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

Timestamp:

Nov 29, 2015, 6:36:21 PM (8 years ago)

Author:

gania

Message:

started working on pickups

File:

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

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

@@ -172 +172 @@
         }
     }
-    
+    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, Vector3& diffUnit)
     {
@@ -179 +203 @@
         float x = CommonController::randomInRange (100, 800) * (CommonController::randomInRange(0,1) <= 0.5 ? 1 : -1);
         float y = CommonController::randomInRange (100, 800) * (CommonController::randomInRange(0,1) <= 0.5 ? 1 : -1);
-        float z = (1/diffUnit.z) * (-x * diffUnit.x - y * diffUnit.y);
+        float z = diffUnit.z == 0 ? 0 : (1/diffUnit.z) * (-x * diffUnit.x - y * diffUnit.y);
         this->setTargetPosition(thisPosition + Vector3(x,y,z) + (this->deltaHp < 0 ? -diffUnit * 450.0f : diffUnit * 100.0f));
         this->boostControl();