UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-01 21:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 4.0-beta

Browse Source
This commit is contained in:
Harald Csaszar 2020-11-24 18:02:22 +01:00
commit 1d59409bde
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs
View File

@ -228,7 +228,7 @@ namespace Spine.Unity {
return false; return false;
var time = AnimationTime(stateInfo.normalizedTime, info.clip.length, var time = AnimationTime(stateInfo.normalizedTime, info.clip.length,
info.clip.isLooping); info.clip.isLooping, stateInfo.speed < 0);
weight = useClipWeight1 ? layerWeight : weight; weight = useClipWeight1 ? layerWeight : weight;
clip.Apply(skeleton, 0, time, info.clip.isLooping, null, clip.Apply(skeleton, 0, time, info.clip.isLooping, null,
weight, layerBlendMode, MixDirection.In); weight, layerBlendMode, MixDirection.In);
@ -252,7 +252,7 @@ namespace Spine.Unity {
return false; return false;
var time = AnimationTime(stateInfo.normalizedTime + interruptingClipTimeAddition, var time = AnimationTime(stateInfo.normalizedTime + interruptingClipTimeAddition,
info.clip.length); info.clip.length, stateInfo.speed < 0);
weight = useClipWeight1 ? layerWeight : weight; weight = useClipWeight1 ? layerWeight : weight;
clip.Apply(skeleton, 0, time, info.clip.isLooping, null, clip.Apply(skeleton, 0, time, info.clip.isLooping, null,
weight, layerBlendMode, MixDirection.In); weight, layerBlendMode, MixDirection.In);
@ -462,18 +462,20 @@ namespace Spine.Unity {
} }
animation = GetAnimation(clip); animation = GetAnimation(clip);
float time = AnimationTime(stateInfo.normalizedTime, clip.length, float time = AnimationTime(stateInfo.normalizedTime, clip.length,
clip.isLooping); clip.isLooping, stateInfo.speed < 0);
return new KeyValuePair<Animation, float>(animation, time); return new KeyValuePair<Animation, float>(animation, time);
} }
static float AnimationTime (float normalizedTime, float clipLength, bool loop) { static float AnimationTime (float normalizedTime, float clipLength, bool loop, bool reversed) {
float time = AnimationTime(normalizedTime, clipLength); float time = AnimationTime(normalizedTime, clipLength, reversed);
if (loop) return time; if (loop) return time;
const float EndSnapEpsilon = 1f / 30f; // Workaround for end-duration keys not being applied. const float EndSnapEpsilon = 1f / 30f; // Workaround for end-duration keys not being applied.
return (clipLength - time < EndSnapEpsilon) ? clipLength : time; // return a time snapped to clipLength; return (clipLength - time < EndSnapEpsilon) ? clipLength : time; // return a time snapped to clipLength;
} }
static float AnimationTime (float normalizedTime, float clipLength) { static float AnimationTime (float normalizedTime, float clipLength, bool reversed) {
if (reversed)
normalizedTime = (1 - normalizedTime);
if (normalizedTime < 0.0f) if (normalizedTime < 0.0f)
normalizedTime = (normalizedTime % 1.0f) + 1.0f; normalizedTime = (normalizedTime % 1.0f) + 1.0f;
return normalizedTime * clipLength; return normalizedTime * clipLength;