robob/PyTaiko
1
0
Fork 0
mirror of https://github.com/Yonokid/PyTaiko.git synced 2026-02-04 03:30:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Anthony Samms
2025-12-20 12:43:14 -05:00
parent 3f9a1e3a4c
commit 1ef78976e8
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/file_navigator.py
View File

@@ -122,7 +122,7 @@ class BaseBox():
def load_text(self): 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) 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: 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) source_rgb = (142, 212, 30)
target_rgb = self.back_color 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]) 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): def load_shader(self):
if self.color is not None: 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) source_rgb = (142, 212, 30)
target_rgb = self.color 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]) source_color = ray.ffi.new('float[3]', [source_rgb[0]/255.0, source_rgb[1]/255.0, source_rgb[2]/255.0])

2
libs/utils.py
View File

@@ -164,7 +164,7 @@ class OutlinedText:
outline_size = ray.ffi.new('float*', self.outline_thickness) outline_size = ray.ffi.new('float*', self.outline_thickness)
texture_size = ray.ffi.new("float[2]", [self.texture.width, self.texture.height]) 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_size_loc = ray.get_shader_location(self.shader, "outlineSize")
self.outline_color_loc = ray.get_shader_location(self.shader, "outlineColor") self.outline_color_loc = ray.get_shader_location(self.shader, "outlineColor")
self.texture_size_loc = ray.get_shader_location(self.shader, "textureSize") self.texture_size_loc = ray.get_shader_location(self.shader, "textureSize")

2
scenes/dan/game_dan.py
View File

@@ -21,7 +21,7 @@ class DanGameScreen(GameScreen):
@override @override
def on_screen_start(self): 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.current_ms = 0
self.end_ms = 0 self.end_ms = 0
self.start_delay = 4000 self.start_delay = 4000

2
scenes/game.py
View File

@@ -63,7 +63,7 @@ class GameScreen(Screen):
JUDGE_Y = 256 * tex.screen_scale JUDGE_Y = 256 * tex.screen_scale
def on_screen_start(self): def on_screen_start(self):
super().on_screen_start() 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.current_ms = 0
self.end_ms = 0 self.end_ms = 0
self.start_delay = 1000 self.start_delay = 1000

2
scenes/song_select.py
View File

@@ -67,7 +67,7 @@ class SongSelectScreen(Screen):
self.screen_init = True self.screen_init = True
self.ura_switch_animation = UraSwitchAnimation() self.ura_switch_animation = UraSwitchAnimation()
self.dan_transition = DanTransition() 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.color = None
self.load_shader_values(self.color) self.load_shader_values(self.color)

2
scenes/two_player/song_select.py
View File

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

0
shader/outline.vs → shader/dummy.vs
View File