Merge pull request #552 from aws-lumberyard-dev/physx_fix_tests

Physx fix tests C18243589_Joints_BallSoftLimitsConstrained and C5932042_PhysXForceRegion_LinearDamping

AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py

@@ -57,6 +57,7 @@ def C18243589_Joints_BallSoftLimitsConstrained():
     """
     import os
     import sys
+    import math
 
     import ImportPathHelper as imports
 
@@ -95,13 +96,33 @@ def C18243589_Joints_BallSoftLimitsConstrained():
     Report.info_vector3(follower.position, "follower initial position:")
     leadInitialPosition = lead.position
     followerInitialPosition = follower.position
-
+    
-    # 4) Wait for several seconds
+    followerMovedAboveJoint = False
-    general.idle_wait(1.0) # wait for lead and follower to move
+    #calculate  the start vector from follower and lead positions
+    normalizedStartPos = JointsHelper.getRelativeVector(lead.position, follower.position)
+    normalizedStartPos = normalizedStartPos.GetNormalizedSafe()
+    #the targeted angle to reach between the initial vector and the current follower-lead vector
+    TARGET_ANGLE_DEG = 45
+    targetAngle = math.radians(TARGET_ANGLE_DEG)
+    angleAchieved = 0.0
+
+    def checkAngleMet():
+        #calculate the current follower-lead vector
+        normalVec = JointsHelper.getRelativeVector(lead.position, follower.position)
+        normalVec = normalVec.GetNormalizedSafe()
+        #dot product + acos to get the angle
+        angleAchieved = math.acos(normalizedStartPos.Dot(normalVec))
+        #is it above target?
+        return angleAchieved > targetAngle
+
+    MAX_WAIT_TIME = 2.0 #seconds
+    followerMovedAboveJoint = helper.wait_for_condition(checkAngleMet, MAX_WAIT_TIME)
 
     # 5) Check to see if lead and follower behaved as expected
-    Report.info_vector3(lead.position, "lead position after 1 second:")
+    Report.info_vector3(lead.position, "lead position:")
-    Report.info_vector3(follower.position, "follower position after 1 second:")
+    Report.info_vector3(follower.position, "follower position:")
+    angleAchievedDeg = math.degrees(angleAchieved)
+    Report.info(f"Angle achieved {angleAchievedDeg:.2f} Target {TARGET_ANGLE_DEG:.2f}")
 
     leadPositionDelta = lead.position.Subtract(leadInitialPosition)
     leadRemainedStill = JointsHelper.vector3SmallerThanScalar(leadPositionDelta, FLOAT_EPSILON)
@@ -111,7 +132,6 @@ def C18243589_Joints_BallSoftLimitsConstrained():
     followerMovedinXYZ = JointsHelper.vector3LargerThanScalar(followerPositionDelta, FLOAT_EPSILON)
     Report.critical_result(Tests.check_follower_position, followerMovedinXYZ)
 
-    followerMovedAboveJoint = follower.position.z > (followerInitialPosition.z + 2.5) # (followerInitialPosition.z + 2.5) is the z position past the 45 degree limit. This is to show that the follower swinged past the 45 degree cone limit, above the joint position.
     Report.critical_result(Tests.check_follower_above_joint, followerMovedAboveJoint)
 
     # 6) Exit Game Mode

AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py

@@ -135,7 +135,7 @@ def C5932042_PhysXForceRegion_LinearDamping():
 
     # Constants
     CLOSE_ENOUGH = 0.001
-    TIME_OUT = 2.0
+    TIME_OUT = 3.0
     INITIAL_VELOCITY = azmath.Vector3(0.0, 0.0, -10.0)
 
     # 1) Open level / Enter game mode

AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py

@@ -27,6 +27,13 @@ def vector3LargerThanScalar(vec3Value, scalarValue):
         vec3Value.y > scalarValue and 
         vec3Value.z > scalarValue)
 
+def getRelativeVector(vecA, vecB):
+    relativeVec = vecA
+    relativeVec.x = relativeVec.x - vecB.x
+    relativeVec.y = relativeVec.y - vecB.y
+    relativeVec.z = relativeVec.z - vecB.z
+    return relativeVec
+
 
 # Entity class for joints tests
 class JointEntity:

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py

@@ -254,6 +254,8 @@ class TestAutomation(TestAutomationBase):
         from . import C4044697_Material_PerfaceMaterialValidation as test_module
         self._run_test(request, workspace, editor, test_module)
 
+    @pytest.mark.xfail(
+        reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.")
     @revert_physics_config
     def test_C4976202_RigidBody_StopsWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform):
         from . import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module
@@ -468,12 +470,12 @@ class TestAutomation(TestAutomationBase):
         from . import C6090547_ForceRegion_ParentChildForceRegions as test_module
         self._run_test(request, workspace, editor, test_module)
         
-        @revert_physics_config
+    @revert_physics_config
     def test_C19578021_ShapeCollider_CanBeAdded(self, request, workspace, editor, launcher_platform):
         from . import C19578021_ShapeCollider_CanBeAdded as test_module
         self._run_test(request, workspace, editor, test_module)
         
-        @revert_physics_config
+    @revert_physics_config
     def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
         from . import C15425929_Undo_Redo as test_module
         self._run_test(request, workspace, editor, test_module)