Changeset 10923 for code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc

Timestamp:

Dec 7, 2015, 8:34:20 AM (8 years ago)

Author:

gania

Message:

check in

File:

• code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) (7 diffs)

code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc

@@ -63 +63 @@
     void FightingController::lookAtTarget(float dt)
     {
+        if (!this || !this->getControllableEntity())
+            return;
         ControllableEntity* entity = this->getControllableEntity();
         if ( !entity )
@@ -126 +128 @@
         float diffLength = diffVector.length();
         Vector3 diffUnit = diffVector/diffLength;
-        bool bTargetIsLookingAtThis = CommonController::isLooking (this->target_, this->getControllableEntity(), math::pi/10.0f)
-            || this->deltaHp < 0;
+
+        if (!this || !this->getControllableEntity())
+            return;
 
         //too far? well, come closer then
@@ -139 +142 @@
         }
         else
-        {
+        {   
+            bool bTargetIsLookingAtThis = CommonController::isLooking (this->target_, this->getControllableEntity(), math::pi/10.0f)
+                || this->deltaHp < 0;
             this->bKeepFormation_ = false;
+
+            if (!this || !this->getControllableEntity())
+                return;
             // if (this->actionCounter_ % 3 == 0)
             if (maneuverCounter_ <= 1.2)
@@ -173 +181 @@
             }
         }
-        /*//too close? How do u expect to dodge anything? Just attack!
-        else if (diffLength < 1000)
-        {   
-            this->bKeepFormation_ = false;
-
-            //at this point, just look and shoot
-            if (diffLength < 1000)
-            {
-                this->stopMoving();
-                this->startLookingAtTarget();
-
-            }
-            else
-            {
-                this->setTargetPosition(this->positionOfTarget_ - diffUnit * 300.0f);
-            }
-        }
-        //Good distance? Check if target looks at us. It doesn't? Go hunt!
-        else if (!bTargetIsLookingAtThis)
-        {
-            this->bKeepFormation_ = false;
-            this->setTargetPosition(this->positionOfTarget_ - diffUnit * 900.0f);
-        }
-        //That's unfortunate, he is looking and probably shooting... try to dodge what we can...  
-        else 
-        {   
-            this->bKeepFormation_ = false;
-            if (maneuverCounter_ == 0)
-            {
-                this->setTargetPosition(this->positionOfTarget_ - diffUnit * 900.0f);   
-                return;
-            }
-            if (this->actionCounter_ % 3 == 0)
-                dodge(thisPosition, diffLength, diffUnit);
-        }*/
-    }
-    void FightingController::dodgeTowards (Vector3& position)
-    {
-        Vector3 thisPosition = this->getControllableEntity()->getPosition();
-        Vector3 diff = (position - thisPosition);
-        float diffLength = diff.length();
-        Vector3 diffUnit = diff/diffLength;
-        float factor = 300.0f;
-        if (diffLength < 300)
-        {
-            this->setTargetPosition(position);
-            return;    
-        }
-        else if (diffLength < 600)
-            factor = 400.0f;
-        else if (diffLength < 1000)
-            factor = 700.0f;
-        else
-            factor = 1000.0f;
-        float x = CommonController::randomInRange (400, 800) * (CommonController::randomInRange(0,1) <= 0.5 ? 1 : -1);
-        float y = CommonController::randomInRange (400, 800) * (CommonController::randomInRange(0,1) <= 0.5 ? 1 : -1);
-        float z = diffUnit.z == 0 ? 0 : (1/diffUnit.z) * (-x * diffUnit.x - y * diffUnit.y);
-        this->setTargetPosition(thisPosition + Vector3(x,y,z) + diffUnit * factor);
-        // orxout(internal_error) << "Dodging towards " << Vector3(x,y,z)  << endl;
-        this->boostControl();
-    }
+    }
+    
     void FightingController::dodge(const Vector3& thisPosition, float diffLength, Vector3& diffUnit)
     {
@@ -257 +206 @@
     {
         //no target? why fire?
-        if (!this->target_)
+        if (!this->target_ || !this->getControllableEntity())
             return false;
         Vector3 newPositionOfTarget = getPredictedPosition(this->getControllableEntity()->getWorldPosition(), 
@@ -274 +223 @@
     float FightingController::squaredDistanceToTarget()  const
     {
-        if (!this->getControllableEntity())
+        if (!this || !this->getControllableEntity())
             return 0;
         if (!this->target_ || !this->getControllableEntity())
@@ -294 +243 @@
     Pawn* FightingController::closestTarget() const
     {
-        if (!this->getControllableEntity())
+        if (!this || !this->getControllableEntity())
             return 0;