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

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2023-09-06 11:07:25 +02:00
commit 8c53a07c5d
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,18 +37,22 @@ _SP_ARRAY_IMPLEMENT_TYPE(spPropertyIdArray, spPropertyId)
_SP_ARRAY_IMPLEMENT_TYPE(spTimelineArray, spTimeline *)
spAnimation *spAnimation_create(const char *name, spTimelineArray *timelines, float duration) {
int i, n;
spAnimation *self = NEW(spAnimation);
MALLOC_STR(self->name, name);
self->timelines = timelines != NULL ? timelines : spTimelineArray_create(1);
timelines = self->timelines;
self->timelineIds = spPropertyIdArray_create(16);
for (i = 0, n = timelines->size; i < n; i++) {
spPropertyIdArray_addAllValues(self->timelineIds, timelines->items[i]->propertyIds, 0,
timelines->items[i]->propertyIdsCount);
}
self->duration = duration;
return self;
int i, n, totalCount = 0;
spAnimation *self = NEW(spAnimation);
MALLOC_STR(self->name, name);
self->timelines = timelines != NULL ? timelines : spTimelineArray_create(1);
timelines = self->timelines;
for (i = 0, n = timelines->size; i < n; i++)
totalCount += timelines->items[i]->propertyIdsCount;
self->timelineIds = spPropertyIdArray_create(totalCount);
for (i = 0, n = timelines->size; i < n; i++) {
spPropertyIdArray_addAllValues(self->timelineIds, timelines->items[i]->propertyIds, 0,
timelines->items[i]->propertyIdsCount);
}
self->duration = duration;
return self;
}
void spAnimation_dispose(spAnimation *self) {