diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-01-29 14:06:10 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:20:41 +0300 |
commit | f4de5841f7bbfa1773ecd824d366a8bea49515a9 (patch) | |
tree | 16ee18c3f36b549e15fbf25c3e2cdfb2b5628b00 /drape_frontend/shape_view_params.hpp | |
parent | 2317f55b5a9460654f0916f6b85d7fa23837d3be (diff) |
Improved displacement algorithm and overlays rendering
Diffstat (limited to 'drape_frontend/shape_view_params.hpp')
-rw-r--r-- | drape_frontend/shape_view_params.hpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp index 6a7e857d6a..f04cba1edd 100644 --- a/drape_frontend/shape_view_params.hpp +++ b/drape_frontend/shape_view_params.hpp @@ -14,9 +14,9 @@ namespace df struct CommonViewParams { - float m_depth; - int m_minVisibleScale; - uint8_t m_rank; + float m_depth = 0.0f; + int m_minVisibleScale = 0; + uint8_t m_rank = 0; }; struct PoiSymbolViewParams : CommonViewParams @@ -26,7 +26,7 @@ struct PoiSymbolViewParams : CommonViewParams FeatureID m_id; string m_symbolName; uint32_t m_extendingSize; - float m_posZ; + float m_posZ = 0.0f; }; struct CircleViewParams : CommonViewParams @@ -35,29 +35,29 @@ struct CircleViewParams : CommonViewParams FeatureID m_id; dp::Color m_color; - float m_radius; + float m_radius = 0.0f; }; struct AreaViewParams : CommonViewParams { dp::Color m_color; - float m_minPosZ; - float m_posZ; + float m_minPosZ = 0.0f; + float m_posZ = 0.0f; }; struct LineViewParams : CommonViewParams { dp::Color m_color; - float m_width; + float m_width = 0.0f; dp::LineCap m_cap; dp::LineJoin m_join; buffer_vector<uint8_t, 8> m_pattern; - float m_baseGtoPScale; + float m_baseGtoPScale = 1.0f; }; struct TextViewParams : CommonViewParams { - TextViewParams() : m_extendingSize(0) {} + TextViewParams() {} FeatureID m_featureID; dp::FontDecl m_primaryTextFont; @@ -66,26 +66,28 @@ struct TextViewParams : CommonViewParams string m_secondaryText; dp::Anchor m_anchor; m2::PointF m_primaryOffset; - bool m_primaryOptional; - bool m_secondaryOptional; - uint32_t m_extendingSize; - float m_posZ; + bool m_primaryOptional = false; + bool m_secondaryOptional = false; + bool m_hasMark = false; + uint32_t m_extendingSize = 0; + float m_posZ = 0.0f; }; struct PathTextViewParams : CommonViewParams { + FeatureID m_featureID; dp::FontDecl m_textFont; string m_text; - float m_baseGtoPScale; + float m_baseGtoPScale = 1.0f; }; struct PathSymbolViewParams : CommonViewParams { FeatureID m_featureID; string m_symbolName; - float m_offset; - float m_step; - float m_baseGtoPScale; + float m_offset = 0.0f; + float m_step = 0.0f; + float m_baseGtoPScale = 1.0f; }; } // namespace df |