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

Timestamp:

Dec 13, 2006, 3:19:40 PM (18 years ago)

Author:

marcscha

Message:

weapon, collision, particles

Location:

branches/playability/src/world_entities/projectiles

Files:

• mbolt.cc (modified) (8 diffs)
• mbolt.h (modified) (2 diffs)
• swarm_projectile.cc (modified) (6 diffs)

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

@@ -24 +24 @@
 
 #include "particles/dot_emitter.h"
+#include "particles/box_emitter.h"
 #include "particles/sprite_particles.h"
+
+#include "space_ships/space_ship.h"
 
 #include <cassert>
@@ -33 +36 @@
 
 #include "class_id_DEPRECATED.h"
+ObjectListDefinition(MBolt);
 CREATE_FAST_FACTORY_STATIC(MBolt);
 
@@ -40 +44 @@
 MBolt::MBolt () : Projectile()
 {
-
+  this->registerObject(this, MBolt::_objectList);
   this->loadModel("models/projectiles/mbolt.obj",0.25);
   //this->loadModel("models/projectiles/laser.obj");
@@ -49 +53 @@
   this->angle     = 0;
 
-  this->emitter = new DotEmitter(40, 0, M_2_PI);
+
+  //this->emitter = new DotEmitter(1000, 0, 0);
+  this->emitter = new BoxEmitter(Vector(8,1,1)*dynamic_cast<StaticModel*>(this->getModel())->getScaleFactor(), 1000, 0, 0);
   this->emitter->setParent(this);
-  this->emitter->setSpread(M_PI, M_PI);
-  this->emitter->setEmissionRate(300.0);
-  this->emitter->setEmissionVelocity(50.0);
+  this->emitter->setSpread(M_PI,M_PI);
+  this->emitter->setInheritSpeed(this->velocity.len());
+  this->emitter->setEmissionRate(500.0);
+  this->emitter->setEmissionVelocity(this->velocity.len());
 
   this->mat = new Material("mBolt");
@@ -59 +66 @@
   this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
   this->mat->setDiffuse(1,1,1);
-  this->mat->setDiffuseMap("laser.png");
+  this->mat->setDiffuseMap("laser_add.png");
   this->mat->setDiffuseMap("laser.png",1);
+
   dynamic_cast<StaticModel*>(this->getModel())->addMaterial(this->mat);
   dynamic_cast<StaticModel*>(this->getModel())->finalize();
@@ -99 +107 @@
     MBolt::trailParticles->setName("BoomerangProjectileTrailParticles");
     MBolt::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    MBolt::trailParticles->setLifeSpan(1, 0);
-    MBolt::trailParticles->setRadius(0.0, 1);
-    MBolt::trailParticles->setRadius(1.0, 1);
+    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,0,.8);
-    MBolt::trailParticles->setColor(1.0, .8,.8,0,.7);
+    MBolt::trailParticles->setColor(0.5, .8,.4,.4,.8);
+    MBolt::trailParticles->setColor(1.0, .8,.8,.8,.7);
   }
   if (unlikely(MBolt::explosionParticles == NULL))
@@ -125 +133 @@
   this->emitter->setSystem(MBolt::trailParticles);
 
+  this->emitter->setSpread(0);
+  this->emitter->setEmissionRate(80.0);
+  this->emitter->setEmissionVelocity(0);
   this->updateNode(0);
-  this->emitter->setSpread(0);
-  this->emitter->setEmissionRate(20.0);
-  this->emitter->setEmissionVelocity(this->velocity.len());
 }
 
@@ -152 +160 @@
     this->destroy( entity );
   this->hitEntity = entity;
+  dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
 }
 

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

@@ -18 +18 @@
 class MBolt : public Projectile
 {
-  //ObjectListDeclaration(MBolt);
+  ObjectListDeclaration(MBolt);
   public:
     MBolt ();
@@ -41 +41 @@
 
     float                             angle;
-    static const float                rotationSpeed = 540;
+    static const float                rotationSpeed = 1080;
 
     ParticleEmitter*                  emitter;

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

@@ -23 +23 @@
 #include "particles/dot_emitter.h"
 #include "particles/sprite_particles.h"
+#include "space_ships/space_ship.h"
 
 #include "debug.h"
@@ -44 +45 @@
   this->setMinEnergy(1);
   this->setHealthMax(10);
-  this->lifeSpan = 2.0;
+  this->lifeSpan = 4.0;
   this->agility = 3.5;
   this->maxVelocity = 100;
@@ -64 +65 @@
 SwarmProjectile::~SwarmProjectile ()
 {
-  // delete this->emitter;
+
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
@@ -79 +80 @@
     SwarmProjectile::explosionParticles = NULL;
   }
-
+   delete this->emitter;
 }
 
@@ -96 +97 @@
     SwarmProjectile::trailParticles->setLifeSpan(1.0, .3);
     SwarmProjectile::trailParticles->setRadius(0.0, .5);
-    SwarmProjectile::trailParticles->setRadius(0.2, 4.0);
-    SwarmProjectile::trailParticles->setRadius(.5, 1.5);
-    SwarmProjectile::trailParticles->setRadius(1.0, 1.5);
+    SwarmProjectile::trailParticles->setRadius(0.2, 2.0);
+    SwarmProjectile::trailParticles->setRadius(.5, 1.0);
+    SwarmProjectile::trailParticles->setRadius(1.0, 0.6);
     SwarmProjectile::trailParticles->setColor(0.0, 1,0,0,.7);
     SwarmProjectile::trailParticles->setColor(0.2, .8,.8,0,.5);
@@ -145 +146 @@
     this->destroy( entity );
   this->hitEntity = entity;
+  dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
 }