rb1-style hw transparency

hmxmilohax · Dec 13, 2023 · 3c6ddb2 · 3c6ddb2
1 parent 776da35
commit 3c6ddb2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 23 deletions.
diff --git a/_ark/dx/track/dx_track_macros.dta b/_ark/dx/track/dx_track_macros.dta
@@ -67,29 +67,36 @@
                {{{get_track_1_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}}
             }
          }
+         {{{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 $nogemdividers
-         {beatmatch foreach_active_player $player
-            {switch {$player instrument}
-               (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})
-               (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})
-               (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})
+      {do
+         {if_else $nogemdividers
+            {beatmatch foreach_active_player $player
+               {switch {$player instrument}
+                  (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})
+                  (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})
+                  (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find all_icons.tex}})
+               }
             }
-         }
-         {beatmatch foreach_active_player $player
-            {switch {$player instrument}
-               (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
-               (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
-               (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
+            {beatmatch foreach_active_player $player
+               {switch {$player instrument}
+                  (bass {{{get_bass_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
+                  (guitar {{{get_guitar_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
+                  (drum {{{get_drum_panel} find drum_slots_narrow.mat} set diffuse_tex {$this find beat_marker.tex}})
+               }
             }
          }
+         {{{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}}
       }
    }
 
    {if $hwalpha_needs_reset
-      {{$this find track_reflect.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}}
-      {{$this find background.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}}
-      {{$this find black.tex} iterate_refs $ref {$ref set intensify {! $hwalpha}}}      
+      {{$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}}}      
    }
 
    #ifndef HX_EE

diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta
@@ -106,10 +106,10 @@
 ;sustain style
 {set $sustains "rb2"}
 
-#ifndef HX_EE
-;highway transparency
-{set $hwalpha TRUE}
+;highway transparency (rb2, rb1, off)
+{set $hwalpha rb2}
 
+#ifndef HX_EE
 ;legacy bass groove
 {set $legacybass FALSE}
 

diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta
@@ -30,6 +30,7 @@
 (rb4 "Rock Band 4")
 (greenday "Green Day: Rock Band")
 (rbvr "Rock Band VR")
+(fnfestival "Fortnite Festival")
 (onyxite "Onyxite Charts")
 (gh1 "Guitar Hero")
 (gh2dx "Guitar Hero II Deluxe")
@@ -1097,8 +1098,9 @@
 (os_trkresetmsg "This will reset everything used to set custom textures. If you do this after being in-game, it will do nothing.\nAre you sure?")
 (os_gemdiv1 "Gem Dividers: ON")
 (os_gemdiv0 "Gem Dividers: OFF")
-(os_hwalpha1 "Highway Transparency: ON")
-(os_hwalpha0 "Highway Transparency: OFF")
+(os_hwalpha_rb2 "Highway Transparency: RB2")
+(os_hwalpha_rb1 "Highway Transparency: RB1")
+(os_hwalpha_off "Highway Transparency: OFF")
 (os_legacybass1 "Legacy Streak Behavior: ON")
 (os_legacybass0 "Legacy Streak Behavior: OFF")
 (os_hwstrk1 "Streak as Overlay: OFF")

diff --git a/_ark/ui/overshell_track.dta b/_ark/ui/overshell_track.dta
@@ -164,7 +164,11 @@
 ((
    {if_else $nogemdividers os_gemdiv0 os_gemdiv1}
    #ifndef HX_EE
-   {if_else $hwalpha os_hwalpha1 os_hwalpha0}
+   {switch $hwalpha
+      (off os_hwalpha_off)
+      (rb2 os_hwalpha_rb2)
+      (rb1 os_hwalpha_rb1)
+   }
    os_warn_behavior
    #endif
 ))
@@ -194,8 +198,12 @@
             {set $hwpos {sel_section.lst selected_sym}}
             {$this lst_reset}
          )
-         ((os_hwalpha0 os_hwalpha1)
-            {set $hwalpha {! $hwalpha}}
+         ((os_hwalpha_off os_hwalpha_rb2 os_hwalpha_rb1)
+            {set $hwalpha {switch $hwalpha
+               (off rb2)
+               (rb2 rb1)
+               (rb1 off)
+            }}
             {set $hwalpha_needs_reset TRUE}
             {set $hwpos {sel_section.lst selected_sym}}
             {$this lst_reset}