From f92576bbe9c2c65ed560a28a274802896d54b3a4 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 2 Jul 2025 14:54:33 +0200 Subject: [PATCH] [cpp] 4.3 porting WIP --- spine-cpp/spine-cpp/include/spine/Constraint.h | 2 +- spine-cpp/spine-cpp/include/spine/ConstraintData.h | 2 +- spine-cpp/spine-cpp/include/spine/PathConstraint.h | 2 +- spine-cpp/spine-cpp/src/spine/Constraint.cpp | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/Constraint.h b/spine-cpp/spine-cpp/include/spine/Constraint.h index 526ced4d8..8986b5c39 100644 --- a/spine-cpp/spine-cpp/include/spine/Constraint.h +++ b/spine-cpp/spine-cpp/include/spine/Constraint.h @@ -40,7 +40,7 @@ namespace spine { class Skeleton; class SP_API Constraint : public Update { - RTTI_DECL_NOPARENT + RTTI_DECL friend class Skeleton; public: diff --git a/spine-cpp/spine-cpp/include/spine/ConstraintData.h b/spine-cpp/spine-cpp/include/spine/ConstraintData.h index ae9ee3cc7..04561fb6f 100644 --- a/spine-cpp/spine-cpp/include/spine/ConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/ConstraintData.h @@ -62,7 +62,7 @@ namespace spine { ConstraintDataGeneric(const String &name) : PosedDataGeneric

(name), ConstraintData(name) {} virtual ~ConstraintDataGeneric() {} - virtual Constraint* create(Skeleton& skeleton) = 0; + virtual Constraint* create(Skeleton& skeleton) override = 0; // Resolve ambiguity by forwarding to PosedData's implementation virtual const String &getName() const override { return PosedDataGeneric

::getName(); } diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/spine-cpp/include/spine/PathConstraint.h index 85fd8182a..7e7b05dd8 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraint.h @@ -81,7 +81,7 @@ namespace spine { void setSlot(Slot *slot); - PathConstraintData &getData(); + virtual PathConstraintData &getData() override; diff --git a/spine-cpp/spine-cpp/src/spine/Constraint.cpp b/spine-cpp/spine-cpp/src/spine/Constraint.cpp index f82dc714a..b9eb21ece 100644 --- a/spine-cpp/spine-cpp/src/spine/Constraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/Constraint.cpp @@ -31,6 +31,8 @@ using namespace spine; +RTTI_IMPL(Constraint, Update) + Constraint::Constraint() { }