Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit aa176f5

Browse files
BenNaccaratoBenNaccarato
authored
Remove 'near ground', fix landing anim lag (#11)
* Remove 'near ground', fix landing anim lag * Putting JumpOutro exit time back to 1.0
1 parent bbeddaf commit aa176f5

File tree

6 files changed

+36
-64
lines changed

6 files changed

+36
-64
lines changed

‎workers/unity/Assets/Fps/Art/AnimationControllers/FirstPersonAnims.controller‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ AnimatorController:
2626
m_DefaultInt: 0
2727
m_DefaultBool: 0
2828
m_Controller: {fileID: 0}
29-
- m_Name: NearGround
30-
m_Type: 4
31-
m_DefaultFloat: 0
32-
m_DefaultInt: 0
33-
m_DefaultBool: 0
34-
m_Controller: {fileID: 0}
3529
- m_Name: Movement
3630
m_Type: 1
3731
m_DefaultFloat: 0

‎workers/unity/Assets/Fps/Art/AnimationControllers/ThirdPersonAnims.controller‎

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ AnimatorController:
2626
m_DefaultInt: 0
2727
m_DefaultBool: 0
2828
m_Controller: {fileID: 9100000}
29-
- m_Name: NearGround
30-
m_Type: 4
31-
m_DefaultFloat: 0
32-
m_DefaultInt: 0
33-
m_DefaultBool: 0
34-
m_Controller: {fileID: 9100000}
3529
- m_Name: X
3630
m_Type: 1
3731
m_DefaultFloat: 0
@@ -663,10 +657,7 @@ AnimatorStateTransition:
663657
m_CorrespondingSourceObject: {fileID: 0}
664658
m_PrefabInternal: {fileID: 0}
665659
m_Name:
666-
m_Conditions:
667-
- m_ConditionMode: 3
668-
m_ConditionEvent: Movement
669-
m_EventTreshold: 0.1
660+
m_Conditions: []
670661
m_DstStateMachine: {fileID: 1107648931561696196}
671662
m_DstState: {fileID: 0}
672663
m_Solo: 0
@@ -675,11 +666,11 @@ AnimatorStateTransition:
675666
serializedVersion: 3
676667
m_TransitionDuration: 0.1
677668
m_TransitionOffset: 0
678-
m_ExitTime: 0.60526323
669+
m_ExitTime: 0.32
679670
m_HasExitTime: 1
680671
m_HasFixedDuration: 1
681672
m_InterruptionSource: 0
682-
m_OrderedInterruption: 1
673+
m_OrderedInterruption: 0
683674
m_CanTransitionToSelf: 1
684675
--- !u!1101 &1101097910787203112
685676
AnimatorStateTransition:
@@ -729,6 +720,30 @@ AnimatorStateTransition:
729720
m_InterruptionSource: 0
730721
m_OrderedInterruption: 1
731722
m_CanTransitionToSelf: 1
723+
--- !u!1101 &1101420971358438898
724+
AnimatorStateTransition:
725+
m_ObjectHideFlags: 1
726+
m_CorrespondingSourceObject: {fileID: 0}
727+
m_PrefabInternal: {fileID: 0}
728+
m_Name:
729+
m_Conditions:
730+
- m_ConditionMode: 1
731+
m_ConditionEvent: Grounded
732+
m_EventTreshold: 0
733+
m_DstStateMachine: {fileID: 0}
734+
m_DstState: {fileID: 1102233534925507944}
735+
m_Solo: 0
736+
m_Mute: 0
737+
m_IsExit: 0
738+
serializedVersion: 3
739+
m_TransitionDuration: 0
740+
m_TransitionOffset: 0
741+
m_ExitTime: 1
742+
m_HasExitTime: 1
743+
m_HasFixedDuration: 1
744+
m_InterruptionSource: 0
745+
m_OrderedInterruption: 1
746+
m_CanTransitionToSelf: 1
732747
--- !u!1101 &1101485113595726038
733748
AnimatorStateTransition:
734749
m_ObjectHideFlags: 1
@@ -737,19 +752,19 @@ AnimatorStateTransition:
737752
m_Name:
738753
m_Conditions:
739754
- m_ConditionMode: 2
740-
m_ConditionEvent: NearGround
755+
m_ConditionEvent: Grounded
741756
m_EventTreshold: 0
742757
m_DstStateMachine: {fileID: 0}
743758
m_DstState: {fileID: 1102544389727780834}
744759
m_Solo: 0
745760
m_Mute: 0
746761
m_IsExit: 0
747762
serializedVersion: 3
748-
m_TransitionDuration: 0.25
763+
m_TransitionDuration: 0
749764
m_TransitionOffset: 0
750-
m_ExitTime: 0.7321429
765+
m_ExitTime: 1
751766
m_HasExitTime: 1
752-
m_HasFixedDuration: 1
767+
m_HasFixedDuration: 0
753768
m_InterruptionSource: 0
754769
m_OrderedInterruption: 1
755770
m_CanTransitionToSelf: 1
@@ -897,30 +912,6 @@ AnimatorStateTransition:
897912
m_InterruptionSource: 0
898913
m_OrderedInterruption: 1
899914
m_CanTransitionToSelf: 1
900-
--- !u!1101 &1101744463204969500
901-
AnimatorStateTransition:
902-
m_ObjectHideFlags: 1
903-
m_CorrespondingSourceObject: {fileID: 0}
904-
m_PrefabInternal: {fileID: 0}
905-
m_Name:
906-
m_Conditions:
907-
- m_ConditionMode: 1
908-
m_ConditionEvent: Grounded
909-
m_EventTreshold: 0
910-
m_DstStateMachine: {fileID: 0}
911-
m_DstState: {fileID: 1102233534925507944}
912-
m_Solo: 0
913-
m_Mute: 0
914-
m_IsExit: 0
915-
serializedVersion: 3
916-
m_TransitionDuration: 0
917-
m_TransitionOffset: 0
918-
m_ExitTime: 0.5
919-
m_HasExitTime: 1
920-
m_HasFixedDuration: 0
921-
m_InterruptionSource: 0
922-
m_OrderedInterruption: 1
923-
m_CanTransitionToSelf: 1
924915
--- !u!1101 &1101983865281015686
925916
AnimatorStateTransition:
926917
m_ObjectHideFlags: 1
@@ -1117,7 +1108,7 @@ AnimatorState:
11171108
m_CycleOffset: 0
11181109
m_Transitions:
11191110
- {fileID: 1101485113595726038}
1120-
- {fileID: 1101744463204969500}
1111+
- {fileID: 1101420971358438898}
11211112
m_StateMachineBehaviours: []
11221113
m_Position: {x: 50, y: 50, z: 0}
11231114
m_IKOnFeet: 0
@@ -1215,13 +1206,13 @@ AnimatorStateMachine:
12151206
m_ChildStates:
12161207
- serializedVersion: 1
12171208
m_State: {fileID: 1102544389727780834}
1218-
m_Position: {x: 384, y: 300, z: 0}
1209+
m_Position: {x: 384, y: 288, z: 0}
12191210
- serializedVersion: 1
12201211
m_State: {fileID: 1102233534925507944}
12211212
m_Position: {x: 168, y: 228, z: 0}
12221213
- serializedVersion: 1
12231214
m_State: {fileID: 1102564331473817460}
1224-
m_Position: {x: 576, y: 228, z: 0}
1215+
m_Position: {x: 600, y: 228, z: 0}
12251216
m_ChildStateMachines:
12261217
- serializedVersion: 1
12271218
m_StateMachine: {fileID: 1107648931561696196}

‎workers/unity/Assets/Fps/Scripts/GameLogic/Animation/FpsAnimator.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ private class AnimationBoolParameter
6363
private readonly AnimationBoolParameter groundedParameter = new AnimationBoolParameter { Name = "Grounded" };
6464
private readonly AnimationBoolParameter sprintingParameter = new AnimationBoolParameter { Name = "Sprinting" };
6565

66-
private readonly AnimationBoolParameter
67-
nearGroundParameter = new AnimationBoolParameter { Name = "NearGround" };
68-
6966
private const string JumpParameter = "Jump";
7067
private readonly AnimationFloatParameter movementParameter = new AnimationFloatParameter { Name = "Movement" };
7168
private readonly AnimationFloatParameter pitchParameter = new AnimationFloatParameter { Name = "Pitch" };
@@ -95,11 +92,6 @@ public void SetGrounded(bool grounded)
9592
SetBoolParameter(groundedParameter, grounded);
9693
}
9794

98-
public void SetNearGround(bool nearGround)
99-
{
100-
SetBoolParameter(nearGroundParameter, nearGround);
101-
}
102-
10395
public void SetPitch(float pitch)
10496
{
10597
if (pitch > 180)

‎workers/unity/Assets/Fps/Scripts/GameLogic/Animation/ProxyAnimation.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ private void OnEnable()
4444
private void Update()
4545
{
4646
fpsAnimator.SetGrounded(groundChecker.Grounded);
47-
fpsAnimator.SetNearGround(groundChecker.NearGround);
4847
if (isMoving)
4948
{
5049
movementTimeout -= Time.deltaTime;

‎workers/unity/Assets/Fps/Scripts/GameLogic/FpsDriver.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ private void Animations(bool isJumping)
215215
{
216216
fpsAnimator.SetAiming(gunState.Data.IsAiming);
217217
fpsAnimator.SetGrounded(groundChecker.Grounded);
218-
fpsAnimator.SetNearGround(groundChecker.NearGround);
219218
fpsAnimator.SetMovement(transform.position, Time.deltaTime);
220219
fpsAnimator.SetPitch(pitchTransform.transform.localEulerAngles.x);
221220

‎workers/unity/Packages/com.improbable.gdk.movement/Behaviours/GroundChecker.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ public class GroundChecker : MonoBehaviour
1010
[SerializeField] private LayerMask walkableLayer = ~0;
1111

1212
private CharacterController characterController;
13-
private bool nearGround;
1413
private bool grounded;
1514

1615
public bool OverrideInAir { get; set; }
17-
18-
public bool NearGround => nearGround || characterController.isGrounded;
1916

2017
public bool Grounded => grounded || characterController.isGrounded;
2118

@@ -29,9 +26,9 @@ private void Update()
2926
{
3027
var upOffset = characterController.radius + 0.1f;
3128
var ray = new Ray(transform.position + Vector3.up * upOffset, Vector3.down);
32-
nearGround = Physics.SphereCast(ray, characterController.radius, out var hitInfo,
29+
var hit = Physics.SphereCast(ray, characterController.radius, out var hitInfo,
3330
nearToGroundDistance + upOffset, walkableLayer);
34-
grounded = nearGround && hitInfo.distance < upOffset + 0.1f;
31+
grounded = hit && hitInfo.distance < upOffset + 0.1f;
3532
}
3633
}
3734
}

0 commit comments

Comments
 (0)