added extra mode and improved particle system

Jeffrey Ventrella committed 13 years ago

Commit ad0ca741 parent 05039b44 files · +63 −50Browse files

Showing the changes to interface/src/ParticleSystem.cpp (1 of 4 files). Show all

Unified · Split

         _emitter[emitterIndex].particleLifespan          = DEFAULT_PARTICLE_LIFESPAN;
         _emitter[emitterIndex].baseParticle.alive        = false;
         _emitter[emitterIndex].baseParticle.age          = 0.0f;
-        _emitter[emitterIndex].baseParticle.lifespan     = 0.0f;
+        _emitter[emitterIndex].thrust                    = 0.0f;
+        _emitter[emitterIndex].rate                      = 0.0f;
         _emitter[emitterIndex].baseParticle.radius       = 0.0f;
         _emitter[emitterIndex].baseParticle.emitterIndex = 0;
         _emitter[emitterIndex].baseParticle.position     = glm::vec3(0.0f, 0.0f, 0.0f);
     for (unsigned int p = 0; p < MAX_PARTICLES; p++) {
         _particle[p].alive        = false;
         _particle[p].age          = 0.0f;
-        _particle[p].lifespan     = 0.0f;
         _particle[p].radius       = 0.0f;
         _particle[p].emitterIndex = 0;
         _particle[p].position     = glm::vec3(0.0f, 0.0f, 0.0f);
     // update particles
     for (unsigned int p = 0; p < _numParticles; p++) {
         if (_particle[p].alive) {
-            if (_particle[p].age > _particle[p].lifespan) {
+            if (_particle[p].age > _emitter[_particle[p].emitterIndex].particleLifespan) {
                 killParticle(p);
             } else {
                 updateParticle(p, deltaTime);
     }
 }
-void ParticleSystem::emitParticlesNow(int e, int num, float thrust) {
+void ParticleSystem::emitNow(int e) {
-    for (unsigned int p = 0; p < num; p++) {
+    for (unsigned int p = 0; p < _emitter[e].rate; p++) {
-        createParticle(e, _emitter[e].direction * thrust);
+        createParticle(e, _emitter[e].direction);
     }
 }
             _particle[p].emitterIndex = e;
             _particle[p].alive        = true;
             _particle[p].age          = 0.0f;
-            _particle[p].velocity     = velocity;
+            _particle[p].velocity     = _emitter[e].direction * _emitter[e].thrust;
-            _particle[p].lifespan     = _emitter[e].particleLifespan;
             _particle[p].position     = _emitter[e].position;
             _particle[p].radius       = _emitter[e].particleAttributes[0].radius;
             _particle[p].color        = _emitter[e].particleAttributes[0].color;
 void ParticleSystem::updateParticle(int p, float deltaTime) {
-    assert(_particle[p].age <= _particle[p].lifespan);
+    assert(_particle[p].age <= _emitter[_particle[p].emitterIndex].particleLifespan);
-    float ageFraction = _particle[p].age / _particle[p].lifespan;
+    float ageFraction = _particle[p].age / _emitter[_particle[p].emitterIndex].particleLifespan;
     int lifeStage = (int)( ageFraction * (NUM_PARTICLE_LIFE_STAGES-1) );
     _particle[p].age += deltaTime;
 }
-void ParticleSystem::setEmitterBaseParticle(int emitterIndex, bool showing ) {
+void ParticleSystem::setShowingEmitterBaseParticle(int emitterIndex, bool showing ) {
     _emitter[emitterIndex].baseParticle.alive = true;
     _emitter[emitterIndex].baseParticle.emitterIndex = emitterIndex;
 }
 void ParticleSystem::render() {
     // render the emitters
     }
 }
 void ParticleSystem::renderEmitter(int e, float size) {
     glLineWidth(2.0f);