Changeset 6619 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 19, 2006, 6:23:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: rendering without the ParticleEngine, so now we are FAST

Location:

trunk/src/world_entities/projectiles

Files:

• bomb.cc (modified) (1 diff)
• guided_missile.cc (modified) (4 diffs)
• laser.cc (modified) (3 diffs)
• rocket.cc (modified) (4 diffs)
• test_bullet.cc (modified) (4 diffs)

trunk/src/world_entities/projectiles/bomb.cc

@@ -25 +25 @@
 #include "object_manager.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -113 +112 @@
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, GuidedMissile::trailParticles);
+  this->emitter->setSystem(GuidedMissile::trailParticles);
 
   this->updateNode(0);
@@ -123 +122 @@
 void GuidedMissile::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
 
@@ -184 +183 @@
   PRINTF(5)("DESTROY GuidedMissile\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, GuidedMissile::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, GuidedMissile::explosionParticles);
+  this->emitter->setSystem(GuidedMissile::explosionParticles);
 
   this->emitter->setEmissionRate(1000.0);

trunk/src/world_entities/projectiles/laser.cc

@@ -24 +24 @@
 #include "model.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -93 +92 @@
 void Laser::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  assert (Laser::explosionParticles != NULL);
+  Laser::explosionParticles->removeEmitter(this->emitter);
   this->lifeCycle = 0.0;
 
@@ -130 +130 @@
   PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->addConnection(this->emitter, Laser::explosionParticles);
+
+  this->emitter->setSystem(Laser::explosionParticles);
 }
 

trunk/src/world_entities/projectiles/rocket.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -110 +109 @@
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
+  this->emitter->setSystem(Rocket::trailParticles);
 
   this->updateNode(0);
@@ -120 +119 @@
 void Rocket::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);
@@ -158 +157 @@
   PRINTF(5)("DESTROY Rocket\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, Rocket::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
+  this->emitter->setSystem(Rocket::explosionParticles);
 
   this->emitter->setEmissionRate(1000.0);

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_engine.h"
 #include "particle_emitter.h"
 #include "particle_system.h"
@@ -105 +104 @@
   }
 
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::trailParticles);
+  this->emitter->setSystem(TestBullet::trailParticles);
 
   this->emitter->setEmissionRate(20.0);
@@ -114 +113 @@
 void TestBullet::deactivate()
 {
-  ParticleEngine::getInstance()->breakConnections(this->emitter);
+  this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
   this->toList(OM_NULL);
@@ -157 +156 @@
   PRINTF(5)("DESTROY TestBullet\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.
-  ParticleEngine::getInstance()->breakConnection(this->emitter, TestBullet::trailParticles);
-  ParticleEngine::getInstance()->addConnection(this->emitter, TestBullet::explosionParticles);
+  this->emitter->setSystem(TestBullet::explosionParticles);
 
   this->emitter->setEmissionRate(30.0);