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

Merge branch '4.0' into 4.1-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-01-26 15:27:59 +01:00
commit 091ece0aa3
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-csharp/src/Animation.cs
View File

@ -774,8 +774,8 @@ namespace Spine {
bone.scaleY = by + (Math.Abs(y) * Math.Sign(by) - by) * alpha; bone.scaleY = by + (Math.Abs(y) * Math.Sign(by) - by) * alpha;
break; break;
case MixBlend.Add: case MixBlend.Add:
bone.scaleX = (x - bone.data.scaleX) * alpha; bone.scaleX += (x - bone.data.scaleX) * alpha;
bone.scaleY = (y - bone.data.scaleY) * alpha; bone.scaleY += (y - bone.data.scaleY) * alpha;
break; break;
} }
} else { } else {
@ -857,7 +857,7 @@ namespace Spine {
bone.scaleX = bx + (Math.Abs(x) * Math.Sign(bx) - bx) * alpha; bone.scaleX = bx + (Math.Abs(x) * Math.Sign(bx) - bx) * alpha;
break; break;
case MixBlend.Add: case MixBlend.Add:
bone.scaleX = (x - bone.data.scaleX) * alpha; bone.scaleX += (x - bone.data.scaleX) * alpha;
break; break;
} }
} else { } else {
@ -934,7 +934,7 @@ namespace Spine {
bone.scaleY = by + (Math.Abs(y) * Math.Sign(by) - by) * alpha; bone.scaleY = by + (Math.Abs(y) * Math.Sign(by) - by) * alpha;
break; break;
case MixBlend.Add: case MixBlend.Add:
bone.scaleY = (y - bone.data.scaleY) * alpha; bone.scaleY += (y - bone.data.scaleY) * alpha;
break; break;
} }
} else { } else {

1
spine-csharp/src/Skeleton.cs
View File

@ -28,7 +28,6 @@
*****************************************************************************/ *****************************************************************************/
using System; using System;
using System.Collections.Generic;
namespace Spine { namespace Spine {
public class Skeleton { public class Skeleton {

8
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -743,8 +743,8 @@ public class Animation {
bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha; bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha;
break; break;
case add: case add:
bone.scaleX = (x - bone.data.scaleX) * alpha; bone.scaleX += (x - bone.data.scaleX) * alpha;
bone.scaleY = (y - bone.data.scaleY) * alpha; bone.scaleY += (y - bone.data.scaleY) * alpha;
} }
} else { } else {
switch (blend) { switch (blend) {
@ -822,7 +822,7 @@ public class Animation {
bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bx) * alpha; bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bx) * alpha;
break; break;
case add: case add:
bone.scaleX = (x - bone.data.scaleX) * alpha; bone.scaleX += (x - bone.data.scaleX) * alpha;
} }
} else { } else {
switch (blend) { switch (blend) {
@ -895,7 +895,7 @@ public class Animation {
bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha; bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha;
break; break;
case add: case add:
bone.scaleY = (y - bone.data.scaleY) * alpha; bone.scaleY += (y - bone.data.scaleY) * alpha;
} }
} else { } else {
switch (blend) { switch (blend) {