UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-06 18:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added timeline type.

Browse Source
This commit is contained in:
NathanSweet 2013-10-10 09:26:30 +02:00
parent 2bff08de4b
commit ff2b76f2ef
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,8 +64,8 @@ void spAnimation_apply (const spAnimation* self, struct spSkeleton* skeleton, fl
* @param lastTime The last time the animation was applied. * @param lastTime The last time the animation was applied.
* @param events Any triggered events are added. * @param events Any triggered events are added.
* @param alpha The amount of this animation that affects the current pose. */ * @param alpha The amount of this animation that affects the current pose. */
void spAnimation_mix (const spAnimation* self, struct spSkeleton* skeleton, float lastTime, float time, int loop, spEvent** events, void spAnimation_mix (const spAnimation* self, struct spSkeleton* skeleton, float lastTime, float time, int loop,
int* eventCount, float alpha); spEvent** events, int* eventCount, float alpha);
#ifdef SPINE_SHORT_NAMES #ifdef SPINE_SHORT_NAMES
typedef spAnimation Animation; typedef spAnimation Animation;
@ -77,7 +77,13 @@ typedef spAnimation Animation;
/**/ /**/
typedef enum {
TIMELINE_SCALE, TIMELINE_ROTATE, TIMELINE_TRANLATE, TIMELINE_COLOR, TIMELINE_ATTACHMENT, TIMELINE_EVENT, TIMELINE_DRAWORDER
} spTimelineType;
struct spTimeline { struct spTimeline {
const spTimelineType type;
const void* const vtable; const void* const vtable;
}; };

5
spine-c/include/spine/extension.h
View File

@ -1,4 +1,3 @@
/* /*
Implementation notes: Implementation notes:
@ -132,7 +131,7 @@ void _spAttachment_deinit (spAttachment* self);
/**/ /**/
void _spTimeline_init (spTimeline* self, /**/ void _spTimeline_init (spTimeline* self, spTimelineType type, /**/
void (*dispose) (spTimeline* self), /**/ void (*dispose) (spTimeline* self), /**/
void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
int* eventCount, float alpha)); int* eventCount, float alpha));
@ -145,7 +144,7 @@ void _spTimeline_deinit (spTimeline* self);
/**/ /**/
void _spCurveTimeline_init (spCurveTimeline* self, int frameCount, /**/ void _spCurveTimeline_init (spCurveTimeline* self, spTimelineType type, int frameCount, /**/
void (*dispose) (spTimeline* self), /**/ void (*dispose) (spTimeline* self), /**/
void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
int* eventCount, float alpha)); int* eventCount, float alpha));

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

@ -81,15 +81,16 @@ void spAnimation_mix (const spAnimation* self, spSkeleton* skeleton, float lastT
/**/ /**/
typedef struct _spTimelineVtable { typedef struct _spTimelineVtable {
void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, int* eventCount, void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
float alpha); int* eventCount, float alpha);
void (*dispose) (spTimeline* self); void (*dispose) (spTimeline* self);
} _spTimelineVtable; } _spTimelineVtable;
void _spTimeline_init (spTimeline* self, /**/ void _spTimeline_init (spTimeline* self, spTimelineType type, /**/
void (*dispose) (spTimeline* self), /**/ void (*dispose) (spTimeline* self), /**/
void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
int* eventCount, float alpha)) { int* eventCount, float alpha)) {
CONST_CAST(spTimelineType, self->type) = type;
CONST_CAST(_spTimelineVtable*, self->vtable) = NEW(_spTimelineVtable); CONST_CAST(_spTimelineVtable*, self->vtable) = NEW(_spTimelineVtable);
VTABLE(spTimeline, self)->dispose = dispose; VTABLE(spTimeline, self)->dispose = dispose;
VTABLE(spTimeline, self)->apply = apply; VTABLE(spTimeline, self)->apply = apply;
@ -114,11 +115,11 @@ static const float CURVE_LINEAR = 0;
static const float CURVE_STEPPED = -1; static const float CURVE_STEPPED = -1;
static const int CURVE_SEGMENTS = 10; static const int CURVE_SEGMENTS = 10;
void _spCurveTimeline_init (spCurveTimeline* self, int frameCount, /**/ void _spCurveTimeline_init (spCurveTimeline* self, spTimelineType type, int frameCount, /**/
void (*dispose) (spTimeline* self), /**/ void (*dispose) (spTimeline* self), /**/
void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
int* eventCount, float alpha)) { int* eventCount, float alpha)) {
_spTimeline_init(SUPER(self), dispose, apply); _spTimeline_init(SUPER(self), type, dispose, apply);
self->curves = CALLOC(float, (frameCount - 1) * 6); self->curves = CALLOC(float, (frameCount - 1) * 6);
} }
@ -229,11 +230,11 @@ void _spBaseTimeline_dispose (spTimeline* timeline) {
} }
/* Many timelines have structure identical to struct spBaseTimeline and extend spCurveTimeline. **/ /* Many timelines have structure identical to struct spBaseTimeline and extend spCurveTimeline. **/
struct spBaseTimeline* _spBaseTimeline_create (int frameCount, int frameSize, /**/ struct spBaseTimeline* _spBaseTimeline_create (int frameCount, spTimelineType type, int frameSize, /**/
void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void (*apply) (const spTimeline* self, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
int* eventCount, float alpha)) { int* eventCount, float alpha)) {
struct spBaseTimeline* self = NEW(struct spBaseTimeline); struct spBaseTimeline* self = NEW(struct spBaseTimeline);
_spCurveTimeline_init(SUPER(self), frameCount, _spBaseTimeline_dispose, apply); _spCurveTimeline_init(SUPER(self), type, frameCount, _spBaseTimeline_dispose, apply);
CONST_CAST(int, self->framesLength) = frameCount * frameSize; CONST_CAST(int, self->framesLength) = frameCount * frameSize;
CONST_CAST(float*, self->frames) = CALLOC(float, self->framesLength); CONST_CAST(float*, self->frames) = CALLOC(float, self->framesLength);
@ -289,7 +290,7 @@ void _spRotateTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton,
} }
spRotateTimeline* spRotateTimeline_create (int frameCount) { spRotateTimeline* spRotateTimeline_create (int frameCount) {
return _spBaseTimeline_create(frameCount, 2, _spRotateTimeline_apply); return _spBaseTimeline_create(frameCount, TIMELINE_ROTATE, 2, _spRotateTimeline_apply);
} }
void spRotateTimeline_setFrame (spRotateTimeline* self, int frameIndex, float time, float angle) { void spRotateTimeline_setFrame (spRotateTimeline* self, int frameIndex, float time, float angle) {
@ -304,8 +305,8 @@ static const int TRANSLATE_LAST_FRAME_TIME = -3;
static const int TRANSLATE_FRAME_X = 1; static const int TRANSLATE_FRAME_X = 1;
static const int TRANSLATE_FRAME_Y = 2; static const int TRANSLATE_FRAME_Y = 2;
void _spTranslateTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void _spTranslateTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
int* eventCount, float alpha) { spEvent** firedEvents, int* eventCount, float alpha) {
spBone *bone; spBone *bone;
int frameIndex; int frameIndex;
float lastFrameX, lastFrameY, frameTime, percent; float lastFrameX, lastFrameY, frameTime, percent;
@ -337,7 +338,7 @@ void _spTranslateTimeline_apply (const spTimeline* timeline, spSkeleton* skeleto
} }
spTranslateTimeline* spTranslateTimeline_create (int frameCount) { spTranslateTimeline* spTranslateTimeline_create (int frameCount) {
return _spBaseTimeline_create(frameCount, 3, _spTranslateTimeline_apply); return _spBaseTimeline_create(frameCount, TIMELINE_TRANLATE, 3, _spTranslateTimeline_apply);
} }
void spTranslateTimeline_setFrame (spTranslateTimeline* self, int frameIndex, float time, float x, float y) { void spTranslateTimeline_setFrame (spTranslateTimeline* self, int frameIndex, float time, float x, float y) {
@ -381,7 +382,7 @@ void _spScaleTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, f
} }
spScaleTimeline* spScaleTimeline_create (int frameCount) { spScaleTimeline* spScaleTimeline_create (int frameCount) {
return _spBaseTimeline_create(frameCount, 3, _spScaleTimeline_apply); return _spBaseTimeline_create(frameCount, TIMELINE_SCALE, 3, _spScaleTimeline_apply);
} }
void spScaleTimeline_setFrame (spScaleTimeline* self, int frameIndex, float time, float x, float y) { void spScaleTimeline_setFrame (spScaleTimeline* self, int frameIndex, float time, float x, float y) {
@ -445,7 +446,7 @@ void _spColorTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, f
} }
spColorTimeline* spColorTimeline_create (int frameCount) { spColorTimeline* spColorTimeline_create (int frameCount) {
return (spColorTimeline*)_spBaseTimeline_create(frameCount, 5, _spColorTimeline_apply); return (spColorTimeline*)_spBaseTimeline_create(frameCount, TIMELINE_COLOR, 5, _spColorTimeline_apply);
} }
void spColorTimeline_setFrame (spColorTimeline* self, int frameIndex, float time, float r, float g, float b, float a) { void spColorTimeline_setFrame (spColorTimeline* self, int frameIndex, float time, float r, float g, float b, float a) {
@ -459,8 +460,8 @@ void spColorTimeline_setFrame (spColorTimeline* self, int frameIndex, float time
/**/ /**/
void _spAttachmentTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void _spAttachmentTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
int* eventCount, float alpha) { spEvent** firedEvents, int* eventCount, float alpha) {
int frameIndex; int frameIndex;
const char* attachmentName; const char* attachmentName;
spAttachmentTimeline* self = (spAttachmentTimeline*)timeline; spAttachmentTimeline* self = (spAttachmentTimeline*)timeline;
@ -492,7 +493,7 @@ void _spAttachmentTimeline_dispose (spTimeline* timeline) {
spAttachmentTimeline* spAttachmentTimeline_create (int frameCount) { spAttachmentTimeline* spAttachmentTimeline_create (int frameCount) {
spAttachmentTimeline* self = NEW(spAttachmentTimeline); spAttachmentTimeline* self = NEW(spAttachmentTimeline);
_spTimeline_init(SUPER(self), _spAttachmentTimeline_dispose, _spAttachmentTimeline_apply); _spTimeline_init(SUPER(self), TIMELINE_ATTACHMENT, _spAttachmentTimeline_dispose, _spAttachmentTimeline_apply);
CONST_CAST(int, self->framesLength) = frameCount; CONST_CAST(int, self->framesLength) = frameCount;
CONST_CAST(float*, self->frames) = CALLOC(float, frameCount); CONST_CAST(float*, self->frames) = CALLOC(float, frameCount);
@ -559,7 +560,7 @@ void _spEventTimeline_dispose (spTimeline* timeline) {
spEventTimeline* spEventTimeline_create (int frameCount) { spEventTimeline* spEventTimeline_create (int frameCount) {
spEventTimeline* self = NEW(spEventTimeline); spEventTimeline* self = NEW(spEventTimeline);
_spTimeline_init(SUPER(self), _spEventTimeline_dispose, _spEventTimeline_apply); _spTimeline_init(SUPER(self), TIMELINE_EVENT, _spEventTimeline_dispose, _spEventTimeline_apply);
CONST_CAST(int, self->framesLength) = frameCount; CONST_CAST(int, self->framesLength) = frameCount;
CONST_CAST(float*, self->frames) = CALLOC(float, frameCount); CONST_CAST(float*, self->frames) = CALLOC(float, frameCount);
@ -577,8 +578,8 @@ void spEventTimeline_setFrame (spEventTimeline* self, int frameIndex, float time
/**/ /**/
void _spDrawOrderTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents, void _spDrawOrderTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
int* eventCount, float alpha) { spEvent** firedEvents, int* eventCount, float alpha) {
int i; int i;
int frameIndex; int frameIndex;
const int* drawOrderToSetupIndex; const int* drawOrderToSetupIndex;
@ -615,7 +616,7 @@ void _spDrawOrderTimeline_dispose (spTimeline* timeline) {
spDrawOrderTimeline* spDrawOrderTimeline_create (int frameCount, int slotCount) { spDrawOrderTimeline* spDrawOrderTimeline_create (int frameCount, int slotCount) {
spDrawOrderTimeline* self = NEW(spDrawOrderTimeline); spDrawOrderTimeline* self = NEW(spDrawOrderTimeline);
_spTimeline_init(SUPER(self), _spDrawOrderTimeline_dispose, _spDrawOrderTimeline_apply); _spTimeline_init(SUPER(self), TIMELINE_DRAWORDER, _spDrawOrderTimeline_dispose, _spDrawOrderTimeline_apply);
CONST_CAST(int, self->framesLength) = frameCount; CONST_CAST(int, self->framesLength) = frameCount;
CONST_CAST(float*, self->frames) = CALLOC(float, frameCount); CONST_CAST(float*, self->frames) = CALLOC(float, frameCount);