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

Fixed stubs displacement.

Browse source
This commit is contained in:
Daria Volvenkova 2018-07-03 13:11:35 +03:00 • committed by Roman Kuznetsov
parent a77d984bde
commit a82f30f470
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drape_frontend/transit_scheme_builder.cpp
View file

@ -683,7 +683,7 @@ void TransitSchemeBuilder::GenerateStop(StopNodeParams const & params, m2::Point
}
void TransitSchemeBuilder::GenerateTitles(StopNodeParams const & stopParams, m2::PointD const & pivot,
vector<m2::PointF> const & markerSizes,
std::vector<m2::PointF> const & markerSizes,
ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher)
{
auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
@ -701,6 +701,11 @@ void TransitSchemeBuilder::GenerateTitles(StopNodeParams const & stopParams, m2:
ASSERT_LESS_OR_EQUAL(priority, static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMax
: Priority::StopMax), ());
std::vector<m2::PointF> symbolSizes;
symbolSizes.reserve(markerSizes.size());
for (auto const & sz : markerSizes)
symbolSizes.push_back(sz * 1.1f);
dp::TitleDecl titleDecl;
titleDecl.m_primaryOptional = true;
titleDecl.m_primaryTextFont.m_color = df::GetColorConstant(kTransitMarkText);
@ -722,7 +727,7 @@ void TransitSchemeBuilder::GenerateTitles(StopNodeParams const & stopParams, m2:
textParams.m_specialPriority = priority;
textParams.m_startOverlayRank = dp::OverlayRank0;
TextShape(stopParams.m_pivot, textParams, TileKey(), markerSizes, title.m_offset, dp::Center, kTransitOverlayIndex)
TextShape(stopParams.m_pivot, textParams, TileKey(), symbolSizes, title.m_offset, dp::Center, kTransitOverlayIndex)
.Draw(&batcher, textures);
}

5
drape_frontend/transit_scheme_builder.hpp
View file

@ -158,8 +158,9 @@ private:
void GenerateStop(StopNodeParams const & params, m2::PointD const & pivot,
std::map<routing::transit::LineId, LineParams> const & lines, dp::Batcher & batcher);
void GenerateTitles(StopNodeParams const & params, m2::PointD const & pivot, vector<m2::PointF> const & markerSizes,
ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher);
void GenerateTitles(StopNodeParams const & params, m2::PointD const & pivot,
std::vector<m2::PointF> const & markerSizes, ref_ptr<dp::TextureManager> textures,
dp::Batcher & batcher);
void GenerateLine(std::vector<m2::PointD> const & path, m2::PointD const & pivot, dp::Color const & colorConst,
float lineOffset, float halfWidth, float depth, dp::Batcher & batcher);

3
drape_frontend/transit_scheme_renderer.cpp
View file

@ -140,7 +140,8 @@ void TransitSchemeRenderer::RenderTransit(ScreenBase const & screen, int zoomLev
StencilWriterGuard guard(postprocessRenderer);
RenderText(screen, mng, commonUniforms);
}
RenderStubs(screen, mng, commonUniforms);
// Render only for debug purpose.
//RenderStubs(screen, mng, commonUniforms);
}
void TransitSchemeRenderer::CollectOverlays(ref_ptr<dp::OverlayTree> tree, ScreenBase const & modelView)