Changeset 934 for code/branches/network/src/orxonox/Orxonox.cc

Timestamp:

Mar 27, 2008, 5:15:08 PM (16 years ago)

Author:

rgrieder

Message:

• added debug output to the InputHandler
• fixed singleton issues
• cleaned up Main.cc (replaced WinMain by main)

File:

• code/branches/network/src/orxonox/Orxonox.cc (modified) (6 diffs)

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

@@ -46 +46 @@
 //#include <exception>
 #include <deque>
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
 
 //***** ORXONOX ****
@@ -80 +77 @@
 {
   /**
+    @brief Reference to the only instance of the class.
+  */
+  Orxonox *Orxonox::singletonRef_s = 0;
+
+  /**
    * create a new instance of Orxonox
    */
@@ -85 +87 @@
   {
     this->ogre_ = new GraphicsEngine();
+    this->timer_ = 0;
     this->dataPath_ = "";
     this->auMan_ = 0;
@@ -105 +108 @@
       delete this->orxonoxHUD_;
     Loader::close();
-    // do not destroy the InputHandler since this is a singleton too
-    // and might have been deleted already (after return 0; in main())
+    InputHandler::destroy();
     if (this->auMan_)
       delete this->auMan_;
@@ -142 +144 @@
   Orxonox* Orxonox::getSingleton()
   {
-    static Orxonox theOnlyInstance;
-    return &theOnlyInstance;
+    if (!singletonRef_s)
+      singletonRef_s = new Orxonox();
+    return singletonRef_s;
+    //static Orxonox theOnlyInstance;
+    //return &theOnlyInstance;
+  }
+
+  /**
+    @brief Destroys the Orxonox singleton.
+  */
+  void Orxonox::destroy()
+  {
+    if (singletonRef_s)
+      delete singletonRef_s;
+    singletonRef_s = 0;
   }
 
@@ -313 +328 @@
   {
     inputHandler_ = InputHandler::getSingleton();
-    inputHandler_->initialise(ogre_->getWindowHandle(),
-          ogre_->getWindowWidth(), ogre_->getWindowHeight());
+    if (!inputHandler_->initialise(ogre_->getWindowHandle(),
+          ogre_->getWindowWidth(), ogre_->getWindowHeight()))
+      abortImmediate();
   }