summaryrefslogtreecommitdiff
path: root/src/render/mobileopenglgraphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:59:26 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:59:26 +0300
commit63f0b730767b1185dc33f8892068d697e26a09bb (patch)
tree9f3bcba891cb747b2b4696651b8df464a8a1fc86 /src/render/mobileopenglgraphics.cpp
parent48646db55005a0da079bd2c945875dc8225e2f86 (diff)
downloadmanaplus-63f0b730767b1185dc33f8892068d697e26a09bb.tar.gz
manaplus-63f0b730767b1185dc33f8892068d697e26a09bb.tar.bz2
manaplus-63f0b730767b1185dc33f8892068d697e26a09bb.tar.xz
manaplus-63f0b730767b1185dc33f8892068d697e26a09bb.zip
Move Rectangle and ClipRectangle into gui directory.
Diffstat (limited to 'src/render/mobileopenglgraphics.cpp')
-rw-r--r--src/render/mobileopenglgraphics.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 252dc0766..a2f7909ff 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -884,7 +884,7 @@ void MobileOpenGLGraphics::_beginDraw()
// glScalef(0.5F, 0.5F, 0.5F);
- pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
+ pushClipArea(Rectangle(0, 0, mRect.w, mRect.h));
}
void MobileOpenGLGraphics::_endDraw()
@@ -951,21 +951,21 @@ SDL_Surface* MobileOpenGLGraphics::getScreenshot()
return screenshot;
}
-bool MobileOpenGLGraphics::pushClipArea(gcn::Rectangle area)
+bool MobileOpenGLGraphics::pushClipArea(Rectangle area)
{
int transX = 0;
int transY = 0;
if (!mClipStack.empty())
{
- const gcn::ClipRectangle &clipArea = mClipStack.top();
+ const ClipRectangle &clipArea = mClipStack.top();
transX = -clipArea.xOffset;
transY = -clipArea.yOffset;
}
const bool result = Graphics::pushClipArea(area);
- const gcn::ClipRectangle &clipArea = mClipStack.top();
+ const ClipRectangle &clipArea = mClipStack.top();
transX += clipArea.xOffset;
transY += clipArea.yOffset;
@@ -986,7 +986,7 @@ void MobileOpenGLGraphics::popClipArea()
if (mClipStack.empty())
return;
- const gcn::ClipRectangle &clipArea1 = mClipStack.top();
+ const ClipRectangle &clipArea1 = mClipStack.top();
int transX = -clipArea1.xOffset;
int transY = -clipArea1.yOffset;
@@ -995,7 +995,7 @@ void MobileOpenGLGraphics::popClipArea()
if (mClipStack.empty())
return;
- const gcn::ClipRectangle &clipArea = mClipStack.top();
+ const ClipRectangle &clipArea = mClipStack.top();
transX += clipArea.xOffset;
transY += clipArea.yOffset;
if (transX || transY)
@@ -1040,12 +1040,12 @@ void MobileOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
drawLineArrays(4);
}
-void MobileOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect)
+void MobileOpenGLGraphics::drawRectangle(const Rectangle& rect)
{
drawRectangle(rect, false);
}
-void MobileOpenGLGraphics::fillRectangle(const gcn::Rectangle& rect)
+void MobileOpenGLGraphics::fillRectangle(const Rectangle& rect)
{
drawRectangle(rect, true);
}
@@ -1090,7 +1090,7 @@ void MobileOpenGLGraphics::setTexturingAndBlending(const bool enable)
}
}
-void MobileOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect,
+void MobileOpenGLGraphics::drawRectangle(const Rectangle& rect,
const bool filled)
{
BLOCK_START("Graphics::drawRectangle")