From 782620c7375376f21518882f83e34dcd56034c45 Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Fri, 4 Jul 2025 22:57:16 +0200
Subject: [PATCH] [cpp] 4.3 porting WIP

---
 spine-cpp/spine-cpp/include/spine/LinkedMesh.h            | 6 +++---
 .../spine-cpp/include/spine/TransformConstraintTimeline.h | 5 ++++-
 spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp              | 8 ++++----
 spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp          | 2 +-
 spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp            | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h
index bd71970bb..cbf8f770b 100644
--- a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h
+++ b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h
@@ -43,10 +43,10 @@ namespace spine {
 
 	public:
 		LinkedMesh(MeshAttachment *mesh, const int skinIndex, size_t slotIndex, const String &parent,
-				   bool inheritTimeline);
+				   bool inheritTimelines);
 
         LinkedMesh(MeshAttachment *mesh, const String &skin, size_t slotIndex, const String &parent,
-                   bool inheritTimeline);
+                   bool inheritTimelines);
 
 	private:
 		MeshAttachment *_mesh;
@@ -54,7 +54,7 @@ namespace spine {
         String _skin;
 		size_t _slotIndex;
 		String _parent;
-		bool _inheritTimeline;
+		bool _inheritTimelines;
 	};
 }
 
diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
index 8a53f28c4..81a91a2f2 100644
--- a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
+++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h
@@ -35,6 +35,9 @@
 
 namespace spine {
 
+	/// Changes a transform constraint's TransformConstraintPose::getMixRotate(), TransformConstraintPose::getMixX(),
+	/// TransformConstraintPose::getMixY(), TransformConstraintPose::getMixScaleX(),
+	/// TransformConstraintPose::getMixScaleY(), and TransformConstraintPose::getMixShearY().
 	class SP_API TransformConstraintTimeline : public CurveTimeline, public ConstraintTimeline {
 		friend class SkeletonBinary;
 
@@ -49,7 +52,7 @@ namespace spine {
 
 		virtual void
 		apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
-			  MixDirection direction, bool appliedPose);
+			  MixDirection direction, bool appliedPose) override;
 
 		/// Sets the time, rotate mix, translate mix, scale mix, and shear mix for the specified frame.
 		/// @param frame Between 0 and frameCount, inclusive.
diff --git a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp
index db10cedde..db8a9bb6c 100644
--- a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp
+++ b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp
@@ -34,19 +34,19 @@
 using namespace spine;
 
 LinkedMesh::LinkedMesh(MeshAttachment *mesh, const int skinIndex, size_t slotIndex, const String &parent,
-					   bool inheritTimeline) : _mesh(mesh),
+					   bool inheritTimelines) : _mesh(mesh),
 											   _skinIndex(skinIndex),
 											   _skin(""),
 											   _slotIndex(slotIndex),
 											   _parent(parent),
-											   _inheritTimeline(inheritTimeline) {
+											   _inheritTimelines(inheritTimelines) {
 }
 
 LinkedMesh::LinkedMesh(MeshAttachment *mesh, const String &skin, size_t slotIndex, const String &parent,
-					   bool inheritTimeline) : _mesh(mesh),
+					   bool inheritTimelines) : _mesh(mesh),
 											   _skinIndex(-1),
 											   _skin(skin),
 											   _slotIndex(slotIndex),
 											   _parent(parent),
-											   _inheritTimeline(inheritTimeline) {
+											   _inheritTimelines(inheritTimelines) {
 }
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
index a82ada141..e4e5f2933 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
@@ -355,7 +355,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
 			setError("Parent mesh not found: ", linkedMesh->_parent.buffer());
 			return NULL;
 		}
-		linkedMesh->_mesh->_timelineAttachment = linkedMesh->_inheritTimeline ? static_cast<VertexAttachment *>(parent)
+		linkedMesh->_mesh->_timelineAttachment = linkedMesh->_inheritTimelines ? static_cast<VertexAttachment *>(parent)
 																			  : linkedMesh->_mesh;
 		linkedMesh->_mesh->setParentMesh(static_cast<MeshAttachment *>(parent));
 		if (linkedMesh->_mesh->_region) linkedMesh->_mesh->updateRegion();
diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
index 275ff8619..025c454bc 100644
--- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
+++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
@@ -798,7 +798,7 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
 			setError(root, "Parent mesh not found: ", linkedMesh->_parent.buffer());
 			return NULL;
 		}
-		linkedMesh->_mesh->_timelineAttachment = linkedMesh->_inheritTimeline ? static_cast<VertexAttachment *>(parent)
+		linkedMesh->_mesh->_timelineAttachment = linkedMesh->_inheritTimelines ? static_cast<VertexAttachment *>(parent)
 																			  : linkedMesh->_mesh;
 		linkedMesh->_mesh->setParentMesh(static_cast<MeshAttachment *>(parent));
 		if (linkedMesh->_mesh->_region != NULL) linkedMesh->_mesh->updateRegion();