From df7306b25899f3fafa4adb969e70ea83ac567ffb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 10 Mar 2014 00:25:58 +0300
Subject: Remove duplicate code from renderers.

---
 src/render/normalopenglgraphics.h | 50 +++------------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

(limited to 'src/render/normalopenglgraphics.h')

diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 214954e3c..6de8d9397 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -56,8 +56,6 @@ class NormalOpenGLGraphics final : public Graphics
 
         ~NormalOpenGLGraphics();
 
-        #include "render/openglgraphicsdef.hpp"
-
         inline void drawQuadArrayfi(const int size);
 
         inline void drawQuadArrayfiCached(const int size);
@@ -78,60 +76,18 @@ class NormalOpenGLGraphics final : public Graphics
 
         inline void drawLineArrayf(const int size);
 
-        inline void drawVertexes(const NormalOpenGLGraphicsVertexes &ogl);
-
-        bool drawNet(const int x1, const int y1, const int x2, const int y2,
-                     const int width, const int height) override final;
-
-        void initArrays() override final;
+        #include "render/graphicsdef.hpp"
 
-        /**
-         * Draws a rectangle using images. 4 corner images, 4 side images and 1
-         * image for the inside.
-         */
-        void drawImageRect(int x, int y, int w, int h,
-                           const ImageRect &imgRect);
-
-#ifdef DEBUG_DRAW_CALLS
-        unsigned int getDrawCalls() const
-        { return mLastDrawCalls; }
+        #include "render/openglgraphicsdef.hpp"
 
-        static unsigned int mDrawCalls;
+        #include "render/openglgraphicsdefadvanced.hpp"
 
-        static unsigned int mLastDrawCalls;
-#endif
 #ifdef DEBUG_BIND_TEXTURE
         unsigned int getBinds() const
         { return mLastBinds; }
 #endif
 
-    protected:
-        void setTexturingAndBlending(const bool enable);
-
-        void debugBindTexture(const Image *const image);
-
     private:
-        void inline setColorAlpha(const float alpha);
-
-        void inline restoreColor();
-
-        void inline calcImageRect(ImageVertexes *const vert,
-                                  int x, int y,
-                                  int w, int h,
-                                  const ImageRect &imgRect);
-
-        void inline calcPatternInline(ImageVertexes *const vert,
-                                      const Image *const image,
-                                      const int x, const int y,
-                                      const int w, const int h) const;
-
-        void inline calcTileVertexesInline(ImageVertexes *const vert,
-                                           const Image *const image,
-                                           int x, int y) const;
-
-        bool inline drawImageInline(const Image *const image,
-                                    int dstX, int dstY);
-
         GLfloat *mFloatTexArray;
         GLint *mIntTexArray;
         GLint *mIntVertArray;
-- 
cgit v1.2.3-60-g2f50