diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/graphics.cpp | 5 | ||||
| -rw-r--r-- | src/graphics.h | 27 | ||||
| -rw-r--r-- | src/guichan/include/guichan/sdl/sdlgraphics.hpp | 158 | ||||
| -rw-r--r-- | src/guichan/sdl/sdlgraphics.cpp | 595 | ||||
| -rw-r--r-- | src/sdlgraphics.cpp | 311 | ||||
| -rw-r--r-- | src/sdlgraphics.h | 20 |
8 files changed, 359 insertions, 761 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a46683928..160660a0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -749,7 +749,6 @@ SET(SRCS_GUICHAN guichan/include/guichan/rectangle.hpp guichan/include/guichan/selectionevent.hpp guichan/include/guichan/selectionlistener.hpp - guichan/include/guichan/sdl/sdlgraphics.hpp guichan/include/guichan/sdl/sdlpixel.hpp guichan/include/guichan/widget.hpp guichan/include/guichan/widgetlistener.hpp @@ -784,7 +783,6 @@ SET(SRCS_GUICHAN guichan/rectangle.cpp guichan/selectionevent.cpp guichan/widget.cpp - guichan/sdl/sdlgraphics.cpp guichan/widgets/button.cpp guichan/widgets/checkbox.cpp guichan/widgets/container.cpp diff --git a/src/Makefile.am b/src/Makefile.am index a3b551313..a915c8c06 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,7 +55,6 @@ manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \ guichan/include/guichan/rectangle.hpp \ guichan/include/guichan/selectionevent.hpp \ guichan/include/guichan/selectionlistener.hpp \ - guichan/include/guichan/sdl/sdlgraphics.hpp \ guichan/include/guichan/sdl/sdlpixel.hpp \ guichan/include/guichan/widget.hpp \ guichan/include/guichan/widgetlistener.hpp \ @@ -91,7 +90,6 @@ manaplus_SOURCES += guichan/actionevent.cpp \ guichan/rectangle.cpp \ guichan/selectionevent.cpp \ guichan/widget.cpp \ - guichan/sdl/sdlgraphics.cpp \ guichan/widgets/button.cpp \ guichan/widgets/checkbox.cpp \ guichan/widgets/container.cpp \ diff --git a/src/graphics.cpp b/src/graphics.cpp index f32d35f3e..7120afb06 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -57,10 +57,12 @@ int MSDL_gfxBlitRGBA(SDL_Surface *src, SDL_Rect *srcrect, } Graphics::Graphics() : - SDLGraphics(), + gcn::Graphics(), mWidth(0), mHeight(0), + mTarget(nullptr), mBpp(0), + mAlpha(false), mFullscreen(false), mHWAccel(false), mRedraw(false), @@ -73,6 +75,7 @@ Graphics::Graphics() : mName("Software"), mStartFreeMem(0), mSync(false), + mColor(), mColor2() { mRect.x = 0; diff --git a/src/graphics.h b/src/graphics.h index 60313fdaf..62bf064b1 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -23,7 +23,10 @@ #ifndef GRAPHICS_H #define GRAPHICS_H -#include <guichan/sdl/sdlgraphics.hpp> +#include "SDL.h" + +#include <guichan/color.hpp> +#include <guichan/graphics.hpp> #include "localconsts.h" @@ -87,7 +90,7 @@ class ImageRect final /** * A central point of control for graphics. */ -class Graphics : public gcn::SDLGraphics +class Graphics : public gcn::Graphics { public: /** @@ -102,6 +105,12 @@ class Graphics : public gcn::SDLGraphics */ virtual ~Graphics(); + void setTarget(SDL_Surface *const target) + { mTarget = target; } + + SDL_Surface *getTarget() const + { return mTarget; } + /** * Sets whether vertical refresh syncing is enabled. Takes effect after * the next call to setVideoMode(). Only implemented on MacOS for now. @@ -136,6 +145,14 @@ class Graphics : public gcn::SDLGraphics */ bool drawImage(const Image *image, int x, int y); + // override unused abstract function + void drawImage(const gcn::Image* image A_UNUSED, + int srcX A_UNUSED, int srcY A_UNUSED, + int dstX A_UNUSED, int dstY A_UNUSED, + int width A_UNUSED, int height A_UNUSED) override + { + } + /** * Draws a resclaled version of the image */ @@ -326,6 +343,9 @@ class Graphics : public gcn::SDLGraphics mAlpha = (color.a != 255); } + const gcn::Color &getColor() const override + { return mColor; } + const gcn::Color &getColor2() const { return mColor2; } @@ -367,7 +387,9 @@ class Graphics : public gcn::SDLGraphics bool videoInfo(); + SDL_Surface* mTarget; int mBpp; + bool mAlpha; bool mFullscreen; bool mHWAccel; bool mRedraw; @@ -380,6 +402,7 @@ class Graphics : public gcn::SDLGraphics std::string mName; int mStartFreeMem; bool mSync; + gcn::Color mColor; gcn::Color mColor2; }; diff --git a/src/guichan/include/guichan/sdl/sdlgraphics.hpp b/src/guichan/include/guichan/sdl/sdlgraphics.hpp deleted file mode 100644 index fff1f6e29..000000000 --- a/src/guichan/include/guichan/sdl/sdlgraphics.hpp +++ /dev/null @@ -1,158 +0,0 @@ -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * Copyright (C) 2011-2013 The ManaPlus Developers - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GCN_SDLGRAPHICS_HPP -#define GCN_SDLGRAPHICS_HPP - -#include "SDL.h" - -#include "guichan/color.hpp" -#include "guichan/graphics.hpp" -#include "guichan/platform.hpp" - -namespace gcn -{ - class Image; - class Rectangle; - - /** - * SDL implementation of the Graphics. - */ - class GCN_EXTENSION_DECLSPEC SDLGraphics : public Graphics - { - public: - // Needed so that drawImage(gcn::Image *, int, int) is visible. - using Graphics::drawImage; - - /** - * Constructor. - */ - SDLGraphics(); - - A_DELETE_COPY(SDLGraphics) - - /** - * Sets the target SDL_Surface to draw to. The target can be any - * SDL_Surface. This funtion also pushes a clip areas corresponding to - * the dimension of the target. - * - * @param target the target to draw to. - */ - virtual void setTarget(SDL_Surface* target); - - /** - * Gets the target SDL_Surface. - * - * @return the target SDL_Surface. - */ - virtual SDL_Surface* getTarget() const; - - /** - * Draws an SDL_Surface on the target surface. Normaly you'll - * use drawImage, but if you want to write SDL specific code - * this function might come in handy. - * - * NOTE: The clip areas will be taken into account. - */ - virtual void drawSDLSurface(SDL_Surface* surface, - SDL_Rect source, - SDL_Rect destination); - - - // Inherited from Graphics - - virtual void _beginDraw(); - - virtual void _endDraw(); - - virtual bool pushClipArea(Rectangle area); - - virtual void popClipArea(); - - virtual void drawImage(const Image* image, - int srcX, - int srcY, - int dstX, - int dstY, - int width, - int height); - - virtual void drawPoint(int x, int y); - - virtual void drawLine(int x1, int y1, int x2, int y2); - - virtual void drawRectangle(const Rectangle& rectangle); - - virtual void fillRectangle(const Rectangle& rectangle); - - virtual void setColor(const Color& color); - - virtual const Color& getColor() const; - - protected: - /** - * Draws a horizontal line. - * - * @param x1 the start coordinate of the line. - * @param y the y coordinate of the line. - * @param x2 the end coordinate of the line. - */ - virtual void drawHLine(int x1, int y, int x2); - - /** - * Draws a vertical line. - * - * @param x the x coordinate of the line. - * @param y1 the start coordinate of the line. - * @param y2 the end coordinate of the line. - */ - virtual void drawVLine(int x, int y1, int y2); - - SDL_Surface* mTarget; - Color mColor; - bool mAlpha; - }; -} // namespace gcn - -#endif // end GCN_SDLGRAPHICS_HPP diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp deleted file mode 100644 index b36b5e565..000000000 --- a/src/guichan/sdl/sdlgraphics.cpp +++ /dev/null @@ -1,595 +0,0 @@ -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * Copyright (C) 2011-2013 The ManaPlus Developers - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * For comments regarding functions please see the header file. - */ - -#include "guichan/sdl/sdlgraphics.hpp" - -#include "guichan/exception.hpp" -#include "guichan/font.hpp" -#include "guichan/image.hpp" -#include "guichan/sdl/sdlpixel.hpp" - -#include "debug.h" - -// For some reason an old version of MSVC did not like std::abs, -// so we added this macro. -#ifndef ABS -#define ABS(x) ((x)<0?-(x):(x)) -#endif - -namespace gcn -{ - SDLGraphics::SDLGraphics() : - Graphics(), - mTarget(nullptr), - mColor(), - mAlpha(false) - { - } - - void SDLGraphics::_beginDraw() - { - Rectangle area; - area.x = 0; - area.y = 0; - area.width = mTarget->w; - area.height = mTarget->h; - pushClipArea(area); - } - - void SDLGraphics::_endDraw() - { - popClipArea(); - } - - void SDLGraphics::setTarget(SDL_Surface* target) - { - mTarget = target; - } - - bool SDLGraphics::pushClipArea(Rectangle area) - { - SDL_Rect rect; - const bool result = Graphics::pushClipArea(area); - - const ClipRectangle& carea = mClipStack.top(); - rect.x = static_cast<int16_t>(carea.x); - rect.y = static_cast<int16_t>(carea.y); - rect.w = static_cast<int16_t>(carea.width); - rect.h = static_cast<int16_t>(carea.height); - - SDL_SetClipRect(mTarget, &rect); - - return result; - } - - void SDLGraphics::popClipArea() - { - Graphics::popClipArea(); - - if (mClipStack.empty()) - return; - - const ClipRectangle& carea = mClipStack.top(); - SDL_Rect rect; - rect.x = static_cast<int16_t>(carea.x); - rect.y = static_cast<int16_t>(carea.y); - rect.w = static_cast<int16_t>(carea.width); - rect.h = static_cast<int16_t>(carea.height); - - SDL_SetClipRect(mTarget, &rect); - } - - SDL_Surface* SDLGraphics::getTarget() const - { - return mTarget; - } - - void SDLGraphics::drawImage(const Image* image A_UNUSED, - int srcX A_UNUSED, - int srcY A_UNUSED, - int dstX A_UNUSED, - int dstY A_UNUSED, - int width A_UNUSED, - int height A_UNUSED) - { - } - - void SDLGraphics::fillRectangle(const Rectangle& rectangle A_UNUSED) - { - } - - void SDLGraphics::drawPoint(int x, int y) - { - if (mClipStack.empty()) - { - throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a " - "draw funtion outside of _beginDraw() and _endDraw()?"); - } - - const ClipRectangle& top = mClipStack.top(); - - x += top.xOffset; - y += top.yOffset; - - if (!top.isPointInRect(x, y)) - return; - - if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); - else - SDLputPixel(mTarget, x, y, mColor); - } - - void SDLGraphics::drawHLine(int x1, int y, int x2) - { - if (mClipStack.empty()) - { - throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a " - "draw funtion outside of _beginDraw() and _endDraw()?"); - } - - const ClipRectangle& top = mClipStack.top(); - - x1 += top.xOffset; - y += top.yOffset; - x2 += top.xOffset; - - if (y < top.y || y >= top.y + top.height) - return; - - if (x1 > x2) - { - x1 ^= x2; - x2 ^= x1; - x1 ^= x2; - } - - if (top.x > x1) - { - if (top.x > x2) - return; - - x1 = top.x; - } - - if (top.x + top.width <= x2) - { - if (top.x + top.width <= x1) - return; - - x2 = top.x + top.width -1; - } - - const int bpp = mTarget->format->BytesPerPixel; - - SDL_LockSurface(mTarget); - - uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) - + y * mTarget->pitch + x1 * bpp; - - const uint32_t pixel = SDL_MapRGB(mTarget->format, - static_cast<uint8_t>(mColor.r), - static_cast<uint8_t>(mColor.g), - static_cast<uint8_t>(mColor.b)); - switch (bpp) - { - case 1: - for (; x1 <= x2; ++x1) - *(p++) = static_cast<uint8_t>(pixel); - break; - - case 2: - { - uint16_t* q = reinterpret_cast<uint16_t*>(p); - for (; x1 <= x2; ++x1) - *(q++) = pixel; - break; - } - - case 3: -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - for (; x1 <= x2; ++x1) - { - p[0] = static_cast<uint8_t>((pixel >> 16) & 0xff); - p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); - p[2] = static_cast<uint8_t>(pixel & 0xff); - p += 3; - } -#else - for (; x1 <= x2; ++x1) - { - p[0] = static_cast<uint8_t>(pixel & 0xff); - p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); - p[2] = static_cast<uint8_t>((pixel >> 16) & 0xff); - p += 3; - } -#endif - break; - - case 4: - { - uint32_t *q = reinterpret_cast<uint32_t*>(p); - for (; x1 <= x2; ++x1) - { - if (mAlpha) - { - *q = SDLAlpha32(pixel, *q, - static_cast<unsigned char>(mColor.a)); - q++; - } - else - { - *(q++) = pixel; - } - } - break; - } - default: - break; - } // end switch - - SDL_UnlockSurface(mTarget); - } - - void SDLGraphics::drawVLine(int x, int y1, int y2) - { - if (mClipStack.empty()) - { - throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a " - "draw funtion outside of _beginDraw() and _endDraw()?"); - } - - const ClipRectangle& top = mClipStack.top(); - - x += top.xOffset; - y1 += top.yOffset; - y2 += top.yOffset; - - if (x < top.x || x >= top.x + top.width) - return; - - if (y1 > y2) - { - y1 ^= y2; - y2 ^= y1; - y1 ^= y2; - } - - if (top.y > y1) - { - if (top.y > y2) - return; - - y1 = top.y; - } - - if (top.y + top.height <= y2) - { - if (top.y + top.height <= y1) - return; - - y2 = top.y + top.height - 1; - } - - const int bpp = mTarget->format->BytesPerPixel; - - SDL_LockSurface(mTarget); - - uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) - + y1 * mTarget->pitch + x * bpp; - - const uint32_t pixel = SDL_MapRGB(mTarget->format, - static_cast<uint8_t>(mColor.r), - static_cast<uint8_t>(mColor.g), - static_cast<uint8_t>(mColor.b)); - - switch (bpp) - { - case 1: - for (; y1 <= y2; ++y1) - { - *p = static_cast<uint8_t>(pixel); - p += mTarget->pitch; - } - break; - - case 2: - for (; y1 <= y2; ++ y1) - { - *reinterpret_cast<uint16_t*>(p) - = static_cast<uint16_t>(pixel); - p += mTarget->pitch; - } - break; - - case 3: -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - for (; y1 <= y2; ++y1) - { - p[0] = static_cast<uint8_t>((pixel >> 16) & 0xff); - p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); - p[2] = static_cast<uint8_t>(pixel & 0xff); - p += mTarget->pitch; - } -#else - for (; y1 <= y2; ++y1) - { - p[0] = static_cast<uint8_t>(pixel & 0xff); - p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); - p[2] = static_cast<uint8_t>((pixel >> 16) & 0xff); - p += mTarget->pitch; - } -#endif - break; - - case 4: - for (; y1 <= y2; ++y1) - { - if (mAlpha) - { - *reinterpret_cast<uint32_t*>(p) = SDLAlpha32(pixel, - *reinterpret_cast<uint32_t*>(p), - static_cast<unsigned char>(mColor.a)); - } - else - { - *reinterpret_cast<uint32_t*>(p) = pixel; - } - p += mTarget->pitch; - } - break; - - default: - break; - } // end switch - - SDL_UnlockSurface(mTarget); - } - - void SDLGraphics::drawRectangle(const Rectangle& rectangle) - { - const int x1 = rectangle.x; - const int x2 = rectangle.x + rectangle.width - 1; - const int y1 = rectangle.y; - const int y2 = rectangle.y + rectangle.height - 1; - - drawHLine(x1, y1, x2); - drawHLine(x1, y2, x2); - - drawVLine(x1, y1, y2); - drawVLine(x2, y1, y2); - } - - void SDLGraphics::drawLine(int x1, int y1, int x2, int y2) - { - if (x1 == x2) - { - drawVLine(x1, y1, y2); - return; - } - if (y1 == y2) - { - drawHLine(x1, y1, x2); - return; - } - - if (mClipStack.empty()) - { - throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a " - "draw funtion outside of _beginDraw() and _endDraw()?"); - } - - const ClipRectangle& top = mClipStack.top(); - - x1 += top.xOffset; - y1 += top.yOffset; - x2 += top.xOffset; - y2 += top.yOffset; - - // Draw a line with Bresenham - - const int dx = ABS(x2 - x1); - const int dy = ABS(y2 - y1); - - if (dx > dy) - { - if (x1 > x2) - { - // swap x1, x2 - x1 ^= x2; - x2 ^= x1; - x1 ^= x2; - - // swap y1, y2 - y1 ^= y2; - y2 ^= y1; - y1 ^= y2; - } - - if (y1 < y2) - { - int y = y1; - int p = 0; - - for (int x = x1; x <= x2; x++) - { - if (top.isPointInRect(x, y)) - { - if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); - else - SDLputPixel(mTarget, x, y, mColor); - } - - p += dy; - - if (p * 2 >= dx) - { - y++; - p -= dx; - } - } - } - else - { - int y = y1; - int p = 0; - - for (int x = x1; x <= x2; x++) - { - if (top.isPointInRect(x, y)) - { - if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); - else - SDLputPixel(mTarget, x, y, mColor); - } - - p += dy; - - if (p * 2 >= dx) - { - y--; - p -= dx; - } - } - } - } - else - { - if (y1 > y2) - { - // swap y1, y2 - y1 ^= y2; - y2 ^= y1; - y1 ^= y2; - - // swap x1, x2 - x1 ^= x2; - x2 ^= x1; - x1 ^= x2; - } - - if (x1 < x2) - { - int x = x1; - int p = 0; - - for (int y = y1; y <= y2; y++) - { - if (top.isPointInRect(x, y)) - { - if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); - else - SDLputPixel(mTarget, x, y, mColor); - } - - p += dx; - - if (p * 2 >= dy) - { - x++; - p -= dy; - } - } - } - else - { - int x = x1; - int p = 0; - - for (int y = y1; y <= y2; y++) - { - if (top.isPointInRect(x, y)) - { - if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); - else - SDLputPixel(mTarget, x, y, mColor); - } - - p += dx; - - if (p * 2 >= dy) - { - x--; - p -= dy; - } - } - } - } - } - - void SDLGraphics::setColor(const Color& color A_UNUSED) - { - } - - const Color& SDLGraphics::getColor() const - { - return mColor; - } - - void SDLGraphics::drawSDLSurface(SDL_Surface* surface, - SDL_Rect source, - SDL_Rect destination) - { - if (mClipStack.empty()) - { - throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a " - "draw funtion outside of _beginDraw() and _endDraw()?"); - } - - const ClipRectangle& top = mClipStack.top(); - - destination.x += static_cast<int16_t>(top.xOffset); - destination.y += static_cast<int16_t>(top.yOffset); - - SDL_BlitSurface(surface, &source, mTarget, &destination); - } -} // namespace gcn diff --git a/src/sdlgraphics.cpp b/src/sdlgraphics.cpp index 81970b0e3..a8cb084ba 100644 --- a/src/sdlgraphics.cpp +++ b/src/sdlgraphics.cpp @@ -771,3 +771,314 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) SDL_FillRect(mTarget, &rect, color); } } + +void SDLGraphics::_beginDraw() +{ + pushClipArea(gcn::Rectangle(0, 0, mTarget->w, mTarget->h)); +} + +void SDLGraphics::_endDraw() +{ + popClipArea(); +} + +bool SDLGraphics::pushClipArea(gcn::Rectangle area) +{ + SDL_Rect rect; + const bool result = gcn::Graphics::pushClipArea(area); + + const gcn::ClipRectangle &carea = mClipStack.top(); + rect.x = static_cast<int16_t>(carea.x); + rect.y = static_cast<int16_t>(carea.y); + rect.w = static_cast<int16_t>(carea.width); + rect.h = static_cast<int16_t>(carea.height); + SDL_SetClipRect(mTarget, &rect); + + return result; +} + +void SDLGraphics::popClipArea() +{ + gcn::Graphics::popClipArea(); + + if (mClipStack.empty()) + return; + + const gcn::ClipRectangle &carea = mClipStack.top(); + SDL_Rect rect; + rect.x = static_cast<int16_t>(carea.x); + rect.y = static_cast<int16_t>(carea.y); + rect.w = static_cast<int16_t>(carea.width); + rect.h = static_cast<int16_t>(carea.height); + + SDL_SetClipRect(mTarget, &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; + + if (mAlpha) + SDLputPixelAlpha(mTarget, x, y, mColor); + else + SDLputPixel(mTarget, x, y, mColor); +} + +void SDLGraphics::drawHLine(int x1, int y, int x2) +{ + if (mClipStack.empty()) + return; + + const gcn::ClipRectangle& top = mClipStack.top(); + + x1 += top.xOffset; + y += top.yOffset; + x2 += top.xOffset; + + if (y < top.y || y >= top.y + top.height) + return; + + if (x1 > x2) + { + x1 ^= x2; + x2 ^= x1; + x1 ^= x2; + } + + if (top.x > x1) + { + if (top.x > x2) + return; + + x1 = top.x; + } + + if (top.x + top.width <= x2) + { + if (top.x + top.width <= x1) + return; + + x2 = top.x + top.width -1; + } + + const int bpp = mTarget->format->BytesPerPixel; + + SDL_LockSurface(mTarget); + + uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) + + y * mTarget->pitch + x1 * bpp; + + const uint32_t pixel = SDL_MapRGB(mTarget->format, + static_cast<uint8_t>(mColor.r), + static_cast<uint8_t>(mColor.g), + static_cast<uint8_t>(mColor.b)); + switch (bpp) + { + case 1: + for (; x1 <= x2; ++x1) + *(p++) = static_cast<uint8_t>(pixel); + break; + + case 2: + { + uint16_t* q = reinterpret_cast<uint16_t*>(p); + for (; x1 <= x2; ++x1) + *(q++) = pixel; + break; + } + + case 3: +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + for (; x1 <= x2; ++x1) + { + p[0] = static_cast<uint8_t>((pixel >> 16) & 0xff); + p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); + p[2] = static_cast<uint8_t>(pixel & 0xff); + p += 3; + } +#else + for (; x1 <= x2; ++x1) + { + p[0] = static_cast<uint8_t>(pixel & 0xff); + p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); + p[2] = static_cast<uint8_t>((pixel >> 16) & 0xff); + p += 3; + } +#endif + break; + + case 4: + { + uint32_t *q = reinterpret_cast<uint32_t*>(p); + for (; x1 <= x2; ++x1) + { + if (mAlpha) + { + *q = gcn::SDLAlpha32(pixel, *q, + static_cast<unsigned char>(mColor.a)); + q++; + } + else + { + *(q++) = pixel; + } + } + break; + } + default: + break; + } // end switch + + SDL_UnlockSurface(mTarget); +} + +void SDLGraphics::drawVLine(int x, int y1, int y2) +{ + if (mClipStack.empty()) + return; + + const gcn::ClipRectangle& top = mClipStack.top(); + + x += top.xOffset; + y1 += top.yOffset; + y2 += top.yOffset; + + if (x < top.x || x >= top.x + top.width) + return; + + if (y1 > y2) + { + y1 ^= y2; + y2 ^= y1; + y1 ^= y2; + } + + if (top.y > y1) + { + if (top.y > y2) + return; + + y1 = top.y; + } + + if (top.y + top.height <= y2) + { + if (top.y + top.height <= y1) + return; + + y2 = top.y + top.height - 1; + } + + const int bpp = mTarget->format->BytesPerPixel; + + SDL_LockSurface(mTarget); + + uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) + + y1 * mTarget->pitch + x * bpp; + + const uint32_t pixel = SDL_MapRGB(mTarget->format, + static_cast<uint8_t>(mColor.r), + static_cast<uint8_t>(mColor.g), + static_cast<uint8_t>(mColor.b)); + + switch (bpp) + { + case 1: + for (; y1 <= y2; ++y1) + { + *p = static_cast<uint8_t>(pixel); + p += mTarget->pitch; + } + break; + + case 2: + for (; y1 <= y2; ++ y1) + { + *reinterpret_cast<uint16_t*>(p) + = static_cast<uint16_t>(pixel); + p += mTarget->pitch; + } + break; + + case 3: +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + for (; y1 <= y2; ++y1) + { + p[0] = static_cast<uint8_t>((pixel >> 16) & 0xff); + p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); + p[2] = static_cast<uint8_t>(pixel & 0xff); + p += mTarget->pitch; + } +#else + for (; y1 <= y2; ++y1) + { + p[0] = static_cast<uint8_t>(pixel & 0xff); + p[1] = static_cast<uint8_t>((pixel >> 8) & 0xff); + p[2] = static_cast<uint8_t>((pixel >> 16) & 0xff); + p += mTarget->pitch; + } +#endif + break; + + case 4: + for (; y1 <= y2; ++y1) + { + if (mAlpha) + { + *reinterpret_cast<uint32_t*>(p) = gcn::SDLAlpha32(pixel, + *reinterpret_cast<uint32_t*>(p), + static_cast<unsigned char>(mColor.a)); + } + else + { + *reinterpret_cast<uint32_t*>(p) = pixel; + } + p += mTarget->pitch; + } + break; + + default: + break; + } // end switch + + SDL_UnlockSurface(mTarget); +} + +void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle) +{ + const int x1 = rectangle.x; + const int x2 = rectangle.x + rectangle.width - 1; + const int y1 = rectangle.y; + const int y2 = rectangle.y + rectangle.height - 1; + + drawHLine(x1, y1, x2); + drawHLine(x1, y2, x2); + + drawVLine(x1, y1, y2); + drawVLine(x2, y1, y2); +} + +void SDLGraphics::drawLine(int x1, int y1, int x2, int y2) +{ + if (x1 == x2) + { + drawVLine(x1, y1, y2); + return; + } + if (y1 == y2) + { + drawHLine(x1, y1, x2); + return; + } + + // other cases not implimented +} diff --git a/src/sdlgraphics.h b/src/sdlgraphics.h index 823ee9a43..b16a5fbac 100644 --- a/src/sdlgraphics.h +++ b/src/sdlgraphics.h @@ -58,6 +58,14 @@ class SDLGraphics : public Graphics */ virtual ~SDLGraphics(); + void _beginDraw(); + + void _endDraw(); + + bool pushClipArea(gcn::Rectangle rect); + + void popClipArea(); + virtual bool drawRescaledImage(const Image *const image, int srcX, int srcY, int dstX, int dstY, const int width, const int height, @@ -118,7 +126,13 @@ class SDLGraphics : public Graphics BlitMode getBlitMode() const A_WARN_UNUSED { return mBlitMode; } - void fillRectangle(const gcn::Rectangle& rectangle) override; + void fillRectangle(const gcn::Rectangle &rect) override; + + void drawRectangle(const gcn::Rectangle &rect) override; + + void drawPoint(int x, int y) override; + + void drawLine(int x1, int y1, int x2, int y2) override; protected: virtual bool drawImage2(const Image *const image, @@ -132,6 +146,10 @@ class SDLGraphics : public Graphics const SDL_Surface *const dst, SDL_Rect *dstrect) const; + void drawHLine(int x1, int y, int x2); + + void drawVLine(int x, int y1, int y2); + BlitMode mBlitMode; uint32_t mOldPixel; int mOldAlpha; |