Changeset 7103 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 9:45:52 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: explosion works

Location:

trunk/src/world_entities

Files:

• effects/explosion.cc (modified) (8 diffs)
• effects/explosion.h (modified) (3 diffs)
• npcs/ground_turret.cc (modified) (3 diffs)
• power_ups/power_up.cc (modified) (1 diff)

trunk/src/world_entities/effects/explosion.cc

@@ -23 +23 @@
 #include "class_list.h"
 
-#include "dot_emitter.h"
+#include "box_emitter.h"
 #include "sprite_particles.h"
 
@@ -30 +30 @@
 
 CREATE_FAST_FACTORY_STATIC(Explosion, CL_EXPLOSION);
+
 
 /**
@@ -38 +39 @@
   this->setClassID(CL_EXPLOSION, "Explosion");
 
-  this->emitter = new DotEmitter(100, 5, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(10,10,10), 300, 50, M_2_PI);
   this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
@@ -44 +45 @@
 
   this->lifeCycle = 0.0f;
-  this->lifeTime = 4.0f;
+  this->lifeTime = 0.5f;
 
 }
@@ -63 +64 @@
 SpriteParticles* Explosion::explosionParticles = NULL;
 
+void Explosion::explode(PNode* position, const Vector& size)
+{
+  Explosion* explosion = dynamic_cast<Explosion*>(Explosion::fastFactory->resurrect());
+  explosion->setParent(position);
+  explosion->emitter->setSize(size);
+  explosion->activate();
+}
+
+
 void Explosion::activate()
 {
   if (unlikely(Explosion::explosionParticles == NULL))
   {
-    Explosion::explosionParticles = new SpriteParticles(200);
+    Explosion::explosionParticles = new SpriteParticles(5000);
     Explosion::explosionParticles->setName("ExplosionExplosionParticles");
     Explosion::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
@@ -74 +84 @@
     Explosion::explosionParticles->setRadius(.5, 15.0);
     Explosion::explosionParticles->setRadius(1.0, 10.0);
-    Explosion::explosionParticles->setColor(0.0, 0,1,0,1);
+    Explosion::explosionParticles->setColor(0.0, 1,0,0,1);
     Explosion::explosionParticles->setColor(0.5, .8,.8,0,.8);
     Explosion::explosionParticles->setColor(0.8, .8,.8,.3,.8);
@@ -86 +96 @@
   this->emitter->setEmissionVelocity(0.0);
   this->toList(OM_DEAD_TICK);
+  this->lifeCycle = 0.0;
 }
 
@@ -92 +103 @@
 {
   this->emitter->setSystem(NULL);
-  this->lifeCycle = 0.0;
   this->toList(OM_DEAD);
-
+  this->emitter->setParent(PNode::getNullParent());
   Explosion::fastFactory->kill(this);
 }

trunk/src/world_entities/effects/explosion.h

@@ -10 +10 @@
 
 class SpriteParticles;
-class ParticleEmitter;
+class BoxEmitter;
 class FastFactory;
 
@@ -16 +16 @@
 {
   public:
+    static void explode (PNode* position, const Vector& size);
+
     Explosion ();
     virtual ~Explosion ();
@@ -30 +32 @@
     float                      lifeCycle;
 
-    static SpriteParticles*           explosionParticles;
-    ParticleEmitter*           emitter;
+    static SpriteParticles*    explosionParticles;
+    BoxEmitter*           emitter;
 };
 

trunk/src/world_entities/npcs/ground_turret.cc

@@ -27 +27 @@
 #include "load_param.h"
 
+#include "effects/explosion.h"
+
 CREATE_FACTORY(GroundTurret, CL_GROUND_TURRET);
 
@@ -60 +62 @@
 {
   this->setClassID(CL_GROUND_TURRET, "GroundTurret");
-  this->loadModel("models/ground_turret.obj", 5);
+  this->loadModel("models/ground_turret_#.obj", 5);
   this->left = NULL;
   this->right = NULL;
@@ -176 +178 @@
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
+  Explosion::explode(this, Vector(5,50,0));
 }
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -120 +120 @@
 void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if(entity->isA(CL_EXTENDABLE))
+  if(this->collider != entity && entity->isA(CL_EXTENDABLE))
   {
     this->collider = entity;