Changeset 4386 in orxonox.OLD for orxonox/trunk/src/util/event

Timestamp:

May 29, 2005, 11:33:49 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: key mapper implementation precess

Location:

orxonox/trunk/src/util/event

Files:

• event_handler.cc (modified) (1 diff)
• event_handler.h (modified) (2 diffs)
• key_mapper.cc (modified) (5 diffs)
• key_mapper.h (modified) (2 diffs)

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

@@ -22 +22 @@
 #include "event.h"
 
-#include "ini_parser.h"
-#include "keynames.h"
 #include "compiler.h"
 #include "debug.h"

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

@@ -16 +16 @@
 
 
-//! 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;
+
 
 
@@ -50 +41 @@
  private:
   static EventHandler* singletonRef;
-  KeyBindings* keyAliases;
   EventListener*** listeners;                         //!< a list of registered listeners
   elState state;

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

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_EVENT
 
-#include "event.h"
+#include "key_mapper.h"
+
+#include "ini_parser.h"
+#include "keynames.h"
 
 using namespace std;
+
+
+
+int KeyMapper::PEV_UP = -1;
+int KeyMapper::PEV_DOWN = -1;
+int KeyMapper::PEV_LEFT = -1;
+int KeyMapper::PEV_RIGHT = -1;
+int KeyMapper::PEV_STRAFE_LEFT = -1;
+int KeyMapper::PEV_STRAFE_RIGHT = -1;
+
+int KeyMapper::PEV_FIRE1 = -1;
+int KeyMapper::PEV_FIRE2 = -1;
+
+int KeyMapper::PEV_VIEW1 = -1;
+int KeyMapper::PEV_VIEW2 = -1;
+int KeyMapper::PEV_VIEW3 = -1;
+int KeyMapper::PEV_VIEW4 = -1;
+
 
 
@@ -28 +49 @@
 {
    this->setClassID(CL_KEY_MAPPER, "KeyMapper"); 
-
+   this->keyAliases = NULL;
 }
 
@@ -41 +62 @@
 }
 
-
+\
 /**
    \brief loads new key bindings from a file
@@ -115 +136 @@
   while( parser.nextVar (namebuf, valuebuf) != -1)
     {
-      //index = nameToIndex (valuebuf);     
-      int c;
-      if( (c = keynameToSDLK (valuebuf)) != -1)
-        {
-          index[1] = c; index[0] = 0;
-        }
-      if( (c = buttonnameToSDLB (valuebuf)) != -1)
-        {
-          index[1] = c; index[0] = 1;
-        }
-
+      index = nameToIndex (valuebuf);     
 
       switch( index[0])
@@ -144 +155 @@
     }
 }
+
+
+
+int* KeyMapper::nameToIndex (char* name)
+{
+  coord[0] = -1;
+  coord[1] = -1;
+  int c;
+  if( (c = keynameToSDLK (name)) != -1)
+    {
+      coord[1] = c;
+      coord[0] = 0;
+    }
+  if( (c = buttonnameToSDLB (name)) != -1)
+    {
+      coord[1] = c;
+      coord[0] = 1;
+    }
+  return coord;
+}

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

@@ -11 +11 @@
 #include "base_object.h"
 #include "event_def.h"
+
+
+//! 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;
 
 
@@ -44 +56 @@
  private:
   KeyBindings* keyAliases;
+  Sint32 coord[2];
 };