Changeset 4402 in orxonox.OLD

Timestamp:

May 30, 2005, 6:12:24 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: key mapping works just fine

Location:

orxonox/trunk/src/util/event

Files:

• key_mapper.cc (modified) (4 diffs)
• key_mapper.h (modified) (2 diffs)

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

@@ -130 +130 @@
           PRINTF(3)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
           strcpy (this->keyAliases->keys[index[1]], namebuf);
+          this->mapKeys(namebuf, index[1]);
           break;
         case 1:
@@ -171 +172 @@
       memset (valuebuf, 0, 256);
     }
-  this->mapKeys();
 }
 
@@ -196 +196 @@
 
 
-void KeyMapper::mapKeys()
-{
-  for(int i = 0; i < N_STD_KEYS; ++i)
-    {
-      if( !strcmp (this->keyAliases->keys[i], "Up")) PEV_UP = i;
-
-    }
-  PRINTF(0)("fire = %i\n", PEV_FIRE1);
+void KeyMapper::mapKeys(char* name, int keyID)
+{
+  for(int i = 0; map[i].pValue != NULL; ++i )
+    {
+      if( !strcmp (name, map[i].pName)) { *map[i].pValue = keyID; break;}
+    }
 }
 
@@ -210 +208 @@
 {
   //PRINT(0)("\n==========================| KeyMapper::debug() |===\n");  
-  PRINT(0)("Command 'up' got SDL key-ref nr %i \n", keynameToSDLK("UP"));
-  PRINT(0)("Command 'down' got SDL key-ref nr %i \n", (this->nameToIndex("DOWN"))[1]);
-  PRINT(0)("Command 'right' got SDL key-ref nr %i \n", (this->nameToIndex("RIGHT"))[1]);
-  PRINT(0)("Command 'left' got SDL key-ref nr %i \n", (this->nameToIndex("LEFT"))[1]);
+  PRINT(0)("PEV_UP = %i\n", PEV_UP);
+  PRINT(0)("PEV_DOWN = %i\n", PEV_DOWN);
+  PRINT(0)("PEV_LEFT = %i\n", PEV_LEFT);
+  PRINT(0)("PEV_RIGHT = %i\n", PEV_RIGHT);
 
   //PRINT(0)("=======================================================\n");        

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

@@ -28 +28 @@
 {
   int* pValue;
-  char* name;
+  char* pName;
 };
 
@@ -45 +45 @@
  private:
   int* nameToIndex (char* name);
-  void mapKeys();
+  void mapKeys(char* name, int keyID);
 
  public: