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

Timestamp:

Mar 26, 2008, 11:39:55 PM (16 years ago)

Author:

rgrieder

Message:

• removed getRoot() from GaphicsEngine —> added getRenderWindow() —> added 3 function to control render loop
• rearranged the sequence of methods in Orxonox.cc to make it a little bit more logical
• added deletion code in Orxonox.cc destructor
• fixed a bug in AudioManger destructor
• fixed a bug in InputHandler destroy()

File:

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

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

@@ -44 +44 @@
     @brief Constructor only resets the pointer values to 0.
   */
-  InputHandler::InputHandler()
+  InputHandler::InputHandler() :
+      mouse_(0), keyboard_(0), inputSystem_(0),
+      uninitialized_(true)
   {
     //RegisterObject(InputHandler);
-    this->mouse_       = 0;
-    this->keyboard_    = 0;
-    this->inputSystem_ = 0;
+  }
+
+  /**
+    @brief Destructor only called at the end of the program
+  */
+  InputHandler::~InputHandler()
+  {
+    this->destroy();
   }
 
@@ -71 +78 @@
   void InputHandler::initialise(size_t windowHnd, int windowWidth, int windowHeight)
   {
-    if (!inputSystem_)
+    if (this->uninitialized_ || !this->inputSystem_)
     {
       // Setup basic variables
@@ -104 +111 @@
         this->setWindowExtents(windowWidth, windowHeight);
       }
+
+      uninitialized_ = false;
     }
 
@@ -120 +129 @@
   void InputHandler::destroy()
   {
-    this->inputSystem_->destroyInputObject(this->mouse_);
-    this->inputSystem_->destroyInputObject(this->keyboard_);
-    OIS::InputManager::destroyInputSystem(this->inputSystem_);
-
-    //TODO: If the InputHandler has been destroyed, how does it know?
+    if (!this->inputSystem_)
+    {
+      this->inputSystem_->destroyInputObject(this->mouse_);
+      this->inputSystem_->destroyInputObject(this->keyboard_);
+      OIS::InputManager::destroyInputSystem(this->inputSystem_);
+    }
+
+    this->uninitialized_ = true;
   }