Changeset 3944 in orxonox.OLD for orxonox/branches/particleEngine/src/story_entities

Timestamp:

Apr 23, 2005, 2:48:57 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: debug function-headers written

File:

• orxonox/branches/particleEngine/src/story_entities/world.cc (modified) (2 diffs)

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

@@ -166 +166 @@
   AnimationPlayer::getInstance()->debug();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
-
+  
+  ParticleEngine::getInstance()->debug();
   delete ParticleEngine::getInstance();
 
@@ -379 +380 @@
             ParticleEmitter* testEmitter,* testEmitter2;
             ParticleSystem* testSystem;
-            testEmitter = new ParticleEmitter(Vector(-1,0,0), M_PI_2, 1200.0, .5);
+            testEmitter = new ParticleEmitter(Vector(-1,0,0), M_PI_2, 120.0, .5);
             testEmitter->setParent(localPlayer);
             testEmitter->setRelCoor(Vector(-3, 0, 0));
-
-            testSystem = new ParticleSystem(100000);
+            testEmitter->setName("ship emitter");
+            testEmitter2 = new ParticleEmitter(Vector(1,0,0), .1, 120.0, 1);
+            testEmitter2->setParent(tn);
+            testEmitter2->setName("crap emitter");
+            
+            testSystem = new ParticleSystem(1000);
             testSystem->setLifeSpan(1, .8);
             testSystem->setRadius(1.0, 0.0, .5);
             testSystem->setConserve(.8);
             testSystem->setInheritSpeed(1);
-
+            testSystem->setName("system");
             ParticleEngine::getInstance()->addConnection(testEmitter, testSystem);
+            ParticleEngine::getInstance()->addConnection(testEmitter2, testSystem);
+            ParticleEngine::getInstance()->debug();
 
             break;