diff --git a/spine-cpp/include/spine/Animation.h b/spine-cpp/include/spine/Animation.h index 950b07d9f..362c538a4 100644 --- a/spine-cpp/include/spine/Animation.h +++ b/spine-cpp/include/spine/Animation.h @@ -139,7 +139,7 @@ namespace spine { /// @param blend Controls how mixing is applied when alpha < 1. /// @param direction Indicates whether the timelines are mixing in or out. Used by timelines which perform instant transitions, /// such as DrawOrderTimeline or AttachmentTimeline. - void apply(Skeleton &skeleton, float lastTime, float time, bool loop, Array *pEvents, float alpha, MixBlend blend, + void apply(Skeleton &skeleton, float lastTime, float time, bool loop, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose); /// The animation's name, which is unique across all animations in the skeleton. diff --git a/spine-cpp/include/spine/AttachmentTimeline.h b/spine-cpp/include/spine/AttachmentTimeline.h index 3f76f38e6..a32ed73db 100644 --- a/spine-cpp/include/spine/AttachmentTimeline.h +++ b/spine-cpp/include/spine/AttachmentTimeline.h @@ -60,7 +60,7 @@ namespace spine { virtual ~AttachmentTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; /// Sets the time and attachment name for the specified frame. diff --git a/spine-cpp/include/spine/BoneTimeline.h b/spine-cpp/include/spine/BoneTimeline.h index b09c18de4..77cfd2b3b 100644 --- a/spine-cpp/include/spine/BoneTimeline.h +++ b/spine-cpp/include/spine/BoneTimeline.h @@ -66,7 +66,7 @@ namespace spine { public: BoneTimeline1(size_t frameCount, size_t bezierCount, int boneIndex, Property property); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; virtual int getBoneIndex() const override { @@ -95,7 +95,7 @@ namespace spine { public: BoneTimeline2(size_t frameCount, size_t bezierCount, int boneIndex, Property property1, Property property2); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; virtual int getBoneIndex() const override { diff --git a/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/include/spine/ColorTimeline.h index c66f4e759..82d55a501 100644 --- a/spine-cpp/include/spine/ColorTimeline.h +++ b/spine-cpp/include/spine/ColorTimeline.h @@ -101,7 +101,7 @@ namespace spine { virtual ~AlphaTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; virtual int getSlotIndex() override; diff --git a/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/include/spine/DrawOrderTimeline.h index 267b43981..e3fe95c9d 100644 --- a/spine-cpp/include/spine/DrawOrderTimeline.h +++ b/spine-cpp/include/spine/DrawOrderTimeline.h @@ -44,7 +44,7 @@ namespace spine { public: explicit DrawOrderTimeline(size_t frameCount); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; size_t getFrameCount(); diff --git a/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/include/spine/EventTimeline.h index 18f5c4b00..1ef07dc41 100644 --- a/spine-cpp/include/spine/EventTimeline.h +++ b/spine-cpp/include/spine/EventTimeline.h @@ -47,7 +47,7 @@ namespace spine { ~EventTimeline(); /// Fires events for frames > lastTime and <= time. - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; size_t getFrameCount(); diff --git a/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/include/spine/IkConstraintTimeline.h index 53c93e927..4dbf789c9 100644 --- a/spine-cpp/include/spine/IkConstraintTimeline.h +++ b/spine-cpp/include/spine/IkConstraintTimeline.h @@ -49,7 +49,7 @@ namespace spine { virtual ~IkConstraintTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; /// Sets the time, mix, softness, bend direction, compress, and stretch for the specified frame. diff --git a/spine-cpp/include/spine/InheritTimeline.h b/spine-cpp/include/spine/InheritTimeline.h index 940b01d0e..7aa970720 100644 --- a/spine-cpp/include/spine/InheritTimeline.h +++ b/spine-cpp/include/spine/InheritTimeline.h @@ -56,7 +56,7 @@ namespace spine { /// @param time The frame time in seconds. void setFrame(int frame, float time, Inherit inherit); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; diff --git a/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/include/spine/PathConstraintMixTimeline.h index dbff2a598..44fdf8fcd 100644 --- a/spine-cpp/include/spine/PathConstraintMixTimeline.h +++ b/spine-cpp/include/spine/PathConstraintMixTimeline.h @@ -49,7 +49,7 @@ namespace spine { virtual ~PathConstraintMixTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; /// Sets the time and color for the specified frame. diff --git a/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/include/spine/PathConstraintPositionTimeline.h index 5246db143..2ddd67bcd 100644 --- a/spine-cpp/include/spine/PathConstraintPositionTimeline.h +++ b/spine-cpp/include/spine/PathConstraintPositionTimeline.h @@ -49,7 +49,7 @@ namespace spine { virtual ~PathConstraintPositionTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; }; }// namespace spine diff --git a/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/include/spine/PathConstraintSpacingTimeline.h index fc7a7f666..443f07380 100644 --- a/spine-cpp/include/spine/PathConstraintSpacingTimeline.h +++ b/spine-cpp/include/spine/PathConstraintSpacingTimeline.h @@ -46,7 +46,7 @@ namespace spine { virtual ~PathConstraintSpacingTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; }; } diff --git a/spine-cpp/include/spine/PhysicsConstraintTimeline.h b/spine-cpp/include/spine/PhysicsConstraintTimeline.h index 281d2a3f4..2eb7ea4f4 100644 --- a/spine-cpp/include/spine/PhysicsConstraintTimeline.h +++ b/spine-cpp/include/spine/PhysicsConstraintTimeline.h @@ -50,7 +50,7 @@ namespace spine { /// @param constraintIndex -1 for all physics constraints in the skeleton. explicit PhysicsConstraintTimeline(size_t frameCount, size_t bezierCount, int constraintIndex, Property property); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; virtual int getConstraintIndex() const override { @@ -268,7 +268,7 @@ namespace spine { setPropertyIds(ids, 1); } - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; int getFrameCount() { diff --git a/spine-cpp/include/spine/SequenceTimeline.h b/spine-cpp/include/spine/SequenceTimeline.h index 3194abe7f..f5e2f7bd9 100644 --- a/spine-cpp/include/spine/SequenceTimeline.h +++ b/spine-cpp/include/spine/SequenceTimeline.h @@ -51,7 +51,7 @@ namespace spine { virtual ~SequenceTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; /// Sets the time, mode, index, and frame time for the specified frame. diff --git a/spine-cpp/include/spine/Skeleton.h b/spine-cpp/include/spine/Skeleton.h index baf5c15ff..dcd8f67e2 100644 --- a/spine-cpp/include/spine/Skeleton.h +++ b/spine-cpp/include/spine/Skeleton.h @@ -255,7 +255,7 @@ namespace spine { /// @param outHeight The height of the AABB. /// @param outVertexBuffer Reference to hold an array of floats. This method will assign it with new floats as needed. /// @param clipping Pointer to a SkeletonClipping instance or NULL. If a clipper is given, clipping attachments will be taken into account. - void getBounds(float &outX, float &outY, float &outWidth, float &outHeight, Array &outVertexBuffer, SkeletonClipping *clipper); + void getBounds(float &outX, float &outY, float &outWidth, float &outHeight, Array &outVertexBuffer, SkeletonClipping *clipping); Color &getColor(); @@ -283,6 +283,8 @@ namespace spine { void setPosition(float x, float y); + void getPosition(float &x, float &y); + float getWindX(); void setWindX(float windX); diff --git a/spine-cpp/include/spine/SliderMixTimeline.h b/spine-cpp/include/spine/SliderMixTimeline.h index 533c00f58..542af4134 100644 --- a/spine-cpp/include/spine/SliderMixTimeline.h +++ b/spine-cpp/include/spine/SliderMixTimeline.h @@ -45,7 +45,7 @@ namespace spine { virtual ~SliderMixTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; }; } diff --git a/spine-cpp/include/spine/SliderTimeline.h b/spine-cpp/include/spine/SliderTimeline.h index 1431ff96f..281713ef4 100644 --- a/spine-cpp/include/spine/SliderTimeline.h +++ b/spine-cpp/include/spine/SliderTimeline.h @@ -45,7 +45,7 @@ namespace spine { virtual ~SliderTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; }; } diff --git a/spine-cpp/include/spine/SlotCurveTimeline.h b/spine-cpp/include/spine/SlotCurveTimeline.h index de0e175ae..6e20a377f 100644 --- a/spine-cpp/include/spine/SlotCurveTimeline.h +++ b/spine-cpp/include/spine/SlotCurveTimeline.h @@ -49,7 +49,7 @@ namespace spine { virtual ~SlotCurveTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; virtual int getSlotIndex() override; diff --git a/spine-cpp/include/spine/Timeline.h b/spine-cpp/include/spine/Timeline.h index 60151d6c8..777ee3c9d 100644 --- a/spine-cpp/include/spine/Timeline.h +++ b/spine-cpp/include/spine/Timeline.h @@ -54,14 +54,14 @@ namespace spine { /// @param skeleton The skeleton the timeline is being applied to. This provides access to the bones, slots, and other skeleton components the timeline may change. /// @param lastTime lastTime The time this timeline was last applied. Timelines such as EventTimeline trigger only at specific times rather than every frame. In that case, the timeline triggers everything between lastTime (exclusive) and time (inclusive). /// @param time The time within the animation. Most timelines find the key before and the key after this time so they can interpolate between the keys. - /// @param pEvents If any events are fired, they are added to this array. Can be NULL to ignore firing events or if the timeline does not fire events. May be NULL. + /// @param events If any events are fired, they are added to this array. Can be NULL to ignore firing events or if the timeline does not fire events. May be NULL. /// @param alpha alpha 0 applies the current or setup pose value (depending on pose parameter). 1 applies the timeline /// value. Between 0 and 1 applies a value between the current or setup pose and the timeline value. By adjusting alpha over /// time, an animation can be mixed in or out. alpha can also be useful to apply animations on top of each other (layered). /// @param blend Controls how mixing is applied when alpha is than 1. /// @param direction Indicates whether the timeline is mixing in or out. Used by timelines which perform instant transitions such as DrawOrderTimeline and AttachmentTimeline. /// @param appliedPose True to modify the applied pose. - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) = 0; size_t getFrameEntries(); diff --git a/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/include/spine/TransformConstraintTimeline.h index 5cf2e9659..097f63503 100644 --- a/spine-cpp/include/spine/TransformConstraintTimeline.h +++ b/spine-cpp/include/spine/TransformConstraintTimeline.h @@ -50,7 +50,7 @@ namespace spine { virtual ~TransformConstraintTimeline(); - virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, + virtual void apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) override; /// Sets the time, rotate mix, translate mix, scale mix, and shear mix for the specified frame. diff --git a/spine-cpp/src/spine/Animation.cpp b/spine-cpp/src/spine/Animation.cpp index ac4a2b3cd..6428fceed 100644 --- a/spine-cpp/src/spine/Animation.cpp +++ b/spine-cpp/src/spine/Animation.cpp @@ -57,7 +57,7 @@ Animation::~Animation() { ArrayUtils::deleteElements(_timelines); } -void Animation::apply(Skeleton &skeleton, float lastTime, float time, bool loop, Array *pEvents, float alpha, MixBlend blend, +void Animation::apply(Skeleton &skeleton, float lastTime, float time, bool loop, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { if (loop && _duration != 0) { time = MathUtil::fmod(time, _duration); @@ -67,7 +67,7 @@ void Animation::apply(Skeleton &skeleton, float lastTime, float time, bool loop, } for (size_t i = 0, n = _timelines.size(); i < n; ++i) { - _timelines[i]->apply(skeleton, lastTime, time, pEvents, alpha, blend, direction, appliedPose); + _timelines[i]->apply(skeleton, lastTime, time, events, alpha, blend, direction, appliedPose); } } diff --git a/spine-cpp/src/spine/AttachmentTimeline.cpp b/spine-cpp/src/spine/AttachmentTimeline.cpp index e47d7c976..485a56969 100644 --- a/spine-cpp/src/spine/AttachmentTimeline.cpp +++ b/spine-cpp/src/spine/AttachmentTimeline.cpp @@ -60,10 +60,10 @@ void AttachmentTimeline::setAttachment(Skeleton &skeleton, SlotPose &pose, Strin pose.setAttachment(attachmentName == NULL || attachmentName->isEmpty() ? NULL : skeleton.getAttachment(_slotIndex, *attachmentName)); } -void AttachmentTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void AttachmentTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(alpha); Slot *slot = skeleton._slots[_slotIndex]; diff --git a/spine-cpp/src/spine/BoneTimeline.cpp b/spine-cpp/src/spine/BoneTimeline.cpp index 279c135d8..fd325ec70 100644 --- a/spine-cpp/src/spine/BoneTimeline.cpp +++ b/spine-cpp/src/spine/BoneTimeline.cpp @@ -48,10 +48,10 @@ BoneTimeline1::BoneTimeline1(size_t frameCount, size_t bezierCount, int boneInde setPropertyIds(ids, 1); } -void BoneTimeline1::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, - MixDirection direction, bool appliedPose) { +void BoneTimeline1::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, + bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); Bone *bone = skeleton._bones[_boneIndex]; if (bone->isActive()) { @@ -67,10 +67,10 @@ BoneTimeline2::BoneTimeline2(size_t frameCount, size_t bezierCount, int boneInde setPropertyIds(ids, 2); } -void BoneTimeline2::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, - MixDirection direction, bool appliedPose) { +void BoneTimeline2::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, + bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); Bone *bone = skeleton._bones[_boneIndex]; if (bone->isActive()) { diff --git a/spine-cpp/src/spine/ColorTimeline.cpp b/spine-cpp/src/spine/ColorTimeline.cpp index 38bbe1221..700bab411 100644 --- a/spine-cpp/src/spine/ColorTimeline.cpp +++ b/spine-cpp/src/spine/ColorTimeline.cpp @@ -219,10 +219,10 @@ void AlphaTimeline::setSlotIndex(int inValue) { _slotIndex = inValue; } -void AlphaTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, - MixDirection direction, bool appliedPose) { +void AlphaTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, + bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); Slot *slot = skeleton._slots[_slotIndex]; diff --git a/spine-cpp/src/spine/DrawOrderTimeline.cpp b/spine-cpp/src/spine/DrawOrderTimeline.cpp index 7cd3a0db0..1a221b4aa 100644 --- a/spine-cpp/src/spine/DrawOrderTimeline.cpp +++ b/spine-cpp/src/spine/DrawOrderTimeline.cpp @@ -52,11 +52,11 @@ DrawOrderTimeline::DrawOrderTimeline(size_t frameCount) : Timeline(frameCount, 1 } } -void DrawOrderTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void DrawOrderTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(appliedPose); SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(alpha); Array &drawOrder = skeleton._drawOrder; diff --git a/spine-cpp/src/spine/IkConstraintTimeline.cpp b/spine-cpp/src/spine/IkConstraintTimeline.cpp index d94ccd57f..0f2ef415e 100644 --- a/spine-cpp/src/spine/IkConstraintTimeline.cpp +++ b/spine-cpp/src/spine/IkConstraintTimeline.cpp @@ -53,10 +53,10 @@ IkConstraintTimeline::IkConstraintTimeline(size_t frameCount, size_t bezierCount IkConstraintTimeline::~IkConstraintTimeline() { } -void IkConstraintTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void IkConstraintTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); IkConstraint *constraint = (IkConstraint *) skeleton._constraints[_constraintIndex]; if (!constraint->isActive()) return; diff --git a/spine-cpp/src/spine/InheritTimeline.cpp b/spine-cpp/src/spine/InheritTimeline.cpp index 6f2cd2140..f01beaa2e 100644 --- a/spine-cpp/src/spine/InheritTimeline.cpp +++ b/spine-cpp/src/spine/InheritTimeline.cpp @@ -57,10 +57,10 @@ void InheritTimeline::setFrame(int frame, float time, Inherit inherit) { } -void InheritTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void InheritTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(alpha); Bone *bone = skeleton._bones[_boneIndex]; diff --git a/spine-cpp/src/spine/PathConstraintMixTimeline.cpp b/spine-cpp/src/spine/PathConstraintMixTimeline.cpp index fd7ce861c..b812d297a 100644 --- a/spine-cpp/src/spine/PathConstraintMixTimeline.cpp +++ b/spine-cpp/src/spine/PathConstraintMixTimeline.cpp @@ -53,10 +53,10 @@ PathConstraintMixTimeline::PathConstraintMixTimeline(size_t frameCount, size_t b PathConstraintMixTimeline::~PathConstraintMixTimeline() { } -void PathConstraintMixTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void PathConstraintMixTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); PathConstraint *constraint = (PathConstraint *) skeleton._constraints[_constraintIndex]; diff --git a/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp b/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp index 28de135da..e324e028f 100644 --- a/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp +++ b/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp @@ -50,10 +50,10 @@ PathConstraintPositionTimeline::PathConstraintPositionTimeline(size_t frameCount PathConstraintPositionTimeline::~PathConstraintPositionTimeline() { } -void PathConstraintPositionTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void PathConstraintPositionTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); PathConstraint *constraint = (PathConstraint *) skeleton._constraints[_constraintIndex]; diff --git a/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp b/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp index 681ce1c58..4e5827b23 100644 --- a/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp +++ b/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp @@ -50,10 +50,10 @@ PathConstraintSpacingTimeline::PathConstraintSpacingTimeline(size_t frameCount, PathConstraintSpacingTimeline::~PathConstraintSpacingTimeline() { } -void PathConstraintSpacingTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void PathConstraintSpacingTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); PathConstraint *constraint = (PathConstraint *) skeleton._constraints[_constraintIndex]; diff --git a/spine-cpp/src/spine/SequenceTimeline.cpp b/spine-cpp/src/spine/SequenceTimeline.cpp index e4d46c626..da04ce66b 100644 --- a/spine-cpp/src/spine/SequenceTimeline.cpp +++ b/spine-cpp/src/spine/SequenceTimeline.cpp @@ -71,11 +71,11 @@ void SequenceTimeline::setSlotIndex(int inValue) { _slotIndex = inValue; } -void SequenceTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void SequenceTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(alpha); SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); Slot *slot = skeleton.getSlots()[getSlotIndex()]; if (!slot->getBone().isActive()) return; diff --git a/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/src/spine/Skeleton.cpp index c86f72ec0..fcf73ad73 100644 --- a/spine-cpp/src/spine/Skeleton.cpp +++ b/spine-cpp/src/spine/Skeleton.cpp @@ -35,23 +35,23 @@ #include #include #include -#include #include #include +#include #include #include #include -#include #include +#include #include #include #include #include #include +#include #include #include -#include #include @@ -224,7 +224,6 @@ void Skeleton::updateWorldTransform(Physics physics) { } } - void Skeleton::setupPose() { setupPoseBones(); setupPoseSlots(); @@ -490,6 +489,11 @@ void Skeleton::setPosition(float x, float y) { _y = y; } +void Skeleton::getPosition(float &x, float &y) { + x = _x; + y = _y; +} + float Skeleton::getWindX() { return _windX; } diff --git a/spine-cpp/src/spine/SliderMixTimeline.cpp b/spine-cpp/src/spine/SliderMixTimeline.cpp index 081067119..701e22e3b 100644 --- a/spine-cpp/src/spine/SliderMixTimeline.cpp +++ b/spine-cpp/src/spine/SliderMixTimeline.cpp @@ -51,10 +51,10 @@ SliderMixTimeline::SliderMixTimeline(size_t frameCount, size_t bezierCount, int SliderMixTimeline::~SliderMixTimeline() { } -void SliderMixTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void SliderMixTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); Slider *constraint = (Slider *) skeleton._constraints[_constraintIndex]; diff --git a/spine-cpp/src/spine/SliderTimeline.cpp b/spine-cpp/src/spine/SliderTimeline.cpp index ed145f757..527a293f5 100644 --- a/spine-cpp/src/spine/SliderTimeline.cpp +++ b/spine-cpp/src/spine/SliderTimeline.cpp @@ -51,10 +51,10 @@ SliderTimeline::SliderTimeline(size_t frameCount, size_t bezierCount, int slider SliderTimeline::~SliderTimeline() { } -void SliderTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void SliderTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); Slider *constraint = (Slider *) skeleton._constraints[_constraintIndex]; diff --git a/spine-cpp/src/spine/SlotCurveTimeline.cpp b/spine-cpp/src/spine/SlotCurveTimeline.cpp index 9365e0bc3..d51bf984a 100644 --- a/spine-cpp/src/spine/SlotCurveTimeline.cpp +++ b/spine-cpp/src/spine/SlotCurveTimeline.cpp @@ -53,10 +53,10 @@ void SlotCurveTimeline::setSlotIndex(int inValue) { _slotIndex = inValue; } -void SlotCurveTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void SlotCurveTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); Slot *slot = skeleton._slots[_slotIndex]; diff --git a/spine-cpp/src/spine/TransformConstraintTimeline.cpp b/spine-cpp/src/spine/TransformConstraintTimeline.cpp index a8426cc38..c7f281fcb 100644 --- a/spine-cpp/src/spine/TransformConstraintTimeline.cpp +++ b/spine-cpp/src/spine/TransformConstraintTimeline.cpp @@ -53,10 +53,10 @@ TransformConstraintTimeline::TransformConstraintTimeline(size_t frameCount, size TransformConstraintTimeline::~TransformConstraintTimeline() { } -void TransformConstraintTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *pEvents, float alpha, MixBlend blend, +void TransformConstraintTimeline::apply(Skeleton &skeleton, float lastTime, float time, Array *events, float alpha, MixBlend blend, MixDirection direction, bool appliedPose) { SP_UNUSED(lastTime); - SP_UNUSED(pEvents); + SP_UNUSED(events); SP_UNUSED(direction); TransformConstraint *constraint = (TransformConstraint *) skeleton._constraints[_constraintIndex];