move some methods from base/graphics into render/graphics.

Remove base/graphcs.

1 files changed, 123 insertions, 1 deletions

diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 7e3687006..653b4d4c0 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -20,6 +20,49 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "render/graphics.h"
 
 #include "main.h"
@@ -48,11 +91,11 @@
 Graphics *mainGraphics = nullptr;
 
 Graphics::Graphics() :
-    gcn::Graphics(),
     mWidth(0),
     mHeight(0),
     mActualWidth(0),
     mActualHeight(0),
+    mClipStack(),
     mWindow(nullptr),
 #ifdef USE_SDL2
     mRenderer(nullptr),
@@ -503,3 +546,82 @@ void Graphics::setWindowSize(const int width A_UNUSED,
     SDL_SetWindowSize(mWindow, width, height);
 #endif
 }
+
+bool Graphics::pushClipArea(gcn::Rectangle area)
+{
+    // Ignore area with a negate width or height
+    // by simple pushing an empty clip area
+    // to the stack.
+    if (area.width < 0 || area.height < 0)
+    {
+        gcn::ClipRectangle carea;
+        mClipStack.push(carea);
+        return true;
+    }
+
+    if (mClipStack.empty())
+    {
+        gcn::ClipRectangle carea;
+        carea.x = area.x;
+        carea.y = area.y;
+        carea.width = area.width;
+        carea.height = area.height;
+        carea.xOffset = area.x;
+        carea.yOffset = area.y;
+        mClipStack.push(carea);
+        return true;
+    }
+
+    const gcn::ClipRectangle &top = mClipStack.top();
+    gcn::ClipRectangle carea;
+    carea = area;
+    carea.xOffset = top.xOffset + carea.x;
+    carea.yOffset = top.yOffset + carea.y;
+    carea.x += top.xOffset;
+    carea.y += top.yOffset;
+
+    // Clamp the pushed clip rectangle.
+    if (carea.x < top.x)
+        carea.x = top.x;
+
+    if (carea.y < top.y)
+        carea.y = top.y;
+
+    if (carea.x + carea.width > top.x + top.width)
+    {
+        carea.width = top.x + top.width - carea.x;
+
+        if (carea.width < 0)
+            carea.width = 0;
+    }
+
+    if (carea.y + carea.height > top.y + top.height)
+    {
+        carea.height = top.y + top.height - carea.y;
+
+        if (carea.height < 0)
+            carea.height = 0;
+    }
+
+    const bool result = carea.isIntersecting(top);
+
+    mClipStack.push(carea);
+
+    return result;
+}
+
+void Graphics::popClipArea()
+{
+    if (mClipStack.empty())
+        return;
+
+    mClipStack.pop();
+}
+
+const gcn::ClipRectangle *Graphics::getCurrentClipArea() const
+{
+    if (mClipStack.empty())
+        return nullptr;
+
+    return &mClipStack.top();
+}