Changeset 2537 for code/branches

Timestamp:

Dec 28, 2008, 7:21:17 PM (16 years ago)

Author:

rgrieder

Message:

• Removed a const_const that could be easily replaced
• getScene()→getSceneManager() is non zero again in dedicated mode

—> PLEASE ALWAYS USE Core::showsGraphics() TO IDENTIFY EXACTLY THAT, NOT this→getScene()→getSceneManager().

Location:

code/branches/presentation/src/orxonox/objects

Files:

• Scene.cc (modified) (2 diffs)
• Scene.h (modified) (1 diff)
• worldentities/Backlight.cc (modified) (1 diff)
• worldentities/Billboard.cc (modified) (3 diffs)
• worldentities/ExplosionChunk.cc (modified) (1 diff)
• worldentities/ParticleEmitter.cc (modified) (1 diff)
• worldentities/triggers/Trigger.cc (modified) (2 diffs)

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

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

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

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

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

@@ -214 +214 @@
                 this->update_trailmaterial();
                 if (this->ribbonTrail_)
-                    this->ribbonTrail_->addNode(const_cast<Ogre::SceneNode*>(this->getNode()));
+                    this->ribbonTrail_->addNode(this->node_);
             }
         }

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

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "core/Core.h"
 #include "objects/Scene.h"
 
@@ -80 +81 @@
         if (!this->billboard_.getBillboardSet())
         {
-            if (this->getScene() && this->getScene()->getSceneManager())
+            if (this->getScene() && Core::showsGraphics())
             {
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);
@@ -97 +98 @@
         {
 /*
-            if (this->getScene() && this->getScene()->getSceneManager() && (this->material_ != ""))
+            if (this->getScene() && Core::showsGraphics() && (this->material_ != ""))
             {
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);

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

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

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

@@ -107 +107 @@
         }
 
-        if (this->getScene() && this->getScene()->getSceneManager())
+        if (Core::showsGraphics() && this->getScene() && this->getScene()->getSceneManager())
         {
             try

code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -36 +36 @@
 #include "core/ConsoleCommand.h"
 #include "core/XMLPort.h"
+#include "core/Core.h"
 #include "objects/Scene.h"
 
@@ -66 +67 @@
 //    this->bUpdating_ = false;
 
-    if (this->getScene() && this->getScene()->getSceneManager())
+    if (this->getScene() && Core::showsGraphics())
     {
       this->debugBillboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1);