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

Timestamp:

Apr 18, 2006, 8:29:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Totally new QuickAnimation. This should be much faster, but it isn't … this again shows, that most of the Time the processor is used on the Draw functions….

File:

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

trunk/src/lib/particles/particle_system.cc

@@ -202 +202 @@
 void ParticleSystem::setRadius(float lifeCycleTime, float radius, float randRadius)
 {
-  this->radiusAnim.changeEntry(lifeCycleTime, radius);
-  this->randRadiusAnim.changeEntry(lifeCycleTime, randRadius);
+  this->radiusAnim.changeValue(lifeCycleTime, radius);
+  this->randRadiusAnim.changeValue(lifeCycleTime, randRadius);
 
   PRINTF(4)("Radius of %s::%s at timeSlice %f is %f with a Random of %f\n",
@@ -217 +217 @@
 void ParticleSystem::setMass(float lifeCycleTime, float mass, float randMass)
 {
-  this->massAnim.changeEntry(lifeCycleTime, mass);
-  this->randMassAnim.changeEntry(lifeCycleTime, randMass);
+  this->massAnim.changeValue(lifeCycleTime, mass);
+  this->randMassAnim.changeValue(lifeCycleTime, randMass);
 }
 
@@ -231 +231 @@
 void ParticleSystem::setColor(float lifeCycleTime, float red, float green, float blue, float alpha)
 {
-  this->colorAnim[0].changeEntry(lifeCycleTime, red);
-  this->colorAnim[1].changeEntry(lifeCycleTime, green);
-  this->colorAnim[2].changeEntry(lifeCycleTime, blue);
-  this->colorAnim[3].changeEntry(lifeCycleTime, alpha);
+  this->colorAnim[0].changeValue(lifeCycleTime, red);
+  this->colorAnim[1].changeValue(lifeCycleTime, green);
+  this->colorAnim[2].changeValue(lifeCycleTime, blue);
+  this->colorAnim[3].changeValue(lifeCycleTime, alpha);
 
   PRINTF(4)("Color of %s::%s on timeslice %f is r:%f g:%f b:%f a:%f\n",
@@ -310 +310 @@
 
     // applying Color
-    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);
+    this->colorAnim[0].getValue(tickPart->color[0], tickPart->lifeCycle);
+    this->colorAnim[1].getValue(tickPart->color[1], tickPart->lifeCycle);
+    this->colorAnim[2].getValue(tickPart->color[2], tickPart->lifeCycle);
+    this->colorAnim[3].getValue(tickPart->color[3], tickPart->lifeCycle);
 
     // rendering new position.