Changeset 3934 in orxonox.OLD

Timestamp:

Apr 23, 2005, 2:27:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: particles get deleted after theit life is over

Location:

orxonox/branches/particleEngine/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_system.cc (modified) (6 diffs)
• lib/graphics/particles/particle_system.h (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/particleEngine/src/defs/debug.h

@@ -72 +72 @@
 #define DEBUG_MODULE_FONT               1
 #define DEBUG_MODULE_ANIM               1
+#define DEBUG_MODULE_PARTICLE           4
 
 #define DEBUG_MODULE_NULL_PARENT        0

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_emitter.cc

@@ -112 +112 @@
 {
   // saving the time
-  float countF = (dt+this->saveTime) * this->emissionRate;
-  int count = (int)round(countF);
-  this->saveTime = countF - (float)count;
-
-  printf( "%d::%f::emmit %f\n", count, countF, emissionRate);
+  float count = (dt+this->saveTime) * this->emissionRate;
+  this->saveTime = modff(count, &count);
+  this->saveTime /= this->emissionRate;
 
   for (int i = 0; i <= count; i++)

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

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PARTICLE
 
 #include "particle_system.h"
@@ -32 +32 @@
    \todo this constructor is not jet implemented - do it
 */
-ParticleSystem::ParticleSystem (unsigned int count, PARTICLE_TYPE type) 
+ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
    this->setClassName ("ParticleSystem");
 
+   this->maxCount = maxCount;
+   this->count = 0;
    this->particleType = type;
    this->particles = NULL;
    this->conserve = 1.0;
-   this->setLifeSpan(5.0);
+   this->setLifeSpan(.1);
 
    ParticleEngine::getInstance()->addSystem(this);
@@ -62 +64 @@
 void ParticleSystem::setLifeSpan(float lifeSpan, float randomLifeSpan)
 {
-
+  this->lifeSpan = lifeSpan;
+  this->randomLifeSpan = randomLifeSpan;
 }
 
@@ -79 +82 @@
 void ParticleSystem::tick(float dt)
 {
-  Particle* tmpPart = particles;
-  while (likely(tmpPart != NULL))
+  Particle* tickPart = particles;  // the particle to Tick
+  Particle* prevPart = NULL;       // 
+  while (likely(tickPart != NULL))
     {
-      tmpPart->position = tmpPart->position + tmpPart->velocity;
+          
+      tickPart->position = tickPart->position + tickPart->velocity;
+      // many more to come
+      
 
-      // many more to come
 
-      tmpPart = tmpPart->next;
+
+
+
+      // find out if we have to delete tickPart
+      if ((tickPart->timeToLive -= dt) <= 0)
+        {
+          // remove the particle from the list
+          if (likely(prevPart != NULL))
+            {
+              prevPart->next = tickPart->next;
+              delete tickPart;
+              tickPart = prevPart->next;
+            }
+          else
+            {
+              prevPart = NULL;
+              this->particles = tickPart->next;
+              delete tickPart;
+              tickPart = this->particles;
+            }
+          --this->count;
+          printf("deleted particle: count %d\n", count);
+        }
+      else
+        {      
+          prevPart = tickPart;
+          tickPart = tickPart->next;
+        }
     }
 }
@@ -92 +125 @@
 void ParticleSystem::draw(void)
 {
-  Particle* tmpPart = particles;
-  if (likely(tmpPart != NULL))
+  Particle* drawPart = particles;
+  if (likely(drawPart != NULL))
     {
-      glBegin(GL_POINTS);
-      while (likely(tmpPart != NULL))
+      glBegin(GL_TRIANGLES);
+      while (likely(drawPart != NULL))
         {
           // draw in DOT mode
-          glVertex3f(tmpPart->position.x, tmpPart->position.y, tmpPart->position.z);
+          glVertex3f(drawPart->position.x, drawPart->position.y, drawPart->position.z);
           
           
-          tmpPart = tmpPart->next;
+          drawPart = drawPart->next;
         }
       glEnd();
@@ -111 +144 @@
 void ParticleSystem::addParticle(Vector position, Vector velocity, unsigned int data)
 {
-  // if it is the first Particle
-  if (unlikely(particles == NULL))
+  if (this->count <= this->maxCount)
     {
-      this->particles = new Particle;
-      this->particles->next = NULL;
+      // if it is the first Particle
+      if (unlikely(particles == NULL))
+        {
+          this->particles = new Particle;
+          this->particles->next = NULL;
+        }
+      // filling the List from the beginning
+      else
+        {
+          Particle* tmpPart = new Particle;
+          tmpPart->next = this->particles;
+          this->particles = tmpPart;
+        }
+      
+      particles->timeToLive = this->lifeSpan + (float)(random()/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)* this->randomInitialMass;
+      particles->radius = this->startRadius + (random()/RAND_MAX)*this->randomRadius;
+
+      ++this->count;
     }
-  // filling the List from the beginning
   else
-    {
-      Particle* tmpPart = new Particle;
-      tmpPart->next = this->particles;
-      this->particles = tmpPart;
-    }
-  
-  particles->timeToLive = this->lifeSpan + (float)(random()/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)* this->randomInitialMass;
-  particles->radius = this->startRadius + (random()/RAND_MAX)*this->randomRadius;
+    PRINTF(4)("maximum count of particles reached not adding any more\n");
 }
 

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.h

@@ -44 +44 @@
 
  public:
-  ParticleSystem(unsigned int particleCount = PARTICLE_DEFAULT_MAX_COUNT, PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
+  ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT, PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
   virtual ~ParticleSystem();
 
@@ -67 +67 @@
   
   // particles
-  int maxCount;              //!< the count of Particles for this ParticleSystem.
+  int maxCount;              //!< The maximum count of Particles.
+  int count;                 //!< The current count of Particles.
   PARTICLE_TYPE particleType;//!< A type for all the Particles
   Material* material;        //!< A Material for all the Particles.

orxonox/branches/particleEngine/src/orxonox.cc

@@ -36 +36 @@
 
 #include <string.h>
-int verbose = 3;
+int verbose = 4;
 
 using namespace std;

orxonox/branches/particleEngine/src/story_entities/world.cc

@@ -377 +377 @@
             this->glmis->step();
             
-            testEmitter = new ParticleEmitter(Vector(1,0,0), 20.0, 10000.0, .1);
+            testEmitter = new ParticleEmitter(Vector(1,0,0), 0.0, 124.0, .1);
             testEmitter->setParent(localPlayer);
-            testSystem = new ParticleSystem();
+            testSystem = new ParticleSystem(100000);
 
             ParticleEngine::getInstance()->addConnection(testEmitter, testSystem);