Changeset 4420 in orxonox.OLD

Timestamp:

May 31, 2005, 5:27:49 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: faster and easier unsubscribe function implemented

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• util/event/event_handler.cc (modified) (2 diffs)
• util/event/event_handler.h (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -171 +171 @@
 {
   PRINTF(3)("World::~World() - deleting current world\n");
-  CommandNode* cn = Orxonox::getInstance()->getLocalInput();
-  cn->unbind(this->localPlayer);
-  cn->reset();
+
+  this->eventHandler->unsubscribe(this->localPlayer);
 
   delete WorldInterface::getInstance();
@@ -186 +185 @@
   //delete garbagecollecor
   //delete animator
-  
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_UP);
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_DOWN);
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_LEFT);
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_RIGHT);
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_FIRE1);
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
-  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_PREVIOUS_WEAPON);
-
 
   LoadClassDescription::printAll();

orxonox/trunk/src/util/event/event_handler.cc

@@ -127 +127 @@
       for(int i = 0; i < ES_NUMBER; ++i)
         {
-          for(int j = 0; j < SDLK_LAST; ++j)
+          for(int j = 0; j < EV_NUMBER; ++j)
             {
               this->listeners[i][j] = NULL;
@@ -135 +135 @@
   else
     {
-      for(int j = 0; j < SDLK_LAST; ++j)
+      for(int j = 0; j < EV_NUMBER; ++j)
         {
           this->listeners[state][j] = NULL;
+        }
+    }
+}
+
+void EventHandler::unsubscribe(EventListener* el, elState state)
+{
+  if( state == ES_ALL)
+    {
+      for(int i = 0; i < ES_NUMBER; ++i)
+        {
+          for(int j = 0; j < EV_NUMBER; ++j)
+            {
+              if( this->listeners[i][j] == el )
+                this->listeners[i][j] = NULL;
+            }
+        }
+    }
+  else
+    {
+      for(int j = 0; j < EV_NUMBER; ++j)
+        {
+          if( this->listeners[state][j] == el )
+            this->listeners[state][j] = NULL;
         }
     }

orxonox/trunk/src/util/event/event_handler.h

@@ -28 +28 @@
   void subscribe(EventListener* el, elState state, int eventType);
   void unsubscribe(elState state, int eventType);
+  void unsubscribe(EventListener* el, elState state = ES_ALL);
+
   void flush(elState state);
 

orxonox/trunk/src/world_entities/camera.cc

@@ -57 +57 @@
 Camera::~Camera(void)
 {
-  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW0);
-  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW1);
-  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW2);
-  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW3);
-  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW4);
-  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW5);
+  EventHandler::getInstance()->unsubscribe(this);
 }