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

[lua] Fixed #1820

Browse Source 
- Port of TransformMode.noRotationOrReflection was incorrect.
- AnimationState.applyAttachmentTimeline was passed incorrect arguments.
This commit is contained in:
badlogic 2020-12-05 10:06:08 +01:00
parent 51a0641c6e
commit 444810c598
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-lua/AnimationState.lua
View File

@ -381,7 +381,7 @@ function AnimationState:apply (skeleton)
self:applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii * 2, self:applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii * 2,
firstFrame) firstFrame)
elseif timeline.type == Animation.TimelineType.attachment then elseif timeline.type == Animation.TimelineType.attachment then
self:applyAttachmentTimeline(skeleton, animationTime, timelineBlend, true) self:applyAttachmentTimeline(timeline, skeleton, animationTime, timelineBlend, true)
else else
timeline:apply(skeleton, animationLast, animationTime, self.events, mix, timelineBlend, MixDirection._in) timeline:apply(skeleton, animationLast, animationTime, self.events, mix, timelineBlend, MixDirection._in)
end end

2
spine-lua/Bone.lua
View File

@ -164,7 +164,7 @@ function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX,
self.b = pa * lb - pb * ld self.b = pa * lb - pb * ld
self.c = pc * la + pd * lc self.c = pc * la + pd * lc
self.d = pc * lb + pd * ld self.d = pc * lb + pd * ld
return
elseif transformMode == TransformMode.noScale or transformMode == TransformMode.noScaleOrReflection then elseif transformMode == TransformMode.noScale or transformMode == TransformMode.noScaleOrReflection then
local cos = math_cos(math_rad(rotation)) local cos = math_cos(math_rad(rotation))
local sin = math_sin(math_rad(rotation)) local sin = math_sin(math_rad(rotation))