Changeset 1792 for code/trunk/src/orxonox

Timestamp:

Sep 16, 2008, 8:45:13 PM (16 years ago)

Author:

rgrieder

Message:

Changed initialisation of TclThreadManager, TclBind and Shell to match the simple singleton concept (runtime assert in the c'tor).
That simplifies things a lot. The instances now 'belong' to GSRoot.

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSRoot.cc (modified) (6 diffs)
• GSRoot.h (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include <OgreRoot.h>
 
-//#include "util/SubString.h"
 #include "util/Exception.h"
 #include "util/Debug.h"
@@ -42 +41 @@
 #include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
+#include "core/Shell.h"
 #include "core/TclBind.h"
 #include "core/TclThreadManager.h"
@@ -73 +73 @@
         , ogreLogger_(0)
         , graphicsEngine_(0)
+        , tclBind_(0)
+        , tclThreadManager_(0)
+        , shell_(0)
     {
         RegisterRootObject(GSRoot);
@@ -120 +123 @@
 
         // initialise TCL
-        TclBind::getInstance().setDataPath(Settings::getDataPath());
-        TclThreadManager::getInstance();
+        this->tclBind_ = new TclBind(Settings::getDataPath());
+        this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
+
+        // create a shell
+        this->shell_ = new Shell();
 
         setupOgre();
@@ -149 +155 @@
     void GSRoot::leave()
     {
+        // TODO: remove and destroy console commands
+
         delete graphicsEngine_;
 
@@ -160 +168 @@
 #endif
 
+        delete this->shell_;
+        delete this->tclThreadManager_;
+        delete this->tclBind_;
+
         delete settings_;
 
-        // TODO: remove and destroy console commands
     }
 

code/trunk/src/orxonox/gamestates/GSRoot.h

@@ -65 +65 @@
         Ogre::LogManager*     ogreLogger_;
         GraphicsEngine*       graphicsEngine_;   //!< Interface to Ogre
+        TclBind*              tclBind_;
+        TclThreadManager*     tclThreadManager_;
+        Shell*                shell_;
 
         std::string           ogreConfigFile_;        //!< ogre config file name