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

Timestamp:

Dec 7, 2005, 4:16:51 PM (19 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..

Location:

branches/network/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (3 diffs)
• bomb.cc (modified) (8 diffs)
• bomb.h (modified) (3 diffs)
• cannon.cc (modified) (2 diffs)
• ground_turret.cc (modified) (1 diff)
• guided_missile.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)
• weapon_manager.cc (modified) (2 diffs)
• weapon_manager.h (modified) (2 diffs)

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

@@ -26 +26 @@
 
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"
@@ -93 +92 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_ROCKET);
+  this->setProjectileType(CL_GUIDED_MISSILE);
 
 
@@ -142 +141 @@
     return;
 
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
+  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
+  pj->setTarget(this->target->getParent());
   pj->setParent(NullParent::getInstance());
   pj->setAbsCoor(this->getEmissionPoint());

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;
   }
 }

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

@@ -8 +8 @@
 
 #include "projectile.h"
+
 class FastFactory;
 class ParticleSystem;
 class ParticleEmitter;
+class Material;
 
 //! A Class to ...
@@ -31 +33 @@
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
   virtual void activate();
-  virtual void detonate();
   virtual void deactivate();
+
+  void detonate(float size);
 
  private:
@@ -40 +43 @@
 
   ParticleEmitter*                  emitter;
-
+  Model*                            detonationSphere;
+  Material*                         detonationMaterial;
 };
 

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

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"
@@ -83 +82 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setMaximumEnergy(100, 1);
-  this->increaseEnergy(30);
+  this->setMaximumEnergy(100, 20);
+  this->increaseEnergy(100);
   //this->minCharge = 2;
 

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

@@ -145 +145 @@
 void GroundTurret::collidesWith (WorldEntity* entity, const Vector& location)
 {
-
+  if (entity->isA(CL_PROJECTILE))
+    this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
 }
 

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

@@ -48 +48 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 5;
-  this->agility = 5;
+  this->lifeSpan = 5.0;
+  this->agility = 5.0;
   this->maxVelocity = 100;
 

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

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"

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

@@ -26 +26 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"

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

@@ -28 +28 @@
 #include "load_param.h"
 #include "state.h"
-#include "sound_engine.h"
 #include "animation3d.h"
 #include "vector.h"
+
+#include "sound_source.h"
+#include "sound_buffer.h"
 
 ////////////////////

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

@@ -110 +110 @@
   this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
   this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
-
-  this->targetIterator = NULL;
 }
 
@@ -337 +335 @@
     }
   }
-}
-
-
-/**
- * Selects an Entity from the NPC-list, and returns the Target
- */
-PNode* WeaponManager::getSomeTarget()
-{
-   if (this->targetIterator == NULL)
-   {
-     std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
-     if (npcList != NULL)
-     {
-       this->targetIterator = npcList->begin();
-     }
-     else
-       return NULL;
-   }
-
-   ///FIXME
-//   this->targetIterator++;
-   PNode* retNode = dynamic_cast<PNode*>((*targetIterator));
-//   if (retNode == NULL && this->targetIterator->getList()->getSize() > 0)
-//     retNode =  dynamic_cast<PNode*>(targetIterator->firstElement());
-
-   return retNode;
-}
-
-
-/**
- * Selects an Entity from the Entity-List, that is near of the carrier PNode.
- * @param carrier: The PNode from which the distance should be measured
- * @param distance: The Maximum Distance to Return.
- */
-PNode* WeaponManager::getDistanceTarget(const PNode* carrier, float distance)
-{
-  std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
-  if (npcList != NULL)
-  {
-    list<BaseObject*>::iterator node;
-    for (node= npcList->begin(); node != npcList->end(); node++)
-      if ((carrier->getAbsCoor() - dynamic_cast<PNode*>(*node)->getAbsCoor()).len() < distance)
-        return dynamic_cast<PNode*>(*node);
-  }
-  return this->getFixedTarget();
 }
 

branches/network/src/world_entities/weapons/weapon_manager.h

@@ -80 +80 @@
     /** @returns a fixed target namely the Crosshair's 3D position */
     inline PNode* getFixedTarget() const { return this->crosshair; };
-    PNode* getSomeTarget();
-    PNode* getDistanceTarget(const PNode* carrier, float distance);
 
     void fire();
@@ -109 +107 @@
     Crosshair*              crosshair;                                //!< an aim.
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
-
-    std::list<BaseObject*>::iterator  targetIterator;                           //!< An iterator for traversion lists of enemies.
 };