Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleEmitter.cc

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) (4 diffs)

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

@@ -33 +33 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "ParticleEmitter.h"
 
-#include "ParticleEmitter.h"
+#include <OgreParticleSystem.h>
 
 #include "tools/ParticleInterface.h"
@@ -46 +47 @@
     CreateFactory(ParticleEmitter);
 
-    ParticleEmitter::ParticleEmitter(BaseObject* creator) : PositionableEntity(creator)
+    ParticleEmitter::ParticleEmitter(BaseObject* creator) : StaticEntity(creator)
     {
         RegisterObject(ParticleEmitter);
@@ -62 +63 @@
     {
         if (this->isInitialized() && this->particles_)
+        {
+            this->detachOgreObject(this->particles_->getParticleSystem());
             delete this->particles_;
+        }
     }
 
@@ -105 +109 @@
             {
                 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());