Changeset 3932 in orxonox.OLD for orxonox/branches/particleEngine/src/story_entities
- Timestamp:
- Apr 23, 2005, 12:42:09 AM (20 years ago)
- Location:
- orxonox/branches/particleEngine/src/story_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/particleEngine/src/story_entities/world.cc
r3870 r3932 40 40 #include "animation_player.h" 41 41 42 #include "particle_engine.h" 43 #include "particle_system.h" 44 #include "particle_emitter.h" 45 42 46 #include "command_node.h" 43 47 #include "glmenu_imagescreen.h" … … 162 166 AnimationPlayer::getInstance()->debug(); 163 167 delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence. 168 169 delete ParticleEngine::getInstance(); 170 164 171 //delete garbagecollecor 165 172 //delete animator … … 185 192 this->entities = new tList<WorldEntity>(); 186 193 AnimationPlayer::getInstance(); // initializes the animationPlayer 194 195 ParticleEngine::getInstance(); 187 196 } 188 197 … … 367 376 trackManager->condition(2, LEFTRIGHT, this->localPlayer); 368 377 this->glmis->step(); 378 379 testEmitter = new ParticleEmitter(Vector(1,0,0)); 380 testSystem = new ParticleSystem(); 381 382 ParticleEngine::getInstance()->addConnection(testEmitter, testSystem); 383 369 384 break; 370 385 } … … 745 760 746 761 TextEngine::getInstance()->draw(); 762 763 ParticleEngine::getInstance()->draw(); 764 747 765 lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes // 748 766 } … … 931 949 932 950 AnimationPlayer::getInstance()->tick(seconds); 951 952 ParticleEngine::getInstance()->tick(seconds); 933 953 } 934 954 this->lastFrame = currentFrame; -
orxonox/branches/particleEngine/src/story_entities/world.h
r3851 r3932 25 25 class GarbageCollector; 26 26 class Text; 27 28 class ParticleEmitter; 29 class ParticleSystem; 27 30 28 31 //! The game world Interface … … 109 112 Terrain* terrain; //!< The Terrain of the World. 110 113 114 ParticleSystem* testSystem; 115 ParticleEmitter* testEmitter; 116 111 117 GLuint objectList; //!< temporary: \todo this will be ereased soon 112 118 tList<WorldEntity>* entities; //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
Note: See TracChangeset
for help on using the changeset viewer.