From ec234c35277db4e85627149d0cee04761cb27392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Mon, 12 Feb 2018 04:45:39 -0300 Subject: [PATCH] Minor fixes. --HG-- branch : dev-scenenode --- include/eepp/scene/event.hpp | 4 ++-- include/eepp/scene/eventdispatcher.hpp | 4 ++-- include/eepp/scene/mouseevent.hpp | 2 +- include/eepp/scene/node.hpp | 2 +- include/eepp/scene/nodemessage.hpp | 2 +- include/eepp/scene/scenemanager.hpp | 2 +- src/eepp/scene/event.cpp | 6 +++--- src/eepp/scene/eventdispatcher.cpp | 10 +++++----- src/eepp/scene/mouseevent.cpp | 10 ++++------ src/eepp/scene/nodemessage.cpp | 4 ++-- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/include/eepp/scene/event.hpp b/include/eepp/scene/event.hpp index 3e2a431f4..6dc3fa358 100644 --- a/include/eepp/scene/event.hpp +++ b/include/eepp/scene/event.hpp @@ -56,7 +56,7 @@ class EE_API Event { NoEvent = eeINDEX_NOT_FOUND }; - Event( Node * control, const Uint32& eventType = NoEvent ); + Event( Node * node, const Uint32& eventType = NoEvent ); ~Event(); @@ -64,7 +64,7 @@ class EE_API Event { const Uint32& getType() const; protected: - Node * mCtrl; + Node * mNode; Uint32 mEventType; }; diff --git a/include/eepp/scene/eventdispatcher.hpp b/include/eepp/scene/eventdispatcher.hpp index dccbb91e5..0ad470d9f 100644 --- a/include/eepp/scene/eventdispatcher.hpp +++ b/include/eepp/scene/eventdispatcher.hpp @@ -19,7 +19,7 @@ namespace EE { namespace Scene { class Node; class SceneNode; -class EventDispatcher { +class EE_API EventDispatcher { public: static EventDispatcher * New( SceneNode * sceneNode ); @@ -75,7 +75,7 @@ class EventDispatcher { protected: EE::Window::Window *mWindow; Input * mInput; - SceneNode * mControl; + SceneNode * mSceneNode; Node * mFocusControl; Node * mOverControl; Node * mDownControl; diff --git a/include/eepp/scene/mouseevent.hpp b/include/eepp/scene/mouseevent.hpp index d4b581939..78131d1e6 100644 --- a/include/eepp/scene/mouseevent.hpp +++ b/include/eepp/scene/mouseevent.hpp @@ -9,7 +9,7 @@ namespace EE { namespace Scene { class EE_API MouseEvent : public Event { public: - MouseEvent( Node * getNode, const Uint32& EventNum, const Vector2i& Pos, const Uint32& getFlags ); + MouseEvent( Node * node, const Uint32& EventNum, const Vector2i& Pos, const Uint32& getFlags ); ~MouseEvent(); diff --git a/include/eepp/scene/node.hpp b/include/eepp/scene/node.hpp index 940f7db8f..f2638424b 100644 --- a/include/eepp/scene/node.hpp +++ b/include/eepp/scene/node.hpp @@ -314,7 +314,7 @@ class EE_API Node : public Transformable { virtual void invalidate(); protected: typedef std::map< Uint32, std::map > EventsMap; - friend class EE::Scene::EventDispatcher; + friend class EventDispatcher; std::string mId; Uint32 mIdHash; diff --git a/include/eepp/scene/nodemessage.hpp b/include/eepp/scene/nodemessage.hpp index bb8579e91..2e06073b1 100644 --- a/include/eepp/scene/nodemessage.hpp +++ b/include/eepp/scene/nodemessage.hpp @@ -39,7 +39,7 @@ class EE_API NodeMessage { const Uint32& getFlags() const; private: - Node * mCtrl; + Node * mNode; Uint32 mMsg; Uint32 mFlags; }; diff --git a/include/eepp/scene/scenemanager.hpp b/include/eepp/scene/scenemanager.hpp index b7a1cb7cf..c9181630c 100644 --- a/include/eepp/scene/scenemanager.hpp +++ b/include/eepp/scene/scenemanager.hpp @@ -16,7 +16,7 @@ namespace EE { namespace Scene { class SceneNode; -class SceneManager : public Container { +class EE_API SceneManager : public Container { SINGLETON_DECLARE_HEADERS(SceneManager) public: SceneManager(); diff --git a/src/eepp/scene/event.cpp b/src/eepp/scene/event.cpp index 598ca10b8..4282f6993 100644 --- a/src/eepp/scene/event.cpp +++ b/src/eepp/scene/event.cpp @@ -3,8 +3,8 @@ namespace EE { namespace Scene { -Event::Event( Node * control, const Uint32& eventType ) : - mCtrl( control ), +Event::Event( Node * node, const Uint32& eventType ) : + mNode( node ), mEventType( eventType ) { } @@ -14,7 +14,7 @@ Event::~Event() } Node * Event::getNode() const { - return mCtrl; + return mNode; } const Uint32& Event::getType() const { diff --git a/src/eepp/scene/eventdispatcher.cpp b/src/eepp/scene/eventdispatcher.cpp index e61ff2d15..8b8730445 100644 --- a/src/eepp/scene/eventdispatcher.cpp +++ b/src/eepp/scene/eventdispatcher.cpp @@ -14,7 +14,7 @@ EventDispatcher * EventDispatcher::New( SceneNode * sceneNode ) { EventDispatcher::EventDispatcher( SceneNode * sceneNode ) : mWindow( sceneNode->getWindow() ), mInput( mWindow->getInput() ), - mControl( sceneNode ), + mSceneNode( sceneNode ), mFocusControl( sceneNode ), mOverControl( NULL ), mDownControl( NULL ), @@ -46,8 +46,8 @@ void EventDispatcher::inputCallback( InputEvent * Event ) { case InputEvent::VideoResize: case InputEvent::VideoExpose: { - if ( NULL != mControl ) - mControl->invalidate(); + if ( NULL != mSceneNode ) + mSceneNode->invalidate(); } } } @@ -58,7 +58,7 @@ void EventDispatcher::update( const Time& elapsed ) { mMousePos = mInput->getMousePosFromView( mWindow->getDefaultView() ); mMousePosi = mMousePos.asInt(); - Node * pOver = mControl->overFind( mMousePos ); + Node * pOver = mSceneNode->overFind( mMousePos ); if ( pOver != mOverControl ) { if ( NULL != mOverControl ) { @@ -238,7 +238,7 @@ Vector2f EventDispatcher::getMousePosf() { } SceneNode *EventDispatcher::getSceneNode() const { - return mControl; + return mSceneNode; } }} diff --git a/src/eepp/scene/mouseevent.cpp b/src/eepp/scene/mouseevent.cpp index b2a50a218..24fc2a3ee 100644 --- a/src/eepp/scene/mouseevent.cpp +++ b/src/eepp/scene/mouseevent.cpp @@ -3,16 +3,14 @@ namespace EE { namespace Scene { -MouseEvent::MouseEvent( Node * Ctrl, const Uint32& EventNum, const Vector2i& Pos, const Uint32& Flags ) : - Event( Ctrl, EventNum ), +MouseEvent::MouseEvent( Node * node, const Uint32& EventNum, const Vector2i& Pos, const Uint32& Flags ) : + Event( node, EventNum ), mPos( Pos ), mFlags( Flags ) -{ -} +{} MouseEvent::~MouseEvent() -{ -} +{} const Vector2i& MouseEvent::getPosition() const { return mPos; diff --git a/src/eepp/scene/nodemessage.cpp b/src/eepp/scene/nodemessage.cpp index e798bb9df..4b211cd57 100644 --- a/src/eepp/scene/nodemessage.cpp +++ b/src/eepp/scene/nodemessage.cpp @@ -4,7 +4,7 @@ namespace EE { namespace Scene { NodeMessage::NodeMessage( Node * node, const Uint32& Msg, const Uint32& Flags ) : - mCtrl( node ), + mNode( node ), mMsg( Msg ), mFlags( Flags ) { @@ -15,7 +15,7 @@ NodeMessage::~NodeMessage() } Node * NodeMessage::getSender() const { - return mCtrl; + return mNode; } const Uint32& NodeMessage::getMsg() const {