Changeset 2023 for code/branches/objecthierarchy/src/orxonox/objects/Scene.cc

Timestamp:

Oct 27, 2008, 10:56:51 PM (16 years ago)

Author:

rgrieder

Message:

• Added support for dedicated server. Could not network test it yet, client still segfaults me.
• Also kicked GraphicsEngine::levelSceneManager_, there are only the statistic methods left.
• GSDedicated also derives from GSLevel, but GSLevel is not anymore a real GameState.
• CameraHandler and LevelManager get created in GSLevel now.

File:

• code/branches/objecthierarchy/src/orxonox/objects/Scene.cc (modified) (6 diffs)

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

@@ -31 +31 @@
 
 #include <OgreRoot.h>
-#include <OgreSceneManager.h>
+#include <OgreSceneManagerEnumerator.h>
 #include <OgreSceneNode.h>
 #include <OgreLight.h>
 
 #include "core/CoreIncludes.h"
+#include "core/Core.h"
 #include "core/XMLPort.h"
 
@@ -49 +50 @@
         this->bShadows_ = false;
 
-        if (Ogre::Root::getSingletonPtr())
+        if (Core::showsGraphics())
         {
-            this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
-            this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
+            if (Ogre::Root::getSingletonPtr())
+            {
+                this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
+                this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
+            }
+            else
+            {
+                this->sceneManager_ = 0;
+                this->rootSceneNode_ = 0;
+            }
         }
         else
         {
-            this->sceneManager_ = 0;
-            this->rootSceneNode_ = 0;
+            // create a dummy SceneManager of our own since we don't have Ogre::Root.
+            this->sceneManager_ = new Ogre::DefaultSceneManager("");
+            this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
         }
 
         // test test test
-        if (this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
         {
             Ogre::Light* light;
@@ -80 +90 @@
             Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
         }
-        else
+        else if (!Core::showsGraphics())
         {
+            delete this->sceneManager_;
         }
     }
@@ -104 +115 @@
     void Scene::setSkybox(const std::string& skybox)
     {
-        if (this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
             this->sceneManager_->setSkyBox(true, skybox);
 
@@ -112 +123 @@
     void Scene::setAmbientLight(const ColourValue& colour)
     {
-        if (this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
             this->sceneManager_->setAmbientLight(colour);
 
@@ -120 +131 @@
     void Scene::setShadow(bool bShadow)
     {
-        if (this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
         {
             if (bShadow)