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

Fixed displaying of lines from KML

Browse source
This commit is contained in:
r.kuznetsov 2016-09-27 19:03:19 +03:00
parent f2384db29f
commit e2e167cf93
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drape_frontend/frontend_renderer.cpp
View file

@ -1161,9 +1161,11 @@ void FrontendRenderer::RenderUserMarksLayer(ScreenBase const & modelView)
for (auto const & group : m_userMarkRenderGroups)
{
ASSERT(group.get() != nullptr, ());
if (m_userMarkVisibility.find(group->GetLayerId()) != m_userMarkVisibility.end() &&
screenRect.IsIntersect(group->GetTileKey().GetGlobalRect()))
RenderSingleGroup(modelView, make_ref(group));
if (m_userMarkVisibility.find(group->GetLayerId()) != m_userMarkVisibility.end())
{
if (!group->CanBeClipped() || screenRect.IsIntersect(group->GetTileKey().GetGlobalRect()))
RenderSingleGroup(modelView, make_ref(group));
}
}
}

5
drape_frontend/render_group.cpp
View file

@ -242,6 +242,11 @@ size_t UserMarkRenderGroup::GetLayerId() const
return m_layerId;
}
bool UserMarkRenderGroup::CanBeClipped() const
{
return m_state.GetProgramIndex() != gpu::LINE_PROGRAM;
}
string DebugPrint(RenderGroup const & group)
{
ostringstream out;

2
drape_frontend/render_group.hpp
View file

@ -105,6 +105,8 @@ public:
size_t GetLayerId() const;
bool CanBeClipped() const;
private:
drape_ptr<dp::RenderBucket> m_renderBucket;
unique_ptr<OpacityAnimation> m_animation;