Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 23, 2005, 12:42:09 AM (20 years ago)
Author:
bensch
Message:

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

Location:
orxonox/branches/particleEngine/src/story_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/particleEngine/src/story_entities/world.cc

    r3870 r3932  
    4040#include "animation_player.h"
    4141
     42#include "particle_engine.h"
     43#include "particle_system.h"
     44#include "particle_emitter.h"
     45
    4246#include "command_node.h"
    4347#include "glmenu_imagescreen.h"
     
    162166  AnimationPlayer::getInstance()->debug();
    163167  delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
     168
     169  delete ParticleEngine::getInstance();
     170
    164171  //delete garbagecollecor
    165172  //delete animator
     
    185192  this->entities = new tList<WorldEntity>();
    186193  AnimationPlayer::getInstance(); // initializes the animationPlayer
     194
     195  ParticleEngine::getInstance();
    187196}
    188197
     
    367376            trackManager->condition(2, LEFTRIGHT, this->localPlayer);
    368377            this->glmis->step();
     378           
     379            testEmitter = new ParticleEmitter(Vector(1,0,0));
     380            testSystem = new ParticleSystem();
     381
     382            ParticleEngine::getInstance()->addConnection(testEmitter, testSystem);
     383
    369384            break;
    370385          }
     
    745760
    746761  TextEngine::getInstance()->draw();
     762
     763  ParticleEngine::getInstance()->draw();
     764
    747765  lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
    748766}
     
    931949
    932950      AnimationPlayer::getInstance()->tick(seconds);
     951
     952      ParticleEngine::getInstance()->tick(seconds);
    933953    }
    934954  this->lastFrame = currentFrame;
  • orxonox/branches/particleEngine/src/story_entities/world.h

    r3851 r3932  
    2525class GarbageCollector;
    2626class Text;
     27
     28class ParticleEmitter;
     29class ParticleSystem;
    2730
    2831//! The game world Interface
     
    109112  Terrain* terrain;                   //!< The Terrain of the World.
    110113
     114  ParticleSystem* testSystem;
     115  ParticleEmitter* testEmitter;
     116
    111117  GLuint objectList;                  //!< temporary: \todo this will be ereased soon
    112118  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.