organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: [drape] Make path_texts use minVisibleScale for rendering order #4428

Closed
pastk wants to merge 1 commit from pastk-drape-path_text_zoom_mask into master
pull from: pastk-drape-path_text_zoom_mask
merge into: organicmaps:master
Conversation 0 Commits 1 Files changed 3 +1 -6
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drape_frontend/path_text_handle.cpp
View file

@ -348,11 +348,6 @@ void PathTextHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mu
TextHandle::GetAttributeMutation(mutator);
}
uint64_t PathTextHandle::GetPriorityMask() const
{
return dp::kPriorityMaskManual | dp::kPriorityMaskRank;
}
bool PathTextHandle::Enable3dExtention() const
{
// Do not extend overlays for path texts.

1
drape_frontend/path_text_handle.hpp
View file

@ -60,7 +60,6 @@ public:
m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override;
void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override;
void GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const override;
uint64_t GetPriorityMask() const override;
bool Enable3dExtention() const override;
bool HasLinearFeatureShape() const override;

1
drape_frontend/rule_drawer.cpp
View file

@ -363,6 +363,7 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s,
if (needAdditional && !clippedSplines.empty())
{
minVisibleScale = feature::GetMinDrawableScale(f);
ApplyLineFeatureAdditional applyAdditional(m_context->GetTileKey(), insertShape, f.GetID(),
m_currentScaleGtoP, minVisibleScale, f.GetRank(),
s.GetCaptionDescription(), clippedSplines);