Changeset 2537 for code/branches/presentation/src/orxonox/objects/worldentities/Billboard.cc

Timestamp:

Dec 28, 2008, 7:21:17 PM (15 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().

File:

• code/branches/presentation/src/orxonox/objects/worldentities/Billboard.cc (modified) (3 diffs)

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