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

[unity] Fixed SkeletonMecanim BlendTree animations being incorrectly applied on WebGL. Was numeric problem of weight == 0 and actual weight being e.g. 1.1E-15. Closes #1862.

Browse Source
This commit is contained in:
Harald Csaszar 2021-03-19 16:10:42 +01:00
parent bb0a4f6998
commit 0fb0b065d7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,9 @@ namespace Spine.Unity {
[System.Serializable] [System.Serializable]
public class MecanimTranslator { public class MecanimTranslator {
const float WeightEpsilon = 0.0001f;
#region Inspector #region Inspector
public bool autoReset = true; public bool autoReset = true;
public bool useCustomMixMode = true; public bool useCustomMixMode = true;
@ -220,7 +223,7 @@ namespace Spine.Unity {
private bool ApplyAnimation (Skeleton skeleton, AnimatorClipInfo info, AnimatorStateInfo stateInfo, private bool ApplyAnimation (Skeleton skeleton, AnimatorClipInfo info, AnimatorStateInfo stateInfo,
int layerIndex, float layerWeight, MixBlend layerBlendMode, bool useClipWeight1 = false) { int layerIndex, float layerWeight, MixBlend layerBlendMode, bool useClipWeight1 = false) {
float weight = info.weight * layerWeight; float weight = info.weight * layerWeight;
if (weight == 0) if (weight < WeightEpsilon)
return false; return false;
var clip = GetAnimation(info.clip); var clip = GetAnimation(info.clip);
@ -244,7 +247,7 @@ namespace Spine.Unity {
float clipWeight = interpolateWeightTo1 ? (info.weight + 1.0f) * 0.5f : info.weight; float clipWeight = interpolateWeightTo1 ? (info.weight + 1.0f) * 0.5f : info.weight;
float weight = clipWeight * layerWeight; float weight = clipWeight * layerWeight;
if (weight == 0) if (weight < WeightEpsilon)
return false; return false;
var clip = GetAnimation(info.clip); var clip = GetAnimation(info.clip);
@ -320,7 +323,7 @@ namespace Spine.Unity {
for (int c = 0; c < clipInfoCount; c++) { for (int c = 0; c < clipInfoCount; c++) {
var info = clipInfo[c]; var info = clipInfo[c];
float weight = info.weight * layerWeight; if (weight == 0) continue; float weight = info.weight * layerWeight; if (weight < WeightEpsilon) continue;
var clip = GetAnimation(info.clip); var clip = GetAnimation(info.clip);
if (clip != null) if (clip != null)
previousAnimations.Add(clip); previousAnimations.Add(clip);
@ -329,7 +332,7 @@ namespace Spine.Unity {
if (hasNext) { if (hasNext) {
for (int c = 0; c < nextClipInfoCount; c++) { for (int c = 0; c < nextClipInfoCount; c++) {
var info = nextClipInfo[c]; var info = nextClipInfo[c];
float weight = info.weight * layerWeight; if (weight == 0) continue; float weight = info.weight * layerWeight; if (weight < WeightEpsilon) continue;
var clip = GetAnimation(info.clip); var clip = GetAnimation(info.clip);
if (clip != null) if (clip != null)
previousAnimations.Add(clip); previousAnimations.Add(clip);
@ -341,7 +344,7 @@ namespace Spine.Unity {
{ {
var info = interruptingClipInfo[c]; var info = interruptingClipInfo[c];
float clipWeight = shallInterpolateWeightTo1 ? (info.weight + 1.0f) * 0.5f : info.weight; float clipWeight = shallInterpolateWeightTo1 ? (info.weight + 1.0f) * 0.5f : info.weight;
float weight = clipWeight * layerWeight; if (weight == 0) continue; float weight = clipWeight * layerWeight; if (weight < WeightEpsilon) continue;
var clip = GetAnimation(info.clip); var clip = GetAnimation(info.clip);
if (clip != null) if (clip != null)
previousAnimations.Add(clip); previousAnimations.Add(clip);