diff --git a/spine-cpp/spine-cpp/include/spine/BoneData.h b/spine-cpp/spine-cpp/include/spine/BoneData.h index 8a1361a23..c8916b434 100644 --- a/spine-cpp/spine-cpp/include/spine/BoneData.h +++ b/spine-cpp/spine-cpp/include/spine/BoneData.h @@ -64,6 +64,8 @@ namespace spine { friend class TranslateYTimeline; + friend class Slot; + public: BoneData(int index, const String &name, BoneData *parent = NULL); diff --git a/spine-cpp/spine-cpp/include/spine/PosedData.h b/spine-cpp/spine-cpp/include/spine/PosedData.h index 00871d446..386e4653b 100644 --- a/spine-cpp/spine-cpp/include/spine/PosedData.h +++ b/spine-cpp/spine-cpp/include/spine/PosedData.h @@ -60,6 +60,7 @@ namespace spine { friend class TranslateYTimeline; friend class InheritTimeline; friend class Skeleton; + friend class Slot; public: PosedData(const spine::String& name); @@ -117,6 +118,7 @@ namespace spine { friend class PhysicsConstraintMassTimeline; friend class PhysicsConstraintWindTimeline; friend class PhysicsConstraintGravityTimeline; + friend class Slot; protected: P _setup; diff --git a/spine-cpp/spine-cpp/include/spine/SliderData.h b/spine-cpp/spine-cpp/include/spine/SliderData.h index 77df7369b..c8db306fa 100644 --- a/spine-cpp/spine-cpp/include/spine/SliderData.h +++ b/spine-cpp/spine-cpp/include/spine/SliderData.h @@ -42,9 +42,7 @@ namespace spine { class Slider; class Skeleton; - /// Stores the setup pose for a PhysicsConstraint. - /// - /// See https://esotericsoftware.com/spine-physics-constraints Physics constraints in the Spine User Guide. + /// Stores the setup pose for a Slider class SP_API SliderData : public ConstraintDataGeneric { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/SlotData.h b/spine-cpp/spine-cpp/include/spine/SlotData.h index 456b2f28a..ef63bc85d 100644 --- a/spine-cpp/spine-cpp/include/spine/SlotData.h +++ b/spine-cpp/spine-cpp/include/spine/SlotData.h @@ -62,6 +62,7 @@ namespace spine { friend class TransformConstraintTimeline; friend class TranslateTimeline; friend class TwoColorTimeline; + friend class Slot; public: SlotData(int index, const String& name, BoneData& boneData); diff --git a/spine-cpp/spine-cpp/src/spine/Slot.cpp b/spine-cpp/spine-cpp/src/spine/Slot.cpp index e40c7bde0..261783e4e 100644 --- a/spine-cpp/spine-cpp/src/spine/Slot.cpp +++ b/spine-cpp/spine-cpp/src/spine/Slot.cpp @@ -39,7 +39,7 @@ using namespace spine; Slot::Slot(SlotData &data, Skeleton &skeleton) : PosedGeneric(data), _skeleton(skeleton), - _bone(*skeleton.getBones()[data.getBoneData().getIndex()]), + _bone(*skeleton.getBones()[data._boneData._index]), _attachmentState(0) { if (data.getSetupPose().hasDarkColor()) { @@ -49,19 +49,18 @@ Slot::Slot(SlotData &data, Skeleton &skeleton) : PosedGeneric - * See Physics constraints in the Spine User Guide. */ +/** Stores the setup pose for a {@link Slider}. */ public class SliderData extends ConstraintData { Animation animation; boolean additive, loop;