Changeset 4434 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jun 1, 2005, 11:27:12 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: PerParticle-animations work as expected

Location:

orxonox/trunk/src/lib/particles

Files:

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

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

@@ -240 +240 @@
       // rendering new position.
       tickPart->position = tickPart->position + tickPart->velocity * dt;
-      tickPart->radius = radiusAnim.getValue(tickPart->lifeCycle);
+      tickPart->radius = radiusAnim.getValue(tickPart->lifeCycle)
+        + randRadiusAnim.getValue(tickPart->lifeCycle) * tickPart->radiusRand;
+
+      tickPart->mass = massAnim.getValue(tickPart->lifeCycle)
+        + randMassAnim.getValue(tickPart->lifeCycle) * tickPart->massRand;
       
       tickPart->extForce = Vector(0,0,0);
@@ -450 +454 @@
 
       //  particle->rotation = ; //! \todo rotation is once again something to be done.
-      particles->mass = this->massAnim.getValue(0.0);
-      particles->radius = this->radiusAnim.getValue(0.0);
+      particles->massRand = 2*(float)rand()/RAND_MAX -1;
+      particles->radiusRand = 2* (float)rand()/RAND_MAX -1;
+      particles->mass = this->massAnim.getValue(0.0) + this->randMassAnim.getValue(0.0)*particles->massRand;
+      particles->radius = this->radiusAnim.getValue(0.0) + this->randRadiusAnim.getValue(0.0)*particles->radiusRand;
 
       ++this->count;

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

@@ -49 +49 @@
   Quaternion rotation;        //!< The current rotation of this particle.
   float mass;                 //!< The mass of this particle.
+  float massRand;
   float radius;               //!< The current size of this particle.
-  float radiusIt;             //!< The difference of the Size per second.
+  float radiusRand;
 
   GLfloat color [4];          //!< A Color for the particles.