Commit: d4381efdd2f061ad49774af2a557996f01d34dbf - HotshotIOS (hg)

Commit MetaInfo

• Revision: d4381efdd2f061ad49774af2a557996f01d34dbf (tree)
• Zeit: 2021-05-06 18:26:08
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Fixed AI limits reached turn around.

Ändern Zusammenfassung

• modified: core/src/headwayent/blackholedarksun/physics/EntityContactListener.java
• modified: core/src/headwayent/blackholedarksun/systems/AISystem.java

Diff

diff -r 2493ad6671f9 -r d4381efdd2f0 core/src/headwayent/blackholedarksun/physics/EntityContactListener.java
--- a/core/src/headwayent/blackholedarksun/physics/EntityContactListener.java	Wed May 05 23:33:43 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/physics/EntityContactListener.java	Thu May 06 12:26:08 2021 +0300
@@ -100,6 +100,7 @@
             // Set the AI to turn around its ship.
             InvisibleWallRigidBody invisibleWallRigidBody = (InvisibleWallRigidBody) nextColObj;
             invisibleWallRigidBody.getInvisibleWall().getWallType().getLimitReached(entityProperties.getLimitsReachedOriginal());
+            System.out.println("Level limit: " + entityProperties.getLimitsReached() + " reached");
         }
 
         return entityDestroyed;

diff -r 2493ad6671f9 -r d4381efdd2f0 core/src/headwayent/blackholedarksun/systems/AISystem.java
--- a/core/src/headwayent/blackholedarksun/systems/AISystem.java	Wed May 05 23:33:43 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/systems/AISystem.java	Thu May 06 12:26:08 2021 +0300
@@ -106,9 +106,12 @@
     private final ENG_Vector4D patrolingRotationAxis = new ENG_Vector4D();
     private final ENG_ClosestObjectData data = new ENG_ClosestObjectData();
     private final ENG_Vector4D levelLimits = new ENG_Vector4D();
+    private final ENG_Vector4D currentLevelLimits = new ENG_Vector4D();
     private final ENG_Vector4D awayFromLimitsPos = new ENG_Vector4D();
     private final ENG_Vector4D destination = new ENG_Vector4D(true);
     private final float updateInterval;
+    private boolean rotationAwayFromLimitsCompleted = true;
+    private boolean awayFromLimitsPosSet;
 //    private float beginTime;
 
     public AISystem(double interval) {
@@ -884,7 +887,9 @@
 
     private void evadeLevelLimits(AIProperties aiProperties, EntityProperties entityProperties, ShipProperties shipProperties) {
         entityProperties.getLimitsReached(levelLimits);
-        if (levelLimits.equals(ENG_Math.VEC4_ZERO)) {
+        // Even if we are no longer touching the level limits we must still complete
+        // the turn around.
+        if (levelLimits.equals(ENG_Math.VEC4_ZERO) && rotationAwayFromLimitsCompleted) {
             aiProperties.setState(AIState.SEEK_CLOSEST_PLAYER);
             showAIStateChange(shipProperties, aiProperties);
         } else {
@@ -892,25 +897,40 @@
             // will end up with previous limits never going away since they are
             // only additive in EntityContactListener.
             entityProperties.resetLimitsReached();
-            levelLimits.invert(awayFromLimitsPos);
-            float angleBetween = currentFrontVec.angleBetween(awayFromLimitsPos);
+            // If we have new level limits should we check and recreate awayFromLimitsPos?
+            if  (awayFromLimitsPosSet && !levelLimits.equals(currentLevelLimits)) {
+                System.out.println("levelLimits: " + levelLimits + " currentLevelLimits: " + currentLevelLimits);
+            }
+            if (!awayFromLimitsPosSet) {
+                levelLimits.invert(awayFromLimitsPos);
+                currentLevelLimits.set(levelLimits);
+                // First slow down to 0 then rotate away.
+                entityProperties.setVelocity(0.0f);
+                awayFromLimitsPosSet = true;
+                rotationAwayFromLimitsCompleted = false;
+            }
+
 //            awayFromLimitsPos.addInPlace(entityProperties.getNode().getPosition());
             entityProperties.getNode().getPosition(currentPos);
             entityProperties.getNode().getLocalInverseZAxis(currentFrontVec);
 //            entityProperties.getNode().getLocalYAxis(currentUpVec);
 
-            // First slow down to 0 then rotate away.
-            entityProperties.setVelocity(0.0f);
+            float angleBetween = currentFrontVec.angleBetween(awayFromLimitsPos);
+
+
 //            ENG_Math.rotateTowardPositionDeg(awayFromLimitsPos, currentPos, currentFrontVec, currentUpVec, rotation, getRotationAngle(shipProperties));
 //            entityProperties.rotate(rotation, true, TransformSpace.TS_WORLD);
-            Utility.rotateToPosition(currentFrontVec,
-                    awayFromLimitsPos,
-                    updateInterval, entityProperties,
-                    shipProperties.getShipData().maxAngularVelocity);
+            rotateTowardPosition(entityProperties, shipProperties, awayFromLimitsPos);
+//            Utility.rotateToPosition(currentFrontVec,
+//                    awayFromLimitsPos,
+//                    updateInterval, entityProperties,
+//                    shipProperties.getShipData().maxAngularVelocity);
 
 
 
             if (angleBetween < ESCAPE_LEVEL_LIMITS_ANGLE) {
+                rotationAwayFromLimitsCompleted = true;
+                awayFromLimitsPosSet = false;
                 // Also get to max speed
                 changeVelocity(entityProperties, shipProperties, aiProperties, new VelocityChange(
                         VELOCITY_CHANGE_NAME_ESCAPING_LIMITS,