From 20683ff9cea6d84abaa8c42d9309c89da2fb4fd7 Mon Sep 17 00:00:00 2001
From: Nathan Sweet <nathan.sweet@gmail.com>
Date: Sat, 19 Apr 2025 18:12:45 -0400
Subject: [PATCH] [libgdx] Improved constraint sorting.

---
 .../esotericsoftware/spine/IkConstraint.java  |  5 +----
 .../spine/PathConstraint.java                 |  4 ----
 .../spine/PhysicsConstraint.java              |  3 ---
 .../com/esotericsoftware/spine/Skeleton.java  |  9 +++++----
 .../com/esotericsoftware/spine/Slider.java    |  4 +---
 .../spine/TransformConstraint.java            | 20 ++++---------------
 6 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java
index 4e0236ef0..e6da05415 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/IkConstraint.java
@@ -75,10 +75,9 @@ public class IkConstraint extends Constraint<IkConstraint, IkConstraintData, IkC
 
 	void sort (Skeleton skeleton) {
 		skeleton.sortBone(target);
-
 		Bone parent = bones.items[0].bone;
-		skeleton.sortBone(parent);
 		skeleton.resetCache(parent);
+		skeleton.sortBone(parent);
 		if (bones.size == 1) {
 			skeleton.updateCache.add(this);
 			skeleton.sortReset(parent.children);
@@ -86,9 +85,7 @@ public class IkConstraint extends Constraint<IkConstraint, IkConstraintData, IkC
 			Bone child = bones.items[1].bone;
 			skeleton.resetCache(child);
 			skeleton.sortBone(child);
-
 			skeleton.updateCache.add(this);
-
 			skeleton.sortReset(parent.children);
 			child.sorted = true;
 		}
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java
index ccc58f043..0b0fbabcf 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java
@@ -464,9 +464,7 @@ public class PathConstraint extends Constraint<PathConstraint, PathConstraintDat
 		if (skeleton.skin != null) sortPathConstraintAttachment(skeleton, skeleton.skin, slotIndex, slotBone);
 		if (skeleton.data.defaultSkin != null && skeleton.data.defaultSkin != skeleton.skin)
 			sortPathConstraintAttachment(skeleton, skeleton.data.defaultSkin, slotIndex, slotBone);
-
 		sortPathConstraintAttachment(skeleton, slot.pose.attachment, slotBone);
-
 		BonePose[] bones = this.bones.items;
 		int boneCount = this.bones.size;
 		for (int i = 0; i < boneCount; i++) {
@@ -474,9 +472,7 @@ public class PathConstraint extends Constraint<PathConstraint, PathConstraintDat
 			skeleton.resetCache(bone);
 			skeleton.sortBone(bone);
 		}
-
 		skeleton.updateCache.add(this);
-
 		for (int i = 0; i < boneCount; i++)
 			skeleton.sortReset(bones[i].bone.children);
 		for (int i = 0; i < boneCount; i++)
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java
index a21a32085..2e9161470 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PhysicsConstraint.java
@@ -269,12 +269,9 @@ public class PhysicsConstraint extends Constraint<PhysicsConstraint, PhysicsCons
 	void sort (Skeleton skeleton) {
 		Bone bone = this.bone.bone;
 		skeleton.sortBone(bone);
-
 		skeleton.resetCache(bone);
 		skeleton.updateCache.add(this);
-
 		skeleton.sortReset(bone.children);
-		bone.sorted = true;
 	}
 
 	boolean isSourceActive () {
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java
index 91cd9c1ab..47ce3b518 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java
@@ -201,7 +201,7 @@ public class Skeleton {
 	}
 
 	void sortBone (Bone bone) {
-		if (bone.sorted) return;
+		if (bone.sorted || !bone.active) return;
 		Bone parent = bone.parent;
 		if (parent != null) sortBone(parent);
 		bone.sorted = true;
@@ -212,9 +212,10 @@ public class Skeleton {
 		Bone[] items = bones.items;
 		for (int i = 0, n = bones.size; i < n; i++) {
 			Bone bone = items[i];
-			if (!bone.active) continue;
-			if (bone.sorted) sortReset(bone.children);
-			bone.sorted = false;
+			if (bone.active) {
+				if (bone.sorted) sortReset(bone.children);
+				bone.sorted = false;
+			}
 		}
 	}
 
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slider.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slider.java
index fbbaaab55..5cbb38a1f 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slider.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Slider.java
@@ -52,6 +52,7 @@ public class Slider extends Constraint<Slider, SliderData, SliderPose> {
 	}
 
 	public void update (Skeleton skeleton, Physics physics) {
+		if (pose.mix == 0) return;
 		SliderPose pose = applied;
 		data.animation.apply(skeleton, pose.time, pose.time, false, null, pose.mix, MixBlend.replace, MixDirection.in, true);
 	}
@@ -71,7 +72,6 @@ public class Slider extends Constraint<Slider, SliderData, SliderPose> {
 			Timeline t = timelines[i];
 			if (t instanceof BoneTimeline timeline) {
 				Bone bone = bones[timeline.getBoneIndex()];
-				skeleton.sortBone(bone);
 				skeleton.sortReset(bone.children);
 				bone.sorted = false;
 			} else if (t instanceof SlotTimeline timeline)
@@ -86,7 +86,5 @@ public class Slider extends Constraint<Slider, SliderData, SliderPose> {
 			} else if (t instanceof ConstraintTimeline timeline) //
 				skeleton.resetCache(skeleton.constraints.items[timeline.getConstraintIndex()]);
 		}
-		for (int i = 0; i < timelineCount; i++)
-			if (timelines[i] instanceof BoneTimeline boneTimeline) skeleton.sortBone(bones[boneTimeline.getBoneIndex()]);
 	}
 }
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java
index 8d0dc8946..b486c67ab 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java
@@ -102,26 +102,14 @@ public class TransformConstraint extends Constraint<TransformConstraint, Transfo
 
 	void sort (Skeleton skeleton) {
 		skeleton.sortBone(source);
-
 		BonePose[] bones = this.bones.items;
 		int boneCount = this.bones.size;
-		if (data.localSource) {
-			for (int i = 0; i < boneCount; i++) {
-				Bone child = bones[i].bone;
-				skeleton.resetCache(child);
-				skeleton.sortBone(child.parent);
-				skeleton.sortBone(child);
-			}
-		} else {
-			for (int i = 0; i < boneCount; i++) {
-				Bone bone = bones[i].bone;
-				skeleton.resetCache(bone);
-				skeleton.sortBone(bone);
-			}
+		for (int i = 0; i < boneCount; i++) {
+			Bone bone = bones[i].bone;
+			skeleton.resetCache(bone);
+			skeleton.sortBone(bone);
 		}
-
 		skeleton.updateCache.add(this);
-
 		for (int i = 0; i < boneCount; i++)
 			skeleton.sortReset(bones[i].bone.children);
 		for (int i = 0; i < boneCount; i++)