Changeset 6112 for code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

Timestamp:

Nov 21, 2009, 12:57:06 AM (14 years ago)

Author:

scheusso

Message:

first attempts to have synchronised fire direction and target
however client cannot select targets yet (probably because of classtreemask hack)

File:

• code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

@@ -81 +81 @@
     void NewHumanController::tick(float dt)
     {
-        if( !this->controllableEntity_->isInMouseLook() )
+        if( this->controllableEntity_ && !this->controllableEntity_->isInMouseLook() )
         {
             this->crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
@@ -185 +185 @@
             pawn->setTarget( 0 );
         }
-
-    //return mouseRay.getOrigin() + mouseRay.getDirection() * 1200;