Changeset 2468 for code/branches/presentation

Timestamp:

Dec 15, 2008, 7:40:25 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix for dedicated mode. Should work now except for an exception with an OrxonoxOverlay. Was that there before too?

Location:

code/branches/presentation/src/orxonox/objects

Files:

• Scene.cc (modified) (2 diffs)
• Scene.h (modified) (1 diff)
• worldentities/Model.cc (modified) (1 diff)
• worldentities/ParticleEmitter.cc (modified) (1 diff)

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

@@ -74 +74 @@
         {
             // create a dummy SceneManager of our own since we don't have Ogre::Root.
-            this->sceneManager_ = new Ogre::DefaultSceneManager("");
-            this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
+            this->sceneManagerDedicated_ = new Ogre::DefaultSceneManager("");
+            this->rootSceneNode_ = this->sceneManagerDedicated_->getRootSceneNode();
+            this->sceneManager_ = 0;
         }
 
@@ -114 +115 @@
             else if (!Core::showsGraphics())
             {
-                delete this->sceneManager_;
+                delete this->sceneManagerDedicated_;
             }
 

code/branches/presentation/src/orxonox/objects/Scene.h

@@ -78 +78 @@
 
             Ogre::SceneManager*      sceneManager_;
+            Ogre::SceneManager*      sceneManagerDedicated_;
             Ogre::SceneNode*         rootSceneNode_;
 

code/branches/presentation/src/orxonox/objects/worldentities/Model.cc

@@ -68 +68 @@
     void Model::changedMesh()
     {
-        if (this->mesh_.getEntity())
-            this->detachOgreObject(this->mesh_.getEntity());
+        if (Core::showsGraphics())
+        {
+            if (this->mesh_.getEntity())
+                this->detachOgreObject(this->mesh_.getEntity());
 
-        this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
+            this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
-        if (this->mesh_.getEntity())
-        {
-            this->attachOgreObject(this->mesh_.getEntity());
-            this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
-            this->mesh_.setVisible(this->isVisible());
+            if (this->mesh_.getEntity())
+            {
+                this->attachOgreObject(this->mesh_.getEntity());
+                this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
+                this->mesh_.setVisible(this->isVisible());
+            }
         }
     }

code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -51 +51 @@
         RegisterObject(ParticleEmitter);
 
-        if (!this->getScene() || !this->getScene()->getSceneManager())
+        if (Core::showsGraphics() && (!this->getScene() || !this->getScene()->getSceneManager()))
             ThrowException(AbortLoading, "Can't create Camera, no scene or no scene manager given.");