Changeset 9166 in orxonox.OLD for branches

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

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (6 diffs)
• world_entities/creatures/fps_player.h (modified) (1 diff)
• world_entities/weapons/aiming_system.cc (modified) (4 diffs)
• world_entities/weapons/aiming_system.h (modified) (1 diff)
• world_entities/world_entity.h (modified) (2 diffs)

branches/presentation/src/lib/collision_reaction/cr_object_damage.cc

@@ -56 +56 @@
   float damage = 0.0f;
 
-  PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
+  PRINTF(5)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
             collision->getEntityB()->getClassName());

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

@@ -32 +32 @@
 
 #include "aabb.h"
+
 
 #include "key_mapper.h"
@@ -90 +91 @@
   this->bJump = false;
   this->bPosBut = false;
+  this->bFire = false;
 
   this->xMouse = 0.0f;
@@ -143 +145 @@
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
 
+  this->aimingSystem = new AimingSystem();
+  this->addChild(this->aimingSystem);
+  this->aimingSystem->toList(OM_LIST(this->getOMListNumber() + 1));
+
 
   // network registration
@@ -245 +251 @@
 
 
-
-
-  Playable::tick( time );
+  this->getWeaponManager().tick(time);
+  if( this->bFire)
+  {
+    this->getWeaponManager().fire();
+
+    WorldEntity* target = this->aimingSystem->getNearestTarget();
+    if( target != NULL)
+    {
+      PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+    }
+    else
+    {
+      PRINTF(0)("nothing hit\n");
+    }
+  }
+
+
+
 
   if( ( xMouse != 0 || yMouse != 0 ) && (this->getOwner() == SharedNetworkData::getInstance()->getHostID() || !State::isOnline() ) )
@@ -407 +428 @@
   }
   else if( event.type == KeyMapper::PEV_JUMP)
+  {
     this->bJump = event.bPressed;
+  }
+  else if( event.type == KeyMapper::PEV_FIRE1)
+  {
+    this->bFire = event.bPressed;
+  }
 }
 
@@ -420 +447 @@
 {
   Playable::destroy( killer );
-  
+
   toList( OM_DEAD );
 }

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

@@ -48 +48 @@
     bool                  bJump;              //!< jumping
     bool                  bPosBut;             //!< position button
+    bool                  bFire;              //!< fire button
 
     float                 xMouse;             //!< mouse moved in x-Direction

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();
 
 

branches/presentation/src/world_entities/world_entity.h

@@ -75 +75 @@
   inline BVTree* getOBBTree() const { return this->obbTree; };
   void drawBVTree(int depth, int drawMode) const;
-  inline AABB* getModelAABB() { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
+  inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
 
   /* --- Collision Reaction Block --- */
@@ -198 +198 @@
   int                     list_write;                      //!< entity's list
   int                     list_handle;                     //!< handle for list changes
-  
+
   float                   health_write;
   int                     health_handle;
-  
+
   float                   healthMax_write;
   int                     healthMax_handle;