Changeset 3938 in orxonox.OLD

Timestamp:

Apr 23, 2005, 4:48:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: inherit speed from emitter is now also an option
for this i had to write a new PNode function, getVelocity (patrick: you could also use this one in the shoot-class, maybe).

Location:

orxonox/branches/particleEngine/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/coord/p_node.h (modified) (1 diff)
• lib/graphics/particles/particle_emitter.cc (modified) (2 diffs)
• lib/graphics/particles/particle_engine.cc (modified) (2 diffs)
• lib/graphics/particles/particle_system.cc (modified) (2 diffs)
• lib/graphics/particles/particle_system.h (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)

orxonox/branches/particleEngine/src/lib/coord/p_node.cc

@@ -307 +307 @@
 }
 
+/**
+   \returns the Velocity of the PNode
+*/
+Vector PNode::getVelocity() const
+{
+  return (*this->absCoordinate - *this->lastAbsCoordinate) / this->time;
+}
 
 /**

orxonox/branches/particleEngine/src/lib/coord/p_node.h

@@ -70 +70 @@
 
   float getSpeed() const;
+  Vector getVelocity() const;
 
   void addChild (PNode* pNode, int parentingMode = DEFAULT_MODE);

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: Patrick Boenzli
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PARTICLE
 
 #include "particle_emitter.h"
@@ -132 +132 @@
       randDir.normalize();
       randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)random()/RAND_MAX -.5), randDir)).apply(this->direction);
-      randDir.normalize();
+      randDir = *randDir.getNormalized() + (this->getVelocity() * system->inheritSpeed);
+
       system->addParticle(this->getAbsCoor(), randDir* velocity);
     }

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

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PARTICLE
 
 #include "particle_engine.h"
@@ -145 +145 @@
     }
   delete tmpIt;
-
 }
 

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

@@ -42 +42 @@
    this->setConserve(.8);
    this->setLifeSpan(.1);
+   this->setInheritSpeed(0);
 
    ParticleEngine::getInstance()->addSystem(this);
@@ -62 +63 @@
   this->material = material;
 }
+
+
+/**
+   \brief how much of the speed from the ParticleEmitter should flow onto the ParticleSystem
+   \param value a Value between zero and one
+
+   
+   if you want to change the value of this variable during emission time (to make it more dynamic)
+   you may want to use the animation class
+*/
+void ParticleSystem::setInheritSpeed(float value)
+{
+  if (unlikely(value > 1.0))
+    this->inheritSpeed = 1;
+  else if (unlikely(value < 0.0))
+    this->inheritSpeed = 0;
+  else
+    this->inheritSpeed = value;
+}
+
 
 void ParticleSystem::setLifeSpan(float lifeSpan, float randomLifeSpan)

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

@@ -49 +49 @@
 
   void setMaterial(Material* material);
+  void setInheritSpeed(float value);
   void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
   void setRadius(float startRadius, float endRadius, float randomRadius = 0.0);
@@ -66 +67 @@
   float initialMass;
   float randomInitialMass;
-  
+  float inheritSpeed;
+
   // particles
   int maxCount;              //!< The maximum count of Particles.

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

@@ -379 +379 @@
             ParticleEmitter* testEmitter,* testEmitter2;
             ParticleSystem* testSystem;
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), .1, 1200.0, .5);
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), M_PI_2, 1200.0, 1);
             testEmitter->setParent(localPlayer);
-            testEmitter->setSpread(M_PI_4, .1);
-            testEmitter2 = new ParticleEmitter(Vector(-1,0,0), .1, 1200, .5);
+            testEmitter2 = new ParticleEmitter(Vector(-1,0,0), .1, 1200, 1);
             testEmitter2->setParent(tn);
 
@@ -388 +387 @@
             testSystem->setLifeSpan(3);
             testSystem->setConserve(.8);
+            testSystem->setInheritSpeed(1);
 
             ParticleEngine::getInstance()->addConnection(testEmitter, testSystem);