Changeset 4433 in orxonox.OLD for orxonox/trunk
- Timestamp:
- Jun 1, 2005, 10:47:42 AM (19 years ago)
- Location:
- orxonox/trunk/src/lib/particles
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/particles/particle_system.cc
r4431 r4433 450 450 451 451 // particle->rotation = ; //! \todo rotation is once again something to be done. 452 particles->mass = this->initialMass + (rand()/RAND_MAX -.5)* this->randomInitialMass; 453 particles->radius = this->startRadius + (rand()/RAND_MAX-.5)*this->randomStartRadius; 454 455 particles->radiusIt = (this->endRadius + (rand()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->lifeTime; 452 particles->mass = this->massAnim.getValue(0.0); 453 particles->radius = this->radiusAnim.getValue(0.0); 456 454 457 455 ++this->count; -
orxonox/trunk/src/lib/particles/particle_system.h
r4431 r4433 90 90 inline float getLifeSpan(void) const { return this->lifeSpan; }; 91 91 /** \returns the starting-radius of the particles */ 92 inline float getStartRadius(void) const { return this->startRadius; };92 inline float getStartRadius(void) { return this->radiusAnim.getValue(0.0); }; 93 93 /** \returns the end-radius of the particles */ 94 inline float getEndRadius(void) const { return this->endRadius; };94 inline float getEndRadius(void) { return this->radiusAnim.getValue(1.0); }; 95 95 /** \returns the conserve-factor of the particles */ 96 96 inline float getConserve(void) const { return this->conserve; }; … … 114 114 float lifeSpan; //!< Initial lifetime of a Particle. 115 115 float randomLifeSpan; //!< A random value for the Lifespan (around the initial lifetime) 116 float startRadius; //!< The beginning Radius of the Particle117 float endRadius; //!< The end Radius of the Particle118 float randomStartRadius; //!< The Random start Radius (begin + rand*randomValue)119 float randomEndRadius; //!< Random end value120 116 float initialMass; //!< The initial Mass of the Particle 121 117 float randomInitialMass; //!< The random initial Mass of the Particle -
orxonox/trunk/src/lib/particles/quick_animation.cc
r4425 r4433 145 145 \param position the position to get the value from :) 146 146 */ 147 float QuickAnimation::getValue(float position) 147 float QuickAnimation::getValue(float position) 148 148 { 149 149 if (unlikely(this->first == NULL))
Note: See TracChangeset
for help on using the changeset viewer.