Changeset 922 for code/branches/network/src/orxonox/InputHandler.cc

Timestamp:

Mar 25, 2008, 5:04:26 PM (16 years ago)

Author:

rgrieder

Message:

• created InputEventListener and InputEvent
• escape key now works through the InputHandler
• the concept will soon be replaced by a new one this is more of a 'svn save'

File:

• code/branches/network/src/orxonox/InputHandler.cc (modified) (8 diffs)

code/branches/network/src/orxonox/InputHandler.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "Orxonox.h"
+#include "InputEventListener.h"
 #include "InputHandler.h"
 
 namespace orxonox
 {
-  //using namespace OIS;
-
   /**
     @brief Constructor only resets the pointer values to 0.
@@ -47 +46 @@
   InputHandler::InputHandler()
   {
-    /*if (orxonox::Identifier::isCreatingHierarchy() && !this->getParents())
-        this->createParents();
-    this->setIdentifier(orxonox::ClassManager<InputHandler>::getIdentifier()->registerClass(this->getParents(), "InputHandler", true));
-    if (orxonox::Identifier::isCreatingHierarchy() && this->getParents())
-        this->getParents()->insert(this->getParents()->end(), this->getIdentifier());
-    orxonox::ClassManager<InputHandler>::getIdentifier()->addObject(this);*/
-
     //RegisterObject(InputHandler);
-
     this->mouse_       = 0;
     this->keyboard_    = 0;
     this->inputSystem_ = 0;
-
-    //this->setConfigValues();
-  }
-
-  void InputHandler::setConfigValues()
-  {
-    //SetConfigValue(codeFire_, 4).description("test value");
-
-    ConfigValueContainer *containercodeFire_ = new ConfigValueContainer("asdfblah", "codeFire_", 4);
-    containercodeFire_->getValue(&codeFire_).description("test");
-    //containercodeFire_->
   }
 
@@ -76 +56 @@
     @return The pointer to the only instance of the InputHandler
   */
-  InputHandler* InputHandler::getSingleton()
+  InputHandler *InputHandler::getSingleton()
   {
     static InputHandler theOnlyInstance;
@@ -83 +63 @@
 
   /**
-    @brief Creates the OIS::InputMananger, the keyboard and the mouse
+    @brief Creates the OIS::InputMananger, the keyboard and the mouse and
+           assigns the key bindings.
     @param windowHnd The window handle of the render window
     @param windowWidth The width of the render window
@@ -120 +101 @@
       }
     }
+
+    // load the key bindings
+    InputEvent empty = {0, false, 0, 0, 0};
+    for (int i = 0; i < this->numberOfKeys_; i++)
+      this->bindingsKeyPressed_[i] = empty;
+
+    //assign 'abort' to the escape key
+    this->bindingsKeyPressed_[(int)OIS::KC_ESCAPE].id = 1;
   }
 
@@ -130 +119 @@
     // capture all the input. That calls the event handlers.
     if (mouse_)
-    {
       mouse_->capture();
-    }
 
     if (keyboard_)
-    {
       keyboard_->capture();
-    }
   }
 
@@ -155 +140 @@
 
   /**
+    @brief Calls all the objects from classes that derive from InputEventListener.
+    @param evt The input event that occured.
+  */
+  inline void InputHandler::callListeners(orxonox::InputEvent &evt)
+  {
+    for (Iterator<InputEventListener> it = ObjectList<InputEventListener>::start(); it; )
+    {
+      if (it->bActive_)
+        (it++)->eventOccured(evt);
+      else
+        it++;
+    }
+  }
+
+  /**
     @brief Event handler for the keyPressed Event.
     @param e Event information
@@ -160 +160 @@
   bool InputHandler::keyPressed(const OIS::KeyEvent &e)
   {
-    if (e.key == OIS::KC_ESCAPE)
-      Orxonox::getSingleton()->abortRequest();
+    callListeners(this->bindingsKeyPressed_[(int)e.key]);
     return true;
   }