Changeset 10107 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Dec 19, 2006, 10:03:19 PM (18 years ago)

Author:

marcscha

Message:

many additions, several fixes

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (4 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -585 +585 @@
 void SpaceShip::destroy( WorldEntity* killer )
 {
-  PRINTF(0)("spaceship destroy\n");
+  PRINTF(5)("spaceship destroy\n");
   
   EmitterNode* node  = NULL;
@@ -591 +591 @@
   SpriteParticles*  explosionParticles  = NULL;
 
-  explosionParticles = new SpriteParticles(100);
-  explosionParticles->setName("MBoltExplosionParticles");
-  explosionParticles->setLifeSpan(.5, .3);
+  explosionParticles = new SpriteParticles(200);
+  explosionParticles->setName("SpaceShipExplosionParticles");
+  explosionParticles->setLifeSpan(.2, .3);
   explosionParticles->setRadius(0.0, 10.0);
   explosionParticles->setRadius(.5, 6.0);
@@ -600 +600 @@
   explosionParticles->setColor(0.1,  1,1,0,.9);
   explosionParticles->setColor(0.5, .8,.4,0,.5);
-  explosionParticles->setColor(1.0, .2,.2,.2,.0);
-
-  
-  emitter = new DotEmitter( 200, 200, M_2_PI);
-  emitter->setSpread( 0, M_2_PI);
-  emitter->setEmissionRate( 400.0);
+  explosionParticles->setColor(1.0, .2,.2,.2,.5);
+
+  
+  emitter = new DotEmitter( 2000, 70, 360);
+  //emitter->setSpread( 0, M_2_PI);
+  emitter->setEmissionRate( 200.0);
   //emitter->setEmissionVelocity( 200.0);
-  emitter->setSystem( explosionParticles);
-  emitter->setAbsCoor( this->getAbsCoor());
-
-  node  = new EmitterNode( 1);
+  //emitter->setSystem( explosionParticles);
+  //emitter->setAbsCoor( this->getAbsCoor());
+
+  node  = new EmitterNode( .1f);
   node->setupParticle( emitter, explosionParticles);
-  node->setVelocity( this->getParent()->getVelocity());
+  node->setAbsDir( this->getAbsDir());
+  node->setVelocity( this->getVelocity() * .9f);
   node->setAbsCoor( this->getAbsCoor());
-  node->start();
+  if( !node->start())
+    PRINTF(0)("Explosion node not correctly started!");
+
 /*
   PNode* node          = new PNode();
@@ -621 +624 @@
   explosion->explode( node, Vector(5,5,5));
 */
-  this->setAbsCoor(Vector(-10000,10000,10000));
-  //this->hide();
-
-  this->toList( OM_DEAD);
-  PRINTF(0)("spaceship destroy == ship translated \n");
+
+  if( this->hasPlayer())
+  {
+        this->setAbsCoor(Vector(-10000,10000,10000));
+        this->hide();
+  }
+  else
+  {
+    this->setAbsCoor( this->getAbsCoor() + Vector(150,0,0) + Vector(1,0,0) * VECTOR_RAND(50).dot(Vector(1,0,0)));
+  }
+
 }
 
 void SpaceShip::respawn( )
 {
-  //this->unhide();
+  this->unhide();
   /*for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
   {