UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cpp] 4.3 porting WIP

Browse Source
This commit is contained in:
Mario Zechner 2025-07-07 21:58:42 +02:00
parent 972a1bc8fc
commit 5aeceb27c9
10 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/include/spine/IkConstraint.h
View File

@ -59,7 +59,7 @@ namespace spine {
virtual bool isSourceActive() override; virtual bool isSourceActive() override;
IkConstraintData &getData(); IkConstraintData &getData() override;
Vector<BonePose *> &getBones(); Vector<BonePose *> &getBones();

2
spine-cpp/spine-cpp/include/spine/InheritTimeline.h
View File

@ -58,7 +58,7 @@ namespace spine {
virtual void virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend, apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction, bool appliedPose); MixDirection direction, bool appliedPose) override;
private: private:
static const int ENTRIES = 2; static const int ENTRIES = 2;

3
spine-cpp/spine-cpp/include/spine/Json.h
View File

@ -31,6 +31,7 @@
#define Spine_Json_h #define Spine_Json_h
#include <spine/SpineObject.h> #include <spine/SpineObject.h>
#include <spine/Vector.h>
#ifndef SPINE_JSON_HAVE_PREV #ifndef SPINE_JSON_HAVE_PREV
/* spine doesn't use the "prev" link in the Json sibling lists. */ /* spine doesn't use the "prev" link in the Json sibling lists. */
@ -53,10 +54,12 @@ namespace spine {
template <typename T> template <typename T>
static bool asArray(Json *value, Vector<T> &array) { static bool asArray(Json *value, Vector<T> &array) {
if (value == NULL) return false;
array.setSize(value->_size, 0); array.setSize(value->_size, 0);
Json *vertex = value->_child; Json *vertex = value->_child;
for (int i = 0; vertex; vertex = vertex->_next, i++) for (int i = 0; vertex; vertex = vertex->_next, i++)
array[i] = vertex->_valueInt; array[i] = vertex->_valueInt;
return true;
} }
/* Get item "string" from object. Case insensitive. */ /* Get item "string" from object. Case insensitive. */

2
spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h
View File

@ -51,7 +51,7 @@ namespace spine {
virtual void virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend, apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction, bool appliedPose); MixDirection direction, bool appliedPose) override;
/// Sets the time and color for the specified frame. /// Sets the time and color for the specified frame.
/// @param frame Between 0 and frameCount, inclusive. /// @param frame Between 0 and frameCount, inclusive.

2
spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h
View File

@ -51,7 +51,7 @@ namespace spine {
virtual void virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend, apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction, bool appliedPose); MixDirection direction, bool appliedPose) override;
}; };
} }

2
spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h
View File

@ -48,7 +48,7 @@ namespace spine {
virtual void virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend, apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction, bool appliedPose); MixDirection direction, bool appliedPose) override;
}; };
} }

2
spine-cpp/spine-cpp/include/spine/SkeletonBinary.h
View File

@ -35,6 +35,8 @@
#include <spine/SpineObject.h> #include <spine/SpineObject.h>
#include <spine/SpineString.h> #include <spine/SpineString.h>
#include <spine/Color.h> #include <spine/Color.h>
#include <spine/BoneTimeline.h>
#include <spine/SkeletonData.h>
namespace spine { namespace spine {
class SkeletonData; class SkeletonData;

4
spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
View File

@ -183,7 +183,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
/* Bones. */ /* Bones. */
Vector<BoneData *> &bones = skeletonData->_bones.setSize(input.readInt(true), NULL); Vector<BoneData *> &bones = skeletonData->_bones.setSize(input.readInt(true), NULL);
for (int i = 0; i < bones.size(); ++i) { for (int i = 0; i < (int)bones.size(); ++i) {
const char *name = input.readString(); const char *name = input.readString();
BoneData *parent = i == 0 ? 0 : bones[input.readInt(true)]; BoneData *parent = i == 0 ? 0 : bones[input.readInt(true)];
BoneData *data = new (__FILE__, __LINE__) BoneData(i, String(name, true), parent); BoneData *data = new (__FILE__, __LINE__) BoneData(i, String(name, true), parent);
@ -208,7 +208,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
/* Slots. */ /* Slots. */
Vector<SlotData *> &slots = skeletonData->_slots.setSize(input.readInt(true), NULL); Vector<SlotData *> &slots = skeletonData->_slots.setSize(input.readInt(true), NULL);
for (int i = 0; i < slots.size(); ++i) { for (int i = 0; i < (int)slots.size(); ++i) {
String slotName = String(input.readString(), true); String slotName = String(input.readString(), true);
BoneData *boneData = bones[input.readInt(true)]; BoneData *boneData = bones[input.readInt(true)];
SlotData *data = new (__FILE__, __LINE__) SlotData(i, slotName, *boneData); SlotData *data = new (__FILE__, __LINE__) SlotData(i, slotName, *boneData);

2
spine-cpp/spine-cpp/src/spine/Slider.cpp
View File

@ -71,7 +71,7 @@ void Slider::update(Skeleton &skeleton, Physics physics) {
if (!_bone->isActive()) return; if (!_bone->isActive()) return;
if (_data._local) _bone->_applied->validateLocalTransform(skeleton); if (_data._local) _bone->_applied->validateLocalTransform(skeleton);
p._time = _data._offset p._time = _data._offset
+ (_data._property->value(skeleton, *_bone->_applied, _data._local, _offsets) - _data._property->offset) * _data._scale; + (_data._property->value(skeleton, *_bone->_applied, _data._local, _offsets) - _data._property->_offset) * _data._scale;
if (_data._loop) if (_data._loop)
p._time = animation->getDuration() + MathUtil::fmod(p._time, animation->getDuration()); p._time = animation->getDuration() + MathUtil::fmod(p._time, animation->getDuration());
else else

12
spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
View File

@ -83,18 +83,18 @@ void TransformConstraint::update(Skeleton &skeleton, Physics physics) {
} }
for (size_t f = 0; f < fn; f++) { for (size_t f = 0; f < fn; f++) {
FromProperty *from = fromItems[f]; FromProperty *from = fromItems[f];
float value = from->value(skeleton, source, localSource, offsets) - from->offset; float value = from->value(skeleton, source, localSource, offsets) - from->_offset;
Vector<ToProperty *> &toProps = from->to; Vector<ToProperty *> &toProps = from->_to;
ToProperty **toItems = toProps.buffer(); ToProperty **toItems = toProps.buffer();
for (size_t t = 0, tn = toProps.size(); t < tn; t++) { for (size_t t = 0, tn = toProps.size(); t < tn; t++) {
ToProperty *to = toItems[t]; ToProperty *to = toItems[t];
if (to->mix(p) != 0) { if (to->mix(p) != 0) {
float clamped = to->offset + value * to->scale; float clamped = to->_offset + value * to->_scale;
if (clamp) { if (clamp) {
if (to->offset < to->max) if (to->_offset < to->_max)
clamped = MathUtil::clamp(clamped, to->offset, to->max); clamped = MathUtil::clamp(clamped, to->_offset, to->_max);
else else
clamped = MathUtil::clamp(clamped, to->max, to->offset); clamped = MathUtil::clamp(clamped, to->_max, to->_offset);
} }
to->apply(skeleton, p, *bone, clamped, localTarget, additive); to->apply(skeleton, p, *bone, clamped, localTarget, additive);
} }