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

[c] 4.0 porting, SRTS timelines.

Browse Source
This commit is contained in:
badlogic 2021-03-26 12:43:24 +01:00
parent 22f6782fe5
commit 25f202abe0
2 changed files with 209 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spine-c/spine-c/include/spine/Animation.h
View File

@ -226,14 +226,39 @@ SP_API void spScaleYTimeline_setFrame (spScaleYTimeline* self, int frame, float
/**/ /**/
typedef struct spBaseTimeline spShearTimeline; typedef struct spShearTimeline {
spCurveTimeline2 super;
int boneIndex;
} spShearTimeline;
SP_API spShearTimeline* spShearTimeline_create (int framesCount); SP_API spShearTimeline* spShearTimeline_create (int frameCount, int bezierCount, int boneIndex);
SP_API void spShearTimeline_setFrame (spShearTimeline* self, int frameIndex, float time, float x, float y); SP_API void spShearTimeline_setFrame (spShearTimeline* self, int frameIndex, float time, float x, float y);
/**/ /**/
typedef struct spShearXTimeline {
spCurveTimeline1 super;
int boneIndex;
} spShearXTimeline;
SP_API spShearXTimeline* spShearXTimeline_create (int frameCount, int bezierCount, int boneIndex);
SP_API void spShearXTimeline_setFrame (spShearXTimeline* self, int frame, float time, float x);
/**/
typedef struct spShearYTimeline {
spCurveTimeline1 super;
int boneIndex;
} spShearYTimeline;
SP_API spShearYTimeline* spShearYTimeline_create (int frameCount, int bezierCount, int boneIndex);
SP_API void spShearYTimeline_setFrame (spShearYTimeline* self, int frame, float time, float x);
/**/
static const int COLOR_ENTRIES = 5; static const int COLOR_ENTRIES = 5;
typedef struct spColorTimeline { typedef struct spColorTimeline {

238
spine-c/spine-c/src/spine/Animation.c
View File

@ -833,61 +833,66 @@ void _spShearTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, f
) { ) {
spBone *bone; spBone *bone;
int frame; int frame;
float frameTime, percent, x, y; float x, y, t;
float *frames; int i, curveType;
int framesCount;
spShearTimeline* self = SUB_CAST(spShearTimeline, timeline); spShearTimeline* self = SUB_CAST(spShearTimeline, timeline);
float* frames = SUPER(self)->super.frames->items;
float* curves = SUPER(self)->curves->items;
bone = skeleton->bones[self->boneIndex]; bone = skeleton->bones[self->boneIndex];
if (!bone->active) return; if (!bone->active) return;
frames = self->frames; if (time < frames[0]) {
framesCount = self->framesCount; switch (blend) {
if (time < self->frames[0]) { case SP_MIX_BLEND_SETUP:
switch (blend) { bone->shearX = bone->data->shearX;
case SP_MIX_BLEND_SETUP: bone->shearY = bone->data->shearY;
bone->shearX = bone->data->shearX; return;
bone->shearY = bone->data->shearY; case SP_MIX_BLEND_FIRST:
return; bone->shearX += (bone->data->shearX - bone->shearX) * alpha;
case SP_MIX_BLEND_FIRST: bone->shearY += (bone->data->shearY - bone->shearY) * alpha;
bone->shearX += (bone->data->shearX - bone->shearX) * alpha; default: {}
bone->shearY += (bone->data->shearY - bone->shearY) * alpha; }
case SP_MIX_BLEND_REPLACE: return;
case SP_MIX_BLEND_ADD: }
; /* to appease compiler */
} i = search(frames, time, CURVE2_ENTRIES);
return; curveType = (int)curves[i / CURVE2_ENTRIES];
} switch (curveType) {
case CURVE_LINEAR: {
float before = frames[i];
x = frames[i + CURVE2_VALUE1];
y = frames[i + CURVE2_VALUE2];
t = (time - before) / (frames[i + CURVE2_ENTRIES] - before);
x += (frames[i + CURVE2_ENTRIES + CURVE2_VALUE1] - x) * t;
y += (frames[i + CURVE2_ENTRIES + CURVE2_VALUE2] - y) * t;
break;
}
case CURVE_STEPPED: {
x = frames[i + CURVE2_VALUE1];
y = frames[i + CURVE2_VALUE2];
break;
}
default: {
x = _spCurveTimeline_getBezierValue(SUPER(self), time, i, CURVE2_VALUE1, curveType - CURVE_BEZIER);
y = _spCurveTimeline_getBezierValue(SUPER(self), time, i, CURVE2_VALUE2, curveType + BEZIER_SIZE - CURVE_BEZIER);
}
}
if (time >= frames[framesCount - TRANSLATE_ENTRIES]) { /* Time is after last frame. */ switch (blend) {
x = frames[framesCount + TRANSLATE_PREV_X]; case SP_MIX_BLEND_SETUP:
y = frames[framesCount + TRANSLATE_PREV_Y]; bone->shearX = bone->data->shearX + x * alpha;
} else { bone->shearY = bone->data->shearY + y * alpha;
/* Interpolate between the previous frame and the current frame. */ break;
frame = binarySearch(frames, framesCount, time, TRANSLATE_ENTRIES); case SP_MIX_BLEND_FIRST:
x = frames[frame + TRANSLATE_PREV_X]; case SP_MIX_BLEND_REPLACE:
y = frames[frame + TRANSLATE_PREV_Y]; bone->shearX += (bone->data->shearX + x - bone->shearX) * alpha;
frameTime = frames[frame]; bone->shearY += (bone->data->shearY + y - bone->shearY) * alpha;
percent = spCurveTimeline_getCurvePercent(SUPER(self), frame / TRANSLATE_ENTRIES - 1, break;
1 - (time - frameTime) / (frames[frame + TRANSLATE_PREV_TIME] - frameTime)); case SP_MIX_BLEND_ADD:
bone->shearX += x * alpha;
x = x + (frames[frame + TRANSLATE_X] - x) * percent; bone->shearY += y * alpha;
y = y + (frames[frame + TRANSLATE_Y] - y) * percent; }
}
switch (blend) {
case SP_MIX_BLEND_SETUP:
bone->shearX = bone->data->shearX + x * alpha;
bone->shearY = bone->data->shearY + y * alpha;
break;
case SP_MIX_BLEND_FIRST:
case SP_MIX_BLEND_REPLACE:
bone->shearX += (bone->data->shearX + x - bone->shearX) * alpha;
bone->shearY += (bone->data->shearY + y - bone->shearY) * alpha;
break;
case SP_MIX_BLEND_ADD:
bone->shearX += x * alpha;
bone->shearY += y * alpha;
}
UNUSED(lastTime); UNUSED(lastTime);
UNUSED(firedEvents); UNUSED(firedEvents);
@ -895,16 +900,137 @@ void _spShearTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, f
UNUSED(direction); UNUSED(direction);
} }
int _spShearTimeline_getPropertyId (const spTimeline* timeline) { spShearTimeline* spShearTimeline_create (int frameCount, int bezierCount, int boneIndex) {
return (SP_TIMELINE_SHEAR << 24) + SUB_CAST(spShearTimeline, timeline)->boneIndex; spShearTimeline* timeline = NEW(spShearTimeline);
} spPropertyId ids[2];
ids[0] = ((spPropertyId)SP_PROPERTY_SHEARX << 32) | boneIndex;
spShearTimeline* spShearTimeline_create (int framesCount) { ids[1] = ((spPropertyId)SP_PROPERTY_SHEARY << 32) | boneIndex;
return (spShearTimeline*)_spBaseTimeline_create(framesCount, SP_TIMELINE_SHEAR, 3, _spShearTimeline_apply, _spShearTimeline_getPropertyId); _spCurveTimeline_init(SUPER(timeline), frameCount, CURVE2_ENTRIES, bezierCount, ids, 2, _spCurveTimeline_dispose, _spShearTimeline_apply);
timeline->boneIndex = boneIndex;
return timeline;
} }
void spShearTimeline_setFrame (spShearTimeline* self, int frameIndex, float time, float x, float y) { void spShearTimeline_setFrame (spShearTimeline* self, int frameIndex, float time, float x, float y) {
spTranslateTimeline_setFrame(self, frameIndex, time, x, y); spCurveTimeline2_setFrame(SUPER(self), frameIndex, time, x, y);
}
/**/
void _spShearXTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
spEvent** firedEvents, int* eventsCount, float alpha, spMixBlend blend, spMixDirection direction
) {
spBone *bone;
int frame;
float x;
int curveType;
spTranslateXTimeline* self = SUB_CAST(spTranslateXTimeline, timeline);
float *frames = self->super.super.frames->items;
float *curves = self->super.curves->items;
bone = skeleton->bones[self->boneIndex];
if (!bone->active) return;
if (time < frames[0]) {
switch (blend) {
case SP_MIX_BLEND_SETUP:
bone->shearX = bone->data->shearX;
return;
case SP_MIX_BLEND_FIRST:
bone->shearX += (bone->data->shearX - bone->shearX) * alpha;
default: {}
}
return;
}
x = spCurveTimeline1_getCurveValue(SUPER(self), time);
switch (blend) {
case SP_MIX_BLEND_SETUP:
bone->shearX = bone->data->shearX + x * alpha;
break;
case SP_MIX_BLEND_FIRST:
case SP_MIX_BLEND_REPLACE:
bone->shearX += (bone->data->shearX + x - bone->shearX) * alpha;
break;
case SP_MIX_BLEND_ADD:
bone->shearX += x * alpha;
}
UNUSED(lastTime);
UNUSED(firedEvents);
UNUSED(eventsCount);
}
spShearXTimeline* spShearXTimeline_create (int frameCount, int bezierCount, int boneIndex) {
spShearXTimeline* timeline = NEW(spShearXTimeline);
spPropertyId ids[1];
ids[0] = ((spPropertyId)SP_PROPERTY_SHEARX << 32) | boneIndex;
_spCurveTimeline_init(SUPER(timeline), frameCount, CURVE1_ENTRIES, bezierCount, ids, 1, _spCurveTimeline_dispose, _spShearXTimeline_apply);
timeline->boneIndex = boneIndex;
return timeline;
}
void spShearXTimeline_setFrame (spShearXTimeline* self, int frame, float time, float x) {
spCurveTimeline1_setFrame(SUPER(self), frame, time, x);
}
/**/
void _spShearYTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
spEvent** firedEvents, int* eventsCount, float alpha, spMixBlend blend, spMixDirection direction
) {
spBone *bone;
int frame;
float y, t;
int i, curveType;
spTranslateXTimeline* self = SUB_CAST(spTranslateXTimeline, timeline);
float *frames = self->super.super.frames->items;
float *curves = self->super.curves->items;
bone = skeleton->bones[self->boneIndex];
if (!bone->active) return;
if (time < frames[0]) {
switch (blend) {
case SP_MIX_BLEND_SETUP:
bone->shearY = bone->data->shearY;
return;
case SP_MIX_BLEND_FIRST:
bone->shearY += (bone->data->shearY - bone->shearY) * alpha;
default: {}
}
return;
}
y = spCurveTimeline1_getCurveValue(SUPER(self), time);
switch (blend) {
case SP_MIX_BLEND_SETUP:
bone->shearY = bone->data->shearY + y * alpha;
break;
case SP_MIX_BLEND_FIRST:
case SP_MIX_BLEND_REPLACE:
bone->shearY += (bone->data->shearY + y - bone->shearY) * alpha;
break;
case SP_MIX_BLEND_ADD:
bone->shearY += y * alpha;
}
UNUSED(lastTime);
UNUSED(firedEvents);
UNUSED(eventsCount);
}
spShearYTimeline* spShearYTimeline_create (int frameCount, int bezierCount, int boneIndex) {
spShearYTimeline* timeline = NEW(spShearYTimeline);
spPropertyId ids[1];
ids[0] = ((spPropertyId)SP_PROPERTY_SHEARY << 32) | boneIndex;
_spCurveTimeline_init(SUPER(timeline), frameCount, CURVE1_ENTRIES, bezierCount, ids, 1, _spCurveTimeline_dispose, _spShearYTimeline_apply);
timeline->boneIndex = boneIndex;
return timeline;
}
void spShearYTimeline_setFrame (spShearYTimeline* self, int frame, float time, float y) {
spCurveTimeline1_setFrame(SUPER(self), frame, time, y);
} }
/**/ /**/