RR/jelito
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

animancer

Browse Source
This commit is contained in:
Brajanowski
2025-10-08 21:07:47 +02:00
parent 35f1337446
commit 2fab3007ae
13 changed files with 159 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/jelycho/Code/Player/PlayerActor.cs
View File

@@ -31,7 +31,6 @@ namespace RebootReality.jelycho.Player {
[SerializeField] float m_RunCameraBobbing = 0.5f;
[SerializeField] float m_IdleCameraBobbing = 0.0f;
[SerializeField] float m_CameraBobbingTransitionSpeed = 5.0f;
[SerializeField] float m_TurnTransitionSpeed = 5.0f;
float m_TargetCameraBobbing = 0.0f;
float m_CurrentCameraBobbing = 0.0f;
@@ -49,7 +48,6 @@ namespace RebootReality.jelycho.Player {
[SerializeField] float m_CharacterRotateFastSpeed = 720.0f;
float m_CharacterTurnVelocity = 0.0f;
float m_CharacterTurnVelocitySmooth = 0.0f;
[Header("Animations")]
[SerializeField] int m_HandsLayerIndex;
@@ -847,7 +845,9 @@ namespace RebootReality.jelycho.Player {
float3 targetCharacterForward = math.normalize(LookDirection.With(y: 0.0f));
float3 currentCharacterForward = math.normalize(m_CharacterForwardTransform.forward.With(y: 0.0f));
float angleDeg = Mathf.DeltaAngle(m_Camera.Yaw, m_Locomotion.YawRotation);
// float angleDeg = Mathf.DeltaAngle(m_Camera.Yaw, m_Locomotion.YawRotation);
float angleRad = math.acos(math.clamp(math.dot(targetCharacterForward, currentCharacterForward) / (math.length(targetCharacterForward) * math.length(currentCharacterForward)), -1f, 1f));
float angleDeg = math.degrees(angleRad);
bool rotateCharacter = false;
float rotateCharacterSpeed = m_CharacterRotateSpeed;
@@ -870,13 +870,14 @@ namespace RebootReality.jelycho.Player {
if (rotateCharacter) {
m_CharacterTurnVelocity = rotateCharacterSpeed * dt;
m_CharacterTurnVelocitySmooth = m_CharacterTurnVelocity;
var newForward = Vector3.RotateTowards(currentCharacterForward,
targetCharacterForward,
math.radians(m_CharacterTurnVelocity),
0.0f);
m_CharacterForwardTransform.forward = newForward;
} else {
m_CharacterTurnVelocity = 0.0f;
}
// Aim Target adjustment
@@ -991,20 +992,16 @@ namespace RebootReality.jelycho.Player {
if (math.abs(forwardNormalized) > 0.01f ||
math.abs(rightNormalized) > 0.01f ||
!m_Locomotion.IsGrounded) {
m_CharacterTurnVelocitySmooth = 0.0f;
m_CharacterTurnVelocity = 0.0f;
}
var locomotionParams = new PlayerLocomotionAnimatorParams {
IsGrounded = m_Locomotion.IsGrounded,
VelocityForwardNormalized = forwardNormalized,
VelocityRightNormalized = rightNormalized,
TurnVelocity = m_CharacterTurnVelocitySmooth
TurnVelocity = math.clamp(m_CharacterTurnVelocity, -1, 1)
};
m_PlayerAnimator.SetLocomotionParams(locomotionParams);
m_CharacterTurnVelocitySmooth = Mathf.MoveTowards(m_CharacterTurnVelocitySmooth,
0.0f,
m_TurnTransitionSpeed * Time.deltaTime);
}
}

217
Assets/jelycho/Code/Player/PlayerAnimator.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Runtime.CompilerServices;
using Animancer;
using RebootKit.Engine.Animations;
using RebootReality.jelycho.Items;
using Unity.Mathematics;
using UnityEngine;
using UnityEngine.Animations;
using UnityEngine.Playables;
using UnityEvent = UnityEngine.Events.UnityEvent;
namespace RebootReality.jelycho.Player {
@@ -17,117 +14,6 @@ namespace RebootReality.jelycho.Player {
public bool IsGrounded;
}
[Serializable]
public class BasicCharacterLocomotionReAnimatorNode : IReAnimatorNode {
[field: SerializeField] public string Name { get; private set; }
[SerializeField] AnimationClip m_IdleClip;
[SerializeField] AnimationClip m_RunForwardClip;
[SerializeField] AnimationClip m_RunBackwardsClip;
[SerializeField] AnimationClip m_StrafeRightClip;
[SerializeField] AnimationClip m_StrafeLeftClip;
[SerializeField] AnimationClip m_TurnRightClip;
[SerializeField] AnimationClip m_TurnLeftClip;
[SerializeField] float m_TransitionSpeed = 5.0f;
[SerializeField, Range(0.0f, 1.0f)] float m_ForceIdleMagnitudeThreshold = 0.2f;
AnimationMixerPlayable m_Mixer;
float2 m_TargetInput;
float2 m_CurrentInput;
float m_Turning;
public void Tick(float deltaTime) {
if (m_TransitionSpeed > 0.0f) {
m_CurrentInput = Vector2.MoveTowards(m_CurrentInput,
m_TargetInput,
m_TransitionSpeed * deltaTime);
} else {
m_CurrentInput = m_TargetInput;
}
if (math.length(m_CurrentInput) <= m_ForceIdleMagnitudeThreshold) {
for (int i = 0; i < 7; ++i) {
m_Mixer.SetInputWeight(i, 0.0f);
}
float turnWeight = math.clamp(math.abs(m_Turning), 0.0f, 1.0f);
if (m_Turning > 0.1f) {
m_Mixer.SetInputWeight(5, turnWeight);
} else if (m_Turning < -0.1f) {
m_Mixer.SetInputWeight(6, turnWeight);
}
m_Mixer.SetInputWeight(0, 1.0f - turnWeight);
return;
}
float inputMagnitude = math.length(m_CurrentInput);
float2 inputNormalized = math.normalizesafe(m_CurrentInput);
inputMagnitude = math.min(1.0f, inputMagnitude);
float forwardWeight = math.max(0.0f, math.dot(inputNormalized, new float2(0, 1)) * inputMagnitude);
float backwardsWeight = math.max(0.0f, math.dot(inputNormalized, new float2(0, -1)) * inputMagnitude);
float rightWeight = math.max(0.0f, math.dot(inputNormalized, new float2(1, 0)) * inputMagnitude);
float leftWeight = math.max(0.0f, math.dot(inputNormalized, new float2(-1, 0)) * inputMagnitude);
float totalWeight = forwardWeight + backwardsWeight + rightWeight + leftWeight;
if (totalWeight > 1.0f) {
forwardWeight /= totalWeight;
backwardsWeight /= totalWeight;
rightWeight /= totalWeight;
leftWeight /= totalWeight;
totalWeight = 1.0f;
}
float idleWeight = math.max(0.0f, 1.0f - totalWeight);
m_Mixer.SetInputWeight(0, idleWeight);
m_Mixer.SetInputWeight(1, forwardWeight);
m_Mixer.SetInputWeight(2, backwardsWeight);
m_Mixer.SetInputWeight(3, rightWeight);
m_Mixer.SetInputWeight(4, leftWeight);
m_Mixer.SetInputWeight(5, 0.0f);
m_Mixer.SetInputWeight(6, 0.0f);
}
public IPlayable Build(PlayableGraph graph) {
m_Mixer = AnimationMixerPlayable.Create(graph, 7);
var idlePlayable = AnimationClipPlayable.Create(graph, m_IdleClip);
var runForwardPlayable = AnimationClipPlayable.Create(graph, m_RunForwardClip);
var runBackwardsPlayable = AnimationClipPlayable.Create(graph, m_RunBackwardsClip);
var strafeRightPlayable = AnimationClipPlayable.Create(graph, m_StrafeRightClip);
var strafeLeftPlayable = AnimationClipPlayable.Create(graph, m_StrafeLeftClip);
var turnRightPlayable = AnimationClipPlayable.Create(graph, m_TurnRightClip);
var turnLeftPlayable = AnimationClipPlayable.Create(graph, m_TurnLeftClip);
m_Mixer.ConnectInput(0, idlePlayable, 0, 1.0f);
m_Mixer.ConnectInput(1, runForwardPlayable, 0, 0.0f);
m_Mixer.ConnectInput(2, runBackwardsPlayable, 0, 0.0f);
m_Mixer.ConnectInput(3, strafeRightPlayable, 0, 0.0f);
m_Mixer.ConnectInput(4, strafeLeftPlayable, 0, 0.0f);
m_Mixer.ConnectInput(5, turnRightPlayable, 0, 0.0f);
m_Mixer.ConnectInput(6, turnLeftPlayable, 0, 0.0f);
return m_Mixer;
}
public bool TryFindChild(string name, out IReAnimatorNode node) {
node = null;
return false;
}
public void SetInput(float2 input, float turning) {
m_TargetInput = input;
m_Turning = turning;
}
}
public class PlayerHandsAnimator {
enum State {
None,
@@ -159,11 +45,9 @@ namespace RebootReality.jelycho.Player {
}
switch (m_State) {
case State.QuickAttack: {
if (IsCurrentClipFinished()) {
Debug.Log("QUICK ATTACK FINISHEDDD");
m_AnimancerState.Stop();
// m_AnimancerState.Stop();
m_AnimancerState = null;
OnQuickAttackAnimationFinished?.Invoke();
}
@@ -204,7 +88,7 @@ namespace RebootReality.jelycho.Player {
}
AnimationClip clip = m_ClipsSet.quickAttacks[combo % m_ClipsSet.quickAttacks.Length];
m_AnimancerState = m_AnimancerLayer.Play(clip);
m_AnimancerState = m_AnimancerLayer.Play(clip, 0.1f);
m_State = State.QuickAttack;
}
@@ -214,7 +98,7 @@ namespace RebootReality.jelycho.Player {
return;
}
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.idle);
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.idle, 0.1f);
m_State = State.Idle;
}
@@ -223,7 +107,7 @@ namespace RebootReality.jelycho.Player {
return;
}
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.charging);
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.charging, 0.1f);
m_State = State.Charging;
}
@@ -232,7 +116,7 @@ namespace RebootReality.jelycho.Player {
return;
}
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.chargedIdle);
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.chargedIdle, 0.1f);
m_State = State.ChargedIdle;
}
@@ -241,7 +125,7 @@ namespace RebootReality.jelycho.Player {
return;
}
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.chargedUse);
m_AnimancerState = m_AnimancerLayer.Play(m_ClipsSet.chargedUse, 0.1f);
m_State = State.ChargedUse;
}
@@ -260,12 +144,25 @@ namespace RebootReality.jelycho.Player {
[SerializeField] StringAsset m_GroundLocomotionPropertyY;
SmoothedVector2Parameter m_SmoothLocomotionDirection;
[SerializeField] AvatarMask m_HandsMask;
[SerializeField] TransitionAsset m_GroundTurn;
[SerializeField] StringAsset m_GroundTurnProperty;
SmoothedFloatParameter m_SmoothGroundTurn;
AnimancerLayer m_LocomotionLayer;
[SerializeField] AnimationClip m_InAirClip;
[SerializeField] AnimationClip m_KickClip;
[SerializeField] AvatarMask m_HandsMask;
[SerializeField] AvatarMask m_LegsMask;
AnimancerLayer m_BaseLayer;
AnimancerLayer m_LocomotionLegsLayer;
AnimancerLayer m_HandsLayer;
AnimancerLayer m_FullBodyLayer;
PlayerHandsAnimator m_Hands;
bool m_IsPlayingKickAnimation;
// @TODO: for some reason `SetLocomotionParams` is called before awake
bool m_IsReady = false;
@@ -273,23 +170,35 @@ namespace RebootReality.jelycho.Player {
public UnityEvent onChargeReady = new UnityEvent();
void Awake() {
m_LocomotionLayer = m_Animancer.Layers[0];
m_HandsLayer = m_Animancer.Layers[1];
m_BaseLayer = m_Animancer.Layers[0];
m_BaseLayer.SetDebugName("Base Layer");
m_BaseLayer.Play(m_IdleClip);
m_LocomotionLayer.SetDebugName("Locomotion");
m_LocomotionLegsLayer = m_Animancer.Layers[1];
m_LocomotionLegsLayer.SetDebugName("Locomotion Legs");
m_LocomotionLegsLayer.Mask = m_LegsMask;
m_SmoothLocomotionDirection = new SmoothedVector2Parameter(m_Animancer,
m_GroundLocomotionPropertyX,
m_GroundLocomotionPropertyY,
0.1f);
m_LocomotionLegsLayer.Play(m_GroundLocomotion);
m_SmoothGroundTurn = new SmoothedFloatParameter(m_Animancer,
m_GroundTurnProperty,
0.1f);
m_HandsLayer = m_Animancer.Layers[2];
m_HandsLayer.SetDebugName("Hands");
m_HandsLayer.Mask = m_HandsMask;
m_HandsLayer.SetWeight(0.0f);
m_Hands = new PlayerHandsAnimator(m_HandsLayer);
m_Hands.OnQuickAttackAnimationFinished += () => onQuickAttackFinished.Invoke();
m_Hands.OnCharged += () => onChargeReady.Invoke();
m_SmoothLocomotionDirection = new SmoothedVector2Parameter(m_Animancer,
m_GroundLocomotionPropertyX,
m_GroundLocomotionPropertyY,
0.1f);
m_LocomotionLayer.Play(m_GroundLocomotion);
m_HandsLayer.SetWeight(0.0f);
m_FullBodyLayer = m_Animancer.Layers[3];
m_FullBodyLayer.SetDebugName("Full body");
m_FullBodyLayer.SetWeight(0.0f);
m_IsReady = true;
}
@@ -301,6 +210,12 @@ namespace RebootReality.jelycho.Player {
void Update() {
float dt = Time.deltaTime;
m_Hands.Tick(dt);
if (m_IsPlayingKickAnimation &&
m_FullBodyLayer.CurrentState.NormalizedTime >= 1.0f) {
m_FullBodyLayer.SetWeight(0.0f);
m_IsPlayingKickAnimation = false;
}
}
public void SetLocomotionParams(PlayerLocomotionAnimatorParams locomotionParams) {
@@ -308,13 +223,20 @@ namespace RebootReality.jelycho.Player {
return;
}
//m_LegsLayerMixer.SetLayerWeight(1, locomotionParams.IsGrounded ? 0.0f : 1.0f);
if (!locomotionParams.IsGrounded) {
m_LocomotionLegsLayer.Play(m_InAirClip, 0.1f);
return;
}
var groundBlendDirection = new float2(locomotionParams.VelocityRightNormalized,
locomotionParams.VelocityForwardNormalized);
//m_GroundBlendTree.SetInput(groundBlendDirection, locomotionParams.TurnVelocity);
m_SmoothLocomotionDirection.TargetValue = groundBlendDirection;
if (math.abs(locomotionParams.TurnVelocity) > 0.1f) {
m_SmoothGroundTurn.TargetValue = locomotionParams.TurnVelocity;
m_LocomotionLegsLayer.Play(m_GroundTurn, 0.1f);
} else {
var groundBlendDirection = new float2(locomotionParams.VelocityRightNormalized,
locomotionParams.VelocityForwardNormalized);
m_SmoothLocomotionDirection.TargetValue = groundBlendDirection;
m_LocomotionLegsLayer.Play(m_GroundLocomotion, 0.1f);
}
}
public void SetHandsAnimationSet(ItemHandsAnimationClipsSet clipsSet) {
@@ -328,17 +250,9 @@ namespace RebootReality.jelycho.Player {
}
public void PlayQuickAttack(int combo) {
// int index = combo % m_ItemHandsClips.quickAttacks.Length;
// AnimancerState state = m_HandsLayer.Play(m_ItemHandsClips.quickAttacks[index]);
// state.Events(this).OnEnd ??= OnQuickAttackAnimationEnd;
m_Hands.PlayQuickAttack(combo);
}
// void OnQuickAttackAnimationEnd() {
// PlayHandsIdle();
// onQuickAttackFinished?.Invoke();
// }
public void PlayHandsIdle() {
m_Hands.SetIdle();
}
@@ -352,11 +266,12 @@ namespace RebootReality.jelycho.Player {
}
public void PlayKickAnimation() {
// m_LegsLayerMixer.SetLayerWeight(2, 1.0f);
if (m_IsPlayingKickAnimation) {
return;
}
// m_QuickKickNode.PlayOnceWithCallback(() => {
// m_LegsLayerMixer.SetLayerWeight(2, 0.0f);
// });
m_FullBodyLayer.Play(m_KickClip, 0.1f).Time = 0.0f;
m_IsPlayingKickAnimation = true;
}
}
}

6
Assets/jelycho/core/player/a_player.prefab
View File

@@ -706,7 +706,6 @@ MonoBehaviour:
m_RunCameraBobbing: 0.5
m_IdleCameraBobbing: 0
m_CameraBobbingTransitionSpeed: 5
m_TurnTransitionSpeed: 5
m_CharacterRootTransform: {fileID: 6286051764664211472}
m_HeadBoneTransform: {fileID: 94602192979364499}
m_HeadAimTargetTransform: {fileID: 6151351464099511810}
@@ -776,7 +775,12 @@ MonoBehaviour:
m_GroundLocomotion: {fileID: 11400000, guid: 38063ab9d0c0bc3489b7f9a13951a37a, type: 2}
m_GroundLocomotionPropertyX: {fileID: 11400000, guid: a68129f286ce37c4cb4e60798aefbc36, type: 2}
m_GroundLocomotionPropertyY: {fileID: 11400000, guid: 26c76ae7294c1e946b32807d9bdec657, type: 2}
m_GroundTurn: {fileID: 11400000, guid: 0b28c7a0182fd7f43a575cf9af72be6b, type: 2}
m_GroundTurnProperty: {fileID: 11400000, guid: e15c83088d8e94f4f8abfed3a2263f81, type: 2}
m_InAirClip: {fileID: -203655887218126122, guid: 9c384b0c7d362af4c9743bfcba1938ad, type: 3}
m_KickClip: {fileID: -6582903340500649431, guid: e74130c49b009364f90d176af44766be, type: 3}
m_HandsMask: {fileID: 31900000, guid: fbfe6297a08a01143870b7dfbc34f046, type: 2}
m_LegsMask: {fileID: 31900000, guid: 54d6224b5a57e1e41b9b347b056bb5dc, type: 2}
onQuickAttackFinished:
m_PersistentCalls:
m_Calls: []

41
Assets/jelycho/core/player/animancer/ground_turn.asset Normal file
View File

@@ -0,0 +1,41 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
m_Name: ground_turn
m_EditorClassIdentifier:
_Transition:
rid: 2723988437811068930
references:
version: 2
RefIds:
- rid: 2723988437811068930
type: {class: LinearMixerTransition, ns: Animancer, asm: Kybernetik.Animancer}
data:
_FadeDuration: 0.25
_Speed: 1
_Events:
_NormalizedTimes: []
_Callbacks: []
_Names: []
_Animations:
- {fileID: -203655887218126122, guid: 8954af6e64f1f224b842ff9d924e3764, type: 3}
- {fileID: -3100369314251171874, guid: e74130c49b009364f90d176af44766be, type: 3}
- {fileID: -203655887218126122, guid: 0b2b6f967b2d3d448834061fa68b6443, type: 3}
_Speeds: []
_SynchronizeChildren:
_Thresholds:
- -1
- 0
- 1
_DefaultParameter: 0
_ExtrapolateSpeed: 1
_ParameterName: {fileID: 11400000, guid: e15c83088d8e94f4f8abfed3a2263f81, type: 2}

8
Assets/jelycho/core/player/animancer/ground_turn.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0b28c7a0182fd7f43a575cf9af72be6b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/jelycho/core/player/animancer/ground_locomotion.asset → Assets/jelycho/core/player/animancer/param_ground_locomotion.asset
View File

@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
m_Name: ground_locomotion
m_Name: param_ground_locomotion
m_EditorClassIdentifier:
_Transition:
rid: 2723988420483612950

0
Assets/jelycho/core/player/animancer/ground_locomotion.asset.meta → Assets/jelycho/core/player/animancer/param_ground_locomotion.asset.meta
View File

15
Assets/jelycho/core/player/animancer/param_ground_locomotion_forward.asset Normal file
View File

@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d26ada6b8b155b4cbf61e26d6fc9a06, type: 3}
m_Name: param_ground_locomotion_forward
m_EditorClassIdentifier:
_EditorComment:

0
Assets/jelycho/core/player/animancer/ground_locomotion_forward.asset.meta → Assets/jelycho/core/player/animancer/param_ground_locomotion_forward.asset.meta
View File

2
Assets/jelycho/core/player/animancer/ground_locomotion_forward.asset → Assets/jelycho/core/player/animancer/param_ground_locomotion_right.asset
View File

@@ -10,6 +10,6 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d26ada6b8b155b4cbf61e26d6fc9a06, type: 3}
m_Name: ground_locomotion_forward
m_Name: param_ground_locomotion_right
m_EditorClassIdentifier:
_EditorComment:

0
Assets/jelycho/core/player/animancer/ground_locomotion_right.asset.meta → Assets/jelycho/core/player/animancer/param_ground_locomotion_right.asset.meta
View File

2
Assets/jelycho/core/player/animancer/ground_locomotion_right.asset → Assets/jelycho/core/player/animancer/param_ground_turn.asset
View File

@@ -10,6 +10,6 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d26ada6b8b155b4cbf61e26d6fc9a06, type: 3}
m_Name: ground_locomotion_right
m_Name: param_ground_turn
m_EditorClassIdentifier:
_EditorComment:

8
Assets/jelycho/core/player/animancer/param_ground_turn.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e15c83088d8e94f4f8abfed3a2263f81
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: