Changeset 4193 in orxonox.OLD for orxonox/branches

Timestamp:

May 16, 2005, 1:06:31 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: color-space

Location:

orxonox/branches/physics/src

Files:

• lib/graphics/particles/particle_system.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

@@ -245 +245 @@
       // applying Color
       //! \todo better algorithm to do this \todo also implement the midColor
-      tickPart->color[0] = this->startColor[0] *(1-tickPart->lifeCycle) + tickPart->lifeCycle * this->endColor[0];
-      tickPart->color[1] = this->startColor[1] *(1-tickPart->lifeCycle) + tickPart->lifeCycle * this->endColor[1];
-      tickPart->color[2] = this->startColor[2] *(1-tickPart->lifeCycle) + tickPart->lifeCycle * this->endColor[2];
-      tickPart->color[3] = this->startColor[3] *(1-tickPart->lifeCycle) + tickPart->lifeCycle * this->endColor[3];
-
+      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);
+        }         
       // many more to come
 

orxonox/branches/physics/src/story_entities/world.cc

@@ -496 +496 @@
   system->setLifeSpan(1);
   system->setConserve(.8);
-  system->setRadius(4, 0, 1, 0);
-  system->setColor(1,0,0,1, 1,1,0,1, 0,0,0,0);
+  system->setRadius(4, 3, 1, 2);
+  system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);
 
   // Creating a Test Particle Emitter