diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compoundsprite.cpp | 2 | ||||
| -rw-r--r-- | src/graphics.cpp | 8 | ||||
| -rw-r--r-- | src/graphics.h | 12 | ||||
| -rw-r--r-- | src/mobileopenglgraphics.cpp | 20 | ||||
| -rw-r--r-- | src/normalopenglgraphics.cpp | 20 | ||||
| -rw-r--r-- | src/resources/atlasmanager.cpp | 2 | ||||
| -rw-r--r-- | src/safeopenglgraphics.cpp | 16 | ||||
| -rw-r--r-- | src/sdl2graphics.cpp | 116 | ||||
| -rw-r--r-- | src/sdlgraphics.cpp | 116 |
9 files changed, 157 insertions, 155 deletions
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index d0bf9bc31..bb9b88159 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -333,7 +333,7 @@ void CompoundSprite::redraw() const SDLGraphics *graphics = new SDLGraphics(); graphics->setBlitMode(SDLGraphics::BLIT_GFX); - graphics->setTarget(surface); + graphics->setWindow(surface); graphics->_beginDraw(); int tileX = 32 / 2; diff --git a/src/graphics.cpp b/src/graphics.cpp index 09ea4d880..188ad85d6 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -52,7 +52,7 @@ Graphics::Graphics() : gcn::Graphics(), mWidth(0), mHeight(0), - mTarget(nullptr), + mWindow(nullptr), mBpp(0), mAlpha(false), mFullscreen(false), @@ -141,7 +141,7 @@ bool Graphics::setOpenGLMode() { #ifdef USE_OPENGL SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - if (!(mTarget = SDL_SetVideoMode(mWidth, mHeight, mBpp, getOpenGLFlags()))) + if (!(mWindow = SDL_SetVideoMode(mWidth, mHeight, mBpp, getOpenGLFlags()))) return false; #ifdef __APPLE__ @@ -266,10 +266,10 @@ bool Graphics::videoInfo() else logger->log1("Using video driver: unknown"); - mDoubleBuffer = ((mTarget->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF); + mDoubleBuffer = ((mWindow->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF); logger->log("Double buffer mode: %s", mDoubleBuffer ? "yes" : "no"); - imageHelper->dumpSurfaceFormat(mTarget); + imageHelper->dumpSurfaceFormat(mWindow); const SDL_VideoInfo *const vi = SDL_GetVideoInfo(); if (!vi) diff --git a/src/graphics.h b/src/graphics.h index 9365af4ec..c269dc540 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -25,6 +25,8 @@ #include "SDL.h" +#include "sdlshared.h" + #include <guichan/color.hpp> #include <guichan/graphics.hpp> @@ -102,11 +104,11 @@ class Graphics : public gcn::Graphics */ virtual ~Graphics(); - void setTarget(SDL_Surface *const target) - { mTarget = target; } + void setWindow(SDL_Window *const window) + { mWindow = window; } - SDL_Surface *getTarget() const - { return mTarget; } + SDL_Window *getWindow() const + { return mWindow; } /** * Sets whether vertical refresh syncing is enabled. Takes effect after @@ -384,7 +386,7 @@ class Graphics : public gcn::Graphics bool videoInfo(); - SDL_Surface* mTarget; + SDL_Window* mWindow; int mBpp; bool mAlpha; bool mFullscreen; diff --git a/src/mobileopenglgraphics.cpp b/src/mobileopenglgraphics.cpp index aa08f7b67..96fcc2304 100644 --- a/src/mobileopenglgraphics.cpp +++ b/src/mobileopenglgraphics.cpp @@ -841,11 +841,11 @@ void MobileOpenGLGraphics::_beginDraw() glLoadIdentity(); #ifdef ANDROID - glOrthof(0.0, static_cast<float>(mTarget->w), - static_cast<float>(mTarget->h), 0.0, -1.0, 1.0); + glOrthof(0.0, static_cast<float>(mWindow->w), + static_cast<float>(mWindow->h), 0.0, -1.0, 1.0); #else - glOrtho(0.0, static_cast<double>(mTarget->w), - static_cast<double>(mTarget->h), 0.0, -1.0, 1.0); + glOrtho(0.0, static_cast<double>(mWindow->w), + static_cast<double>(mWindow->h), 0.0, -1.0, 1.0); #endif glMatrixMode(GL_MODELVIEW); @@ -879,7 +879,7 @@ void MobileOpenGLGraphics::_beginDraw() // glScalef(0.5f, 0.5f, 0.5f); - pushClipArea(gcn::Rectangle(0, 0, mTarget->w, mTarget->h)); + pushClipArea(gcn::Rectangle(0, 0, mWindow->w, mWindow->h)); } void MobileOpenGLGraphics::_endDraw() @@ -890,13 +890,13 @@ void MobileOpenGLGraphics::_endDraw() void MobileOpenGLGraphics::prepareScreenshot() { if (config.getBoolValue("usefbo")) - graphicsManager.createFBO(mTarget->w, mTarget->h, &mFbo); + graphicsManager.createFBO(mWindow->w, mWindow->h, &mFbo); } SDL_Surface* MobileOpenGLGraphics::getScreenshot() { - const int h = mTarget->h; - const int w = mTarget->w - (mTarget->w % 4); + const int h = mWindow->h; + const int w = mWindow->w - (mWindow->w % 4); GLint pack = 1; SDL_Surface *const screenshot = SDL_CreateRGBSurface( @@ -967,7 +967,7 @@ bool MobileOpenGLGraphics::pushClipArea(gcn::Rectangle area) glTranslatef(static_cast<GLfloat>(transX), static_cast<GLfloat>(transY), 0); } - glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + glScissor(clipArea.x, mWindow->h - clipArea.y - clipArea.height, clipArea.width, clipArea.height); return result; @@ -982,7 +982,7 @@ void MobileOpenGLGraphics::popClipArea() glPopMatrix(); const gcn::ClipRectangle &clipArea = mClipStack.top(); - glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + glScissor(clipArea.x, mWindow->h - clipArea.y - clipArea.height, clipArea.width, clipArea.height); } diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp index 74d8b4f63..bb4a03860 100644 --- a/src/normalopenglgraphics.cpp +++ b/src/normalopenglgraphics.cpp @@ -1049,11 +1049,11 @@ void NormalOpenGLGraphics::_beginDraw() glLoadIdentity(); #ifdef ANDROID - glOrthof(0.0, static_cast<float>(mTarget->w), - static_cast<float>(mTarget->h), 0.0, -1.0, 1.0); + glOrthof(0.0, static_cast<float>(mWindow->w), + static_cast<float>(mWindow->h), 0.0, -1.0, 1.0); #else - glOrtho(0.0, static_cast<double>(mTarget->w), - static_cast<double>(mTarget->h), 0.0, -1.0, 1.0); + glOrtho(0.0, static_cast<double>(mWindow->w), + static_cast<double>(mWindow->h), 0.0, -1.0, 1.0); #endif glMatrixMode(GL_MODELVIEW); @@ -1088,7 +1088,7 @@ void NormalOpenGLGraphics::_beginDraw() // glScalef(0.5f, 0.5f, 0.5f); - pushClipArea(gcn::Rectangle(0, 0, mTarget->w, mTarget->h)); + pushClipArea(gcn::Rectangle(0, 0, mWindow->w, mWindow->h)); } void NormalOpenGLGraphics::_endDraw() @@ -1099,13 +1099,13 @@ void NormalOpenGLGraphics::_endDraw() void NormalOpenGLGraphics::prepareScreenshot() { if (config.getBoolValue("usefbo")) - graphicsManager.createFBO(mTarget->w, mTarget->h, &mFbo); + graphicsManager.createFBO(mWindow->w, mWindow->h, &mFbo); } SDL_Surface* NormalOpenGLGraphics::getScreenshot() { - const int h = mTarget->h; - const int w = mTarget->w - (mTarget->w % 4); + const int h = mWindow->h; + const int w = mWindow->w - (mWindow->w % 4); GLint pack = 1; SDL_Surface *const screenshot = SDL_CreateRGBSurface( @@ -1177,7 +1177,7 @@ bool NormalOpenGLGraphics::pushClipArea(gcn::Rectangle area) glTranslatef(static_cast<GLfloat>(transX), static_cast<GLfloat>(transY), 0); } - glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + glScissor(clipArea.x, mWindow->h - clipArea.y - clipArea.height, clipArea.width, clipArea.height); return result; @@ -1192,7 +1192,7 @@ void NormalOpenGLGraphics::popClipArea() glPopMatrix(); const gcn::ClipRectangle &clipArea = mClipStack.top(); - glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + glScissor(clipArea.x, mWindow->h - clipArea.y - clipArea.height, clipArea.width, clipArea.height); } diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index 1292baeb7..dd1f7aef3 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -228,7 +228,7 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) return nullptr; SDLGraphics *const graphics = new SDLGraphics(); - graphics->setTarget(surface); + graphics->setWindow(surface); graphics->_beginDraw(); // drawing SDL images to surface diff --git a/src/safeopenglgraphics.cpp b/src/safeopenglgraphics.cpp index dd66011a9..4411c5130 100644 --- a/src/safeopenglgraphics.cpp +++ b/src/safeopenglgraphics.cpp @@ -397,8 +397,8 @@ void SafeOpenGLGraphics::_beginDraw() glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glOrtho(0.0, static_cast<double>(mTarget->w), - static_cast<double>(mTarget->h), 0.0, -1.0, 1.0); + glOrtho(0.0, static_cast<double>(mWindow->w), + static_cast<double>(mWindow->h), 0.0, -1.0, 1.0); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -416,7 +416,7 @@ void SafeOpenGLGraphics::_beginDraw() glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - pushClipArea(gcn::Rectangle(0, 0, mTarget->w, mTarget->h)); + pushClipArea(gcn::Rectangle(0, 0, mWindow->w, mWindow->h)); } void SafeOpenGLGraphics::_endDraw() @@ -427,13 +427,13 @@ void SafeOpenGLGraphics::_endDraw() void SafeOpenGLGraphics::prepareScreenshot() { if (config.getBoolValue("usefbo")) - graphicsManager.createFBO(mTarget->w, mTarget->h, &mFbo); + graphicsManager.createFBO(mWindow->w, mWindow->h, &mFbo); } SDL_Surface* SafeOpenGLGraphics::getScreenshot() { - const int h = mTarget->h; - const int w = mTarget->w - (mTarget->w % 4); + const int h = mWindow->h; + const int w = mWindow->w - (mWindow->w % 4); GLint pack = 1; SDL_Surface *const screenshot = SDL_CreateRGBSurface( @@ -500,7 +500,7 @@ bool SafeOpenGLGraphics::pushClipArea(gcn::Rectangle area) glPushMatrix(); glTranslatef(static_cast<GLfloat>(transX), static_cast<GLfloat>(transY), 0); - glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + glScissor(clipArea.x, mWindow->h - clipArea.y - clipArea.height, clipArea.width, clipArea.height); return result; @@ -515,7 +515,7 @@ void SafeOpenGLGraphics::popClipArea() glPopMatrix(); const gcn::ClipRectangle &clipArea = mClipStack.top(); - glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height, + glScissor(clipArea.x, mWindow->h - clipArea.y - clipArea.height, clipArea.width, clipArea.height); } diff --git a/src/sdl2graphics.cpp b/src/sdl2graphics.cpp index 18b8b8e2e..d5e984700 100644 --- a/src/sdl2graphics.cpp +++ b/src/sdl2graphics.cpp @@ -72,7 +72,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image, int srcX, int srcY { FUNC_BLOCK("Graphics::drawRescaledImage", 1) // Check that preconditions for blitting are met. - if (!mTarget || !image) + if (!mWindow || !image) return false; if (!image->mSDLSurface) return false; @@ -101,7 +101,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image, int srcX, int srcY srcRect.h = static_cast<uint16_t>(height); const bool returnValue = !(SDL_BlitSurface(tmpImage->mSDLSurface, - &srcRect, mTarget, &dstRect) < 0); + &srcRect, mWindow, &dstRect) < 0); delete tmpImage; @@ -114,7 +114,7 @@ bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY, { FUNC_BLOCK("Graphics::drawImage2", 1) // Check that preconditions for blitting are met. - if (!mTarget || !image || !image->mSDLSurface) + if (!mWindow || !image || !image->mSDLSurface) return false; dstX += mClipStack.top().xOffset; @@ -135,12 +135,12 @@ bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY, if (mBlitMode == BLIT_NORMAL) { return !(SDL_BlitSurface(image->mSDLSurface, &srcRect, - mTarget, &dstRect) < 0); + mWindow, &dstRect) < 0); } else { return !(SDL_gfxBlitRGBA(image->mSDLSurface, &srcRect, - mTarget, &dstRect) < 0); + mWindow, &dstRect) < 0); } } @@ -150,7 +150,7 @@ void SDLGraphics::drawImagePattern(const Image *const image, { FUNC_BLOCK("Graphics::drawImagePattern", 1) // Check that preconditions for blitting are met. - if (!mTarget || !image) + if (!mWindow || !image) return; if (!image->mSDLSurface) return; @@ -182,7 +182,7 @@ void SDLGraphics::drawImagePattern(const Image *const image, srcRect.w = static_cast<uint16_t>(dw); srcRect.h = static_cast<uint16_t>(dh); - SDL_BlitSurface(image->mSDLSurface, &srcRect, mTarget, &dstRect); + SDL_BlitSurface(image->mSDLSurface, &srcRect, mWindow, &dstRect); } } } @@ -194,7 +194,7 @@ void SDLGraphics::drawRescaledImagePattern(const Image *const image, const int scaledHeight) { // Check that preconditions for blitting are met. - if (!mTarget || !image) + if (!mWindow || !image) return; if (!image->mSDLSurface) return; @@ -235,7 +235,7 @@ void SDLGraphics::drawRescaledImagePattern(const Image *const image, srcRect.h = static_cast<uint16_t>(dh); SDL_BlitSurface(tmpImage->mSDLSurface, &srcRect, - mTarget, &dstRect); + mWindow, &dstRect); } } @@ -248,7 +248,7 @@ void SDLGraphics::calcImagePattern(ImageVertexes* const vert, const int w, const int h) const { // Check that preconditions for blitting are met. - if (!vert || !mTarget || !image || !image->mSDLSurface) + if (!vert || !mWindow || !image || !image->mSDLSurface) return; const int iw = image->mBounds.w; @@ -280,7 +280,7 @@ void SDLGraphics::calcImagePattern(ImageVertexes* const vert, srcRect.h = static_cast<uint16_t>(dh); if (SDL_FakeUpperBlit(image->mSDLSurface, &srcRect, - mTarget, &dstRect) == 1) + mWindow, &dstRect) == 1) { vert->sdl.push_back(r); } @@ -342,7 +342,7 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const rect->src.w = static_cast<uint16_t>(image->mBounds.w); rect->src.h = static_cast<uint16_t>(image->mBounds.h); if (SDL_FakeUpperBlit(image->mSDLSurface, &rect->src, - mTarget, &rect->dst) == 1) + mWindow, &rect->dst) == 1) { vert->sdl.push_back(rect); } @@ -385,7 +385,7 @@ void SDLGraphics::drawTile(const ImageCollection *const vertCol) while (it2 != it2_end) { SDL_LowerBlit(img->mSDLSurface, &(*it2)->src, - mTarget, &(*it2)->dst); + mWindow, &(*it2)->dst); ++ it2; } } @@ -400,7 +400,7 @@ void SDLGraphics::drawTile(const ImageVertexes *const vert) const DoubleRects::const_iterator it_end = rects->end(); while (it != it_end) { - SDL_LowerBlit(img->mSDLSurface, &(*it)->src, mTarget, &(*it)->dst); + SDL_LowerBlit(img->mSDLSurface, &(*it)->src, mWindow, &(*it)->dst); ++ it; } } @@ -410,12 +410,12 @@ void SDLGraphics::updateScreen() BLOCK_START("Graphics::updateScreen") if (mDoubleBuffer) { - SDL_Flip(mTarget); + SDL_Flip(mWindow); } else { - SDL_UpdateRects(mTarget, 1, &mRect); -// SDL_UpdateRect(mTarget, 0, 0, 0, 0); + SDL_UpdateRects(mWindow, 1, &mRect); +// SDL_UpdateRect(mWindow, 0, 0, 0, 0); } BLOCK_END("Graphics::updateScreen") } @@ -434,10 +434,10 @@ SDL_Surface *SDLGraphics::getScreenshot() const int amask = 0x00000000; SDL_Surface *const screenshot = SDL_CreateRGBSurface(SDL_SWSURFACE, - mTarget->w, mTarget->h, 24, rmask, gmask, bmask, amask); + mWindow->w, mWindow->h, 24, rmask, gmask, bmask, amask); if (screenshot) - SDL_BlitSurface(mTarget, nullptr, screenshot, nullptr); + SDL_BlitSurface(mWindow, nullptr, screenshot, nullptr); return screenshot; } @@ -609,10 +609,10 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) area.y + area.height : top.y + top.height; int x, y; - SDL_LockSurface(mTarget); + SDL_LockSurface(mWindow); - const int bpp = mTarget->format->BytesPerPixel; - const uint32_t pixel = SDL_MapRGB(mTarget->format, + const int bpp = mWindow->format->BytesPerPixel; + const uint32_t pixel = SDL_MapRGB(mWindow->format, static_cast<uint8_t>(mColor.r), static_cast<uint8_t>(mColor.g), static_cast<uint8_t>(mColor.b)); @@ -621,8 +621,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) case 1: for (y = y1; y < y2; y++) { - uint8_t *const p = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) *(p + x) = static_cast<uint8_t>(pixel); } @@ -630,15 +630,15 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) case 2: for (y = y1; y < y2; y++) { - uint8_t *const p0 = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p0 = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; *reinterpret_cast<uint16_t *>(p) = gcn::SDLAlpha16( static_cast<uint16_t>(pixel), *reinterpret_cast<uint16_t *>(p), - static_cast<uint8_t>(mColor.a), mTarget->format); + static_cast<uint8_t>(mColor.a), mWindow->format); } } break; @@ -651,8 +651,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (y = y1; y < y2; y++) { - uint8_t *const p0 = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p0 = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 3; @@ -679,8 +679,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (y = y1; y < y2; y++) { - uint8_t *const p0 = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p0 = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) { uint8_t *p = p0 + x * 4; @@ -704,7 +704,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) mOldAlpha = mColor.a; } - const SDL_PixelFormat * const format = mTarget->format; + const SDL_PixelFormat * const format = mWindow->format; const unsigned rMask = format->Rmask; const unsigned gMask = format->Gmask; const unsigned bMask = format->Bmask; @@ -743,8 +743,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (y = y1; y < y2; y++) { uint32_t *const p0 = reinterpret_cast<uint32_t*>( - static_cast<uint8_t*>(mTarget->pixels) - + y * mTarget->pitch); + static_cast<uint8_t*>(mWindow->pixels) + + y * mWindow->pitch); for (x = x1; x < x2; x++) { uint32_t *const p = p0 + x; @@ -761,7 +761,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) break; } - SDL_UnlockSurface(mTarget); + SDL_UnlockSurface(mWindow); } else { @@ -771,18 +771,18 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) rect.w = static_cast<uint16_t>(area.width); rect.h = static_cast<uint16_t>(area.height); - const uint32_t color = SDL_MapRGBA(mTarget->format, + const uint32_t color = SDL_MapRGBA(mWindow->format, static_cast<int8_t>(mColor.r), static_cast<int8_t>(mColor.g), static_cast<int8_t>(mColor.b), static_cast<int8_t>(mColor.a)); - SDL_FillRect(mTarget, &rect, color); + SDL_FillRect(mWindow, &rect, color); } } void SDLGraphics::_beginDraw() { - pushClipArea(gcn::Rectangle(0, 0, mTarget->w, mTarget->h)); + pushClipArea(gcn::Rectangle(0, 0, mWindow->w, mWindow->h)); } void SDLGraphics::_endDraw() @@ -800,7 +800,7 @@ bool SDLGraphics::pushClipArea(gcn::Rectangle area) 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_SetClipRect(mWindow, &rect); return result; } @@ -819,7 +819,7 @@ void SDLGraphics::popClipArea() rect.w = static_cast<int16_t>(carea.width); rect.h = static_cast<int16_t>(carea.height); - SDL_SetClipRect(mTarget, &rect); + SDL_SetClipRect(mWindow, &rect); } void SDLGraphics::drawPoint(int x, int y) @@ -836,9 +836,9 @@ void SDLGraphics::drawPoint(int x, int y) return; if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); + SDLputPixelAlpha(mWindow, x, y, mColor); else - SDLputPixel(mTarget, x, y, mColor); + SDLputPixel(mWindow, x, y, mColor); } void SDLGraphics::drawHLine(int x1, int y, int x2) @@ -882,14 +882,14 @@ void SDLGraphics::drawHLine(int x1, int y, int x2) x2 = sumX -1; } - const int bpp = mTarget->format->BytesPerPixel; + const int bpp = mWindow->format->BytesPerPixel; - SDL_LockSurface(mTarget); + SDL_LockSurface(mWindow); - uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) - + y * mTarget->pitch + x1 * bpp; + uint8_t *p = static_cast<uint8_t*>(mWindow->pixels) + + y * mWindow->pitch + x1 * bpp; - const uint32_t pixel = SDL_MapRGB(mTarget->format, + const uint32_t pixel = SDL_MapRGB(mWindow->format, static_cast<uint8_t>(mColor.r), static_cast<uint8_t>(mColor.g), static_cast<uint8_t>(mColor.b)); @@ -964,7 +964,7 @@ void SDLGraphics::drawHLine(int x1, int y, int x2) break; } // end switch - SDL_UnlockSurface(mTarget); + SDL_UnlockSurface(mWindow); } void SDLGraphics::drawVLine(int x, int y1, int y2) @@ -1006,19 +1006,19 @@ void SDLGraphics::drawVLine(int x, int y1, int y2) y2 = sumY - 1; } - const int bpp = mTarget->format->BytesPerPixel; + const int bpp = mWindow->format->BytesPerPixel; - SDL_LockSurface(mTarget); + SDL_LockSurface(mWindow); - uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) - + y1 * mTarget->pitch + x * bpp; + uint8_t *p = static_cast<uint8_t*>(mWindow->pixels) + + y1 * mWindow->pitch + x * bpp; - const uint32_t pixel = SDL_MapRGB(mTarget->format, + const uint32_t pixel = SDL_MapRGB(mWindow->format, static_cast<uint8_t>(mColor.r), static_cast<uint8_t>(mColor.g), static_cast<uint8_t>(mColor.b)); - const int pitch = mTarget->pitch; + const int pitch = mWindow->pitch; switch (bpp) { case 1: @@ -1099,7 +1099,7 @@ void SDLGraphics::drawVLine(int x, int y1, int y2) break; } // end switch - SDL_UnlockSurface(mTarget); + SDL_UnlockSurface(mWindow); } void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle) @@ -1138,11 +1138,11 @@ bool SDLGraphics::setVideoMode(const int w, const int h, const int bpp, { setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame); - if (!(mTarget = SDL_SetVideoMode(w, h, bpp, getSoftwareFlags()))) + if (!(mWindow = SDL_SetVideoMode(w, h, bpp, getSoftwareFlags()))) return false; - mRect.w = static_cast<uint16_t>(mTarget->w); - mRect.h = static_cast<uint16_t>(mTarget->h); + mRect.w = static_cast<uint16_t>(mWindow->w); + mRect.h = static_cast<uint16_t>(mWindow->h); return videoInfo(); } diff --git a/src/sdlgraphics.cpp b/src/sdlgraphics.cpp index 6505ccdcf..75cb7883d 100644 --- a/src/sdlgraphics.cpp +++ b/src/sdlgraphics.cpp @@ -72,7 +72,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image, int srcX, int srcY { FUNC_BLOCK("Graphics::drawRescaledImage", 1) // Check that preconditions for blitting are met. - if (!mTarget || !image) + if (!mWindow || !image) return false; if (!image->mSDLSurface) return false; @@ -101,7 +101,7 @@ bool SDLGraphics::drawRescaledImage(const Image *const image, int srcX, int srcY srcRect.h = static_cast<uint16_t>(height); const bool returnValue = !(SDL_BlitSurface(tmpImage->mSDLSurface, - &srcRect, mTarget, &dstRect) < 0); + &srcRect, mWindow, &dstRect) < 0); delete tmpImage; @@ -114,7 +114,7 @@ bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY, { FUNC_BLOCK("Graphics::drawImage2", 1) // Check that preconditions for blitting are met. - if (!mTarget || !image || !image->mSDLSurface) + if (!mWindow || !image || !image->mSDLSurface) return false; dstX += mClipStack.top().xOffset; @@ -135,12 +135,12 @@ bool SDLGraphics::drawImage2(const Image *const image, int srcX, int srcY, if (mBlitMode == BLIT_NORMAL) { return !(SDL_BlitSurface(image->mSDLSurface, &srcRect, - mTarget, &dstRect) < 0); + mWindow, &dstRect) < 0); } else { return !(SDL_gfxBlitRGBA(image->mSDLSurface, &srcRect, - mTarget, &dstRect) < 0); + mWindow, &dstRect) < 0); } } @@ -150,7 +150,7 @@ void SDLGraphics::drawImagePattern(const Image *const image, { FUNC_BLOCK("Graphics::drawImagePattern", 1) // Check that preconditions for blitting are met. - if (!mTarget || !image) + if (!mWindow || !image) return; if (!image->mSDLSurface) return; @@ -182,7 +182,7 @@ void SDLGraphics::drawImagePattern(const Image *const image, srcRect.w = static_cast<uint16_t>(dw); srcRect.h = static_cast<uint16_t>(dh); - SDL_BlitSurface(image->mSDLSurface, &srcRect, mTarget, &dstRect); + SDL_BlitSurface(image->mSDLSurface, &srcRect, mWindow, &dstRect); } } } @@ -194,7 +194,7 @@ void SDLGraphics::drawRescaledImagePattern(const Image *const image, const int scaledHeight) { // Check that preconditions for blitting are met. - if (!mTarget || !image) + if (!mWindow || !image) return; if (!image->mSDLSurface) return; @@ -235,7 +235,7 @@ void SDLGraphics::drawRescaledImagePattern(const Image *const image, srcRect.h = static_cast<uint16_t>(dh); SDL_BlitSurface(tmpImage->mSDLSurface, &srcRect, - mTarget, &dstRect); + mWindow, &dstRect); } } @@ -248,7 +248,7 @@ void SDLGraphics::calcImagePattern(ImageVertexes* const vert, const int w, const int h) const { // Check that preconditions for blitting are met. - if (!vert || !mTarget || !image || !image->mSDLSurface) + if (!vert || !mWindow || !image || !image->mSDLSurface) return; const int iw = image->mBounds.w; @@ -280,7 +280,7 @@ void SDLGraphics::calcImagePattern(ImageVertexes* const vert, srcRect.h = static_cast<uint16_t>(dh); if (SDL_FakeUpperBlit(image->mSDLSurface, &srcRect, - mTarget, &dstRect) == 1) + mWindow, &dstRect) == 1) { vert->sdl.push_back(r); } @@ -342,7 +342,7 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const rect->src.w = static_cast<uint16_t>(image->mBounds.w); rect->src.h = static_cast<uint16_t>(image->mBounds.h); if (SDL_FakeUpperBlit(image->mSDLSurface, &rect->src, - mTarget, &rect->dst) == 1) + mWindow, &rect->dst) == 1) { vert->sdl.push_back(rect); } @@ -385,7 +385,7 @@ void SDLGraphics::drawTile(const ImageCollection *const vertCol) while (it2 != it2_end) { SDL_LowerBlit(img->mSDLSurface, &(*it2)->src, - mTarget, &(*it2)->dst); + mWindow, &(*it2)->dst); ++ it2; } } @@ -400,7 +400,7 @@ void SDLGraphics::drawTile(const ImageVertexes *const vert) const DoubleRects::const_iterator it_end = rects->end(); while (it != it_end) { - SDL_LowerBlit(img->mSDLSurface, &(*it)->src, mTarget, &(*it)->dst); + SDL_LowerBlit(img->mSDLSurface, &(*it)->src, mWindow, &(*it)->dst); ++ it; } } @@ -410,12 +410,12 @@ void SDLGraphics::updateScreen() BLOCK_START("Graphics::updateScreen") if (mDoubleBuffer) { - SDL_Flip(mTarget); + SDL_Flip(mWindow); } else { - SDL_UpdateRects(mTarget, 1, &mRect); -// SDL_UpdateRect(mTarget, 0, 0, 0, 0); + SDL_UpdateRects(mWindow, 1, &mRect); +// SDL_UpdateRect(mWindow, 0, 0, 0, 0); } BLOCK_END("Graphics::updateScreen") } @@ -434,10 +434,10 @@ SDL_Surface *SDLGraphics::getScreenshot() const int amask = 0x00000000; SDL_Surface *const screenshot = SDL_CreateRGBSurface(SDL_SWSURFACE, - mTarget->w, mTarget->h, 24, rmask, gmask, bmask, amask); + mWindow->w, mWindow->h, 24, rmask, gmask, bmask, amask); if (screenshot) - SDL_BlitSurface(mTarget, nullptr, screenshot, nullptr); + SDL_BlitSurface(mWindow, nullptr, screenshot, nullptr); return screenshot; } @@ -609,10 +609,10 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) area.y + area.height : top.y + top.height; int x, y; - SDL_LockSurface(mTarget); + SDL_LockSurface(mWindow); - const int bpp = mTarget->format->BytesPerPixel; - const uint32_t pixel = SDL_MapRGB(mTarget->format, + const int bpp = mWindow->format->BytesPerPixel; + const uint32_t pixel = SDL_MapRGB(mWindow->format, static_cast<uint8_t>(mColor.r), static_cast<uint8_t>(mColor.g), static_cast<uint8_t>(mColor.b)); @@ -621,8 +621,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) case 1: for (y = y1; y < y2; y++) { - uint8_t *const p = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) *(p + x) = static_cast<uint8_t>(pixel); } @@ -630,15 +630,15 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) case 2: for (y = y1; y < y2; y++) { - uint8_t *const p0 = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p0 = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; *reinterpret_cast<uint16_t *>(p) = gcn::SDLAlpha16( static_cast<uint16_t>(pixel), *reinterpret_cast<uint16_t *>(p), - static_cast<uint8_t>(mColor.a), mTarget->format); + static_cast<uint8_t>(mColor.a), mWindow->format); } } break; @@ -651,8 +651,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (y = y1; y < y2; y++) { - uint8_t *const p0 = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p0 = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 3; @@ -679,8 +679,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (y = y1; y < y2; y++) { - uint8_t *const p0 = static_cast<uint8_t *>(mTarget->pixels) - + y * mTarget->pitch; + uint8_t *const p0 = static_cast<uint8_t *>(mWindow->pixels) + + y * mWindow->pitch; for (x = x1; x < x2; x++) { uint8_t *p = p0 + x * 4; @@ -704,7 +704,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) mOldAlpha = mColor.a; } - const SDL_PixelFormat * const format = mTarget->format; + const SDL_PixelFormat * const format = mWindow->format; const unsigned rMask = format->Rmask; const unsigned gMask = format->Gmask; const unsigned bMask = format->Bmask; @@ -743,8 +743,8 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (y = y1; y < y2; y++) { uint32_t *const p0 = reinterpret_cast<uint32_t*>( - static_cast<uint8_t*>(mTarget->pixels) - + y * mTarget->pitch); + static_cast<uint8_t*>(mWindow->pixels) + + y * mWindow->pitch); for (x = x1; x < x2; x++) { uint32_t *const p = p0 + x; @@ -761,7 +761,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) break; } - SDL_UnlockSurface(mTarget); + SDL_UnlockSurface(mWindow); } else { @@ -771,18 +771,18 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) rect.w = static_cast<uint16_t>(area.width); rect.h = static_cast<uint16_t>(area.height); - const uint32_t color = SDL_MapRGBA(mTarget->format, + const uint32_t color = SDL_MapRGBA(mWindow->format, static_cast<int8_t>(mColor.r), static_cast<int8_t>(mColor.g), static_cast<int8_t>(mColor.b), static_cast<int8_t>(mColor.a)); - SDL_FillRect(mTarget, &rect, color); + SDL_FillRect(mWindow, &rect, color); } } void SDLGraphics::_beginDraw() { - pushClipArea(gcn::Rectangle(0, 0, mTarget->w, mTarget->h)); + pushClipArea(gcn::Rectangle(0, 0, mWindow->w, mWindow->h)); } void SDLGraphics::_endDraw() @@ -800,7 +800,7 @@ bool SDLGraphics::pushClipArea(gcn::Rectangle area) 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_SetClipRect(mWindow, &rect); return result; } @@ -819,7 +819,7 @@ void SDLGraphics::popClipArea() rect.w = static_cast<int16_t>(carea.width); rect.h = static_cast<int16_t>(carea.height); - SDL_SetClipRect(mTarget, &rect); + SDL_SetClipRect(mWindow, &rect); } void SDLGraphics::drawPoint(int x, int y) @@ -836,9 +836,9 @@ void SDLGraphics::drawPoint(int x, int y) return; if (mAlpha) - SDLputPixelAlpha(mTarget, x, y, mColor); + SDLputPixelAlpha(mWindow, x, y, mColor); else - SDLputPixel(mTarget, x, y, mColor); + SDLputPixel(mWindow, x, y, mColor); } void SDLGraphics::drawHLine(int x1, int y, int x2) @@ -882,14 +882,14 @@ void SDLGraphics::drawHLine(int x1, int y, int x2) x2 = sumX -1; } - const int bpp = mTarget->format->BytesPerPixel; + const int bpp = mWindow->format->BytesPerPixel; - SDL_LockSurface(mTarget); + SDL_LockSurface(mWindow); - uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) - + y * mTarget->pitch + x1 * bpp; + uint8_t *p = static_cast<uint8_t*>(mWindow->pixels) + + y * mWindow->pitch + x1 * bpp; - const uint32_t pixel = SDL_MapRGB(mTarget->format, + const uint32_t pixel = SDL_MapRGB(mWindow->format, static_cast<uint8_t>(mColor.r), static_cast<uint8_t>(mColor.g), static_cast<uint8_t>(mColor.b)); @@ -964,7 +964,7 @@ void SDLGraphics::drawHLine(int x1, int y, int x2) break; } // end switch - SDL_UnlockSurface(mTarget); + SDL_UnlockSurface(mWindow); } void SDLGraphics::drawVLine(int x, int y1, int y2) @@ -1006,19 +1006,19 @@ void SDLGraphics::drawVLine(int x, int y1, int y2) y2 = sumY - 1; } - const int bpp = mTarget->format->BytesPerPixel; + const int bpp = mWindow->format->BytesPerPixel; - SDL_LockSurface(mTarget); + SDL_LockSurface(mWindow); - uint8_t *p = static_cast<uint8_t*>(mTarget->pixels) - + y1 * mTarget->pitch + x * bpp; + uint8_t *p = static_cast<uint8_t*>(mWindow->pixels) + + y1 * mWindow->pitch + x * bpp; - const uint32_t pixel = SDL_MapRGB(mTarget->format, + const uint32_t pixel = SDL_MapRGB(mWindow->format, static_cast<uint8_t>(mColor.r), static_cast<uint8_t>(mColor.g), static_cast<uint8_t>(mColor.b)); - const int pitch = mTarget->pitch; + const int pitch = mWindow->pitch; switch (bpp) { case 1: @@ -1099,7 +1099,7 @@ void SDLGraphics::drawVLine(int x, int y1, int y2) break; } // end switch - SDL_UnlockSurface(mTarget); + SDL_UnlockSurface(mWindow); } void SDLGraphics::drawRectangle(const gcn::Rectangle &rectangle) @@ -1138,11 +1138,11 @@ bool SDLGraphics::setVideoMode(const int w, const int h, const int bpp, { setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame); - if (!(mTarget = SDL_SetVideoMode(w, h, bpp, getSoftwareFlags()))) + if (!(mWindow = SDL_SetVideoMode(w, h, bpp, getSoftwareFlags()))) return false; - mRect.w = static_cast<uint16_t>(mTarget->w); - mRect.h = static_cast<uint16_t>(mTarget->h); + mRect.w = static_cast<uint16_t>(mWindow->w); + mRect.h = static_cast<uint16_t>(mWindow->h); return videoInfo(); } |