move render classes into render dir.

1 files changed, 0 insertions, 641 deletions

diff --git a/src/sdl2graphics.cpp b/src/sdl2graphics.cpp
deleted file mode 100644
index ee4e7dbce..000000000
--- a/src/sdl2graphics.cpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2013  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef USE_SDL2
-
-#include "sdl2graphics.h"
-
-#include "main.h"
-
-#include "configuration.h"
-#include "graphicsmanager.h"
-#include "graphicsvertexes.h"
-#include "logger.h"
-
-#include "resources/imagehelper.h"
-#include "resources/sdl2imagehelper.h"
-
-#include <guichan/sdl/sdlpixel.hpp>
-
-#include "utils/sdlcheckutils.h"
-
-#include <SDL.h>
-
-#include "debug.h"
-
-#ifdef DEBUG_SDL_SURFACES
-
-#define MSDL_RenderCopy(render, texture, src, dst) \
-    FakeSDL_RenderCopy(render, texture, src, dst)
-
-static int FakeSDL_RenderCopy(SDL_Renderer *const renderer,
-                              SDL_Texture *const texture,
-                              const SDL_Rect *const srcrect,
-                              const SDL_Rect *const dstrect)
-{
-    int ret = SDL_RenderCopy(renderer, texture, srcrect, dstrect);
-    if (ret)
-    {
-        logger->log("rendering error in texture %p: %s",
-            static_cast<void*>(texture), SDL_GetError());
-    }
-    return ret;
-}
-
-#else
-
-#define MSDL_RenderCopy(render, texture, src, dst) \
-    SDL_RenderCopy(render, texture, src, dst)
-
-#endif
-
-SDLGraphics::SDLGraphics() :
-    Graphics(),
-    mOldPixel(0),
-    mOldAlpha(0)
-{
-}
-
-SDLGraphics::~SDLGraphics()
-{
-}
-
-bool SDLGraphics::drawRescaledImage(const Image *const image,
-                                    int srcX, int srcY,
-                                    int dstX, int dstY,
-                                    const int width, const int height,
-                                    const int desiredWidth,
-                                    const int desiredHeight,
-                                    const bool useColor A_UNUSED)
-{
-    FUNC_BLOCK("Graphics::drawRescaledImage", 1)
-    // Check that preconditions for blitting are met.
-    if (!mWindow || !image)
-        return false;
-    if (!image->mTexture)
-        return false;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-    const SDL_Rect &bounds = image->mBounds;
-    const SDL_Rect srcRect =
-    {
-        static_cast<int32_t>(srcX + bounds.x),
-        static_cast<int32_t>(srcY + bounds.y),
-        static_cast<int32_t>(width),
-        static_cast<int32_t>(height)
-    };
-    const SDL_Rect dstRect =
-    {
-        static_cast<int32_t>(dstX + top.xOffset),
-        static_cast<int32_t>(dstY + top.yOffset),
-        static_cast<int32_t>(desiredWidth),
-        static_cast<int32_t>(desiredHeight)
-    };
-
-    return (MSDL_RenderCopy(mRenderer, image->mTexture,
-        &srcRect, &dstRect) < 0);
-}
-
-bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY,
-                             int dstX, int dstY, const int width,
-                             const int height, const bool useColor A_UNUSED)
-{
-    FUNC_BLOCK("Graphics::drawImage2", 1)
-    // Check that preconditions for blitting are met.
-    if (!mWindow || !image || !image->mTexture)
-        return false;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-    if (!top.height)
-        return false;
-
-    const SDL_Rect &bounds = image->mBounds;
-    const SDL_Rect srcRect =
-    {
-        static_cast<int32_t>(srcX + bounds.x),
-        static_cast<int32_t>(srcY + bounds.y),
-        static_cast<int32_t>(width),
-        static_cast<int32_t>(height)
-    };
-
-    const SDL_Rect dstRect =
-    {
-        static_cast<int32_t>(dstX + top.xOffset),
-        static_cast<int32_t>(dstY + top.yOffset),
-        static_cast<int32_t>(width),
-        static_cast<int32_t>(height)
-    };
-
-    return !MSDL_RenderCopy(mRenderer, image->mTexture, &srcRect, &dstRect);
-}
-
-void SDLGraphics::drawImagePattern(const Image *const image,
-                                   const int x, const int y,
-                                   const int w, const int h)
-{
-    FUNC_BLOCK("Graphics::drawImagePattern", 1)
-    // Check that preconditions for blitting are met.
-    if (!mWindow || !image)
-        return;
-    if (!image->mTexture)
-        return;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-    if (!top.height)
-        return;
-
-    const SDL_Rect &bounds = image->mBounds;
-    const int iw = bounds.w;
-    const int ih = bounds.h;
-    if (iw == 0 || ih == 0)
-        return;
-
-    const int xOffset = top.xOffset + x;
-    const int yOffset = top.yOffset + y;
-
-    SDL_Rect dstRect;
-    SDL_Rect srcRect;
-    srcRect.x = static_cast<int32_t>(bounds.x);
-    srcRect.y = static_cast<int32_t>(bounds.y);
-    for (int py = 0; py < h; py += ih)
-    {
-        const int dh = (py + ih >= h) ? h - py : ih;
-        dstRect.y = static_cast<int32_t>(py + yOffset);
-        srcRect.h = static_cast<int32_t>(dh);
-        dstRect.h = static_cast<int32_t>(dh);
-
-        for (int px = 0; px < w; px += iw)
-        {
-            const int dw = (px + iw >= w) ? w - px : iw;
-            dstRect.x = static_cast<int32_t>(px + xOffset);
-            srcRect.w = static_cast<int32_t>(dw);
-            dstRect.w = static_cast<int32_t>(dw);
-
-            MSDL_RenderCopy(mRenderer, image->mTexture, &srcRect, &dstRect);
-        }
-    }
-}
-
-void SDLGraphics::drawRescaledImagePattern(const Image *const image,
-                                           const int x, const int y,
-                                           const int w, const int h,
-                                           const int scaledWidth,
-                                           const int scaledHeight)
-{
-    // Check that preconditions for blitting are met.
-    if (!mWindow || !image)
-        return;
-    if (!image->mTexture)
-        return;
-
-    if (scaledHeight == 0 || scaledWidth == 0)
-        return;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-    if (!top.height)
-        return;
-
-    Image *const tmpImage = image->SDLgetScaledImage(
-        scaledWidth, scaledHeight);
-    if (!tmpImage)
-        return;
-
-    const SDL_Rect &bounds = tmpImage->mBounds;
-    const int iw = bounds.w;
-    const int ih = bounds.h;
-    if (iw == 0 || ih == 0)
-        return;
-
-    const int xOffset = top.xOffset + x;
-    const int yOffset = top.yOffset + y;
-
-    SDL_Rect dstRect;
-    SDL_Rect srcRect;
-    srcRect.x = static_cast<int32_t>(bounds.x);
-    srcRect.y = static_cast<int32_t>(bounds.y);
-    for (int py = 0; py < h; py += ih)
-    {
-        const int dh = (py + ih >= h) ? h - py : ih;
-        dstRect.y = static_cast<int32_t>(py + yOffset);
-        srcRect.h = static_cast<int32_t>(dh);
-        dstRect.h = static_cast<int32_t>(dh);
-
-        for (int px = 0; px < w; px += iw)
-        {
-            const int dw = (px + iw >= w) ? w - px : iw;
-            dstRect.x = static_cast<int32_t>(px + xOffset);
-            srcRect.w = static_cast<int32_t>(dw);
-            dstRect.w = static_cast<int32_t>(dw);
-
-            MSDL_RenderCopy(mRenderer, image->mTexture, &srcRect, &dstRect);
-        }
-    }
-
-    delete tmpImage;
-}
-
-void SDLGraphics::calcImagePattern(ImageVertexes* const vert,
-                                   const Image *const image,
-                                   const int x, const int y,
-                                   const int w, const int h) const
-{
-    // Check that preconditions for blitting are met.
-    if (!vert || !mWindow || !image || !image->mTexture)
-        return;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-    if (!top.height)
-        return;
-
-    const SDL_Rect &bounds = image->mBounds;
-    const int iw = bounds.w;
-    const int ih = bounds.h;
-    if (iw == 0 || ih == 0)
-        return;
-
-    const int xOffset = top.xOffset + x;
-    const int yOffset = top.yOffset + y;
-    const int srcX = bounds.x;
-    const int srcY = bounds.y;
-    for (int py = 0; py < h; py += ih)
-    {
-        const int dh = (py + ih >= h) ? h - py : ih;
-        const int dstY = py + yOffset;
-
-        for (int px = 0; px < w; px += iw)
-        {
-            const int dw = (px + iw >= w) ? w - px : iw;
-            const int dstX = px + xOffset;
-
-            DoubleRect *const r = new DoubleRect();
-            SDL_Rect &dstRect = r->dst;
-            SDL_Rect &srcRect = r->src;
-            srcRect.x = static_cast<int32_t>(srcX);
-            srcRect.y = static_cast<int32_t>(srcY);
-            srcRect.w = static_cast<int32_t>(dw);
-            srcRect.h = static_cast<int32_t>(dh);
-            dstRect.x = static_cast<int32_t>(dstX);
-            dstRect.y = static_cast<int32_t>(dstY);
-            dstRect.w = static_cast<int32_t>(dw);
-            dstRect.h = static_cast<int32_t>(dh);
-
-            vert->sdl.push_back(r);
-        }
-    }
-}
-
-void SDLGraphics::calcImagePattern(ImageCollection* const vertCol,
-                                   const Image *const image,
-                                   const int x, const int y,
-                                   const int w, const int h) const
-{
-    ImageVertexes *vert = nullptr;
-    if (vertCol->currentImage != image)
-    {
-        vert = new ImageVertexes();
-        vertCol->currentImage = image;
-        vertCol->currentVert = vert;
-        vert->image = image;
-        vertCol->draws.push_back(vert);
-    }
-    else
-    {
-        vert = vertCol->currentVert;
-    }
-
-    calcImagePattern(vert, image, x, y, w, h);
-}
-
-void SDLGraphics::calcTile(ImageVertexes *const vert,
-                           const Image *const image,
-                           int x, int y) const
-{
-    vert->image = image;
-    calcTileSDL(vert, x, y);
-}
-
-void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const
-{
-    // Check that preconditions for blitting are met.
-    if (!vert || !vert->image || !vert->image->mTexture)
-        return;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-    if (!top.height)
-        return;
-
-    const Image *const image = vert->image;
-    const SDL_Rect &bounds = image->mBounds;
-
-    x += top.xOffset;
-    y += top.yOffset;
-
-    DoubleRect *rect = new DoubleRect();
-    SDL_Rect &dstRect = rect->dst;
-    SDL_Rect &srcRect = rect->src;
-
-    srcRect.x = static_cast<int32_t>(bounds.x);
-    srcRect.y = static_cast<int32_t>(bounds.y);
-    srcRect.w = static_cast<int32_t>(bounds.w);
-    srcRect.h = static_cast<int32_t>(bounds.h);
-    dstRect.x = static_cast<int32_t>(x);
-    dstRect.y = static_cast<int32_t>(y);
-    dstRect.w = static_cast<int32_t>(bounds.w);
-    dstRect.h = static_cast<int32_t>(bounds.h);
-
-    vert->sdl.push_back(rect);
-}
-
-void SDLGraphics::calcTile(ImageCollection *const vertCol,
-                           const Image *const image,
-                           int x, int y)
-{
-    if (vertCol->currentImage != image)
-    {
-        ImageVertexes *const vert = new ImageVertexes();
-        vertCol->currentImage = image;
-        vertCol->currentVert = vert;
-        vert->image = image;
-        vertCol->draws.push_back(vert);
-        calcTileSDL(vert, x, y);
-    }
-    else
-    {
-        calcTileSDL(vertCol->currentVert, x, y);
-    }
-}
-
-void SDLGraphics::drawTile(const ImageCollection *const vertCol)
-{
-    const ImageVertexesVector &draws = vertCol->draws;
-    const ImageCollectionCIter it_end = draws.end();
-    for (ImageCollectionCIter it = draws.begin(); it != it_end; ++ it)
-    {
-        const ImageVertexes *const vert = *it;
-        const Image *const img = vert->image;
-        const DoubleRects *const rects = &vert->sdl;
-        DoubleRects::const_iterator it2 = rects->begin();
-        const DoubleRects::const_iterator it2_end = rects->end();
-        while (it2 != it2_end)
-        {
-            MSDL_RenderCopy(mRenderer, img->mTexture,
-                &(*it2)->src, &(*it2)->dst);
-            ++ it2;
-        }
-    }
-}
-
-void SDLGraphics::drawTile(const ImageVertexes *const vert)
-{
-    // vert and img must be != 0
-    const Image *const img = vert->image;
-    const DoubleRects *const rects = &vert->sdl;
-    DoubleRects::const_iterator it = rects->begin();
-    const DoubleRects::const_iterator it_end = rects->end();
-    while (it != it_end)
-    {
-        MSDL_RenderCopy(mRenderer, img->mTexture, &(*it)->src, &(*it)->dst);
-        ++ it;
-    }
-}
-
-void SDLGraphics::updateScreen()
-{
-    BLOCK_START("Graphics::updateScreen")
-    SDL_RenderPresent(mRenderer);
-//    SDL_RenderClear(mRenderer);
-    BLOCK_END("Graphics::updateScreen")
-}
-
-SDL_Surface *SDLGraphics::getScreenshot()
-{
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    const int rmask = 0xff000000;
-    const int gmask = 0x00ff0000;
-    const int bmask = 0x0000ff00;
-#else
-    const int rmask = 0x000000ff;
-    const int gmask = 0x0000ff00;
-    const int bmask = 0x00ff0000;
-#endif
-    const int amask = 0x00000000;
-
-    SDL_Surface *const screenshot = MSDL_CreateRGBSurface(SDL_SWSURFACE,
-        mRect.w, mRect.h, 24, rmask, gmask, bmask, amask);
-
-//    if (screenshot)
-//        SDL_BlitSurface(mWindow, nullptr, screenshot, nullptr);
-
-    return screenshot;
-}
-
-bool SDLGraphics::drawNet(const int x1, const int y1,
-                          const int x2, const int y2,
-                          const int width, const int height)
-{
-    // +++ need use SDL_RenderDrawLines
-    for (int y = y1; y < y2; y += height)
-        drawLine(x1, y, x2, y);
-
-    for (int x = x1; x < x2; x += width)
-        drawLine(x, y1, x, y2);
-
-    return true;
-}
-
-bool SDLGraphics::calcWindow(ImageCollection *const vertCol,
-                             const int x, const int y,
-                             const int w, const int h,
-                             const ImageRect &imgRect)
-{
-    ImageVertexes *vert = nullptr;
-    Image *const image = imgRect.grid[4];
-    if (vertCol->currentImage != image)
-    {
-        vert = new ImageVertexes();
-        vertCol->currentImage = image;
-        vertCol->currentVert = vert;
-        vert->image = image;
-        vertCol->draws.push_back(vert);
-    }
-    else
-    {
-        vert = vertCol->currentVert;
-    }
-
-    const Image *const *const grid = &imgRect.grid[0];
-    return calcImageRect(vert, x, y, w, h,
-        grid[0], grid[2], grid[6], grid[8],
-        grid[1], grid[5], grid[7], grid[3],
-        grid[4]);
-}
-
-void SDLGraphics::fillRectangle(const gcn::Rectangle &rectangle)
-{
-    const gcn::ClipRectangle &top = mClipStack.top();
-    const SDL_Rect rect =
-    {
-        static_cast<int32_t>(rectangle.x + top.xOffset),
-        static_cast<int32_t>(rectangle.y + top.yOffset),
-        static_cast<int32_t>(rectangle.width),
-        static_cast<int32_t>(rectangle.height)
-    };
-
-    SDL_SetRenderDrawColor(mRenderer, mColor.r, mColor.g, mColor.b, mColor.a);
-    SDL_RenderFillRects(mRenderer, &rect, 1);
-}
-
-void SDLGraphics::_beginDraw()
-{
-    pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
-}
-
-void SDLGraphics::_endDraw()
-{
-    popClipArea();
-}
-
-bool SDLGraphics::pushClipArea(gcn::Rectangle area)
-{
-    const bool result = gcn::Graphics::pushClipArea(area);
-
-    const gcn::ClipRectangle &carea = mClipStack.top();
-    const SDL_Rect rect =
-    {
-        static_cast<int32_t>(carea.x),
-        static_cast<int32_t>(carea.y),
-        static_cast<int32_t>(carea.width),
-        static_cast<int32_t>(carea.height)
-    };
-    SDL_RenderSetClipRect(mRenderer, &rect);
-    return result;
-}
-
-void SDLGraphics::popClipArea()
-{
-    gcn::Graphics::popClipArea();
-
-    if (mClipStack.empty())
-        return;
-
-    const gcn::ClipRectangle &carea = mClipStack.top();
-    const SDL_Rect rect =
-    {
-        static_cast<int32_t>(carea.x),
-        static_cast<int32_t>(carea.y),
-        static_cast<int32_t>(carea.width),
-        static_cast<int32_t>(carea.height)
-    };
-
-    SDL_RenderSetClipRect(mRenderer, &rect);
-}
-
-void SDLGraphics::drawPoint(int x, int y)
-{
-    if (mClipStack.empty())
-        return;
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    x += top.xOffset;
-    y += top.yOffset;
-
-    if (!top.isPointInRect(x, y))
-        return;
-
-    SDL_SetRenderDrawColor(mRenderer, mColor.r, mColor.g, mColor.b, mColor.a);
-    const SDL_Point point =
-    {
-        x,
-        y
-    };
-
-    SDL_RenderDrawPoints(mRenderer, &point, 1);
-}
-
-
-void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle)
-{
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    SDL_SetRenderDrawColor(mRenderer, mColor.r, mColor.g, mColor.b, mColor.a);
-
-    const int x1 = rectangle.x + top.xOffset;
-    const int y1 = rectangle.y + top.yOffset;
-    const int x2 = x1 + rectangle.width - 1;
-    const int y2 = y1 + rectangle.height - 1;
-    SDL_Point points[] =
-    {
-        {x1, y1},
-        {x2, y1},
-        {x2, y2},
-        {x1, y2},
-        {x1, y1}
-    };
-
-    SDL_RenderDrawLines(mRenderer, points, 5);
-}
-
-void SDLGraphics::drawLine(int x1, int y1, int x2, int y2)
-{
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    SDL_SetRenderDrawColor(mRenderer, mColor.r, mColor.g, mColor.b, mColor.a);
-
-    const int x0 = top.xOffset;
-    const int y0 = top.yOffset;
-
-    SDL_Point points[] =
-    {
-        {x1 + x0, y1 + y0},
-        {x2 + x0, y2 + y0}
-    };
-
-    SDL_RenderDrawLines(mRenderer, points, 2);
-}
-
-bool SDLGraphics::setVideoMode(const int w, const int h, const int bpp,
-                               const bool fs, const bool hwaccel,
-                               const bool resize, const bool noFrame)
-{
-    setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
-
-    if (!(mWindow = graphicsManager.createWindow(w, h, bpp,
-        getSoftwareFlags())))
-    {
-        mRect.w = 0;
-        mRect.h = 0;
-        return false;
-    }
-
-    int w1 = 0;
-    int h1 = 0;
-    SDL_GetWindowSize(mWindow, &w1, &h1);
-    mRect.w = w1;
-    mRect.h = h1;
-
-    mRenderer = graphicsManager.createRenderer(mWindow, SDL_RENDERER_SOFTWARE);
-    SDLImageHelper::setRenderer(mRenderer);
-    return videoInfo();
-}
-
-#endif  // USE_SDL2