From 75b2d08527b986253697455ce3b18b9b6c26f19b Mon Sep 17 00:00:00 2001 From: ExMix Date: Tue, 13 Jan 2015 15:24:09 +0300 Subject: [drape] testing applications stuff --- drape_head/drape_head.pro | 1 - drape_head/drape_surface.hpp | 1 + drape_head/testing_engine.cpp | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drape_head/drape_head.pro b/drape_head/drape_head.pro index fe98fc1de6..9be6d2010f 100644 --- a/drape_head/drape_head.pro +++ b/drape_head/drape_head.pro @@ -11,7 +11,6 @@ TARGET = DrapeHead TEMPLATE = app CONFIG += warn_on QT *= core gui widgets opengl -#DEFINES += USE_TESTING_ENGINE win32* { LIBS += -lopengl32 -lws2_32 -lshell32 -liphlpapi diff --git a/drape_head/drape_surface.hpp b/drape_head/drape_surface.hpp index c9b355dfa9..e695405694 100644 --- a/drape_head/drape_surface.hpp +++ b/drape_head/drape_surface.hpp @@ -10,6 +10,7 @@ #include "../drape/gpu_program_manager.hpp" #include "../drape/uniform_values_storage.hpp" +//#define USE_TESTING_ENGINE #if defined(USE_TESTING_ENGINE) #include "testing_engine.hpp" #define DrapeEngine TestingEngine diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index 0451c921ba..637d04208b 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -406,11 +406,12 @@ void TestingEngine::DrawImpl() 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(101.277071f, 45.9271164f)); + path1.push_back(m2::PointD(101.277071f, 49.9271164f)); path1.push_back(m2::PointD(102.277071f, 40.9271164f)); m2::SharedSpline spl1(path1); - lvp.m_join = dp::BevelJoin; + lvp.m_pattern = dp::TextureManager::TStipplePattern{8, 8}; + lvp.m_join = dp::RoundJoin; lvp.m_cap = dp::RoundCap; lvp.m_color = dp::Color::Black(); LineShape(spl1, lvp).Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer()); -- cgit v1.2.3