[drape] In shape view params will be structures that describe view params for primitives. This structure will be created in functions like

void Extract(LineDefProto *, LineViewParams)

drape_frontend/line_shape.cpp

@@ -39,12 +39,10 @@ namespace df
 
 
   LineShape::LineShape(const vector<m2::PointF> & points,
-                       const Color & color,
                        float depth,
-                       float width)
-    : m_color(color)
-    , m_depth(depth)
-    , m_width(width)
+                       const LineViewParams & params)
+    : m_depth(depth)
+    , m_params(params)
   {
     ASSERT(!points.empty(), ());
     m_points.reserve(points.size());
@@ -61,7 +59,7 @@ namespace df
     vector<Point3D> renderPoints;
     vector<m2::PointF> renderNormals;
 
-    const float hw = m_width/2;
+    const float hw = GetWidth() / 2.0f;
     typedef m2::PointF vec2;
 
     vec2 start = m_points[0];
@@ -119,7 +117,7 @@ namespace df
 
     GLState state(gpu::SOLID_LINE_PROGRAM, 0, TextureBinding("", false, 0, MakeStackRefPointer<Texture>(NULL)));
     float r, g, b, a;
-    ::Convert(m_color, r, g, b, a);
+    ::Convert(GetColor(), r, g, b, a);
     state.GetUniformValues().SetFloatValue("color", r, g, b, a);
 
     AttributeProvider provider(2, renderPoints.size());

drape_frontend/line_shape.hpp

@@ -1,34 +1,30 @@
 #pragma once
 
 #include "map_shape.hpp"
+#include "shape_view_params.hpp"
 
-#include "../drape/color.hpp"
 #include "../geometry/point2d.hpp"
 
 #include "../std/vector.hpp"
 
 namespace df
 {
-
   class LineShape : public MapShape
   {
   public:
     LineShape(vector<m2::PointF> const & points,
-              Color const & color,
               float depth,
-              float width);
+              LineViewParams const & params);
 
     virtual void Draw(RefPointer<Batcher> batcher) const;
 
-    float         GetWidth() { return m_width; }
-    Color const & GetColor() { return m_color; }
+    float         GetWidth() const { return m_params.m_width; }
+    Color const & GetColor() const { return m_params.m_color; }
 
   private:
     vector<m2::PointF> m_points;
-    Color m_color;
     float m_depth;
-    float m_width;
+    LineViewParams m_params;
   };
-
 }
 

drape_frontend/shape_view_params.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "../drape/color.hpp"
+
+namespace df
+{
+  enum LineCap
+  {
+    RoundCap,
+    ButtCap,
+    SquareCap
+  };
+
+  enum LineJoin
+  {
+    NonJoin,
+    RoundJoin,
+    BevelJoin
+  };
+
+  struct LineViewParams
+  {
+    Color m_color;
+    float m_width;
+    LineCap m_cap;
+    LineJoin m_join;
+  };
+}