cleanup

libs/file_navigator.py

@@ -122,7 +122,7 @@ class BaseBox():
     def load_text(self):
         self.name = OutlinedText(self.text_name, tex.skin_config["song_box_name"].font_size, ray.WHITE, outline_thickness=5, vertical=True)
         if self.back_color is not None:
-            self.shader = ray.load_shader('', 'shader/colortransform.fs')
+            self.shader = ray.load_shader('shader/dummy.vs', 'shader/colortransform.fs')
             source_rgb = (142, 212, 30)
             target_rgb = self.back_color
             source_color = ray.ffi.new('float[3]', [source_rgb[0]/255.0, source_rgb[1]/255.0, source_rgb[2]/255.0])
@@ -756,7 +756,7 @@ class GenreBG:
 
     def load_shader(self):
         if self.color is not None:
-            self.shader = ray.load_shader('', 'shader/colortransform.fs')
+            self.shader = ray.load_shader('shader/dummy.vs', 'shader/colortransform.fs')
             source_rgb = (142, 212, 30)
             target_rgb = self.color
             source_color = ray.ffi.new('float[3]', [source_rgb[0]/255.0, source_rgb[1]/255.0, source_rgb[2]/255.0])

libs/utils.py

@@ -164,7 +164,7 @@ class OutlinedText:
         outline_size = ray.ffi.new('float*', self.outline_thickness)
         texture_size = ray.ffi.new("float[2]", [self.texture.width, self.texture.height])
 
-        self.shader = ray.load_shader('shader/outline.vs', 'shader/outline.fs')
+        self.shader = ray.load_shader('shader/dummy.vs', 'shader/outline.fs')
         self.outline_size_loc = ray.get_shader_location(self.shader, "outlineSize")
         self.outline_color_loc = ray.get_shader_location(self.shader, "outlineColor")
         self.texture_size_loc = ray.get_shader_location(self.shader, "textureSize")

scenes/dan/game_dan.py

@@ -21,7 +21,7 @@ class DanGameScreen(GameScreen):
 
     @override
     def on_screen_start(self):
-        self.mask_shader = ray.load_shader("shader/outline.vs", "shader/mask.fs")
+        self.mask_shader = ray.load_shader("shader/dummy.vs", "shader/mask.fs")
         self.current_ms = 0
         self.end_ms = 0
         self.start_delay = 4000

scenes/game.py

@@ -63,7 +63,7 @@ class GameScreen(Screen):
     JUDGE_Y = 256 * tex.screen_scale
     def on_screen_start(self):
         super().on_screen_start()
-        self.mask_shader = ray.load_shader("shader/outline.vs", "shader/mask.fs")
+        self.mask_shader = ray.load_shader("shader/dummy.vs", "shader/mask.fs")
         self.current_ms = 0
         self.end_ms = 0
         self.start_delay = 1000

scenes/song_select.py

@@ -67,7 +67,7 @@ class SongSelectScreen(Screen):
         self.screen_init = True
         self.ura_switch_animation = UraSwitchAnimation()
         self.dan_transition = DanTransition()
-        self.shader = ray.load_shader('', 'shader/colortransform.fs')
+        self.shader = ray.load_shader('shader/dummy.vs', 'shader/colortransform.fs')
         self.color = None
         self.load_shader_values(self.color)
 

scenes/two_player/song_select.py

@@ -16,7 +16,7 @@ class TwoPlayerSongSelectScreen(SongSelectScreen):
 
     def finalize_song(self, current_item):
         global_data.session_data[PlayerNum.P1].selected_song = current_item.path
-        global_data.session_data[PlayerNum.P1].genre_index = current_item.box.name_texture_index
+        global_data.session_data[PlayerNum.P1].genre_index = current_item.box.genre_index
         logger.info(f"Finalized song selection: {global_data.session_data[PlayerNum.P1].selected_song}")
 
     def handle_input(self):