Changeset 4347 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

May 27, 2005, 11:54:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added the ParticleEngine fix into the trunk

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (3 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -21 +21 @@
 
 #include "orxonox.h"
+
+#include "state.h"
 
 #include "p_node.h"
@@ -285 +287 @@
   this->localCamera->setName ("Camera");
   
+  State::getInstance()->setCamera(this->localCamera, this->localCamera->getTarget());
+
   GraphicsEngine::getInstance()->displayFPS(true);
 }
@@ -455 +459 @@
 
 
-  /*
-    ParticleSystem* system = new ParticleSystem(1000, PARTICLE_SPRITE);
-    system->setLifeSpan(.5);
-    system->setConserve(.99);
-    system->setRadius(2, 0, 2, 0);
-    
-    ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 100, .05);
-    emitter->setParent(this->localPlayer);
-    
-    particleEngine->addConnection(emitter, system);
-  */
+
+  // Creating a Test Particle System
+  ParticleSystem* system = new ParticleSystem(100000, PARTICLE_SPRITE);
+  system->setLifeSpan(1);
+  system->setConserve(.8);
+  system->setRadius(4, 3, 1, 2);
+  system->setColor(.5,0,0,.5, 1,1,0,1, 0,0,0,0);
+
+  // Creating a Test Particle Emitter
+  ParticleEmitter* emitter = new ParticleEmitter(Vector(-1, 0, 0), M_PI_4, 400, .5);
+  emitter->setType(EMITTER_DOT);
+  emitter->setSize(20);
+  emitter->setParent(this->localPlayer);
+  emitter->setRelCoor(Vector(-3,0,0));
+  
+  // Add the Flow from the Emitter into the System
+  particleEngine->addConnection(emitter, system);
+
+
   WorldEntity* testEntity = new TestEntity();
   //testEntity->setRelCoor(Vector(570, 10, -15));