pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape] Make m_depth use float everywhere

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-02-05 09:25:00 +00:00 • committed by Viktor Govako
parent 9830a8bd44
commit e9731f6fdc
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drape_frontend/apply_feature_functors.cpp
View file

@ -398,12 +398,12 @@ BaseApplyFeature::BaseApplyFeature(TileKey const & tileKey, TInsertShapeFn const
void BaseApplyFeature::ExtractCaptionParams(CaptionDefProto const * primaryProto,
CaptionDefProto const * secondaryProto,
double depth, TextViewParams & params) const
float depth, TextViewParams & params) const
{
dp::FontDecl decl;
CaptionDefProtoToFontDecl(primaryProto, decl);
params.m_depth = static_cast<float>(depth);
params.m_depth = depth;
params.m_featureId = m_id;
auto & titleDecl = params.m_titleDecl;
@ -509,7 +509,7 @@ void ApplyPointFeature::Finish(ref_ptr<dp::TextureManager> texMng)
params.m_tileCenter = m_tileRect.Center();
params.m_depthTestEnabled = m_depthLayer != DepthLayer::NavigationLayer &&
m_depthLayer != DepthLayer::OverlayLayer;
params.m_depth = static_cast<float>(m_symbolDepth);
params.m_depth = m_symbolDepth;
params.m_depthLayer = m_depthLayer;
params.m_minVisibleScale = m_minVisibleScale;
params.m_rank = m_rank;
@ -738,7 +738,7 @@ void ApplyAreaFeature::ProcessAreaRule(Stylist::TRuleWrapper const & rule)
{
AreaViewParams params;
params.m_tileCenter = m_tileRect.Center();
params.m_depth = static_cast<float>(rule.m_depth);
params.m_depth = rule.m_depth;
params.m_color = ToDrapeColor(areaRule->color());
params.m_minVisibleScale = m_minVisibleScale;
params.m_rank = m_rank;
@ -862,7 +862,7 @@ void ApplyLineFeatureGeometry::ProcessLineRule(Stylist::TRuleWrapper const & rul
PathSymProto const & symRule = pLineRule->pathsym();
PathSymbolViewParams params;
params.m_tileCenter = m_tileRect.Center();
params.m_depth = static_cast<float>(rule.m_depth);
params.m_depth = rule.m_depth;
params.m_minVisibleScale = m_minVisibleScale;
params.m_rank = m_rank;
params.m_symbolName = symRule.name();
@ -879,7 +879,7 @@ void ApplyLineFeatureGeometry::ProcessLineRule(Stylist::TRuleWrapper const & rul
LineViewParams params;
params.m_tileCenter = m_tileRect.Center();
Extract(pLineRule, params);
params.m_depth = static_cast<float>(rule.m_depth);
params.m_depth = rule.m_depth;
params.m_minVisibleScale = m_minVisibleScale;
params.m_rank = m_rank;
params.m_baseGtoPScale = m_currentScaleGtoP;
@ -917,7 +917,7 @@ void ApplyLineFeatureAdditional::ProcessLineRule(Stylist::TRuleWrapper const & r
if (m_clippedSplines.empty())
return;
m_depth = static_cast<float>(rule.m_depth);
m_depth = rule.m_depth;
ShieldRuleProto const * pShieldRule = rule.m_rule->GetShield();
if (pShieldRule != nullptr)

4
drape_frontend/apply_feature_functors.hpp
View file

@ -49,7 +49,7 @@ public:
protected:
void ExtractCaptionParams(CaptionDefProto const * primaryProto,
CaptionDefProto const * secondaryProto,
double depth, TextViewParams & params) const;
float depth, TextViewParams & params) const;
std::string ExtractHotelInfo() const;
TInsertShapeFn m_insertShape;
@ -85,7 +85,7 @@ private:
bool m_createdByEditor;
bool m_obsoleteInEditor;
DepthLayer m_depthLayer;
double m_symbolDepth;
float m_symbolDepth;
SymbolRuleProto const * m_symbolRule;
m2::PointF m_centerPoint;
std::vector<TextViewParams> m_textParams;

6
drape_frontend/stylist.cpp
View file

@ -45,7 +45,7 @@ inline drule::rule_type_t Convert(Type t)
}
}
double constexpr kMinPriority = std::numeric_limits<double>::lowest();
float constexpr kMinPriority = std::numeric_limits<float>::lowest();
inline bool IsTypeOf(drule::Key const & key, int flags)
{
@ -138,7 +138,7 @@ private:
if (lineRule != nullptr && (lineRule->width() < 1e-5 && !lineRule->has_pathsym()))
return;
m_rules.push_back({ dRule, depth, key.m_hatching });
m_rules.push_back({ dRule, static_cast<float>(depth), key.m_hatching });
}
void Init()
@ -355,7 +355,7 @@ double GetFeaturePriority(FeatureType & f, int const zoomLevel)
Aggregator aggregator(f, types.GetGeomType(), zoomLevel, keys.size());
aggregator.AggregateKeys(keys);
double maxPriority = kMinPriority;
float maxPriority = kMinPriority;
for (auto const & rule : aggregator.m_rules)
{
if (rule.m_depth > maxPriority)

2
drape_frontend/stylist.hpp
View file

@ -62,7 +62,7 @@ public:
struct TRuleWrapper
{
drule::BaseRule const * m_rule;
double m_depth;
float m_depth;
bool m_hatching;
};