Changeset 4398 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

May 30, 2005, 5:01:25 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: moved the keynames strucure to a place closer to util/event, some small tests

Location:

orxonox/trunk/src/util/event

Files:

• event_handler.cc (modified) (1 diff)
• key_mapper.cc (modified) (3 diffs)
• key_names.cc (added)
• key_names.h (added)

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

@@ -198 +198 @@
   PRINT(0)("\n==========================| EventHandler::test () |===\n");  
   PRINT(0)("Eventhandler init successfuly\n");
-  //KeyMapper km;
+  KeyMapper km;
   PRINT(0)("KeyMapper loaded\n");
-  //km.loadKeyBindings();
-  //km.debug();
+  km.loadKeyBindings();
+  km.debug();
 
   PRINT(0)("=======================================================\n");      

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

@@ -101 +101 @@
   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;
-        }
+      PRINTF(0)("Keys: Parsing %s, %s now.\n", namebuf, valuebuf);
+      index = nameToIndex (valuebuf);
 
       switch( index[0])
@@ -139 +131 @@
   while( parser.nextVar (namebuf, valuebuf) != -1)
     {
+      PRINTF(0)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
       index = nameToIndex (valuebuf);     
 
@@ -183 +176 @@
 {
   //PRINT(0)("\n==========================| KeyMapper::debug() |===\n");  
-  PRINT(0)("Command 'up' got SDL key-ref nr %i \n", (this->nameToIndex("UP"))[0]);
-  PRINT(0)("Command 'down' got SDL key-ref nr %i \n", (this->nameToIndex("DOWN"))[0]);
-  PRINT(0)("Command 'right' got SDL key-ref nr %i \n", (this->nameToIndex("RIGHT"))[0]);
-  PRINT(0)("Command 'left' got SDL key-ref nr %i \n", (this->nameToIndex("LEFT"))[0]);
+  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)("=======================================================\n");