Changeset 7105 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 10:17:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ok, explosions are mighty cool now

Location:

trunk/src/world_entities

Files:

• effects/explosion.cc (modified) (7 diffs)
• npcs/ground_turret.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (1 diff)

trunk/src/world_entities/effects/explosion.cc

@@ -40 +40 @@
   this->toList(OM_DEAD_TICK);
 
-  this->emitter = new BoxEmitter(Vector(10,10,10), 1000, 30, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(10,10,10), 800, 30, M_2_PI);
   this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
@@ -46 +46 @@
 
   this->lifeCycle = 0.0f;
-  this->lifeTime = 1.0f;
+  this->lifeTime = .5f;
 
 }
@@ -68 +68 @@
 {
   Explosion* explosion = dynamic_cast<Explosion*>(Explosion::fastFactory->resurrect());
-  explosion->setParent(position);
+  explosion->setAbsCoor(position->getAbsCoor());
   explosion->emitter->setSize(size);
   explosion->activate();
@@ -81 +81 @@
     Explosion::explosionParticles->setName("ExplosionExplosionParticles");
     Explosion::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    Explosion::explosionParticles->setLifeSpan(.5, .3);
+    Explosion::explosionParticles->setLifeSpan(1.5, .3);
     Explosion::explosionParticles->setRadius(0.0, 10);
     Explosion::explosionParticles->setRadius(.5, 15.0);
@@ -92 +92 @@
 
   this->emitter->setSystem(Explosion::explosionParticles);
+  this->emitter->updateNode(.01);
   this->toList(OM_DEAD_TICK);
   this->lifeCycle = 0.0;
@@ -101 +102 @@
   this->emitter->setSystem(NULL);
   this->toList(OM_DEAD);
-  this->emitter->setParent(PNode::getNullParent());
   Explosion::fastFactory->kill(this);
 }
@@ -112 +112 @@
 void Explosion::tick (float dt)
 {
+  printf("%f %f\n", this->lifeCycle, this->lifeTime);
   this->lifeCycle += dt;
   if(this->lifeTime < this->lifeCycle)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -178 +178 @@
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
-  Explosion::explode(this, Vector(5,50,0));
+  Explosion::explode(this, Vector(10,10,10));
 }
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -272 +272 @@
 void TurbineHover::tick (float dt)
 {
-  this->debugNode(1);
+//  this->debugNode(1);
   Playable::tick(dt);