Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExMix <rahuba.youri@mapswithme.com>2015-02-02 15:32:04 +0300
committerr.kuznetsov <r.kuznetsov@corp.mail.ru>2015-11-30 16:04:02 +0300
commitf4a87c2d851b3973a94553d42857ccb3a86615cc (patch)
tree84301ccc062c08fb56fd9cebde2329116f3e1dad /drape_head
parentda25d3faaf098441fe3f4778b690be21c1287406 (diff)
rebase fix
Diffstat (limited to 'drape_head')
-rw-r--r--drape_head/testing_engine.cpp5
-rw-r--r--drape_head/testing_engine.hpp3
2 files changed, 5 insertions, 3 deletions
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp
index 17e89f10c5..d680ceca88 100644
--- a/drape_head/testing_engine.cpp
+++ b/drape_head/testing_engine.cpp
@@ -251,12 +251,13 @@ private:
TestingEngine::TestingEngine(dp::RefPointer<dp::OGLContextFactory> oglcontextfactory,
Viewport const & viewport,
- MapDataProvider const & model)
+ MapDataProvider const & model,
+ double vs)
: m_contextFactory(oglcontextfactory)
, m_viewport(viewport)
{
GLFunctions::Init();
- df::VisualParams::Init(viewport.GetPixelRatio(), df::CalculateTileSize(viewport.GetWidth(), viewport.GetHeight()));
+ df::VisualParams::Init(vs, df::CalculateTileSize(viewport.GetWidth(), viewport.GetHeight()));
m_contextFactory->getDrawContext()->makeCurrent();
dp::TextureManager::Params params;
diff --git a/drape_head/testing_engine.hpp b/drape_head/testing_engine.hpp
index 7593dfd12f..5d046cb7ec 100644
--- a/drape_head/testing_engine.hpp
+++ b/drape_head/testing_engine.hpp
@@ -23,7 +23,8 @@ class TestingEngine : public QObject
public:
TestingEngine(dp::RefPointer<dp::OGLContextFactory> oglcontextfactory,
Viewport const & viewport,
- MapDataProvider const & model);
+ MapDataProvider const & model,
+ double vs);
~TestingEngine();
void Draw();