Changeset 6619 in orxonox.OLD for trunk/src/lib/particles/particle_emitter.cc

Timestamp:

Jan 19, 2006, 6:23:56 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: rendering without the ParticleEngine, so now we are FAST

File:

• trunk/src/lib/particles/particle_emitter.cc (modified) (6 diffs)

trunk/src/lib/particles/particle_emitter.cc

@@ -19 +19 @@
 
 #include "particle_system.h"
-#include "particle_engine.h"
 
 #include "load_param.h"
@@ -44 +43 @@
   this->setEmissionVelocity(velocity);
 
-  ParticleEngine::getInstance()->addEmitter(this);
 }
 
@@ -57 +55 @@
    if (root != NULL)
      this->loadParams(root);
-
-   ParticleEngine::getInstance()->addEmitter(this);
 }
 
@@ -68 +64 @@
 ParticleEmitter::~ParticleEmitter ()
 {
-  ParticleEngine::getInstance()->removeEmitter(this);
 }
 
@@ -84 +79 @@
   this->setSize(PARTICLE_EMITTER_DEFAULT_SIZE);
 
+  this->system = NULL;
+
   this->saveTime = 0.0;
 }
@@ -118 +115 @@
 
   LoadParam(root, "emission-direction", this, ParticleEmitter, setDirection);
+}
+
+void ParticleEmitter::setSystem(ParticleSystem* system)
+{
+  if (system != NULL)
+    system->addEmitter(this);
+  else if (this->system != NULL)
+    this->system->removeEmitter(this);
+  this->system = system;
 }