Changeset 4431 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 1, 2005, 10:30:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: particles: color is animatable too

Location:

orxonox/trunk/src

Files:

• lib/particles/particle_system.cc (modified) (2 diffs)
• lib/particles/particle_system.h (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)

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

@@ -208 +208 @@
 
 /**
-   \brief Tells the ParticleSystem how it should iterate the color over time
-   \param ....
-*/
-void ParticleSystem::setColor(GLfloat br, GLfloat bg, GLfloat bb, GLfloat ba,
-                              GLfloat mr, GLfloat mg, GLfloat mb, GLfloat ma,
-                              GLfloat er, GLfloat eg, GLfloat eb, GLfloat ea)
-{
-  this->startColor[0] = br;
-  this->startColor[1] = bg;
-  this->startColor[2] = bb;
-  this->startColor[3] = ba;
-
-  this->midColor[0] = mr;
-  this->midColor[1] = mg;
-  this->midColor[2] = mb;
-  this->midColor[3] = ma;
-
-  this->endColor[0] = er;
-  this->endColor[1] = eg;
-  this->endColor[2] = eb;
-  this->endColor[3] = ea;
+   \brief sets a key in the color-animation on a per-particle basis
+   \param lifeCycleTime the time (partilceLifeTime/particleAge) [0-1]
+   \param red red
+   \param green green
+   \param blue blue
+*/
+void ParticleSystem::setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
+{
+  this->colorAnim[0].addEntry(lifeCycleTime, red);
+  this->colorAnim[1].addEntry(lifeCycleTime, green);
+  this->colorAnim[2].addEntry(lifeCycleTime, blue);
+  this->colorAnim[3].addEntry(lifeCycleTime, alpha);
 }
 
@@ -254 +245 @@
 
       // applying Color
-      //! \todo better algorithm to do this \todo also implement the midColor
-      if (tickPart->lifeCycle < .5)
-        {
-          tickPart->color[0] = this->startColor[0] *(1.0-tickPart->lifeCycle*2.0) + this->midColor[0] *(tickPart->lifeCycle*2);
-          tickPart->color[1] = this->startColor[1] *(1.0-tickPart->lifeCycle*2.0) + this->midColor[1] *(tickPart->lifeCycle*2);
-          tickPart->color[2] = this->startColor[2] *(1.0-tickPart->lifeCycle*2.0) + this->midColor[2] *(tickPart->lifeCycle*2);
-          tickPart->color[3] = this->startColor[3] *(1.0-tickPart->lifeCycle*2.0) + this->midColor[3] *(tickPart->lifeCycle*2);
-        }
-      else
-        {
-          tickPart->color[0] = this->midColor[0] *(2.0-tickPart->lifeCycle*2.0) + this->endColor[0] *(tickPart->lifeCycle*2);
-          tickPart->color[1] = this->midColor[1] *(2.0-tickPart->lifeCycle*2.0) + this->endColor[1] *(tickPart->lifeCycle*2);
-          tickPart->color[2] = this->midColor[2] *(2.0-tickPart->lifeCycle*2.0) + this->endColor[2] *(tickPart->lifeCycle*2);
-          tickPart->color[3] = this->midColor[3] *(2.0-tickPart->lifeCycle*2.0) + this->endColor[3] *(tickPart->lifeCycle*2);
-        }         
+      tickPart->color[0] = this->colorAnim[0].getValue(tickPart->lifeCycle);
+      tickPart->color[1] = this->colorAnim[1].getValue(tickPart->lifeCycle);
+      tickPart->color[2] = this->colorAnim[2].getValue(tickPart->lifeCycle);
+      tickPart->color[3] = this->colorAnim[3].getValue(tickPart->lifeCycle);
+
       // many more to come
 

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

@@ -79 +79 @@
   void setRadius(float lifeCycleTime, float radius, float randRadius = 0.0);
   void setMass(float lifeCycleTime, float mass, float randMass = 0.0);
-  void setColor(GLfloat br, GLfloat bg, GLfloat bb, GLfloat ba,
-                GLfloat mr, GLfloat mg, GLfloat mb, GLfloat ma,
-                GLfloat er, GLfloat eg, GLfloat eb, GLfloat ea);
-
-
+  void setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
 
   /** \returns the Type of the particles */
@@ -126 +122 @@
   float inheritSpeed;        //!< How much speed the particle inherits from the Emitters speed \todo move this to the emitter
 
-  GLfloat startColor[4];     //!< Color of the Particle at the beginning
-  GLfloat midColor[4];       //!< Color of the Particle at the middle of its lifeSpan
-  GLfloat endColor[4];       //!< Color of the Particle at the end of its lifeSpan
-
   // particles
   int maxCount;              //!< The maximum count of Particles.
@@ -141 +133 @@
   GLuint dialectCount;       //!< How many different types of particles are there in the Particle System  
 
+  // per particle attributes
   QuickAnimation radiusAnim;
   QuickAnimation randRadiusAnim;

orxonox/trunk/src/story_entities/world.cc

@@ -474 +474 @@
   // Creating a Test Particle System
   ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
-  system->setLifeSpan(1);
+  system->setLifeSpan(.5);
   system->setConserve(.8);
   system->setRadius(0.0, 1.0, .6);
+  system->setRadius(.2, 3, .2);
   system->setRadius(1.0, 0.0, .0);
-
-  system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);
+  system->setMass (0.0, 1.0);
+
+  system->setColor(0, .5,0,0,.5);
+  system->setColor(.5, 1,1,0,1);
+  system->setColor(1.0, 0,0,0,0);
 
   // Creating a Test Particle Emitter