Changeset 4405 in orxonox.OLD

Timestamp:

May 30, 2005, 6:36:43 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: event_handler subscribe functionality improved

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) (2 diffs)
• util/event/key_mapper.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -62 +62 @@
 
 #include "projectile.h"
+#include "event_handler.h"
 
 using namespace std;
@@ -418 +419 @@
   Orxonox *orx = Orxonox::getInstance ();
   orx->getLocalInput()->bind (localPlayer);
+
+  EventHandler::getInstance()->subscribe(this->localPlayer, ES_ALL, KeyMapper::PEV_UP);
   
   // bind camera

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

@@ -80 +80 @@
 }
 
-void EventHandler::subscribeListener(EventListener* el, elState state, int eventType)
+void EventHandler::subscribe(EventListener* el, elState state, int eventType)
 {
   if( likely(this->listeners[state][eventType] == NULL))
@@ -89 +89 @@
 
 
-void EventHandler::unsubscribeListener(int eventType, elState state)
+void EventHandler::unsubscribe(int eventType, elState state)
 {
   this->listeners[state][eventType] = NULL;

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

@@ -9 +9 @@
 
 #include "base_object.h"
+#include "key_mapper.h"
 #include "event_def.h"
 
@@ -23 +24 @@
   void setState(elState state);
 
-  void subscribeListener(EventListener* el, elState state, int eventType);
-  void unsubscribeListener(int eventType, elState state);
+  void subscribe(EventListener* el, elState state, int eventType);
+  void unsubscribe(int eventType, elState state);
   void flush(elState state);
 

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

@@ -14 +14 @@
 
 
-//! Key aliasing structure
-/**
-   This structure contains the key aliasing information, e.g. the command strings that
-   have been bound to the keys.
-*/
-typedef struct
-{
-  char keys[N_STD_KEYS][CMD_LENGHT];
-  char buttons[N_BUTTONS][CMD_LENGHT];
-} KeyBindings;
+
 
 typedef struct orxKeyMapping

orxonox/trunk/src/world_entities/player.cc

@@ -203 +203 @@
 void Player::tick (float time)
 {
-  printf("%p\n", this);
-  this->getRelCoor().debug();
+  //printf("%p\n", this);
+  //this->getRelCoor().debug();
   
   /* link tick to weapon */