Changeset 6619 in orxonox.OLD for trunk/src/lib/particles/particle_system.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_system.cc (modified) (4 diffs)

trunk/src/lib/particles/particle_system.cc

@@ -19 +19 @@
 
 #include "particle_emitter.h"
-#include "particle_engine.h"
 
 #include "field.h"
@@ -69 +68 @@
 ParticleSystem::~ParticleSystem()
 {
-  // delete what has to be deleted here
-   ParticleEngine::getInstance()->removeSystem(this);
-
    // deleting all the living Particles
    while (this->particles)
@@ -108 +104 @@
   this->glID = NULL;
   this->setType(PARTICLE_DEFAULT_TYPE, 1);
-  ParticleEngine::getInstance()->addSystem(this);
 
   this->toList(OM_ENVIRON);
@@ -297 +292 @@
 void ParticleSystem::addEmitter(ParticleEmitter* emitter)
 {
+  assert (emitter != NULL);
+  if (emitter->getSystem() != NULL)
+    emitter->getSystem()->removeEmitter(emitter);
   this->emitters.push_back(emitter);
 }