Changeset 4687 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 24, 2005, 1:44:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Particles now have a momentum and an orientation

Location:

orxonox/trunk/src/lib/particles

Files:

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

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

@@ -273 +273 @@
 
       // rendering new position.
-      tickPart->position = tickPart->position + tickPart->velocity * dt;
+      tickPart->position += tickPart->velocity * dt;
+      tickPart->orientation += tickPart->momentum *dt;
+
       tickPart->radius = radiusAnim.getValue(tickPart->lifeCycle)
         + randRadiusAnim.getValue(tickPart->lifeCycle) * tickPart->radiusRand;
@@ -439 +441 @@
 
     case PARTICLE_MODEL:
-      if (likely(this->model != NULL))
-        while (likely(drawPart != NULL))
       {
-        glPushMatrix();
-        glMatrixMode(GL_MODELVIEW);
-
-        glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
-        glScalef(drawPart->radius, drawPart->radius, drawPart->radius);
-
-        this->model->draw();
-
-        glPopMatrix();
-        drawPart = drawPart->next;
+        GLfloat matrix[4][4];
+
+        if (likely(this->model != NULL))
+          while (likely(drawPart != NULL))
+        {
+          glPushMatrix();
+          glMatrixMode(GL_MODELVIEW);
+          /* move */
+          glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          /* scale */
+          glScalef(drawPart->radius, drawPart->radius, drawPart->radius);
+          /* rotate */
+          drawPart->orientation.matrix (matrix);
+          glMultMatrixf((float*)matrix);
+
+          this->model->draw();
+
+          glPopMatrix();
+          drawPart = drawPart->next;
+        }
       }
       break;
@@ -515 +525 @@
           this->particles = tmpPart;
         }
-
       particles->lifeTime = this->lifeSpan + (float)(rand()/RAND_MAX)* this->randomLifeSpan;
       particles->lifeCycle = 0.0;
       particles->position = position;
       particles->velocity = velocity;
+
+      particles->orientation = Quaternion(.4, velocity.getNormalized());
+      particles->momentum = Quaternion(.4, velocity.getNormalized());
 
       //  particle->rotation = ; //! \todo rotation is once again something to be done.

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

@@ -51 +51 @@
 
   Vector        position;            //!< The current position of this particle.
-  Vector        velocity;            //!< The current velocity of this particle.
+  Vector        velocity;            //!< The current velocity of this Particle.
   Vector        extForce;            //!< The external Force that influences this Particle.
-  Quaternion    rotation;            //!< The current rotation of this particle.
-  float         mass;                //!< The mass of this particle.
+  Quaternion    orientation;         //!< The current orientation of this Particle.
+  Quaternion    momentum;            //!< The current angular momentum (spin) of this Particle.
+  float         mass;                //!< The mass of this Particle.
   float         massRand;            //!< A random mass
-  float         radius;              //!< The current size of this particle.
+  float         radius;              //!< The current size of this Particle.
   float         radiusRand;          //!< a random Radius
   GLfloat       color [4];           //!< A Color for the particles.