Changeset 4389 in orxonox.OLD

Timestamp:

May 30, 2005, 12:12:03 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: working on keymapping, there are some problems in genericaly map unknown keys to well undefined functions… which is not very surprising

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• util/event/event_handler.cc (modified) (1 diff)
• util/event/key_mapper.cc (modified) (3 diffs)
• util/event/key_mapper.h (modified) (1 diff)
• util/garbage_collector.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -66 +66 @@
 #define DEBUG_MODULE_TRACK_MANAGER      0
 #define DEBUG_MODULE_GARBAGE_COLLECTOR  0
-#define DEBUG_MODULE_OBJECT_MANAGER     3
+#define DEBUG_MODULE_OBJECT_MANAGER     0
 #define DEBUG_MODULE_LIGHT              0
 #define DEBUG_MODULE_PLAYER             1

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();
 
   PRINT(0)("=======================================================\n");      

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

@@ -115 +115 @@
         {
         case 0:
-          PRINTF(4)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
+          PRINTF(0)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
           strcpy (this->keyAliases->keys[index[1]], namebuf);
           break;
         case 1:
-          PRINTF(4)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
+          PRINTF(0)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
           strcpy (this->keyAliases->buttons[index[1]], namebuf);
           break;
@@ -144 +144 @@
         {
         case 0:
-          PRINTF(4)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
+          PRINTF(0)("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), namebuf);
           strcpy (keyAliases->keys[index[1]], namebuf);
           break;
         case 1:
-          PRINTF(4)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
+          PRINTF(0)("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), namebuf);
           strcpy (keyAliases->buttons[index[1]], namebuf);
           break;
@@ -178 +178 @@
   return coord;
 }
+
+
+void KeyMapper::debug()
+{
+  //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)("=======================================================\n");        
+}

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

@@ -33 +33 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const char* fileName);
+  void loadKeyBindings(const char* fileName = "~/.orxonox/orxonox.conf");
+
+  void debug();
 
  private:

orxonox/trunk/src/util/garbage_collector.cc

@@ -147 +147 @@
   PRINTF(3)("=============================\n");
 
-  ObjectManager::getInstance()->debug();
+  //ObjectManager::getInstance()->debug();
 
   /* reset time to count again up to this->delay */

orxonox/trunk/src/world_entities/player.cc

@@ -28 +28 @@
 #include "stdincl.h"
 
-#include "object_manager.h"
+
 #include "projectile.h"
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -92 +92 @@
   Projectile* p = new TestBullet(this);
   ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
-  ObjectManager::getInstance()->debug();
+  //ObjectManager::getInstance()->debug();
 }