Wall hit

Author: Kinerius

unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Animations/Addressables/gltf/Hit_Wall_Walk.glb

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:567ae3f9be0eca23fae93bea19f178a7fcb8cf06b9a8020c2711d38b6b041254
+size 305768

unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Animations/Addressables/gltf/Hit_Wall_Walk.glb.meta

@@ -18,6 +18,7 @@ public class CharacterAnimationController : MonoBehaviour, IAnimator
         private static readonly int FALLING = Animator.StringToHash("IsFalling");
         private static readonly int LONG_JUMP = Animator.StringToHash("IsLongJump");
         private static readonly int JUMP = Animator.StringToHash("Jump");
+        private static readonly int WALL_HIT = Animator.StringToHash("WallHit");
         private static readonly int EMOTE_REFRESH = Animator.StringToHash("EmoteRefresh");
         private static readonly int ANGLE = Animator.StringToHash("Angle");
         private static readonly int ANGLE_DIR = Animator.StringToHash("AngleDir");
@@ -76,9 +77,12 @@ public void SetupCharacterState(CharacterState characterState)
         {
             this.characterState = characterState;
             characterState.OnJump += OnJump;
+            characterState.OnWallHit += OnWallHit;
+            characterState.OnWallHitReset += OnWallHitReset;
         }
 
         // todo: move this elsewhere
+
         private void InitializeAvatarAudioAndParticleHandlers(GameObject container)
         {
             AvatarAnimationEventHandler animationEventHandler = container.GetOrCreateComponent<AvatarAnimationEventHandler>();
@@ -100,6 +104,16 @@ private void OnJump()
             animator.SetTrigger(JUMP);
         }
 
+        private void OnWallHit()
+        {
+            animator.SetTrigger(WALL_HIT);
+        }
+
+        private void OnWallHitReset()
+        {
+            animator.ResetTrigger(WALL_HIT);
+        }
+
         private void LateUpdate()
         {
             if (characterState == null || animator == null) return;

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterControllerV2/Animation/CharacterAnimationController.cs

@@ -10,6 +10,8 @@ public class CharacterState
         public SpeedState SpeedState;
         public bool IsGrounded;
         public event Action OnJump = () => { };
+        public event Action OnWallHit = () => { };
+        public event Action OnWallHitReset = () => { };
         public bool IsJumping;
         public bool IsLongJump;
         public bool IsLongFall;
@@ -24,5 +26,15 @@ public void Jump()
         {
             OnJump.Invoke();
         }
+
+        public void WallHit()
+        {
+            OnWallHit.Invoke();
+        }
+
+        public void ResetWallHit()
+        {
+            OnWallHitReset.Invoke();
+        }
     }
 }

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterControllerV2/Animation/CharacterState.cs

@@ -171,20 +171,20 @@ private Vector3 Flat(Vector3 vector3)
             return vector3;
         }
 
-        public (bool isGrounded, Vector3 deltaPosition) Move(Vector3 delta)
+        public (bool isGrounded, Vector3 deltaPosition, bool wallHit) Move(Vector3 delta)
         {
-            if (!initialPositionAlreadySet) return (true, transform.position);
+            if (!initialPositionAlreadySet) return (true, transform.position, false);
 
             var previousPosition = transform.position;
-            characterController.Move(delta);
+            var collisionFlags = characterController.Move(delta);
             Vector3 currentPosition = transform.position;
             var deltaPosition = previousPosition - currentPosition;
 
             if (currentPosition.y < 0) { transform.position = new Vector3(currentPosition.x, 0, currentPosition.z); }
 
             ReportPosition(PositionUtils.UnityToWorldPosition(currentPosition));
 
-            return (characterController.isGrounded, deltaPosition);
+            return (characterController.isGrounded, deltaPosition, collisionFlags.HasFlag(CollisionFlags.Sides));
         }
 
         public void SetForward(Vector3 forward)
@@ -295,7 +295,7 @@ private float Height(float value) =>
 
     public interface ICharacterView
     {
-        (bool isGrounded, Vector3 deltaPosition) Move(Vector3 delta);
+        (bool isGrounded, Vector3 deltaPosition, bool wallHit) Move(Vector3 delta);
 
         void SetForward(Vector3 forward);
 

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterControllerV2/CharacterView.cs

@@ -58,13 +58,14 @@ internal class DCLCharacterControllerV2
         private RaycastHit sphereCastHitInfo;
         private bool isLongFall;
         private Vector3 lastSlopeDelta;
-        private Vector3 lastFinalVelocity;
+        private Vector3 lastTargetVelocity; // this is the velocity that we want to move, it always has a value if you are pressing a key to move
+        private Vector3 lastActualVelocity; // this is the actual velocity that moved the character, its 0 if you are moving against a wall
+        private float lastImpactMagnitude; // this is 0 if you are at a wall running at it, it gets higher if you run at high velocities and impact the wall
         private int groundLayers;
         private Ray groundRay;
 
         private CameraMode.ModeId[] tpsCameraModes = new[] { CameraMode.ModeId.ThirdPersonRight, CameraMode.ModeId.ThirdPersonLeft, CameraMode.ModeId.ThirdPersonCenter };
         private int currentCameraMode = 0;
-        private Vector3 lastFinalVelocityBasedOnActualMovement;
 
         public DCLCharacterControllerV2(ICharacterView view, CharacterControllerData data, IInputActionHold jumpAction, IInputActionHold sprintAction, InputAction_Hold walkAction,
             IInputActionMeasurable characterXAxis,
@@ -154,17 +155,29 @@ public void Update(float deltaTime)
 
             Vector3 deltaPosition;
             bool currentGroundStatus;
+            bool wallHit;
             Vector3 velocityDelta = finalVelocity * deltaTime;
 
             Vector3 downwardsSlopeModifier = GetDownwardsSlopeBasedOnVelocity(velocityDelta);
 
-            (currentGroundStatus, deltaPosition) = view.Move(velocityDelta + lastSlopeDelta + downwardsSlopeModifier);
+            (currentGroundStatus, deltaPosition, wallHit) = view.Move(velocityDelta + lastSlopeDelta + downwardsSlopeModifier);
 
-            if (lastFinalVelocity.y >= 0 && finalVelocity.y < 0)
+            Vector3 currentActualVelocity = lastTargetVelocity.normalized * (Flat(deltaPosition).magnitude / Time.deltaTime);
+
+            var currentWallImpactMagnitude = (lastActualVelocity - currentActualVelocity).magnitude;
+            if (wallHit && currentWallImpactMagnitude < 0.1f && lastImpactMagnitude > 1)
+                characterState.WallHit();
+
+            if (!wallHit)
+                characterState.ResetWallHit();
+
+            lastImpactMagnitude = currentWallImpactMagnitude;
+
+            if (lastTargetVelocity.y >= 0 && finalVelocity.y < 0)
                 lastUngroundPeakHeight = view.GetPosition().y;
 
-            lastFinalVelocity = finalVelocity;
-            lastFinalVelocityBasedOnActualMovement = lastFinalVelocity.normalized * (Flat(deltaPosition).magnitude / Time.deltaTime);
+            lastTargetVelocity = finalVelocity;
+            lastActualVelocity = currentActualVelocity;
 
             Vector3 slope = GetSlopeModifier();
             lastSlopeDelta = slope * (data.slipSpeedMultiplier * Time.deltaTime);
@@ -198,6 +211,7 @@ public void Update(float deltaTime)
 
         private void OnJustGrounded()
         {
+            characterState.ResetWallHit();
             accelerationWeight = 0;
 
             float deltaHeight = lastUngroundPeakHeight - view.GetPosition().y;
@@ -398,7 +412,7 @@ private void CalculateVerticalVelocity(float deltaTime)
             if (CanJump())
             {
                 characterState.Jump();
-                float jumpHeight = GetJumpHeight(Flat(lastFinalVelocityBasedOnActualMovement));
+                float jumpHeight = GetJumpHeight(Flat(lastActualVelocity));
                 float jumpStr = Mathf.Sqrt(-2 * jumpHeight * (data.gravity * data.jumpGravityFactor));
                 velocity.y += jumpStr;
                 /*var jumpImpulse = new Vector3(velocity.x, jumpStr, velocity.z);