refactored inheritance for Blitter.

graphics/area_renderer.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "geometry_batcher.hpp"
+#include "blitter.hpp"
 
 namespace graphics
 {
-  class AreaRenderer : public GeometryBatcher
+  class AreaRenderer : public Blitter
   {
   private:
 
@@ -14,7 +14,7 @@ namespace graphics
 
   public:
 
-    typedef GeometryBatcher base_t;
+    typedef Blitter base_t;
 
     struct Params : base_t::Params
     {

graphics/blitter.cpp

@@ -22,16 +22,6 @@ namespace graphics
   {
   }
 
-  void Blitter::beginFrame()
-  {
-    base_t::beginFrame();
-  }
-
-  void Blitter::endFrame()
-  {
-    base_t::endFrame();
-  }
-
   void Blitter::blit(shared_ptr<gl::BaseTexture> const & srcSurface,
                      ScreenBase const & from,
                      ScreenBase const & to,

graphics/blitter.hpp

@@ -2,7 +2,7 @@
 
 #include "opengl/storage.hpp"
 
-#include "display_list_renderer.hpp"
+#include "geometry_batcher.hpp"
 
 #include "../geometry/point2d.hpp"
 #include "../geometry/rect2d.hpp"
@@ -30,7 +30,7 @@ namespace graphics
     m2::RectU m_texRect;
   };
 
-  class Blitter : public DisplayListRenderer
+  class Blitter : public GeometryBatcher
   {
   private:
 
@@ -38,7 +38,7 @@ namespace graphics
 
   protected:
 
-    typedef DisplayListRenderer base_t;
+    typedef GeometryBatcher base_t;
 
     void calcPoints(m2::RectI const & srcRect,
                     m2::RectU const & texRect,
@@ -52,9 +52,6 @@ namespace graphics
     Blitter(base_t::Params const & params);
     ~Blitter();
 
-    void beginFrame();
-    void endFrame();
-
     /// Immediate mode rendering functions.
     /// they doesn't buffer any data as other functions do, but immediately renders it
     /// @{

graphics/geometry_batcher.hpp

@@ -6,7 +6,7 @@
 #include "opengl/framebuffer.hpp"
 #include "opengl/storage.hpp"
 
-#include "blitter.hpp"
+#include "display_list_renderer.hpp"
 #include "skin_page.hpp"
 #include "resource_manager.hpp"
 
@@ -28,7 +28,7 @@ namespace graphics
 {
   class Skin;
 
-  class GeometryBatcher : public Blitter
+  class GeometryBatcher : public DisplayListRenderer
   {
   public:
 
@@ -36,7 +36,7 @@ namespace graphics
 
   private:
 
-    typedef Blitter base_t;
+    typedef DisplayListRenderer base_t;
 
     shared_ptr<Skin> m_skin;