Changeset 10081 in orxonox.OLD for branches/playability/src/world_entities/projectiles/swarm_projectile.cc

Timestamp:

Dec 16, 2006, 2:12:41 AM (17 years ago)

Author:

marcscha

Message:

Some surprises for comming wednesday

File:

• branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) (8 diffs)

branches/playability/src/world_entities/projectiles/swarm_projectile.cc

@@ -24 +24 @@
 #include "particles/sprite_particles.h"
 #include "space_ships/space_ship.h"
+#include "effects/trail.h"
 
 #include "debug.h"
@@ -57 +58 @@
 
   this->physDamage = 200;
+
+  this->trail = new Trail(2.5,4,.2);
+  this->trail->setParent( this);
+  this->trail->setTexture( "maps/laser.png");
 }
 
@@ -66 +71 @@
 {
 
-
-  /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (SwarmProjectile::trailParticles != NULL && SwarmProjectile::objectList().size() <= 1)
-  {
-    if (ParticleSystem::objectList().exists(SwarmProjectile::trailParticles))
-      delete SwarmProjectile::trailParticles;
-    SwarmProjectile::trailParticles = NULL;
-  }
   if (SwarmProjectile::explosionParticles != NULL && SwarmProjectile::objectList().size() <= 1)
   {
@@ -80 +77 @@
     SwarmProjectile::explosionParticles = NULL;
   }
-   delete this->emitter;
-}
-
-SpriteParticles* SwarmProjectile::trailParticles = NULL;
+  // delete this->emitter;
+  delete this->trail;
+}
+
 SpriteParticles* SwarmProjectile::explosionParticles = NULL;
 
@@ -90 +87 @@
 void SwarmProjectile::activate()
 {
-  if (unlikely(SwarmProjectile::trailParticles == NULL))
-  {
-    SwarmProjectile::trailParticles = new SpriteParticles(2000);
-    SwarmProjectile::trailParticles->setName("SwarmProjectileTrailParticles");
-    SwarmProjectile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    SwarmProjectile::trailParticles->setLifeSpan(.3, 0);
-    SwarmProjectile::trailParticles->setRadius(0.0, .7);
-    SwarmProjectile::trailParticles->setRadius(0.2, 1.3);
-    SwarmProjectile::trailParticles->setRadius(.5, .8);
-    SwarmProjectile::trailParticles->setRadius(1.0, 0.3);
-    SwarmProjectile::trailParticles->setColor(0.0, 1,0,0,.7);
-    SwarmProjectile::trailParticles->setColor(0.2, .8,.8,0,.5);
-    SwarmProjectile::trailParticles->setColor(0.5, .8,.8,.8,.8);
-    SwarmProjectile::trailParticles->setColor(1.0, .8,.8,.8,.0);
-  }
   if (unlikely(SwarmProjectile::explosionParticles == NULL))
   {
@@ -120 +102 @@
   }
 
-  this->emitter->setSystem(SwarmProjectile::trailParticles);
 
   this->updateNode(0);
@@ -253 +234 @@
 
   this->updateAngle(time);
+
+  this->trail->tick(time);
 }
 
@@ -291 +274 @@
   //glScalef(2.0, 2.0, 2.0);  // no double rescale
   this->getModel()->draw();
-
+  glTranslatef(-.9,0,0);
+  this->trail->draw();
   glPopMatrix();
-
-}
+}