From fa4d43bda57df9ea122bfe7f4199fe94b530d7bd Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 10 Sep 2025 21:38:27 +0200 Subject: [PATCH] [cpp] Unshadow apply in BoneTimeline and others by prefixing the protected method with _apply() --- spine-cpp/include/spine/BoneTimeline.h | 4 ++-- spine-cpp/include/spine/ColorTimeline.h | 8 ++++---- spine-cpp/include/spine/DeformTimeline.h | 2 +- spine-cpp/include/spine/RotateTimeline.h | 2 +- spine-cpp/include/spine/ScaleTimeline.h | 6 +++--- spine-cpp/include/spine/ShearTimeline.h | 6 +++--- spine-cpp/include/spine/SlotCurveTimeline.h | 2 +- spine-cpp/include/spine/TransformConstraint.h | 2 +- spine-cpp/include/spine/TranslateTimeline.h | 6 +++--- spine-cpp/src/spine/BoneTimeline.cpp | 4 ++-- spine-cpp/src/spine/ColorTimeline.cpp | 8 ++++---- spine-cpp/src/spine/DeformTimeline.cpp | 2 +- spine-cpp/src/spine/RotateTimeline.cpp | 2 +- spine-cpp/src/spine/ScaleTimeline.cpp | 6 +++--- spine-cpp/src/spine/ShearTimeline.cpp | 6 +++--- spine-cpp/src/spine/SlotCurveTimeline.cpp | 2 +- spine-cpp/src/spine/TranslateTimeline.cpp | 6 +++--- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/spine-cpp/include/spine/BoneTimeline.h b/spine-cpp/include/spine/BoneTimeline.h index 85ae26e2f..4b4126693 100644 --- a/spine-cpp/include/spine/BoneTimeline.h +++ b/spine-cpp/include/spine/BoneTimeline.h @@ -79,7 +79,7 @@ namespace spine { protected: /// Applies changes to the pose based on the timeline values. - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) = 0; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) = 0; int _boneIndex; }; @@ -110,7 +110,7 @@ namespace spine { protected: /// Applies changes to the pose based on the timeline values. - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) = 0; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) = 0; int _boneIndex; diff --git a/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/include/spine/ColorTimeline.h index 82d55a501..9802e4059 100644 --- a/spine-cpp/include/spine/ColorTimeline.h +++ b/spine-cpp/include/spine/ColorTimeline.h @@ -53,7 +53,7 @@ namespace spine { void setFrame(int frame, float time, float r, float g, float b, float a); protected: - virtual void apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; + virtual void _apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; static const int ENTRIES = 5; static const int R = 1; @@ -81,7 +81,7 @@ namespace spine { void setFrame(int frame, float time, float r, float g, float b); protected: - virtual void apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; + virtual void _apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; static const int ENTRIES = 4; static const int R = 1; @@ -131,7 +131,7 @@ namespace spine { void setFrame(int frame, float time, float r, float g, float b, float a, float r2, float g2, float b2); protected: - virtual void apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; + virtual void _apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; static const int ENTRIES = 8; static const int R = 1; @@ -162,7 +162,7 @@ namespace spine { void setFrame(int frame, float time, float r, float g, float b, float r2, float g2, float b2); protected: - virtual void apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; + virtual void _apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; static const int ENTRIES = 7; static const int R = 1; diff --git a/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/include/spine/DeformTimeline.h index d6698e86f..e56071439 100644 --- a/spine-cpp/include/spine/DeformTimeline.h +++ b/spine-cpp/include/spine/DeformTimeline.h @@ -67,7 +67,7 @@ namespace spine { } protected: - void apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; + void _apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) override; private: Array> _vertices; diff --git a/spine-cpp/include/spine/RotateTimeline.h b/spine-cpp/include/spine/RotateTimeline.h index 84de7e99f..9998866a2 100644 --- a/spine-cpp/include/spine/RotateTimeline.h +++ b/spine-cpp/include/spine/RotateTimeline.h @@ -47,7 +47,7 @@ namespace spine { explicit RotateTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; } diff --git a/spine-cpp/include/spine/ScaleTimeline.h b/spine-cpp/include/spine/ScaleTimeline.h index 759bf94d6..60e2d47e8 100644 --- a/spine-cpp/include/spine/ScaleTimeline.h +++ b/spine-cpp/include/spine/ScaleTimeline.h @@ -45,7 +45,7 @@ namespace spine { explicit ScaleTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; /// Changes a bone's local BoneLocal::getScaleX(). @@ -60,7 +60,7 @@ namespace spine { explicit ScaleXTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; /// Changes a bone's local BoneLocal::getScaleY(). @@ -75,7 +75,7 @@ namespace spine { explicit ScaleYTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; } diff --git a/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/include/spine/ShearTimeline.h index b04af3e94..2c5377d3f 100644 --- a/spine-cpp/include/spine/ShearTimeline.h +++ b/spine-cpp/include/spine/ShearTimeline.h @@ -45,7 +45,7 @@ namespace spine { explicit ShearTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; /// Changes a bone's local BoneLocal::getShearX(). @@ -60,7 +60,7 @@ namespace spine { explicit ShearXTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; /// Changes a bone's local BoneLocal::getShearY(). @@ -75,7 +75,7 @@ namespace spine { explicit ShearYTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; } diff --git a/spine-cpp/include/spine/SlotCurveTimeline.h b/spine-cpp/include/spine/SlotCurveTimeline.h index 6e20a377f..e009330d8 100644 --- a/spine-cpp/include/spine/SlotCurveTimeline.h +++ b/spine-cpp/include/spine/SlotCurveTimeline.h @@ -58,7 +58,7 @@ namespace spine { protected: /// Applies the timeline to the slot pose. - virtual void apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) = 0; + virtual void _apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) = 0; int _slotIndex; }; diff --git a/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/include/spine/TransformConstraint.h index 44ae1c423..5848873be 100644 --- a/spine-cpp/include/spine/TransformConstraint.h +++ b/spine-cpp/include/spine/TransformConstraint.h @@ -52,9 +52,9 @@ namespace spine { friend class Skeleton; friend class TransformConstraintTimeline; + public: RTTI_DECL - public: TransformConstraint(TransformConstraintData &data, Skeleton &skeleton); virtual TransformConstraint ©(Skeleton &skeleton); diff --git a/spine-cpp/include/spine/TranslateTimeline.h b/spine-cpp/include/spine/TranslateTimeline.h index 5b24789fe..f642d777c 100644 --- a/spine-cpp/include/spine/TranslateTimeline.h +++ b/spine-cpp/include/spine/TranslateTimeline.h @@ -46,7 +46,7 @@ namespace spine { explicit TranslateTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; /// Changes a bone's local X translation. @@ -61,7 +61,7 @@ namespace spine { explicit TranslateXTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; /// Changes a bone's local Y translation. @@ -76,7 +76,7 @@ namespace spine { explicit TranslateYTimeline(size_t frameCount, size_t bezierCount, int boneIndex); protected: - virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; + virtual void _apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) override; }; } diff --git a/spine-cpp/src/spine/BoneTimeline.cpp b/spine-cpp/src/spine/BoneTimeline.cpp index 526f9b742..1b89d15db 100644 --- a/spine-cpp/src/spine/BoneTimeline.cpp +++ b/spine-cpp/src/spine/BoneTimeline.cpp @@ -60,7 +60,7 @@ void BoneTimeline1::apply(Skeleton &skeleton, float lastTime, float time, Array< Bone *bone = skeleton._bones[_boneIndex]; if (bone->isActive()) { - apply(appliedPose ? *bone->_applied : bone->_pose, bone->_data._setup, time, alpha, blend, direction); + _apply(appliedPose ? *bone->_applied : bone->_pose, bone->_data._setup, time, alpha, blend, direction); } } @@ -79,7 +79,7 @@ void BoneTimeline2::apply(Skeleton &skeleton, float lastTime, float time, Array< Bone *bone = skeleton._bones[_boneIndex]; if (bone->isActive()) { - apply(appliedPose ? *bone->_applied : bone->_pose, bone->_data._setup, time, alpha, blend, direction); + _apply(appliedPose ? *bone->_applied : bone->_pose, bone->_data._setup, time, alpha, blend, direction); } } diff --git a/spine-cpp/src/spine/ColorTimeline.cpp b/spine-cpp/src/spine/ColorTimeline.cpp index 700bab411..999a2c755 100644 --- a/spine-cpp/src/spine/ColorTimeline.cpp +++ b/spine-cpp/src/spine/ColorTimeline.cpp @@ -59,7 +59,7 @@ void RGBATimeline::setFrame(int frame, float time, float r, float g, float b, fl _frames[frame + A] = a; } -void RGBATimeline::apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { +void RGBATimeline::_apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { Color &color = pose._color; if (time < _frames[0]) { Color &setup = slot._data._setup._color; @@ -134,7 +134,7 @@ void RGBTimeline::setFrame(int frame, float time, float r, float g, float b) { _frames[frame + B] = b; } -void RGBTimeline::apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { +void RGBTimeline::_apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { Color &color = pose._color; if (time < _frames[0]) { Color &setup = slot._data._setup._color; @@ -275,7 +275,7 @@ void RGBA2Timeline::setFrame(int frame, float time, float r, float g, float b, f _frames[frame + B2] = b2; } -void RGBA2Timeline::apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { +void RGBA2Timeline::_apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { Color &light = pose._color; Color &dark = pose._darkColor; if (time < _frames[0]) { @@ -388,7 +388,7 @@ void RGB2Timeline::setFrame(int frame, float time, float r, float g, float b, fl _frames[frame + B2] = b2; } -void RGB2Timeline::apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { +void RGB2Timeline::_apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { Color &light = pose._color; Color &dark = pose._darkColor; if (time < _frames[0]) { diff --git a/spine-cpp/src/spine/DeformTimeline.cpp b/spine-cpp/src/spine/DeformTimeline.cpp index d00f57412..7a0705eb4 100644 --- a/spine-cpp/src/spine/DeformTimeline.cpp +++ b/spine-cpp/src/spine/DeformTimeline.cpp @@ -56,7 +56,7 @@ DeformTimeline::DeformTimeline(size_t frameCount, size_t bezierCount, int slotIn } -void DeformTimeline::apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { +void DeformTimeline::_apply(Slot &slot, SlotPose &pose, float time, float alpha, MixBlend blend) { Attachment *slotAttachment = pose._attachment; if (slotAttachment == NULL || !slotAttachment->getRTTI().instanceOf(VertexAttachment::rtti)) { return; diff --git a/spine-cpp/src/spine/RotateTimeline.cpp b/spine-cpp/src/spine/RotateTimeline.cpp index 0ecf17be3..0d1802a1d 100644 --- a/spine-cpp/src/spine/RotateTimeline.cpp +++ b/spine-cpp/src/spine/RotateTimeline.cpp @@ -39,7 +39,7 @@ RotateTimeline::RotateTimeline(size_t frameCount, size_t bezierCount, int boneIn : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_Rotate) { } -void RotateTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void RotateTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { SP_UNUSED(direction); pose._rotation = getRelativeValue(time, alpha, blend, pose._rotation, setup._rotation); } \ No newline at end of file diff --git a/spine-cpp/src/spine/ScaleTimeline.cpp b/spine-cpp/src/spine/ScaleTimeline.cpp index dc4c6f6b4..060b4d4ed 100644 --- a/spine-cpp/src/spine/ScaleTimeline.cpp +++ b/spine-cpp/src/spine/ScaleTimeline.cpp @@ -46,7 +46,7 @@ ScaleTimeline::ScaleTimeline(size_t frameCount, size_t bezierCount, int boneInde : BoneTimeline2(frameCount, bezierCount, boneIndex, Property_ScaleX, Property_ScaleY) { } -void ScaleTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void ScaleTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { if (time < _frames[0]) { switch (blend) { case MixBlend_Setup: @@ -146,7 +146,7 @@ ScaleXTimeline::ScaleXTimeline(size_t frameCount, size_t bezierCount, int boneIn : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_ScaleX) { } -void ScaleXTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void ScaleXTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { pose._scaleX = getScaleValue(time, alpha, blend, direction, pose._scaleX, setup._scaleX); } @@ -156,6 +156,6 @@ ScaleYTimeline::ScaleYTimeline(size_t frameCount, size_t bezierCount, int boneIn : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_ScaleY) { } -void ScaleYTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void ScaleYTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { pose._scaleY = getScaleValue(time, alpha, blend, direction, pose._scaleY, setup._scaleY); } \ No newline at end of file diff --git a/spine-cpp/src/spine/ShearTimeline.cpp b/spine-cpp/src/spine/ShearTimeline.cpp index a76741f7f..75fa8f64f 100644 --- a/spine-cpp/src/spine/ShearTimeline.cpp +++ b/spine-cpp/src/spine/ShearTimeline.cpp @@ -46,7 +46,7 @@ ShearTimeline::ShearTimeline(size_t frameCount, size_t bezierCount, int boneInde : BoneTimeline2(frameCount, bezierCount, boneIndex, Property_ShearX, Property_ShearY) { } -void ShearTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void ShearTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { if (time < _frames[0]) { switch (blend) { case MixBlend_Setup: @@ -108,7 +108,7 @@ ShearXTimeline::ShearXTimeline(size_t frameCount, size_t bezierCount, int boneIn : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_ShearX) { } -void ShearXTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void ShearXTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { pose._shearX = getRelativeValue(time, alpha, blend, pose._shearX, setup._shearX); } @@ -118,6 +118,6 @@ ShearYTimeline::ShearYTimeline(size_t frameCount, size_t bezierCount, int boneIn : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_ShearY) { } -void ShearYTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void ShearYTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { pose._shearY = getRelativeValue(time, alpha, blend, pose._shearY, setup._shearY); } \ No newline at end of file diff --git a/spine-cpp/src/spine/SlotCurveTimeline.cpp b/spine-cpp/src/spine/SlotCurveTimeline.cpp index d51bf984a..99e9cc52d 100644 --- a/spine-cpp/src/spine/SlotCurveTimeline.cpp +++ b/spine-cpp/src/spine/SlotCurveTimeline.cpp @@ -60,5 +60,5 @@ void SlotCurveTimeline::apply(Skeleton &skeleton, float lastTime, float time, Ar SP_UNUSED(direction); Slot *slot = skeleton._slots[_slotIndex]; - if (slot->_bone.isActive()) apply(*slot, appliedPose ? *slot->_applied : slot->_pose, time, alpha, blend); + if (slot->_bone.isActive()) _apply(*slot, appliedPose ? *slot->_applied : slot->_pose, time, alpha, blend); } \ No newline at end of file diff --git a/spine-cpp/src/spine/TranslateTimeline.cpp b/spine-cpp/src/spine/TranslateTimeline.cpp index 42937f001..d53fbd592 100644 --- a/spine-cpp/src/spine/TranslateTimeline.cpp +++ b/spine-cpp/src/spine/TranslateTimeline.cpp @@ -46,7 +46,7 @@ TranslateTimeline::TranslateTimeline(size_t frameCount, size_t bezierCount, int : BoneTimeline2(frameCount, bezierCount, boneIndex, Property_X, Property_Y) { } -void TranslateTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void TranslateTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { if (time < _frames[0]) { switch (blend) { case MixBlend_Setup: @@ -108,7 +108,7 @@ TranslateXTimeline::TranslateXTimeline(size_t frameCount, size_t bezierCount, in : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_X) { } -void TranslateXTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void TranslateXTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { pose._x = getRelativeValue(time, alpha, blend, pose._x, setup._x); } @@ -118,6 +118,6 @@ TranslateYTimeline::TranslateYTimeline(size_t frameCount, size_t bezierCount, in : BoneTimeline1(frameCount, bezierCount, boneIndex, Property_Y) { } -void TranslateYTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { +void TranslateYTimeline::_apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend, MixDirection direction) { pose._y = getRelativeValue(time, alpha, blend, pose._y, setup._y); } \ No newline at end of file