Changeset 3343 for code/branches/resource/src/orxonox

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/orxonox

Files:

• LevelManager.cc (modified) (1 diff)
• OrxonoxPrecompiledHeaders.h (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (2 diffs)

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();
     }