Changeset 5828 in orxonox.OLD for trunk/src

Timestamp:

Nov 30, 2005, 12:14:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: bomb detonates

Location:

trunk/src

Files:

• util/object_manager.cc (modified) (1 diff)
• world_entities/weapons/bomb.cc (modified) (9 diffs)
• world_entities/weapons/bomb.h (modified) (2 diffs)
• world_entities/weapons/cannon.cc (modified) (1 diff)

trunk/src/util/object_manager.cc

@@ -62 +62 @@
     list<BaseObject*>::const_iterator node;
     for (node = objectList->begin(); node != objectList->end(); node++)
-    {
       if ((dynamic_cast<PNode*>(*node)->getAbsCoor() - center.getAbsCoor()).len() < radius)
         newList->push_back(dynamic_cast<WorldEntity*>(*node));
-    }
     return newList;
   }

trunk/src/world_entities/weapons/bomb.cc

@@ -18 +18 @@
 #include "state.h"
 #include "model.h"
+#include "primitive_model.h"
+
 #include "fast_factory.h"
 #include "list.h"
@@ -59 +61 @@
 Bomb::~Bomb ()
 {
+  delete this->detonationSphere;
+  delete this->detonationMaterial;
 
 }
@@ -71 +75 @@
   this->setClassID(CL_BOMB, "Bomb");
 
+
+  this->detonationSphere = new PrimitiveModel(PRIM_SPHERE);
+  this->detonationMaterial = new Material();
+  this->detonationMaterial->setDiffuse(1, 0, 0);
+  //   this->detonationMaterial->setTransparency(.1);
   /**
    * @todo: Write CL_PROTO_WORLD_ENTITY INTO THE src/defs/class_id.h (your own definition)
@@ -101 +110 @@
 void Bomb::tick(float time)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  Vector v = this->velocity * (time);
-  this->shiftCoor(v);
-
   this->lifeCycle += time/this->lifeSpan;
   if( this->lifeCycle >= 1.0)
@@ -114 +119 @@
       this->deactivate();
     }
-    if (this->lifeCycle > 0.9f)
-      this->detonate ((this->lifeCycle-.89) *10000.0);
+  else if (this->lifeCycle > 0.9f)
+    this->detonate ((this->lifeCycle-.89) *1000.0);
+  else
+  {
+    Vector v = this->velocity * (time);
+    this->shiftCoor(v);
+  }
 }
 
@@ -135 +145 @@
   glMultMatrixf((float*)matrix);
 
-  if (model)
-    model->draw();
+  if (this->lifeCycle < .9)
+  {
+    if (model)
+      model->draw();
+  }
+  else
+  {
+    glScalef((this->lifeCycle-.89) *1000.0,
+              (this->lifeCycle-.89) *1000.0,
+              (this->lifeCycle-.89) *1000.0);
+    this->detonationMaterial->select();
+    this->detonationSphere->draw();
+  }
   glPopMatrix();
 }
@@ -147 +168 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_NPC))
-    this->lifeSpan = 0.9f;
+  if (this->lifeCycle < .9f && entity->isA(CL_NPC))
+    this->lifeCycle = 0.9f;
 }
 
@@ -160 +181 @@
 {
   State::getWorldEntityList()->remove(this);
+  this->lifeCycle = 0.0f;
   Bomb::fastFactory->kill(this);
 }
@@ -170 +192 @@
     while( !detonationList->empty() )
     {
-    //detonationList->front()->collidesWith(this, Vector(0,0,0));
+      detonationList->front()->collidesWith(this, Vector(0,0,0));
       detonationList->pop_front();
     }

trunk/src/world_entities/weapons/bomb.h

@@ -8 +8 @@
 
 #include "projectile.h"
+
 class FastFactory;
 class ParticleSystem;
 class ParticleEmitter;
+class Material;
 
 //! A Class to ...
@@ -41 +43 @@
 
   ParticleEmitter*                  emitter;
-
+  Model*                            detonationSphere;
+  Material*                         detonationMaterial;
 };
 

trunk/src/world_entities/weapons/cannon.cc

@@ -83 +83 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setMaximumEnergy(100, 1);
-  this->increaseEnergy(30);
+  this->setMaximumEnergy(100, 20);
+  this->increaseEnergy(100);
   //this->minCharge = 2;