Changeset 973 for code/branches/input/src/orxonox/core/InputManager.cc

Timestamp:

Apr 3, 2008, 10:23:37 AM (16 years ago)

Author:

rgrieder

Message:

• not really done a lot, but svn create patch doesn't work with renamed files

File:

• code/branches/input/src/orxonox/core/InputManager.cc (copied) (copied from code/branches/input/src/orxonox/core/InputHandler.cc) (19 diffs)

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

@@ -35 +35 @@
 #include "core/Debug.h"
 #include "InputEventListener.h"
-#include "InputHandler.h"
+#include "InputManager.h"
 
 namespace orxonox
@@ -42 +42 @@
     @brief The reference to the singleton
   */
-  InputHandler* InputHandler::singletonRef_s = 0;
+  InputManager* InputManager::singletonRef_s = 0;
 
   /**
     @brief Constructor only resets the pointer values to 0.
   */
-  InputHandler::InputHandler() :
+  InputManager::InputManager() :
       mouse_(0), keyboard_(0), inputSystem_(0)
   {
@@ -55 +55 @@
     @brief Destructor only called at the end of the program
   */
-  InputHandler::~InputHandler()
+  InputManager::~InputManager()
   {
     this->destroyDevices();
@@ -61 +61 @@
 
   /**
-    @brief The one instance of the InputHandler is stored in this function.
-    @return The pointer to the only instance of the InputHandler
-  */
-  InputHandler *InputHandler::getSingleton()
+    @brief The one instance of the InputManager is stored in this function.
+    @return The pointer to the only instance of the InputManager
+  */
+  InputManager *InputManager::getSingleton()
   {
     if (!singletonRef_s)
-      singletonRef_s = new InputHandler();
+      singletonRef_s = new InputManager();
     return singletonRef_s;
   }
@@ -78 +78 @@
     @param windowHeight The height of the render window
   */
-  bool InputHandler::initialise(size_t windowHnd, int windowWidth, int windowHeight)
+  bool InputManager::initialise(size_t windowHnd, int windowWidth, int windowHeight)
   {
     if (!this->inputSystem_)
@@ -98 +98 @@
         // Create inputsystem
         inputSystem_ = OIS::InputManager::createInputSystem(paramList);
-        COUT(ORX_DEBUG) << "*** InputHandler: Created OIS input system" << std::endl;
+        COUT(ORX_DEBUG) << "*** InputManager: Created OIS input system" << std::endl;
 
         // create a keyboard. If none are available the exception is caught.
         keyboard_ = static_cast<OIS::Keyboard*>(inputSystem_->createInputObject(OIS::OISKeyboard, true));
         keyboard_->setEventCallback(this);
-        COUT(ORX_DEBUG) << "*** InputHandler: Created OIS mouse" << std::endl;
+        COUT(ORX_DEBUG) << "*** InputManager: Created OIS mouse" << std::endl;
 
         // create a mouse. If none are available the exception is caught.
         mouse_ = static_cast<OIS::Mouse*>(inputSystem_->createInputObject(OIS::OISMouse, true));
         mouse_->setEventCallback(this);
-        COUT(ORX_DEBUG) << "*** InputHandler: Created OIS keyboard" << std::endl;
+        COUT(ORX_DEBUG) << "*** InputManager: Created OIS keyboard" << std::endl;
 
         // Set mouse region
@@ -122 +122 @@
     }
 
-    COUT(ORX_DEBUG) << "*** InputHandler: Loading key bindings..." << std::endl;
+    COUT(ORX_DEBUG) << "*** InputManager: Loading key bindings..." << std::endl;
     // load the key bindings
     InputEvent empty = {0, false, 0, 0, 0};
@@ -130 +130 @@
     //assign 'abort' to the escape key
     this->bindingsKeyPressed_[(int)OIS::KC_ESCAPE].id = 1;
-    COUT(ORX_DEBUG) << "*** InputHandler: Loading done." << std::endl;
+    COUT(ORX_DEBUG) << "*** InputManager: Loading done." << std::endl;
 
     return true;
@@ -138 +138 @@
     @brief Destroys all the created input devices.
   */
-  void InputHandler::destroyDevices()
-  {
-    COUT(ORX_DEBUG) << "*** InputHandler: Destroying InputHandler..." << std::endl;
+  void InputManager::destroyDevices()
+  {
+    COUT(ORX_DEBUG) << "*** InputManager: Destroying InputManager..." << std::endl;
     if (this->mouse_)
       this->inputSystem_->destroyInputObject(mouse_);
@@ -151 +151 @@
     this->keyboard_      = 0;
     this->inputSystem_   = 0;
-    COUT(ORX_DEBUG) << "*** InputHandler: Destroying done." << std::endl;
+    COUT(ORX_DEBUG) << "*** InputManager: Destroying done." << std::endl;
   }
 
@@ -157 +157 @@
     @brief Destroys the singleton.
   */
-  void InputHandler::destroySingleton()
+  void InputManager::destroySingleton()
   {
     if (singletonRef_s)
@@ -165 +165 @@
 
   /**
-    @brief Updates the InputHandler
+    @brief Updates the InputManager
     @param dt Delta time
   */
-  void InputHandler::tick(float dt)
+  void InputManager::tick(float dt)
   {
     //this->mouse_->setEventCallback(this);
@@ -185 +185 @@
     @param height the new height of the render window
   */
-  void InputHandler::setWindowExtents(int width, int height)
+  void InputManager::setWindowExtents(int width, int height)
   {
     // Set mouse region (if window resizes, we should alter this to reflect as well)
@@ -197 +197 @@
     @param evt The input event that occured.
   */
-  inline void InputHandler::callListeners(orxonox::InputEvent &evt)
+  inline void InputManager::callListeners(orxonox::InputEvent &evt)
   {
     for (Iterator<InputEventListener> it = ObjectList<InputEventListener>::start(); it; )
@@ -212 +212 @@
     @param e Event information
   */
-  bool InputHandler::keyPressed(const OIS::KeyEvent &e)
+  bool InputManager::keyPressed(const OIS::KeyEvent &e)
   {
     callListeners(this->bindingsKeyPressed_[(int)e.key]);
@@ -222 +222 @@
     @param e Event information
   */
-  bool InputHandler::keyReleased(const OIS::KeyEvent &e)
+  bool InputManager::keyReleased(const OIS::KeyEvent &e)
   {
     return true;
@@ -231 +231 @@
     @param e Event information
   */
-  bool InputHandler::mouseMoved(const OIS::MouseEvent &e)
+  bool InputManager::mouseMoved(const OIS::MouseEvent &e)
   {
     return true;
@@ -241 +241 @@
     @param id The ID of the mouse button
   */
-  bool InputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
+  bool InputManager::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {
     COUT(1) << "asdf" << std::endl;
@@ -252 +252 @@
     @param id The ID of the mouse button
   */
-  bool InputHandler::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
+  bool InputManager::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
   {
     return true;