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

Merge pull request #183 from splitlane/main

Browse Source 
Transitioning toward new Skins structures
This commit is contained in:
Anthony Samms
2025-12-23 19:40:39 -05:00
committed by GitHub
parent 3c19f84489 a7fc1c5b55
commit 30d68884dd
3 changed files with 30 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "Skins/PyTaikoGreen"]
path = Skins/PyTaikoGreen
url = https://ese.tjadataba.se/Yonokid/PyTaikoGreen.git

1
Skins/PyTaikoGreen Submodule

Submodule Skins/PyTaikoGreen added at cc253a534d

92
libs/texture.py
View File

@@ -4,7 +4,6 @@ import os
import logging import logging
import sys import sys
import tempfile import tempfile
import zipfile
from pathlib import Path from pathlib import Path
from typing import Any, Optional from typing import Any, Optional
@@ -184,90 +183,39 @@ class TextureWrapper:
self.animations = parse_animations(anim_json) self.animations = parse_animations(anim_json)
logger.info(f"Animations loaded for screen: {screen_name} (from parent)") logger.info(f"Animations loaded for screen: {screen_name} (from parent)")
# TODO: rename to load_folder, add parent_folder logic
def load_zip(self, screen_name: str, subset: str): def load_zip(self, screen_name: str, subset: str):
"""Load textures from child zip, using parent texture.json if child doesn't have one.""" folder = (self.graphics_path / screen_name / subset)
zip_path = (self.graphics_path / screen_name / subset).with_suffix('.zip')
parent_zip_path = (self.parent_graphics_path / screen_name / subset).with_suffix('.zip')
if screen_name in self.textures and subset in self.textures[screen_name]: if screen_name in self.textures and subset in self.textures[screen_name]:
return return
# Child zip must exist
if not zip_path.exists():
logger.warning(f"Zip file not found: {subset} for screen {screen_name}")
return
try: try:
with zipfile.ZipFile(zip_path, 'r') as zip_ref: if not os.path.isfile(folder / 'texture.json'):
# Try to get texture.json from child first, then parent raise Exception(f"texture.json file missing from {folder}")
tex_mapping_data = None
texture_json_source = "child"
if 'texture.json' in zip_ref.namelist(): with open(folder / 'texture.json') as json_file:
with zip_ref.open('texture.json') as json_file: tex_mapping_data: dict[str, dict] = json.load(json_file)
tex_mapping_data = json.loads(json_file.read().decode('utf-8')) self.textures[folder.stem] = dict()
elif self.parent_graphics_path != self.graphics_path and parent_zip_path.exists():
# Fall back to parent's texture.json
with zipfile.ZipFile(parent_zip_path, 'r') as parent_zip_ref:
if 'texture.json' in parent_zip_ref.namelist():
with parent_zip_ref.open('texture.json') as json_file:
tex_mapping_data = json.loads(json_file.read().decode('utf-8'))
for tex_map in tex_mapping_data:
if isinstance(tex_mapping_data[tex_map], list):
for index, item in enumerate(tex_mapping_data[tex_map]):
for key in item:
if key in ["x", "y", "x2", "y2"]:
tex_mapping_data[tex_map][index][key] = tex_mapping_data[tex_map][index][key] * self.screen_scale
else:
for key in tex_mapping_data[tex_map]:
if key in ["x", "y", "x2", "y2"]:
tex_mapping_data[tex_map][key] = tex_mapping_data[tex_map][key] * self.screen_scale
texture_json_source = "parent"
else:
raise Exception(f"texture.json file missing from both {zip_path} and {parent_zip_path}")
else:
raise Exception(f"texture.json file missing from {zip_path}")
self.textures[zip_path.stem] = dict()
encoding = sys.getfilesystemencoding() encoding = sys.getfilesystemencoding()
for tex_name in tex_mapping_data: for tex_name in tex_mapping_data:
if f"{tex_name}/" in zip_ref.namelist(): tex_dir = folder / tex_name
tex_file = folder / f"{tex_name}.png"
tex_mapping = tex_mapping_data[tex_name] tex_mapping = tex_mapping_data[tex_name]
with tempfile.TemporaryDirectory() as temp_dir: if tex_dir.is_dir():
zip_ref.extractall(temp_dir, members=[name for name in zip_ref.namelist() frames = [ray.LoadTexture(str(frame).encode(encoding)) for frame in sorted(tex_dir.iterdir(),
if name.startswith(tex_name)])
extracted_path = Path(temp_dir) / tex_name
if extracted_path.is_dir():
frames = [ray.LoadTexture(str(frame).encode(encoding)) for frame in sorted(extracted_path.iterdir(),
key=lambda x: int(x.stem)) if frame.is_file()] key=lambda x: int(x.stem)) if frame.is_file()]
self.textures[folder.stem][tex_name] = Texture(tex_name, frames, tex_mapping)
self._read_tex_obj_data(tex_mapping, self.textures[folder.stem][tex_name])
elif tex_file.is_file():
tex = ray.LoadTexture(str(tex_file).encode(encoding))
self.textures[folder.stem][tex_name] = Texture(tex_name, tex, tex_mapping)
self._read_tex_obj_data(tex_mapping, self.textures[folder.stem][tex_name])
else: else:
frames = [ray.LoadTexture(str(extracted_path).encode(encoding))] logger.error(f"Texture {tex_name} was not found in {folder}")
self.textures[zip_path.stem][tex_name] = FramedTexture(tex_name, frames, tex_mapping) logger.info(f"Textures loaded from zip: {folder}")
self._read_tex_obj_data(tex_mapping, self.textures[zip_path.stem][tex_name])
elif f"{tex_name}.png" in zip_ref.namelist():
tex_mapping = tex_mapping_data[tex_name]
png_filename = f"{tex_name}.png"
with tempfile.NamedTemporaryFile(suffix='.png', delete=False) as temp_file:
temp_file.write(zip_ref.read(png_filename))
temp_path = temp_file.name
try:
tex = ray.LoadTexture(temp_path.encode(encoding))
self.textures[zip_path.stem][tex_name] = Texture(tex_name, tex, tex_mapping)
self._read_tex_obj_data(tex_mapping, self.textures[zip_path.stem][tex_name])
finally:
os.unlink(temp_path)
else:
logger.error(f"Texture {tex_name} was not found in {zip_path}")
json_note = f" (texture.json from {texture_json_source})" if texture_json_source == "parent" else ""
logger.info(f"Textures loaded from zip: {zip_path}{json_note}")
except Exception as e: except Exception as e:
logger.error(f"Failed to load textures from zip {zip_path}: {e}") logger.error(f"Failed to load textures from zip {folder}: {e}")
def load_screen_textures(self, screen_name: str) -> None: def load_screen_textures(self, screen_name: str) -> None:
"""Load textures for a screen.""" """Load textures for a screen."""