diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h index a1ab06a02..f4fd01706 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h @@ -34,6 +34,7 @@ namespace spine { + /// Changes a path constraint's PathConstraintPose::getPosition(). class SP_API PathConstraintPositionTimeline : public ConstraintTimeline1 { friend class SkeletonBinary; @@ -44,7 +45,7 @@ namespace spine { public: static const int ENTRIES; - explicit PathConstraintPositionTimeline(size_t frameCount, size_t bezierCount, int pathConstraintIndex); + explicit PathConstraintPositionTimeline(size_t frameCount, size_t bezierCount, int constraintIndex); virtual ~PathConstraintPositionTimeline(); diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h index db464d37c..92b5053a5 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h @@ -42,7 +42,7 @@ namespace spine { RTTI_DECL public: - explicit PathConstraintSpacingTimeline(size_t frameCount, size_t bezierCount, int pathConstraintIndex); + explicit PathConstraintSpacingTimeline(size_t frameCount, size_t bezierCount, int constraintIndex); virtual ~PathConstraintSpacingTimeline(); diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp index 26aafe407..0d8e736ec 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp @@ -44,12 +44,10 @@ using namespace spine; RTTI_IMPL(PathConstraintPositionTimeline, ConstraintTimeline1) PathConstraintPositionTimeline::PathConstraintPositionTimeline(size_t frameCount, size_t bezierCount, - int pathConstraintIndex) : ConstraintTimeline1(frameCount, + int constraintIndex) : ConstraintTimeline1(frameCount, bezierCount, - pathConstraintIndex, + constraintIndex, Property_PathConstraintPosition) { - PropertyId ids[] = {((PropertyId) Property_PathConstraintPosition << 32) | pathConstraintIndex}; - setPropertyIds(ids, 1); } PathConstraintPositionTimeline::~PathConstraintPositionTimeline() { diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp index 90f64b525..6cecc184a 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp @@ -44,12 +44,10 @@ using namespace spine; RTTI_IMPL(PathConstraintSpacingTimeline, ConstraintTimeline1) PathConstraintSpacingTimeline::PathConstraintSpacingTimeline(size_t frameCount, size_t bezierCount, - int pathConstraintIndex) : ConstraintTimeline1(frameCount, + int constraintIndex) : ConstraintTimeline1(frameCount, bezierCount, - pathConstraintIndex, + constraintIndex, Property_PathConstraintSpacing) { - PropertyId ids[] = {((PropertyId) Property_PathConstraintSpacing << 32) | pathConstraintIndex}; - setPropertyIds(ids, 1); } PathConstraintSpacingTimeline::~PathConstraintSpacingTimeline() {