summaryrefslogtreecommitdiff
path: root/src/render/nullopenglgraphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-24 14:01:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-24 21:18:57 +0300
commit0a8b5d325f2d2c326b6da27399711b198417a499 (patch)
tree9e89aa7610f3f74ef9df53f6afce6655fc95ab07 /src/render/nullopenglgraphics.cpp
parent779b65f15d3350b2d95a095e24a90526c64dcecb (diff)
downloadmanaverse-0a8b5d325f2d2c326b6da27399711b198417a499.tar.gz
manaverse-0a8b5d325f2d2c326b6da27399711b198417a499.tar.bz2
manaverse-0a8b5d325f2d2c326b6da27399711b198417a499.tar.xz
manaverse-0a8b5d325f2d2c326b6da27399711b198417a499.zip
Rename Rectangle into Rect.
Rename ClipRectangle into ClipRect.
Diffstat (limited to 'src/render/nullopenglgraphics.cpp')
-rw-r--r--src/render/nullopenglgraphics.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index 8dd4ca91f..159ccea94 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -918,7 +918,7 @@ void NullOpenGLGraphics::updateScreen()
void NullOpenGLGraphics::_beginDraw()
{
- pushClipArea(Rectangle(0, 0, 640, 480));
+ pushClipArea(Rect(0, 0, 640, 480));
}
void NullOpenGLGraphics::_endDraw()
@@ -935,21 +935,21 @@ SDL_Surface* NullOpenGLGraphics::getScreenshot()
return nullptr;
}
-bool NullOpenGLGraphics::pushClipArea(Rectangle area)
+bool NullOpenGLGraphics::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();
transX += clipArea.xOffset;
transY += clipArea.yOffset;
@@ -984,12 +984,12 @@ void NullOpenGLGraphics::drawLine(int x1, int y1,
drawLineArrayf(4);
}
-void NullOpenGLGraphics::drawRectangle(const Rectangle& rect)
+void NullOpenGLGraphics::drawRectangle(const Rect& rect)
{
drawRectangle(rect, false);
}
-void NullOpenGLGraphics::fillRectangle(const Rectangle& rect)
+void NullOpenGLGraphics::fillRectangle(const Rect& rect)
{
drawRectangle(rect, true);
}
@@ -1017,7 +1017,7 @@ void NullOpenGLGraphics::setTexturingAndBlending(const bool enable)
}
}
-void NullOpenGLGraphics::drawRectangle(const Rectangle& rect A_UNUSED,
+void NullOpenGLGraphics::drawRectangle(const Rect& rect A_UNUSED,
const bool filled A_UNUSED)
{
BLOCK_START("Graphics::drawRectangle")