From bb40090b78a4d3c380d0de041a98bab75e1e1ad6 Mon Sep 17 00:00:00 2001 From: ExMix Date: Tue, 8 Jul 2014 20:15:33 +0200 Subject: [PATCH] [drape] compile fix --- drape_head/drape_head.pro | 2 +- drape_head/testing_engine.cpp | 14 ++++++-------- drape_head/testing_engine.hpp | 7 +++++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drape_head/drape_head.pro b/drape_head/drape_head.pro index 0d3ac92df8..c20b223f7f 100644 --- a/drape_head/drape_head.pro +++ b/drape_head/drape_head.pro @@ -8,7 +8,7 @@ TARGET = DrapeHead TEMPLATE = app CONFIG += warn_on QT *= core gui widgets -DEFINES += USE_TESTING_ENGINE +#DEFINES += USE_TESTING_ENGINE win32* { LIBS += -lopengl32 -lws2_32 -lshell32 -liphlpapi diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index 965a613f94..cc8cb2f8ac 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -69,21 +69,19 @@ void TestingEngine::Draw() context->present(); } -void TestingEngine::OnSizeChanged(int x0, int y0, int w, int h) +void TestingEngine::Resize(int w, int h) { - m_viewport.SetViewport(x0, y0, w, h); + m_viewport.SetViewport(0, 0, w, h); ModelViewInit(); ProjectionInit(); Draw(); } -void TestingEngine::SetAngle(float radians) -{ - ModelViewInit(); - ProjectionInit(); +void TestingEngine::DragStarted(m2::PointF const & p) {} +void TestingEngine::Drag(m2::PointF const & p) {} +void TestingEngine::DragEnded(m2::PointF const & p) {} +void TestingEngine::Scale(m2::PointF const & p, double factor) {} - Draw(); -} void TestingEngine::DrawImpl() { diff --git a/drape_head/testing_engine.hpp b/drape_head/testing_engine.hpp index b4790fb1a8..977c4e4758 100644 --- a/drape_head/testing_engine.hpp +++ b/drape_head/testing_engine.hpp @@ -21,8 +21,11 @@ public: ~TestingEngine(); void Draw(); - void OnSizeChanged(int x0, int y0, int w, int h); - void SetAngle(float radians); + void Resize(int w, int h); + void DragStarted(m2::PointF const & p); + void Drag(m2::PointF const & p); + void DragEnded(m2::PointF const & p); + void Scale(m2::PointF const & p, double factor); private: void DrawImpl();