Changeset 2296 for code/branches/physics/src/orxonox/objects/worldentities/Model.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/Model.cc (modified) (3 diffs)

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

@@ -48 +48 @@
     {
         if (this->isInitialized() && this->mesh_.getEntity())
-            this->getNode()->detachObject(this->mesh_.getEntity());
+            this->detachOgreObject(this->mesh_.getEntity());
     }
 
@@ -68 +68 @@
     {
         if (this->mesh_.getEntity())
-            this->getNode()->detachObject(this->mesh_.getEntity());
+            this->detachOgreObject(this->mesh_.getEntity());
 
         this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
@@ -74 +74 @@
         if (this->mesh_.getEntity())
         {
-            this->getNode()->attachObject(this->mesh_.getEntity());
+            this->attachOgreObject(this->mesh_.getEntity());
             this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
             this->mesh_.setVisible(this->isVisible());