Changeset 5750 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Nov 24, 2005, 12:13:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (1 diff)
• environment.cc (modified) (1 diff)
• npc.cc (deleted)
• npc.h (deleted)
• npc2.cc (deleted)
• npc2.h (deleted)
• npcs (copied) (copied from branches/world_entities/src/world_entities/npcs)
• npcs/npc.cc (copied) (copied from branches/world_entities/src/world_entities/npcs/npc.cc)
• npcs/npc.h (copied) (copied from branches/world_entities/src/world_entities/npcs/npc.h)
• npcs/npc_test.cc (copied) (copied from branches/world_entities/src/world_entities/npcs/npc_test.cc)
• npcs/npc_test.h (copied) (copied from branches/world_entities/src/world_entities/npcs/npc_test.h)
• npcs/npc_test1.cc (copied) (copied from branches/world_entities/src/world_entities/npcs/npc_test1.cc)
• npcs/npc_test1.h (copied) (copied from branches/world_entities/src/world_entities/npcs/npc_test1.h)
• player.cc (modified) (7 diffs)
• power_ups/laser_power_up.cc (modified) (1 diff)
• power_ups/turret_power_up.cc (modified) (1 diff)
• skybox.cc (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• weapons/aim.cc (modified) (7 diffs)
• weapons/aim.h (modified) (3 diffs)
• weapons/aiming_turret.cc (copied) (copied from branches/world_entities/src/world_entities/weapons/aiming_turret.cc)
• weapons/aiming_turret.h (copied) (copied from branches/world_entities/src/world_entities/weapons/aiming_turret.h)
• weapons/bomb.cc (copied) (copied from branches/world_entities/src/world_entities/weapons/bomb.cc)
• weapons/bomb.h (copied) (copied from branches/world_entities/src/world_entities/weapons/bomb.h)
• weapons/cannon.cc (copied) (copied from branches/world_entities/src/world_entities/weapons/cannon.cc)
• weapons/cannon.h (copied) (copied from branches/world_entities/src/world_entities/weapons/cannon.h)
• weapons/crosshair.cc (modified) (1 diff)
• weapons/ground_turret.cc (copied) (copied from branches/world_entities/src/world_entities/weapons/ground_turret.cc)
• weapons/ground_turret.h (copied) (copied from branches/world_entities/src/world_entities/weapons/ground_turret.h)
• weapons/laser.cc (modified) (1 diff)
• weapons/laser.h (modified) (1 diff)
• weapons/test_gun.cc (modified) (2 diffs)
• weapons/test_gun.h (modified) (1 diff)
• weapons/turret.cc (modified) (5 diffs)
• weapons/turret.h (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)
• weapons/weapon.h (modified) (8 diffs)
• weapons/weapon_manager.cc (modified) (3 diffs)
• weapons/weapon_manager.h (modified) (5 diffs)

trunk/src/world_entities/Makefile.am

@@ -25 +25 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
+                  weapons/ground_turret.cc \
                   weapons/crosshair.cc \
+                  weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \

trunk/src/world_entities/environment.cc

@@ -28 +28 @@
 
 using namespace std;
-CREATE_FACTORY(Environment);
+CREATE_FACTORY(Environment, CL_ENVIRONMENT);
 
 /**

trunk/src/world_entities/player.cc

@@ -28 +28 @@
 #include "weapons/test_gun.h"
 #include "weapons/turret.h"
+#include "weapons/cannon.h"
 
 #include "list.h"
@@ -37 +38 @@
 using namespace std;
 
-CREATE_FACTORY(Player);
+CREATE_FACTORY(Player, CL_PLAYER);
 
 /**
@@ -46 +47 @@
 {
   this->init();
-
-  //weapons:
-  Weapon* wpRight = new TestGun(this->weaponMan, 0);
-  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
-
-  this->weaponMan->addWeapon(wpRight);
-//  this->weaponMan->addWeapon(wpLeft, WM_CONFIG1, WM_SLOT1);
-//  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
-//  this->weaponMan->addWeapon(wpLeft, WM_CONFIG2);
 }
 
@@ -88 +80 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(this->weaponMan, 0);
+  Weapon* wpRight = new TestGun(0);
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
+  Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(CL_CANNON));
+
+  cannon->setName("BFG");
 
   this->weaponMan->addWeapon(wpLeft, 1, 0);
   this->weaponMan->addWeapon(wpRight,1 ,1);
+  this->weaponMan->addWeapon(cannon, 0, 6);
+
   //this->weaponMan->addWeapon(turret, 3, 0);
 
@@ -134 +131 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(10);
+  this->weaponMan->setSlotCount(7);
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
@@ -153 +150 @@
   this->weaponMan->setSlotPosition(5, Vector(-1.5, -.5, -.5));
   this->weaponMan->setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(6, Vector(-2.0, 0.1, -2.0));
-  this->weaponMan->setSlotPosition(7, Vector(-2.0, 0.1, 2.0));
-
-  this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
-  this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
-  this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));
+//
+   this->weaponMan->setSlotPosition(6, Vector(-1, 0.0, 0));
+   this->weaponMan->setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+   //
+//   this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
+//   this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
+//
+//   this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
+//   this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
+
 }
 
@@ -337 +335 @@
 }
 
+#include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
 void Player::ADDWEAPON()
 {
-  Weapon* turret1 = new Turret(this->weaponMan);
-  turret1->setName("Turret");
-  turret1->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-
-  this->weaponMan->addWeapon(turret1, 2);
-
-  this->weaponMan->changeWeaponConfig(2);
-}
+  Weapon* turret = NULL;
+
+  if ((float)rand()/RAND_MAX < .1)
+  {
+    //if (this->weaponMan->hasFreeSlot(2, WTYPE_TURRET))
+    {
+      turret = new Turret();
+      this->weaponMan->addWeapon(turret, 2);
+      this->weaponMan->changeWeaponConfig(2);
+    }
+  }
+  else
+  {
+    //if (this->weaponMan->hasFreeSlot(3))
+    {
+      turret = new AimingTurret();
+      this->weaponMan->addWeapon(turret, 3);
+
+      this->weaponMan->changeWeaponConfig(3);
+    }
+  }
+
+  if(turret != NULL)
+  {
+    turret->setName("Turret");
+    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
+  }
+}

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -25 +25 @@
 using namespace std;
 
-CREATE_FACTORY(LaserPowerUp);
+CREATE_FACTORY(LaserPowerUp, CL_LASER_POWER_UP);
 
 LaserPowerUp::LaserPowerUp ()

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -25 +25 @@
 using namespace std;
 
-CREATE_FACTORY(TurretPowerUp);
+CREATE_FACTORY(TurretPowerUp, CL_TURRET_POWER_UP);
 
 TurretPowerUp::TurretPowerUp ()

trunk/src/world_entities/skybox.cc

@@ -25 +25 @@
 using namespace std;
 
-CREATE_FACTORY(SkyBox);
+CREATE_FACTORY(SkyBox, CL_SKYBOX);
 
 /**

trunk/src/world_entities/terrain.cc

@@ -29 +29 @@
 using namespace std;
 
-CREATE_FACTORY(Terrain);
+CREATE_FACTORY(Terrain, CL_TERRAIN);
 
 /**

trunk/src/world_entities/weapons/aim.cc

@@ -20 +20 @@
 #include "load_param.h"
 #include "graphics_engine.h"
-#include "glincl.h"
 #include "state.h"
+#include "list.h"
 #include "material.h"
+#include "t_animation.h"
+#include "text.h"
+
+#include "world_entity.h"
 
 using namespace std;
@@ -30 +34 @@
  * standart constructor
  */
-Aim::Aim (const TiXmlElement* root)
+Aim::Aim (PNode* source, const TiXmlElement* root)
 {
   this->init();
+
+  this->source = source;
 
   if (root)
@@ -47 +53 @@
   if (this->material)
     delete this->material;
+
+  if (this->text != NULL)
+    delete this->text;
 }
 
@@ -58 +67 @@
 
   this->setLayer(E2D_LAYER_TOP);
-  this->setRotationSpeed(5);
+  this->setRotationSpeed(30.0* (float)rand()/RAND_MAX + 10.0);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
-//  this->setBindNode(this);
+  this->setBindNode(this);
   this->material = new Material;
-}
-
+  this->source = NULL;
+
+  this->anim = new tAnimation<Aim>(this, &Aim::setSize);
+  this->anim->setInfinity(ANIM_INF_CONSTANT);
+  this->anim->addKeyFrame(500, .3, ANIM_LINEAR);
+  this->anim->addKeyFrame(100, .2, ANIM_LINEAR);
+  this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
+
+  this->text = new Text();
+  this->text->setParent2D(this);
+  this->text->setRelCoor2D(10, -50);
+  this->text->setParentMode2D(E2D_PARENT_MOVEMENT);
+  this->text->setText("Testing");
+}
 
 void Aim::loadParams(const TiXmlElement* root)
@@ -80 +101 @@
 }
 
+void Aim::searchTarget(float range)
+{
+  tIterator<WorldEntity>* iterator = State::getWorldEntityList()->getIterator();
+  WorldEntity* entity = iterator->firstElement();
+  while (likely(entity != NULL))
+  {
+    if (entity->isA(CL_NPC) && this->source->getAbsCoor().x < entity->getAbsCoor().x && (this->source->getAbsCoor() - entity->getAbsCoor()).len() < range)
+    {
+      if (this->getParent() != entity)
+      {
+        this->anim->replay();
+        this->setParentSoft(entity, 5);
+      }
+      delete iterator;
+      return;
+    }
+    entity = iterator->nextElement();
+  }
+
+  delete iterator;
+}
+
+
 
 /**
@@ -108 +152 @@
   this->shiftDir2D(dt * rotationSpeed);
 
-
-  float z = 0.0f;
-  glReadPixels ((int)this->getAbsCoor2D().x,
-                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
-                 1,
-                 1,
-                 GL_DEPTH_COMPONENT,
-                 GL_FLOAT,
-                 &z);
-
-
-  GLdouble objX=.0, objY=.0, objZ=.0;
-  gluUnProject(this->getAbsCoor2D().x,
-               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
-               .99,  // z
-               GraphicsEngine::modMat,
-               GraphicsEngine::projMat,
-               GraphicsEngine::viewPort,
-               &objX,
-               &objY,
-               &objZ );
-
-  this->setAbsCoor(objX, objY, objZ);
+  char outputText[100];
+  sprintf(outputText, "%s - distance: %f\n", this->getParent()->getName(), (this->source->getAbsCoor() - this->getAbsCoor()).len());
+  this->text->setText(outputText);
+
+
+  if (this->source->getAbsCoor().x > this->getAbsCoor().x )
+    this->searchTarget(1000);
+//   float z = 0.0f;
+//   glReadPixels ((int)this->getAbsCoor2D().x,
+//                  GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
+//                  1,
+//                  1,
+//                  GL_DEPTH_COMPONENT,
+//                  GL_FLOAT,
+//                  &z);
+//
+//
+//   GLdouble objX=.0, objY=.0, objZ=.0;
+//   gluUnProject(this->getAbsCoor2D().x,
+//                GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
+//                .99,  // z
+//                GraphicsEngine::modMat,
+//                GraphicsEngine::projMat,
+//                GraphicsEngine::viewPort,
+//                &objX,
+//                &objY,
+//                &objZ );
+//
+//   this->setAbsCoor(objX, objY, objZ);
 }
 
@@ -138 +188 @@
 void Aim::draw() const
 {
+
   glPushMatrix();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);

trunk/src/world_entities/weapons/aim.h

@@ -12 +12 @@
 // FORWARD DECLARATION
 class Model;
+class Text;
 class Material;
 class TiXmlElement;
+template<class T> class tAnimation;
 
 //! An Aim for zooming in on Targets.
+/**
+ * An Aim is a PNode, that is connected, to the Target, it has aquired
+ * The target becomes, if selected its Parent.
+ *
+ * Also the Aim is a Element2D, as it draws a cross onto the Target.
+ */
 class Aim : public PNode, public Element2D {
 
  public:
-  Aim(const TiXmlElement* root = NULL);
+  Aim(PNode* source, const TiXmlElement* root = NULL);
   virtual ~Aim();
 
@@ -25 +33 @@
   void loadParams(const TiXmlElement* root);
 
+  inline void setSource(PNode* source) { this->source = source; };
+
   inline void selectTarget(PNode* target) { this->setParent(target); };
   inline PNode* getTarget(PNode* target) { return this->getParent(); };
 
+  void searchTarget(float range);
 
   void setSize(float size);
@@ -40 +51 @@
    Material*        material;             //!< a material for the Aim.
    float            rotationSpeed;        //!< Speed of the Rotation.
+   tAnimation<Aim>* anim;
+
+   PNode*           source;               //!< Where this Shot has come from.
+
+   Text*            text;                 //!< A Text to display onto this Node. (distance to Target)
 };
 

trunk/src/world_entities/weapons/crosshair.cc

@@ -76 +76 @@
   GraphicsEngine::showMouse(false);
   GraphicsEngine::stealWMEvents(true);
+  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 }
 

trunk/src/world_entities/weapons/laser.cc

@@ -84 +84 @@
     Laser::explosionParticles->setName("LaserExplosionParticles");
     Laser::explosionParticles->setLifeSpan(.5, .3);
-    Laser::explosionParticles->setRadius(0.0, 3.0);
+    Laser::explosionParticles->setRadius(0.0, 10.0);
     Laser::explosionParticles->setRadius(.5, 6.0);
     Laser::explosionParticles->setRadius(1.0, 3.0);

trunk/src/world_entities/weapons/laser.h

@@ -42 +42 @@
 
     WorldEntity* hitEntity; // FIXME TEMPORARY
-
 };
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -41 +41 @@
 using namespace std;
 
-CREATE_FACTORY(TestGun);
+CREATE_FACTORY(TestGun, CL_TEST_GUN);
 
 /**
@@ -48 +48 @@
    creates a new weapon
 */
-TestGun::TestGun (WeaponManager* weaponManager, int leftRight)
-  : Weapon(weaponManager)
+TestGun::TestGun ( int leftRight)
+  : Weapon()
 {
   this->init();

trunk/src/world_entities/weapons/test_gun.h

@@ -38 +38 @@
   {
   public:
-    TestGun (WeaponManager* weaponManager, int leftRight);
+    TestGun (int leftRight);
     TestGun (const TiXmlElement* root);
     virtual ~TestGun ();

trunk/src/world_entities/weapons/turret.cc

@@ -30 +30 @@
 #include "factory.h"
 
-CREATE_FACTORY(Turret);
+CREATE_FACTORY(Turret, CL_TURRET);
 
 using namespace std;
 
-
 /**
  *  standard constructor
-
-   creates a new weapon
-*/
-Turret::Turret (WeaponManager* weaponManager)
-  : Weapon(weaponManager)
+ *
+ * creates a new Turret
+ */
+Turret::Turret ()
+  : Weapon()
 {
   this->init();
@@ -53 +52 @@
 }
 
-
+/**
+ * creates a new Turret from a TiXmlElement
+ */
 Turret::Turret(const TiXmlElement* root)
 {
@@ -117 +118 @@
 {
   Quaternion quat;
-  Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
 
   direction.normalize();
@@ -135 +136 @@
     return;
 
-  PNode* target = this->getWeaponManager()->getFixedTarget();
-
-  if (target != NULL)
-  {
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
-  }
-  else
-    pj->setVelocity(target->getVelocity());
 
   pj->setParent(NullParent::getInstance());
@@ -159 +153 @@
 void Turret::draw () const
 {
-  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
-
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);

trunk/src/world_entities/weapons/turret.h

@@ -12 +12 @@
   {
   public:
-    Turret (WeaponManager* weaponManager);
+    Turret ();
     Turret(const TiXmlElement* root);
     virtual ~Turret ();

trunk/src/world_entities/weapons/weapon.cc

@@ -41 +41 @@
  * creates a new weapon
 */
-Weapon::Weapon (WeaponManager* weaponManager)
+Weapon::Weapon ()
 {
   this->init();
-  this->setWeaponManager(weaponManager);
 }
 
@@ -97 +96 @@
   this->energyMax = 10.0;                          //< How much energy can be carried
   this->capability = WTYPE_ALL;                    //< The Weapon has all capabilities @see W_Capability.
-
-  this->setWeaponManager(NULL);                    //< By default the Weapon is free, and unhandled by a WeaponManager (this is good for small enemies).
 }
 

trunk/src/world_entities/weapons/weapon.h

@@ -81 +81 @@
   public:
     // INITIALISATION //
-    Weapon (WeaponManager* weaponManager = NULL);
+    Weapon ();
     virtual ~Weapon ();
 
@@ -93 +93 @@
     ///////////////////
 
-    /** @param weaponManager sets the WeaponManager for this Weapon (NULL if free)) */
-    inline void setWeaponManager(WeaponManager* weaponManager) { this->weaponManager = weaponManager; };
-    /** @returns the WeaponManager of this Weapon (or NULL if it is free) */
-    inline WeaponManager* getWeaponManager() const { return this->weaponManager; };
-
     /** @returns true if the Weapon is Active  (this is used to check if the weapon must be drawn)*/
-    inline bool isActive() const { return (this->currentState == WS_INACTIVE)?false:true; };
+    inline bool isActive() const { return (this->currentState == WS_INACTIVE)? false : true; };
     /** @returns true if the weapon must be drawn */
-    inline bool isVisible() const { return (this->currentState != WS_INACTIVE || !this->hideInactive)?true:false; };
+    inline bool isVisible() const { return (this->currentState != WS_INACTIVE || !this->hideInactive) ? true : false; };
     /** @returns true if the Weapon is chargeable */
     inline bool isChargeable() const { return this->chargeable; };
@@ -120 +115 @@
 
 
+    // EMISSION
     void setEmissionPoint(const Vector& point);
     /** @see void setEmissionPoint(const Vector& point); */
@@ -126 +122 @@
     inline const Vector& getEmissionPoint() const { return this->emissionPoint.getAbsCoor(); };
 
+    // STATE CHANGES //
     /** @param state the State to time @param duration the duration of the State */
     inline void setStateDuration(const char* state, float duration) { setStateDuration(charToState(state), duration); };
@@ -131 +128 @@
     inline void setStateDuration(WeaponState state, float duration) { /*(state < WS_STATE_COUNT)?*/this->times[state] = duration; };
     /** @param state The state to query @returns the Time the queried State takes to complete */
-    inline float getStateDuration(WeaponState state) const { return (state < WS_STATE_COUNT)?this->times[state]:0.0; };
+    inline float getStateDuration(WeaponState state) const { return (state < WS_STATE_COUNT)? this->times[state] : 0.0; };
     /** @returns true if the time of the currentState is elapsed, false otherwise */
-    inline bool stateTimeElapsed() const { return (this->stateDuration > this->times[currentState])?true:false; };
+    inline bool stateTimeElapsed() const { return (this->stateDuration > this->times[currentState])? true : false; };
     /** @returns the current State of the Weapon */
     inline WeaponState getCurrentState() const { return this->currentState; };
@@ -149 +146 @@
     // FLOW
     void tickW(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
+
     virtual void tick(float dt) {};
     virtual void draw() const;
@@ -194 +192 @@
     // it is all about energy
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
-    float                energyLoaded;                     //!< The energy stored in the weapons primary buffers (firewithout reload)
+    float                energyLoaded;                     //!< The energy stored in the weapons primary buffers (fire without reload)
     float                energyMax;                        //!< The maximal energy that can be stored in the secondary buffers (reserveMax)
     float                energyLoadedMax;                  //!< The maximal energy that can be stored in the primary buffers
@@ -220 +218 @@
     ClassID              projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     FastFactory*         projectileFactory;               //!< A factory, that produces and handles the projectiles.
-
-    WeaponManager*       weaponManager;                   //!< The weaponManager this weapon is connected to. if NULL it is assumed, that the weapon is freely connected to an entity without a binding WeaponManager.
   };
 

trunk/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;
 }
 
@@ -334 +337 @@
     }
   }
+}
+
+
+/**
+ * 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();
+
 }
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -17 +17 @@
 // FORWARD DECLARATION
 template <class T> class tAnimation;
+template <class T> class tIterator;
 
 
@@ -70 +71 @@
     void removeWeapon(Weapon* weapon, int configID = -1);
 
-
+    // FIXME ::
+//    bool hasFreeSlot(int configID, long capability = WTYPE_ALL) { return ( getNextFreeSlot(configID, capability ) != -1)? true : false; };
 
     void nextWeaponConfig();
@@ -77 +79 @@
 
     /** @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);
@@ -85 +92 @@
     void debug() const;
 
-  private:
+ // private:
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
 
@@ -102 +109 @@
     Crosshair*              crosshair;                                //!< an aim.
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
+
+    tIterator<BaseObject>*  targetIterator;                           //!< An iterator for traversion lists of enemies.
 };