Changeset 3935 in orxonox.OLD for orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc

Timestamp:

Apr 23, 2005, 3:30:45 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: spread works, and many other functions implemented

File:

• orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc (modified) (8 diffs)

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

@@ -40 +40 @@
    this->particleType = type;
    this->particles = NULL;
-   this->conserve = 1.0;
+   this->setConserve(.8);
    this->setLifeSpan(.1);
 
@@ -54 +54 @@
 {
   // delete what has to be deleted here
+   ParticleEngine::getInstance()->removeSystem(this);
 }
 
@@ -59 +60 @@
 void ParticleSystem::setMaterial(Material* material)
 {
-  
+  this->material = material;
 }
 
@@ -70 +71 @@
 void ParticleSystem::setRadius(float startRadius, float endRadius, float randomRadius)
 {
-
+  this->startRadius = startRadius;
+  this->endRadius = endRadius;
+  this->randomRadius = randomRadius;
 }
 
 void ParticleSystem::setConserve(float conserve)
 {
-  this->conserve = conserve;
+  if (conserve > 1.0)
+    this->conserve = 1.0;
+  else if (conserve < 0.0)
+    this->conserve = 0.0;
+  else
+    this->conserve = conserve;
 }
 
@@ -86 +94 @@
   while (likely(tickPart != NULL))
     {
-          
+      
       tickPart->position = tickPart->position + tickPart->velocity;
       // many more to come
@@ -94 +102 @@
 
 
-
+      if (this->conserve < 1.0)
+        tickPart->velocity = tickPart->velocity * this->conserve;
       // find out if we have to delete tickPart
       if ((tickPart->timeToLive -= dt) <= 0)
@@ -113 +122 @@
             }
           --this->count;
-          printf("deleted particle: count %d\n", count);
         }
       else
@@ -128 +136 @@
   if (likely(drawPart != NULL))
     {
-      glBegin(GL_TRIANGLES);
+      glBegin(GL_POINTS);
       while (likely(drawPart != NULL))
         {