From 53d28e67f8b7966596818af7cbfd360df241b332 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 15 Dec 2013 00:23:39 +0300 Subject: rename calcTile methods into separate names calcTileVertexes, calTileCollection. --- src/render/graphics.cpp | 8 ++++---- src/render/graphics.h | 12 ++++++------ src/render/mobileopenglgraphics.cpp | 16 ++++++++-------- src/render/mobileopenglgraphics.h | 10 ++++++---- src/render/normalopenglgraphics.cpp | 16 ++++++++-------- src/render/normalopenglgraphics.h | 10 ++++++---- src/render/nullopenglgraphics.cpp | 16 ++++++++-------- src/render/nullopenglgraphics.h | 10 ++++++---- src/render/safeopenglgraphics.cpp | 13 +++++++------ src/render/safeopenglgraphics.h | 10 ++++++---- src/render/sdl2graphics.cpp | 12 ++++++------ src/render/sdl2graphics.h | 12 ++++++------ src/render/sdl2softwaregraphics.cpp | 12 ++++++------ src/render/sdl2softwaregraphics.h | 12 ++++++------ src/render/sdlgraphics.cpp | 12 ++++++------ src/render/sdlgraphics.h | 12 ++++++------ src/render/surfacegraphics.h | 13 +++++++------ 17 files changed, 108 insertions(+), 98 deletions(-) (limited to 'src/render') diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp index 561ce3a90..8508b9eec 100644 --- a/src/render/graphics.cpp +++ b/src/render/graphics.cpp @@ -569,14 +569,14 @@ bool Graphics::calcImageRect(ImageVertexes *const vert, calcImagePattern(vert, right, x + w - rw, y + th, rw, h - th - bh); } - calcTile(vert, topLeft, x, y); + calcTileVertexes(vert, topLeft, x, y); if (topRight) - calcTile(vert, topRight, x + w - topRight->getWidth(), y); + calcTileVertexes(vert, topRight, x + w - topRight->getWidth(), y); if (bottomLeft) - calcTile(vert, bottomLeft, x, y + h - bottomLeft->getHeight()); + calcTileVertexes(vert, bottomLeft, x, y + h - bottomLeft->getHeight()); if (bottomRight) { - calcTile(vert, bottomRight, x + w - bottomRight->getWidth(), + calcTileVertexes(vert, bottomRight, x + w - bottomRight->getWidth(), y + h - bottomRight->getHeight()); } diff --git a/src/render/graphics.h b/src/render/graphics.h index cb009291b..d55b326aa 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -234,9 +234,9 @@ class Graphics : public gcn::Graphics const int x, const int y, const int w, const int h) const = 0; - virtual void calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const = 0; + virtual void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const = 0; virtual void calcTileSDL(ImageVertexes *const vert A_UNUSED, int x A_UNUSED, int y A_UNUSED) const @@ -247,9 +247,9 @@ class Graphics : public gcn::Graphics virtual void drawTile(const ImageCollection *const vertCol) = 0; - virtual void calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) = 0; + virtual void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) = 0; virtual bool calcWindow(ImageCollection *const vertCol, const int x, const int y, diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index eee4b9b0c..f8a3fd91e 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -623,9 +623,9 @@ void MobileOpenGLGraphics::calcImagePattern(ImageVertexes *const vert, ogl.switchVp(vp); } -void MobileOpenGLGraphics::calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) +void MobileOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) { if (vertCol->currentGLImage != image->mGLImage) { @@ -634,11 +634,11 @@ void MobileOpenGLGraphics::calcTile(ImageCollection *const vertCol, vertCol->currentVert = vert; vert->image = image; vertCol->draws.push_back(vert); - calcTile(vert, image, x, y); + calcTileVertexes(vert, image, x, y); } else { - calcTile(vertCol->currentVert, image, x, y); + calcTileVertexes(vertCol->currentVert, image, x, y); } } @@ -683,9 +683,9 @@ void MobileOpenGLGraphics::calcImagePattern(ImageCollection* const vertCol, calcImagePattern(vert, image, x, y, w, h); } -void MobileOpenGLGraphics::calcTile(ImageVertexes *const vert, - const Image *const image, - int dstX, int dstY) const +void MobileOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int dstX, int dstY) const { if (!vert || !image) return; diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h index 55283010e..dd285fdee 100644 --- a/src/render/mobileopenglgraphics.h +++ b/src/render/mobileopenglgraphics.h @@ -105,13 +105,15 @@ class MobileOpenGLGraphics final : public Graphics const int x, const int y, const int w, const int h) const override final; - void calcTile(ImageVertexes *const vert, const Image *const image, - int x, int y) const override final; + void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; void drawTile(const ImageCollection *const vertCol) override final; - void calcTile(ImageCollection *const vertCol, - const Image *const image, int x, int y) override final; + void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; void drawTile(const ImageVertexes *const vert) override final; diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index f837d1928..dd0d75871 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -797,9 +797,9 @@ void NormalOpenGLGraphics::calcImagePattern(ImageVertexes* const vert, ogl.switchVp(vp); } -void NormalOpenGLGraphics::calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) +void NormalOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) { if (vertCol->currentGLImage != image->mGLImage) { @@ -808,11 +808,11 @@ void NormalOpenGLGraphics::calcTile(ImageCollection *const vertCol, vertCol->currentVert = vert; vert->image = image; vertCol->draws.push_back(vert); - calcTile(vert, image, x, y); + calcTileVertexes(vert, image, x, y); } else { - calcTile(vertCol->currentVert, image, x, y); + calcTileVertexes(vertCol->currentVert, image, x, y); } } @@ -857,9 +857,9 @@ void NormalOpenGLGraphics::calcImagePattern(ImageCollection* const vertCol, calcImagePattern(vert, image, x, y, w, h); } -void NormalOpenGLGraphics::calcTile(ImageVertexes *const vert, - const Image *const image, - int dstX, int dstY) const +void NormalOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int dstX, int dstY) const { if (!vert || !image) return; diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h index 3af6ad00a..8fc127dbe 100644 --- a/src/render/normalopenglgraphics.h +++ b/src/render/normalopenglgraphics.h @@ -105,11 +105,13 @@ class NormalOpenGLGraphics final : public Graphics const int x, const int y, const int w, const int h) const override final; - void calcTile(ImageVertexes *const vert, const Image *const image, - int x, int y) const override final; + void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; - void calcTile(ImageCollection *const vertCol, - const Image *const image, int x, int y) override final; + void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; void drawTile(const ImageCollection *const vertCol) override final; diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index d1d157503..2c433d804 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -700,9 +700,9 @@ void NullOpenGLGraphics::calcImagePattern(ImageVertexes* const vert, ogl.switchVp(vp); } -void NullOpenGLGraphics::calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) +void NullOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) { if (vertCol->currentGLImage != image->mGLImage) { @@ -711,11 +711,11 @@ void NullOpenGLGraphics::calcTile(ImageCollection *const vertCol, vertCol->currentVert = vert; vert->image = image; vertCol->draws.push_back(vert); - calcTile(vert, image, x, y); + calcTileVertexes(vert, image, x, y); } else { - calcTile(vertCol->currentVert, image, x, y); + calcTileVertexes(vertCol->currentVert, image, x, y); } } @@ -760,9 +760,9 @@ void NullOpenGLGraphics::calcImagePattern(ImageCollection* const vertCol, calcImagePattern(vert, image, x, y, w, h); } -void NullOpenGLGraphics::calcTile(ImageVertexes *const vert, - const Image *const image, - int dstX, int dstY) const +void NullOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int dstX, int dstY) const { if (!vert || !image) return; diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h index 620baa59d..94cda7bb3 100644 --- a/src/render/nullopenglgraphics.h +++ b/src/render/nullopenglgraphics.h @@ -105,11 +105,13 @@ class NullOpenGLGraphics final : public Graphics const int x, const int y, const int w, const int h) const override final; - void calcTile(ImageVertexes *const vert, const Image *const image, - int x, int y) const override final; + void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; - void calcTile(ImageCollection *const vertCol, - const Image *const image, int x, int y) override final; + void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; void drawTile(const ImageCollection *const vertCol) override final; diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index cc56e4b89..7c1ac0fe4 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -326,15 +326,16 @@ void SafeOpenGLGraphics::drawRescaledImagePattern(const Image *const image, glEnd(); } -void SafeOpenGLGraphics::calcTile(ImageCollection *const vertCol A_UNUSED, - const Image *const image A_UNUSED, - int x A_UNUSED, int y A_UNUSED) +void SafeOpenGLGraphics::calcTileCollection(ImageCollection *const + vertCol A_UNUSED, + const Image *const image A_UNUSED, + int x A_UNUSED, int y A_UNUSED) { } -void SafeOpenGLGraphics::calcTile(ImageVertexes *const vert A_UNUSED, - const Image *const image A_UNUSED, - int x A_UNUSED, int y A_UNUSED) const +void SafeOpenGLGraphics::calcTileVertexes(ImageVertexes *const vert A_UNUSED, + const Image *const image A_UNUSED, + int x A_UNUSED, int y A_UNUSED) const { } diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h index 6ece1bc88..a9f70f0c0 100644 --- a/src/render/safeopenglgraphics.h +++ b/src/render/safeopenglgraphics.h @@ -88,11 +88,13 @@ class SafeOpenGLGraphics final : public Graphics const int scaledWidth, const int scaledHeight) override final; - void calcTile(ImageVertexes *const vert, const Image *const image, - int x, int y) const override final; + void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; - void calcTile(ImageCollection *const vertCol, - const Image *const image, int x, int y) override final; + void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; void calcImagePattern(ImageVertexes *const vert, const Image *const image, diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index ff8da65c9..7169ee9eb 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -326,9 +326,9 @@ void SDLGraphics::calcImagePattern(ImageCollection* const vertCol, calcImagePattern(vert, image, x, y, w, h); } -void SDLGraphics::calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const +void SDLGraphics::calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const { vert->image = image; calcTileSDL(vert, x, y); @@ -366,9 +366,9 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const vert->sdl.push_back(rect); } -void SDLGraphics::calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) +void SDLGraphics::calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) { if (vertCol->currentImage != image) { diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h index 57e60135f..2a8fd7047 100644 --- a/src/render/sdl2graphics.h +++ b/src/render/sdl2graphics.h @@ -95,16 +95,16 @@ class SDLGraphics : public Graphics const int w, const int h) const override final; - virtual void calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const override final; + virtual void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; virtual void calcTileSDL(ImageVertexes *const vert, int x, int y) const override final; - virtual void calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) override final; + virtual void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; virtual void drawTile(const ImageVertexes *const vert) override final; diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index 5ba4ab693..156f8a412 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -455,9 +455,9 @@ void SDL2SoftwareGraphics::calcImagePattern(ImageCollection* const vertCol, calcImagePattern(vert, image, x, y, w, h); } -void SDL2SoftwareGraphics::calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const +void SDL2SoftwareGraphics::calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const { vert->image = image; calcTileSDL(vert, x, y); @@ -492,9 +492,9 @@ void SDL2SoftwareGraphics::calcTileSDL(ImageVertexes *const vert, } } -void SDL2SoftwareGraphics::calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) +void SDL2SoftwareGraphics::calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) { if (vertCol->currentImage != image) { diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h index 9c2b00ad9..df88dfe7b 100644 --- a/src/render/sdl2softwaregraphics.h +++ b/src/render/sdl2softwaregraphics.h @@ -96,16 +96,16 @@ class SDL2SoftwareGraphics : public Graphics const int w, const int h) const override final; - virtual void calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const override final; + virtual void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; virtual void calcTileSDL(ImageVertexes *const vert, int x, int y) const override final; - virtual void calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) override final; + virtual void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; virtual void drawTile(const ImageVertexes *const vert) override final; diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 3cba46abe..b3d962d9f 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -446,9 +446,9 @@ void SDLGraphics::calcImagePattern(ImageCollection* const vertCol, calcImagePattern(vert, image, x, y, w, h); } -void SDLGraphics::calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const +void SDLGraphics::calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const { vert->image = image; calcTileSDL(vert, x, y); @@ -482,9 +482,9 @@ void SDLGraphics::calcTileSDL(ImageVertexes *const vert, int x, int y) const } } -void SDLGraphics::calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) +void SDLGraphics::calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) { if (vertCol->currentImage != image) { diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h index dd33fcc0c..1ca37f8e4 100644 --- a/src/render/sdlgraphics.h +++ b/src/render/sdlgraphics.h @@ -95,16 +95,16 @@ class SDLGraphics : public Graphics const int w, const int h) const override final; - virtual void calcTile(ImageVertexes *const vert, - const Image *const image, - int x, int y) const override final; + virtual void calcTileVertexes(ImageVertexes *const vert, + const Image *const image, + int x, int y) const override final; virtual void calcTileSDL(ImageVertexes *const vert, int x, int y) const override final; - virtual void calcTile(ImageCollection *const vertCol, - const Image *const image, - int x, int y) override final; + virtual void calcTileCollection(ImageCollection *const vertCol, + const Image *const image, + int x, int y) override final; virtual void drawTile(const ImageVertexes *const vert) override final; diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h index d10ea938a..9af2efb76 100644 --- a/src/render/surfacegraphics.h +++ b/src/render/surfacegraphics.h @@ -113,18 +113,19 @@ class SurfaceGraphics : public Graphics const int h A_UNUSED) const override final { } - void calcTile(ImageVertexes *const vert A_UNUSED, - const Image *const image A_UNUSED, - int x A_UNUSED, int y A_UNUSED) const override final + void calcTileVertexes(ImageVertexes *const vert A_UNUSED, + const Image *const image A_UNUSED, + int x A_UNUSED, + int y A_UNUSED) const override final { } void calcTileSDL(ImageVertexes *const vert A_UNUSED, int x A_UNUSED, int y A_UNUSED) const override final { } - void calcTile(ImageCollection *const vertCol A_UNUSED, - const Image *const image A_UNUSED, - int x A_UNUSED, int y A_UNUSED) override final + void calcTileCollection(ImageCollection *const vertCol A_UNUSED, + const Image *const image A_UNUSED, + int x A_UNUSED, int y A_UNUSED) override final { } void drawTile(const ImageVertexes *const vert A_UNUSED) override final -- cgit v1.2.3-60-g2f50