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

Timestamp:

Jan 20, 2006, 12:54:20 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: particle Systems and Emitters are loaded and cleaned up nicely

File:

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

trunk/src/lib/particles/particle_system.cc

@@ -44 +44 @@
 
   this->setMaxCount(maxCount);
-}
-
-/**
- * @brief creates a Particle System out of a XML-element
- * @param root: the XML-element to load from
- */
-ParticleSystem::ParticleSystem(const TiXmlElement* root)
-{
-  this->init();
-
-  this->loadParams(root);
 }
 
@@ -78 +67 @@
      }
 
-   if (this->material)
-     delete this->material;
+     while(!this->emitters.empty())
+     {
+       this->removeEmitter(this->emitters.front());
+     }
+
 }
 
@@ -89 +81 @@
   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
 
-  this->material = NULL;
   this->setMaxCount(PARTICLE_DEFAULT_MAX_COUNT);
   this->count = 0;
@@ -96 +87 @@
   this->setConserve(1);
   this->setLifeSpan(1);
-  this->glID = NULL;
 
   this->toList(OM_ENVIRON);
@@ -120 +110 @@
       .describe("sets the Conserve factor of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
 
-  LoadParam(root, "texture", this, ParticleSystem, setMaterialTexture);
-  LoadParamXML(root, "emitter", this, ParticleSystem, addEmitterXML);
+  LoadParamXML(root, "emitters", this, ParticleSystem, loadEmitters);
 
   LOAD_PARAM_START_CYCLE(root, element);
@@ -140 +129 @@
 
 /**
+ * @brief loads the Emitters from An XML-Root
+ * @param root the XML-Element to load all emitters from
+ */
+void ParticleSystem::loadEmitters(const TiXmlElement* root)
+{
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    BaseObject* emitter = Factory::fabricate(element);
+    if (emitter->isA(CL_PARTICLE_EMITTER))
+      this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
+    else
+    {
+      PRINTF(2)("Tried to load an Element of type '%s' that should be a ParticleEmitter onto '%s::%s'.\n",
+                emitter->getClassName(), this->getClassName(), this->getName());
+      delete emitter;
+    }
+  }
+  LOAD_PARAM_END_CYCLE(element);
+}
+
+/**
 * @param maxCount the maximum count of particles that can be emitted
  */
@@ -148 +158 @@
 
 // setting properties
-/**
- *  sets the material to an external material
- * @param material: the material to set this material to.
-
-   !! important if the extern material gets deleted it MUST be unregistered here or segfault !!
-*/
-void ParticleSystem::setMaterial(Material* material)
-{
-  this->material = material;
-}
-
-void ParticleSystem::setMaterialTexture(const char* textureFile)
-{
-  if (this->material != NULL)
-    this->material->setDiffuseMap(textureFile);
-}
-
 /**
  *  Sets the lifespan of newly created particles
@@ -237 +230 @@
     emitter->getSystem()->removeEmitter(emitter);
   this->emitters.push_back(emitter);
-}
-
-void ParticleSystem::addEmitterXML(const TiXmlElement* emitterRoot)
-{
-  ParticleEmitter* emitter = new ParticleEmitter(emitterRoot);
-  this->addEmitter(emitter);
 }