diff options
author | ExMix <rahuba.youri@mapswithme.com> | 2015-06-15 16:15:40 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:08:36 +0300 |
commit | 9f2f464e5366e5ca9b4f20263dde1e35df51f02f (patch) | |
tree | 6850a8c6268c8e76d046ca80ef571adc19d6324e /drape_head | |
parent | adfb65e70eb8e20b89168bae14b3edeb76cb7271 (diff) |
[drape] code from drape_gui lib have moved to drape_frontend lib.
Show/Hide animations for Copyright, Compass and ruler
Diffstat (limited to 'drape_head')
-rw-r--r-- | drape_head/testing_engine.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index 1d1fb62e4f..d0b06d054f 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -3,6 +3,8 @@ #include "coding/file_reader.hpp" #include "platform/platform.hpp" +#include "drape_frontend/gui/gui_text.hpp" + #include "drape_frontend/visual_params.hpp" #include "drape_frontend/line_shape.hpp" #include "drape_frontend/text_shape.hpp" @@ -13,9 +15,6 @@ #include "drape_frontend/circle_shape.hpp" #include "drape_frontend/poi_symbol_shape.hpp" -#include "drape_gui/drape_gui.hpp" -#include "drape_gui/gui_text.hpp" - #include "drape/utils/vertex_decl.hpp" #include "drape/glsl_types.hpp" #include "drape/vertex_array_buffer.hpp" @@ -336,18 +335,6 @@ TestingEngine::TestingEngine(ref_ptr<dp::OGLContextFactory> oglcontextfactory, m_contextFactory->getDrawContext()->makeCurrent(); df::VisualParams::Init(vs, df::CalculateTileSize(viewport.GetWidth(), viewport.GetHeight())); - gui::DrapeGui::TScaleFactorFn scaleFn = []() - { - return df::VisualParams::Instance().GetVisualScale(); - }; - - gui::DrapeGui::TGeneralizationLevelFn genLvlFn = [](ScreenBase const & screen) - { - return df::GetDrawTileScale(screen); - }; - - gui::DrapeGui::Instance().Init(scaleFn, genLvlFn); - GLFunctions::Init(); dp::TextureManager::Params params; |