From ac2046c1a50640af1add70308b5e5705703c2328 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 4 Jul 2025 22:37:58 +0200 Subject: [PATCH] [cpp] 4.3 porting WIP --- spine-cpp/spine-cpp/include/spine/ShearTimeline.h | 6 +++--- spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h | 2 +- spine-cpp/spine-cpp/include/spine/SliderTimeline.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h index b4401a9b6..b5ab1422c 100644 --- a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h @@ -33,7 +33,7 @@ #include namespace spine { - /// Changes a bone's local shear X and Y. + /// Changes a bone's local BoneLocal::getShearX() and BoneLocal::getShearY(). class SP_API ShearTimeline : public BoneTimeline2 { friend class SkeletonBinary; @@ -49,7 +49,7 @@ namespace spine { MixDirection direction) override; }; - /// Changes a bone's local shear X. + /// Changes a bone's local BoneLocal::getShearX(). class SP_API ShearXTimeline : public BoneTimeline1 { friend class SkeletonBinary; @@ -65,7 +65,7 @@ namespace spine { MixDirection direction) override; }; - /// Changes a bone's local shear Y. + /// Changes a bone's local BoneLocal::getShearY(). class SP_API ShearYTimeline : public BoneTimeline1 { friend class SkeletonBinary; diff --git a/spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h b/spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h index 5ab7962c0..f0231647e 100644 --- a/spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h @@ -47,7 +47,7 @@ namespace spine { virtual void apply(Skeleton &skeleton, float lastTime, float time, Vector *pEvents, float alpha, MixBlend blend, - MixDirection direction, bool appliedPose); + MixDirection direction, bool appliedPose) override; }; } diff --git a/spine-cpp/spine-cpp/include/spine/SliderTimeline.h b/spine-cpp/spine-cpp/include/spine/SliderTimeline.h index bd163582c..d1213a56b 100644 --- a/spine-cpp/spine-cpp/include/spine/SliderTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/SliderTimeline.h @@ -33,6 +33,7 @@ #include namespace spine { + /// Changes a slider's SliderPose::getTime(). class SP_API SliderTimeline : public ConstraintTimeline1 { friend class SkeletonBinary; friend class SkeletonJson; @@ -46,7 +47,7 @@ namespace spine { virtual void apply(Skeleton &skeleton, float lastTime, float time, Vector *pEvents, float alpha, MixBlend blend, - MixDirection direction, bool appliedPose); + MixDirection direction, bool appliedPose) override; }; }