Changeset 1215 for code/branches/input/src/core/InputHandler.cc

Timestamp:

May 2, 2008, 9:31:20 PM (16 years ago)

Author:

rgrieder

Message:

• SpaceShip is now a default listener for mouse input. still a hack..
• several changes in InputManager.cc regarding joy sticks
• Key bindings work, but not very advanced

File:

• code/branches/input/src/core/InputHandler.cc (modified) (10 diffs)

code/branches/input/src/core/InputHandler.cc

@@ -267 +267 @@
         switch (j)
         {
+          // note: the first element in the struct is the string, so the following pointer
+          //       arithmetic works.
           case 0:
-            cont->getValue(bindingsKeyPress_ + i);
+            cont->getValue(&bindingsKeyPress_[i].commandStr);
             break;
           case 1:
@@ -337 +339 @@
     for (int i = 0; i < numberOfKeys_s; i++)
     {
-      bindingsKeyPress_  [i] = "";
-      bindingsKeyRelease_[i] = "";
-      bindingsKeyHold_   [i] = "";
+      bindingsKeyPress_  [i].commandStr = "";
+      bindingsKeyRelease_[i].commandStr = "";
+      bindingsKeyHold_   [i].commandStr = "";
     }
     for (int i = 0; i < numberOfMouseButtons_s; i++)
@@ -366 +368 @@
     setConfigValues();
 
+    // evaluate the key bindings
+    // TODO: what if binding is invalid?
+    //for (int i = 0; i < numberOfKeys_s; i++)
+    //{
+    //  if (bindingsKeyPress_[i].commandStr != "")
+    //  {
+    //    bindingsKeyPress_[i].evaluation = CommandExecutor::evaluate(bindingsKeyPress_[i].commandStr);
+    //    bindingsKeyPress_[i].commandStr = bindingsKeyPress_[i].evaluation.getCommandString();
+    //  }
+    //}
+
     COUT(ORX_DEBUG) << "KeyBinder: Loading key bindings done." << std::endl;
+    return true;
+  }
+
+  bool KeyBinder::executeBinding(KeyBinding& binding)
+  {
+    if (binding.commandStr != "")
+    {
+      //if (binding.commandStr != binding.evaluation.getCommandString())
+      //{
+      //  // key binding has changed, reevaluate the command string.
+      //  binding.evaluation = CommandExecutor::evaluate(binding.commandStr);
+      //  binding.commandStr = binding.evaluation.getCommandString();
+      //}
+      COUT(3) << "Executing command: " << binding.commandStr << std::endl;
+      CommandExecutor::execute(binding.commandStr);
+    }
+
     return true;
   }
@@ -379 +409 @@
     COUT(3) << "Key: " << e.key << std::endl;
     // find the appropriate key binding
-    std::string cmdStr = bindingsKeyPress_[int(e.key)];
-    if (cmdStr != "")
-    {
-      CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
-    }
-    
+    executeBinding(bindingsKeyPress_[int(e.key)]);
+     
     return true;
   }
@@ -396 +421 @@
   {
     // find the appropriate key binding
-    std::string cmdStr = bindingsKeyRelease_[int(e.key)];
-    if (cmdStr != "")
-    {
-      CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
-    }
+    executeBinding(bindingsKeyRelease_[int(e.key)]);
 
     return true;
@@ -413 +433 @@
   {
     // find the appropriate key binding
-    std::string cmdStr = bindingsKeyHold_[int(e.key)];
-    if (cmdStr != "")
-    {
-      CommandExecutor::execute(cmdStr);
-      COUT(3) << "Executing command: " << cmdStr << std::endl;
-    }
+    executeBinding(bindingsKeyHold_[int(e.key)]);
 
     return true;
@@ -486 +501 @@
   }
 
-  bool KeyBinder::buttonPressed(const OIS::JoyStickEvent &arg, int button)
+  bool KeyBinder::buttonPressed(int joyStickID, const OIS::JoyStickEvent &arg, int button)
   {
     // find the appropriate key binding
@@ -499 +514 @@
   }
 
-  bool KeyBinder::buttonReleased(const OIS::JoyStickEvent &arg, int button)
+  bool KeyBinder::buttonReleased(int joyStickID, const OIS::JoyStickEvent &arg, int button)
   {
     // find the appropriate key binding
@@ -512 +527 @@
   }
 
-  bool KeyBinder::buttonHeld(const OIS::JoyStickEvent &arg, int button)
+  bool KeyBinder::buttonHeld(int joyStickID, const OIS::JoyStickEvent &arg, int button)
   {
     // find the appropriate key binding
@@ -525 +540 @@
   }
 
-  bool KeyBinder::axisMoved(const OIS::JoyStickEvent &arg, int axis)
-  {
-    return true;
-  }
-
-  bool KeyBinder::sliderMoved(const OIS::JoyStickEvent &arg, int id)
-  {
-    return true;
-  }
-
-  bool KeyBinder::povMoved(const OIS::JoyStickEvent &arg, int id)
+  bool KeyBinder::axisMoved(int joyStickID, const OIS::JoyStickEvent &arg, int axis)
+  {
+    return true;
+  }
+
+  bool KeyBinder::sliderMoved(int joyStickID, const OIS::JoyStickEvent &arg, int id)
+  {
+    return true;
+  }
+
+  bool KeyBinder::povMoved(int joyStickID, const OIS::JoyStickEvent &arg, int id)
+  {
+    return true;
+  }
+
+  bool KeyBinder::vector3Moved(int joyStickID, const OIS::JoyStickEvent &arg, int id)
   {
     return true;