diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-15 15:45:36 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-18 12:33:44 +0300 |
| commit | c0ce77e1df4673fff7cf8b0e4f0af230376c688b (patch) | |
| tree | 7c23d6c5868a0375c73ee28d43ec2fd2804e830a /drape_frontend | |
| parent | 4c87755023e2b7ede757e5b46c43e013f202b346 (diff) | |
Color of my position accuracy changed.
Diffstat (limited to 'drape_frontend')
| -rw-r--r-- | drape_frontend/color_constants.cpp | 4 | ||||
| -rw-r--r-- | drape_frontend/my_position.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp index 060e524f2b..e743bba1c1 100644 --- a/drape_frontend/color_constants.cpp +++ b/drape_frontend/color_constants.cpp @@ -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) }, diff --git a/drape_frontend/my_position.cpp b/drape_frontend/my_position.cpp index ef76067b1f..f3e682fa1e 100644 --- a/drape_frontend/my_position.cpp +++ b/drape_frontend/my_position.cpp @@ -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); } |