Changeset 1022 for code/branches/input/src/orxonox/core/InputHandler.cc

Timestamp:

Apr 10, 2008, 5:12:02 PM (16 years ago)

Author:

rgrieder

Message:

• modified the input handler
• few more little changes

File:

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

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

@@ -31 +31 @@
  */
 
+#include "Debug.h"
+#include "util/Convert.h"
+#include "InputEventListener.h"
+#include "InputEvent.h"
 #include "InputHandler.h"
 
@@ -54 +58 @@
 
   /**
+    @brief Loads the key bindings from the ini file.
+    Currently, this is just a simple test routine that fills the list with numbers.
+  */
+  bool InputHandlerGame::loadBindings()
+  {
+    for (int i = 0; i < numberOfKeys_s; i++)
+    {
+      // simply write the key number (i) in the string
+      this->bindingsKeyPressed_[i] = ConvertValueAndReturn<int, std::string>(i);
+      this->bindingsKeyReleased_[i] = ConvertValueAndReturn<int, std::string>(i);
+    }
+    return true;
+  }
+
+  /**
     @brief Event handler for the keyPressed Event.
     @param e Event information
@@ -59 +78 @@
   bool InputHandlerGame::keyPressed(const OIS::KeyEvent &e)
   {
+    if (e.key == OIS::KC_ESCAPE)
+    {
+      InputEvent e = {1, true, 0, 0, 0};
+      InputHandlerGame::callListeners(e);
+    }
+    else
+    {
+      // find the appropriate key binding
+      std::string cmdStr = bindingsKeyPressed_[int(e.key)];
+      //COUT(3) << cmdStr << " pressed" << std::endl;
+    }
     return true;
   }
@@ -68 +98 @@
   bool InputHandlerGame::keyReleased(const OIS::KeyEvent &e)
   {
+    // find the appropriate key binding
+    std::string cmdStr = bindingsKeyReleased_[int(e.key)];
+    //COUT(3) << cmdStr << " released" << std::endl;
     return true;
   }
@@ -100 +133 @@
   }
 
+  /**
+    @brief Calls all the objects from classes that derive from InputEventListener.
+    @param evt The input event that occured.
+  */
+  inline void InputHandlerGame::callListeners(orxonox::InputEvent &evt)
+  {
+    for (Iterator<InputEventListener> it = ObjectList<InputEventListener>::start(); it; )
+    {
+      if (it->bActive_)
+        (it++)->eventOccured(evt);
+      else
+        it++;
+    }
+  }
+
+
   // ###############################
   // ###     InputHandlerGUI     ###
@@ -124 +173 @@
   bool InputHandlerGUI::keyPressed(const OIS::KeyEvent &e)
   {
+                //CEGUI::System::getSingleton().injectKeyDown( arg.key );
+                //CEGUI::System::getSingleton().injectChar( arg.text );
     return true;
   }
@@ -133 +184 @@
   bool InputHandlerGUI::keyReleased(const OIS::KeyEvent &e)
   {
+                //CEGUI::System::getSingleton().injectKeyUp( arg.key );
     return true;
   }
@@ -142 +194 @@
   bool InputHandlerGUI::mouseMoved(const OIS::MouseEvent &e)
   {
+                //CEGUI::System::getSingleton().injectMouseMove( arg.state.X.rel, arg.state.Y.rel );
     return true;
   }
@@ -152 +205 @@
   bool InputHandlerGUI::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {
+                //CEGUI::System::getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id));
     return true;
   }
@@ -162 +216 @@
   bool InputHandlerGUI::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {
+                //CEGUI::System::getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id));
     return true;
   }