Changeset 3951 in orxonox.OLD

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

Files:

• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_system.cc (modified) (3 diffs)
• lib/graphics/particles/particle_system.h (modified) (1 diff)
• lib/math/vector.cc (modified) (1 diff)
• lib/math/vector.h (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)

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);
   
 };

orxonox/branches/particleEngine/src/lib/math/vector.cc

@@ -172 +172 @@
    \brief Outputs the values of the Vector
 */
-void Vector::debug(void)
+void Vector::debug(void) const
 {
   PRINT(0)("Vector Debug information\n");

orxonox/branches/particleEngine/src/lib/math/vector.h

@@ -53 +53 @@
   Vector abs();
 
-  void debug();
+  void debug() const;
 };
 

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

@@ -372 +372 @@
             //localCamera->setParent(TrackNode::getInstance());
             tn->addChild(this->localCamera);
+            localCamera->setMode(PNODE_MOVEMENT);
             //      localCamera->lookAt(tn);
-            this->localPlayer->setMode(PNODE_ALL);
+            this->localPlayer->setMode(PNODE_ROTATE_AND_MOVE);
             //Vector* cameraOffset = new Vector (0, 5, -10);
             trackManager->condition(2, LEFTRIGHT, this->localPlayer);
@@ -380 +381 @@
             ParticleEmitter* testEmitter,* testEmitter2;
             ParticleSystem* testSystem;
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), .4, 60.0, 0);
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), .4, 600.0, 0);
             testEmitter->setParent(localPlayer);
             testEmitter->setRelCoor(Vector(-3, 0, 0));
@@ -392 +393 @@
             testSystem->setLifeSpan(1, .2);
             testSystem->setRadius(3.0, 0.0, .5);
-            testSystem->setConserve(.8);
+            testSystem->setConserve(1);
             testSystem->setInheritSpeed(1);
             testSystem->setName("system");