Changeset 4123 in orxonox.OLD

Timestamp:

May 9, 2005, 3:39:52 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged back the ParticleEngine into the Trunk

Location:

orxonox/trunk/src/lib/graphics/particles

Files:

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

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

@@ -40 +40 @@
    this->particleType = type;
    this->particles = NULL;
+   this->deadList = NULL;
    this->setConserve(.8);
    this->setLifeSpan(.1);
@@ -57 +58 @@
   // 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;
+     }
 }
 
@@ -199 +216 @@
             {
               prevPart->next = tickPart->next;
-              delete tickPart;
+              tickPart->next = this->deadList;
+              this->deadList = tickPart;
               tickPart = prevPart->next;
             }
@@ -206 +224 @@
               prevPart = NULL;
               this->particles = tickPart->next;
-              delete tickPart;
+              tickPart->next = this->deadList;
+              this->deadList = tickPart;
               tickPart = this->particles;
             }
@@ -266 +285 @@
       if (unlikely(particles == NULL))
         {
-          this->particles = new Particle;
+          if (likely(deadList != NULL))
+            {
+              this->particles = this->deadList;
+              deadList = deadList->next;
+            }
+          else
+            this->particles = new Particle;
           this->particles->next = NULL;
         }
@@ -272 +297 @@
       else
         {
-          Particle* tmpPart = new Particle;
+          Particle* tmpPart;
+          if (likely(deadList != NULL))
+            {
+              tmpPart = this->deadList;
+              deadList = deadList->next;
+            }
+          else
+            tmpPart = new Particle;
           tmpPart->next = this->particles;
           this->particles = tmpPart;
@@ -300 +332 @@
   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);
+    }
+}

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

@@ -92 +92 @@
   Material* material;        //!< A Material for all the Particles.
   Particle* particles;       //!< A list of particles of this System.
+  Particle* deadList;        //!< A list of dead Particles in the System.
 
   GLuint* glID;              //!< A List of different gl-List-ID's