Changeset 4725 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jun 28, 2005, 8:51:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more load-params for Particles

Location:

orxonox/trunk/src/lib/particles

Files:

• particle_emitter.cc (modified) (2 diffs)
• particle_system.cc (modified) (4 diffs)
• particle_system.h (modified) (3 diffs)

orxonox/trunk/src/lib/particles/particle_emitter.cc

@@ -26 +26 @@
 
 using namespace std;
+
+
+CREATE_FACTORY(ParticleEmitter);
 
 
@@ -94 +97 @@
   LoadParam<ParticleEmitter>(root, "emission-velocity", this, &ParticleEmitter::setEmissionVelocity)
     .describe("How fast the particles are emittet (their initial speed)");
+
+  LoadParam<ParticleEmitter>(root, "emission-momentum", this, &ParticleEmitter::setEmissionMomentum)
+      .describe("How fast the particles rotation is at emissiontime (their initial momentum)");
 
   LoadParam<ParticleEmitter>(root, "spread", this, &ParticleEmitter::setSpread)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -30 +30 @@
 #include "tinyxml.h"
 
+CREATE_FACTORY(ParticleSystem);
+
+
 using namespace std;
 
@@ -52 +55 @@
 {
   this->init();
+
   this->loadParams(root);
 }
@@ -116 +120 @@
 
   //LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType);
-  LoadParam<ParticleSystem>(root, "life-span", this, &ParticleSystem::setLifeSpan);
-  LoadParam<ParticleSystem>(root, "conserve", this, &ParticleSystem::setConserve);
-//   void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
-//   void setConserve(float conserve);
-//
-//   /* Per-Particle-Attributes */
-//   void setRadius(float lifeCycleTime, float radius, float randRadius = 0.0);
-//   void setMass(float lifeCycleTime, float mass, float randMass = 0.0);
-//   void setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-
+  LoadParam<ParticleSystem>(root, "life-span", this, &ParticleSystem::setLifeSpan)
+      .describe("sets the life-span of the Particles.");
+
+  LoadParam<ParticleSystem>(root, "conserve", this, &ParticleSystem::setConserve)
+      .describe("sets the Conserve facrot of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
+
+  LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType)
+      .describe("sets the type of the Particles, (DOT, SPARK, SPRITE or MODEL)");
+
+  LoadParam<ParticleSystem>(root, "model", this, &ParticleSystem::setModel)
+      .describe("sets a model to be loaded on top of this System (also sets type to Model)");
+
+  // PER-PARTICLE-ATTRIBUTES:
+  LoadParam<ParticleSystem>(root, "radius", this, &ParticleSystem::setRadius)
+      .describe("The Radius of each particle over time (TimeIndex [0-1], radius at TimeIndex, randomRadius at TimeIndex)");
+
+  LoadParam<ParticleSystem>(root, "mass", this, &ParticleSystem::setMass)
+      .describe("The Mass of each particle over time (TimeIndex: [0-1], mass at TimeIndex, randomMass at TimeIndex)");
+
+  LoadParam<ParticleSystem>(root, "color", this, &ParticleSystem::setColor)
+      .describe("The Color of each particle over time (TimeIndex: [0-1], red: [0-1], green: [0-1], blue: [0-1], alpha: [0-1])");
+}
+/**
+   \param particleType the type of particles in this System
+   \param count how many particles (in PARTICLE_MULTI-mode)
+   \todo this will be different
+*/
+void ParticleSystem::setType(const char* particleType)
+{
+  if (strcmp(particleType, "DOTS"))
+    this->setType(PARTICLE_DOT);
+  else if (strcmp(particleType, "SPARKS"))
+    this->setType(PARTICLE_SPARK);
+  else if (strcmp(particleType, "MODELS"))
+    this->setType(PARTICLE_MODEL);
+  else // if (strcmp(particleType, "SPRITE"))
+    this->setType(PARTICLE_SPRITE);
 }
 
@@ -255 +286 @@
    \param alpha: alpha
 */
-void ParticleSystem::setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
+void ParticleSystem::setColor(float lifeCycleTime, float red, float green, float blue, float alpha)
 {
   this->colorAnim[0].changeEntry(lifeCycleTime, red);

orxonox/trunk/src/lib/particles/particle_system.h

@@ -76 +76 @@
   void loadParams(const TiXmlElement* root);
 
+  void setType(const char* particleType);
   void setType(PARTICLE_TYPE particleType, int count = 0);
   void setMaterial(Material* material);
@@ -85 +86 @@
   void setRadius(float lifeCycleTime, float radius, float randRadius = 0.0);
   void setMass(float lifeCycleTime, float mass, float randMass = 0.0);
-  void setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+  void setColor(float lifeCycleTime, float red, float green, float blue, float alpha);
 
   /** \returns the Type of the particles */
@@ -127 +128 @@
   PARTICLE_TYPE     particleType;        //!< A type for all the Particles
   Material*         material;            //!< A Material for all the Particles.
-  Model*            model;               //!< A Model to be displayed (PARTICLE_MODEL)
   Particle*         particles;           //!< A list of particles of this System.
   Particle*         deadList;            //!< A list of dead Particles in the System.