From 63f0b730767b1185dc33f8892068d697e26a09bb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Feb 2014 14:59:26 +0300 Subject: Move Rectangle and ClipRectangle into gui directory. --- src/render/nullopenglgraphics.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/render/nullopenglgraphics.cpp') diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index d1c6ed0a6..6018247f9 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -918,7 +918,7 @@ void NullOpenGLGraphics::updateScreen() void NullOpenGLGraphics::_beginDraw() { - pushClipArea(gcn::Rectangle(0, 0, 640, 480)); + pushClipArea(Rectangle(0, 0, 640, 480)); } void NullOpenGLGraphics::_endDraw() @@ -935,21 +935,21 @@ SDL_Surface* NullOpenGLGraphics::getScreenshot() return nullptr; } -bool NullOpenGLGraphics::pushClipArea(gcn::Rectangle area) +bool NullOpenGLGraphics::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; @@ -984,12 +984,12 @@ void NullOpenGLGraphics::drawLine(int x1, int y1, drawLineArrayf(4); } -void NullOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect) +void NullOpenGLGraphics::drawRectangle(const Rectangle& rect) { drawRectangle(rect, false); } -void NullOpenGLGraphics::fillRectangle(const gcn::Rectangle& rect) +void NullOpenGLGraphics::fillRectangle(const Rectangle& rect) { drawRectangle(rect, true); } @@ -1017,7 +1017,7 @@ void NullOpenGLGraphics::setTexturingAndBlending(const bool enable) } } -void NullOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect A_UNUSED, +void NullOpenGLGraphics::drawRectangle(const Rectangle& rect A_UNUSED, const bool filled A_UNUSED) { BLOCK_START("Graphics::drawRectangle") -- cgit v1.2.3-60-g2f50