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

Added color constants for night theme

Browse source
This commit is contained in:
r.kuznetsov 2015-12-31 16:50:25 +03:00 • committed by Constantin Shalnev
parent 790d863496
commit fc74c1ffc0
9 changed files with 112 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
drape_frontend/color_constants.cpp Normal file
View file

@ -0,0 +1,56 @@
#include "drape_frontend/color_constants.hpp"
#include "base/assert.hpp"
#include "std/array.hpp"
#include "std/unordered_map.hpp"
namespace df
{
unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
{
{ MapStyleClear,
{
{ DownloadButton, dp::Color(0, 0, 0, 0.44 * 255) },
{ DownloadButtonRouting, dp::Color(32, 152, 82, 255) },
{ DownloadButtonPressed, dp::Color(0, 0, 0, 0.72 * 255) },
{ DownloadButtonRoutingPressed, dp::Color(24, 128, 68, 255) },
{ GuiText, dp::Color(0x4D, 0x4D, 0x4D, 0xDD) },
{ MyPositionAccuracy, dp::Color(30, 150, 240, 20) },
{ Selection, dp::Color(0x17, 0xBF, 0x8E, 0x6F) },
{ Route, dp::Color(30, 150, 240, 204) },
{ RoutePedestrian, dp::Color(5, 105, 175, 204) },
}
},
{ MapStyleDark,
{
{ DownloadButton, dp::Color(0, 0, 0, 0.44 * 255) },
{ DownloadButtonRouting, dp::Color(32, 152, 82, 255) },
{ DownloadButtonPressed, dp::Color(0, 0, 0, 0.72 * 255) },
{ DownloadButtonRoutingPressed, dp::Color(24, 128, 68, 255) },
{ GuiText, dp::Color(0x4D, 0x4D, 0x4D, 0xDD) },
{ MyPositionAccuracy, dp::Color(30, 150, 240, 20) },
{ Selection, dp::Color(0x17, 0xBF, 0x8E, 0x6F) },
{ Route, dp::Color(30, 150, 240, 204) },
{ RoutePedestrian, dp::Color(5, 105, 175, 204) },
}
},
};
dp::Color GetColorConstant(MapStyle style, ColorConstant constant)
{
// "Light" and "clear" theme share the same colors.
if (style == MapStyle::MapStyleLight)
style = MapStyle::MapStyleClear;
int const styleIndex = static_cast<int>(style);
int const colorIndex = static_cast<int>(constant);
ASSERT(kColorConstants.find(styleIndex) != kColorConstants.end(), ());
ASSERT(kColorConstants[styleIndex].find(colorIndex) != kColorConstants[styleIndex].end(), ());
return kColorConstants[styleIndex][colorIndex];
}
} // namespace df

25
drape_frontend/color_constants.hpp Normal file
View file

@ -0,0 +1,25 @@
#pragma once
#include "drape/color.hpp"
#include "indexer/map_style.hpp"
namespace df
{
enum ColorConstant
{
DownloadButton,
DownloadButtonRouting,
DownloadButtonPressed,
DownloadButtonRoutingPressed,
GuiText,
MyPositionAccuracy,
Selection,
Route,
RoutePedestrian,
};
dp::Color GetColorConstant(MapStyle style, ColorConstant constant);
} // namespace df

2
drape_frontend/drape_frontend.pro
View file

@ -38,6 +38,7 @@ SOURCES += \
base_renderer.cpp \
batchers_pool.cpp \
circle_shape.cpp \
color_constants.cpp \
drape_engine.cpp \
engine_context.cpp \
framebuffer.cpp \
@ -124,6 +125,7 @@ HEADERS += \
base_renderer.hpp \
batchers_pool.hpp \
circle_shape.hpp \
color_constants.hpp \
drape_engine.hpp \
engine_context.hpp \
framebuffer.hpp \

12
drape_frontend/gui/country_status.cpp
View file

@ -3,11 +3,14 @@
#include "drape_gui.hpp"
#include "gui_text.hpp"
#include "drape_frontend/color_constants.hpp"
#include "drape_frontend/visual_params.hpp"
#include "drape/batcher.hpp"
#include "drape/glsl_func.hpp"
#include "indexer/map_style_reader.hpp"
#include "std/algorithm.hpp"
#include "std/bind.hpp"
@ -211,12 +214,13 @@ drape_ptr<ShapeRenderer> CountryStatus::Draw(ref_ptr<dp::TextureManager> tex,
params.m_margin = 5.0f * visualScale;
params.m_facet = 8.0f * visualScale;
auto color = dp::Color(0, 0, 0, 0.44 * 255);
auto pressedColor = dp::Color(0, 0, 0, 0.72 * 255);
MapStyle style = GetStyleReader().GetCurrentStyle();
auto color = df::GetColorConstant(style, df::DownloadButton);
auto pressedColor = df::GetColorConstant(style, df::DownloadButtonPressed);
if (control.m_buttonType == CountryStatusHelper::BUTTON_TYPE_MAP_ROUTING)
{
color = dp::Color(32, 152, 82, 255);
pressedColor = dp::Color(24, 128, 68, 255);
color = df::GetColorConstant(style, df::DownloadButtonRouting);
pressedColor = df::GetColorConstant(style, df::DownloadButtonRoutingPressed);
}
auto const buttonHandlerIt = buttonHandlers.find(control.m_buttonType);

8
drape_frontend/gui/drape_gui.cpp
View file

@ -2,8 +2,11 @@
#include "drape_gui.hpp"
#include "ruler_helper.hpp"
#include "drape_frontend/color_constants.hpp"
#include "drape_frontend/visual_params.hpp"
#include "indexer/map_style_reader.hpp"
#include "base/assert.hpp"
namespace gui
@ -42,10 +45,9 @@ CountryStatusHelper & DrapeGui::GetCountryStatusHelper()
return Instance().GetCountryStatusHelperImpl();
}
dp::FontDecl const & DrapeGui::GetGuiTextFont()
dp::FontDecl DrapeGui::GetGuiTextFont()
{
static dp::FontDecl font(dp::Color(0x4D, 0x4D, 0x4D, 0xDD), 14);
return font;
return dp::FontDecl(df::GetColorConstant(GetStyleReader().GetCurrentStyle(), df::GuiText), 14);
}
void DrapeGui::Destroy()

2
drape_frontend/gui/drape_gui.hpp
View file

@ -31,7 +31,7 @@ public:
static RulerHelper & GetRulerHelper();
static CountryStatusHelper & GetCountryStatusHelper();
static dp::FontDecl const & GetGuiTextFont();
static dp::FontDecl GetGuiTextFont();
void SetLocalizator(TLocalizeStringFn const & fn);
void Destroy();

7
drape_frontend/my_position.cpp
View file

@ -1,4 +1,5 @@
#include "my_position.hpp"
#include "drape_frontend/my_position.hpp"
#include "drape_frontend/color_constants.hpp"
#include "drape/depth_constants.hpp"
#include "drape/glsl_func.hpp"
@ -7,6 +8,8 @@
#include "drape/render_bucket.hpp"
#include "drape/shader_def.hpp"
#include "indexer/map_style_reader.hpp"
namespace df
{
@ -128,7 +131,7 @@ void MyPosition::CacheAccuracySector(ref_ptr<dp::TextureManager> mng)
float const etalonSector = math::twicePi / static_cast<double>(TriangleCount);
dp::TextureManager::ColorRegion color;
mng->GetColorRegion(dp::Color(30, 150, 240, 20), color);
mng->GetColorRegion(df::GetColorConstant(GetStyleReader().GetCurrentStyle(), df::MyPositionAccuracy), color);
glsl::vec2 colorCoord = glsl::ToVec2(color.GetTexRect().Center());
buffer_vector<Vertex, TriangleCount> buffer;

9
drape_frontend/selection_shape.cpp
View file

@ -1,5 +1,6 @@
#include "selection_shape.hpp"
#include "visual_params.hpp"
#include "drape_frontend/selection_shape.hpp"
#include "drape_frontend/color_constants.hpp"
#include "drape_frontend/visual_params.hpp"
#include "drape/attribute_provider.hpp"
#include "drape/batcher.hpp"
@ -11,6 +12,8 @@
#include "drape/texture_manager.hpp"
#include "drape/uniform_values_storage.hpp"
#include "indexer/map_style_reader.hpp"
namespace df
{
@ -63,7 +66,7 @@ SelectionShape::SelectionShape(ref_ptr<dp::TextureManager> mng)
float const etalonSector = math::twicePi / static_cast<double>(TriangleCount);
dp::TextureManager::ColorRegion color;
mng->GetColorRegion(dp::Color(0x17, 0xBF, 0x8E, 0x6F), color);
mng->GetColorRegion(df::GetColorConstant(GetStyleReader().GetCurrentStyle(), df::Selection), color);
glsl::vec2 colorCoord = glsl::ToVec2(color.GetTexRect().Center());
buffer_vector<Vertex, TriangleCount> buffer;

6
map/framework.cpp
View file

@ -18,9 +18,11 @@
#include "search/search_engine.hpp"
#include "search/search_query_factory.hpp"
#include "drape_frontend/color_constants.hpp"
#include "drape_frontend/gps_track_point.hpp"
#include "drape_frontend/gui/country_status_helper.hpp"
#include "drape_frontend/visual_params.hpp"
#include "drape_frontend/gui/country_status_helper.hpp"
#include "drape_frontend/watch/cpu_drawer.hpp"
#include "drape_frontend/watch/feature_processor.hpp"
@ -2043,9 +2045,9 @@ void Framework::InsertRoute(Route const & route)
dp::Color routeColor;
if (m_currentRouterType == RouterType::Pedestrian)
routeColor = dp::Color(5, 105, 175, 204);
routeColor = df::GetColorConstant(GetMapStyle(), df::RoutePedestrian);
else
routeColor = dp::Color(30, 150, 240, 204);
routeColor = df::GetColorConstant(GetMapStyle(), df::Route);
m_drapeEngine->AddRoute(route.GetPoly(), turns, routeColor);
}