UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[haxe] Fix skeleton json to properties scale missing default.

Browse Source
This commit is contained in:
Davide Tantillo 2025-09-16 10:51:31 +02:00
parent 98a39e9079
commit 34be39c098
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-haxe/spine-haxe/spine/SkeletonJson.hx
View File

@ -270,7 +270,7 @@ class SkeletonJson {
}
to.offset = getFloat(toEntry, "offset", 0) * toScale;
to.max = getFloat(toEntry, "max", 1) * toScale;
to.scale = getFloat(toEntry, "scale") * toScale / fromScale;
to.scale = getFloat(toEntry, "scale", 1) * toScale / fromScale;
from.to.push(to);
}
if (from.to.length > 0)

27
spine-haxe/spine-haxe/spine/TransformConstraintData.hx
View File

@ -66,27 +66,6 @@ class TransformConstraintData extends ConstraintData<TransformConstraint, Transf
/** The mapping of transform properties to other transform properties. */
public final properties = new Array<FromProperty>();
/** An offset added to the constrained bone rotation. */
public var offsetRotation:Float = 0;
/** An offset added to the constrained bone X translation. */
public var offsetX:Float = 0;
/** An offset added to the constrained bone Y translation. */
public var offsetY:Float = 0;
/** An offset added to the constrained bone scaleX. */
public var offsetScaleX:Float = 0;
/** An offset added to the constrained bone scaleY. */
public var offsetScaleY:Float = 0;
/** An offset added to the constrained bone shearY. */
public var offsetShearY:Float = 0;
public var relative:Bool = false;
public var local:Bool = false;
public function new(name:String) {
super(name, new TransformConstraintPose());
}
@ -366,9 +345,9 @@ class FromShearY extends FromProperty {
public function value(skeleton:Skeleton, source:BonePose, local:Bool, offsets:Array<Float>):Float {
if (local)
return source.shearY + offsets[TransformConstraintData.SHEARY];
var sx = 1 / skeleton.scaleX, sy = 1 / skeleton.scaleY;
return (Math.atan2(source.d * sy, source.b * sx)
- Math.atan2(source.c * sy, source.a * sx)) * MathUtils.radDeg
var ix = 1 / skeleton.scaleX, iy = 1 / skeleton.scaleY;
return (Math.atan2(source.d * iy, source.b * ix)
- Math.atan2(source.c * iy, source.a * ix)) * MathUtils.radDeg
- 90
+ offsets[TransformConstraintData.SHEARY];
}