UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed exception at prefab baking. Closes #2034.

Browse Source
This commit is contained in:
Harald Csaszar 2022-02-16 19:51:02 +01:00
parent dc2bddd883
commit ece6530b0c
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs
View File

@ -808,20 +808,11 @@ namespace Spine.Unity.Editor {
return clip; return clip;
} }
static int BinarySearch (float[] values, float target) { internal static int Search (float[] frames, float time) {
int low = 0; int n = frames.Length;
int high = values.Length - 2; for (int i = 1; i < n; i++)
if (high == 0) return 1; if (frames[i] > time) return i - 1;
int current = (int)((uint)high >> 1); return n - 1;
while (true) {
if (values[(current + 1)] <= target)
low = current + 1;
else
high = current;
if (low == high) return (low + 1);
current = (int)((uint)(low + high) >> 1);
}
} }
static void BakeBoneConstraints (Bone bone, Spine.Animation animation, AnimationClip clip) { static void BakeBoneConstraints (Bone bone, Spine.Animation animation, AnimationClip clip) {
@ -977,8 +968,7 @@ namespace Spine.Unity.Editor {
lastTime = time; lastTime = time;
listIndex++; listIndex++;
} else if (curveType == 2) { } else {
//bezier //bezier
Keyframe px = xKeys[pIndex]; Keyframe px = xKeys[pIndex];
Keyframe py = yKeys[pIndex]; Keyframe py = yKeys[pIndex];
@ -1058,7 +1048,6 @@ namespace Spine.Unity.Editor {
while (currentTime < endTime) { while (currentTime < endTime) {
int pIndex = listIndex - 1; int pIndex = listIndex - 1;
float curveType = timeline.GetCurveType(frameIndex - 1); float curveType = timeline.GetCurveType(frameIndex - 1);
if (curveType == 0) { if (curveType == 0) {
//linear //linear
Keyframe px = xKeys[pIndex]; Keyframe px = xKeys[pIndex];
@ -1113,7 +1102,7 @@ namespace Spine.Unity.Editor {
lastTime = time; lastTime = time;
listIndex++; listIndex++;
} else if (curveType == 2) { } else {
//bezier //bezier
Keyframe px = xKeys[pIndex]; Keyframe px = xKeys[pIndex];
Keyframe py = yKeys[pIndex]; Keyframe py = yKeys[pIndex];
@ -1240,7 +1229,7 @@ namespace Spine.Unity.Editor {
lastTime = time; lastTime = time;
listIndex++; listIndex++;
} else if (curveType == 2) { } else {
//bezier //bezier
Keyframe pk = keys[pIndex]; Keyframe pk = keys[pIndex];
@ -1365,7 +1354,7 @@ namespace Spine.Unity.Editor {
while (currentTime < endTime) { while (currentTime < endTime) {
float time = frames[f]; float time = frames[f];
int frameIndex = (time >= frames[frames.Length - 1] ? frames.Length : BinarySearch(frames, time)) - 1; int frameIndex = Search(frames, time);
string name = timeline.AttachmentNames[frameIndex]; string name = timeline.AttachmentNames[frameIndex];
foreach (var pair in curveTable) { foreach (var pair in curveTable) {