Changeset 5781 for code/trunk/src/libraries/core/Core.cc

Timestamp:

Sep 24, 2009, 11:02:42 AM (15 years ago)

Author:

rgrieder

Message:

Reverted trunk again. We might want to find a way to delete these revisions again (x3n's changes are still available as diff in the commit mails).

File:

• code/trunk/src/libraries/core/Core.cc (modified) (12 diffs)

code/trunk/src/libraries/core/Core.cc

@@ -63 +63 @@
 #include "util/SignalHandler.h"
 #include "Clock.h"
+#include "CommandExecutor.h"
 #include "CommandLine.h"
 #include "ConfigFileManager.h"
@@ -69 +70 @@
 #include "DynLibManager.h"
 #include "Factory.h"
+#include "GameMode.h"
+#include "GraphicsManager.h"
+#include "GUIManager.h"
 #include "Identifier.h"
 #include "Language.h"
 #include "LuaState.h"
+#include "Shell.h"
+#include "TclBind.h"
+#include "TclThreadManager.h"
+#include "input/InputManager.h"
 
 // Boost 1.36 has some issues with deprecated functions that have been omitted
@@ -109 +117 @@
             RegisterRootObject(CoreConfiguration);
             this->setConfigValues();
+
+            // External data directory only exists for dev runs
+            if (Core::isDevelopmentRun())
+            {
+                // Possible data path override by the command line
+                if (!CommandLine::getArgument("externalDataPath")->hasDefaultValue())
+                    tsetExternalDataPath(CommandLine::getValue("externalDataPath"));
+            }
         }
 
@@ -178 +194 @@
         }
 
+        /**
+        @brief
+            Temporary sets the external data path
+        @param path
+            The new data path
+        */
+        void tsetExternalDataPath(const std::string& path)
+        {
+            externalDataPath_ = boost::filesystem::path(path);
+        }
+
         void initializeRandomNumberGenerator()
         {
@@ -201 +228 @@
         boost::filesystem::path modulePath_;            //!< Path to the modules
         boost::filesystem::path dataPath_;              //!< Path to the data file folder
+        boost::filesystem::path externalDataPath_;      //!< Path to the external data file folder
         boost::filesystem::path configPath_;            //!< Path to the config file folder
         boost::filesystem::path logPath_;               //!< Path to the log file folder
@@ -209 +237 @@
         // Cleanup guard for identifier destruction (incl. XMLPort, configValues, consoleCommands)
         : identifierDestroyer_(Identifier::destroyAllIdentifiers)
+        // Cleanup guard for external console commands that don't belong to an Identifier
+        , consoleCommandDestroyer_(CommandExecutor::destroyExternalCommands)
         , configuration_(new CoreConfiguration()) // Don't yet create config values!
         , bDevRun_(false)
+        , bGraphicsLoaded_(false)
     {
         // Set the hard coded fixed paths
@@ -308 +339 @@
         // possibility to configure everything below here
         this->configuration_->initialise();
+
+        // Load OGRE excluding the renderer and the render window
+        this->graphicsManager_.reset(new GraphicsManager(false));
+
+        // initialise Tcl
+        this->tclBind_.reset(new TclBind(Core::getDataPathString()));
+        this->tclThreadManager_.reset(new TclThreadManager(tclBind_->getTclInterpreter()));
+
+        // create a shell
+        this->shell_.reset(new Shell());
     }
 
@@ -316 +357 @@
     Core::~Core()
     {
+    }
+
+    void Core::loadGraphics()
+    {
+        // Any exception should trigger this, even in upgradeToGraphics (see its remarks)
+        Loki::ScopeGuard unloader = Loki::MakeObjGuard(*this, &Core::unloadGraphics);
+
+        // Upgrade OGRE to receive a render window
+        graphicsManager_->upgradeToGraphics();
+
+        // Calls the InputManager which sets up the input devices.
+        inputManager_.reset(new InputManager());
+
+        // load the CEGUI interface
+        guiManager_.reset(new GUIManager(graphicsManager_->getRenderWindow(),
+            inputManager_->getMousePosition(), graphicsManager_->isFullScreen()));
+
+        unloader.Dismiss();
+
+        bGraphicsLoaded_ = true;
+    }
+
+    void Core::unloadGraphics()
+    {
+        this->guiManager_.reset();;
+        this->inputManager_.reset();;
+        this->graphicsManager_.reset();
+
+        // Load Ogre::Root again, but without the render system
+        try
+            { this->graphicsManager_.reset(new GraphicsManager(false)); }
+        catch (...)
+        {
+            COUT(0) << "An exception occurred during 'unloadGraphics':" << Exception::handleMessage() << std::endl
+                    << "Another exception might be being handled which may lead to undefined behaviour!" << std::endl
+                    << "Terminating the program." << std::endl;
+            abort();
+        }
+
+        bGraphicsLoaded_ = false;
     }
 
@@ -376 +457 @@
     }
 
+    /*static*/ void Core::tsetExternalDataPath(const std::string& path)
+    {
+        getInstance().configuration_->tsetExternalDataPath(path);
+    }
+
     /*static*/ const boost::filesystem::path& Core::getDataPath()
     {
@@ -383 +469 @@
     {
         return getInstance().configuration_->dataPath_.string() + '/';
+    }
+
+    /*static*/ const boost::filesystem::path& Core::getExternalDataPath()
+    {
+        return getInstance().configuration_->externalDataPath_;
+    }
+    /*static*/ std::string Core::getExternalDataPathString()
+    {
+        return getInstance().configuration_->externalDataPath_.string() + '/';
     }
 
@@ -564 +659 @@
         {
             configuration_->dataPath_  = specialConfig::dataDevDirectory;
+            configuration_->externalDataPath_ = specialConfig::externalDataDevDirectory;
             configuration_->configPath_ = specialConfig::configDevDirectory;
             configuration_->logPath_    = specialConfig::logDevDirectory;
@@ -629 +725 @@
     void Core::preUpdate(const Clock& time)
     {
+        if (this->bGraphicsLoaded_)
+        {
+            // process input events
+            this->inputManager_->update(time);
+            // process gui events
+            this->guiManager_->update(time);
+        }
+        // process thread commands
+        this->tclThreadManager_->update(time);
     }
 
     void Core::postUpdate(const Clock& time)
     {
+        if (this->bGraphicsLoaded_)
+        {
+            // Render (doesn't throw)
+            this->graphicsManager_->update(time);
+        }
     }
 }