Skip to content

Commit

Permalink
overshell animations
Browse files Browse the repository at this point in the history 
opening the non list menus currently doesn't animate, don't merge to main until that is completed
  • Loading branch information
@LlysiX
LlysiX committed Jan 6, 2024
1 parent 3b9682c commit a6d9704
Show file tree
Hide file tree
Showing 5 changed files with 345 additions and 71 deletions.
25 changes: 25 additions & 0 deletions _ark/dx/ui/dx_funcs.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,29 @@
}
{func get_track_1_panel
{{get_track_panel} find track_1}
}

;overshell change screen functions
{func os_change_screen ($next) ;for moving forward, flip from right to left
{set $os_next_screen {sprint $next "_screen"}}
{set $os_next_panel {sprint $next "_panel"}}
{thread_task kTaskUISeconds
(script
OS_CHANGE_CURRENT_ANIM
{ui push_screen $os_next_screen}
OS_CHANGE_NEXT_ANIM
)
}
}
{func os_back_screen ($next) ;for moving backward, flip from left to right
{set $os_next_screen {sprint $next "_screen"}}
{set $os_next_panel {sprint $next "_panel"}}
{thread_task kTaskUISeconds
(script
OS_BACK_CURRENT_ANIM
OS_BACK_NEXT_ANIM
{ui goto_screen $os_next_screen}
{ui pop_screen}
)
}
}
235 changes: 235 additions & 0 deletions _ark/dx/ui/dx_overshell_macros.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,4 +494,239 @@
{set $track_fade_start 74}
{set $track_fade_length 15}
{set $multioptimized FALSE}
)

#define OS_OPEN_ANIM
(
{thread_task kTaskUISeconds
(script
{all.grp set_local_pos $osx $osy {+ $osz 450}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 450}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 404}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 404}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 360}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 360}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 319}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 319}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 280}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 280}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 244}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 244}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 211}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 211}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 180}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 180}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 151}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 151}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 125}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 125}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 101}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 101}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 80}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 80}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 61}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 61}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 45}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 45}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 31}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 31}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 20}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 20}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 11}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 11}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 5}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 5}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy $osz}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y $osl3z}
)
}
)

#define OS_CLOSE_ANIM
(
{thread_task kTaskUISeconds
(script
{all.grp set_local_pos $osx $osy {+ $osz 5}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 5}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 11}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 11}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 20}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 20}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 31}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 31}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 45}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 45}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 61}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 61}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 80}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 80}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 101}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 101}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 125}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 125}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 151}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 151}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 180}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 180}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 211}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 211}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 244}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 244}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 280}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 280}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 319}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 319}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 360}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 360}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 404}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 404}}
{$task sleep 0.005}
{all.grp set_local_pos $osx $osy {+ $osz 450}}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 450}}
{if_else {exists $modifier_exit}
{ui goto_screen $modifier_exit}
{ui goto_screen splash_screen}}
{ui pop_screen}
)
}
)

#define OS_CHANGE_CURRENT_ANIM
(
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 9}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 18}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 27}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 36}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 45}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 54}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 63}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 72}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 81}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 85.5}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {- $oszrot 90}}
{$task sleep 0.005}
)

#define OS_CHANGE_NEXT_ANIM
(
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 90}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 85.5}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 81}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 72}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 63}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 54}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 45}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 36}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 27}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 18}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 9}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
)

#define OS_BACK_CURRENT_ANIM
(
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 9}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 18}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 27}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 36}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 45}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 54}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 63}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 72}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 81}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 85.5}}
{$task sleep 0.005}
{all.grp set_local_rot $osxrot $osyrot {+ $oszrot 90}}
{$task sleep 0.005}
)

#define OS_BACK_NEXT_ANIM
(
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 90}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 85.5}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 81}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 72}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 63}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 54}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 45}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 36}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 27}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 18}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 9}}
{$task sleep 0.005}
{{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
)
34 changes: 20 additions & 14 deletions _ark/ui/overshell.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,23 @@
(enter
{sel_section.lst set_data (os_mod #ifndef HX_EE os_sys #endif os_spd os_trkset #ifndef HX_EE os_cam #endif)}
{title.lbl set_localized {localize os_dxsettings}}
{full_selection.mesh set_showing FALSE})
{full_selection.mesh set_showing FALSE}
{unless $os_first_entry
{all.grp get_local_pos $osxpos $osypos $oszpos}
{all.grp get_local_rot $osxrot $osyrot $oszrot}
;{all.grp get_local_scale $osxscl $osyscl $oszscl}
;{title.lbl get_local_scale $oslblx $oslbly $oslblz}
;{sel_section.lst get_local_scale $oslsx $oslsy $oslsz}
{{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} get_local_pos $osl3x $osl3y $osl3z}
{set $os_first_entry TRUE}
}
OS_OPEN_ANIM
)
(exit)
(SELECT_MSG
{switch {$component selected_sym}
(os_sys
{ui push_screen overshell_system_screen}
{os_change_screen overshell_system}
)
(os_spd
{ui push_screen options_milo_screen}
Expand All @@ -25,10 +36,10 @@
{ui push_screen modifiers_screen}
)
(os_trkset
{ui push_screen overshell_track_screen}
{os_change_screen overshell_track}
)
(os_cam
{ui push_screen overshell_cam_sfx_screen}
{os_change_screen overshell_cam_sfx}
)
})
(update_helpbar
Expand All @@ -42,10 +53,7 @@
#ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif
{do
{synth play button_toggle}
{if_else {exists $modifier_exit}
{ui goto_screen $modifier_exit}
{ui goto_screen splash_screen}}
{ui pop_screen}
OS_CLOSE_ANIM
TRUE}
kDataUnhandled})
(TRANSITION_COMPLETE_MSG
Expand Down Expand Up @@ -114,10 +122,9 @@
{if
{== $action kAction_Cancel}
{synth play button_toggle}
{ui goto_screen overshell_main_screen}
{set $mod_os_entered FALSE}
{ui pop_screen}}
kDataUnhandled)
{set $mod_os_entered FALSE}
{os_back_screen overshell_main}}
kDataUnhandled)
(TRANSITION_COMPLETE_MSG
{$this update_helpbar})}
{new
Expand Down Expand Up @@ -187,8 +194,7 @@
{if
{== $action kAction_Cancel}
{synth play button_toggle}
{ui goto_screen overshell_main_screen}
{ui pop_screen}}
{os_back_screen overshell_main}}
kDataUnhandled)
(TRANSITION_COMPLETE_MSG
{$this update_helpbar})}
Expand Down
Loading

0 comments on commit a6d9704

Please sign in to comment.