Changeset 928 for code/branches/network

Timestamp:

Mar 26, 2008, 8:18:14 PM (17 years ago)

Author:

rgrieder

Message:

• added destroy code for the InputHandler

Location:

code/branches/network/src/orxonox

Files:

• InputHandler.cc (modified) (2 diffs)
• InputHandler.h (modified) (1 diff)
• Orxonox.cc (modified) (1 diff)

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

@@ -80 +80 @@
       windowHndStr << (unsigned int)windowHnd;
       paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
+
+#if defined OIS_LINUX_PLATFORM
+      paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+#endif
 
       // Create inputsystem
@@ -109 +113 @@
     //assign 'abort' to the escape key
     this->bindingsKeyPressed_[(int)OIS::KC_ESCAPE].id = 1;
+  }
+
+  /**
+    @brief Destroys all the created input devices.
+  */
+  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?
   }
 

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

@@ -49 +49 @@
   public:
     void initialise(size_t windowHnd, int windowWidth, int windowHeight);
+    void destroy();
     void tick(float dt);
     void setWindowExtents(int width, int height);

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

@@ -98 +98 @@
   {
     // nothing to delete as for now
+    inputHandler_->destroy();
   }