kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[drape] Fix shields' priorities being overriden by pathtexts'

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-08-18 21:09:35 +03:00 • committed by Viktor Govako
parent 7a5212f4c4
commit b09e2e14b6
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drape_frontend/apply_feature_functors.cpp
View file

@ -900,7 +900,8 @@ ApplyLineFeatureAdditional::ApplyLineFeatureAdditional(TileKey const & tileKey,
: TBase(tileKey, insertShape, id, rank, captions)
, m_clippedSplines(clippedSplines)
, m_currentScaleGtoP(static_cast<float>(currentScaleGtoP))
, m_depth(0.0f)
, m_captionDepth(0.0f)
, m_shieldDepth(0.0f)
, m_captionRule(nullptr)
, m_shieldRule(nullptr)
{}
@ -910,15 +911,19 @@ void ApplyLineFeatureAdditional::ProcessLineRule(Stylist::TRuleWrapper const & r
if (m_clippedSplines.empty())
return;
m_depth = rule.m_depth;
ShieldRuleProto const * pShieldRule = rule.m_rule->GetShield();
if (pShieldRule != nullptr)
{
m_shieldRule = pShieldRule;
m_shieldDepth = rule.m_depth;
}
CaptionDefProto const * pCaptionRule = rule.m_rule->GetCaption(0);
if (pCaptionRule != nullptr && pCaptionRule->height() > 2 && !m_captions.GetMainText().empty())
{
m_captionRule = pCaptionRule;
m_captionDepth = rule.m_depth;
}
}
void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureManager> texMng,
@ -946,7 +951,7 @@ void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureMan
UpdateRoadShieldTextFont(font, shield);
textParams.m_tileCenter = m_tileRect.Center();
textParams.m_depthTestEnabled = false;
textParams.m_depth = m_depth;
textParams.m_depth = m_shieldDepth;
textParams.m_depthLayer = DepthLayer::OverlayLayer;
textParams.m_rank = m_rank;
textParams.m_featureId = m_id;
@ -976,7 +981,7 @@ void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureMan
symbolParams.m_featureId = m_id;
symbolParams.m_tileCenter = m_tileRect.Center();
symbolParams.m_depthTestEnabled = true;
symbolParams.m_depth = m_depth;
symbolParams.m_depth = m_shieldDepth;
symbolParams.m_depthLayer = DepthLayer::OverlayLayer;
symbolParams.m_rank = m_rank;
symbolParams.m_anchor = anchor;
@ -1001,8 +1006,9 @@ void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureMan
if (IsSymbolRoadShield(shield))
{
std::string symbolName = GetRoadShieldSymbolName(shield, fontScale);
poiParams.m_featureId = m_id;
poiParams.m_tileCenter = m_tileRect.Center();
poiParams.m_depth = m_depth;
poiParams.m_depth = m_shieldDepth;
poiParams.m_depthTestEnabled = false;
poiParams.m_depthLayer = DepthLayer::OverlayLayer;
poiParams.m_rank = m_rank;
@ -1086,7 +1092,7 @@ void ApplyLineFeatureAdditional::Finish(ref_ptr<dp::TextureManager> texMng,
PathTextViewParams params;
params.m_tileCenter = m_tileRect.Center();
params.m_featureId = m_id;
params.m_depth = m_depth;
params.m_depth = m_captionDepth;
params.m_rank = m_rank;
params.m_mainText = m_captions.GetMainText();
params.m_auxText = m_captions.GetAuxText();
@ -1146,7 +1152,6 @@ void ApplyLineFeatureAdditional::Finish(ref_ptr<dp::TextureManager> texMng,
TextViewParams textParams;
ColoredSymbolViewParams symbolParams;
PoiSymbolViewParams poiParams;
poiParams.m_featureId = m_id;
m2::PointD shieldPixelSize;
GetRoadShieldsViewParams(texMng, shield, shieldIndex, static_cast<uint8_t>(roadShields.size()),
textParams, symbolParams, poiParams, shieldPixelSize);

2
drape_frontend/apply_feature_functors.hpp
View file

@ -206,7 +206,7 @@ private:
std::vector<m2::SharedSpline> m_clippedSplines;
float m_currentScaleGtoP;
float m_depth;
float m_captionDepth, m_shieldDepth;
CaptionDefProto const * m_captionRule;
ShieldRuleProto const * m_shieldRule;
};

3
drape_frontend/text_shape.cpp
View file

@ -427,6 +427,9 @@ void TextShape::DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context,
batcher->InsertListOfStrip(context, state, make_ref(&provider), std::move(handle), 4);
}
// TODO: *Shape classes are concerned with drawing themselves. Its strange they decide/manipulate overlays' priorities
// in the scene. It seems more logical to set priorities beforehand in the creators of *Shapes and pass on final values only.
// Check if such a refactoring makes sense.
uint64_t TextShape::GetOverlayPriority() const
{
// Set up maximum priority for shapes which created by user in the editor and in case of disabling