diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-07-28 18:41:49 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:09:33 +0300 |
| commit | 1be68b2b557b6cd145fc1372f63f7fd8460534df (patch) | |
| tree | 8674ce66af077d703cb77bf388dcf4112ccde313 /drape_head | |
| parent | be3b4d884d8691a93edb0e8aed74fd012c803630 (diff) | |
Moved line shape building to Read MWM task
Diffstat (limited to 'drape_head')
| -rw-r--r-- | drape_head/testing_engine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index dcb0fa00f4..b4c2b22706 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -193,7 +193,7 @@ public: } }; -class MapShapeFactory +/*class MapShapeFactory { typedef function<MapShape * (json_t *)> TCreateFn; typedef map<string, TCreateFn> TCreatorsMap; @@ -324,7 +324,7 @@ private: private: TCreatorsMap m_creators; -}; +};*/ TestingEngine::TestingEngine(Viewport const & viewport, double vs) : m_viewport(viewport) @@ -463,7 +463,7 @@ void TestingEngine::DrawImpl() lvp.m_color = dp::Color::Red(); lvp.m_width = 16.0f; lvp.m_join = dp::BevelJoin; - LineShape(spline, lvp).Draw(make_ref(m_batcher), make_ref(m_textures)); + LineShape(spline, lvp, make_ref(m_textures)).Draw(make_ref(m_batcher), make_ref(m_textures)); { PathSymbolViewParams p; @@ -494,7 +494,7 @@ void TestingEngine::DrawImpl() lvp.m_join = dp::RoundJoin; lvp.m_cap = dp::RoundCap; lvp.m_color = dp::Color::Black(); - LineShape(spl1, lvp).Draw(make_ref(m_batcher), make_ref(m_textures)); + LineShape(spl1, lvp, make_ref(m_textures)).Draw(make_ref(m_batcher), make_ref(m_textures)); } { @@ -518,7 +518,7 @@ void TestingEngine::DrawImpl() lvpl.m_pattern.clear(); lvpl.m_depth = -10.0f; lvpl.m_width = 2.0f; - LineShape(spl, lvpl).Draw(make_ref(m_batcher), make_ref(m_textures)); + LineShape(spl, lvpl, make_ref(m_textures)).Draw(make_ref(m_batcher), make_ref(m_textures)); DummyMutableLabel tt(m2::PointF(120.0f, 30.0f), "200 km"); tt.Draw(make_ref(m_batcher), make_ref(m_textures)); @@ -537,7 +537,7 @@ void TestingEngine::DrawImpl() lvpl.m_pattern.clear(); lvpl.m_depth = -10.0f; lvpl.m_width = 2.0f; - LineShape(spl, lvpl).Draw(make_ref(m_batcher), make_ref(m_textures)); + LineShape(spl, lvpl, make_ref(m_textures)).Draw(make_ref(m_batcher), make_ref(m_textures)); } dp::FontDecl font(dp::Color::Black(), 14); @@ -577,7 +577,7 @@ void TestingEngine::DrawRects() }; m2::SharedSpline spline(path); - LineShape(spline, lvp).Draw(make_ref(m_batcher), make_ref(m_textures)); + LineShape(spline, lvp, make_ref(m_textures)).Draw(make_ref(m_batcher), make_ref(m_textures)); }; for (m2::RectD const & r : m_boundRects) |