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

Timestamp:

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

Author:

marcscha

Message:

Some surprises for comming wednesday

Location:

branches/playability/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (1 diff)
• mbolt.cc (modified) (10 diffs)
• mbolt.h (modified) (2 diffs)
• swarm_projectile.cc (modified) (8 diffs)
• swarm_projectile.h (modified) (2 diffs)

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

@@ -122 +122 @@
     this->destroy( entity );
   this->hitEntity = entity;
-  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),0);
-//   this->deactivate();
+  dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
+  this->deactivate();
 }
 

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

@@ -34 +34 @@
 #include "static_model.h"
 
+#include "effects/trail.h"
+
 
 #include "class_id_DEPRECATED.h"
@@ -46 +48 @@
   this->registerObject(this, MBolt::_objectList);
   this->loadModel("models/projectiles/mbolt.obj");
+
   
   //this->loadModel("models/projectiles/laser.obj");
@@ -72 +75 @@
   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
   dynamic_cast<StaticModel*>(this->getModel())->finalize();
+
+  
+  this->trail = new Trail(6,1,.4);
+  this->trail->setParent( this);
+  this->trail->setTexture( "maps/laser.png");
 }
 
@@ -83 +91 @@
   // delete this->emitter;
 
-  if (MBolt::trailParticles != NULL && MBolt::objectList().size() <= 1)
-  {
-    if (ParticleSystem::objectList().exists(MBolt::trailParticles))
-      delete MBolt::trailParticles;
-    MBolt::trailParticles = NULL;
-  }
   if (MBolt::explosionParticles != NULL && MBolt::objectList().size() <= 1)
   {
@@ -94 +96 @@
       delete MBolt::explosionParticles;
     MBolt::explosionParticles = NULL;
+    PRINTF(1)("Deleting MBolt Explosion Particles\n");
   }
-}
-
-SpriteParticles* MBolt::trailParticles = NULL;
+  
+}
+
 SpriteParticles* MBolt::explosionParticles = NULL;
 
 void MBolt::activate()
 {
-  if (unlikely(MBolt::trailParticles == NULL))
-  {
-    MBolt::trailParticles = new SpriteParticles(1000);
-    MBolt::trailParticles->setName("BoomerangProjectileTrailParticles");
-    MBolt::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    MBolt::trailParticles->setLifeSpan(0.3, 0);
-    MBolt::trailParticles->setRadius(0.0, .8);
-    MBolt::trailParticles->setRadius(1.0, .2);
-    MBolt::trailParticles->setColor(0.0, 1,0,0,.9);
-    MBolt::trailParticles->setColor(0.2, .8,.2,0,.9);
-    MBolt::trailParticles->setColor(0.5, .8,.4,.4,.8);
-    MBolt::trailParticles->setColor(1.0, .8,.8,.8,.7);
-  }
   if (unlikely(MBolt::explosionParticles == NULL))
   {
@@ -128 +118 @@
   }
 
-  this->setDamage(10);
+  this->setPhysDamage(10);
+  this->setElecDamage(0);
   this->setHealth(0);
 
-  this->emitter->setSystem(MBolt::trailParticles);
 
   this->emitter->setSpread(0);
@@ -142 +132 @@
 void MBolt::deactivate()
 {
-  assert (MBolt::trailParticles != NULL);
-  MBolt::trailParticles->removeEmitter(this->emitter);
-
   assert (MBolt::explosionParticles != NULL);
   MBolt::explosionParticles->removeEmitter(this->emitter);
@@ -157 +144 @@
 void MBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy( entity );
-  this->hitEntity = entity;
-  dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
+  PRINTF(0)("MBolt collides pretest\n");
+  if( entity == NULL || dynamic_cast<SpaceShip*>(entity) == NULL)
+    return;
+
+  PRINTF(0)("MBolt collides\n");
+  dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
+  entity->destroy(this);
+  this->deactivate();
 }
 
@@ -177 +168 @@
 
   this->angle += MBolt::rotationSpeed * dt;
+  this->trail->tick(dt);
 }
 
@@ -209 +201 @@
   dynamic_cast<StaticModel*>(this->getModel())->draw();
   this->mat->unselect();
+  glScalef(1/.75,4/.7,4/.7);
+  glTranslatef(-4,0,0);
+  this->trail->draw();
   glPopMatrix();
   glPopAttrib();

branches/playability/src/world_entities/projectiles/mbolt.h

@@ -15 +15 @@
 class ParticleEmitter;
 class FastFactory;
+class Trail;
 
 class MBolt : public Projectile
@@ -37 +38 @@
   private:
     static FastFactory*               fastFactory;
-    static SpriteParticles*           trailParticles;
     static SpriteParticles*           explosionParticles;
+
+    Trail*                            trail;
 
     float                             angle;

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();
-
-}
+}

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

@@ -14 +14 @@
 class FastFactory;
 class Aim;
+class Trail;
 
 class SwarmProjectile : public Projectile
@@ -36 +37 @@
   private:
     static FastFactory*               fastFactory;
-    static SpriteParticles*           trailParticles;
     static SpriteParticles*           explosionParticles;
+
+    Trail*                            trail;
 
     ParticleEmitter*                  emitter;