diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-06-02 12:00:51 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:08:33 +0300 |
| commit | 2f4e0b1caef8dbeb587e3cee05929e7e38748229 (patch) | |
| tree | 516a1804f8632c886fe2d74c05d0df04190476ee /drape_head | |
| parent | a79643d279e58944ab7386f4d670ca193a2a30b7 (diff) | |
Fixed drape_head
Diffstat (limited to 'drape_head')
| -rw-r--r-- | drape_head/testing_engine.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index d0bc986faa..bce3b7d30d 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -443,6 +443,8 @@ void TestingEngine::timerEvent(QTimerEvent * e) void TestingEngine::DrawImpl() { + m_generalUniforms.SetFloatValue("u_opacity", 1.0f); + dp::Batcher::TFlushFn flushFn = bind(&df::TestingEngine::OnFlushData, this, _1, _2); m_batcher->StartSession(flushFn); dp::FontDecl fd; @@ -462,7 +464,7 @@ void TestingEngine::DrawImpl() params.m_primaryTextFont = fd; params.m_secondaryTextFont = auxFd; params.m_secondaryText = "Народная Китайская республика"; - TextShape sh1(m2::PointF(82.277071f, 56.9271164f), params); + TextShape sh1(m2::PointF(82.277071f, 46.9271164f), params); sh1.Draw(make_ref(m_batcher), make_ref(m_textures)); vector<m2::PointD> path; @@ -499,12 +501,17 @@ void TestingEngine::DrawImpl() { vector<m2::PointD> path1; + path1.push_back(m2::PointD(92.277071f, 47.9271164f)); path1.push_back(m2::PointD(92.277071f, 45.9271164f)); path1.push_back(m2::PointD(98.277071f, 45.9271164f)); path1.push_back(m2::PointD(98.277071f, 40.9271164f)); - path1.push_back(m2::PointD(100.277071f, 38.9271164f)); + path1.push_back(m2::PointD(100.277071f, 42.9271164f)); path1.push_back(m2::PointD(101.277071f, 49.9271164f)); path1.push_back(m2::PointD(102.277071f, 40.9271164f)); + path1.push_back(m2::PointD(105.277071f, 40.9271164f)); + path1.push_back(m2::PointD(101.277071f, 35.9271164f)); + path1.push_back(m2::PointD(90.277071f, 35.9271164f)); + path1.push_back(m2::PointD(89.277071f, 33.9271164f)); m2::SharedSpline spl1(path1); lvp.m_pattern = dp::TextureManager::TStipplePattern{8, 8}; @@ -614,7 +621,7 @@ void TestingEngine::ModelViewInit() math::Matrix<double, 3, 3> m { 34.1554f, 0.0f, 0.0f, 0.0f, -34.1554f, 0.0f, - -2639.46f, 2080.99f, 1.0f}; + -2639.46f, 1800.99f, 1.0f}; // math::Matrix<double, 3, 3> m = math::Inverse(math::Shift( // math::Rotate( |