From 4c39f293349250a8a6f8d67b86ab0413f41a6e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 14 Jan 2018 00:39:35 -0300 Subject: [PATCH] Clean up. --HG-- branch : dev-2.1 --- include/eepp/ui/uinode.hpp | 4 ---- src/eepp/math/interpolation1d.cpp | 2 +- src/examples/empty_window/empty_window.cpp | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/eepp/ui/uinode.hpp b/include/eepp/ui/uinode.hpp index 1b53b0384..131cb2c26 100644 --- a/include/eepp/ui/uinode.hpp +++ b/include/eepp/ui/uinode.hpp @@ -400,10 +400,6 @@ class EE_API UINode { OriginPoint mScaleOriginPoint; Float mAlpha; - Interpolation1d * mAngleAnim; - Interpolation2d * mScaleAnim; - Interpolation2d * mMoveAnim; - UIActionManager * mActionManager; virtual Uint32 onMessage( const UIMessage * Msg ); diff --git a/src/eepp/math/interpolation1d.cpp b/src/eepp/math/interpolation1d.cpp index 629776bd3..00b2f7c0b 100644 --- a/src/eepp/math/interpolation1d.cpp +++ b/src/eepp/math/interpolation1d.cpp @@ -35,9 +35,9 @@ Interpolation1d::Interpolation1d( std::vector points ) : mCurPoint(0), mCurTime(Time::Zero), mSpeed(1.3f), + mPoints(points), mActP(NULL), mNexP(NULL), - mPoints(points), mOnPathEndCallback(), mOnStepCallback() { diff --git a/src/examples/empty_window/empty_window.cpp b/src/examples/empty_window/empty_window.cpp index 62005d04c..3847069ff 100644 --- a/src/examples/empty_window/empty_window.cpp +++ b/src/examples/empty_window/empty_window.cpp @@ -23,7 +23,7 @@ void mainLoop() } // Draw a circle - p.drawCircle( Vector2f( win->getWidth() * 0.5f, win->getHeight() * 0.5f ), 200, 60 ); + p.drawCircle( win->getCenter(), 200, 60 ); // Draw frame win->display();