gg.easy.airship 0.1.1663 → 0.1.1665

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

@@ -4,6 +4,8 @@ using UnityEngine.Serialization;
 namespace Code.Player.Character.API {
 	[LuauAPI]
 	public class CharacterMovementData : MonoBehaviour {
+
+
 		[Header("Size")]
 		[Tooltip("How tall is the character")] [Min(.01f)]
 		public float characterHeight = 1.8f;
@@ -11,8 +13,6 @@ namespace Code.Player.Character.API {
 		[Tooltip("Radius of the character")] [Min(.01f)]
 		public float characterRadius = .2f;
 
-		/*[Tooltip("Default movement speed (units per second)")] [Min(0f)]
-		public float colliderHeightOffset = .15f;*/
 
 		[Header("Movement")]
 		[Tooltip("Should movement be applied over time as a force? Or a constant speed.")]
@@ -21,26 +21,30 @@ namespace Code.Player.Character.API {
 		[Tooltip("Default movement speed (units per second)")] [Min(0f)]
 		public float speed = 4.666667f;
 
-
 		[Tooltip("Sprint movement speed (units per second)")] [Min(0f)]
 		public float sprintSpeed = 6.666667f;
 
-		[Tooltip("How much to multiply speed while you are in the air")] [Range(0,2f)]
-		public float airSpeedMultiplier = 1;
-
 		[Tooltip("Only allow sprinting forward.")]
 		public bool onlySprintForward = false;
 
+
 		[Header("Crouch")]
 		[Tooltip("Auto crouch will make the character crouch if they walk into a small area")]
 		public bool autoCrouch = true;
 
+		[Tooltip("While crouching, prevent falling of ledges")]
+		public bool preventFallingWhileCrouching = true;
+
+		[Tooltip("While crouching dont step up onto ledges")]
+		public bool preventStepUpWhileCrouching = true;
+
 		[Tooltip("Crouching speed is determined by multiplying the speed against this number")] [Range(0f, 1f)]
 		public float crouchSpeedMultiplier = 0.455f;
 
 		[Tooltip("Character height multiplier when crouching (e.g. 0.75 would be 75% of normal character height)")] [Range(0.15f, 1f)]
 		public float crouchHeightMultiplier = 0.75f;
 
+
 		[Header("Jump")]
 		[Tooltip("How many jumps you can make before hitting the ground again")] [Min(0f)]
 		public int numberOfJumps = 1;
@@ -51,6 +55,7 @@ namespace Code.Player.Character.API {
 		[Tooltip("The time after falling that the player can still jump")] [Min(0f)]
 		public float jumpCoyoteTime = 0.14f;
 
+
 		[Header("Fly")]
 		[Tooltip("Flying speed is determined by multiplying the speed against this number")]
 		public float flySpeedMultiplier = 3.5f;
@@ -67,6 +72,7 @@ namespace Code.Player.Character.API {
 		[Tooltip("Minimum interval (in seconds) between jumps, measured from the time the player became grounded")] [Min(0f)]
 		public float jumpUpBlockCooldown = 0.4f;
 
+
 		[Header("Gravity")]
 		[Tooltip("Apply Physics.gravity force every tick")]
 		public bool useGravity = true;
@@ -78,7 +84,11 @@ namespace Code.Player.Character.API {
 		[Tooltip("Use this to adjust gravity while moving in the +Y. So you can have floaty jumps upwards but still have hard drops downward")]
 		public float upwardsGravityMultiplier = 1;
 
+
 		[Header("Physics")]
+		[Tooltip("Push the character away from walls to prevent rigibody friction")]
+		public bool preventWallClipping = true;
+
 		[Tooltip("What layers will count as walkable ground")]
 		public LayerMask groundCollisionLayerMask = 1 << 0 | 1 << 8 | 1 << 11; // Layers Default, VisuallyHidden and VoxelWorld
 
@@ -88,16 +98,6 @@ namespace Code.Player.Character.API {
 		public float minimumVelocity = 1;
 		[Tooltip("Also stop momentum when in the air")]
 		public bool useMinimumVelocityInAir = false;
-		
-		[Tooltip("The maximum force that pushes against the character when on a slope")] [Min(0f)]
-		public float slopeForce = 45;
-
-		[Tooltip("Slopes below this threshold will be ignored. O is flat ground, 1 is a vertical wall")]
-		[Range(0,1)]
-		public float minSlopeDelta = .1f;
-		[Tooltip("Slopes above this threshold will be treated as walls")]
-		[Range(0,1)]
-		public float maxSlopeDelta = .3f;
 
 		[Tooltip("How high in units can you auto step up")] 
 		[Range(.05f, 1)]
@@ -114,12 +114,11 @@ namespace Code.Player.Character.API {
 		[Tooltip("How much to multiply drag resistance while you are in the air")] [Range(0,2f)]
 		public float airDragMultiplier = 1;
 
+		[Tooltip("How much to multiply speed while you are in the air")] [Range(0,2f)]
+		public float airSpeedMultiplier = 1;
 
-		[Header("Movement Modes")]
-
-		[Tooltip("Auto detect slopes to create a downward drag. Disable as an optimization to skip raycast checks")]
-		public bool detectSlopes = false;
 
+		[Header("Step Ups")]
 		[Tooltip("Push the character up when they stop over a set threshold")]
 		public bool detectStepUps = true;
 		[Tooltip("Step the character up every frame if it theres nothing to push up to")]
@@ -128,10 +127,19 @@ namespace Code.Player.Character.API {
 		[Tooltip("While in the air, if you are near an edge it will push you up to the edge. Requries detectStepUps to be on")]
 		public bool assistedLedgeJump = true;
 
-		[Tooltip("Push the character away from walls to prevent rigibody friction")]
-		public bool preventWallClipping = true;
 
-		[Tooltip("While crouching, prevent falling of ledges")]
-		public bool preventFallingWhileCrouching = true;
+		[Header("Slopes")]
+		[Tooltip("Auto detect slopes to create a downward drag. Disable as an optimization to skip raycast checks")]
+		public bool detectSlopes = false;
+
+		[Tooltip("The maximum force that pushes against the character when on a slope")] [Min(0f)]
+		public float slopeForce = 45;
+
+		[Tooltip("Slopes below this threshold will be ignored. O is flat ground, 1 is a vertical wall")]
+		[Range(0,1)]
+		public float minSlopeDelta = .1f;
+		[Tooltip("Slopes above this threshold will be treated as walls")]
+		[Range(0,1)]
+		public float maxSlopeDelta = .3f;
 	}
 }

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

@@ -6,7 +6,6 @@ namespace Code.Player.Character.API {
 	public class CharacterPhysics {
 		private const float offsetMargin = .02f;
 		private const float gizmoDuration = 1f;
-		private const bool renderGroundGizmos = true;
 
 		private CharacterMovement movement;
 		private Vector3 uniformHalfExtents;
@@ -75,12 +74,11 @@ namespace Code.Player.Character.API {
 		
 	#region RAYCASTS
 		public (bool isGrounded, RaycastHit hit, bool detectedGround) CheckIfGrounded(Vector3 currentPos, Vector3 vel, Vector3 moveDir) {
-			// Fallthrough - do raycast to check for PrefabBlock object below:
 			var intersectionMargin = .075f;
 			var castDistance = .2f;
 			var castStartPos = currentPos;
 			//Move the start position up
-			castStartPos.y += castDistance-intersectionMargin;
+			castStartPos.y += castDistance-offsetMargin;
 			//Extend the ray further if you are falling faster
 			castDistance += Mathf.Max(0, -vel.y);// Mathf.Min(0, movement.transform.InverseTransformVector(vel).y); //Need this part of we change gravity dir
 			
@@ -89,9 +87,9 @@ namespace Code.Player.Character.API {
 
 			//Check directly below character as an early out and for comparison information
 			if(Physics.Raycast(castStartPos, gravityDir, out var rayHitInfo, castDistance, movement.moveData.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)){
-				if(movement.drawDebugGizmos && renderGroundGizmos){
-					//GizmoUtils.DrawLine(castStartPos, castStartPos+gravityDir*castDistance, Color.gray, gizmoDuration);
-					//GizmoUtils.DrawSphere(rayHitInfo.point, .05f, Color.red, 4, gizmoDuration);
+				if(movement.drawDebugGizmos_GROUND){
+					GizmoUtils.DrawLine(castStartPos, castStartPos+gravityDir*castDistance, Color.gray, gizmoDuration);
+					GizmoUtils.DrawSphere(rayHitInfo.point, .05f, Color.red, 4, gizmoDuration);
 				}
 				
 				if(!this.ignoredColliders.ContainsKey(rayHitInfo.collider.GetInstanceID())){
@@ -101,24 +99,24 @@ namespace Code.Player.Character.API {
 			
 			//Extend the casting for the box
 			var verticalExtents = .05f;
-			var extents = uniformHalfExtents;
+			var extents = uniformHalfExtents*.98f;
 			extents.y = verticalExtents;
 			castStartPos.y += verticalExtents;
 			castDistance += verticalExtents;
 
-			if(movement.drawDebugGizmos && renderGroundGizmos){
-				//GizmoUtils.DrawBox(castStartPos, Quaternion.identity, extents, Color.magenta, gizmoDuration);
-				//GizmoUtils.DrawBox(castStartPos+gravityDir*castDistance, Quaternion.identity, extents, Color.magenta, gizmoDuration);
+			if(movement.drawDebugGizmos_GROUND){
+				GizmoUtils.DrawBox(castStartPos, Quaternion.identity, extents, Color.magenta, gizmoDuration);
+				GizmoUtils.DrawBox(castStartPos+gravityDir*castDistance, Quaternion.identity, extents, Color.magenta, gizmoDuration);
 			}
 
 			//Check down around the entire character
 			if (Physics.BoxCast(castStartPos, extents, gravityDir, out var hitInfo, Quaternion.identity, castDistance, movement.moveData.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)) {
-				if(movement.drawDebugGizmos && renderGroundGizmos){
-					//GizmoUtils.DrawSphere(hitInfo.point + gravityDirOffset, .05f, Color.red, 4, gizmoDuration);
+				if(movement.drawDebugGizmos_GROUND){
+					GizmoUtils.DrawSphere(hitInfo.point + gravityDirOffset, .05f, Color.red, 4, gizmoDuration);
 				}
 				if(!movement.grounded){
-					if(movement.drawDebugGizmos && renderGroundGizmos){
-						//GizmoUtils.DrawSphere(hitInfo.point, .1f, Color.red, 8, gizmoDuration);
+					if(movement.drawDebugGizmos_GROUND){
+						GizmoUtils.DrawSphere(hitInfo.point, .1f, Color.red, 8, gizmoDuration);
 						
 					}
 					if(movement.useExtraLogging){
@@ -130,8 +128,8 @@ namespace Code.Player.Character.API {
 					//Physics Casts give you interpolated normals. This uses a ray to find an exact normal
 					hitInfo.normal = CalculateRealNormal(hitInfo.normal, hitInfo.point + gravityDirOffset + moveDir.normalized*.01f, gravityDir, .11f, movement.moveData.groundCollisionLayerMask);
 				
-					if(movement.drawDebugGizmos && renderGroundGizmos){
-						//GizmoUtils.DrawLine(hitInfo.point, hitInfo.point + hitInfo.normal, Color.red, gizmoDuration);
+					if(movement.drawDebugGizmos_GROUND){
+						GizmoUtils.DrawLine(hitInfo.point, hitInfo.point + hitInfo.normal, Color.red, gizmoDuration);
 					}
 
 					//var inCollider = IsPointInCharacter...(hitInfo.point);
@@ -156,7 +154,7 @@ namespace Code.Player.Character.API {
 			//Move from root to center of collider
 			var startPos = rootPos + new Vector3(0,centerHeight,0);
 			var extents = ignoreStepUp ? new Vector3(movement.characterHalfExtents.x, movement.characterHalfExtents.y - movement.moveData.maxStepUpHeight/2f, movement.characterHalfExtents.z) : movement.characterHalfExtents; 
-			if(movement.drawDebugGizmos){
+			if(movement.drawDebugGizmos_FORWARD){
 				// GizmoUtils.DrawBox(startPos, Quaternion.identity, extents, Color.green, gizmoDuration);
 				// GizmoUtils.DrawBox(startPos+normalizedForward * distance, Quaternion.identity, extents, Color.green, gizmoDuration);
 			}
@@ -169,7 +167,7 @@ namespace Code.Player.Character.API {
 					//localHit.y = 0;
 					hitInfo.normal = CalculateRealNormal(hitInfo.normal, hitInfo.point-forwardVector, forwardVector, forwardVector.magnitude, movement.moveData.groundCollisionLayerMask);
 
-					if(movement.drawDebugGizmos){
+					if(movement.drawDebugGizmos_FORWARD){
 						//GizmoUtils.DrawSphere(hitInfo.point, .05f, Color.black, 4, gizmoDuration);
 						//GizmoUtils.DrawLine(hitInfo.point, hitInfo.point + hitInfo.normal, Color.black, gizmoDuration);
 					}
@@ -202,7 +200,7 @@ namespace Code.Player.Character.API {
 				Debug.Log("currentUpNormal: " + currentUpNormal + " forwardHitInfo: " + forwardHitInfo.normal + " EQUAL: "+ (currentUpNormal == forwardHitInfo.normal));
 			}
 
-			if(didHitForward && movement.drawDebugGizmos){
+			if(didHitForward && movement.drawDebugGizmos_STEPUP){
 				//GizmoUtils.DrawSphere(forwardHitInfo.point, .025f, Color.cyan, 4, gizmoDuration);
 			}
 
@@ -220,7 +218,7 @@ namespace Code.Player.Character.API {
 				var stepUpRayStart = forwardHitInfo.point + velDir * (forwardHitInfo.distance + offsetMargin);
 				stepUpRayStart.y =  startPos.y + movement.moveData.maxStepUpHeight+movement.characterRadius;
 				
-				if(movement.drawDebugGizmos){
+				if(movement.drawDebugGizmos_STEPUP){
 					GizmoUtils.DrawSphere(stepUpRayStart, .05f, Color.yellow, 4, gizmoDuration);
 					GizmoUtils.DrawSphere(startPos, .04f, Color.blue, 4, gizmoDuration);
 				}
@@ -229,7 +227,7 @@ namespace Code.Player.Character.API {
 					//Vector3.down, out RaycastHit stepUpRayHitInfo, Quaternion.identity, movement.moveData.characterHeight, movement.moveData.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)){
 				if(Physics.Raycast(stepUpRayStart, new Vector3(0,-1,0), out RaycastHit stepUpRayHitInfo, movement.moveData.characterHeight, movement.moveData.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)){
 					//Hit a surface that is in range
-					if(movement.drawDebugGizmos){
+					if(movement.drawDebugGizmos_STEPUP){
 						GizmoUtils.DrawLine(stepUpRayStart, stepUpRayHitInfo.point, Color.yellow, gizmoDuration);
 					}
 
@@ -248,7 +246,7 @@ namespace Code.Player.Character.API {
 						
 						var bottompoint = topPoint - flatDir * stepUpRampDistance;
 						bottompoint.y = topPoint.y - movement.moveData.maxStepUpHeight;
-						if(movement.drawDebugGizmos){
+						if(movement.drawDebugGizmos_STEPUP){
 							GizmoUtils.DrawBox(startPos + Vector3.up, Quaternion.identity, Vector3.one * .02f, Color.red, 4);
 							GizmoUtils.DrawBox(startPos + Vector3.up + new Vector3(0,-movement.moveData.maxStepUpHeight-1,0), Quaternion.identity, Vector3.one * .02f, Color.blue, 4);
 						}
@@ -262,7 +260,7 @@ namespace Code.Player.Character.API {
 						var rawDelta = GetFlatDistance(startPos + (vel * deltaTime), bottompoint) / stepUpRampDistance;
 						var pointOnRampDelta = Mathf.Clamp01(rawDelta);
 						var pointOnRamp = Vector3.Lerp(bottompoint, topPoint, pointOnRampDelta);// + new Vector3(0,offsetMargin,0);
-						if(movement.drawDebugGizmos){
+						if(movement.drawDebugGizmos_STEPUP){
 							GizmoUtils.DrawSphere(topPoint, .02f, Color.cyan, 4, gizmoDuration);
 							GizmoUtils.DrawLine(topPoint, topPoint+rampNormal, Color.yellow, gizmoDuration);
 							GizmoUtils.DrawSphere(pointOnRamp, .02f, Color.green, 4, gizmoDuration);
@@ -302,7 +300,7 @@ namespace Code.Player.Character.API {
 					if(!Physics.Raycast(quickStepHitInfo.point, Vector3.up, movement.standingCharacterHeight+offsetMargin, movement.moveData.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)
 						&& IsWalkableSurface(quickStepHitInfo.normal)){
 						var hitPoint = quickStepHitInfo.point + new Vector3(0,offsetMargin, 0);
-						if(movement.drawDebugGizmos){
+						if(movement.drawDebugGizmos_STEPUP){
 							GizmoUtils.DrawSphere(hitPoint, .05f, Color.white, 4, gizmoDuration);
 						}
 						return (true, false, hitPoint, vel);

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

@@ -2,7 +2,7 @@
 	public enum CharacterState {
 		Idle = 0,
 		Running = 1,
-		Jumping = 2,
+		Airborne = 2,
 		Sprinting = 3,
 		Crouching = 4,
 	}

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

@@ -114,7 +114,7 @@ namespace Code.Player.Character {
             if (currentState == CharacterState.Idle) {
                 targetVelNormalized = Vector2.zero;
                 modifiedTargetPlaybackSpeed = 1;
-            } else if (currentState == CharacterState.Jumping){
+            } else if (currentState == CharacterState.Airborne){
                 modifiedTargetPlaybackSpeed = 1;
             }
 

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

@@ -21,7 +21,10 @@ namespace Code.Player.Character {
 		public Transform slopeVisualizer;
 
 		[Header("Debug")]
-		public bool drawDebugGizmos = false;
+		public bool drawDebugGizmos_FORWARD = false;
+		public bool drawDebugGizmos_GROUND = false;
+		public bool drawDebugGizmos_STEPUP = false;
+		public bool drawDebugGizmos_STATES= false;
 		public bool useExtraLogging = false;
 
 		[Header("Variables")]
@@ -399,7 +402,7 @@ namespace Code.Player.Character {
 
 			//If you are in the air override the state
 			if (inAir) {
-				state = CharacterState.Jumping;
+				state = CharacterState.Airborne;
 			}else{
 				//Otherwise use our found state
 				state = groundedState;
@@ -579,7 +582,7 @@ namespace Code.Player.Character {
 					var newMoveVector = Vector3.ProjectOnPlane(characterMoveVelocity, groundHit.normal);
 					newMoveVector.y = Mathf.Min(0, newMoveVector.y);
 					characterMoveVelocity = newMoveVector;
-					if(drawDebugGizmos){
+					if(drawDebugGizmos_STEPUP){
 						GizmoUtils.DrawLine(transform.position, transform.position + characterMoveVelocity * 2, Color.red);
 					}
 					//characterMoveVector.y = Mathf.Clamp( characterMoveVector.y, 0, moveData.maxSlopeSpeed);
@@ -695,7 +698,7 @@ namespace Code.Player.Character {
 #region STEP_UP
 		//Step up as the last step so we have the most up to date velocity to work from
 		var didStepUp = false;
-		if(moveData.detectStepUps && !md.crouch){
+		if(moveData.detectStepUps && (!md.crouch || !moveData.preventStepUpWhileCrouching)){
 			(bool hitStepUp, bool onRamp, Vector3 pointOnRamp, Vector3 stepUpVel) = physics.StepUp(rootTransform.position, newVelocity + characterMoveVelocity, deltaTime, detectedGround ? groundHit.normal: Vector3.up);
 			if(hitStepUp){
 				didStepUp = hitStepUp;
@@ -710,7 +713,7 @@ namespace Code.Player.Character {
 				debugPoint += newVelocity * deltaTime;
 				//print("PointOnRamp: " + pointOnRamp + " position: " + transform.position + " velY: " + newVelocity.y);
 				
-				if(drawDebugGizmos){
+				if(drawDebugGizmos_STEPUP){
 					GizmoUtils.DrawSphere(debugPoint, .03f, Color.red, 4, 4);
 				}
 				state = groundedState;//Force grounded state since we are in the air for the step up
@@ -1012,7 +1015,7 @@ namespace Code.Player.Character {
 
 			// If the character state is different
 			if (isNewState) {
-				if(drawDebugGizmos && newStateData.state == CharacterState.Jumping){
+				if(drawDebugGizmos_STATES && newStateData.state == CharacterState.Airborne){
 					GizmoUtils.DrawSphere(transform.position, .05f, Color.green,4,1);
 				}
 				stateChanged?.Invoke((int)newStateData.state);

package/package.json

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