Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/lib/graphics/particles/particle_system.cc

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:

• orxonox/branches/movie_player/src/lib/graphics/particles/particle_system.cc (modified) (9 diffs)

orxonox/branches/movie_player/src/lib/graphics/particles/particle_system.cc

@@ -35 +35 @@
 {
    this->setClassName ("ParticleSystem");
+   this->material = NULL;
    this->name = NULL;
    this->maxCount = maxCount;
    this->count = 0;
-   this->particleType = type;
    this->particles = NULL;
-   this->setConserve(.8);
-   this->setLifeSpan(.1);
+   this->deadList = NULL;
+   this->setConserve(1);
+   this->setLifeSpan(1);
    this->setInheritSpeed(0);
    this->glID = NULL;
    this->setRadius(1.0, 1.0, 0.0);
-   this->setType(PARTICLE_SPRITE, 1);
+   this->setType(type, 1);
    ParticleEngine::getInstance()->addSystem(this);
 }
@@ -53 +54 @@
    \brief standard deconstructor
 */
-ParticleSystem::~ParticleSystem() 
+ParticleSystem::~ParticleSystem()
 {
   // delete what has to be deleted here
    ParticleEngine::getInstance()->removeSystem(this);
+
+   // deleting all the living Particles
+   while (this->particles)
+     {
+       Particle* tmpDelPart = this->particles;
+       this->particles = this->particles->next;
+       delete tmpDelPart;
+     }
+
+   // deleting all the dead particles
+   while (this->deadList)
+     {
+       Particle* tmpDelPart = this->deadList;
+       this->deadList = this->deadList->next;
+       delete tmpDelPart;
+     }
+
+   if (this->material)
+     delete this->material;
 }
 
@@ -199 +219 @@
             {
               prevPart->next = tickPart->next;
-              delete tickPart;
+              tickPart->next = this->deadList;
+              this->deadList = tickPart;
               tickPart = prevPart->next;
             }
@@ -206 +227 @@
               prevPart = NULL;
               this->particles = tickPart->next;
-              delete tickPart;
+              tickPart->next = this->deadList;
+              this->deadList = tickPart;
               tickPart = this->particles;
             }
@@ -221 +243 @@
 /**
    \brief draws all the Particles of this System
-*/
-void ParticleSystem::draw(void)
-{
+   \param the time passed in seconds (since the last draw)
+*/
+void ParticleSystem::draw(float dt)
+{
+  glPushAttrib(GL_ENABLE_BIT);
   //  material->select();
-
-
-  glMatrixMode(GL_MODELVIEW);
-  //  glDisable(GL_LIGHTING);
-  material->select();
-
   Particle* drawPart = particles;
-  if (likely(drawPart != NULL))
+
+  switch (this->particleType)
     {
-      glBegin(GL_POINTS);
+    case PARTICLE_SPRITE:
+      glMatrixMode(GL_MODELVIEW);
+      //  glDisable(GL_LIGHTING);
+      material->select(); 
+      glDisable(GL_DEPTH_TEST);
       while (likely(drawPart != NULL))
         {
-          // draw in DOT mode
           glPushMatrix();
           glTranslatef(drawPart->position.x, drawPart->position.y, drawPart->position.z);
@@ -243 +265 @@
           glCallList(*this->glID);
           
-          //              glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          //glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
           drawPart = drawPart->next;
           glPopMatrix();
         }
+      //      glEnd();
+      
+      //  glEnable(GL_LIGHTING);
+      
+      glEnable(GL_DEPTH_TEST);
+      break;
+    default:
+
+    case PARTICLE_SPARK:
+      glEnable(GL_LINE_SMOOTH);
+      glBegin(GL_LINES);
+      while (likely(drawPart != NULL))
+        {
+          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          glVertex3f(drawPart->position.x - drawPart->velocity.x,
+                     drawPart->position.y - drawPart->velocity.y,
+                     drawPart->position.z - drawPart->velocity.z);
+          drawPart = drawPart->next;
+        }
       glEnd();
+      break;
+      
+    case PARTICLE_DOT:
+      glBegin(GL_POINTS);
+      while (likely(drawPart != NULL))
+        {
+          glLineWidth(drawPart->radius);
+
+          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
+          drawPart = drawPart->next;
+        }
+      glEnd();
+      break;
     }
+  glPopAttrib();
 }
 
@@ -264 +319 @@
       if (unlikely(particles == NULL))
         {
-          this->particles = new Particle;
+          if (likely(deadList != NULL))
+            {
+              this->particles = this->deadList;
+              deadList = deadList->next;
+            }
+          else
+            {
+              PRINTF(5)("Generating new Particle\n");
+              this->particles = new Particle;
+            }
           this->particles->next = NULL;
         }
@@ -270 +334 @@
       else
         {
-          Particle* tmpPart = new Particle;
+          Particle* tmpPart;
+          if (likely(deadList != NULL))
+            {
+              tmpPart = this->deadList;
+              deadList = deadList->next;
+            }
+          else
+            {
+              PRINTF(5)("Generating new Particle\n");
+              tmpPart = new Particle;
+            }
           tmpPart->next = this->particles;
           this->particles = tmpPart;
         }
       
-      particles->timeToLive = this->lifeSpan + (float)(random()/RAND_MAX)* this->randomLifeSpan;
+      particles->timeToLive = this->lifeSpan + (float)(rand()/RAND_MAX)* this->randomLifeSpan;
       particles->position = position;
       particles->velocity = velocity;
 
       //  particle->rotation = ; //! \todo rotation is once again something to be done.
-      particles->mass = this->initialMass + (random()/RAND_MAX -.5)* this->randomInitialMass;
-      particles->radius = this->startRadius + (random()/RAND_MAX-.5)*this->randomStartRadius;
-      
-      particles->radiusIt = (this->endRadius + (random()/RAND_MAX-.5)*this->randomEndRadius - particles->radius) / particles->timeToLive;
+      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->timeToLive;
 
       ++this->count;
     }
   else
-    PRINTF(4)("maximum count of particles reached not adding any more\n");
+    PRINTF(5)("maximum count of particles reached not adding any more\n");
 }
 
@@ -298 +372 @@
   PRINT(0)("  ParticleSystem %s\n", this->name);
   PRINT(0)("  ParticleCount: %d, maximumCount: %d :: filled %d%%\n", this->count, this->maxCount, 100*this->count/this->maxCount);
-}
+  if (deadList)
+    {
+      PRINT(0)("  - ParticleDeadList is used: ");
+      int i = 1;
+      Particle* tmpPart = this->deadList;
+      while (tmpPart = tmpPart->next) ++i;
+      PRINT(0)("count: %d\n", i);
+    }
+}