From 33e82a3469d1b1019f0b285d7c772cf057014fc5 Mon Sep 17 00:00:00 2001 From: Roman Sorokin Date: Fri, 18 Jul 2014 16:03:05 +0300 Subject: [PATCH] small namespace fixes --- drape/overlay_handle.cpp | 12 ++++++------ drape/overlay_handle.hpp | 20 ++++---------------- drape_frontend/apply_feature_functors.cpp | 12 ++++++------ drape_frontend/circle_shape.cpp | 2 +- drape_frontend/line_shape.cpp | 15 ++++++--------- drape_frontend/line_shape.hpp | 2 +- drape_frontend/poi_symbol_shape.cpp | 2 +- 7 files changed, 25 insertions(+), 40 deletions(-) diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp index 609d788133..4dc0e07588 100644 --- a/drape/overlay_handle.cpp +++ b/drape/overlay_handle.cpp @@ -17,7 +17,7 @@ private: }; OverlayHandle::OverlayHandle(FeatureID const & id, - OverlayHandle::Anchor anchor, + dp::Anchor anchor, double priority) : m_id(id) , m_anchor(anchor) @@ -89,7 +89,7 @@ OverlayHandle::TOffsetNode const & OverlayHandle::GetOffsetNode(uint8_t bufferID //////////////////////////////////////////////////////////////////////////////// -SquareHandle::SquareHandle(FeatureID const & id, OverlayHandle::Anchor anchor, +SquareHandle::SquareHandle(FeatureID const & id, dp::Anchor anchor, m2::PointD const & gbPivot, m2::PointD const & pxSize, double priority) : base_t(id, anchor, priority) @@ -104,14 +104,14 @@ m2::RectD SquareHandle::GetPixelRect(ScreenBase const & screen) const m2::RectD result(pxPivot - m_pxHalfSize, pxPivot + m_pxHalfSize); m2::PointD offset(0.0, 0.0); - if (m_anchor & Left) + if (m_anchor & dp::Left) offset.x = m_pxHalfSize.x; - else if (m_anchor & Right) + else if (m_anchor & dp::Right) offset.x = -m_pxHalfSize.x; - if (m_anchor & Top) + if (m_anchor & dp::Top) offset.y = m_pxHalfSize.y; - else if (m_anchor & Bottom) + else if (m_anchor & dp::Bottom) offset.y = -m_pxHalfSize.y; result.Offset(offset); diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp index b22bc04ea8..41776b01b6 100644 --- a/drape/overlay_handle.hpp +++ b/drape/overlay_handle.hpp @@ -1,5 +1,6 @@ #pragma once +#include "drape_global.hpp" #include "binding_info.hpp" #include "index_buffer_mutator.hpp" #include "attribute_buffer_mutator.hpp" @@ -14,21 +15,8 @@ class OverlayHandle { public: - enum Anchor - { - Center = 0, - Left = 0x1, - Right = Left << 1, - Top = Right << 1, - Bottom = Top << 1, - LeftTop = Left | Top, - RightTop = Right | Top, - LeftBottom = Left | Bottom, - RightBottom = Right | Bottom - }; - OverlayHandle(FeatureID const & id, - Anchor anchor, + dp::Anchor anchor, double priority); virtual ~OverlayHandle() {} @@ -51,7 +39,7 @@ public: protected: FeatureID const m_id; - Anchor const m_anchor; + dp::Anchor const m_anchor; double const m_priority; typedef pair TOffsetNode; @@ -79,7 +67,7 @@ class SquareHandle : public OverlayHandle typedef OverlayHandle base_t; public: SquareHandle(FeatureID const & id, - Anchor anchor, + dp::Anchor anchor, m2::PointD const & gbPivot, m2::PointD const & pxSize, double priority); diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp index 6c646369ed..a0cacbfb5f 100644 --- a/drape_frontend/apply_feature_functors.cpp +++ b/drape_frontend/apply_feature_functors.cpp @@ -34,11 +34,11 @@ void Extract(::LineDefProto const * lineRule, switch(lineRule->cap()) { - case ::ROUNDCAP : params.m_cap = df::RoundCap; + case ::ROUNDCAP : params.m_cap = dp::RoundCap; break; - case ::BUTTCAP : params.m_cap = df::ButtCap; + case ::BUTTCAP : params.m_cap = dp::ButtCap; break; - case ::SQUARECAP: params.m_cap = df::SquareCap; + case ::SQUARECAP: params.m_cap = dp::SquareCap; break; default: ASSERT(false, ()); @@ -46,11 +46,11 @@ void Extract(::LineDefProto const * lineRule, switch (lineRule->join()) { - case ::NOJOIN : params.m_join = df::MiterJoin; + case ::NOJOIN : params.m_join = dp::MiterJoin; break; - case ::ROUNDJOIN : params.m_join = df::RoundJoin; + case ::ROUNDJOIN : params.m_join = dp::RoundJoin; break; - case ::BEVELJOIN : params.m_join = df::BevelJoin; + case ::BEVELJOIN : params.m_join = dp::BevelJoin; break; default: ASSERT(false, ()); diff --git a/drape_frontend/circle_shape.cpp b/drape_frontend/circle_shape.cpp index 3dcc5b6ed3..9bc598b94b 100644 --- a/drape_frontend/circle_shape.cpp +++ b/drape_frontend/circle_shape.cpp @@ -75,7 +75,7 @@ void CircleShape::Draw(RefPointer batcher, RefPointer normalDecl.m_stride = 5 * sizeof(float); OverlayHandle * overlay = new SquareHandle(m_params.m_id, - OverlayHandle::Center, m_pt, + dp::Center, m_pt, m2::PointD(m_params.m_radius, m_params.m_radius), m_params.m_depth); diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp index b59dc08eb9..cbf6859427 100644 --- a/drape_frontend/line_shape.cpp +++ b/drape_frontend/line_shape.cpp @@ -78,9 +78,6 @@ void SetColor(vector &dst, float const * ar, int index) { uint32_t const colorArraySize = 4; uint32_t const baseListIndex = ListStride * index; - for(int i = 0; i < ListStride ; ++i) - dst[baseListIndex + i] = ar[i%4]; - for (uint32_t i = 0; i < 6; ++i) memcpy(&dst[baseListIndex + colorArraySize * i], ar, colorArraySize * sizeof(float)); } @@ -133,13 +130,13 @@ struct SphereCenters LineShape::LineShape(vector const & points, LineViewParams const & params) - : m_params(params), - m_points( params.m_cap == ButtCap ? points.size() : points.size() + 2) + : m_params(params) + , m_points(params.m_cap == dp::ButtCap ? points.size() : points.size() + 2) { ASSERT_GREATER(points.size(), 1, ()); int const size = m_points.size(); - if (m_params.m_cap != ButtCap) + if (m_params.m_cap != dp::ButtCap) { m_points[0] = points[0] + (points[0] - points[1]).Normalize();; m_points[size - 1] = points[size - 3] + (points[size - 3] - points[size - 4]).Normalize(); @@ -168,7 +165,7 @@ void LineShape::Draw(RefPointer batcher, RefPointer / Bisector(r, v1, v2, v3, leftBisector, rightBisector, dx); - float const joinType = m_params.m_join == RoundJoin ? 1 : 0; + float const joinType = m_params.m_join == dp::RoundJoin ? 1 : 0; float const halfWidth = m_params.m_width / 2.0f; float const insetHalfWidth= 1.0f * halfWidth; @@ -222,9 +219,9 @@ void LineShape::Draw(RefPointer batcher, RefPointer / widthType[(size - 2) * 4 + 1] = widthType[(size - 2) * 4 + 3] = WidthType(-halfWidth, 0, joinType, insetHalfWidth); centers[(size - 2) * 4 + 2] = centers[(size - 2) * 4 + 3] = SphereCenters(v1, v2); - if (m_params.m_cap != ButtCap) + if (m_params.m_cap != dp::ButtCap) { - float const type = m_params.m_cap == RoundCap ? -1 : 1; + float const type = m_params.m_cap == dp::RoundCap ? -1 : 1; uint32_t const baseIdx = 4 * (size - 2); widthType[0] = WidthType(halfWidth, type, -1, insetHalfWidth); widthType[1] = WidthType(-halfWidth, type, -1, insetHalfWidth); diff --git a/drape_frontend/line_shape.hpp b/drape_frontend/line_shape.hpp index 55401bcced..1a5c595c67 100644 --- a/drape_frontend/line_shape.hpp +++ b/drape_frontend/line_shape.hpp @@ -22,8 +22,8 @@ public: Color const & GetColor() const { return m_params.m_color; } private: - vector m_points; LineViewParams m_params; + vector m_points; }; } // namespace df diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp index 1ec14e5d09..ac7a2f0dfd 100644 --- a/drape_frontend/poi_symbol_shape.cpp +++ b/drape_frontend/poi_symbol_shape.cpp @@ -65,7 +65,7 @@ void PoiSymbolShape::Draw(RefPointer batcher, RefPointer