소스 검색

[lua] Fixed #1820

- Port of TransformMode.noRotationOrReflection was incorrect.
- AnimationState.applyAttachmentTimeline was passed incorrect arguments.
badlogic 4 년 전
부모
커밋
444810c598
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      spine-lua/AnimationState.lua
  2. 1 1
      spine-lua/Bone.lua

+ 1 - 1
spine-lua/AnimationState.lua

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

+ 1 - 1
spine-lua/Bone.lua

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