diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2018-08-02 16:04:59 +0300 |
---|---|---|
committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2018-08-02 20:32:49 +0300 |
commit | c43305029839d5c7c9ab2eeed370e56bd777cc41 (patch) | |
tree | e9fc909e179efa3e838dfd5b44378f3a750b857a /map | |
parent | 926cd384a1f6c34b6ea62d9b078d6fad38b92758 (diff) |
Renamed GLState
Diffstat (limited to 'map')
-rw-r--r-- | map/local_ads_mark.cpp | 4 | ||||
-rw-r--r-- | map/local_ads_mark.hpp | 5 | ||||
-rw-r--r-- | map/routing_mark.cpp | 4 | ||||
-rw-r--r-- | map/routing_mark.hpp | 7 | ||||
-rw-r--r-- | map/search_mark.cpp | 4 | ||||
-rw-r--r-- | map/search_mark.hpp | 2 | ||||
-rw-r--r-- | map/track.cpp | 4 | ||||
-rw-r--r-- | map/track.hpp | 2 | ||||
-rw-r--r-- | map/user_mark.cpp | 4 | ||||
-rw-r--r-- | map/user_mark.hpp | 2 |
10 files changed, 18 insertions, 20 deletions
diff --git a/map/local_ads_mark.cpp b/map/local_ads_mark.cpp index b01ea95197..40d111ec56 100644 --- a/map/local_ads_mark.cpp +++ b/map/local_ads_mark.cpp @@ -36,9 +36,9 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> LocalAdsMark::GetSymbolNames() return symbol; } -df::RenderState::DepthLayer LocalAdsMark::GetDepthLayer() const +df::DepthLayer LocalAdsMark::GetDepthLayer() const { - return df::RenderState::LocalAdsMarkLayer; + return df::DepthLayer::LocalAdsMarkLayer; } drape_ptr<df::UserPointMark::TitlesInfo> LocalAdsMark::GetTitleDecl() const diff --git a/map/local_ads_mark.hpp b/map/local_ads_mark.hpp index ecaf0b0f60..9739edefcf 100644 --- a/map/local_ads_mark.hpp +++ b/map/local_ads_mark.hpp @@ -19,10 +19,9 @@ struct LocalAdsMarkData class LocalAdsMark : public UserMark { public: - LocalAdsMark(m2::PointD const & ptOrg); - virtual ~LocalAdsMark() {} + explicit LocalAdsMark(m2::PointD const & ptOrg); - df::RenderState::DepthLayer GetDepthLayer() const override; + df::DepthLayer GetDepthLayer() const override; drape_ptr<SymbolNameZoomInfo> GetSymbolNames() const override; diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp index 8a8fceefba..bbd38ba020 100644 --- a/map/routing_mark.cpp +++ b/map/routing_mark.cpp @@ -44,9 +44,9 @@ dp::Anchor RouteMarkPoint::GetAnchor() const return dp::Center; } -df::RenderState::DepthLayer RouteMarkPoint::GetDepthLayer() const +df::DepthLayer RouteMarkPoint::GetDepthLayer() const { - return df::RenderState::RoutingMarkLayer; + return df::DepthLayer::RoutingMarkLayer; } void RouteMarkPoint::SetRoutePointType(RouteMarkType type) diff --git a/map/routing_mark.hpp b/map/routing_mark.hpp index 35ae42dd02..d23dd2f9d2 100644 --- a/map/routing_mark.hpp +++ b/map/routing_mark.hpp @@ -34,7 +34,7 @@ public: void SetIsVisible(bool isVisible) { m_markData.m_isVisible = isVisible; } dp::Anchor GetAnchor() const override; - df::RenderState::DepthLayer GetDepthLayer() const override; + df::DepthLayer GetDepthLayer() const override; drape_ptr<SymbolNameZoomInfo> GetSymbolNames() const override; bool IsAvailableForSearch() const override { return !IsPassed(); } @@ -105,10 +105,9 @@ private: class TransitMark : public UserMark { public: - TransitMark(m2::PointD const & ptOrg); - virtual ~TransitMark() {} + explicit TransitMark(m2::PointD const & ptOrg); - df::RenderState::DepthLayer GetDepthLayer() const override { return df::RenderState::TransitMarkLayer; } + df::DepthLayer GetDepthLayer() const override { return df::DepthLayer::TransitMarkLayer; } bool HasSymbolPriority() const override { return !m_symbolNames.empty() || !m_coloredSymbols.empty(); } bool HasTitlePriority() const override { return true; } diff --git a/map/search_mark.cpp b/map/search_mark.cpp index d3deb4f609..9e7f16800e 100644 --- a/map/search_mark.cpp +++ b/map/search_mark.cpp @@ -198,9 +198,9 @@ int SearchMarkPoint::GetMinTitleZoom() const return 1; } -df::RenderState::DepthLayer SearchMarkPoint::GetDepthLayer() const +df::DepthLayer SearchMarkPoint::GetDepthLayer() const { - return df::RenderState::SearchMarkLayer; + return df::DepthLayer::SearchMarkLayer; } void SearchMarkPoint::SetFoundFeature(FeatureID const & feature) diff --git a/map/search_mark.hpp b/map/search_mark.hpp index 8d28513630..f31f368b0e 100644 --- a/map/search_mark.hpp +++ b/map/search_mark.hpp @@ -39,7 +39,7 @@ public: df::ColorConstant GetColorConstant() const override; drape_ptr<TitlesInfo> GetTitleDecl() const override; int GetMinTitleZoom() const override; - df::RenderState::DepthLayer GetDepthLayer() const override; + df::DepthLayer GetDepthLayer() const override; drape_ptr<SymbolNameZoomInfo> GetBadgeNames() const override; drape_ptr<SymbolOffsets> GetSymbolOffsets() const override; bool GetDepthTestEnabled() const override { return false; } diff --git a/map/track.cpp b/map/track.cpp index 4e82b019dd..89e22471d0 100644 --- a/map/track.cpp +++ b/map/track.cpp @@ -46,9 +46,9 @@ double Track::GetLengthMeters() const return res; } -df::RenderState::DepthLayer Track::GetDepthLayer() const +df::DepthLayer Track::GetDepthLayer() const { - return df::RenderState::UserLineLayer; + return df::DepthLayer::UserLineLayer; } size_t Track::GetLayerCount() const diff --git a/map/track.hpp b/map/track.hpp index f4fcfd986d..f1953a2405 100644 --- a/map/track.hpp +++ b/map/track.hpp @@ -20,7 +20,7 @@ public: double GetLengthMeters() const; int GetMinZoom() const override { return 1; } - df::RenderState::DepthLayer GetDepthLayer() const override; + df::DepthLayer GetDepthLayer() const override; size_t GetLayerCount() const override; dp::Color GetColor(size_t layerIndex) const override; float GetWidth(size_t layerIndex) const override; diff --git a/map/user_mark.cpp b/map/user_mark.cpp index 60d97a8947..b47d5ccc3d 100644 --- a/map/user_mark.cpp +++ b/map/user_mark.cpp @@ -36,9 +36,9 @@ dp::Anchor UserMark::GetAnchor() const return dp::Center; } -df::RenderState::DepthLayer UserMark::GetDepthLayer() const +df::DepthLayer UserMark::GetDepthLayer() const { - return df::RenderState::UserMarkLayer; + return df::DepthLayer::UserMarkLayer; } ms::LatLon UserMark::GetLatLon() const diff --git a/map/user_mark.hpp b/map/user_mark.hpp index f4dced339f..bbd954a8cc 100644 --- a/map/user_mark.hpp +++ b/map/user_mark.hpp @@ -61,7 +61,7 @@ public: dp::Anchor GetAnchor() const override; bool GetDepthTestEnabled() const override { return true; } float GetDepth() const override { return 0.0f; } - df::RenderState::DepthLayer GetDepthLayer() const override; + df::DepthLayer GetDepthLayer() const override; drape_ptr<TitlesInfo> GetTitleDecl() const override { return nullptr; } drape_ptr<ColoredSymbolZoomInfo> GetColoredSymbols() const override { return nullptr; } drape_ptr<SymbolNameZoomInfo> GetBadgeNames() const override { return nullptr; } |