Changeset 4403 in orxonox.OLD for orxonox/trunk

Timestamp:

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

Author:

patrick

Message:

cleaned and finished up the key mapper class

Location:

orxonox/trunk/src/util/event

Files:

• key_mapper.cc (modified) (6 diffs)
• key_mapper.h (modified) (1 diff)

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

@@ -73 +73 @@
 {
    this->setClassID(CL_KEY_MAPPER, "KeyMapper"); 
-   this->keyAliases = NULL;
 }
 
@@ -97 +96 @@
   PRINTF(4)("Loading key bindings from %s\n", fileName);
   
-  // remove old bindings if present
-  if( this->keyAliases != NULL)
-    {
-      free (this->keyAliases);
-      this->keyAliases = NULL;
-    }
-  
   // create parser
   IniParser parser(fileName);
@@ -112 +104 @@
     }
   // allocate empty lookup table
-  this->keyAliases = (KeyBindings*) calloc (1, sizeof (KeyBindings));
   
   char namebuf[256];
@@ -124 +115 @@
       PRINTF(3)("Keys: Parsing %s, %s now.\n", namebuf, valuebuf);
       index = nameToIndex (valuebuf);
-
+      this->mapKeys(namebuf, index[1]);
+
+      /*
       switch( index[0])
         {
         case 0:
-          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:
-          PRINTF(3)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
-          strcpy (this->keyAliases->buttons[index[1]], namebuf);
+          this->mapKeys(namebuf, index[1]);
           break;
         default:
           break;
         }
+      */
       memset (namebuf, 0, 256);
       memset (valuebuf, 0, 256);
@@ -155 +146 @@
       PRINTF(3)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
       index = nameToIndex (valuebuf);     
-
+      this->mapKeys(namebuf, index[1]);
+      /*
       switch( index[0])
         {
         case 0:
-          PRINTF(3)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
-          strcpy (keyAliases->keys[index[1]], namebuf);
+          this->mapKeys(namebuf, index[1]);
           break;
         case 1:
-          PRINTF(3)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
-          strcpy (keyAliases->buttons[index[1]], namebuf);
+        this->mapKeys(namebuf, index[1]);
           break;
         default:
           break;
         }
+      */
       memset (namebuf, 0, 256);
       memset (valuebuf, 0, 256);
@@ -208 +199 @@
 {
   //PRINT(0)("\n==========================| KeyMapper::debug() |===\n");  
-  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);
+
+  for(int i = 0; map[i].pValue != NULL; ++i)
+    {
+      PRINT(0)("%s = %i\n",map[i].pName, *map[i].pValue);
+    }
 
   //PRINT(0)("=======================================================\n");        

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

@@ -67 +67 @@
 
  private:
-  KeyBindings* keyAliases;
   Sint32 coord[2];
 };