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

Timestamp:

Nov 21, 2009, 12:33:37 AM (14 years ago)

Author:

scheusso

Message:

made some changes in NewHumanController, Pawn, CE, Controller and WeaponMode preparing the synchronisation of clients target and aimPosition

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/NewHumanController.cc (modified) (6 diffs)

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

@@ -37 +37 @@
 #include "core/ConsoleCommand.h"
 #include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 #include "infos/PlayerInfo.h"
 #include "overlays/OrxonoxOverlay.h"
@@ -80 +81 @@
     void NewHumanController::tick(float dt)
     {
-        crossHairOverlay_->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize_/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize_/2));
+        if( !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));
+            this->crossHairOverlay_->show();
+        }
+        else
+            this->crossHairOverlay_->hide();
+        // TODO: update aimPosition of Pawn
 
         HumanController::tick(dt);
@@ -117 +125 @@
         }
 */
+        if( !NewHumanController::localController_s->getControllableEntity()->isInMouseLook() )
+            this->updateTarget();
 
         HumanController::localController_s->getControllableEntity()->fire(firemode);
     }
 
-    Vector3 NewHumanController::getTarget()
+    void NewHumanController::updateTarget()
     {
         Ogre::RaySceneQuery * rsq = HumanController::localController_s->getControllableEntity()->getScene()->getSceneManager()->createRayQuery(Ogre::Ray());
@@ -140 +150 @@
 
         Ogre::RaySceneQueryResult& result = rsq->execute();
+        Pawn* pawn = orxonox_cast<Pawn*>(this->getControllableEntity());
 
         Ogre::RaySceneQueryResult::iterator itr;
@@ -154 +165 @@
                         continue;
                 }
+                
+                this->getControllableEntity()->setTarget(wePtr);
 
                 itr->movable->getParentSceneNode()->showBoundingBox(true);
                 //std::cout << itr->movable->getParentSceneNode()->_getDerivedPosition() << endl;
-                return mouseRay.getOrigin() + mouseRay.getDirection() * itr->distance; //or itr->movable->getParentSceneNode()->_getDerivedPosition()
+                //return mouseRay.getOrigin() + mouseRay.getDirection() * itr->distance; //or itr->movable->getParentSceneNode()->_getDerivedPosition()
+                if ( pawn )
+                {
+                    pawn->setAimPosition( mouseRay.getOrigin() + mouseRay.getDirection() * itr->distance ); // or itr->movable->getParentSceneNode()->_getDerivedPosition()
+                    pawn->setTarget( wePtr );
+                }
+                return;
             }
 
         }
-
-        return mouseRay.getOrigin() + mouseRay.getDirection() * 1200;
+        if ( pawn )
+        {
+            pawn->setAimPosition( mouseRay.getOrigin() + mouseRay.getDirection() * 1200 );
+            pawn->setTarget( 0 );
+        }
+
+    //return mouseRay.getOrigin() + mouseRay.getDirection() * 1200;
+    
 
         //return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getWorldOrientation() * Vector3::NEGATIVE_UNIT_Z * 2000);
@@ -189 +214 @@
 
     void NewHumanController::changeMode() {
-        if (NewHumanController::localController_s->controlMode_ == 0)
-            NewHumanController::localController_s->controlMode_ = 1;
+        if (NewHumanController::localController_s && NewHumanController::localController_s->controlMode_ == 0)
+        {
+            if (NewHumanController::localController_s->controllableEntity_ && !NewHumanController::localController_s->controllableEntity_->isInMouseLook() )
+                NewHumanController::localController_s->controlMode_ = 1;
+        }
         else
             NewHumanController::localController_s->controlMode_ = 0;