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

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2022-09-21 13:19:55 +02:00
commit dac3983b62
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -438,7 +438,7 @@ int spAnimationState_apply(spAnimationState *self, spSkeleton *skeleton) {
if (!shortestRotation && timeline->type == SP_TIMELINE_ROTATE) if (!shortestRotation && timeline->type == SP_TIMELINE_ROTATE)
_spAnimationState_applyRotateTimeline(self, timeline, skeleton, applyTime, mix, timelineBlend, _spAnimationState_applyRotateTimeline(self, timeline, skeleton, applyTime, mix, timelineBlend,
timelinesRotation, ii << 1, firstFrame); timelinesRotation, ii << 1, firstFrame);
else if (timeline->type == SP_TIMELINE_ROTATE) else if (timeline->type == SP_TIMELINE_ATTACHMENT)
_spAnimationState_applyAttachmentTimeline(self, timeline, skeleton, applyTime, timelineBlend, -1); _spAnimationState_applyAttachmentTimeline(self, timeline, skeleton, applyTime, timelineBlend, -1);
else else
spTimeline_apply(timeline, skeleton, animationLast, applyTime, applyEvents, &internal->eventsCount, spTimeline_apply(timeline, skeleton, animationLast, applyTime, applyEvents, &internal->eventsCount,

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

@ -513,9 +513,9 @@ namespace Spine.Unity.Editor {
bone.UpdateWorldTransform(); bone.UpdateWorldTransform();
Vector2[] uvs = ExtractUV(attachment.UVs);
float[] floatVerts = new float[8]; float[] floatVerts = new float[8];
attachment.ComputeWorldVertices(slot, floatVerts, 0); attachment.ComputeWorldVertices(slot, floatVerts, 0);
Vector2[] uvs = ExtractUV(attachment.UVs);
Vector3[] verts = ExtractVerts(floatVerts); Vector3[] verts = ExtractVerts(floatVerts);
//unrotate verts now that they're centered //unrotate verts now that they're centered
@ -550,9 +550,9 @@ namespace Spine.Unity.Editor {
slot.Bone.Y = 0; slot.Bone.Y = 0;
slot.Bone.UpdateWorldTransform(); slot.Bone.UpdateWorldTransform();
Vector2[] uvs = ExtractUV(attachment.UVs);
float[] floatVerts = new float[attachment.WorldVerticesLength]; float[] floatVerts = new float[attachment.WorldVerticesLength];
attachment.ComputeWorldVertices(slot, floatVerts); attachment.ComputeWorldVertices(slot, floatVerts);
Vector2[] uvs = ExtractUV(attachment.UVs);
Vector3[] verts = ExtractVerts(floatVerts); Vector3[] verts = ExtractVerts(floatVerts);
int[] triangles = attachment.Triangles; int[] triangles = attachment.Triangles;
@ -617,7 +617,6 @@ namespace Spine.Unity.Editor {
float[] floatVerts = new float[attachment.WorldVerticesLength]; float[] floatVerts = new float[attachment.WorldVerticesLength];
attachment.ComputeWorldVertices(skeleton.Slots.Items[slotIndex], floatVerts); attachment.ComputeWorldVertices(skeleton.Slots.Items[slotIndex], floatVerts);
Vector2[] uvs = ExtractUV(attachment.UVs); Vector2[] uvs = ExtractUV(attachment.UVs);
Vector3[] verts = ExtractVerts(floatVerts); Vector3[] verts = ExtractVerts(floatVerts);