[haxe] Fix some missing porting loc.

davidetan · davidetan · commit c48487a423f5 · 2026-04-09T11:04:32.000+02:00
diff --git a/spine-haxe/spine-haxe/spine/BonePose.hx b/spine-haxe/spine-haxe/spine/BonePose.hx
@@ -262,8 +262,8 @@ class BonePose implements Pose<BonePose> implements Update {
 					ib = pb * pid;
 				case Inherit.noScale, Inherit.noScaleOrReflection:
 					var r = rotation * MathUtils.degRad,
-						cos = Math.cos(rotation),
-						sin = Math.sin(rotation);
+						cos = Math.cos(r),
+						sin = Math.sin(r);
 					pa = (pa * cos + pb * sin) / skeleton.scaleX;
 					pc = (pc * cos + pd * sin) / skeleton.scaleY;
 					var s = Math.sqrt(pa * pa + pc * pc);
@@ -405,7 +405,7 @@ class BonePose implements Pose<BonePose> implements Update {
 
 	/** Transforms a local rotation to a world rotation. */
 	public function localToWorldRotation(localRotation:Float):Float {
-		localRotation -= rotation - shearX;
+		localRotation -= rotation + shearX;
 		var sin:Float = MathUtils.sinDeg(localRotation),
 			cos:Float = MathUtils.cosDeg(localRotation);
 		return Math.atan2(cos * c + sin * d, cos * a + sin * b) * MathUtils.radDeg;
diff --git a/spine-haxe/spine-haxe/spine/animation/AnimationState.hx b/spine-haxe/spine-haxe/spine/animation/AnimationState.hx
@@ -115,11 +115,11 @@ class AnimationState {
 				var nextTime:Float = current.trackLast - next.delay;
 				if (nextTime >= 0) {
 					next.delay = 0;
-					next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
+					next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
 					current.trackTime += currentDelta;
 					setCurrent(i, next, true);
 					while (next.mixingFrom != null) {
-						next.mixTime += currentDelta;
+						next.mixTime += delta;
 						next = next.mixingFrom;
 					}
 					continue;
@@ -530,6 +530,7 @@ class AnimationState {
 	private function setCurrent(index:Int, current:TrackEntry, interrupt:Bool):Void {
 		var from:TrackEntry = expandToIndex(index);
 		tracks[index] = current;
+		current.previous = null;
 
 		if (from != null) {
 			if (interrupt)
diff --git a/spine-haxe/spine-haxe/spine/animation/DeformTimeline.hx b/spine-haxe/spine-haxe/spine/animation/DeformTimeline.hx
@@ -52,6 +52,7 @@ class DeformTimeline extends SlotCurveTimeline {
 		this.attachment = attachment;
 		vertices = new Array<Array<Float>>();
 		vertices.resize(frameCount);
+		this.additive = true;
 	}
 
 	public override function getFrameCount():Int {
diff --git a/spine-haxe/spine-haxe/spine/animation/DrawOrderFolderTimeline.hx b/spine-haxe/spine-haxe/spine/animation/DrawOrderFolderTimeline.hx
@@ -52,6 +52,7 @@ class DrawOrderFolderTimeline extends Timeline {
 			inFolder[i] = false;
 		for (i in slots)
 			inFolder[i] = true;
+		this.instant = true;
 	}
 
 	private static function getPropertyIds(slots:Array<Int>):Array<String> {
diff --git a/spine-haxe/spine-haxe/spine/animation/DrawOrderTimeline.hx b/spine-haxe/spine-haxe/spine/animation/DrawOrderTimeline.hx
@@ -44,6 +44,7 @@ class DrawOrderTimeline extends Timeline {
 		super(frameCount, Property.drawOrder);
 		drawOrders = new Array<Array<Int>>();
 		drawOrders.resize(frameCount);
+		this.instant = true;
 	}
 
 	public var frameCount(get, never):Int;
diff --git a/spine-haxe/spine-haxe/spine/animation/EventTimeline.hx b/spine-haxe/spine-haxe/spine/animation/EventTimeline.hx
@@ -42,6 +42,7 @@ class EventTimeline extends Timeline {
 		super(frameCount, Property.event);
 		events = new Array<Event>();
 		events.resize(frameCount);
+		this.instant = true;
 	}
 
 	public override function getFrameCount():Int {
diff --git a/spine-haxe/spine-haxe/spine/animation/PathConstraintMixTimeline.hx b/spine-haxe/spine-haxe/spine/animation/PathConstraintMixTimeline.hx
@@ -110,8 +110,14 @@ class PathConstraintMixTimeline extends CurveTimeline implements ConstraintTimel
 		}
 
 		var base = fromSetup ? constraint.data.setupPose : pose;
-		pose.mixRotate = base.mixRotate + (rotate - base.mixRotate) * alpha;
-		pose.mixX = base.mixX + (x - base.mixX) * alpha;
-		pose.mixY = base.mixY + (y - base.mixY) * alpha;
+		if (add) {
+			pose.mixRotate = base.mixRotate + rotate * alpha;
+			pose.mixX = base.mixX + x * alpha;
+			pose.mixY = base.mixY + y * alpha;
+		} else {
+			pose.mixRotate = base.mixRotate + (rotate - base.mixRotate) * alpha;
+			pose.mixX = base.mixX + (x - base.mixX) * alpha;
+			pose.mixY = base.mixY + (y - base.mixY) * alpha;
+		}
 	}
 }
diff --git a/spine-haxe/spine-haxe/spine/animation/PathConstraintPositionTimeline.hx b/spine-haxe/spine-haxe/spine/animation/PathConstraintPositionTimeline.hx
@@ -33,6 +33,7 @@ package spine.animation;
 class PathConstraintPositionTimeline extends ConstraintTimeline1 {
 	public function new(frameCount:Int, bezierCount:Int, constraintIndex:Int) {
 		super(frameCount, bezierCount, constraintIndex, Property.pathConstraintPosition);
+		this.additive = true;
 	}
 
 	public function apply(skeleton:Skeleton, lastTime:Float, time:Float, events:Array<Event>, alpha:Float, fromSetup:Bool, add:Bool, out:Bool,
diff --git a/spine-haxe/spine-haxe/spine/animation/PhysicsConstraintResetTimeline.hx b/spine-haxe/spine-haxe/spine/animation/PhysicsConstraintResetTimeline.hx
@@ -41,6 +41,7 @@ class PhysicsConstraintResetTimeline extends Timeline implements ConstraintTimel
 	public function new(frameCount:Int, constraintIndex:Int) {
 		super(frameCount, Property.physicsConstraintReset);
 		this.constraintIndex = constraintIndex;
+		this.instant = true;
 	}
 
 	public function getConstraintIndex() {
diff --git a/spine-haxe/spine-haxe/spine/animation/SequenceTimeline.hx b/spine-haxe/spine-haxe/spine/animation/SequenceTimeline.hx
@@ -44,6 +44,7 @@ class SequenceTimeline extends Timeline implements SlotTimeline {
 		super(frameCount, Std.string(Property.sequence) + "|" + Std.string(slotIndex) + "|" + Std.string(attachment.sequence.id));
 		this.slotIndex = slotIndex;
 		this.attachment = attachment;
+		this.instant = true;
 	}
 
 	public override function getFrameEntries():Int {
diff --git a/spine-haxe/spine-haxe/spine/animation/SliderMixTimeline.hx b/spine-haxe/spine-haxe/spine/animation/SliderMixTimeline.hx
@@ -35,6 +35,7 @@ import haxe.macro.Type.VarAccess;
 class SliderMixTimeline extends ConstraintTimeline1 {
 	public function new(frameCount:Int, bezierCount:Int, constraintIndex:Int) {
 		super(frameCount, bezierCount, constraintIndex, Property.sliderMix);
+		this.additive = true;
 	}
 
 	public function apply(skeleton:Skeleton, lastTime:Float, time:Float, events:Array<Event>, alpha:Float, fromSetup:Bool, add:Bool, out:Bool,
diff --git a/spine-haxe/spine-haxe/spine/animation/TrackEntry.hx b/spine-haxe/spine-haxe/spine/animation/TrackEntry.hx
@@ -227,7 +227,8 @@ class TrackEntry implements Poolable {
 				return animationStart;
 			return (trackTime % duration) + animationStart;
 		}
-		return Math.min(trackTime + animationStart, animationEnd);
+		var animationTime = trackTime + animationStart;
+		return animationEnd >= animation.duration ? animationTime : Math.min(animationTime, animationEnd);
 	}
 
 	/** If this track entry is non-looping, the track time in seconds when TrackEntry.getAnimationEnd() is reached, or the current
diff --git a/spine-haxe/spine-haxe/spine/animation/TransformConstraintTimeline.hx b/spine-haxe/spine-haxe/spine/animation/TransformConstraintTimeline.hx
@@ -48,6 +48,7 @@ class TransformConstraintTimeline extends CurveTimeline implements ConstraintTim
 	public function new(frameCount:Int, bezierCount:Int, constraintIndex:Int) {
 		super(frameCount, bezierCount, Property.transformConstraint + "|" + constraintIndex);
 		this.constraintIndex = constraintIndex;
+		this.additive = true;
 	}
 
 	public override function getFrameEntries():Int {
@@ -128,11 +129,20 @@ class TransformConstraintTimeline extends CurveTimeline implements ConstraintTim
 		}
 
 		var base = fromSetup ? constraint.data.setupPose : pose;
-		pose.mixRotate = base.mixRotate + (rotate - base.mixRotate) * alpha;
-		pose.mixX = base.mixX + (x - base.mixX) * alpha;
-		pose.mixY = base.mixY + (y - base.mixY) * alpha;
-		pose.mixScaleX = base.mixScaleX + (scaleX - base.mixScaleX) * alpha;
-		pose.mixScaleY = base.mixScaleY + (scaleY - base.mixScaleY) * alpha;
-		pose.mixShearY = base.mixShearY + (shearY - base.mixShearY) * alpha;
+		if (add) {
+			pose.mixRotate = base.mixRotate + rotate * alpha;
+			pose.mixX = base.mixX + x * alpha;
+			pose.mixY = base.mixY + y * alpha;
+			pose.mixScaleX = base.mixScaleX + scaleX * alpha;
+			pose.mixScaleY = base.mixScaleY + scaleY * alpha;
+			pose.mixShearY = base.mixShearY + shearY * alpha;
+		} else {
+			pose.mixRotate = base.mixRotate + (rotate - base.mixRotate) * alpha;
+			pose.mixX = base.mixX + (x - base.mixX) * alpha;
+			pose.mixY = base.mixY + (y - base.mixY) * alpha;
+			pose.mixScaleX = base.mixScaleX + (scaleX - base.mixScaleX) * alpha;
+			pose.mixScaleY = base.mixScaleY + (scaleY - base.mixScaleY) * alpha;
+			pose.mixShearY = base.mixShearY + (shearY - base.mixShearY) * alpha;
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ class DeformTimeline extends SlotCurveTimeline {`
`52`	`52`	`this.attachment = attachment;`
`53`	`53`	`vertices = new Array<Array<Float>>();`
`54`	`54`	`vertices.resize(frameCount);`
	`55`	`+ this.additive = true;`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`public override function getFrameCount():Int {`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ class DrawOrderFolderTimeline extends Timeline {`
`52`	`52`	`inFolder[i] = false;`
`53`	`53`	`for (i in slots)`
`54`	`54`	`inFolder[i] = true;`
	`55`	`+ this.instant = true;`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`private static function getPropertyIds(slots:Array<Int>):Array<String> {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ class DrawOrderTimeline extends Timeline {`
`44`	`44`	`super(frameCount, Property.drawOrder);`
`45`	`45`	`drawOrders = new Array<Array<Int>>();`
`46`	`46`	`drawOrders.resize(frameCount);`
	`47`	`+ this.instant = true;`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`public var frameCount(get, never):Int;`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ class EventTimeline extends Timeline {`
`42`	`42`	`super(frameCount, Property.event);`
`43`	`43`	`events = new Array<Event>();`
`44`	`44`	`events.resize(frameCount);`
	`45`	`+ this.instant = true;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`public override function getFrameCount():Int {`
Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,14 @@ class PathConstraintMixTimeline extends CurveTimeline implements ConstraintTimel`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`var base = fromSetup ? constraint.data.setupPose : pose;`
`113`		`- pose.mixRotate = base.mixRotate + (rotate - base.mixRotate) * alpha;`
`114`		`- pose.mixX = base.mixX + (x - base.mixX) * alpha;`
`115`		`- pose.mixY = base.mixY + (y - base.mixY) * alpha;`
	`113`	`+ if (add) {`
	`114`	`+ pose.mixRotate = base.mixRotate + rotate * alpha;`
	`115`	`+ pose.mixX = base.mixX + x * alpha;`
	`116`	`+ pose.mixY = base.mixY + y * alpha;`
	`117`	`+ } else {`
	`118`	`+ pose.mixRotate = base.mixRotate + (rotate - base.mixRotate) * alpha;`
	`119`	`+ pose.mixX = base.mixX + (x - base.mixX) * alpha;`
	`120`	`+ pose.mixY = base.mixY + (y - base.mixY) * alpha;`
	`121`	`+ }`
`116`	`122`	`}`
`117`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ package spine.animation;`
`33`	`33`	`class PathConstraintPositionTimeline extends ConstraintTimeline1 {`
`34`	`34`	`public function new(frameCount:Int, bezierCount:Int, constraintIndex:Int) {`
`35`	`35`	`super(frameCount, bezierCount, constraintIndex, Property.pathConstraintPosition);`
	`36`	`+ this.additive = true;`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`public function apply(skeleton:Skeleton, lastTime:Float, time:Float, events:Array<Event>, alpha:Float, fromSetup:Bool, add:Bool, out:Bool,`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ class PhysicsConstraintResetTimeline extends Timeline implements ConstraintTimel`
`41`	`41`	`public function new(frameCount:Int, constraintIndex:Int) {`
`42`	`42`	`super(frameCount, Property.physicsConstraintReset);`
`43`	`43`	`this.constraintIndex = constraintIndex;`
	`44`	`+ this.instant = true;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`public function getConstraintIndex() {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ class SequenceTimeline extends Timeline implements SlotTimeline {`
`44`	`44`	`super(frameCount, Std.string(Property.sequence) + "\|" + Std.string(slotIndex) + "\|" + Std.string(attachment.sequence.id));`
`45`	`45`	`this.slotIndex = slotIndex;`
`46`	`46`	`this.attachment = attachment;`
	`47`	`+ this.instant = true;`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`public override function getFrameEntries():Int {`