Changeset 7027 in orxonox.OLD for trunk/src

Timestamp:

Feb 3, 2006, 8:27:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: saver and faster emitter

Location:

trunk/src/lib/particles

Files:

• particle_emitter.cc (modified) (1 diff)
• particle_system.cc (modified) (1 diff)
• particle_system.h (modified) (1 diff)

trunk/src/lib/particles/particle_emitter.cc

@@ -186 +186 @@
     this->saveTime = modff(count, &count) / this->emissionRate;
     PRINTF(5)("emitting %f particles, saving %f seconds for the next timestep\n", count, this->saveTime);
-
+    if (count + this->system->getCount() > this->system->getMaxCount())
+      count = this->system->getMaxCount() - this->system->getCount();
     if (likely(count > 0.0f))
-    {
       this->emitParticles((unsigned int)count);
-
-/*      Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
-      for (int i = 0; i < (int)count; i++)
-      {
-        Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
-        randDir.normalize();
-        randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
-        Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
-
-        // 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 & 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 & EMITTER_CUBE)
-//         {
-//           extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
-//         }
-
-
-        // ROTATIONAL CALCULATION (this must not be done for all types of particles.)
-        randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
-        randDir.normalize();
-        Quaternion orient = Quaternion(M_PI, randDir);
-        Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
-
-        this->system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV, orient, moment);
-      } */
-    }
   }
 }

trunk/src/lib/particles/particle_system.cc

@@ -311 +311 @@
     // rendering new position.
     tickPart->position += tickPart->velocity * dt;
-    tickPart->orientation += tickPart->momentum *dt;
+    tickPart->orientation *= tickPart->momentum *dt;
 
     // many more to come

trunk/src/lib/particles/particle_system.h

@@ -84 +84 @@
   inline float getMass() const { return this->initialMass; };
 
+  /** @returns the count of particles in this System */
+  inline unsigned int getCount() const { return this->count; };
+  /** @returns the maximum count of particles that can be contained by this System */
+  inline unsigned int getMaxCount() const { return this->maxCount; };
+
   virtual unsigned int getFaceCount() const;