Changeset 6822 in orxonox.OLD for trunk/src/world_entities/projectiles

Timestamp:

Jan 29, 2006, 1:57:03 AM (18 years ago)

Author:

bensch

Message:

trunk: ParticleEmitters now splitted into SubClasses.
Also fixed a little Boeg in the ClassID

Location:

trunk/src/world_entities/projectiles

Files:

• bomb.cc (modified) (2 diffs)
• guided_missile.cc (modified) (2 diffs)
• hyperblast.cc (modified) (2 diffs)
• laser.cc (modified) (2 diffs)
• rocket.cc (modified) (2 diffs)
• test_bullet.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/bomb.cc

@@ -25 +25 @@
 #include "object_manager.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "particle_system.h"
 
@@ -50 +50 @@
   this->lifeSpan = 15;
 
-  this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
+  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "sprite_particles.h"
 
@@ -46 +46 @@
   this->maxVelocity = 75;
 
-  this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
+  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "sprite_particles.h"
 #include "spark_particles.h"
@@ -47 +47 @@
   this->size = 4.0;
 
-  this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
-  this->emitter->setType( EMITTER_CUBE );
-  this->emitter->setSize(10);
+  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);

trunk/src/world_entities/projectiles/laser.cc

@@ -26 +26 @@
 #include "model.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "sprite_particles.h"
-#include <cassert>
 
 #include <cassert>
-
 
 using namespace std;
@@ -50 +48 @@
   this->lifeSpan = 5.0;
 
-  this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
+  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);

trunk/src/world_entities/projectiles/rocket.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "sprite_particles.h"
 
@@ -45 +45 @@
   this->lifeSpan = 5;
 
-  this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
+  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "sprite_particles.h"
 
@@ -45 +45 @@
   this->lifeSpan = 2;
 
-  this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
+  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);