Changeset 5527 in orxonox.OLD for branches/world_entities/src/world_entities/weapons

Timestamp:

Nov 10, 2005, 12:33:31 AM (19 years ago)

Author:

bensch

Message:

world_entities: new AimingTurret added.
This turret aims a Target that is the nearest one, and shoots in its direction

Location:

branches/world_entities/src/world_entities/weapons

Files:

• aiming_turret.cc (copied) (copied from branches/world_entities/src/world_entities/weapons/turret.cc) (10 diffs)
• aiming_turret.h (copied) (copied from branches/world_entities/src/world_entities/weapons/turret.h) (2 diffs)
• weapon_manager.cc (modified) (4 diffs)
• weapon_manager.h (modified) (3 diffs)

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

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "turret.h"
+#include "aiming_turret.h"
 
 #include "weapon_manager.h"
@@ -30 +30 @@
 #include "factory.h"
 
-CREATE_FACTORY(Turret);
+CREATE_FACTORY(AimingTurret);
 
 using namespace std;
@@ -40 +40 @@
    creates a new weapon
 */
-Turret::Turret (WeaponManager* weaponManager)
+AimingTurret::AimingTurret (WeaponManager* weaponManager)
   : Weapon(weaponManager)
 {
@@ -54 +54 @@
 
 
-Turret::Turret(const TiXmlElement* root)
+AimingTurret::AimingTurret(const TiXmlElement* root)
 {
   this->init();
@@ -63 +63 @@
  *  standard deconstructor
 */
-Turret::~Turret ()
+AimingTurret::~AimingTurret ()
 {
   // model will be deleted from WorldEntity-destructor
 }
 
-void Turret::init()
+void AimingTurret::init()
 {
-  this->setClassID(CL_TURRET, "Turret");
+  this->setClassID(CL_AIMING_TURRET, "AimingTurret");
 
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
@@ -98 +98 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
+
+  this->target = NULL;
 }
 
-void Turret::loadParams(const TiXmlElement* root)
+void AimingTurret::loadParams(const TiXmlElement* root)
 {
   static_cast<Weapon*>(this)->loadParams(root);
@@ -106 +108 @@
 }
 
-void Turret::activate()
+void AimingTurret::activate()
 {
 }
 
-void Turret::deactivate()
+void AimingTurret::deactivate()
 {
 }
 
-void Turret::tick(float dt)
+void AimingTurret::tick(float dt)
 {
   Quaternion quat;
-  Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  if (this->target == NULL)
+    this->target = this->getWeaponManager()->getDistanceTarget(this, 50);
+  Vector direction = this->target->getAbsCoor() - this->getAbsCoor();
 
   direction.normalize();
@@ -126 +130 @@
     quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
-  this->setAbsDirSoft(quat, 5);
+  this->setAbsDirSoft(quat, 20);
 }
 
-void Turret::fire()
+void AimingTurret::fire()
 {
   Projectile* pj = this->getProjectile();
@@ -139 +143 @@
   if (target != NULL)
   {
-    pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
+    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
   }
@@ -149 +153 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
+  this->target = this->getWeaponManager()->getDistanceTarget(this, 50);
 }
 
-void Turret::destroy ()
+void AimingTurret::destroy ()
 {}
 
 /**
- * draws the Turret
+ * draws the AimingTurret
 */
-void Turret::draw () const
+void AimingTurret::draw () const
 {
   this->getWeaponManager()->getFixedTarget()->debugDraw(10);

branches/world_entities/src/world_entities/weapons/aiming_turret.h

@@ -1 +1 @@
 /*!
- * @file turret.h
+ * @file aiming_turret.h
 */
 
 
-#ifndef _TURRET_H
-#define _TURRET_H
+#ifndef _AIMING_TURRET_H
+#define _AIMING_TURRET_H
 
 #include "weapon.h"
 
-class Turret : public Weapon
+class AimingTurret : public Weapon
   {
   public:
-    Turret (WeaponManager* weaponManager);
-    Turret(const TiXmlElement* root);
-    virtual ~Turret ();
+    AimingTurret (WeaponManager* weaponManager);
+    AimingTurret(const TiXmlElement* root);
+    virtual ~AimingTurret ();
 
     void init();
@@ -29 +29 @@
 
   private:
+    PNode*          target;
   };
 
-#endif /* _TURRET_H */
+#endif /* _AIMING_TURRET_H */

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

@@ -23 +23 @@
 #include "crosshair.h"
 
+#include "class_list.h"
 #include "load_param.h"
 #include "factory.h"
-#include "vector.h"
 #include "list.h"
 #include "t_animation.h"
 #include "null_parent.h"
+
 
 using namespace std;
@@ -109 +110 @@
   this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
   this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
+
+  this->targetIterator = NULL;
 }
 
@@ -140 +143 @@
 
   Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(element));
-
 
 
@@ -334 +336 @@
     }
   }
+}
+
+
+/**
+ * Selects an Entity from the NPC-list, and returns the Target
+ */
+PNode* WeaponManager::getSomeTarget()
+{
+   if (this->targetIterator == NULL)
+   {
+     tList<BaseObject>* npcList = ClassList::getList(CL_NPC);
+     if (npcList != NULL)
+     {
+       this->targetIterator = npcList->getIterator();
+       this->targetIterator->firstElement();
+     }
+     else
+       return NULL;
+   }
+
+   PNode* retNode = dynamic_cast<PNode*>(targetIterator->nextElement());
+   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)
+{
+  tList<BaseObject>* npcList = ClassList::getList(CL_NPC);
+  if (npcList != NULL)
+  {
+    tIterator<BaseObject>* npcIT = npcList->getIterator();
+    PNode* tmpNPC = dynamic_cast<PNode*>(npcIT->firstElement());
+    while (tmpNPC != NULL)
+    {
+      if ((carrier->getAbsCoor() - tmpNPC->getAbsCoor()).len() < distance)
+      {
+        delete npcIT;
+        return tmpNPC;
+      }
+      tmpNPC = dynamic_cast<PNode*>(npcIT->nextElement());
+    }
+    delete npcIT;
+  }
+  return this->getFixedTarget();
+
 }
 

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

@@ -17 +17 @@
 // FORWARD DECLARATION
 template <class T> class tAnimation;
+template <class T> class tIterator;
 
 
@@ -77 +78 @@
 
     /** @returns a fixed target namely the Crosshair's 3D position */
-    inline PNode* getFixedTarget() { return this->crosshair; };
+    inline PNode* getFixedTarget() const { return this->crosshair; };
+    PNode* getSomeTarget();
+    PNode* getDistanceTarget(const PNode* carrier, float distance);
+
     void fire();
+    //! @TODO: implement this function (maybe also in Weapon itself)
+    void releaseFire();
 
     void tick(float dt);
@@ -102 +108 @@
     Crosshair*              crosshair;                                //!< an aim.
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
+
+    tIterator<BaseObject>*  targetIterator;                           //!< An iterator for traversion lists of enemies.
 };