Changeset 2296 for code/branches/physics/src/orxonox/objects/worldentities/Billboard.cc

Timestamp:

Nov 29, 2008, 12:25:22 AM (16 years ago)

Author:

rgrieder

Message:

Made return value of WorldEntity::getNode() const —> Modifying the node_ will not anymore be allowed.
That change implicates:

• Removed Ogre::SceneNode from ParticleInterface. It gets connected now by the ParticleEmitter
• Added functions attachOgreObject and detachOgreObject to WorldEntity
• changed all getNode()→attachObject(…) to attachOgreObject(…)

File:

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

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

@@ -50 +50 @@
         {
             if (this->isInitialized() && this->billboard_.getBillboardSet())
-                this->getNode()->detachObject(this->billboard_.getName());
+                this->detachOgreObject(this->billboard_.getName());
         }
     }
@@ -75 +75 @@
             {
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);
-                this->getNode()->attachObject(this->billboard_.getBillboardSet());
+                this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
             }
@@ -90 +90 @@
             {
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);
-                this->getNode()->attachObject(this->billboard_.getBillboardSet());
+                this->attachOgreObject(this->billboard_.getBillboardSet());
                 this->billboard_.setVisible(this->isVisible());
             }