Changeset 6612 in orxonox.OLD for trunk/src/lib/particles/particle_system.cc

Timestamp:

Jan 19, 2006, 1:50:39 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: particle_system is now loaded differently

ParticleEngine is NOT needed anymore, this is faster and better

File:

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

trunk/src/lib/particles/particle_system.cc

@@ -31 +31 @@
 
 #include "parser/tinyxml/tinyxml.h"
+#include <algorithm>
+
 
 CREATE_FACTORY(ParticleSystem, CL_PARTICLE_SYSTEM);
@@ -107 +109 @@
   this->setType(PARTICLE_DEFAULT_TYPE, 1);
   ParticleEngine::getInstance()->addSystem(this);
+
+  this->toList(OM_ENVIRON);
 }
 
@@ -132 +136 @@
 
   LoadParam(root, "texture", this, ParticleSystem, setMaterialTexture);
+  LoadParamXML(root, "emitter", this, ParticleSystem, addEmitterXML);
 
   LOAD_PARAM_START_CYCLE(root, element);
@@ -147 +152 @@
   }
   LOAD_PARAM_END_CYCLE(element);
-
 }
 
@@ -288 +292 @@
   this->colorAnim[2].changeEntry(lifeCycleTime, blue);
   this->colorAnim[3].changeEntry(lifeCycleTime, alpha);
+}
+
+
+void ParticleSystem::addEmitter(ParticleEmitter* emitter)
+{
+  this->emitters.push_back(emitter);
+}
+
+void ParticleSystem::addEmitterXML(const TiXmlElement* emitterRoot)
+{
+  ParticleEmitter* emitter = new ParticleEmitter(emitterRoot);
+  this->addEmitter(emitter);
+}
+
+
+void ParticleSystem::removeEmitter(ParticleEmitter* emitter)
+{
+  std::list<ParticleEmitter*>::iterator it = std::find(this->emitters.begin(), this->emitters.end(), emitter);
+  if (it != this->emitters.end())
+    this->emitters.erase(it);
 }
 
@@ -357 +381 @@
         }
     }
+
+    std::list<ParticleEmitter*>::iterator emitter;
+    for (emitter = this->emitters.begin(); emitter != this->emitters.end(); emitter++)
+      (*emitter)->tick(dt, this);
 }