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

[cpp] 4.3 porting WIP

Browse Source
This commit is contained in:
Mario Zechner 2025-06-11 15:56:00 +02:00
parent 366291deaf
commit b605f0ccac
8 changed files with 117 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,9 @@ namespace spine {
class SP_API BoneLocal : public Pose<BoneLocal> {
friend class BoneTimeline1;
friend class RotateTimeline;
friend class ScaleTimeline;
friend class ScaleXTimeline;
friend class ScaleYTimeline;
RTTI_DECL

27
spine-cpp/spine-cpp/include/spine/BoneTimeline.h
View File

@ -74,6 +74,33 @@ namespace spine {
int _boneIndex;
};
/// Base class for timelines that animate two bone properties.
class SP_API BoneTimeline2 : public CurveTimeline2, public BoneTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;
friend class AnimationState;
RTTI_DECL
public:
BoneTimeline2(size_t frameCount, size_t bezierCount, int boneIndex, Property property1, Property property2);
virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction, bool appliedPose) override;
virtual int getBoneIndex() override { return _boneIndex; }
void setBoneIndex(int inValue) { _boneIndex = inValue; }
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;
int _boneIndex;
};
}
#endif

1
spine-cpp/spine-cpp/include/spine/Posed.h
View File

@ -38,6 +38,7 @@ namespace spine {
class SP_API Posed : public SpineObject {
friend class AnimationState;
friend class BoneTimeline1;
friend class BoneTimeline2;
friend class RotateTimeline;
friend class IkConstraint;
friend class TransformConstraint;

1
spine-cpp/spine-cpp/include/spine/PosedData.h
View File

@ -43,6 +43,7 @@ namespace spine {
friend class SkeletonBinary;
friend class SkeletonJson;
friend class BoneTimeline1;
friend class BoneTimeline2;
friend class RotateTimeline;
friend class AttachmentTimeline;
friend class RGBATimeline;

56
spine-cpp/spine-cpp/include/spine/ScaleTimeline.h
View File

@ -30,10 +30,11 @@
#ifndef Spine_ScaleTimeline_h
#define Spine_ScaleTimeline_h
#include <spine/TranslateTimeline.h>
#include <spine/BoneTimeline.h>
namespace spine {
class SP_API ScaleTimeline : public CurveTimeline2 {
/// Changes a bone's local scale X and Y.
class SP_API ScaleTimeline : public BoneTimeline2 {
friend class SkeletonBinary;
friend class SkeletonJson;
@ -43,21 +44,13 @@ namespace spine {
public:
explicit ScaleTimeline(size_t frameCount, size_t bezierCount, int boneIndex);
virtual ~ScaleTimeline();
virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction);
int getBoneIndex() { return _boneIndex; }
void setBoneIndex(int inValue) { _boneIndex = inValue; }
private:
int _boneIndex;
protected:
virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend,
MixDirection direction) override;
};
class SP_API ScaleXTimeline : public CurveTimeline1 {
/// Changes a bone's local scale X.
class SP_API ScaleXTimeline : public BoneTimeline1 {
friend class SkeletonBinary;
friend class SkeletonJson;
@ -67,21 +60,13 @@ namespace spine {
public:
explicit ScaleXTimeline(size_t frameCount, size_t bezierCount, int boneIndex);
virtual ~ScaleXTimeline();
virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction);
int getBoneIndex() { return _boneIndex; }
void setBoneIndex(int inValue) { _boneIndex = inValue; }
private:
int _boneIndex;
protected:
virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend,
MixDirection direction) override;
};
class SP_API ScaleYTimeline : public CurveTimeline1 {
/// Changes a bone's local scale Y.
class SP_API ScaleYTimeline : public BoneTimeline1 {
friend class SkeletonBinary;
friend class SkeletonJson;
@ -91,18 +76,9 @@ namespace spine {
public:
explicit ScaleYTimeline(size_t frameCount, size_t bezierCount, int boneIndex);
virtual ~ScaleYTimeline();
virtual void
apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha, MixBlend blend,
MixDirection direction);
int getBoneIndex() { return _boneIndex; }
void setBoneIndex(int inValue) { _boneIndex = inValue; }
private:
int _boneIndex;
protected:
virtual void apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend,
MixDirection direction) override;
};
}

1
spine-cpp/spine-cpp/include/spine/Skeleton.h
View File

@ -108,6 +108,7 @@ namespace spine {
friend class TransformConstraintTimeline;
friend class BoneTimeline1;
friend class BoneTimeline2;
friend class RotateTimeline;

19
spine-cpp/spine-cpp/src/spine/BoneTimeline.cpp
View File

@ -57,6 +57,25 @@ void BoneTimeline1::apply(Skeleton &skeleton, float lastTime, float time, Vector
SP_UNUSED(lastTime);
SP_UNUSED(pEvents);
Bone *bone = skeleton._bones[_boneIndex];
if (bone->isActive()) {
apply(appliedPose ? *bone->_applied : bone->_pose, *bone->_data._setup, time, alpha, blend, direction);
}
}
RTTI_IMPL(BoneTimeline2, CurveTimeline2)
BoneTimeline2::BoneTimeline2(size_t frameCount, size_t bezierCount, int boneIndex, Property property1, Property property2) :
CurveTimeline2(frameCount, bezierCount), _boneIndex(boneIndex) {
PropertyId ids[] = {((PropertyId) property1 << 32) | boneIndex, ((PropertyId) property2 << 32) | boneIndex};
setPropertyIds(ids, 2);
}
void BoneTimeline2::apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha,
MixBlend blend, MixDirection direction, bool appliedPose) {
SP_UNUSED(lastTime);
SP_UNUSED(pEvents);
Bone *bone = skeleton._bones[_boneIndex];
if (bone->isActive()) {
apply(appliedPose ? *bone->_applied : bone->_pose, *bone->_data._setup, time, alpha, blend, direction);

127
spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp
View File

@ -31,6 +31,7 @@
#include <spine/Event.h>
#include <spine/Skeleton.h>
#include <spine/Animation.h>
#include <spine/Bone.h>
#include <spine/BoneData.h>
@ -39,35 +40,23 @@
using namespace spine;
RTTI_IMPL(ScaleTimeline, CurveTimeline2)
RTTI_IMPL(ScaleTimeline, BoneTimeline2)
ScaleTimeline::ScaleTimeline(size_t frameCount, size_t bezierCount, int boneIndex) : CurveTimeline2(frameCount,
bezierCount),
_boneIndex(boneIndex) {
PropertyId ids[] = {((PropertyId) Property_ScaleX << 32) | boneIndex,
((PropertyId) Property_ScaleY << 32) | boneIndex};
setPropertyIds(ids, 2);
ScaleTimeline::ScaleTimeline(size_t frameCount, size_t bezierCount, int boneIndex) :
BoneTimeline2(frameCount, bezierCount, boneIndex, Property_ScaleX, Property_ScaleY) {
}
ScaleTimeline::~ScaleTimeline() {}
void ScaleTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha,
MixBlend blend, MixDirection direction) {
SP_UNUSED(lastTime);
SP_UNUSED(pEvents);
Bone *bone = skeleton._bones[_boneIndex];
if (!bone->_active) return;
void ScaleTimeline::apply(BoneLocal &pose, BoneLocal &setup, float time, float alpha, MixBlend blend,
MixDirection direction) {
if (time < _frames[0]) {
switch (blend) {
case MixBlend_Setup:
bone->_scaleX = bone->_data._scaleX;
bone->_scaleY = bone->_data._scaleY;
pose._scaleX = setup._scaleX;
pose._scaleY = setup._scaleY;
return;
case MixBlend_First:
bone->_scaleX += (bone->_data._scaleX - bone->_scaleX) * alpha;
bone->_scaleY += (bone->_data._scaleY - bone->_scaleY) * alpha;
pose._scaleX += (setup._scaleX - pose._scaleX) * alpha;
pose._scaleY += (setup._scaleY - pose._scaleY) * alpha;
default: {
}
}
@ -98,97 +87,79 @@ void ScaleTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector
curveType + CurveTimeline2::BEZIER_SIZE - CurveTimeline2::BEZIER);
}
}
x *= bone->_data._scaleX;
y *= bone->_data._scaleY;
x *= setup._scaleX;
y *= setup._scaleY;
if (alpha == 1) {
if (blend == MixBlend_Add) {
bone->_scaleX += x - bone->_data._scaleX;
bone->_scaleY += y - bone->_data._scaleY;
pose._scaleX += x - setup._scaleX;
pose._scaleY += y - setup._scaleY;
} else {
bone->_scaleX = x;
bone->_scaleY = y;
pose._scaleX = x;
pose._scaleY = y;
}
} else {
float bx, by;
if (direction == MixDirection_Out) {
switch (blend) {
case MixBlend_Setup:
bx = bone->_data._scaleX;
by = bone->_data._scaleY;
bone->_scaleX = bx + (MathUtil::abs(x) * MathUtil::sign(bx) - bx) * alpha;
bone->_scaleY = by + (MathUtil::abs(y) * MathUtil::sign(by) - by) * alpha;
bx = setup._scaleX;
by = setup._scaleY;
pose._scaleX = bx + (MathUtil::abs(x) * MathUtil::sign(bx) - bx) * alpha;
pose._scaleY = by + (MathUtil::abs(y) * MathUtil::sign(by) - by) * alpha;
break;
case MixBlend_First:
case MixBlend_Replace:
bx = bone->_scaleX;
by = bone->_scaleY;
bone->_scaleX = bx + (MathUtil::abs(x) * MathUtil::sign(bx) - bx) * alpha;
bone->_scaleY = by + (MathUtil::abs(y) * MathUtil::sign(by) - by) * alpha;
bx = pose._scaleX;
by = pose._scaleY;
pose._scaleX = bx + (MathUtil::abs(x) * MathUtil::sign(bx) - bx) * alpha;
pose._scaleY = by + (MathUtil::abs(y) * MathUtil::sign(by) - by) * alpha;
break;
case MixBlend_Add:
bone->_scaleX += (x - bone->_data._scaleX) * alpha;
bone->_scaleY += (y - bone->_data._scaleY) * alpha;
pose._scaleX += (x - setup._scaleX) * alpha;
pose._scaleY += (y - setup._scaleY) * alpha;
}
} else {
switch (blend) {
case MixBlend_Setup:
bx = MathUtil::abs(bone->_data._scaleX) * MathUtil::sign(x);
by = MathUtil::abs(bone->_data._scaleY) * MathUtil::sign(y);
bone->_scaleX = bx + (x - bx) * alpha;
bone->_scaleY = by + (y - by) * alpha;
bx = MathUtil::abs(setup._scaleX) * MathUtil::sign(x);
by = MathUtil::abs(setup._scaleY) * MathUtil::sign(y);
pose._scaleX = bx + (x - bx) * alpha;
pose._scaleY = by + (y - by) * alpha;
break;
case MixBlend_First:
case MixBlend_Replace:
bx = MathUtil::abs(bone->_scaleX) * MathUtil::sign(x);
by = MathUtil::abs(bone->_scaleY) * MathUtil::sign(y);
bone->_scaleX = bx + (x - bx) * alpha;
bone->_scaleY = by + (y - by) * alpha;
bx = MathUtil::abs(pose._scaleX) * MathUtil::sign(x);
by = MathUtil::abs(pose._scaleY) * MathUtil::sign(y);
pose._scaleX = bx + (x - bx) * alpha;
pose._scaleY = by + (y - by) * alpha;
break;
case MixBlend_Add:
bone->_scaleX += (x - bone->_data._scaleX) * alpha;
bone->_scaleY += (y - bone->_data._scaleY) * alpha;
pose._scaleX += (x - setup._scaleX) * alpha;
pose._scaleY += (y - setup._scaleY) * alpha;
}
}
}
}
RTTI_IMPL(ScaleXTimeline, CurveTimeline1)
RTTI_IMPL(ScaleXTimeline, BoneTimeline1)
ScaleXTimeline::ScaleXTimeline(size_t frameCount, size_t bezierCount, int boneIndex) : CurveTimeline1(frameCount,
bezierCount),
_boneIndex(boneIndex) {
PropertyId ids[] = {((PropertyId) Property_ScaleX << 32) | boneIndex};
setPropertyIds(ids, 1);
ScaleXTimeline::ScaleXTimeline(size_t frameCount, size_t bezierCount, int boneIndex) :
BoneTimeline1(frameCount, bezierCount, boneIndex, Property_ScaleX) {
}
ScaleXTimeline::~ScaleXTimeline() {}
void ScaleXTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha,
MixBlend blend, MixDirection direction) {
SP_UNUSED(lastTime);
SP_UNUSED(pEvents);
Bone *bone = skeleton._bones[_boneIndex];
if (bone->_active) bone->_scaleX = getScaleValue(time, alpha, blend, direction, bone->_scaleX, bone->_data._scaleX);
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);
}
RTTI_IMPL(ScaleYTimeline, CurveTimeline1)
RTTI_IMPL(ScaleYTimeline, BoneTimeline1)
ScaleYTimeline::ScaleYTimeline(size_t frameCount, size_t bezierCount, int boneIndex) : CurveTimeline1(frameCount,
bezierCount),
_boneIndex(boneIndex) {
PropertyId ids[] = {((PropertyId) Property_ScaleY << 32) | boneIndex};
setPropertyIds(ids, 1);
ScaleYTimeline::ScaleYTimeline(size_t frameCount, size_t bezierCount, int boneIndex) :
BoneTimeline1(frameCount, bezierCount, boneIndex, Property_ScaleY) {
}
ScaleYTimeline::~ScaleYTimeline() {}
void ScaleYTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector<Event *> *pEvents, float alpha,
MixBlend blend, MixDirection direction) {
SP_UNUSED(lastTime);
SP_UNUSED(pEvents);
Bone *bone = skeleton._bones[_boneIndex];
if (bone->_active) bone->_scaleY = getScaleValue(time, alpha, blend, direction, bone->_scaleX, bone->_data._scaleY);
}
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);
}