diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-24 14:01:32 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-24 21:18:57 +0300 |
commit | 0a8b5d325f2d2c326b6da27399711b198417a499 (patch) | |
tree | 9e89aa7610f3f74ef9df53f6afce6655fc95ab07 /src/render/safeopenglgraphics.cpp | |
parent | 779b65f15d3350b2d95a095e24a90526c64dcecb (diff) | |
download | mv-0a8b5d325f2d2c326b6da27399711b198417a499.tar.gz mv-0a8b5d325f2d2c326b6da27399711b198417a499.tar.bz2 mv-0a8b5d325f2d2c326b6da27399711b198417a499.tar.xz mv-0a8b5d325f2d2c326b6da27399711b198417a499.zip |
Rename Rectangle into Rect.
Rename ClipRectangle into ClipRect.
Diffstat (limited to 'src/render/safeopenglgraphics.cpp')
-rw-r--r-- | src/render/safeopenglgraphics.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index 342495a47..a739a4904 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -459,7 +459,7 @@ void SafeOpenGLGraphics::_beginDraw() glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - pushClipArea(Rectangle(0, 0, mRect.w, mRect.h)); + pushClipArea(Rect(0, 0, mRect.w, mRect.h)); } void SafeOpenGLGraphics::_endDraw() @@ -523,21 +523,21 @@ SDL_Surface* SafeOpenGLGraphics::getScreenshot() return screenshot; } -bool SafeOpenGLGraphics::pushClipArea(Rectangle area) +bool SafeOpenGLGraphics::pushClipArea(Rect area) { int transX = 0; int transY = 0; if (!mClipStack.empty()) { - const ClipRectangle &clipArea = mClipStack.top(); + const ClipRect &clipArea = mClipStack.top(); transX = -clipArea.xOffset; transY = -clipArea.yOffset; } const bool result = Graphics::pushClipArea(area); - const ClipRectangle &clipArea = mClipStack.top(); + const ClipRect &clipArea = mClipStack.top(); glPushMatrix(); glTranslatef(static_cast<GLfloat>(transX + clipArea.xOffset), @@ -557,7 +557,7 @@ void SafeOpenGLGraphics::popClipArea() return; glPopMatrix(); - const ClipRectangle &clipArea = mClipStack.top(); + const ClipRect &clipArea = mClipStack.top(); glScissor(clipArea.x * mScale, (mRect.h - clipArea.y - clipArea.height) * mScale, clipArea.width * mScale, @@ -613,12 +613,12 @@ void SafeOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2) glEnd(); } -void SafeOpenGLGraphics::drawRectangle(const Rectangle& rect) +void SafeOpenGLGraphics::drawRectangle(const Rect& rect) { drawRectangle(rect, false); } -void SafeOpenGLGraphics::fillRectangle(const Rectangle& rect) +void SafeOpenGLGraphics::fillRectangle(const Rect& rect) { drawRectangle(rect, true); } @@ -661,7 +661,7 @@ void SafeOpenGLGraphics::setTexturingAndBlending(const bool enable) } } -void SafeOpenGLGraphics::drawRectangle(const Rectangle& rect, +void SafeOpenGLGraphics::drawRectangle(const Rect& rect, const bool filled) { BLOCK_START("Graphics::drawRectangle") |