Changeset 4649 in orxonox.OLD for orxonox/trunk/src/lib/particles

Timestamp:

Jun 17, 2005, 10:52:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: subproject Particles looks good again

Location:

orxonox/trunk/src/lib/particles

Files:

• particle_system.cc (modified) (3 diffs)
• quick_animation.cc (modified) (2 diffs)

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

@@ -194 +194 @@
 void ParticleSystem::setRadius(float lifeCycleTime, float radius, float randRadius)
 {
-  this->radiusAnim.addEntry(lifeCycleTime, radius);
-  this->randRadiusAnim.addEntry(lifeCycleTime, randRadius);
+  this->radiusAnim.changeEntry(lifeCycleTime, radius);
+  this->randRadiusAnim.changeEntry(lifeCycleTime, randRadius);
 }
 
@@ -206 +206 @@
 void ParticleSystem::setMass(float lifeCycleTime, float mass, float randMass)
 {
-  this->massAnim.addEntry(lifeCycleTime, mass);
-  this->randMassAnim.addEntry(lifeCycleTime, randMass);
+  this->massAnim.changeEntry(lifeCycleTime, mass);
+  this->randMassAnim.changeEntry(lifeCycleTime, randMass);
 }
 
@@ -220 +220 @@
 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);
+  this->colorAnim[0].changeEntry(lifeCycleTime, red);
+  this->colorAnim[1].changeEntry(lifeCycleTime, green);
+  this->colorAnim[2].changeEntry(lifeCycleTime, blue);
+  this->colorAnim[3].changeEntry(lifeCycleTime, alpha);
 }
 

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

@@ -36 +36 @@
    this->first = this->current = NULL;
 }
-
 
 /**
@@ -115 +114 @@
     }
   this->current = this->first;
-  return false;
+
+  this->addEntry(position, value);
 }