User lines rendering.

1 files changed, 22 insertions, 13 deletions

diff --git a/drape_frontend/user_mark_shapes.hpp b/drape_frontend/user_mark_shapes.hpp
index c9d03a0a44..a315647918 100644
--- a/drape_frontend/user_mark_shapes.hpp
+++ b/drape_frontend/user_mark_shapes.hpp
@@ -1,40 +1,49 @@
 #pragma once
 
 #include "tile_key.hpp"
-#include "user_marks_provider.hpp"
 
-#include "drape/batcher.hpp"
+#include "drape/glstate.hpp"
+#include "drape/render_bucket.hpp"
 #include "drape/texture_manager.hpp"
 
-#include "geometry/point2d.hpp"
+#include "geometry/spline.hpp"
 
-#include "std/function.hpp"
+#include <memory>
 
 namespace df
 {
 
 struct UserMarkRenderParams
 {
-  m2::PointD m_pivot;
-  m2::PointD m_pixelOffset;
+  int m_minZoom = 1;
+  m2::PointD m_pivot = m2::PointD(0.0, 0.0);
+  m2::PointD m_pixelOffset = m2::PointD(0.0, 0.0);
   std::string m_symbolName;
-  dp::Anchor m_anchor;
-  float m_depth;
-  bool m_runCreationAnim;
-  bool m_isVisible;
+  dp::Anchor m_anchor = dp::Center;
+  float m_depth = 0.0;
+  bool m_runCreationAnim = false;
+  bool m_isVisible = true;
 };
 
 struct LineLayer
 {
+  LineLayer() = default;
+  LineLayer(dp::Color color, float width, float depth)
+    : m_color(color)
+    , m_width(width)
+    , m_depth(depth)
+  {}
+
   dp::Color m_color;
-  float m_width;
-  float m_depth;
+  float m_width = 0.0;
+  float m_depth = 0.0;
 };
 
 struct UserLineRenderParams
 {
+  int m_minZoom = 1;
   std::vector<LineLayer> m_layers;
-  std::vector<m2::PointD> m_points;
+  m2::SharedSpline m_spline;
 };
 
 using UserMarksRenderCollection = std::vector<UserMarkRenderParams>;