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

Color of my position accuracy changed.

Browse source
This commit is contained in:
Daria Volvenkova 2016-07-15 15:45:36 +03:00
parent 4c87755023
commit c0ce77e1df
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape_frontend/color_constants.cpp
View file

@ -13,7 +13,7 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
{ MapStyleClear,
{
{ GuiText, dp::Color(77, 77, 77, 221) },
{ MyPositionAccuracy, dp::Color(30, 150, 240, 20) },
{ MyPositionAccuracy, dp::Color(0, 0, 0, 20) },
{ Selection, dp::Color(30, 150, 240, 164) },
{ Route, dp::Color(21, 121, 244, 204) },
{ RoutePedestrian, dp::Color(29, 51, 158, 204) },
@ -29,7 +29,7 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
{ MapStyleDark,
{
{ GuiText, dp::Color(255, 255, 255, 178) },
{ MyPositionAccuracy, dp::Color(255, 230, 140, 20) },
{ MyPositionAccuracy, dp::Color(255, 255, 255, 15) },
{ Selection, dp::Color(255, 230, 140, 164) },
{ Route, dp::Color(255, 202, 40, 180) },
{ RoutePedestrian, dp::Color(255, 152, 0, 180) },

4
drape_frontend/my_position.cpp
View file

@ -103,9 +103,9 @@ void MyPosition::RenderAccuracy(ScreenBase const & screen,
m2::PointD accuracyPoint(m_position.x + m_accuracy, m_position.y);
float pixelAccuracy = (screen.GtoP(accuracyPoint) - screen.GtoP(m_position)).Length();
uniforms.SetFloatValue("u_position", m_position.x, m_position.y, dp::depth::POSITION_ACCURACY);
uniforms.SetFloatValue("u_position", m_position.x, m_position.y, 0.0f);
uniforms.SetFloatValue("u_accuracy", pixelAccuracy);
uniforms.SetFloatValue("u_opacity", 1.0);
uniforms.SetFloatValue("u_opacity", 1.0f);
RenderPart(mng, uniforms, MY_POSITION_ACCURACY);
}