gg.easy.airship 0.1.1821 → 0.1.1823

package/Runtime/Code/Player/Character/API/CharacterMovementData.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using UnityEditor.EditorTools;
+using UnityEngine;
 using UnityEngine.Serialization;
 
 namespace Code.Player.Character.API {
@@ -28,6 +29,9 @@ namespace Code.Player.Character.API {
 		public float accelerationForce = 1;
 		[Tooltip("How much to accelerate sprinting (units per second) when using acceleration movement or when going faster than the target speed")] [Min(0f)]
 		public float sprintAccelerationForce = 1.4f;
+		[Tooltip("If accelerating in a direction you are already moving, how much force can you still apply?")]
+		[Range(0,1)]
+		public float minAccelerationDelta = 0;
 
 		[Tooltip("Only allow sprinting forward.")]
 		public bool onlySprintForward = false;

package/Runtime/Code/Player/Character/CharacterAnimationHelper.cs

@@ -40,6 +40,7 @@ namespace Code.Player.Character {
         private Vector2 targetVelNormalized;
         private float verticalVel = 0;
         private float currentPlaybackSpeed = 0;
+        private float currentSpeed = 0;
         private bool firstPerson = false;
         private float lastStateTime = 0;
         private float targetPlaybackSpeed = 0;
@@ -131,9 +132,9 @@ namespace Code.Player.Character {
             //Blend directional influence
             float blendMod = targetMagnitude > currentMagnitude ? this.directionalBlendLerpMod : this.directionalBlendLerpMod /2f;
             currentVelNormalized = Vector2.MoveTowards(currentVelNormalized, targetVelNormalized, blendMod * Time.deltaTime);
-            animator.SetFloat("VelX",  Mathf.Abs(currentVelNormalized.x) < .01 ? 0 : currentVelNormalized.x);// * Mathf.Clamp01(currentPlaybackSpeed));
+            animator.SetFloat("VelX",  currentSpeed < .01 ? 0 : currentVelNormalized.x);// * Mathf.Clamp01(currentPlaybackSpeed));
             animator.SetFloat("VelY", Mathf.Lerp(animator.GetFloat("VelY"), verticalVel, Time.deltaTime*1.5f));
-            animator.SetFloat("VelZ", Mathf.Abs(currentVelNormalized.y) < .01 ? 0 : currentVelNormalized.y);// * Mathf.Clamp01(currentPlaybackSpeed));
+            animator.SetFloat("VelZ", currentSpeed < .01 ? 0 : currentVelNormalized.y);// * Mathf.Clamp01(currentPlaybackSpeed));
             animator.SetFloat("Speed", targetMagnitude);
 
             
@@ -166,7 +167,7 @@ namespace Code.Player.Character {
             } else if (currentState == CharacterState.Crouching) {
                 targetSpeed = 2.1233335f;
             }
-            var currentSpeed = new Vector2(localVel.x, localVel.z).magnitude;
+            currentSpeed = new Vector2(localVel.x, localVel.z).magnitude;
             //print("currentSpeed: " + currentSpeed + " targetSpeed: " + targetSpeed + " playbackSpeed: " + targetPlaybackSpeed);
             this.targetPlaybackSpeed = Mathf.Max(0, currentSpeed  / targetSpeed);
             targetVelNormalized = new Vector2(localVel.x, localVel.z).normalized;

package/Runtime/Code/Player/Character/CharacterMovement.cs

@@ -287,7 +287,6 @@ private void OnEnable() {
 			if (grounded && !prevGrounded) {
 				jumpCount = 0;
 				timeSinceBecameGrounded = 0f;
-				airborneFromImpulse = false;
 				this.OnImpactWithGround?.Invoke(currentVelocity);
 			} else {
 				timeSinceBecameGrounded = Math.Min(timeSinceBecameGrounded + deltaTime, 100f);
@@ -560,8 +559,9 @@ private void OnEnable() {
 
 			//Apply the impulse to the velocity
 			newVelocity += impulseVelocity;
+			airborneFromImpulse = !grounded || impulseVelocity.y > .01f;
+			print("gounded: " + grounded + " impulseVelocity: " + impulseVelocity);
 			impulseVelocity = Vector3.zero;
-			airborneFromImpulse = true;
 		}
 #endregion
 
@@ -674,35 +674,20 @@ private void OnEnable() {
 			//Instantly move at the desired speed
 			var moveMagnitude = characterMoveVelocity.magnitude;
 			var velMagnitude = flatVelocity.magnitude;
-			//var clampedIncrease = normalizedMoveDir * Mathf.Min(moveMagnitude, Mathf.Max(0, currentSpeed - velMagnitude));
-
 			
 			//Don't move character in direction its already moveing
 			//Positive dot means we are already moving in this direction. Negative dot means we are moving opposite of velocity.
-			//var rawDot = Vector3.Dot(flatVelocity/ currentSpeed, characterMoveVelocity/ currentSpeed);
+			//Multipy by 2 so perpendicular movement is still fully applied rather than half applied
 			var rawDot = Vector3.Dot(flatVelocity.normalized, normalizedMoveDir);
-			var dirDot = Mathf.Clamp01(1-rawDot);
+			var dirDot = Mathf.Max(moveData.minAccelerationDelta, Mathf.Clamp01((1-rawDot)*2));
 			
 			if(useExtraLogging){
 				print("old vel: " + currentVelocity + " new vel: " + newVelocity + " move dir: " + characterMoveVelocity + " Dir dot: " + dirDot + " currentSpeed: " + currentSpeed + " grounded: " + grounded + " canJump: " + canJump + " didJump: " + didJump);
 			}
-	
-			if (inAir){
-				//clampedIncrease *= moveData.airSpeedMultiplier;
-			}
-
-			if(_flying || (velMagnitude < (moveData.useAccelerationMovement?currentSpeed:Mathf.Max(moveData.sprintSpeed, currentSpeed) + 1) && !isImpulsing)){
-				// if(clampedIncrease.x < 0){
-				// 	clampedIncrease.x = Mathf.Max(clampedIncrease.x, newVelocity.x + clampedIncrease.x);
-				// }else{
-				// 	clampedIncrease.x = Mathf.Min(clampedIncrease.x, newVelocity.x + clampedIncrease.x);
-				// }
-				// if(clampedIncrease.z < 0){
-				// 	clampedIncrease.z = Mathf.Max(clampedIncrease.z, newVelocity.z + clampedIncrease.z);
-				// }else{
-				// 	clampedIncrease.z = Mathf.Min(clampedIncrease.z, newVelocity.z + clampedIncrease.z);
-				// }
-				
+			print("airborneFromImpulse: " + airborneFromImpulse);
+			if(_flying || //In Fly mode OR
+				(!isImpulsing && !airborneFromImpulse && //Not impulsing AND under our max speed
+						(velMagnitude < (moveData.useAccelerationMovement?currentSpeed:Mathf.Max(moveData.sprintSpeed, currentSpeed) + 1)))){
 				if(moveData.useAccelerationMovement){
 					newVelocity += characterMoveVelocity;
 				}else{
@@ -710,21 +695,10 @@ private void OnEnable() {
 					newVelocity.z = characterMoveVelocity.z;
 				}
 			}else{
-				//dirDot = dirDot - 1 / 2;
-				//clampedIncrease *= -Mathf.Min(0, dirDot-1);
+				//Moving faster than max speed or using acceleration mode
 				newVelocity += normalizedMoveDir * (dirDot * dirDot / 2) * 
 					(groundedState == CharacterState.Sprinting ? this.moveData.sprintAccelerationForce : moveData.accelerationForce);
 			}
-			//characterMoveVelocity = clampedIncrease;
-			// if(Mathf.Abs(newVelocity.x) < Mathf.Abs(characterMoveVelocity.x)){
-			// 	newVelocity.x = characterMoveVelocity.x;
-			// }
-			// if(Mathf.Abs(newVelocity.y) < Mathf.Abs(characterMoveVelocity.y)){
-			// 	newVelocity.y = characterMoveVelocity.y;
-			// }
-			// if(Mathf.Abs(newVelocity.z) < Mathf.Abs(characterMoveVelocity.z)){
-			// 	newVelocity.z = characterMoveVelocity.z;
-			// }
 
 			//print("isreplay: " + replaying + " didHitForward: " + didHitForward + " moveVec: " + characterMoveVector + " colliderDot: " + colliderDot  + " for: " + forwardHit.collider?.gameObject.name + " point: " + forwardHit.point);
 #endregion
@@ -769,8 +743,10 @@ private void OnEnable() {
 			var canStopVel = !airborneFromImpulse && (!inAir || moveData.useMinimumVelocityInAir) && !isImpulsing;
 			var notTryingToMove = normalizedMoveDir.sqrMagnitude < .1f;
 			var underMin = physics.GetFlatDistance(Vector3.zero, newVelocity) <= moveData.minimumVelocity;
+			//print("airborneFromImpulse: " + airborneFromImpulse + " unerMin: " +underMin + " notTryingToMove: " + notTryingToMove);
 			if(canStopVel && notTryingToMove && underMin){
 				//Not intending to move so snap to zero (Fake Dynamic Friction)
+				//print("STOPPING VELOCITY");
 				newVelocity.x = 0;
 				newVelocity.z = 0;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.1821",
+  "version": "0.1.1823",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",