Changeset 1118 for code/branches/input/src/core

Timestamp:

Apr 20, 2008, 4:31:03 PM (17 years ago)

Author:

rgrieder

Message:

• classed FloatParser to ExprParser class

Location:

code/branches/input/src/core

Files:

• InputHandler.cc (modified) (5 diffs)
• InputHandler.h (modified) (5 diffs)
• InputManager.cc (modified) (1 diff)

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

@@ -74 +74 @@
     this->bindingsKeyPress_[OIS::KC_NUMPADENTER] = "setInputMode " + getConvertedValue<int, std::string>(IM_KEYBOARD);
     this->bindingsKeyPress_[OIS::KC_ESCAPE] = "exit";
+    this->bindingsKeyHold_[OIS::KC_U] = "exec disco.txt";
     return true;
   }
@@ -83 +84 @@
   bool InputHandlerGame::keyPressed(const OIS::KeyEvent &e)
   {
+    this->keysDown_.push_back(e.key);
     // find the appropriate key binding
     std::string cmdStr = bindingsKeyPress_[int(e.key)];
@@ -99 +101 @@
   bool InputHandlerGame::keyReleased(const OIS::KeyEvent &e)
   {
+    // remove the key from the keysDown_ list
+    for (std::list<OIS::KeyCode>::iterator it = keysDown_.begin(); it != keysDown_.end(); it++)
+    {
+      if (*it == e.key)
+      {
+        keysDown_.erase(it);
+        break;
+      }
+    }
+
     // find the appropriate key binding
     std::string cmdStr = bindingsKeyRelease_[int(e.key)];
@@ -136 +148 @@
   {
     return true;
+  }
+
+  /**
+    @brief Tick method to do additional calculations.
+    @param dt Delta time.
+  */
+  void InputHandlerGame::tick(float dt)
+  {
+    // iterate through all the pressed keys
+    for (std::list<OIS::KeyCode>::iterator it = keysDown_.begin(); it != keysDown_.end(); it++)
+    {
+      // find the appropriate key binding
+      std::string cmdStr = bindingsKeyHold_[*it];
+      if (cmdStr != "")
+      {
+        CommandExecutor::execute(cmdStr);
+        COUT(3) << "Executing command: " << cmdStr << std::endl;
+      }
+    }
   }
 
@@ -225 +256 @@
   }
 
+  /**
+    @brief Tick method to do additional calculations.
+    @param dt Delta time.
+  */
+  void InputHandlerGUI::tick(float dt)
+  {
+    
+  }
+
 }

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

@@ -38 +38 @@
 
 #include <string>
+#include <list>
 #include <OIS/OIS.h>
 
@@ -48 +49 @@
     enum KeybindSetting
     {
-      none,
-      onPress,
-      onRelease,
-      continuous,
+      None,
+      OnPress,
+      OnRelease,
+      Continuous,
     };
   }
@@ -58 +59 @@
       : public OIS::KeyListener, public OIS::MouseListener
   {
+    virtual void tick(float dt) = 0;
   };
     
@@ -80 +82 @@
                 bool keyReleased  (const OIS::KeyEvent   &arg);
 
+    void tick(float dt);
+
     // temporary hack
     void callListeners(InputEvent &evt);
+
+    //! Stores all the keys that are down
+    std::list<OIS::KeyCode> keysDown_;
 
     /** denotes the maximum number of different keys there are in OIS.
@@ -114 +121 @@
     ~InputHandlerGUI();
 
+    void tick(float dt);
+
   private:
     // input events

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

@@ -207 +207 @@
     if (mouse_)
       mouse_->capture();
-
     if (keyboard_)
       keyboard_->capture();
+
+    // Give the listeners the chance to do additional calculations
   }