Add damping to AIPlayer steering

adrenak · Jul 8, 2019 · da814b5 · da814b5
1 parent 6d34f45
commit da814b5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Assets/Adrenak/Tork/AI/Demo/AIDemo.unity b/Assets/Adrenak/Tork/AI/Demo/AIDemo.unity
@@ -2343,7 +2343,7 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1424718895}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 17.84, y: 0, z: 50.68}
+  m_LocalPosition: {x: 22.45, y: 1.6846727, z: 16.56}
   m_LocalScale: {x: 2.254064, y: 2.2540638, z: 2.2540638}
   m_Children: []
   m_Father: {fileID: 0}

diff --git a/Assets/Adrenak/Tork/AI/Demo/Scripts/AIDemo.cs b/Assets/Adrenak/Tork/AI/Demo/Scripts/AIDemo.cs
@@ -12,6 +12,7 @@ void Start() {
 			vehicle.SetPlayer(ai);
 
 			ai.destination = destination;
+			ai.steerDamping = .5f;
 
 			follow.target = vehicle.transform;
 		}

diff --git a/Assets/Adrenak/Tork/AI/Scripts/AIPlayer.cs b/Assets/Adrenak/Tork/AI/Scripts/AIPlayer.cs
@@ -3,15 +3,18 @@
 namespace Adrenak.Tork {
 	[RequireComponent(typeof(Steering))]
 	public class AIPlayer : Player {
-		enum Direction {
+		public enum Direction {
 			Forward,
 			Reverse
 		}
 
 		public Transform destination;
-		Direction m_Direction = Direction.Forward;
+		public Direction m_Direction = Direction.Forward;
+		public float steerDamping = .5f;
+
 		Vehicle m_Vehicle;
 		Steering m_Steering;
+		float lastSteer;
 
 		bool m_IsInTurningCircle;
 
@@ -20,12 +23,15 @@ void Start() {
 			m_Steering = GetComponent<Steering>();
 		}
 
+		public bool isBehind;
+		public bool isInCircle;
+
 		public override VehicleInput GetInput() {
 			var towards = destination.position - transform.position;
 			var locTowards = transform.InverseTransformDirection(towards);
 			var angle = Vector3.Angle(transform.forward, towards) * Mathf.Sign(locTowards.x);
 			bool isTargetOnRight = Mathf.Sign(locTowards.x) > 0;
-			bool isBehind = Vector3.Dot(towards, transform.forward) < 0;
+			isBehind = Vector3.Dot(towards, transform.forward) < 0;
 
 			// Get radii at the maximum steering angle
 			// This gives is the smallest turning radius the car can have
@@ -46,14 +52,15 @@ public override VehicleInput GetInput() {
 			if (isPivotOnRight != isTargetOnRight)
 				localPivot.x *= -1;
 			pivot = transform.TransformPoint(localPivot);
-			var isInCircle = (destination.position - pivot).magnitude < avgRadius;
+			isInCircle = (destination.position - pivot).magnitude < avgRadius;
 
 			switch (m_Direction) {
 				case Direction.Forward:
 					Debug.DrawLine(transform.position, pivot, Color.green);
 					p_Input.acceleration = 1;
 					p_Input.brake = 0;
 					p_Input.steering = Mathf.Clamp(angle / m_Steering.range, -1, 1);
+					lastSteer = p_Input.steering;
 					if (isBehind && isInCircle)
 						m_Direction = Direction.Reverse;
 					break;
@@ -62,6 +69,9 @@ public override VehicleInput GetInput() {
 					p_Input.acceleration = -1;
 					p_Input.brake = 0;
 					p_Input.steering = Mathf.Clamp(angle / m_Steering.range, -1, 1) * (isTargetOnRight ? -1 : 1);
+					lastSteer = p_Input.steering;
+
+
 					if (!isBehind && !isInCircle)
 						m_Direction = Direction.Forward;
 					break;

diff --git a/Assets/Adrenak/Tork/Physics/Scripts/Vehicle.cs b/Assets/Adrenak/Tork/Physics/Scripts/Vehicle.cs
@@ -52,8 +52,8 @@ void Update() {
 
 			m_Steering.value = input.steering;
 			m_Motor.value = input.acceleration;
-			m_Aerodynamics.midAirSteerInput = input.steering;
 			m_Brake.value = input.brake;
+			m_Aerodynamics.midAirSteerInput = input.steering;
 		}
 
 		public float GetMotorTorqueAtSpeed(float speed) {