From f61cb8dd4d8d47f291e99ed5fd5afe1acf73b604 Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 27 Mar 2014 17:59:19 +0300
Subject: [PATCH] [drape] stuff

---
 drape/batcher.cpp            | 4 ++--
 drape/color.cpp              | 4 ++--
 drape/color.hpp              | 4 ++--
 drape/drape.pro              | 5 ++++-
 drape/drape_common.pri       | 6 +++---
 drape_head/drape_surface.cpp | 1 -
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/drape/batcher.cpp b/drape/batcher.cpp
index c17399f3af..853e3141e7 100644
--- a/drape/batcher.cpp
+++ b/drape/batcher.cpp
@@ -7,8 +7,8 @@
 
 namespace
 {
-  const uint32_t AllocateIndexCount = 3000;
-  const uint32_t AllocateVertexCount = 3000;
+  const uint32_t AllocateIndexCount = 9000;
+  const uint32_t AllocateVertexCount = 10000;
 
   class IndexGenerator
   {
diff --git a/drape/color.cpp b/drape/color.cpp
index d028a5d2c1..9027e7283b 100644
--- a/drape/color.cpp
+++ b/drape/color.cpp
@@ -21,7 +21,7 @@ Color::Color(uint8_t red, uint8_t green, uint8_t blue, uint8_t alfa)
 {
 }
 
-bool Color::operator< (Color const & other)
+bool Color::operator< (Color const & other) const
 {
   if (other.m_red != m_red)
     return m_red < other.m_red;
@@ -33,7 +33,7 @@ bool Color::operator< (Color const & other)
   return m_alfa < other.m_alfa;
 }
 
-bool Color::operator== (Color const & other)
+bool Color::operator== (Color const & other) const
 {
   return m_red   == other.m_red   &&
          m_green == other.m_green &&
diff --git a/drape/color.hpp b/drape/color.hpp
index 8f12abbe87..c4fbaa6a2b 100644
--- a/drape/color.hpp
+++ b/drape/color.hpp
@@ -12,8 +12,8 @@ struct Color
   uint8_t m_blue;
   uint8_t m_alfa;
 
-  bool operator <  (Color const & other);
-  bool operator == (Color const & other);
+  bool operator <  (Color const & other) const;
+  bool operator == (Color const & other) const;
 };
 
 inline uint8_t ExtractRed(uint32_t argb);
diff --git a/drape/drape.pro b/drape/drape.pro
index c921c3d415..5cdf4d67fd 100644
--- a/drape/drape.pro
+++ b/drape/drape.pro
@@ -25,4 +25,7 @@ OTHER_FILES += \
     shaders/texturing_vertex_shader.vsh \
     shaders/shader_index.txt \
     shaders/texturing_fragment_shader.fsh \
-    shaders/line_vertex_shader.vsh
+    shaders/line_vertex_shader.vsh \
+    shaders/line_fragment_shader.fsh \
+    shaders/solid_color_fragment_shader.fsh \
+    shaders/normalize_vertex_shader.vsh
diff --git a/drape/drape_common.pri b/drape/drape_common.pri
index 15e7d61b59..c0cccc6bd6 100644
--- a/drape/drape_common.pri
+++ b/drape/drape_common.pri
@@ -16,7 +16,6 @@ SOURCES += \
     $$DRAPE_DIR/glconstants.cpp \
     $$DRAPE_DIR/glstate.cpp \
     $$DRAPE_DIR/gpu_buffer.cpp \
-    $$DRAPE_DIR/utils/list_generator.cpp \
     $$DRAPE_DIR/shader_def.cpp \
     $$DRAPE_DIR/glextensions_list.cpp \
     $$DRAPE_DIR/pointers.cpp \
@@ -48,7 +47,6 @@ HEADERS += \
     $$DRAPE_DIR/glconstants.hpp \
     $$DRAPE_DIR/glfunctions.hpp \
     $$DRAPE_DIR/gpu_buffer.hpp \
-    $$DRAPE_DIR/utils/list_generator.hpp \
     $$DRAPE_DIR/shader_def.hpp \
     $$DRAPE_DIR/glextensions_list.hpp \
     $$DRAPE_DIR/oglcontext.hpp \
@@ -60,4 +58,6 @@ HEADERS += \
     $$DRAPE_DIR/utils/lodepng.h \
     $$DRAPE_DIR/texture_structure_desc.hpp \
     $$DRAPE_DIR/symbols_texture.hpp \
-    $$DRAPE_DIR/texture_manager.hpp
+    $$DRAPE_DIR/texture_manager.hpp \
+    $$DRAPE_DIR/texture_set_controller.hpp \
+    $$DRAPE_DIR/texture_set_holder.hpp
diff --git a/drape_head/drape_surface.cpp b/drape_head/drape_surface.cpp
index 07c88a5bb4..a4c0e4d324 100644
--- a/drape_head/drape_surface.cpp
+++ b/drape_head/drape_surface.cpp
@@ -2,7 +2,6 @@
 
 #include "../drape_frontend/viewport.hpp"
 
-#include "../drape/utils/list_generator.hpp"
 #include "../drape/shader_def.hpp"
 
 #include "../base/stl_add.hpp"