Changeset 4407 in orxonox.OLD

Timestamp:

May 31, 2005, 12:04:15 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: event management now runs with new event-handler: no chance to kill current game without killall…

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -964 +964 @@
 {
   // localinput
-  CommandNode* cn = Orxonox::getInstance()->getLocalInput();
-  cn->process();
+  //CommandNode* cn = Orxonox::getInstance()->getLocalInput();
+  //cn->process();
+
+  EventHandler::getInstance()->process();
+
   // remoteinput
 }

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

@@ -47 +47 @@
         }
     }
-}
+  this->state = ES_GAME;
+}
+
 
 /**
@@ -53 +55 @@
 */
 EventHandler* EventHandler::singletonRef = NULL;
+
 
 /**
@@ -64 +67 @@
 }
 
+
 /**
    \brief standard deconstructor
@@ -71 +75 @@
 {
   EventHandler::singletonRef = NULL;
+  delete this->keyMapper;
+}
+
+
+
+void EventHandler::init()
+{
+  this->keyMapper = new KeyMapper();
+  this->keyMapper->loadKeyBindings();
 }
 
@@ -80 +93 @@
 }
 
+
 void EventHandler::subscribe(EventListener* el, elState state, int eventType)
 {
   PRINTF(0)("Subscribing event type: %i\n", eventType);
-  if( likely(this->listeners[state][eventType] == NULL))
-    this->listeners[state][eventType] = el;
-  else
-    PRINTF(0)("Someone tried to subscribe to event %i @ state %i but this event has already been subscribed\n", eventType, state);
+  if( state == ES_ALL )
+    {
+      for(int i = 0; i < ES_NUMBER; ++i)
+        if( likely(this->listeners[state][eventType] == NULL))
+          this->listeners[i][eventType] = el;
+        else
+          PRINTF(0)("Someone tried to subscribe to event %i @ state %i but this event has already been subscribed\n", eventType, state);
+    }
+  else 
+    if( likely(this->listeners[state][eventType] == NULL))
+      {
+        this->listeners[state][eventType] = el;
+      }
+    else
+      PRINTF(0)("Someone tried to subscribe to event %i @ state %i but this event has already been subscribed\n", eventType, state);
 }
 
@@ -123 +148 @@
   SDL_Event event;
   Event ev;
-  EventListener* listener;
+  EventListener* listener = NULL;
   while( SDL_PollEvent (&event))
     {
@@ -178 +203 @@
       /* small debug routine: shows alle events dispatched by the event handler */
       PRINT(0)("\n==========================| EventHandler::process () |===\n");
-      PRINT(0)("=  Got Event nr%i\n, for state %i", event.type, this->state);  
+      PRINT(0)("=  Got Event nr %i, for state %i", ev.type, this->state);  
       
-      listener = this->listeners[this->state][event.key.keysym.sym];
+      listener = this->listeners[this->state][ev.type];
       if( listener != NULL)
         {
+          PRINTF(0)("=  Event dispatcher msg: This event has been consumed\n");
           listener->process(ev);
-          PRINTF(0)("=  Event dispatcher msg: This event has been consumed\n");
         }
       else

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

@@ -22 +22 @@
   virtual ~EventHandler(void);
 
+  void init();
+
   void setState(elState state);
 
@@ -41 +43 @@
   EventListener*** listeners;                         //!< a list of registered listeners
   elState state;
-
+  KeyMapper* keyMapper;
 };