From 1ef78976e85dd3e0f71c7dc43144c7c5d7381359 Mon Sep 17 00:00:00 2001 From: Anthony Samms Date: Sat, 20 Dec 2025 12:43:14 -0500 Subject: [PATCH] cleanup --- libs/file_navigator.py | 4 ++-- libs/utils.py | 2 +- scenes/dan/game_dan.py | 2 +- scenes/game.py | 2 +- scenes/song_select.py | 2 +- scenes/two_player/song_select.py | 2 +- shader/{outline.vs => dummy.vs} | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename shader/{outline.vs => dummy.vs} (100%) diff --git a/libs/file_navigator.py b/libs/file_navigator.py index df0cfd0..0facfd8 100644 --- a/libs/file_navigator.py +++ b/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]) diff --git a/libs/utils.py b/libs/utils.py index 1a7c1fc..71826e4 100644 --- a/libs/utils.py +++ b/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") diff --git a/scenes/dan/game_dan.py b/scenes/dan/game_dan.py index d99f029..1697304 100644 --- a/scenes/dan/game_dan.py +++ b/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 diff --git a/scenes/game.py b/scenes/game.py index 48d1865..f5494ad 100644 --- a/scenes/game.py +++ b/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 diff --git a/scenes/song_select.py b/scenes/song_select.py index 80c94c1..cc934a4 100644 --- a/scenes/song_select.py +++ b/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) diff --git a/scenes/two_player/song_select.py b/scenes/two_player/song_select.py index 5109bd7..beb432b 100644 --- a/scenes/two_player/song_select.py +++ b/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): diff --git a/shader/outline.vs b/shader/dummy.vs similarity index 100% rename from shader/outline.vs rename to shader/dummy.vs