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

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

Files:

• objects/worldentities/Billboard.cc (modified) (3 diffs)
• objects/worldentities/Camera.cc (modified) (1 diff)
• objects/worldentities/Light.cc (modified) (1 diff)
• objects/worldentities/Model.cc (modified) (3 diffs)
• objects/worldentities/ParticleEmitter.cc (modified) (2 diffs)
• objects/worldentities/WorldEntity.h (modified) (2 diffs)
• objects/worldentities/triggers/Trigger.cc (modified) (1 diff)
• tools/ParticleInterface.cc (modified) (2 diffs)
• tools/ParticleInterface.h (modified) (2 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());
             }

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

@@ -55 +55 @@
 
         this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
-        this->getNode()->attachObject(this->camera_);
+        this->attachOgreObject(this->camera_);
 
         this->bHasFocus_ = false;

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

@@ -53 +53 @@
         if (this->getScene() && this->getScene()->getSceneManager())
         this->light_ = this->getScene()->getSceneManager()->createLight("Light" + convertToString(Light::lightCounter_s++));
-        this->getNode()->attachObject(this->light_);
+        this->attachOgreObject(this->light_);
 
         this->registerVariables();

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

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

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h

@@ -61 +61 @@
             void registerVariables();
 
-            inline Ogre::SceneNode* getNode() const
+            inline const Ogre::SceneNode* getNode() const
                 { return this->node_; }
 
@@ -145 +145 @@
                 { return this->children_; }
 
+            inline void attachOgreObject(Ogre::MovableObject* object)
+                { this->node_->attachObject(object); }
+            inline void detachOgreObject(Ogre::MovableObject* object)
+                { this->node_->detachObject(object); }
+            inline Ogre::MovableObject* detachOgreObject(const Ogre::String& name)
+                { return this->node_->detachObject(name); }
+
             inline void attachToParent(WorldEntity* parent)
                 { parent->attach(this); }

code/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -71 +71 @@
     }
 
-    this->getNode()->attachObject(this->debugBillboard_.getBillboardSet());
+    this->attachOgreObject(this->debugBillboard_.getBillboardSet());
     this->setObjectMode(0x0);
   }

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