Changeset 9163 in orxonox.OLD

Timestamp:

Jul 4, 2006, 6:16:00 PM (18 years ago)

Author:

patrick

Message:

aiming system integration

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• creatures/fps_player.h (modified) (3 diffs)
• weapons/aiming_system.cc (modified) (3 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -29 +29 @@
 #include "weapons/cannon.h"
 #include "weapons/fps_sniper_rifle.h"
+#include "weapons/aiming_system.h"
 
 #include "aabb.h"

branches/presentation/src/world_entities/creatures/fps_player.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+
+class AimingSystem;
 
 
@@ -26 +29 @@
 
     virtual void reset();
-    
+
     virtual void destroy(WorldEntity* killer);
     virtual void respawn();
@@ -57 +60 @@
     float                 fallVelocity;        //!< velocity for falling down
     float                 jumpForce;           //!< the jump force
-    
+
     bool                  initWeapon;
+
+    AimingSystem*         aimingSystem;        //!< aiming system of the player
 };
 

branches/presentation/src/world_entities/weapons/aiming_system.cc

@@ -76 +76 @@
 /**
  * get back the nearest target
+ * @returns the nerest target
  */
 inline WorldEntity* AimingSystem::getNearestTarget()
@@ -84 +85 @@
     return this->selectionList.back();
 
-//   WorldEntity* nearestEntity = this->;
+  WorldEntity* nearestEntity     = this->selectionList.back();
+  float        distance          = 0.0f;
+  float        smalestDistance   = this->range * 5.0f;
+
 
   for( int i = 0; i < this->selectionList.size(); i++)
   {
+    distance = fabs((this->getAbsCoor() - this->selectionList[i]->getAbsCoor()).len());
+    if( distance < smalestDistance)
+    {
+      nearestEntity = this->selectionList[i];
+      smalestDistance = distance;
+    }
+  }
 
-  }
+  return nearestEntity;
 }
 
@@ -111 +122 @@
 void AimingSystem::tick(float dt)
 {
+
+  this->selectionList.clear();
 }