Changeset 9166 in orxonox.OLD for branches/presentation/src/world_entities/weapons

Timestamp:

Jul 4, 2006, 7:28:41 PM (18 years ago)

Author:

patrick

Message:

more aiming system work. nothing visible yet

Location:

branches/presentation/src/world_entities/weapons

Files:

• aiming_system.cc (modified) (4 diffs)
• aiming_system.h (modified) (1 diff)

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

@@ -21 +21 @@
 
 #include "state.h"
+
+#include "aabb.h"
 
 #include <vector>
@@ -55 +57 @@
   this->setClassID(CL_CROSSHAIR, "AimingSystem");
   this->setName("AimingSystem");
+
+  this->loadModel("models/guns/targeting_system_body.obj");
 }
 
@@ -78 +82 @@
  * @returns the nerest target
  */
-inline WorldEntity* AimingSystem::getNearestTarget()
+WorldEntity* AimingSystem::getNearestTarget()
 {
   if( this->selectionList.size() == 0)
@@ -132 +136 @@
 void AimingSystem::draw() const
 {
+//   if( this->getModelAABB() != NULL)
+//     this->getModelAABB()->drawBV(0, 1);
 }

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

@@ -32 +32 @@
   inline PNode* getTarget(PNode* target) { return this->getParent(); };
 
-  inline WorldEntity* getNearestTarget();
+  WorldEntity* getNearestTarget();