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

[libgdx] Fixed transform constraints ToScaleX/Y when skeleton scale is used.

Browse Source
This commit is contained in:
Davide Tantillo 2025-06-19 17:45:41 +02:00
parent e723893c0c
commit 1408b21dee
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java
View File

@ -94,7 +94,7 @@ public class TransformConstraint extends Constraint<TransformConstraint, Transfo
else else
clamped = clamp(clamped, to.max, to.offset); clamped = clamp(clamped, to.max, to.offset);
} }
to.apply(p, bone, clamped, localTarget, additive); to.apply(skeleton, p, bone, clamped, localTarget, additive);
} }
} }
} }

27
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraintData.java
View File

@ -190,7 +190,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
abstract public float mix (TransformConstraintPose pose); abstract public float mix (TransformConstraintPose pose);
/** Applies the value to this property. */ /** Applies the value to this property. */
abstract public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive); abstract public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive);
} }
static public class FromRotate extends FromProperty { static public class FromRotate extends FromProperty {
@ -208,7 +209,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
return pose.mixRotate; return pose.mixRotate;
} }
public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive) { public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive) {
if (local) { if (local) {
if (!additive) value -= bone.rotation; if (!additive) value -= bone.rotation;
bone.rotation += value * pose.mixRotate; bone.rotation += value * pose.mixRotate;
@ -241,7 +243,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
return pose.mixX; return pose.mixX;
} }
public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive) { public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive) {
if (local) { if (local) {
if (!additive) value -= bone.x; if (!additive) value -= bone.x;
bone.x += value * pose.mixX; bone.x += value * pose.mixX;
@ -263,7 +266,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
return pose.mixY; return pose.mixY;
} }
public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive) { public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive) {
if (local) { if (local) {
if (!additive) value -= bone.y; if (!additive) value -= bone.y;
bone.y += value * pose.mixY; bone.y += value * pose.mixY;
@ -287,7 +291,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
return pose.mixScaleX; return pose.mixScaleX;
} }
public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive) { public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive) {
if (local) { if (local) {
if (additive) if (additive)
bone.scaleX *= 1 + ((value - 1) * pose.mixScaleX); bone.scaleX *= 1 + ((value - 1) * pose.mixScaleX);
@ -298,9 +303,9 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
if (additive) if (additive)
s = 1 + (value - 1) * pose.mixScaleX; s = 1 + (value - 1) * pose.mixScaleX;
else { else {
s = (float)Math.sqrt(bone.a * bone.a + bone.c * bone.c); s = (float)Math.sqrt(bone.a * bone.a + bone.c * bone.c) / skeleton.scaleX;
if (s != 0) s = 1 + (value / s - 1) * pose.mixScaleX; if (s != 0) s = 1 + (value / s - 1) * pose.mixScaleX;
} }
bone.a *= s; bone.a *= s;
bone.c *= s; bone.c *= s;
} }
@ -320,7 +325,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
return pose.mixScaleY; return pose.mixScaleY;
} }
public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive) { public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive) {
if (local) { if (local) {
if (additive) if (additive)
bone.scaleY *= 1 + ((value - 1) * pose.mixScaleY); bone.scaleY *= 1 + ((value - 1) * pose.mixScaleY);
@ -331,7 +337,7 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
if (additive) if (additive)
s = 1 + (value - 1) * pose.mixScaleY; s = 1 + (value - 1) * pose.mixScaleY;
else { else {
s = (float)Math.sqrt(bone.b * bone.b + bone.d * bone.d); s = (float)Math.sqrt(bone.b * bone.b + bone.d * bone.d) / skeleton.scaleY;
if (s != 0) s = 1 + (value / s - 1) * pose.mixScaleY; if (s != 0) s = 1 + (value / s - 1) * pose.mixScaleY;
} }
bone.b *= s; bone.b *= s;
@ -353,7 +359,8 @@ public class TransformConstraintData extends ConstraintData<TransformConstraint,
return pose.mixShearY; return pose.mixShearY;
} }
public void apply (TransformConstraintPose pose, BonePose bone, float value, boolean local, boolean additive) { public void apply (Skeleton skeleton, TransformConstraintPose pose, BonePose bone, float value, boolean local,
boolean additive) {
if (local) { if (local) {
if (!additive) value -= bone.shearY; if (!additive) value -= bone.shearY;
bone.shearY += value * pose.mixShearY; bone.shearY += value * pose.mixShearY;