diff --git a/Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer b/Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer new file mode 100644 index 00000000..5d6924e2 Binary files /dev/null and b/Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer differ diff --git a/Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer.shmeta b/Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer.shmeta new file mode 100644 index 00000000..75860e48 --- /dev/null +++ b/Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer.shmeta @@ -0,0 +1,7 @@ +Name: MD_RigTest01_SkinningTestAnims +ID: 203438081 +Type: 12 +Sub Assets: +Name: Full +ID: 231416496 +Type: 13 diff --git a/Assets/Animation Clips/racoonAnims.shanimcontainer b/Assets/Animation Clips/racoonAnims.shanimcontainer index 499ff422..c0b335cf 100644 Binary files a/Assets/Animation Clips/racoonAnims.shanimcontainer and b/Assets/Animation Clips/racoonAnims.shanimcontainer differ diff --git a/Assets/Animation Clips/racoonAnims.shanimcontainer.shmeta b/Assets/Animation Clips/racoonAnims.shanimcontainer.shmeta index 928c9fc5..74ac2624 100644 --- a/Assets/Animation Clips/racoonAnims.shanimcontainer.shmeta +++ b/Assets/Animation Clips/racoonAnims.shanimcontainer.shmeta @@ -35,3 +35,6 @@ Type: 13 Name: Jump_End ID: 228134756 Type: 13 +Name: Full +ID: 223752972 +Type: 13 diff --git a/Assets/Scenes/anim.shade b/Assets/Scenes/anim.shade index c553b17d..fb4049fa 100644 --- a/Assets/Scenes/anim.shade +++ b/Assets/Scenes/anim.shade @@ -19,8 +19,8 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: -0.291508496, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Renderable Component: @@ -34,6 +34,7 @@ Scripts: - Type: SHADE.Test.AnimTest Enabled: true + fullClip: 223752972 idleClip: 227450439 runClip: 229125027 pickUpClip: 219605278 @@ -53,4 +54,29 @@ Perspective: true FOV: 90 IsActive: true - Scripts: ~ \ No newline at end of file + Scripts: ~ +- EID: 3 + Name: Leg + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.332949668, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} + Scale: {x: 0.0710000023, y: 0.0710000023, z: 0.0710000023} + IsActive: true + Renderable Component: + Mesh: 141097368 + Material: 128805346 + IsActive: true + Animator Component: + Rig: 72178939 + AnimationController: 0 + IsActive: true + Scripts: + - Type: SHADE.Test.AnimTest + Enabled: true + fullClip: 231416496 + idleClip: 0 + runClip: 0 + pickUpClip: 0 \ No newline at end of file diff --git a/Assets/Scripts/AnimTest.cs b/Assets/Scripts/AnimTest.cs index 376fb372..324058b2 100644 --- a/Assets/Scripts/AnimTest.cs +++ b/Assets/Scripts/AnimTest.cs @@ -1,9 +1,11 @@ namespace SHADE.Test -{ +{ public class AnimTest : Script { #region Serialized Fields [SerializeField] + private AnimationClipAsset fullClip; + [SerializeField] private AnimationClipAsset idleClip; [SerializeField] private AnimationClipAsset runClip; @@ -12,7 +14,7 @@ #endregion #region Components - public Animator Animator { get; private set; } + public Animator Animator { get; private set; } #endregion #region Lifecycle Functions @@ -23,7 +25,11 @@ protected override void update() { - if (Input.GetKeyUp(Input.KeyCode.Alpha1)) + if (Input.GetKeyUp(Input.KeyCode.Equals)) + { + Animator.Play(fullClip); + } + else if (Input.GetKeyUp(Input.KeyCode.Alpha1)) { Animator.Play(idleClip); } @@ -38,4 +44,4 @@ } #endregion } -} \ No newline at end of file +}