소스 검색

[as3] Ported scale mixing fix, closes #2028.

Mario Zechner 3 년 전
부모
커밋
b0de9cbfb6

+ 2 - 2
spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as

@@ -115,8 +115,8 @@ package spine.animation {
 						bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
 						break;
 					case MixBlend.add:
-						bone.scaleX = (x - bone.data.scaleX) * alpha;
-						bone.scaleY = (y - bone.data.scaleY) * alpha;
+						bone.scaleX += (x - bone.data.scaleX) * alpha;
+						bone.scaleY += (y - bone.data.scaleY) * alpha;
 					}
 				} else {
 					switch (blend) {

+ 1 - 1
spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as

@@ -82,7 +82,7 @@ package spine.animation {
 						bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bx) * alpha;
 						break;
 					case MixBlend.add:
-						bone.scaleX = (x - bone.data.scaleX) * alpha;
+						bone.scaleX += (x - bone.data.scaleX) * alpha;
 					}
 				} else {
 					switch (blend) {

+ 1 - 1
spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as

@@ -82,7 +82,7 @@ package spine.animation {
 						bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
 						break;
 					case MixBlend.add:
-						bone.scaleY = (y - bone.data.scaleY) * alpha;
+						bone.scaleY += (y - bone.data.scaleY) * alpha;
 					}
 				} else {
 					switch (blend) {