Changeset 9160 in orxonox.OLD

Timestamp:

Jul 4, 2006, 5:53:06 PM (18 years ago)

Author:

patrick

Message:

aimin system work on and on and…

Location:

branches/presentation/src/world_entities

Files:

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

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

@@ -256 +256 @@
     attitude-= yMouse;
 
-    PRINTF(0)("attitude: %f\n", attitude);
 
     if ( attitude > 0.32 )

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

@@ -19 +19 @@
 
 #include "util/loading/load_param.h"
-#include "graphics_engine.h"
+
 #include "state.h"
-#include "material.h"
-#include "t_animation.h"
-#include "text.h"
 
-#include "world_entity.h"
+#include <vector>
+
 
 using namespace std;
@@ -76 +74 @@
 
 
+/**
+ * get back the nearest target
+ */
+inline WorldEntity* AimingSystem::getNearestTarget()
+{
+  if( this->selectionList.size() == 0)
+    return NULL;
+  else if( this->selectionList.size() == 1)
+    return this->selectionList.back();
+
+//   WorldEntity* nearestEntity = this->;
+
+  for( int i = 0; i < this->selectionList.size(); i++)
+  {
+
+  }
+}
+
+
+/**
+ * called when an object is "selected"
+ *  @param damage damage to be dealt
+ *  @param killer the entity
+ */
+void AimingSystem::hit(float damage, WorldEntity* killer)
+{
+  this->selectionList.push_back(killer);
+}
+
+
 
 /**

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

@@ -7 +7 @@
 #define _AIMING_SYSTEM_H
 
-#include "p_node.h"
-#include "element_2d.h"
-#include "object_manager.h"
+
+#include "world_entity.h"
+
+
 
 // FORWARD DECLARATION
 class TiXmlElement;
+class BVTree;
+class Model;
 
 
-
-class AimingSystem : public PNode
+class AimingSystem : public WorldEntity
 {
 
@@ -30 +32 @@
   inline PNode* getTarget(PNode* target) { return this->getParent(); };
 
+  inline WorldEntity* getNearestTarget();
+
 
   void setRange(float range){this->range = range;};
-  void setGroup(OM_LIST group){this->group = group;};
 
+  void hit(float damage, WorldEntity* killer);
 
   virtual void tick(float dt);
@@ -40 +44 @@
 
  private:
-   float            range;                //!<
-   OM_LIST          group;
+   float                       range;                //!<
+   std::vector<WorldEntity*>   selectionList;        //!< the selections
+
 
 };