Changeset 2296 for code/branches/physics/src/orxonox/tools

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(…)

Location:

code/branches/physics/src/orxonox/tools

Files:

• ParticleInterface.cc (modified) (2 diffs)
• ParticleInterface.h (modified) (2 diffs)

code/branches/physics/src/orxonox/tools/ParticleInterface.cc

@@ -56 +56 @@
 
         this->scenemanager_ = scenemanager;
-        this->sceneNode_ = 0;
 
         this->bEnabled_ = true;
@@ -72 +71 @@
     {
         this->particleSystem_->removeAllEmitters();
-        this->detachFromSceneNode();
         this->scenemanager_->destroyParticleSystem(particleSystem_);
-    }
-
-    void ParticleInterface::addToSceneNode(Ogre::SceneNode* sceneNode)
-    {
-        if (this->sceneNode_)
-            this->detachFromSceneNode();
-
-        this->sceneNode_ = sceneNode;
-        this->sceneNode_->attachObject(this->particleSystem_);
-    }
-
-    void ParticleInterface::detachFromSceneNode()
-    {
-        if (this->sceneNode_)
-        {
-            this->sceneNode_->detachObject(this->particleSystem_);
-            this->sceneNode_ = 0;
-        }
     }
 

code/branches/physics/src/orxonox/tools/ParticleInterface.h

@@ -54 +54 @@
                 { return this->particleSystem_; }
 
-            void addToSceneNode(Ogre::SceneNode* sceneNode);
-            void detachFromSceneNode();
-
             Ogre::ParticleEmitter* createNewEmitter();
             Ogre::ParticleEmitter* getEmitter(unsigned int emitterNr) const;
@@ -96 +93 @@
             static unsigned int       counter_s;
 
-            Ogre::SceneNode*          sceneNode_;
             Ogre::ParticleSystem*     particleSystem_;
             bool                      bVisible_;