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

Timestamp:

Nov 29, 2008, 12:25:22 AM (15 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/ParticleEmitter.cc (modified) (2 diffs)

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

@@ -61 +61 @@
     {
         if (this->isInitialized() && this->particles_)
+        {
+            this->detachOgreObject(this->particles_->getParticleSystem());
             delete this->particles_;
+        }
     }
 
@@ -104 +107 @@
             {
                 this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), this->source_, this->LOD_);
-                this->particles_->addToSceneNode(this->getNode());
+                this->attachOgreObject(particles_->getParticleSystem());
                 this->particles_->setVisible(this->isVisible());
                 this->particles_->setEnabled(this->isActive());