From a07bda1aa0f870a3d12d1f6245cbbe4a56a05287 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 4 Jul 2025 20:50:37 +0200 Subject: [PATCH] [cpp] 4.3 porting WIP --- .../spine-cpp/include/spine/PathConstraintMixTimeline.h | 4 +++- spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h index c33748c53..312fdf979 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h @@ -35,6 +35,8 @@ namespace spine { + /// Changes a path constraint's PathConstraintPose::getMixRotate(), PathConstraintPose::getMixX(), and + /// PathConstraintPose::getMixY(). class SP_API PathConstraintMixTimeline : public CurveTimeline, public ConstraintTimeline { friend class SkeletonBinary; @@ -43,7 +45,7 @@ namespace spine { RTTI_DECL public: - explicit PathConstraintMixTimeline(size_t frameCount, size_t bezierCount, int pathConstraintIndex); + explicit PathConstraintMixTimeline(size_t frameCount, size_t bezierCount, int constraintIndex); virtual ~PathConstraintMixTimeline(); diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp index d18c0126e..a6cdc025e 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp @@ -44,10 +44,10 @@ using namespace spine; RTTI_IMPL_MULTI(PathConstraintMixTimeline, CurveTimeline, ConstraintTimeline) -PathConstraintMixTimeline::PathConstraintMixTimeline(size_t frameCount, size_t bezierCount, int pathConstraintIndex) +PathConstraintMixTimeline::PathConstraintMixTimeline(size_t frameCount, size_t bezierCount, int constraintIndex) : CurveTimeline(frameCount, PathConstraintMixTimeline::ENTRIES, bezierCount), - ConstraintTimeline(pathConstraintIndex) { - PropertyId ids[] = {((PropertyId) Property_PathConstraintMix << 32) | pathConstraintIndex}; + ConstraintTimeline(constraintIndex) { + PropertyId ids[] = {((PropertyId) Property_PathConstraintMix << 32) | constraintIndex}; setPropertyIds(ids, 1); }