summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-04-24 15:45:52 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-04-24 15:45:52 +0300
commit444132edd056cd52a60e3551d1f6c1a07909c040 (patch)
tree92f6a79294d104053b7709a4d424d90f45afb10b
parent0e0488623e8d8820a909a48a6c847866a65bf845 (diff)
Add last and first update of frame for anims
-rw-r--r--visualizer.c9
-rw-r--r--visualizer.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/visualizer.c b/visualizer.c
index ed5c9fa2c9..219d44cd3c 100644
--- a/visualizer.c
+++ b/visualizer.c
@@ -103,6 +103,8 @@ void stop_keyframe_animation(keyframe_animation_t* animation) {
animation->current_frame = animation->num_frames;
animation->time_left_in_frame = 0;
animation->need_update = true;
+ animation->first_update_of_frame = false;
+ animation->last_update_of_frame = false;
for (int i=0;i<MAX_SIMULTANEOUS_ANIMATIONS;i++) {
if (animations[i] == animation) {
animations[i] = NULL;
@@ -117,6 +119,8 @@ void stop_all_keyframe_animations(void) {
animations[i]->current_frame = animations[i]->num_frames;
animations[i]->time_left_in_frame = 0;
animations[i]->need_update = true;
+ animations[i]->first_update_of_frame = false;
+ animations[i]->last_update_of_frame = false;
animations[i] = NULL;
}
}
@@ -133,16 +137,20 @@ static bool update_keyframe_animation(keyframe_animation_t* animation, visualize
animation->current_frame = 0;
animation->time_left_in_frame = animation->frame_lengths[0];
animation->need_update = true;
+ animation->first_update_of_frame = true;
} else {
animation->time_left_in_frame -= delta;
while (animation->time_left_in_frame <= 0) {
int left = animation->time_left_in_frame;
if (animation->need_update) {
animation->time_left_in_frame = 0;
+ animation->last_update_of_frame = true;
(*animation->frame_functions[animation->current_frame])(animation, state);
+ animation->last_update_of_frame = false;
}
animation->current_frame++;
animation->need_update = true;
+ animation->first_update_of_frame = true;
if (animation->current_frame == animation->num_frames) {
if (animation->loop) {
animation->current_frame = 0;
@@ -159,6 +167,7 @@ static bool update_keyframe_animation(keyframe_animation_t* animation, visualize
}
if (animation->need_update) {
animation->need_update = (*animation->frame_functions[animation->current_frame])(animation, state);
+ animation->first_update_of_frame = false;
}
int wanted_sleep = animation->need_update ? 10 : animation->time_left_in_frame;
diff --git a/visualizer.h b/visualizer.h
index 6a72fde1fd..82d7a71d37 100644
--- a/visualizer.h
+++ b/visualizer.h
@@ -95,6 +95,8 @@ typedef struct keyframe_animation_t {
// keyframe update functions
int current_frame;
int time_left_in_frame;
+ bool first_update_of_frame;
+ bool last_update_of_frame;
bool need_update;
} keyframe_animation_t;