ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-05 21:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

default animation rate tweaks

Browse Source
This commit is contained in:
Ryan Fleury
2024-01-26 07:59:04 -08:00
parent 88a218e36e
commit 33f5d4f5b1
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_gfx.c
+5 -3
View File
@@ -3853,10 +3853,10 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
df_autocomp_lister_item_array_sort__in_place(&item_array); df_autocomp_lister_item_array_sort__in_place(&item_array);
//- rjf: animate //- rjf: animate
F32 rate = 1 - pow_f32(2, (-40.f * df_dt()));
{ {
// rjf: animate target # of rows // rjf: animate target # of rows
{ {
F32 rate = 1 - pow_f32(2, (-60.f * df_dt()));
F32 target = Min((F32)item_array.count, 8.f); F32 target = Min((F32)item_array.count, 8.f);
if(abs_f32(target - ws->autocomp_num_visible_rows_t) > 0.01f) if(abs_f32(target - ws->autocomp_num_visible_rows_t) > 0.01f)
{ {
@@ -3871,6 +3871,7 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
// rjf: animate open // rjf: animate open
{ {
F32 rate = 1 - pow_f32(2, (-60.f * df_dt()));
F32 diff = 1.f-ws->autocomp_open_t; F32 diff = 1.f-ws->autocomp_open_t;
ws->autocomp_open_t += diff*rate; ws->autocomp_open_t += diff*rate;
if(abs_f32(diff) < 0.05f) if(abs_f32(diff) < 0.05f)
@@ -4009,10 +4010,10 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
DF_EvalVizWindowedRowList viz_rows = df_eval_viz_windowed_row_list_from_viz_block_list(scratch.arena, scope, &ctrl_ctx, &parse_ctx, 10, ui_top_font(), ui_top_font_size(), r1s64(0, 50), &viz_blocks); DF_EvalVizWindowedRowList viz_rows = df_eval_viz_windowed_row_list_from_viz_block_list(scratch.arena, scope, &ctrl_ctx, &parse_ctx, 10, ui_top_font(), ui_top_font_size(), r1s64(0, 50), &viz_blocks);
//- rjf: animate //- rjf: animate
F32 fish_rate = 1 - pow_f32(2, (-40.f * df_dt()));
{ {
// rjf: animate height // rjf: animate height
{ {
F32 fish_rate = 1 - pow_f32(2, (-60.f * df_dt()));
F32 hover_eval_container_height_target = row_height * Min(30, viz_blocks.total_visual_row_count); F32 hover_eval_container_height_target = row_height * Min(30, viz_blocks.total_visual_row_count);
ws->hover_eval_num_visible_rows_t += (hover_eval_container_height_target - ws->hover_eval_num_visible_rows_t) * fish_rate; ws->hover_eval_num_visible_rows_t += (hover_eval_container_height_target - ws->hover_eval_num_visible_rows_t) * fish_rate;
if(abs_f32(hover_eval_container_height_target - ws->hover_eval_num_visible_rows_t) > 0.5f) if(abs_f32(hover_eval_container_height_target - ws->hover_eval_num_visible_rows_t) > 0.5f)
@@ -4027,6 +4028,7 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
// rjf: animate open // rjf: animate open
{ {
F32 fish_rate = 1 - pow_f32(2, (-60.f * df_dt()));
F32 diff = 1.f - ws->hover_eval_open_t; F32 diff = 1.f - ws->hover_eval_open_t;
ws->hover_eval_open_t += diff*fish_rate; ws->hover_eval_open_t += diff*fish_rate;
if(abs_f32(diff) < 0.01f) if(abs_f32(diff) < 0.01f)
@@ -5050,7 +5052,7 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
//- rjf: animate query info //- rjf: animate query info
// //
{ {
F32 rate = 1 - pow_f32(2, (-40.f * df_dt())); F32 rate = 1 - pow_f32(2, (-60.f * df_dt()));
// rjf: animate query view selection transition // rjf: animate query view selection transition
{ {
src/ui/ui_core.c
+4 -4
View File
@@ -1089,19 +1089,19 @@ ui_end_build(void)
//- rjf: animate //- rjf: animate
{ {
ProfBegin("ui animate"); ProfBegin("ui animate");
F32 vast_rate = 1 - pow_f32(2, (-100.f* ui_state->animation_dt)); F32 vast_rate = 1 - pow_f32(2, (-60.f * ui_state->animation_dt));
F32 fast_rate = 1 - pow_f32(2, (-50.f * ui_state->animation_dt)); F32 fast_rate = 1 - pow_f32(2, (-50.f * ui_state->animation_dt));
F32 fish_rate = 1 - pow_f32(2, (-40.f * ui_state->animation_dt)); F32 fish_rate = 1 - pow_f32(2, (-40.f * ui_state->animation_dt));
F32 slow_rate = 1 - pow_f32(2, (-30.f * ui_state->animation_dt)); F32 slow_rate = 1 - pow_f32(2, (-30.f * ui_state->animation_dt));
F32 slug_rate = 1 - pow_f32(2, (-15.f * ui_state->animation_dt)); F32 slug_rate = 1 - pow_f32(2, (-15.f * ui_state->animation_dt));
F32 slaf_rate = 1 - pow_f32(2, (-8.f * ui_state->animation_dt)); F32 slaf_rate = 1 - pow_f32(2, (-8.f * ui_state->animation_dt));
ui_state->ctx_menu_open_t += ((F32)!!ui_state->ctx_menu_open - ui_state->ctx_menu_open_t) * fish_rate; ui_state->ctx_menu_open_t += ((F32)!!ui_state->ctx_menu_open - ui_state->ctx_menu_open_t) * vast_rate;
ui_state->is_animating = (ui_state->is_animating || abs_f32((F32)!!ui_state->ctx_menu_open - ui_state->ctx_menu_open_t) > 0.01f); ui_state->is_animating = (ui_state->is_animating || abs_f32((F32)!!ui_state->ctx_menu_open - ui_state->ctx_menu_open_t) > 0.01f);
if(ui_state->ctx_menu_open_t >= 0.99f && ui_state->ctx_menu_open) if(ui_state->ctx_menu_open_t >= 0.99f && ui_state->ctx_menu_open)
{ {
ui_state->ctx_menu_open_t = 1.f; ui_state->ctx_menu_open_t = 1.f;
} }
ui_state->tooltip_open_t += ((F32)!!ui_state->tooltip_open - ui_state->tooltip_open_t) * fish_rate; ui_state->tooltip_open_t += ((F32)!!ui_state->tooltip_open - ui_state->tooltip_open_t) * vast_rate;
ui_state->is_animating = (ui_state->is_animating || abs_f32((F32)!!ui_state->tooltip_open - ui_state->tooltip_open_t) > 0.01f); ui_state->is_animating = (ui_state->is_animating || abs_f32((F32)!!ui_state->tooltip_open - ui_state->tooltip_open_t) > 0.01f);
if(ui_state->tooltip_open_t >= 0.99f && ui_state->tooltip_open) if(ui_state->tooltip_open_t >= 0.99f && ui_state->tooltip_open)
{ {
@@ -1205,7 +1205,7 @@ ui_end_build(void)
} }
//- rjf: animate context menu //- rjf: animate context menu
if(ui_state->ctx_menu_open && !ui_box_is_nil(ui_state->ctx_menu_root)) if(ui_state->ctx_menu_open && !ui_box_is_nil(ui_state->ctx_menu_root) && !ui_state->ctx_menu_changed)
{ {
UI_Box *root = ui_state->ctx_menu_root; UI_Box *root = ui_state->ctx_menu_root;
Rng2F32 rect = root->rect; Rng2F32 rect = root->rect;