Changeset 3343

Timestamp:

Jul 24, 2009, 4:25:33 PM (15 years ago)

Author:

rgrieder

Message:

Expanded Core class by loadGraphics and unloadGraphics which don't do anything at the moment.

Location:

code/branches/resource/src

Files:

• core/Core.cc (modified) (4 diffs)
• core/Core.h (modified) (2 diffs)
• core/GameMode.h (modified) (3 diffs)
• orxonox/LevelManager.cc (modified) (1 diff)
• orxonox/OrxonoxPrecompiledHeaders.h (modified) (1 diff)
• orxonox/gamestates/GSGraphics.cc (modified) (2 diffs)

code/branches/resource/src/core/Core.cc

@@ -68 +68 @@
 #include "CoreIncludes.h"
 #include "Factory.h"
+#include "GameMode.h"
 #include "Identifier.h"
 #include "Language.h"
@@ -230 +231 @@
 
     Core::Core(const std::string& cmdLine)
+        : bGraphicsLoaded_(false)
     {
         if (singletonRef_s != 0)
@@ -315 +317 @@
         // Destroy command line arguments
         CommandLine::destroyAllArguments();
-        // Also delete external console command that don't belong to an Identifier
+        // Also delete external console commands that don't belong to an Identifier
         CommandExecutor::destroyExternalCommands();
         // Clean up class hierarchy stuff (identifiers, XMLPort, configValues, consoleCommand)
@@ -323 +325 @@
 
         // Don't assign singletonRef_s with NULL! Recreation is not supported
+    }
+
+    void Core::loadGraphics()
+    {
+        if (bGraphicsLoaded_)
+            return;
+
+        GameMode::setShowsGraphics(true);
+        bGraphicsLoaded_ = true;
+    }
+
+    void Core::unloadGraphics()
+    {
+        if (!bGraphicsLoaded_)
+            return;
+
+        bGraphicsLoaded_ = false;
+        GameMode::setShowsGraphics(false);
     }
 

code/branches/resource/src/core/Core.h

@@ -73 +73 @@
             void update(const Clock& time);
 
+            void loadGraphics();
+            void unloadGraphics();
+
             static Core& getInstance() { assert(Core::singletonRef_s); return *Core::singletonRef_s; }
 
@@ -111 +114 @@
             TclThreadManager*     tclThreadManager_;
 
-            bool isDevBuild_;                               //!< True for builds in the build directory (not installed)
+            bool                  isDevBuild_;          //!< True for builds in the build directory (not installed)
+            bool                  bGraphicsLoaded_;
             CoreConfiguration*    configuration_;
 

code/branches/resource/src/core/GameMode.h

@@ -41 +41 @@
     class _CoreExport GameMode
     {
+        friend class Core;
+
         public:
             static bool showsGraphics() { return bShowsGraphics_s; }
@@ -47 +49 @@
             static bool isStandalone()  { return bIsStandalone_s; }
             static bool isMaster()      { return bIsMaster_s; }
-            static void setShowsGraphics(bool val) { bShowsGraphics_s = val; updateIsMaster(); }
+
             static void setHasServer    (bool val) { bHasServer_s     = val; updateIsMaster(); }
             static void setIsClient     (bool val) { bIsClient_s      = val; updateIsMaster(); }
             static void setIsStandalone (bool val) { bIsStandalone_s  = val; updateIsMaster(); }
-            static void updateIsMaster  ()         { bIsMaster_s      = (bHasServer_s || bIsStandalone_s); }
 
         private:
@@ -57 +58 @@
             GameMode(const GameMode& inst);
             ~GameMode();
+
+            static void setShowsGraphics(bool val) { bShowsGraphics_s = val; updateIsMaster(); }
+            static void updateIsMaster  ()         { bIsMaster_s      = (bHasServer_s || bIsStandalone_s); }
 
             static bool bShowsGraphics_s;                   //!< global variable that tells whether to show graphics

code/branches/resource/src/orxonox/LevelManager.cc

@@ -34 +34 @@
 #include "core/CommandLine.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Loader.h"

code/branches/resource/src/orxonox/OrxonoxPrecompiledHeaders.h

@@ -90 +90 @@
 //#include "core/ConfigValueIncludes.h" // 19
 //#include "core/ConsoleCommand.h" // 15
-#include "core/Core.h"
+//#include "core/Core.h" // ?, but not many times
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
 #include "core/XMLPort.h"
 

code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

@@ -93 +93 @@
     void GSGraphics::activate()
     {
-        GameMode::setShowsGraphics(true);
+        // Load OGRE, CEGUI and OIS
+        Core::getInstance().loadGraphics();
 
         // Load OGRE including the render window
@@ -170 +171 @@
         delete graphicsManager_;
 
-        GameMode::setShowsGraphics(false);
+        // Unload OGRE, CEGUI and OIS
+        Core::getInstance().loadGraphics();
     }