RandyTheSilly/Maan-On-My-Wrist-XL
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Animation cleanup

Browse Source
This commit is contained in:
Randall Winkhart
2026-03-20 00:19:13 -04:00
parent 449a9359bb
commit 3627069998
1 changed files with 79 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/c/main.c
View File

@@ -31,6 +31,20 @@ static GRect s_guy_butt_grect_on_screen_raised = GRect(PBL_IF_ROUND_ELSE(0, -30)
static GRect s_guy_butt_grect_off_screen_raised = GRect(PBL_IF_ROUND_ELSE(260, 170), PBL_IF_ROUND_ELSE(160, 144), 260, 115); static GRect s_guy_butt_grect_off_screen_raised = GRect(PBL_IF_ROUND_ELSE(260, 170), PBL_IF_ROUND_ELSE(160, 144), 260, 115);
static GRect s_guy_butt_grect_on_screen_resting = GRect(PBL_IF_ROUND_ELSE(0, -30), PBL_IF_ROUND_ELSE(145, 129), 260, 115); static GRect s_guy_butt_grect_on_screen_resting = GRect(PBL_IF_ROUND_ELSE(0, -30), PBL_IF_ROUND_ELSE(145, 129), 260, 115);
// declare animations
static Animation *s_head_raise_anim;
static Animation *s_head_out_anim;
static Animation *s_head_in_anim;
static Animation *s_head_rest_anim;
static PropertyAnimation *s_head_y_prop_anim;
static PropertyAnimation *s_head_x_prop_anim;
static Animation *s_butt_raise_anim;
static Animation *s_butt_out_anim;
static Animation *s_butt_in_anim;
static Animation *s_butt_rest_anim;
static PropertyAnimation *s_butt_y_prop_anim;
static PropertyAnimation *s_butt_x_prop_anim;
// declare lookup tables // declare lookup tables
static const uint8_t s_head_count = 25; static const uint8_t s_head_count = 25;
static const uint32_t s_random_heads[] = { static const uint32_t s_random_heads[] = {
@@ -113,25 +127,35 @@ static void update_minute_30_out_handler(Animation *animation, bool finished, vo
static void update_minute_30() { static void update_minute_30() {
update_minute_1(); update_minute_1();
// animate silly butt swap // raise
//// raise s_butt_y_prop_anim = property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_butt_layer), &s_guy_butt_grect_on_screen_resting, &s_guy_butt_grect_on_screen_raised);
Animation *butt_raise_anim = property_animation_get_animation(property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_butt_layer), &s_guy_butt_grect_on_screen_resting, &s_guy_butt_grect_on_screen_raised)); s_butt_raise_anim = property_animation_get_animation(s_butt_y_prop_anim);
animation_set_curve(butt_raise_anim, AnimationCurveEaseOut); animation_set_curve(s_butt_raise_anim, AnimationCurveEaseOut);
animation_set_duration(butt_raise_anim, 350); animation_set_duration(s_butt_raise_anim, 350);
//// out // out
Animation *butt_out_anim = property_animation_get_animation(property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_butt_layer), &s_guy_butt_grect_on_screen_raised, &s_guy_butt_grect_off_screen_raised)); s_butt_x_prop_anim = property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_butt_layer), &s_guy_butt_grect_on_screen_raised, &s_guy_butt_grect_off_screen_raised);
animation_set_curve(butt_out_anim, AnimationCurveEaseOut); s_butt_out_anim = property_animation_get_animation(s_butt_x_prop_anim);
animation_set_duration(butt_out_anim, 350); animation_set_curve(s_butt_out_anim, AnimationCurveEaseOut);
//// back in animation_set_duration(s_butt_out_anim, 350);
Animation *butt_in_anim = animation_clone(butt_out_anim); // back in
animation_set_reverse(butt_in_anim, true); s_butt_in_anim = animation_clone(s_butt_out_anim);
//// set handler on out (after clone) animation_set_reverse(s_butt_in_anim, true);
animation_set_handlers(butt_out_anim, (AnimationHandlers){.stopped = update_minute_30_out_handler}, NULL); // set handler on out (after clone)
//// back to resting animation_set_handlers(s_butt_out_anim, (AnimationHandlers){.stopped = update_minute_30_out_handler}, NULL);
Animation *butt_rest_anim = animation_clone(butt_raise_anim); // back to resting
animation_set_reverse(butt_rest_anim, true); s_butt_rest_anim = animation_clone(s_butt_raise_anim);
//// do it! animation_set_reverse(s_butt_rest_anim, true);
animation_schedule(animation_sequence_create(butt_raise_anim, butt_out_anim, butt_in_anim, butt_rest_anim, NULL));
// run animations
animation_schedule(animation_sequence_create(s_butt_raise_anim, s_butt_out_anim, s_butt_in_anim, s_butt_rest_anim, NULL));
// cleanup
animation_destroy(s_butt_raise_anim);
animation_destroy(s_butt_out_anim);
animation_destroy(s_butt_in_anim);
animation_destroy(s_butt_rest_anim);
property_animation_destroy(s_butt_y_prop_anim);
property_animation_destroy(s_butt_x_prop_anim);
} }
static void update_minute_60_out_handler(Animation *animation, bool finished, void *context) { static void update_minute_60_out_handler(Animation *animation, bool finished, void *context) {
@@ -156,25 +180,35 @@ static void update_minute_60_out_handler(Animation *animation, bool finished, vo
static void update_minute_60() { static void update_minute_60() {
update_minute_1(); update_minute_1();
// animate silly butt swap // raise
//// raise s_head_y_prop_anim = property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_head_layer), &s_guy_head_grect_on_screen_resting, &s_guy_head_grect_on_screen_raised);
Animation *head_raise_anim = property_animation_get_animation(property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_head_layer), &s_guy_head_grect_on_screen_resting, &s_guy_head_grect_on_screen_raised)); s_head_raise_anim = property_animation_get_animation(s_head_y_prop_anim);
animation_set_curve(head_raise_anim, AnimationCurveEaseOut); animation_set_curve(s_head_raise_anim, AnimationCurveEaseOut);
animation_set_duration(head_raise_anim, 350); animation_set_duration(s_head_raise_anim, 350);
//// out // out
Animation *head_out_anim = property_animation_get_animation(property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_head_layer), &s_guy_head_grect_on_screen_raised, &s_guy_head_grect_off_screen_raised)); s_head_x_prop_anim = property_animation_create_layer_frame(bitmap_layer_get_layer(s_guy_head_layer), &s_guy_head_grect_on_screen_raised, &s_guy_head_grect_off_screen_raised);
animation_set_curve(head_out_anim, AnimationCurveEaseOut); s_head_out_anim = property_animation_get_animation(s_head_x_prop_anim);
animation_set_duration(head_out_anim, 350); animation_set_curve(s_head_out_anim, AnimationCurveEaseOut);
//// back in animation_set_duration(s_head_out_anim, 350);
Animation *head_in_anim = animation_clone(head_out_anim); // back in
animation_set_reverse(head_in_anim, true); s_head_in_anim = animation_clone(s_head_out_anim);
//// set handler on out (after clone) animation_set_reverse(s_head_in_anim, true);
animation_set_handlers(head_out_anim, (AnimationHandlers){.stopped = update_minute_60_out_handler}, NULL); // set handler on out (after clone)
//// back to resting animation_set_handlers(s_head_out_anim, (AnimationHandlers){.stopped = update_minute_30_out_handler}, NULL);
Animation *head_rest_anim = animation_clone(head_raise_anim); // back to resting
animation_set_reverse(head_rest_anim, true); s_head_rest_anim = animation_clone(s_head_raise_anim);
//// do it! animation_set_reverse(s_head_rest_anim, true);
animation_schedule(animation_sequence_create(head_raise_anim, head_out_anim, head_in_anim, head_rest_anim, NULL));
// run animations
animation_schedule(animation_sequence_create(s_head_raise_anim, s_head_out_anim, s_head_in_anim, s_head_rest_anim, NULL));
// cleanup
animation_destroy(s_head_raise_anim);
animation_destroy(s_head_out_anim);
animation_destroy(s_head_in_anim);
animation_destroy(s_head_rest_anim);
property_animation_destroy(s_head_y_prop_anim);
property_animation_destroy(s_head_x_prop_anim);
} }
static void minute_handler(struct tm *tick_time, TimeUnits units_changed) { static void minute_handler(struct tm *tick_time, TimeUnits units_changed) {
@@ -250,12 +284,12 @@ static void main_window_load(Window *window) {
// free memory on Window close // free memory on Window close
static void main_window_unload(Window *window) { static void main_window_unload(Window *window) {
// destroy layers
bitmap_layer_destroy(s_guy_head_layer); bitmap_layer_destroy(s_guy_head_layer);
bitmap_layer_destroy(s_guy_butt_layer); bitmap_layer_destroy(s_guy_butt_layer);
text_layer_destroy(s_time_layer); text_layer_destroy(s_time_layer);
text_layer_destroy(s_date_layer); text_layer_destroy(s_date_layer);
layer_destroy(s_time_bar_layer); layer_destroy(s_time_bar_layer);
fonts_unload_custom_font(s_custom_font);
// DEBUG memory usage layer // DEBUG memory usage layer
text_layer_destroy(s_memory_layer); text_layer_destroy(s_memory_layer);
@@ -323,11 +357,17 @@ static void init() {
// free memory on app exit // free memory on app exit
static void deinit() { static void deinit() {
// unload font
fonts_unload_custom_font(s_custom_font);
// destroy gbitmaps
gbitmap_destroy(s_head_current); gbitmap_destroy(s_head_current);
gbitmap_destroy(s_butt_current); gbitmap_destroy(s_butt_current);
gbitmap_destroy(s_head_next); gbitmap_destroy(s_head_next);
gbitmap_destroy(s_butt_next); gbitmap_destroy(s_butt_next);
gbitmap_destroy(s_bt); gbitmap_destroy(s_bt);
// destroy window
window_destroy(s_main_window); window_destroy(s_main_window);
} }