Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2087: Modify singleton implement for EventDispatcher, adding EventDispatcher::destroyInstance().

This commit is contained in:
James Chen 2013-09-18 13:00:08 +08:00
parent 37ce756d12
commit 80d1c315b3
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos2dx/event_dispatcher/CCEventDispatcher.cpp
View File

@ -58,6 +58,8 @@ private:
NS_CC_BEGIN NS_CC_BEGIN
static EventDispatcher* g_instance = nullptr;
EventDispatcher::EventListenerItem::~EventListenerItem() EventDispatcher::EventListenerItem::~EventListenerItem()
{ {
CC_SAFE_RELEASE(this->node); CC_SAFE_RELEASE(this->node);
@ -73,12 +75,22 @@ EventDispatcher::EventDispatcher()
EventDispatcher::~EventDispatcher() EventDispatcher::~EventDispatcher()
{ {
removeAllListeners();
} }
EventDispatcher* EventDispatcher::getInstance() EventDispatcher* EventDispatcher::getInstance()
{ {
static EventDispatcher _instance; if (g_instance == nullptr)
return &_instance; {
g_instance = new EventDispatcher();
}
return g_instance;
}
void EventDispatcher::destroyInstance()
{
CC_SAFE_DELETE(g_instance);
} }
void EventDispatcher::addEventListenerWithItem(EventListenerItem* item) void EventDispatcher::addEventListenerWithItem(EventListenerItem* item)
@ -249,13 +261,15 @@ void EventDispatcher::setPriorityWithFixedValue(EventListener* listener, int fix
} }
} }
void EventDispatcher::dispatchEvent(Event* event, bool toSortListeners) void EventDispatcher::dispatchEvent(Event* event, bool forceSortListeners)
{ {
if (_listeners == nullptr || !_isEnabled) if (_listeners == nullptr || !_isEnabled)
return; return;
if (toSortListeners) if (forceSortListeners)
{
sortAllEventListenerItemsForType(event->_type); sortAllEventListenerItemsForType(event->_type);
}
DispatchGuard guard(_inDispatch); DispatchGuard guard(_inDispatch);

9
cocos2dx/event_dispatcher/CCEventDispatcher.h
View File

@ -55,6 +55,9 @@ public:
/** Gets the singleton of EventDispatcher */ /** Gets the singleton of EventDispatcher */
static EventDispatcher* getInstance(); static EventDispatcher* getInstance();
/** Destroys the singleton of EventDispatcher */
static void destroyInstance();
/** Adds a event listener for a specified event with the priority of scene graph. /** Adds a event listener for a specified event with the priority of scene graph.
* @param listener The listener of a specified event. * @param listener The listener of a specified event.
* @param node The priority of the listener is based on the draw order of this node. * @param node The priority of the listener is based on the draw order of this node.
@ -98,7 +101,7 @@ public:
* Also removes all EventListeners marked for deletion from the * Also removes all EventListeners marked for deletion from the
* event dispatcher list. * event dispatcher list.
*/ */
void dispatchEvent(Event* event, bool toSortListeners = true); void dispatchEvent(Event* event, bool forceSortListeners = true);
public: public:
/** Destructor of EventDispatcher */ /** Destructor of EventDispatcher */
@ -141,8 +144,8 @@ private:
std::map<std::string, std::vector<EventListenerItem*>*>* _listeners; std::map<std::string, std::vector<EventListenerItem*>*>* _listeners;
std::vector<EventListenerItem*> _toAddedListeners; std::vector<EventListenerItem*> _toAddedListeners;
int _inDispatch; int _inDispatch; ///< Whether it's in dispatching event
bool _isEnabled; bool _isEnabled; ///< Whether to enable dispatching event
}; };