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

Timestamp:

Apr 23, 2005, 12:42:09 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: the first particles are being drawn

Location:

orxonox/branches/particleEngine/src/story_entities

Files:

• world.cc (modified) (6 diffs)
• world.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include "animation_player.h"
 
+#include "particle_engine.h"
+#include "particle_system.h"
+#include "particle_emitter.h"
+
 #include "command_node.h"
 #include "glmenu_imagescreen.h"
@@ -162 +166 @@
   AnimationPlayer::getInstance()->debug();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
+
+  delete ParticleEngine::getInstance();
+
   //delete garbagecollecor
   //delete animator
@@ -185 +192 @@
   this->entities = new tList<WorldEntity>();
   AnimationPlayer::getInstance(); // initializes the animationPlayer
+
+  ParticleEngine::getInstance();
 }
 
@@ -367 +376 @@
             trackManager->condition(2, LEFTRIGHT, this->localPlayer);
             this->glmis->step();
+            
+            testEmitter = new ParticleEmitter(Vector(1,0,0));
+            testSystem = new ParticleSystem();
+
+            ParticleEngine::getInstance()->addConnection(testEmitter, testSystem);
+
             break;
           }
@@ -745 +760 @@
 
   TextEngine::getInstance()->draw();
+
+  ParticleEngine::getInstance()->draw();
+
   lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
 }
@@ -931 +949 @@
 
       AnimationPlayer::getInstance()->tick(seconds);
+
+      ParticleEngine::getInstance()->tick(seconds);
     }
   this->lastFrame = currentFrame;

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

@@ -25 +25 @@
 class GarbageCollector;
 class Text;
+
+class ParticleEmitter;
+class ParticleSystem;
 
 //! The game world Interface
@@ -109 +112 @@
   Terrain* terrain;                   //!< The Terrain of the World.
 
+  ParticleSystem* testSystem;
+  ParticleEmitter* testEmitter;
+
   GLuint objectList;                  //!< temporary: \todo this will be ereased soon
   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.