Changeset 4433 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jun 1, 2005, 10:47:42 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: no more flickering effect at the beginning

Location:

orxonox/trunk/src/lib/particles

Files:

• particle_system.cc (modified) (1 diff)
• particle_system.h (modified) (2 diffs)
• quick_animation.cc (modified) (1 diff)

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

@@ -450 +450 @@
 
       //  particle->rotation = ; //! \todo rotation is once again something to be done.
-      particles->mass = this->initialMass + (rand()/RAND_MAX -.5)* this->randomInitialMass;
-      particles->radius = this->startRadius + (rand()/RAND_MAX-.5)*this->randomStartRadius;
-      
-      particles->radiusIt = (this->endRadius + (rand()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->lifeTime;
+      particles->mass = this->massAnim.getValue(0.0);
+      particles->radius = this->radiusAnim.getValue(0.0);
 
       ++this->count;

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

@@ -90 +90 @@
   inline float getLifeSpan(void) const { return this->lifeSpan; };
   /** \returns the starting-radius of the particles */
-  inline float getStartRadius(void) const { return this->startRadius; };
+  inline float getStartRadius(void) { return this->radiusAnim.getValue(0.0); };
   /** \returns the end-radius of the particles */
-  inline float getEndRadius(void) const { return this->endRadius; };
+  inline float getEndRadius(void) { return this->radiusAnim.getValue(1.0); };
   /** \returns the conserve-factor of the particles */
   inline float getConserve(void) const { return this->conserve; };
@@ -114 +114 @@
   float lifeSpan;            //!< Initial lifetime of a Particle.
   float randomLifeSpan;      //!< A random value for the Lifespan (around the initial lifetime)
-  float startRadius;         //!< The beginning Radius of the Particle
-  float endRadius;           //!< The end Radius of the Particle
-  float randomStartRadius;   //!< The Random start Radius (begin + rand*randomValue)
-  float randomEndRadius;     //!< Random end value
   float initialMass;         //!< The initial Mass of the Particle
   float randomInitialMass;   //!< The random initial Mass of the Particle

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

@@ -145 +145 @@
    \param position the position to get the value from :)
 */
-float QuickAnimation::getValue(float position)
+float QuickAnimation::getValue(float position) 
 {
   if (unlikely(this->first == NULL))