Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/Scene.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/Scene.cc (modified) (7 diffs)

code/branches/questsystem5/src/orxonox/objects/Scene.cc

@@ -41 +41 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
@@ -57 +57 @@
         this->bShadows_ = true;
 
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             if (Ogre::Root::getSingletonPtr())
@@ -99 +99 @@
                 Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
             }
-            else if (!GameMode::showsGraphics())
+            else if (!Core::showsGraphics())
             {
                 delete this->sceneManager_;
@@ -227 +227 @@
     void Scene::tick(float dt)
     {
-        if (!GameMode::showsGraphics())
+        if (!Core::showsGraphics())
         {
             // We need to update the scene nodes if we don't render
@@ -256 +256 @@
     void Scene::setSkybox(const std::string& skybox)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
             this->sceneManager_->setSkyBox(true, skybox);
 
@@ -264 +264 @@
     void Scene::setAmbientLight(const ColourValue& colour)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
             this->sceneManager_->setAmbientLight(colour);
 
@@ -272 +272 @@
     void Scene::setShadow(bool bShadow)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
         {
             if (bShadow)