rb3 hw transparency

hmxmilohax · Jan 13, 2024 · 2bcedd3 · 2bcedd3
1 parent 7249fd0
commit 2bcedd3
Show file tree

Hide file tree

Showing 22 changed files with 127 additions and 4 deletions.
diff --git a/_ark/dx/track/dx_h2h_callback.dta b/_ark/dx/track/dx_h2h_callback.dta
@@ -14,6 +14,9 @@
          {$this check_missed}
          {{{get_track_0_panel} find streak_meter} star_deploy_stop}
          {{{{get_track_0_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_track_0_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {track_0 stop_deploy}
       }
    )
@@ -25,6 +28,9 @@
       {$this check_missed}
       {{{get_track_0_panel} find streak_meter} star_deploy_stop}
       {{{{get_track_0_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+      {if {== $hwalpha rb3}
+         {{{get_track_0_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+      }
       {track_0 stop_deploy}
    )
    (check_fc
@@ -40,6 +46,9 @@
       {if {> {'+' [num_gems_miss] [num_gems_pass]} 0}
          {{{get_track_0_panel} find streak_meter} star_deploy_stop}
          {{{{get_track_0_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_track_0_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {track_0 stop_deploy}
       }
       {if_else {== {{game get_participant_config 0} get_track_sym} guitar}
@@ -101,6 +110,9 @@
                }
             }
          }
+         {if {== $hwalpha rb3}
+            {{{get_track_0_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find track_clipping.tex}}
+         }
       }
    )
    (do_streak
@@ -153,6 +165,9 @@
          {$this check_missed}
          {{{get_track_1_panel} find streak_meter} star_deploy_stop}
          {{{{get_track_1_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_track_1_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {track_1 stop_deploy}
       }
    )
@@ -164,6 +179,9 @@
       {$this check_missed}
       {{{get_track_1_panel} find streak_meter} star_deploy_stop}
       {{{{get_track_1_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+      {if {== $hwalpha rb3}
+         {{{get_track_1_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+      }
       {track_1 stop_deploy}
      )
    (check_fc
@@ -179,6 +197,9 @@
       {if {> {'+' [num_gems_miss] [num_gems_pass]} 0}
          {{{get_track_1_panel} find streak_meter} star_deploy_stop}
          {{{{get_track_1_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_track_1_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {track_1 stop_deploy}
       }
       {if_else {== {{game get_participant_config 0} get_track_sym} guitar}
@@ -240,6 +261,9 @@
                }
             }
          }
+         {if {== $hwalpha rb3}
+            {{{get_track_1_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find track_clipping.tex}}
+         }
       }
    )
    (do_streak

diff --git a/_ark/dx/track/dx_track_callback.dta b/_ark/dx/track/dx_track_callback.dta
@@ -17,6 +17,9 @@
          {{{get_bass_panel} find streak_meter} star_deploy_stop}
          {{{{get_bass_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
          {bass stop_deploy}
+         {if {== $hwalpha rb3}
+            {{{get_bass_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
       }
    )
    (pass
@@ -27,6 +30,9 @@
       {$this check_missed}
       {{{get_bass_panel} find streak_meter} star_deploy_stop}
       {{{{get_bass_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+      {if {== $hwalpha rb3}
+         {{{get_bass_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+      }
       {bass stop_deploy}
    )
    (check_fc
@@ -42,6 +48,9 @@
       {if {> {'+' [num_gems_miss] [num_gems_pass]} 0}
          {{{get_bass_panel} find streak_meter} star_deploy_stop}
          {{{{get_bass_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_bass_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {bass stop_deploy}
       }
       {if_else {== $highwaybass "_1_none"}
@@ -91,6 +100,9 @@
    (do_customhw_streak
       {if $hwstrk 
          {{{get_bass_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_bass_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find track_clipping.tex}}
+         }
       }
    )
    (do_warning
@@ -165,6 +177,9 @@
          {$this check_missed}
          {{{get_guitar_panel} find streak_meter} star_deploy_stop}
          {{{{get_guitar_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_guitar_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {guitar stop_deploy}
       }
    )
@@ -176,6 +191,9 @@
       {$this check_missed}
       {{{get_guitar_panel} find streak_meter} star_deploy_stop}
       {{{{get_guitar_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+      {if {== $hwalpha rb3}
+         {{{get_guitar_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+      }
       {guitar stop_deploy}
    )
    (check_fc
@@ -192,6 +210,9 @@
          {{{get_guitar_panel} find streak_meter} star_deploy_stop}
          {{{{get_guitar_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
          {guitar stop_deploy}
+         {if {== $hwalpha rb3}
+            {{{get_guitar_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
       }
       {if_else {== $highwaygtr "_1_none"}
          {do
@@ -240,6 +261,9 @@
             {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
             {{{get_guitar_panel} find surface.mat} set emissive_map {{get_track_panel} find pitch_arrow_effect_old.tex}}
          }
+         {if {== $hwalpha rb3}
+            {{{get_guitar_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find track_clipping.tex}}
+         }
       }
    )
    (do_warning
@@ -314,6 +338,9 @@
          {$this check_missed}
          {{{get_drum_panel} find streak_meter} star_deploy_stop}
          {{{{get_drum_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_drum_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {drum stop_deploy}
       }
    )
@@ -325,6 +352,9 @@
       {$this check_missed}
       {{{get_drum_panel} find streak_meter} star_deploy_stop}
       {{{{get_drum_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+      {if {== $hwalpha rb3}
+         {{{get_drum_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+      }
       {drum stop_deploy}
    )
    (check_fc
@@ -340,6 +370,9 @@
       {if {> {'+' [num_gems_miss] [num_gems_pass]} 0}
          {{{get_drum_panel} find streak_meter} star_deploy_stop}
          {{{{get_drum_panel} find streak_meter} find glass.mat} set diffuse_tex {{get_track_panel} find multiplier_cap_glass_vox.tex}}
+         {if {== $hwalpha rb3}
+            {{{get_drum_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find rb3clip.tex}}
+         }
          {drum stop_deploy}
       }
       {if_else {== $highwaydrum "_1_none"}
@@ -392,6 +425,9 @@
             {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find bass_superstreak_pattern.tex}}
             {{{get_drum_panel} find surface.mat} set emissive_map {{get_track_panel} find smasher_plate_orange_emiss_nomip.tex}}
          }
+         {if {== $hwalpha rb3}
+            {{{get_drum_panel} find track_clipping.mat} set diffuse_tex {{get_track_panel} find track_clipping.tex}}
+         }
       }
    )
    (do_warning

diff --git a/_ark/dx/track/dx_track_macros.dta b/_ark/dx/track/dx_track_macros.dta
@@ -63,6 +63,8 @@
    {unless $texrunevery ;this runs every track load as these textures always reset
       {new Tex transparent.tex}
       {{$this find transparent.tex} set_bitmap "track/custom_track_textures/_no_highway.png"}
+      {new Tex rb3clip.tex}
+      {{$this find rb3clip.tex} set_bitmap "track/custom_track_textures/track_clipping_rb3.png"}
    }
 
    {unless $texrunonce
@@ -90,6 +92,26 @@
                {{{get_track_1_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}
             }
          }
+         {unless $h2hclipscale
+            {{{get_track_0_panel} find track_clipping.mesh} get_local_scale $clipx $clipy $clipz}
+            {set $h2hclipscale TRUE}
+         }
+         {if_else {== $hwalpha rb3}
+            {do
+               {{{get_track_0_panel} find track_clipping.mat} set diffuse_tex {$this find rb3clip.tex}}
+               {{{get_track_1_panel} find track_clipping.mat} set diffuse_tex {$this find rb3clip.tex}}
+               {{{get_track_0_panel} find track_clipping.mesh} set_local_scale {+ $clipx 0.05} {+ $clipy 500} $clipz}
+               {{{get_track_1_panel} find track_clipping.mesh} set_local_scale {+ $clipx 0.05} {+ $clipy 500} $clipz}
+            }
+            {do
+               {{{get_track_0_panel} find track_clipping.mat} set diffuse_tex {$this find track_clipping.tex}}
+               {{{get_track_1_panel} find track_clipping.mat} set diffuse_tex {$this find track_clipping.tex}}
+               {{{get_track_0_panel} find track_clipping.mesh} set_local_scale $clipx $clipy $clipz}
+               {{{get_track_1_panel} find track_clipping.mesh} set_local_scale $clipx $clipy $clipz}
+            }
+         }
+         {{{get_track_0_panel} find track_clipping.mat} set intensify {== $hwalpha rb3}}
+         {{{get_track_1_panel} find track_clipping.mat} set intensify {== $hwalpha rb3}}
          {{{get_track_0_panel} find track_clipping.mesh} set_showing {!= $hwalpha rb1}}
          {{{get_track_1_panel} find track_clipping.mesh} set_showing {!= $hwalpha rb1}}
          {if_else {== {{game get_participant_config 0} get_track_sym} drum}
@@ -120,6 +142,43 @@
                }
             }
          }
+         {if_else {== $hwalpha rb3}
+            {beatmatch foreach_active_player $player
+               {switch {$player instrument}
+                  (bass {{{get_bass_panel} find track_clipping.mat} set diffuse_tex {$this find rb3clip.tex}})
+                  (guitar {{{get_guitar_panel} find track_clipping.mat} set diffuse_tex {$this find rb3clip.tex}})
+                  (drum {{{get_drum_panel} find track_clipping.mat} set diffuse_tex {$this find rb3clip.tex}})
+               }
+            }
+            {beatmatch foreach_active_player $player
+               {switch {$player instrument}
+                  (bass {{{get_bass_panel} find track_clipping.mat} set diffuse_tex {$this find track_clipping.tex}})
+                  (guitar {{{get_guitar_panel} find track_clipping.mat} set diffuse_tex {$this find track_clipping.tex}})
+                  (drum {{{get_drum_panel} find track_clipping.mat} set diffuse_tex {$this find track_clipping.tex}})
+               }
+            }
+         }
+         {{{get_guitar_panel} find track_clipping.mat} set intensify {== $hwalpha rb3}}
+         {{{get_bass_panel} find track_clipping.mat} set intensify {== $hwalpha rb3}}
+         {{{get_drum_panel} find track_clipping.mat} set intensify {== $hwalpha rb3}}
+         {unless $clipscale
+            {{{get_guitar_panel} find track_clipping.mesh} get_local_scale $clipx $clipy $clipz}
+            {{{get_bass_panel} find track_clipping.mesh} get_local_scale $clipx $clipy $clipz}
+            {{{get_drum_panel} find track_clipping.mesh} get_local_scale $clipx $clipy $clipz}
+            {set $clipscale TRUE}
+         }
+         {if_else {== $hwalpha rb3}
+            {do
+               {{{get_guitar_panel} find track_clipping.mesh} set_local_scale {+ $clipx 0.05} {+ $clipy 500} $clipz}
+               {{{get_bass_panel} find track_clipping.mesh} set_local_scale {+ $clipx 0.05} {+ $clipy 500} $clipz}
+               {{{get_drum_panel} find track_clipping.mesh} set_local_scale {+ $clipx 0.05} {+ $clipy 500} $clipz}
+            }
+            {do
+               {{{get_guitar_panel} find track_clipping.mesh} set_local_scale $clipx $clipy $clipz}
+               {{{get_bass_panel} find track_clipping.mesh} set_local_scale $clipx $clipy $clipz}
+               {{{get_drum_panel} find track_clipping.mesh} set_local_scale $clipx $clipy $clipz}
+            }
+         }
          {{{get_guitar_panel} find track_clipping.mesh} set_showing {!= $hwalpha rb1}}
          {{{get_bass_panel} find track_clipping.mesh} set_showing {!= $hwalpha rb1}}
          {{{get_drum_panel} find track_clipping.mesh} set_showing {!= $hwalpha rb1}}
@@ -130,6 +189,7 @@
    }
 
    {if $hwalpha_needs_reset
+      {{$this find rb3clip.tex} iterate_refs $ref {$ref set color {pack_color 1 1 1}}}
       {{$this find track_reflect.tex} iterate_refs $ref {$ref set intensify {== $hwalpha off}}}
       {{$this find background.tex} iterate_refs $ref {$ref set intensify {== $hwalpha off}}}
       {{$this find black.tex} iterate_refs $ref {$ref set intensify {== $hwalpha off}}}      

diff --git a/_ark/dx/ui/dx_overshell_macros.dta b/_ark/dx/ui/dx_overshell_macros.dta
@@ -211,7 +211,7 @@
    {set $spotlightdrumcustomtexture TRUE}
    {set $spotlightdrum rb3_drums}
    {set $hwalpha_needs_reset TRUE}
-   {set $hwalpha off}
+   {set $hwalpha rb3}
    {set $hwstrk TRUE}
    {set $nohwwarn TRUE}
    {set $railwarn TRUE}

diff --git a/_ark/track/custom_track_textures/gen/track_clipping_rb3.png_ps2 b/_ark/track/custom_track_textures/gen/track_clipping_rb3.png_ps2
diff --git a/_ark/track/custom_track_textures/gen/track_clipping_rb3.png_ps3 b/_ark/track/custom_track_textures/gen/track_clipping_rb3.png_ps3
diff --git a/_ark/track/custom_track_textures/gen/track_clipping_rb3.png_xbox b/_ark/track/custom_track_textures/gen/track_clipping_rb3.png_xbox
diff --git a/_ark/track_new/highways/gen/_2_rb3_guitar.png_ps3 b/_ark/track_new/highways/gen/_2_rb3_guitar.png_ps3
diff --git a/_ark/track_new/highways/gen/_2_rb3_guitar.png_xbox b/_ark/track_new/highways/gen/_2_rb3_guitar.png_xbox
diff --git a/_ark/track_new/highways/gen/_rb3_bass.png_ps3 b/_ark/track_new/highways/gen/_rb3_bass.png_ps3
diff --git a/_ark/track_new/highways/gen/_rb3_bass.png_xbox b/_ark/track_new/highways/gen/_rb3_bass.png_xbox
diff --git a/_ark/track_new/highways/gen/_rb3_drum.png_ps3 b/_ark/track_new/highways/gen/_rb3_drum.png_ps3
diff --git a/_ark/track_new/highways/gen/_rb3_drum.png_xbox b/_ark/track_new/highways/gen/_rb3_drum.png_xbox
diff --git a/_ark/track_new/highways/gen/_rb3_keys.png_ps3 b/_ark/track_new/highways/gen/_rb3_keys.png_ps3
diff --git a/_ark/track_new/highways/gen/_rb3_keys.png_xbox b/_ark/track_new/highways/gen/_rb3_keys.png_xbox
diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta
@@ -1145,6 +1145,7 @@
 (os_gemdiv0 "Gem Dividers: OFF")
 (os_smasherbracket1 "Strikeline Bracket: OFF")
 (os_smasherbracket0 "Strikeline Bracket: ON")
+(os_hwalpha_rb3 "Highway Transparency: RB3")
 (os_hwalpha_rb2 "Highway Transparency: RB2")
 (os_hwalpha_rb1 "Highway Transparency: RB1")
 (os_hwalpha_off "Highway Transparency: OFF")

diff --git a/_ark/ui/overshell_track.dta b/_ark/ui/overshell_track.dta
@@ -267,6 +267,7 @@
    {if_else $nogemdividers os_gemdiv0 os_gemdiv1}
    {switch $hwalpha
       (off os_hwalpha_off)
+      (rb3 os_hwalpha_rb3)
       (rb2 os_hwalpha_rb2)
       (rb1 os_hwalpha_rb1)
    }
@@ -306,11 +307,12 @@
             {set $hwpos {sel_section.lst selected_sym}}
             {$this lst_reset}
          )
-         ((os_hwalpha_off os_hwalpha_rb2 os_hwalpha_rb1)
+         ((os_hwalpha_off os_hwalpha_rb3 os_hwalpha_rb2 os_hwalpha_rb1)
             {set $hwalpha {switch $hwalpha
-               (off rb2)
+               (off rb3)
+               (rb3 rb2)
                (rb2 rb1)
-               (rb1 #ifdef HX_EE rb2 #else off #endif)
+               (rb1 #ifdef HX_EE rb3 #else off #endif)
             }}
             {set $hwalpha_needs_reset TRUE}
             {set $hwpos {sel_section.lst selected_sym}}

diff --git a/custom_textures/custom_track_textures/track_clipping_rb3.png b/custom_textures/custom_track_textures/track_clipping_rb3.png
diff --git a/custom_textures/highways/_2_rb3_guitar.png b/custom_textures/highways/_2_rb3_guitar.png
diff --git a/custom_textures/highways/_rb3_bass.png b/custom_textures/highways/_rb3_bass.png
diff --git a/custom_textures/highways/_rb3_drum.png b/custom_textures/highways/_rb3_drum.png
diff --git a/custom_textures/highways/_rb3_keys.png b/custom_textures/highways/_rb3_keys.png