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

Timestamp:

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

Author:

patrick

Message:

more aiming system work. nothing visible yet

Location:

branches/presentation/src/world_entities/creatures

Files:

• fps_player.cc (modified) (6 diffs)
• fps_player.h (modified) (1 diff)

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