mirror of
https://github.com/bjornbytes/lovr.git
synced 2024-07-02 12:33:52 +00:00
Animation track priority;
This commit is contained in:
parent
b9b9a42a05
commit
54259f816c
|
@ -4,22 +4,29 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
static Track* lovrAnimatorEnsureTrack(Animator* animator, const char* animation) {
|
static Track* lovrAnimatorEnsureTrack(Animator* animator, const char* animation) {
|
||||||
Track* track = map_get(&animator->timeline, animation);
|
Track* track = map_get(&animator->trackMap, animation);
|
||||||
lovrAssert(track, "Animation '%s' does not exist", animation);
|
lovrAssert(track, "Animation '%s' does not exist", animation);
|
||||||
return track;
|
return track;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int trackSortCallback(const void* a, const void* b) {
|
||||||
|
return ((Track*) a)->priority < ((Track*) b)->priority;
|
||||||
|
}
|
||||||
|
|
||||||
Animator* lovrAnimatorCreate(AnimationData* animationData) {
|
Animator* lovrAnimatorCreate(AnimationData* animationData) {
|
||||||
Animator* animator = lovrAlloc(sizeof(Animator), lovrAnimatorDestroy);
|
Animator* animator = lovrAlloc(sizeof(Animator), lovrAnimatorDestroy);
|
||||||
if (!animator) return NULL;
|
if (!animator) return NULL;
|
||||||
|
|
||||||
animator->animationData = animationData;
|
animator->animationData = animationData;
|
||||||
map_init(&animator->timeline);
|
map_init(&animator->trackMap);
|
||||||
|
vec_init(&animator->trackList);
|
||||||
animator->speed = 1;
|
animator->speed = 1;
|
||||||
|
|
||||||
for (int i = 0; i < animationData->animations.length; i++) {
|
for (int i = 0; i < animationData->animations.length; i++) {
|
||||||
|
Animation* animation = &animationData->animations.data[i];
|
||||||
|
|
||||||
Track track = {
|
Track track = {
|
||||||
.animation = &animationData->animations.data[i],
|
.animation = animation,
|
||||||
.time = 0,
|
.time = 0,
|
||||||
.speed = 1,
|
.speed = 1,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
|
@ -27,7 +34,8 @@ Animator* lovrAnimatorCreate(AnimationData* animationData) {
|
||||||
.looping = false
|
.looping = false
|
||||||
};
|
};
|
||||||
|
|
||||||
map_set(&animator->timeline, animationData->animations.data[i].name, track);
|
map_set(&animator->trackMap, animation->name, track);
|
||||||
|
vec_push(&animator->trackList, map_get(&animator->trackMap, animation->name));
|
||||||
}
|
}
|
||||||
|
|
||||||
return animator;
|
return animator;
|
||||||
|
@ -35,15 +43,14 @@ Animator* lovrAnimatorCreate(AnimationData* animationData) {
|
||||||
|
|
||||||
void lovrAnimatorDestroy(const Ref* ref) {
|
void lovrAnimatorDestroy(const Ref* ref) {
|
||||||
Animator* animator = containerof(ref, Animator);
|
Animator* animator = containerof(ref, Animator);
|
||||||
map_deinit(&animator->timeline);
|
map_deinit(&animator->trackMap);
|
||||||
|
vec_deinit(&animator->trackList);
|
||||||
free(animator);
|
free(animator);
|
||||||
}
|
}
|
||||||
|
|
||||||
void lovrAnimatorReset(Animator* animator) {
|
void lovrAnimatorReset(Animator* animator) {
|
||||||
map_iter_t iter = map_iter(&animator->timeline);
|
Track* track; int i;
|
||||||
const char* key;
|
vec_foreach(&animator->trackList, track, i) {
|
||||||
while ((key = map_next(&animator->timeline, &iter)) != NULL) {
|
|
||||||
Track* track = map_get(&animator->timeline, key);
|
|
||||||
track->time = 0;
|
track->time = 0;
|
||||||
track->speed = 1;
|
track->speed = 1;
|
||||||
track->playing = true;
|
track->playing = true;
|
||||||
|
@ -53,11 +60,8 @@ void lovrAnimatorReset(Animator* animator) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void lovrAnimatorUpdate(Animator* animator, float dt) {
|
void lovrAnimatorUpdate(Animator* animator, float dt) {
|
||||||
map_iter_t iter = map_iter(&animator->timeline);
|
Track* track; int i;
|
||||||
const char* key;
|
vec_foreach(&animator->trackList, track, i) {
|
||||||
while ((key = map_next(&animator->timeline, &iter)) != NULL) {
|
|
||||||
Track* track = map_get(&animator->timeline, key);
|
|
||||||
|
|
||||||
if (track->playing) {
|
if (track->playing) {
|
||||||
track->time += dt * track->speed * animator->speed;
|
track->time += dt * track->speed * animator->speed;
|
||||||
|
|
||||||
|
@ -72,11 +76,9 @@ void lovrAnimatorUpdate(Animator* animator, float dt) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool lovrAnimatorEvaluate(Animator* animator, const char* bone, mat4 transform) {
|
bool lovrAnimatorEvaluate(Animator* animator, const char* bone, mat4 transform) {
|
||||||
map_iter_t iter = map_iter(&animator->timeline);
|
|
||||||
const char* key;
|
|
||||||
bool touched = false;
|
bool touched = false;
|
||||||
while ((key = map_next(&animator->timeline, &iter)) != NULL) {
|
Track* track; int i;
|
||||||
Track* track = map_get(&animator->timeline, key);
|
vec_foreach(&animator->trackList, track, i) {
|
||||||
Animation* animation = track->animation;
|
Animation* animation = track->animation;
|
||||||
AnimationChannel* channel = map_get(&animation->channels, bone);
|
AnimationChannel* channel = map_get(&animation->channels, bone);
|
||||||
|
|
||||||
|
@ -267,6 +269,7 @@ int lovrAnimatorGetPriority(Animator* animator, const char* animation) {
|
||||||
void lovrAnimatorSetPriority(Animator* animator, const char* animation, int priority) {
|
void lovrAnimatorSetPriority(Animator* animator, const char* animation, int priority) {
|
||||||
Track* track = lovrAnimatorEnsureTrack(animator, animation);
|
Track* track = lovrAnimatorEnsureTrack(animator, animation);
|
||||||
track->priority = priority;
|
track->priority = priority;
|
||||||
|
vec_sort(&animator->trackList, trackSortCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
float lovrAnimatorGetSpeed(Animator* animator, const char* animation) {
|
float lovrAnimatorGetSpeed(Animator* animator, const char* animation) {
|
||||||
|
|
|
@ -21,7 +21,8 @@ typedef map_t(Track) map_track_t;
|
||||||
typedef struct {
|
typedef struct {
|
||||||
Ref ref;
|
Ref ref;
|
||||||
AnimationData* animationData;
|
AnimationData* animationData;
|
||||||
map_track_t timeline;
|
map_track_t trackMap;
|
||||||
|
vec_void_t trackList;
|
||||||
float speed;
|
float speed;
|
||||||
} Animator;
|
} Animator;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue