From bbed1413d3ea2ef67f7fd7db146c372a7181ad43 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 30 Dec 2013 20:04:35 +0300 Subject: add calcImageRect into each renderer. but copy function body to shared file. --- src/render/sdlgraphics.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/render/sdlgraphics.cpp') diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 2f13f53f0..ed2f08c4d 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -789,7 +789,7 @@ bool SDLGraphics::drawNet(const int x1, const int y1, return true; } -bool SDLGraphics::calcWindow(ImageCollection *const vertCol, +void SDLGraphics::calcWindow(ImageCollection *const vertCol, const int x, const int y, const int w, const int h, const ImageRect &imgRect) @@ -808,9 +808,7 @@ bool SDLGraphics::calcWindow(ImageCollection *const vertCol, { vert = vertCol->currentVert; } - - const Image *const *const grid = &imgRect.grid[0]; - return calcImageRect(vert, x, y, w, h, imgRect); + calcImageRect(vert, x, y, w, h, imgRect); } int SDLGraphics::SDL_FakeUpperBlit(const SDL_Surface *const src, @@ -1472,4 +1470,12 @@ void SDLGraphics::drawImageRect(const int x, const int y, #include "render/openglgraphics_drawImageRect.hpp" } +void SDLGraphics::calcImageRect(ImageVertexes *const vert, + const int x, const int y, + const int w, const int h, + const ImageRect &imgRect) +{ + #include "render/openglgraphics_calcImageRect.hpp" +} + #endif // USE_SDL2 -- cgit v1.2.3-60-g2f50