overshell animations are back (and some wii fixes)

hmxmilohax · Mar 5, 2024 · ff12c09 · ff12c09
1 parent fa28d70
commit ff12c09
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 30 deletions.
diff --git a/_ark/dx/ui/dx_funcs.dta b/_ark/dx/ui/dx_funcs.dta
@@ -29,9 +29,9 @@
    {set $os_next_panel {sprint $next "_panel"}}
    {thread_task kTaskUISeconds
       (script
-         ;OS_CHANGE_CURRENT_ANIM
+         OS_CHANGE_CURRENT_ANIM
          {ui push_screen $os_next_screen}
-         ;OS_CHANGE_NEXT_ANIM
+         OS_CHANGE_NEXT_ANIM
       )
    }
 }
@@ -40,8 +40,8 @@
    {set $os_next_panel {sprint $next "_panel"}}
    {thread_task kTaskUISeconds
       (script
-         ;OS_BACK_CURRENT_ANIM
-         ;OS_BACK_NEXT_ANIM
+         OS_BACK_CURRENT_ANIM
+         OS_BACK_NEXT_ANIM
          {ui goto_screen $os_next_screen}
          {ui pop_screen}
       )

diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta
@@ -33,7 +33,11 @@
 {set $gem "rb2dx"}
 
 ;strikeline texture
+#ifdef HX_WII ; wii transparency is broken atm, so the rb2dx smashers don't exist
+{set $smasher "rb2"} ; set it to rb2 "HD" texture instead
+#else
 {set $smasher "rb2dx"}
+#endif
 
 ;lanes texture
 {set $lanestex "rb2"}

diff --git a/_ark/dx/ui/dx_overshell_macros.dta b/_ark/dx/ui/dx_overshell_macros.dta
@@ -678,6 +678,7 @@
    {all.grp set_local_rot $osxrot $osyrot {- $oszrot 85.5}}
    {$task sleep 0.005}
    {all.grp set_local_rot $osxrot $osyrot {- $oszrot 90}}
+   {all.grp set_showing FALSE}
    {$task sleep 0.005}
 )
 
@@ -731,11 +732,13 @@
    {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 85.5}}
    {$task sleep 0.005}
    {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 90}}
+   {all.grp set_showing FALSE}
    {$task sleep 0.005}
 )
 
 #define OS_BACK_NEXT_ANIM
 (
+   {{$os_next_panel find all.grp} set_showing TRUE}
    {{$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}}

diff --git a/_ark/ui/overshell.dta b/_ark/ui/overshell.dta
@@ -26,6 +26,23 @@
         }
         OS_OPEN_ANIM
     )
+    (poll
+       {if {== {ui current_screen} overshell_main_screen}
+          {if_else $os_in_transition
+              {thread_task kTaskUISeconds
+                  (script
+                      {$task sleep 0.5}
+                      {if_else {== {ui current_screen} overshell_main_screen}
+                         {{overshell_main_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+                         {{overshell_main_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 90}}
+
+                      }
+                  )
+              }
+              {{overshell_main_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+          }
+       }
+    )
     (lst_reset
       {sel_section.lst set_data OS_MAIN_DATA})
     (exit)
@@ -35,6 +52,7 @@
             {run #ifdef HX_XBOX "GAME:/ace.dta" #else "GD:/dev_hdd0/game/BLUS30147/USRDIR/ace.dta" #endif}
          )
          (os_sys
+            {set $os_in_transition TRUE}
             {os_change_screen overshell_system}
          )
          (os_spd
@@ -45,9 +63,11 @@
             {ui push_screen modifiers_screen}
          )
          (os_trkset
+            {set $os_in_transition TRUE}
             {os_change_screen overshell_track}
          )
          (os_cam
+            {set $os_in_transition TRUE}
             {os_change_screen overshell_cam_sfx}
          )
       })
@@ -85,7 +105,8 @@
     (enter
         {sel_section.lst set_data (os_console #ifndef HX_PS3 os_gameplay #endif os_data)}
         {title.lbl set_localized {localize os_sys}}
-        {full_selection.mesh set_showing FALSE})
+        {full_selection.mesh set_showing FALSE}
+        {set $os_in_transition FALSE})
     (exit)
     (SELECT_MSG
     {switch {$component selected_sym}
@@ -162,12 +183,15 @@
     (enter
         {$this lst_reset}
         {title.lbl set_localized {localize os_cam}}
-        {full_selection.mesh set_showing FALSE})
+        {full_selection.mesh set_showing FALSE}
+        {set $os_in_transition TRUE}
+    )
     (lst_reset
-      {sel_section.lst set_data CAM_SFX_DATA}
-         {if $camsfxpos
-      {sel_section.lst set_selected $camsfxpos}
-    })
+        {sel_section.lst set_data CAM_SFX_DATA}
+        {if $camsfxpos
+            {sel_section.lst set_selected $camsfxpos}
+        }
+    )
     (exit)
     (SELECT_MSG
     {switch {$component selected_sym}

diff --git a/_ark/ui/overshell_textures.dta b/_ark/ui/overshell_textures.dta
@@ -10,62 +10,94 @@
     (enter
         {sel_section.lst set_data (#ifndef HX_OG os_hw #endif os_strk os_spotlight os_gems os_smashers #ifndef HX_WII os_flames #endif os_sus #ifndef HX_OG os_lanes os_font #endif #ifndef HX_WII os_score os_solobox os_stars os_crowd_meter os_bre os_rails os_odbar os_multi_ring #endif os_voxtrk)}
         {title.lbl set_localized {localize os_tex1}}
-        {full_selection.mesh set_showing FALSE})
+        {full_selection.mesh set_showing FALSE}
+        {set $os_in_transition FALSE}
+    )
+    (poll
+        {if {== {ui current_screen} overshell_tex_screen}
+            {if_else $os_in_transition
+                {thread_task kTaskUISeconds
+                    (script
+                        {$task sleep 1.0}
+                        {if_else {== {ui current_screen} overshell_tex_screen}
+                           {{overshell_tex_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+                           {{overshell_tex_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 90}}
+                        }
+                    )
+                }
+                {{overshell_tex_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+            }
+        }
+    )
     (exit)
     (SELECT_MSG
     {switch {$component selected_sym}
          (os_sus
+            {set $os_in_transition TRUE}
             {os_change_screen overshell_sustains}
          )
          (os_lanes
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader lanes}
             {os_change_screen overshell_texload}
          )
          (os_gems
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader gems}
             {os_change_screen overshell_texload}
          )
          (os_smashers
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader smashers}
             {os_change_screen overshell_texload}
          )
          (os_crowd_meter
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader crowd_meter}
             {os_change_screen overshell_texload}
          )
          (os_font
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader font}
             {os_change_screen overshell_texload}
          )
          (os_score
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader score}
             {os_change_screen overshell_texload}
          )
          (os_solobox
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader solobox}
             {os_change_screen overshell_texload}
          )
          (os_stars
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader stars}
             {os_change_screen overshell_texload}
          )
          (os_bre
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader bre}
             {os_change_screen overshell_texload}
          )
          (os_flames
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader flames}
             {os_change_screen overshell_texload}
          )
          (os_rails
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader rails}
             {os_change_screen overshell_texload}
          )
          (os_hw
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader highway}
             {os_change_screen overshell_instrument_sel}
          )
          (os_strk
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader streak}
             #ifdef HX_OG
             {set $dx_tracked_instrument bass}
@@ -75,18 +107,22 @@
             #endif
          )
          (os_spotlight
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader spotlight}
             {os_change_screen overshell_instrument_sel}
          )
          (os_odbar
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader odbar}
             {os_change_screen overshell_texload}
          )
          (os_multi_ring
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader multiring}
             {os_change_screen overshell_texload}
          )
-        (os_voxtrk
+         (os_voxtrk
+            {set $os_in_transition TRUE}
             {os_change_screen overshell_voxtrk}
          )
       })
@@ -101,7 +137,8 @@
          #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif
          {do
          {synth play button_toggle}
-         #ifdef HX_EE
+         {set $os_in_transition TRUE}
+         #ifdef HX_OG
          {os_back_screen overshell_track}
          #else
          {os_back_screen overshell_trkpreset}
@@ -139,23 +176,44 @@
          )
         }
         {full_selection.mesh set_showing FALSE}
+        {set $os_in_transition FALSE}
+    )
+    (poll
+        {if {== {ui current_screen} overshell_instrument_sel_screen}
+            {if_else $os_in_transition
+                {thread_task kTaskUISeconds
+                    (script
+                        {$task sleep 1.0}
+                        {if_else {== {ui current_screen} overshell_instrument_sel_screen}
+                           {{overshell_instrument_sel_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+                           {{overshell_instrument_sel_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 90}}
+                        }
+                    )
+                }
+                {{overshell_instrument_sel_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+            }
+        }
     )
     (exit)
     (SELECT_MSG
     {switch {$component selected_sym}
          (os_spotlightall
+            {set $os_in_transition TRUE}
             {set $dx_tracked_instrument all}
             {os_change_screen overshell_texload}
          )
          (os_spotlightgtr
+            {set $os_in_transition TRUE}
             {set $dx_tracked_instrument guitar}
             {os_change_screen overshell_texload}
          )
          (os_spotlightbass
+            {set $os_in_transition TRUE}
             {set $dx_tracked_instrument bass}
             {os_change_screen overshell_texload}
          )
          (os_spotlightdrum
+            {set $os_in_transition TRUE}
             {set $dx_tracked_instrument drum}
             {os_change_screen overshell_texload}
          )
@@ -171,6 +229,7 @@
          #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif
          {do
          {synth play button_toggle}
+         {set $os_in_transition TRUE}
          {os_back_screen overshell_tex}
          TRUE}
          kDataUnhandled})
@@ -194,23 +253,45 @@
     (enter
         {sel_section.lst set_data (#ifndef HX_WII os_voxarrow os_voxhw #endif os_voxnotes os_voxod)}
         {title.lbl set_localized {localize os_voxtrk1}}
-        {full_selection.mesh set_showing FALSE})
+        {full_selection.mesh set_showing FALSE}
+        {set $os_in_transition FALSE}
+    )
+    (poll
+        {if {== {ui current_screen} overshell_voxtrk_screen}
+            {if_else $os_in_transition
+                {thread_task kTaskUISeconds
+                    (script
+                        {$task sleep 1.0}
+                        {if_else {== {ui current_screen} overshell_voxtrk_screen}
+                           {{overshell_voxtrk_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+                           {{overshell_voxtrk_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 90}}
+                        }
+                    )
+                }
+                {{overshell_voxtrk_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot}
+            }
+        }
+    )
     (exit)
     (SELECT_MSG
       {switch {$component selected_sym}
          (os_voxarrow
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader voxarrow}
             {os_change_screen overshell_texload}
          )
          (os_voxhw
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader voxhw}
             {os_change_screen overshell_texload}
          )
          (os_voxnotes
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader voxnotes}
             {os_change_screen overshell_texload}
          )
          (os_voxod
+            {set $os_in_transition TRUE}
             {set $dx_tracked_texture_loader voxod}
             {os_change_screen overshell_texload}
          )
@@ -227,6 +308,7 @@
          #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif
          {do
          {synth play button_toggle}
+         {set $os_in_transition TRUE}
          {os_back_screen overshell_tex}
          TRUE}
          kDataUnhandled})
@@ -248,6 +330,7 @@
     #endif
     (focus sel_section.lst)
     (enter
+      {set $os_in_transition FALSE}
       {full_selection.mesh set_showing FALSE}
       {switch $dx_tracked_texture_loader
          (gems
@@ -665,7 +748,7 @@
          {synth play button_toggle}
          {if_else {|| {== $dx_tracked_texture_loader voxarrow} {== $dx_tracked_texture_loader voxhw} {== $dx_tracked_texture_loader voxnotes} {== $dx_tracked_texture_loader voxod}}
             {os_back_screen overshell_voxtrk}
-            {if_else {|| {== $dx_tracked_texture_loader highway} {== $dx_tracked_texture_loader spotlight} #ifndef HX_EE {== $dx_tracked_texture_loader streak} #endif}
+            {if_else {|| {== $dx_tracked_texture_loader highway} {== $dx_tracked_texture_loader spotlight} #ifndef HX_OG {== $dx_tracked_texture_loader streak} #endif}
                {os_back_screen overshell_instrument_sel}
                {os_back_screen overshell_tex}
             }