move track_panel scripting to a dx/handle

hmxmilohax · Jan 7, 2024 · d151bdb · d151bdb
1 parent 8c521e9
commit d151bdb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 27 deletions.
diff --git a/_ark/dx/track/dx_track_panel_handles.dta b/_ark/dx/track/dx_track_panel_handles.dta
@@ -105,13 +105,40 @@
          }
       }
    )
+   (dx_track_panel_enter
+      {if {|| {! {gamemode in_mode trainer} {! {gamemode in_mode campaign}}}}
+         {$this dx_set_scoreboard_pos}
+         {$this dx_set_solo_box_pos}
+         {$this dx_set_star_display_pos}
+         {$this dx_force_remote_vox}
+         {$this dx_set_failed_pos}
+      }
+      {dx_add_player_sinks}
+      {dx_apply_remote_textures} ;sync highway textures with remote players
+      {dx_apply_remote_track_speeds} ;sync track speeds with remote players
+      {$this track_texture_reset_handler}
+      {dx_track_bre_reset}
+      {dx_track_angle_var_reset} ;reset the track angle just to be safe
+      {unless $dx_texloadonce {dx_default_texture_var_reset}} ;reset rb3 textures if no textures have been loaded yet
+   )
+   (dx_track_panel_on_extend
+      {if {! {gamemode in_mode trainer}}
+         {dx_track_streak_reset}
+         {dx_set_song_speed}
+         {dx_toggle_fail_feedback}
+         {{find_obj {{get_track_panel} loaded_dir} track_0} set bottom_y -26}
+         {{find_obj {{get_track_panel} loaded_dir} track_1} set bottom_y -26}
+         {{find_obj {{get_track_panel} loaded_dir} track_2} set bottom_y -26}
+         {{find_obj {{get_track_panel} loaded_dir} track_3} set bottom_y -26}
+         {dx_track_fc_reset}
+      }
+   )
 )
-#define DX_TRACK_TEXTURE_HANDLER
+#define DX_TRACK_TEXTURE_HANDLES
 (
    (track_texture_reset_handler
       {dx_log_writer info {sprint "Setting up textures"}}
       {unless {|| {gamemode in_mode trainer} {modifier_mgr is_modifier_active mod_nohud}} ;don't run anything if performance mode is enabled
-
          {if_else $fcringonce ;check if we have already generated new textures for the fc ring
             {do ;if we have
                {{coop_track_panel find fcframe.tex} set_bitmap

diff --git a/_ark/ui/track_panel.dta b/_ark/ui/track_panel.dta
@@ -6,20 +6,7 @@
 #define TRACK_PANEL_HANDLERS
 ((enter
       {game add_sink $this}
-      {if {|| {! {gamemode in_mode trainer} {! {gamemode in_mode campaign}}}}
-         {$this dx_set_scoreboard_pos}
-         {$this dx_set_solo_box_pos}
-         {$this dx_set_star_display_pos}
-         {$this dx_force_remote_vox}
-         {$this dx_set_failed_pos}
-      }
-      {dx_add_player_sinks}
-      {dx_apply_remote_textures} ;sync highway textures with remote players
-      {dx_apply_remote_track_speeds} ;sync track speeds with remote players
-      {$this track_texture_reset_handler}
-      {dx_track_bre_reset}
-      {dx_track_angle_var_reset} ;reset the track angle just to be safe
-      {unless $dx_texloadonce {dx_default_texture_var_reset}} ;reset rb3 textures if no textures have been loaded yet
+      {$this dx_track_panel_enter}
       {$this
          set_showing
          {!
@@ -52,16 +39,7 @@
          {$m on_new_track}})
    (on_extend
       {$this play_intro}
-      {if {! {gamemode in_mode trainer}}
-         {dx_track_streak_reset}
-         {dx_set_song_speed}
-         {dx_toggle_fail_feedback}
-         {{find_obj {{get_track_panel} loaded_dir} track_0} set bottom_y -26}
-         {{find_obj {{get_track_panel} loaded_dir} track_1} set bottom_y -26}
-         {{find_obj {{get_track_panel} loaded_dir} track_2} set bottom_y -26}
-         {{find_obj {{get_track_panel} loaded_dir} track_3} set bottom_y -26}
-         {dx_track_fc_reset}
-      }
+      {$this dx_track_panel_on_extend}
       {if
          {&&
             {exists gamemode}
@@ -70,8 +48,8 @@
 {new
    TrackPanel
    coop_track_panel
+   DX_TRACK_TEXTURE_HANDLES
    DX_TRACK_PANEL_HANDLES
-   DX_TRACK_TEXTURE_HANDLER
    (file
       "track/trackpanel.milo")
    TRACK_PANEL_HANDLERS}