UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 00:58:43 +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-12 04:43:24 +02:00
parent 4876f0d00b
commit 90536c3b49
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-cpp/spine-cpp/include/spine/Animation.h
View File

@ -40,6 +40,7 @@
namespace spine {
class Timeline;
class BoneTimeline;
class Skeleton;
@ -104,12 +105,14 @@ namespace spine {
/// Applies all the animation's timelines to the specified skeleton.
/// See also Timeline::apply(Skeleton&, float, float, Vector, float, MixPose, MixDirection)
void apply(Skeleton &skeleton, float lastTime, float time, bool loop, Vector<Event *> *pEvents, float alpha,
MixBlend blend, MixDirection direction);
MixBlend blend, MixDirection direction, bool appliedPose);
const String &getName();
Vector<Timeline *> &getTimelines();
void setTimelines(Vector<Timeline *> &timelines);
bool hasTimeline(Vector<PropertyId> &ids);
float getDuration();
@ -123,6 +126,7 @@ namespace spine {
private:
Vector<Timeline *> _timelines;
HashMap<PropertyId, bool> _timelineIds;
Vector<int> _bones;
float _duration;
String _name;
};

46
spine-cpp/spine-cpp/src/spine/Animation.cpp
View File

@ -31,6 +31,7 @@
#include <spine/Event.h>
#include <spine/Skeleton.h>
#include <spine/Timeline.h>
#include <spine/BoneTimeline.h>
#include <spine/ContainerUtil.h>
@ -38,16 +39,13 @@
using namespace spine;
Animation::Animation(const String &name, Vector<Timeline *> &timelines, float duration) : _timelines(timelines),
Animation::Animation(const String &name, Vector<Timeline *> &timelines, float duration) : _timelines(),
_timelineIds(),
_bones(),
_duration(duration),
_name(name) {
assert(_name.length() > 0);
for (size_t i = 0; i < timelines.size(); i++) {
Vector<PropertyId> propertyIds = timelines[i]->getPropertyIds();
for (size_t ii = 0; ii < propertyIds.size(); ii++)
_timelineIds.put(propertyIds[ii], true);
}
setTimelines(timelines);
}
bool Animation::hasTimeline(Vector<PropertyId> &ids) {
@ -62,7 +60,7 @@ Animation::~Animation() {
}
void Animation::apply(Skeleton &skeleton, float lastTime, float time, bool loop, Vector<Event *> *pEvents, float alpha,
MixBlend blend, MixDirection direction) {
MixBlend blend, MixDirection direction, bool appliedPose) {
if (loop && _duration != 0) {
time = MathUtil::fmod(time, _duration);
if (lastTime > 0) {
@ -71,7 +69,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);
_timelines[i]->apply(skeleton, lastTime, time, pEvents, alpha, blend, direction, appliedPose);
}
}
@ -105,3 +103,35 @@ int Animation::search(Vector<float> &frames, float target, int step) {
if (frames[i] > target) return (int) (i - step);
return (int) (n - step);
}
void Animation::setTimelines(Vector<Timeline *> &timelines) {
_timelines = timelines;
size_t n = timelines.size();
_timelineIds.clear();
_bones.clear();
HashMap<int, bool> boneSet;
for (size_t i = 0; i < n; i++) {
Timeline *timeline = timelines[i];
Vector<PropertyId> propertyIds = timeline->getPropertyIds();
for (size_t ii = 0; ii < propertyIds.size(); ii++) {
_timelineIds.put(propertyIds[ii], true);
}
BoneTimeline *boneTimeline = nullptr;
if (timeline->getRTTI().instanceOf(BoneTimeline1::rtti)) {
boneTimeline = static_cast<BoneTimeline1 *>(timeline);
} else if (timeline->getRTTI().instanceOf(BoneTimeline2::rtti)) {
boneTimeline = static_cast<BoneTimeline2 *>(timeline);
}
if (boneTimeline) {
int boneIndex = boneTimeline->getBoneIndex();
if (!boneSet.containsKey(boneIndex)) {
boneSet.put(boneIndex, true);
_bones.add(boneIndex);
}
}
}
}