Changeset 1035 for code/trunk/src/orxonox/core/InputManager.cc

Timestamp:

Apr 12, 2008, 11:23:32 PM (16 years ago)

Author:

rgrieder

Message:

• minor Singleton changes

File:

• code/trunk/src/orxonox/core/InputManager.cc (modified) (4 diffs)

code/trunk/src/orxonox/core/InputManager.cc

@@ -43 +43 @@
     @brief The reference to the singleton
   */
-  InputManager* InputManager::singletonRef_s = 0;
+  //InputManager* InputManager::singletonRef_s = 0;
 
   /**
@@ -60 +60 @@
   InputManager::~InputManager()
   {
-    this->destroyDevices();
+    this->destroy();
   }
 
   /**
     @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 InputManager();
-    return singletonRef_s;
+    @return A reference to the only instance of the InputManager
+  */
+  InputManager& InputManager::getSingleton()
+  {
+    static InputManager theOnlyInstance;
+    return theOnlyInstance;
   }
 
@@ -142 +141 @@
 
   /**
-    @brief Destroys all the created input devices.
-  */
-  void InputManager::destroyDevices()
-  {
-    COUT(ORX_DEBUG) << "*** InputManager: Destroying InputManager..." << std::endl;
+    @brief Destroys all the created input devices and handlers.
+  */
+  void InputManager::destroy()
+  {
+    COUT(ORX_DEBUG) << "*** InputManager: Destroying ..." << std::endl;
     if (this->mouse_)
       this->inputSystem_->destroyInputObject(mouse_);
@@ -157 +156 @@
     this->keyboard_      = 0;
     this->inputSystem_   = 0;
+
+    if (this->handlerBuffer_)
+      delete this->handlerBuffer_;
+    if (this->handlerGame_)
+      delete this->handlerGame_;
+    if (this->handlerGUI_)
+      delete this->handlerGUI_;
+
+    this->handlerBuffer_ = 0;
+    this->handlerGame_   = 0;
+    this->handlerGUI_    = 0;
+
     COUT(ORX_DEBUG) << "*** InputManager: Destroying done." << std::endl;
-  }
-
-  /**
-    @brief Destroys the singleton.
-  */
-  void InputManager::destroySingleton()
-  {
-    if (singletonRef_s)
-      delete singletonRef_s;
-    singletonRef_s = 0;
   }