mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-07-13 13:01:25 -07:00
animation setting coverage
This commit is contained in:
+8
-8
@@ -1423,13 +1423,13 @@ ui_end_build(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
ui_state->ctx_menu_open_t += ((F32)!!ui_state->ctx_menu_open - ui_state->ctx_menu_open_t) * (ui_state->animation_info.flags & UI_AnimationInfoFlag_ContextMenuAnimations ? fast_rate : 1);
|
||||
ui_state->ctx_menu_open_t += ((F32)!!ui_state->ctx_menu_open - ui_state->ctx_menu_open_t) * ui_state->animation_info.menu_animation_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);
|
||||
if(ui_state->ctx_menu_open_t >= 0.99f && ui_state->ctx_menu_open)
|
||||
{
|
||||
ui_state->ctx_menu_open_t = 1.f;
|
||||
}
|
||||
ui_state->tooltip_open_t += ((F32)!!ui_state->tooltip_open - ui_state->tooltip_open_t) * (ui_state->animation_info.flags & UI_AnimationInfoFlag_TooltipAnimations ? fast_rate : 1);
|
||||
ui_state->tooltip_open_t += ((F32)!!ui_state->tooltip_open - ui_state->tooltip_open_t) * ui_state->animation_info.tooltip_animation_rate;
|
||||
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)
|
||||
{
|
||||
@@ -1452,10 +1452,10 @@ ui_end_build(void)
|
||||
B32 is_focus_active_disabled = !!(box->flags & UI_BoxFlag_FocusActiveDisabled);
|
||||
|
||||
// rjf: determine rates
|
||||
F32 hot_rate = (ui_state->animation_info.flags & UI_AnimationInfoFlag_HotAnimations ? fast_rate : 1);
|
||||
F32 active_rate = (ui_state->animation_info.flags & UI_AnimationInfoFlag_ActiveAnimations ? fast_rate : 1);
|
||||
F32 disabled_rate = (ui_state->animation_info.flags & UI_AnimationInfoFlag_HotAnimations ? slow_rate : 1);
|
||||
F32 focus_rate = (ui_state->animation_info.flags & UI_AnimationInfoFlag_FocusAnimations ? fast_rate : 1);
|
||||
F32 hot_rate = ui_state->animation_info.hot_animation_rate;
|
||||
F32 active_rate = ui_state->animation_info.active_animation_rate;
|
||||
F32 disabled_rate = slow_rate;
|
||||
F32 focus_rate = ui_state->animation_info.focus_animation_rate;
|
||||
|
||||
// rjf: determine animating status
|
||||
B32 box_is_animating = 0;
|
||||
@@ -1520,8 +1520,8 @@ ui_end_build(void)
|
||||
|
||||
// rjf: animate view offset
|
||||
{
|
||||
box->view_off.x += fast_rate * (box->view_off_target.x - box->view_off.x);
|
||||
box->view_off.y += fast_rate * (box->view_off_target.y - box->view_off.y);
|
||||
box->view_off.x += ui_state->animation_info.scroll_animation_rate * (box->view_off_target.x - box->view_off.x);
|
||||
box->view_off.y += ui_state->animation_info.scroll_animation_rate * (box->view_off_target.y - box->view_off.y);
|
||||
if(abs_f32(box->view_off.x - box->view_off_target.x) < 2)
|
||||
{
|
||||
box->view_off.x = box->view_off_target.x;
|
||||
|
||||
+6
-13
@@ -238,22 +238,15 @@ struct UI_Theme
|
||||
////////////////////////////////
|
||||
//~ rjf: Animation Info
|
||||
|
||||
typedef U32 UI_AnimationInfoFlags;
|
||||
enum
|
||||
{
|
||||
UI_AnimationInfoFlag_HotAnimations = (1<<0),
|
||||
UI_AnimationInfoFlag_ActiveAnimations = (1<<1),
|
||||
UI_AnimationInfoFlag_FocusAnimations = (1<<2),
|
||||
UI_AnimationInfoFlag_TooltipAnimations = (1<<3),
|
||||
UI_AnimationInfoFlag_ContextMenuAnimations = (1<<4),
|
||||
UI_AnimationInfoFlag_ScrollingAnimations = (1<<5),
|
||||
UI_AnimationInfoFlag_All = 0xffffffff,
|
||||
};
|
||||
|
||||
typedef struct UI_AnimationInfo UI_AnimationInfo;
|
||||
struct UI_AnimationInfo
|
||||
{
|
||||
UI_AnimationInfoFlags flags;
|
||||
F32 hot_animation_rate;
|
||||
F32 active_animation_rate;
|
||||
F32 focus_animation_rate;
|
||||
F32 tooltip_animation_rate;
|
||||
F32 menu_animation_rate;
|
||||
F32 scroll_animation_rate;
|
||||
};
|
||||
|
||||
////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user