Changeset 4692 in orxonox.OLD

Timestamp:

Jun 24, 2005, 4:26:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: momentum

Location:

orxonox/trunk/src

Files:

• lib/particles/particle_emitter.cc (modified) (4 diffs)
• lib/particles/particle_system.cc (modified) (1 diff)
• subprojects/particles/particle_fun.cc (modified) (3 diffs)

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

@@ -245 +245 @@
   if (likely(dt > 0.0 && this->emissionRate > 0.0))
   {
-    // saving the time
+    // saving the time (particles only partly emitted in this timestep)
     float count = (dt+this->saveTime) * this->emissionRate;
     this->saveTime = modff(count, &count) / this->emissionRate;
-    PRINTF(5)("emitting %f particles, saving %f seconds for the next round\n", count, this->saveTime);
+    PRINTF(5)("emitting %f particles, saving %f seconds for the next timestep\n", count, this->saveTime);
 
     if (likely(count > 0))
@@ -254 +254 @@
       Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
       for (int i = 0; i < count; i++)
-          // emmits from EMITTER_DOT,
       {
         Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
@@ -261 +260 @@
         Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
 
-            // this should spread the Particles evenly. if the Emitter is moved around quickly
+        // this should spread the Particles evenly. if the Emitter is moved around quickly
         Vector equalSpread = this->getVelocity() * rand()/RAND_MAX * dt;
         Vector extension; // the Vector for different fields.
 
-        if (this->type & 2)
+        if (this->type & EMITTER_PLANE)
         {
           extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
           extension = this->getAbsDir().apply(extension);
         }
-        else if (this->type & 8)
+        else if (this->type & EMITTER_CUBE)
         {
           extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
@@ -283 +282 @@
 
         system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV, orient, moment);
-
       }
     }

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

@@ -265 +265 @@
 {
   Particle* tickPart = particles;  // the particle to Tick
-  Particle* prevPart = NULL;       //
+  Particle* prevPart = NULL;
   while (likely(tickPart != NULL))
     {

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -29 +29 @@
 #define PINIT_EMISSION_RATE          50
 #define PINIT_EMISSION_VELOCITY      5.0
+#define PINIT_EMISSION_MOMENTUM      1.0
 #define PINIT_SPREAD_ANGLE           0.1
 #define PINIT_EMITTER_TYPE           EMITTER_DOT
@@ -146 +147 @@
           PRINT(4)("Velocity set to %f\n", atof(value));
         }
+      else if (!strcmp(name, "Momentum"))
+        {
+          tmpEmit->setEmissionMomentum(atof(value));
+          PRINT(4)("Momentum set to %f\n", atof(value));
+        }
       else if(!strcmp(name, "SpreadAngle"))
         {
@@ -294 +300 @@
           velocity->redraw();
           emitterBox->fill(velocity);
+
+          emitterBox->fill(new Label("Momentum"));
+          Slider* Momentum = new Slider("Momentum", 0, 20);
+          Momentum->setExactness(2);
+          Momentum->connectSignal("value_changed", (void*)Momentum, emitterChange );
+          Momentum->setValue(PINIT_EMISSION_MOMENTUM);
+          Momentum->redraw();
+          emitterBox->fill(Momentum);
 
           emitterBox->fill(new Label("SpreadAngle"));