Changeset 5968 in orxonox.OLD for branches/network/src/world_entities/weapons/bomb.cc

Timestamp:

Dec 7, 2005, 4:16:51 PM (20 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

File:

• branches/network/src/world_entities/weapons/bomb.cc (modified) (8 diffs)

branches/network/src/world_entities/weapons/bomb.cc

@@ -17 +17 @@
 #include "glincl.h"
 #include "state.h"
+#include "model.h"
+#include "primitive_model.h"
+
+#include "fast_factory.h"
 #include "list.h"
-#include "model.h"
-#include "vector.h"
-#include "fast_factory.h"
 
+#include "object_manager.h"
 
 #include "particle_engine.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();
     }
+  else if (this->lifeCycle > 0.9f)
+    this->detonate ((this->lifeCycle-.89) *1000.0);
+  else
+  {
+    Vector v = this->velocity * (time);
+    this->shiftCoor(v);
+  }
 }
 
@@ -133 +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();
 }
@@ -145 +168 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-        this->detonate();
+  if (this->lifeCycle < .9f && entity->isA(CL_NPC))
+    this->lifeCycle = 0.9f;
 }
 
@@ -157 +181 @@
 {
   State::getWorldEntityList()->remove(this);
+  this->lifeCycle = 0.0f;
   Bomb::fastFactory->kill(this);
 }
 
-void Bomb::detonate()
+void Bomb::detonate(float size)
 {
-  tIterator<WorldEntity>* it = State::getWorldEntityList()->getIterator();
-  WorldEntity* lm = it->firstElement();
-
-  while(lm != NULL)
+  std::list<WorldEntity*>* detonationList = ObjectManager::distanceFromObject(*this, size, CL_NPC);
+  if (detonationList != NULL)
   {
-
-    lm = it->nextElement();
+    while( !detonationList->empty() )
+    {
+      detonationList->front()->collidesWith(this, Vector(0,0,0));
+      detonationList->pop_front();
+    }
+    delete detonationList;
   }
 }