[c][cpp][flutter][godot][ios] Port d463f34 and 71999c2 from libgdx

badlogic · badlogic · commit f16630af088e · 2026-05-27T00:45:11.000+02:00
Also ports libgdx doc updates f5dea9f and 7d8c983.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## C
 
 - **Additions**
+  - Added generated slider data `max` APIs.
   - Added generated physics constraint `ScaleYMode` APIs.
   - Added generated `Interpolation` and `TrackEntry` mix interpolation APIs for non-linear animation mixing.
   - Added `spine_slider` and `spine_slider_data` types for slider constraints
@@ -13,6 +14,7 @@
   - Added generated animation color and bone icon size/rotation APIs.
 
 - **Bug fixes**
+  - Fixed draw order timelines not mixing out to the setup pose.
   - Fixed slider sorting crashes when slider animations key slot or constraint timelines.
   - Fixed bones that don't inherit rotation when parent scale is near zero.
   - Fixed `BonePose::updateLocalTransform()` for `noScale` and `noScaleOrReflection` inheritance.
@@ -98,6 +100,7 @@
 ## C++
 
 - **Additions**
+  - Added `SliderData::getMax()` / `setMax()` for nonessential bone-driven slider metadata.
   - Added `PhysicsConstraintData::getScaleYMode()` / `setScaleYMode()` to control how physics scaleX affects scaleY.
   - Added `Interpolation` and `TrackEntry::getMixInterpolation()` / `setMixInterpolation()` for non-linear animation mixing.
   - Added `Slider` and `SliderData` classes for slider constraints
@@ -124,6 +127,7 @@
   - Added `Animation::getColor()` and `BoneData` icon size/rotation accessors for nonessential editor data.
 
 - **Bug fixes**
+  - Fixed draw order timelines not mixing out to the setup pose.
   - Fixed slider sorting crashes when slider animations key slot or constraint timelines.
   - Fixed bones that don't inherit rotation when parent scale is near zero.
   - Fixed `BonePose::updateLocalTransform()` for `noScale` and `noScaleOrReflection` inheritance, plus related IK epsilon handling.
@@ -293,13 +297,15 @@
 ### Godot
 
 - **Additions**
+  - Added `SpineSliderData.get_max()` / `set_max()` for nonessential bone-driven slider metadata.
   - Added `SpinePhysicsConstraintData.get_scale_y_mode()` / `set_scale_y_mode()`.
   - Added `SpineTrackEntry` mix interpolation APIs and `SpineConstant.MixInterpolation`.
   - Added convex and inverse clipping support through the updated spine-cpp clipping runtime.
   - Added `SpineSlider` and `SpineSliderData` classes for slider constraints
   - Added `SpineTrackEntry.get_additive()` / `set_additive()` for additive blending per track entry.
 
 - **Bug fixes**
+  - Fixed draw order timelines not mixing out to the setup pose.
   - Fixed editor crashes when assigning skeleton data with slider animations that key slots or constraints.
   - Fixed attachment timelines so hidden setup-pose attachments remain hidden while mixing out, preserving deform behavior.
   - Fixed `SpineAnimationTrack` editor preview paths for nested `AnimationPlayer` roots, and prevented inactive tracks from clearing `SpineSprite` preview animations.
@@ -549,11 +555,13 @@
 ## iOS
 
 - **Additions**
+  - Added generated slider data `max` APIs.
   - Added generated physics constraint `scaleYMode` APIs.
   - Added generated `Interpolation` and `TrackEntry` mix interpolation APIs.
   - Added convex and inverse clipping support through the updated spine-cpp clipping runtime.
 
 - **Bug fixes**
+  - Fixed draw order timelines not mixing out to the setup pose.
   - Fixed bones that don't inherit rotation when parent scale is near zero.
   - Fixed `BonePose.updateLocalTransform(_:)` for `noScale` and `noScaleOrReflection` inheritance.
   - Fixed attachment timelines so hidden setup-pose attachments remain hidden while mixing out, preserving deform behavior.
@@ -570,6 +578,7 @@
 ## Dart
 
 - **Additions**
+  - Added generated slider data `max` APIs.
   - Added generated physics constraint `scaleYMode` APIs.
   - Added generated `Interpolation` and `TrackEntry` mix interpolation APIs.
   - Added `Slider` and `SliderData` classes for slider constraints
@@ -578,6 +587,7 @@
   - Added `Pose`, `Posed`, and `PosedActive` base classes for unified pose management
 
 - **Bug fixes**
+  - Fixed draw order timelines not mixing out to the setup pose.
   - Fixed bones that don't inherit rotation when parent scale is near zero.
   - Fixed `BonePose.updateLocalTransform()` for `noScale` and `noScaleOrReflection` inheritance.
   - Fixed attachment timelines so hidden setup-pose attachments remain hidden while mixing out, preserving deform behavior.
@@ -606,13 +616,15 @@
 ### Flutter
 
 - **Additions**
+  - Added generated slider data `max` APIs.
   - Added generated physics constraint `scaleYMode` APIs.
   - Added generated `Interpolation` and `TrackEntry` mix interpolation APIs.
   - Added convex and inverse clipping support through the updated spine-cpp clipping runtime.
   - Added `fromMemory` methods to `AtlasFlutter`, `SkeletonDataFlutter`, `SkeletonDrawableFlutter`, and `SpineWidget` for loading Spine data from custom sources (memory, encrypted storage, databases, custom caching, etc.)
   - Added example `load_from_memory.dart` demonstrating how to load all assets into memory and use the `fromMemory` API
 
 - **Bug fixes**
+  - Fixed draw order timelines not mixing out to the setup pose.
   - Fixed bones that don't inherit rotation when parent scale is near zero.
   - Fixed `BonePose.updateLocalTransform()` for `noScale` and `noScaleOrReflection` inheritance.
   - Fixed attachment timelines so hidden setup-pose attachments remain hidden while mixing out, preserving deform behavior.
diff --git a/spine-c/src/generated/physics_constraint_data.h b/spine-c/src/generated/physics_constraint_data.h
@@ -57,8 +57,8 @@ SPINE_C_API void spine_physics_constraint_data_set_shear_x(spine_physics_constra
 SPINE_C_API float spine_physics_constraint_data_get_limit(spine_physics_constraint_data self);
 SPINE_C_API void spine_physics_constraint_data_set_limit(spine_physics_constraint_data self, float limit);
 /**
- * Determines how BonePose::getScaleY() changes when
- * PhysicsConstraintData::getScaleX() sets BonePose::getScaleX().
+ * Determines how BonePose::getScaleY() changes when getScaleX() sets
+ * BonePose::getScaleX().
  */
 SPINE_C_API spine_scale_y_mode spine_physics_constraint_data_get_scale_y_mode(spine_physics_constraint_data self);
 SPINE_C_API void spine_physics_constraint_data_set_scale_y_mode(spine_physics_constraint_data self, spine_scale_y_mode scaleYMode);
diff --git a/spine-c/src/generated/slider_data.cpp b/spine-c/src/generated/slider_data.cpp
@@ -91,6 +91,16 @@ void spine_slider_data_set_offset(spine_slider_data self, float offset) {
 	_self->setOffset(offset);
 }
 
+float spine_slider_data_get_max(spine_slider_data self) {
+	SliderData *_self = (SliderData *) self;
+	return _self->getMax();
+}
+
+void spine_slider_data_set_max(spine_slider_data self, float max) {
+	SliderData *_self = (SliderData *) self;
+	_self->setMax(max);
+}
+
 bool spine_slider_data_get_local(spine_slider_data self) {
 	SliderData *_self = (SliderData *) self;
 	return _self->getLocal();
diff --git a/spine-c/src/generated/slider_data.h b/spine-c/src/generated/slider_data.h
@@ -58,6 +58,12 @@ SPINE_C_API void spine_slider_data_set_scale(spine_slider_data self, float scale
  */
 SPINE_C_API float spine_slider_data_get_offset(spine_slider_data self);
 SPINE_C_API void spine_slider_data_set_offset(spine_slider_data self, float offset);
+/**
+ * When a bone is set, the maximum slider time for the bone property range, or 0
+ * if nonessential data was not exported.
+ */
+SPINE_C_API float spine_slider_data_get_max(spine_slider_data self);
+SPINE_C_API void spine_slider_data_set_max(spine_slider_data self, float max);
 /**
  * When true and a bone is set, the bone's local transform property is read
  * instead of its world transform.
diff --git a/spine-c/src/generated/track_entry.h b/spine-c/src/generated/track_entry.h
@@ -81,7 +81,8 @@ SPINE_C_API void spine_track_entry_set_track_time(spine_track_entry self, float
  * animation are set to the setup pose and the track is cleared.
  *
  * It may be desired to use AnimationState::addEmptyAnimation(int, float, float)
- * rather than have the animation abruptly cease being applied.
+ * rather than have the animation abruptly cease being applied, leaving the
+ * current pose.
  */
 SPINE_C_API float spine_track_entry_get_track_end(spine_track_entry self);
 SPINE_C_API void spine_track_entry_set_track_end(spine_track_entry self, float inValue);
diff --git a/spine-cpp/include/spine/AnimationState.h b/spine-cpp/include/spine/AnimationState.h
@@ -159,7 +159,7 @@ namespace spine {
 		/// properties keyed by the animation are set to the setup pose and the track is cleared.
 		///
 		/// It may be desired to use AnimationState::addEmptyAnimation(int, float, float) rather than have the animation
-		/// abruptly cease being applied.
+		/// abruptly cease being applied, leaving the current pose.
 		float getTrackEnd();
 
 		void setTrackEnd(float inValue);
diff --git a/spine-cpp/include/spine/PhysicsConstraintData.h b/spine-cpp/include/spine/PhysicsConstraintData.h
@@ -85,7 +85,7 @@ namespace spine {
 		float getLimit();
 		void setLimit(float limit);
 
-		/// Determines how BonePose::getScaleY() changes when PhysicsConstraintData::getScaleX() sets BonePose::getScaleX().
+		/// Determines how BonePose::getScaleY() changes when getScaleX() sets BonePose::getScaleX().
 		ScaleYMode getScaleYMode();
 		void setScaleYMode(ScaleYMode scaleYMode);
 
diff --git a/spine-cpp/include/spine/SliderData.h b/spine-cpp/include/spine/SliderData.h
@@ -87,6 +87,10 @@ namespace spine {
 		float getOffset();
 		void setOffset(float offset);
 
+		/// When a bone is set, the maximum slider time for the bone property range, or 0 if nonessential data was not exported.
+		float getMax();
+		void setMax(float max);
+
 		/// When true and a bone is set, the bone's local transform property is read instead of its world transform.
 		bool getLocal();
 		void setLocal(bool local);
@@ -99,6 +103,7 @@ namespace spine {
 		FromProperty *_property;
 		float _offset;
 		float _scale;
+		float _max;
 		bool _local;
 	};
 }
diff --git a/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/src/spine/AnimationState.cpp
@@ -981,16 +981,16 @@ float AnimationState::applyMixingFrom(TrackEntry *to, Skeleton &skeleton) {
 	for (size_t i = 0; i < timelineCount; i++) {
 		Timeline *timeline = timelines[i];
 		int mode = timelineMode[i];
+		bool fromSetup = (mode & First) != 0;
 		float alpha;
 		if ((mode & Hold) != 0) {
 			TrackEntry *holdMix = timelineHoldMix[i];
 			alpha = holdMix == NULL ? alphaHold : alphaHold * (1 - holdMix->mix());
 		} else {
-			if (!drawOrder && timeline->getRTTI().isExactly(DrawOrderTimeline::rtti)) continue;
+			if (!drawOrder && timeline->getRTTI().isExactly(DrawOrderTimeline::rtti) && !fromSetup) continue;
 			alpha = alphaMix;
 		}
 		from->_totalAlpha += alpha;
-		bool fromSetup = (mode & First) != 0;
 		if (!shortestRotation && timeline->getRTTI().isExactly(RotateTimeline::rtti)) {
 			applyRotateTimeline((RotateTimeline *) timeline, skeleton, applyTime, alpha, fromSetup, timelinesRotation, i << 1, firstFrame);
 		} else if (timeline->getRTTI().isExactly(AttachmentTimeline::rtti)) {
diff --git a/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/src/spine/SkeletonBinary.cpp
@@ -406,7 +406,13 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
 					data->_loop = (flags & 2) != 0;
 					data->_additive = (flags & 4) != 0;
 					SliderPose &setup = data->_setupPose;
-					if ((flags & 8) != 0) setup._time = input.readFloat();
+					if ((flags & 8) != 0) {
+						float value = input.readFloat();
+						if (nonessential && (flags & 64) != 0)
+							data->_max = value;
+						else
+							setup._time = value;
+					}
 					if ((flags & 16) != 0) setup._mix = (flags & 32) != 0 ? input.readFloat() : 1;
 					if ((flags & 64) != 0) {
 						data->_local = (flags & 128) != 0;
diff --git a/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/src/spine/SkeletonJson.cpp
@@ -458,7 +458,6 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
 				data->setSkinRequired(skinRequired);
 				data->_additive = Json::getBoolean(constraintMap, "additive", false);
 				data->_loop = Json::getBoolean(constraintMap, "loop", false);
-				data->_setupPose._time = Json::getFloat(constraintMap, "time", 0);
 				data->_setupPose._mix = Json::getFloat(constraintMap, "mix", 1);
 
 				const char *boneName = Json::getString(constraintMap, "bone", NULL);
@@ -472,9 +471,11 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
 						data->_property->_offset = Json::getFloat(constraintMap, "from", 0) * propertyScaleValue;
 						data->_offset = Json::getFloat(constraintMap, "to", 0);
 						data->_scale = Json::getFloat(constraintMap, "scale", 1) / propertyScaleValue;
+						data->_max = Json::getFloat(constraintMap, "max", 0);
 						data->_local = Json::getBoolean(constraintMap, "local", false);
 					}
-				}
+				} else
+					data->_setupPose._time = Json::getFloat(constraintMap, "time", 0);
 
 				skeletonData->_constraints.add(data);
 			}
diff --git a/spine-cpp/src/spine/SliderData.cpp b/spine-cpp/src/spine/SliderData.cpp
@@ -37,7 +37,7 @@ RTTI_IMPL(SliderData, ConstraintData)
 
 SliderData::SliderData(const String &name)
 	: ConstraintDataGeneric<Slider, SliderPose>(name), _animation(NULL), _additive(false), _loop(false), _bone(NULL), _property(NULL), _offset(0.0f),
-	  _scale(0.0f), _local(false) {
+	  _scale(0.0f), _max(0.0f), _local(false) {
 }
 
 Constraint &SliderData::create(Skeleton &skeleton) {
@@ -100,6 +100,14 @@ void SliderData::setOffset(float offset) {
 	_offset = offset;
 }
 
+float SliderData::getMax() {
+	return _max;
+}
+
+void SliderData::setMax(float max) {
+	_max = max;
+}
+
 bool SliderData::getLocal() {
 	return _local;
 }
diff --git a/spine-cpp/tests/SkeletonSerializer.h b/spine-cpp/tests/SkeletonSerializer.h
@@ -3593,6 +3593,9 @@ namespace spine {
 			_json.writeName("scale");
 			_json.writeValue(obj->getScale());
 
+			_json.writeName("max");
+			_json.writeValue(obj->getMax());
+
 			_json.writeName("local");
 			_json.writeValue(obj->getLocal());
 
diff --git a/spine-flutter/lib/assets/libspine_flutter.js b/spine-flutter/lib/assets/libspine_flutter.js
diff --git a/spine-flutter/lib/assets/libspine_flutter.wasm b/spine-flutter/lib/assets/libspine_flutter.wasm
diff --git a/spine-flutter/lib/generated/physics_constraint_data.dart b/spine-flutter/lib/generated/physics_constraint_data.dart
@@ -184,8 +184,8 @@ class PhysicsConstraintData extends PosedData implements ConstraintData {
     SpineBindings.bindings.spine_physics_constraint_data_set_limit(_ptr, value);
   }
 
-  /// Determines how BonePose::getScaleY() changes when
-  /// PhysicsConstraintData::getScaleX() sets BonePose::getScaleX().
+  /// Determines how BonePose::getScaleY() changes when getScaleX() sets
+  /// BonePose::getScaleX().
   ScaleYMode get scaleYMode {
     final result = SpineBindings.bindings.spine_physics_constraint_data_get_scale_y_mode(_ptr);
     return ScaleYMode.fromValue(result);
diff --git a/spine-flutter/lib/generated/slider_data.dart b/spine-flutter/lib/generated/slider_data.dart
@@ -207,6 +207,17 @@ class SliderData extends PosedData implements ConstraintData {
     SpineBindings.bindings.spine_slider_data_set_offset(_ptr, value);
   }
 
+  /// When a bone is set, the maximum slider time for the bone property range,
+  /// or 0 if nonessential data was not exported.
+  double get max {
+    final result = SpineBindings.bindings.spine_slider_data_get_max(_ptr);
+    return result;
+  }
+
+  set max(double value) {
+    SpineBindings.bindings.spine_slider_data_set_max(_ptr, value);
+  }
+
   /// When true and a bone is set, the bone's local transform property is read
   /// instead of its world transform.
   bool get local {
diff --git a/spine-flutter/lib/generated/spine_dart_bindings_generated.dart b/spine-flutter/lib/generated/spine_dart_bindings_generated.dart
@@ -31420,8 +31420,8 @@ class SpineDartBindings {
   late final _spine_physics_constraint_data_set_limit =
       _spine_physics_constraint_data_set_limitPtr.asFunction<void Function(spine_physics_constraint_data, double)>();
 
-  /// Determines how BonePose::getScaleY() changes when
-  /// PhysicsConstraintData::getScaleX() sets BonePose::getScaleX().
+  /// Determines how BonePose::getScaleY() changes when getScaleX() sets
+  /// BonePose::getScaleX().
   int spine_physics_constraint_data_get_scale_y_mode(
     spine_physics_constraint_data self,
   ) {
@@ -44764,6 +44764,36 @@ class SpineDartBindings {
   late final _spine_slider_data_set_offset =
       _spine_slider_data_set_offsetPtr.asFunction<void Function(spine_slider_data, double)>();
 
+  /// When a bone is set, the maximum slider time for the bone property range, or 0
+  /// if nonessential data was not exported.
+  double spine_slider_data_get_max(
+    spine_slider_data self,
+  ) {
+    return _spine_slider_data_get_max(
+      self,
+    );
+  }
+
+  late final _spine_slider_data_get_maxPtr =
+      _lookup<ffi.NativeFunction<ffi.Float Function(spine_slider_data)>>('spine_slider_data_get_max');
+  late final _spine_slider_data_get_max =
+      _spine_slider_data_get_maxPtr.asFunction<double Function(spine_slider_data)>();
+
+  void spine_slider_data_set_max(
+    spine_slider_data self,
+    double max,
+  ) {
+    return _spine_slider_data_set_max(
+      self,
+      max,
+    );
+  }
+
+  late final _spine_slider_data_set_maxPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(spine_slider_data, ffi.Float)>>('spine_slider_data_set_max');
+  late final _spine_slider_data_set_max =
+      _spine_slider_data_set_maxPtr.asFunction<void Function(spine_slider_data, double)>();
+
   /// When true and a bone is set, the bone's local transform property is read
   /// instead of its world transform.
   bool spine_slider_data_get_local(
@@ -48139,7 +48169,8 @@ class SpineDartBindings {
   /// animation are set to the setup pose and the track is cleared.
   ///
   /// It may be desired to use AnimationState::addEmptyAnimation(int, float, float)
-  /// rather than have the animation abruptly cease being applied.
+  /// rather than have the animation abruptly cease being applied, leaving the
+  /// current pose.
   double spine_track_entry_get_track_end(
     spine_track_entry self,
   ) {
diff --git a/spine-flutter/lib/generated/track_entry.dart b/spine-flutter/lib/generated/track_entry.dart
@@ -165,7 +165,8 @@ class TrackEntry {
   /// is cleared.
   ///
   /// It may be desired to use AnimationState::addEmptyAnimation(int, float,
-  /// float) rather than have the animation abruptly cease being applied.
+  /// float) rather than have the animation abruptly cease being applied,
+  /// leaving the current pose.
   double get trackEnd {
     final result = SpineBindings.bindings.spine_track_entry_get_track_end(_ptr);
     return result;
diff --git a/spine-godot/spine_godot/SpineSliderData.cpp b/spine-godot/spine_godot/SpineSliderData.cpp
diff --git a/spine-godot/spine_godot/SpineSliderData.h b/spine-godot/spine_godot/SpineSliderData.h
diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift
diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_data.swift b/spine-ios/Sources/SpineSwift/Generated/slider_data.swift
diff --git a/spine-ios/Sources/SpineSwift/Generated/track_entry.swift b/spine-ios/Sources/SpineSwift/Generated/track_entry.swift
