Changeset 6111 for code/branches/presentation2

Timestamp:

Nov 21, 2009, 12:33:37 AM (15 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/Controller.h (modified) (1 diff)
• src/orxonox/controllers/NewHumanController.cc (modified) (6 diffs)
• src/orxonox/controllers/NewHumanController.h (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/presentation2/src/orxonox/controllers/Controller.h

@@ -54 +54 @@
             virtual void changedControllableEntity() {}
 
-            virtual bool canFindTarget()
-                { return false; }
-            virtual Vector3 getTarget()
-                { return Vector3::ZERO; }
-
         protected:
             // don't use this directly, use getPlayer()->startControl(entity) (unless you know exactly what you do)

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;

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

@@ -52 +52 @@
             static void changeMode();
 
-            virtual bool canFindTarget() { return true; }
-            virtual Vector3 getTarget();
-
         protected:
+            void updateTarget();
+            
             unsigned int                controlMode_;
             static NewHumanController* localController_s;

code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -202 +202 @@
             this->muzzlePosition_ = this->weapon_->getWorldPosition() + this->weapon_->getWorldOrientation() * this->muzzleOffset_;
 
-            Controller* controller = this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getController();
-            if (controller->canFindTarget())
-            {
-                Vector3 muzzleDirection(controller->getTarget() - this->muzzlePosition_);
-                this->muzzleOrientation_ = (this->weapon_->getWorldOrientation() * WorldEntity::FRONT).getRotationTo(muzzleDirection) * this->weapon_->getWorldOrientation();
+            Pawn* pawn = this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn();
+            Vector3 muzzleDirection;
+            if ( pawn->getTarget() )
+            {
+                muzzleDirection = pawn->getTarget()->getWorldPosition() - this->muzzlePosition_;
             }
             else
-                this->muzzleOrientation_ = this->weapon_->getWorldOrientation();
+                muzzleDirection = pawn->getAimPosition() - this->muzzlePosition_;
+//             COUT(0) << "muzzleDirection " << muzzleDirection << endl;
+                //this->muzzleOrientation_ = this->weapon_->getWorldOrientation();
+            this->muzzleOrientation_ = (this->weapon_->getWorldOrientation() * WorldEntity::FRONT).getRotationTo(muzzleDirection) * this->weapon_->getWorldOrientation();
         }
         else

code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h

@@ -145 +145 @@
             inline void setController(Controller* val)
                 { this->controller_ = val; }
+            
+            virtual void setTarget( WorldEntity* target )
+                { this->target_ = target; }
+            virtual WorldEntity* getTarget()
+                { return this->target_.get(); }
 
         protected:
@@ -209 +214 @@
             Controller* controller_;
             CameraPosition* reverseCamera_;
+            WeakPtr<WorldEntity> target_;
     };
 }

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -67 +67 @@
 
         this->spawnparticleduration_ = 3.0f;
+        
+        this->aimPosition_ = Vector3::ZERO;
 
         this->getPickups().setOwner(this);

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h

@@ -116 +116 @@
 
             virtual void startLocalHumanControl();
+            
+            void setAimPosition( Vector3 position )
+                { this->aimPosition_ = position; }
+            Vector3 getAimPosition()
+                { return this->aimPosition_; }
 
         protected:
@@ -146 +151 @@
             inline void setWeaponSystem(WeaponSystem* weaponsystem)
                 { this->weaponSystem_ = weaponsystem; }
+            
+            Vector3 aimPosition_;
     };
 }