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

Timestamp:

Jan 19, 2006, 11:46:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: particle derivate… still working on this

Location:

trunk/src/world_entities/projectiles

Files:

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

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -24 +24 @@
 
 #include "particle_emitter.h"
-#include "particle_system.h"
+#include "sprite_particles.h"
 
 using namespace std;
@@ -84 +84 @@
   if (unlikely(GuidedMissile::trailParticles == NULL))
   {
-    GuidedMissile::trailParticles = new ParticleSystem(2000, PARTICLE_SPRITE);
+    GuidedMissile::trailParticles = new SpriteParticles(2000);
     GuidedMissile::trailParticles->setName("GuidedMissileTrailParticles");
     GuidedMissile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
@@ -99 +99 @@
   if (unlikely(GuidedMissile::explosionParticles == NULL))
   {
-    GuidedMissile::explosionParticles = new ParticleSystem(200, PARTICLE_SPRITE);
+    GuidedMissile::explosionParticles = new SpriteParticles(200);
     GuidedMissile::explosionParticles->setName("GuidedMissileExplosionParticles");
     GuidedMissile::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");

trunk/src/world_entities/projectiles/laser.cc

@@ -25 +25 @@
 
 #include "particle_emitter.h"
-#include "particle_system.h"
+#include "sprite_particles.h"
 
 
@@ -77 +77 @@
   if (unlikely(Laser::explosionParticles == NULL))
   {
-    Laser::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    Laser::explosionParticles = new SpriteParticles(1000);
     Laser::explosionParticles->setName("LaserExplosionParticles");
     Laser::explosionParticles->setLifeSpan(.5, .3);

trunk/src/world_entities/projectiles/rocket.cc

@@ -24 +24 @@
 
 #include "particle_emitter.h"
-#include "particle_system.h"
+#include "sprite_particles.h"
 
 
@@ -81 +81 @@
   if (unlikely(Rocket::trailParticles == NULL))
   {
-    Rocket::trailParticles = new ParticleSystem(2000, PARTICLE_SPRITE);
+    Rocket::trailParticles = new SpriteParticles(2000);
     Rocket::trailParticles->setName("RocketTrailParticles");
     Rocket::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
@@ -96 +96 @@
   if (unlikely(Rocket::explosionParticles == NULL))
   {
-    Rocket::explosionParticles = new ParticleSystem(200, PARTICLE_SPRITE);
+    Rocket::explosionParticles = new SpriteParticles(200);
     Rocket::explosionParticles->setName("RocketExplosionParticles");
     Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -24 +24 @@
 
 #include "particle_emitter.h"
-#include "particle_system.h"
+#include "sprite_particles.h"
 
 
@@ -81 +81 @@
   if (unlikely(TestBullet::trailParticles == NULL))
   {
-    TestBullet::trailParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    TestBullet::trailParticles = new SpriteParticles(1000);
     TestBullet::trailParticles->setName("TestBulletTrailParticles");
     TestBullet::trailParticles->setLifeSpan(.5, .3);
@@ -93 +93 @@
   if (unlikely(TestBullet::explosionParticles == NULL))
   {
-    TestBullet::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    TestBullet::explosionParticles = new SpriteParticles(1000);
     TestBullet::explosionParticles->setName("TestBulletExplosionParticles");
     TestBullet::explosionParticles->setLifeSpan(.5, .3);