Changeset 3330 for Core/branches/0075_TR_SCRIPTING/Event/src/EventService.cpp

Timestamp:

01/30/10 13:18:29 (6 months ago)

Author:

trichards

Message:

Refactored the Event framework so that I_Event is created in EventService? instead of EventQueue?.

Files:

• Core/branches/0075_TR_SCRIPTING/Event/src/EventService.cpp (modified) (5 diffs)

Core/branches/0075_TR_SCRIPTING/Event/src/EventService.cpp

@@ -47 +47 @@
 EventService::EventService()
 :   m_pScriptObject(NULL)
+,   m_pEventsMutex(Threading::MutexFactory::create())
 {
 }
@@ -70 +71 @@
         }
     }
+
+    Threading::MutexFactory::destroy(m_pEventsMutex);
 }
 
@@ -117 +120 @@
 
     module.addType<I_EventService>(getScriptTypeName(), "Event Service")
+        .addMethod("createEvent", &I_EventService::createEvent)
+        .addMethod("getEvent", &I_EventService::getEvent)
         .addMethod("getEventQueue", &I_EventService::getEventQueue)
         .addMethod("getActionMap", &I_EventService::getActionMap)
@@ -123 +128 @@
 
     // EventQueue
-    module.addType<I_EventQueue>("EventQueue", "Event Queue")
-        .addMethod("createEvent", &I_EventQueue::createEvent)
-        .addMethod("getEvent", &I_EventQueue::getEvent)
-        .addMethod("dispatchOneEvent", &I_EventQueue::dispatchOneEvent)
-        .addMethod("dispatchAllEvents", &I_EventQueue::dispatchAllEvents)
+    module.addType<EventQueue>("EventQueue", "Event Queue")
+        .addMethod("dispatchOneEvent", &EventQueue::dispatchOneEvent)
+        .addMethod("dispatchAllEvents", &EventQueue::dispatchAllEvents)
     ;
 
@@ -159 +162 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+I_Event&
+EventService::createEvent(const std::string& _name)
+{
+    // Since getEvent() will create the event if
+    // it doesn't exist, just call it.
+    return getEvent(_name);
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+I_Event&
+EventService::getEvent(const std::string& _name)
+{
+    Threading::CriticalSection guard(m_pEventsMutex);
+
+    // TODO Make sure the event has been created.
+    Events_type::iterator iter = m_events.find(_name);
+    
+    if (iter == m_events.end())
+    {
+        Event_impl* pEvent = new Event_impl(*this);
+
+        m_events[_name] = pEvent;
+
+        return *pEvent;
+    }
+    else
+    {
+        return *iter->second;
+    }
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 I_EventQueue&
 EventService::getEventQueue(const std::string& _queueName)