Changeset 7047 in orxonox.OLD

Timestamp:

Feb 6, 2006, 1:29:09 PM (18 years ago)

Author:

bensch

Message:

trunk: added class Explosion

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/effects (added)
• world_entities/effects/explosion.cc (copied) (copied from trunk/src/world_entities/projectiles/rocket.cc) (4 diffs)
• world_entities/effects/explosion.h (copied) (copied from trunk/src/world_entities/projectiles/rocket.h) (1 diff)

trunk/src/defs/class_id.h

@@ -276 +276 @@
   // Particles
   CL_PARTICLE_SYSTEM            =    0x00a01000,
-  CL_SPRITE_PARTICLES           =    0x00000a01,
-  CL_SPARK_PARTICLES            =    0x00000a02,
-  CL_PNODE_PARTICLES            =    0x00000a03,
-  CL_DOT_PARTICLES              =    0x00000a04,
-  CL_MODEL_PARTICLES            =    0x00000a05,
+  CL_SPRITE_PARTICLES           =    0x00002000,
+  CL_SPARK_PARTICLES            =    0x00004000,
+  CL_PNODE_PARTICLES            =    0x00008000,
+  CL_DOT_PARTICLES              =    0x00010000,
+  CL_MODEL_PARTICLES            =    0x00020000,
 
   CL_PARTICLE_EMITTER           =    0x00a02000,
@@ -295 +295 @@
   CL_FOG_EFFECT                 =    0x00000841,
   CL_LENSE_FLARE                =    0x00000842,
+  CL_EXPLOSION                  =    0x00000850,
 
   // Element2D's  (range from 0x00000b00 to 0x00000bff)

trunk/src/world_entities/Makefile.am

@@ -65 +65 @@
                   \
                   world_entities/elements/image_entity.cc \
-                  world_entities/elements/text_element.cc
+                  world_entities/elements/text_element.cc \
+                  \
+                  world_entities/effects/explosion.cc
 
 
@@ -128 +130 @@
                  \
                  world_entities/elements/image_entity.h \
-                 world_entities/elements/text_element.h
+                 world_entities/elements/text_element.h \
+                 \
+                 world_entities/effects/explosion.h
 
+

trunk/src/world_entities/effects/explosion.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "rocket.h"
+#include "explosion.h"
 
 #include "fast_factory.h"
@@ -29 +29 @@
 using namespace std;
 
-CREATE_FAST_FACTORY_STATIC(Rocket, CL_ROCKET);
+CREATE_FAST_FACTORY_STATIC(Explosion, CL_EXPLOSION);
 
 /**
  *  standard constructor
 */
-Rocket::Rocket () : Projectile()
+Explosion::Explosion ()
 {
-  this->setClassID(CL_ROCKET, "Rocket");
-
-  float modelSize = .3;
-  this->loadModel("models/projectiles/orx-rocket.obj", .3);
-
-  this->setMinEnergy(1);
-  this->setHealthMax(10);
-  this->lifeSpan = 5;
+  this->setClassID(CL_EXPLOSION, "Explosion");
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
+  this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
+
+  this->lifeCycle = 0.0f;
+  this->lifeTime = 4.0f;
+
 }
 
@@ -54 +52 @@
  *  standard deconstructor
 */
-Rocket::~Rocket ()
+Explosion::~Explosion ()
 {
-  // delete this->emitter;
+  delete this->emitter;
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Rocket::trailParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
+  if (Explosion::explosionParticles != NULL && ClassList::getList(CL_EXPLOSION)->size() <= 1)
+     Explosion::explosionParticles = NULL;
+}
+
+SpriteParticles* Explosion::explosionParticles = NULL;
+
+void Explosion::activate()
+{
+  if (unlikely(Explosion::explosionParticles == NULL))
   {
-/*    if (ClassList::exists(Rocket::trailParticles, CL_PARTICLE_SYSTEM))
-      delete Rocket::trailParticles;*/
-    Rocket::trailParticles = NULL;
-  }
-  if (Rocket::explosionParticles != NULL && ClassList::getList(CL_ROCKET)->size() <= 1)
-  {
-/*    if (ClassList::exists(Rocket::explosionParticles, CL_PARTICLE_SYSTEM))
-      delete Rocket::explosionParticles;*/
-    Rocket::explosionParticles = NULL;
+    Explosion::explosionParticles = new SpriteParticles(200);
+    Explosion::explosionParticles->setName("ExplosionExplosionParticles");
+    Explosion::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
+    Explosion::explosionParticles->setLifeSpan(.5, .3);
+    Explosion::explosionParticles->setRadius(0.0, 10);
+    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.5, .8,.8,0,.8);
+    Explosion::explosionParticles->setColor(0.8, .8,.8,.3,.8);
+    Explosion::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
 
-}
-
-SpriteParticles* Rocket::trailParticles = NULL;
-SpriteParticles* Rocket::explosionParticles = NULL;
-
-void Rocket::activate()
-{
-  if (unlikely(Rocket::trailParticles == NULL))
-  {
-    Rocket::trailParticles = new SpriteParticles(2000);
-    Rocket::trailParticles->setName("RocketTrailParticles");
-    Rocket::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    Rocket::trailParticles->setLifeSpan(1.0, .3);
-    Rocket::trailParticles->setRadius(0.0, .5);
-    Rocket::trailParticles->setRadius(0.2, 2.0);
-    Rocket::trailParticles->setRadius(.5, .8);
-    Rocket::trailParticles->setRadius(1.0, .8);
-    Rocket::trailParticles->setColor(0.0, 1,0,0,.7);
-    Rocket::trailParticles->setColor(0.2, .8,.8,0,.5);
-    Rocket::trailParticles->setColor(0.5, .8,.8,.8,.8);
-    Rocket::trailParticles->setColor(1.0, .8,.8,.8,.0);
-  }
-  if (unlikely(Rocket::explosionParticles == NULL))
-  {
-    Rocket::explosionParticles = new SpriteParticles(200);
-    Rocket::explosionParticles->setName("RocketExplosionParticles");
-    Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    Rocket::explosionParticles->setLifeSpan(.5, .3);
-    Rocket::explosionParticles->setRadius(0.0, 10);
-    Rocket::explosionParticles->setRadius(.5, 15.0);
-    Rocket::explosionParticles->setRadius(1.0, 10.0);
-    Rocket::explosionParticles->setColor(0.0, 0,1,0,1);
-    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.8);
-    Rocket::explosionParticles->setColor(0.8, .8,.8,.3,.8);
-    Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
-  }
-
-  this->emitter->setSystem(Rocket::trailParticles);
+  this->emitter->setSystem(Explosion::explosionParticles);
 
   this->updateNode(0);
   this->emitter->setEmissionRate(45.0);
   this->emitter->setEmissionVelocity(0.0);
+  this->toList(OM_DEAD_TICK);
 }
 
 
-void Rocket::deactivate()
+void Explosion::deactivate()
 {
   this->emitter->setSystem(NULL);
   this->lifeCycle = 0.0;
-  this->toList(OM_NULL);
+  this->toList(OM_DEAD);
 
-//  GarbageCollector::getInstance()->collect(this);
-  this->toList(OM_DEAD);
-  Rocket::fastFactory->kill(this);
+  Explosion::fastFactory->kill(this);
 }
 
-
-void Rocket::collidesWith(WorldEntity* entity, const Vector& location)
-{
-  if (this->hitEntity != entity)
-    this->destroy();
-  this->hitEntity = entity;
-}
 
 /**
@@ -140 +103 @@
  * @param time since last tick
 */
-void Rocket::tick (float dt)
+void Explosion::tick (float dt)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  Vector v = this->velocity * (dt);
-  this->shiftCoor(v);
-
-  if(this->tickLifeCycle(dt))
+  this->lifeCycle += dt;
+  if(this->lifeTime < this->lifeCycle)
     this->deactivate();
 }
-
-/**
- *  the function gets called, when the projectile is destroyed
-*/
-void Rocket::destroy ()
-{
-  PRINTF(5)("DESTROY Rocket\n");
-  this->lifeCycle = .95; //!< @todo calculate this usefully.
-  this->emitter->setSystem(Rocket::explosionParticles);
-
-  this->emitter->setEmissionRate(1000.0);
-  this->emitter->setEmissionVelocity(50.0);
-//  this->deactivate();
-
-}
-
-
-void Rocket::draw () const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  glScalef(2.0, 2.0, 2.0);
-  this->getModel()->draw();
-
-  glPopMatrix();
-}
-

trunk/src/world_entities/effects/explosion.h

@@ -1 +1 @@
 /*!
- * @file rocket.h
- * @brief a Rocket Projectile
+ * @file explosion.h
+ * @brief a Explosion Projectile
 */
 
-#ifndef _ROCKET_H
-#define _ROCKET_H
+#ifndef _EXPLOSION_H
+#define _EXPLOSION_H
 
-#include "projectile.h"
+#include "world_entity.h"
 
-class Vector;
-class Weapon;
 class SpriteParticles;
 class ParticleEmitter;
 class FastFactory;
 
-class Rocket : public Projectile
+class Explosion : public WorldEntity
 {
   public:
-    Rocket ();
-    virtual ~Rocket ();
-
+    Explosion ();
+    virtual ~Explosion ();
 
     virtual void activate();
     virtual void deactivate();
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
-
-    virtual void destroy ();
-
     virtual void tick (float time);
-    virtual void draw () const;
-
 
   private:
-    static FastFactory*               fastFactory;
-    static SpriteParticles*           trailParticles;
+    static FastFactory*        fastFactory;
+
+    float                      lifeTime;
+    float                      lifeCycle;
+
     static SpriteParticles*           explosionParticles;
-
-    ParticleEmitter*                  emitter;
-
-
-    WorldEntity* hitEntity; // FIXME TEMPORARY
-
+    ParticleEmitter*           emitter;
 };
 
-#endif /* _ROCKET_H */
+#endif /* _EXPLOSION_H */