Changeset 3951 in orxonox.OLD for orxonox/branches/particleEngine/src/lib/graphics

Timestamp:

Apr 25, 2005, 12:28:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: some minor fixes

Location:

orxonox/branches/particleEngine/src/lib/graphics/particles

Files:

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

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

@@ -134 +134 @@
         randDir.normalize();
         randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
-        randDir = *randDir.getNormalized() + (this->getVelocity() * system->inheritSpeed);
-        
-        system->addParticle(this->getAbsCoor(), randDir* velocity);
+        randDir = *randDir.getNormalized()*velocity + (this->getVelocity() * system->inheritSpeed);
+
+        system->addParticle(this->getAbsCoor(), randDir);
       }
   }

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

@@ -184 +184 @@
   while (likely(tickPart != NULL))
     {
-      
       tickPart->position = tickPart->position + tickPart->velocity;
       tickPart->radius += tickPart->radiusIt * dt;
 
       // many more to come
-
 
 
@@ -271 +269 @@
    \param data some more data given by the emitter
 */
-void ParticleSystem::addParticle(Vector position, Vector velocity, unsigned int data)
+void ParticleSystem::addParticle(const Vector& position, const Vector& velocity, unsigned int data)
 {
   if (this->count <= this->maxCount)
@@ -292 +290 @@
       particles->position = position;
       particles->velocity = velocity;
+
       //  particle->rotation = ; //! \todo rotation is once again something to be done.
       particles->mass = this->initialMass + (random()/RAND_MAX -.5)* this->randomInitialMass;

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

@@ -87 +87 @@
   GLuint dialectCount;       //!< How many different types of particles are there in the Particle System
 
-  void addParticle(Vector position, Vector velocity, unsigned int data = 0);
+  void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);
   
 };