Skip to content

Commit

Permalink
do not modify texture names
Browse files Browse the repository at this point in the history
  • Loading branch information
HailSanta authored and HailSanta committed Apr 25, 2024
1 parent d35bdf4 commit ecfc5b7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
5 changes: 0 additions & 5 deletions tools/build/mapfs/tex.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ def img_from_json(json_data, tex_name: str, asset_stack: Tuple[Path, ...]) -> Te

ret.img_name = json_data["name"]

if "ext" in json_data:
ret.raw_ext = json_data["ext"]
else:
ret.raw_ext = "tif"

# read data for main tile
main_data = json_data.get("main")
if main_data == None:
Expand Down
15 changes: 4 additions & 11 deletions tools/splat_ext/tex_archives.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,7 @@ def get_n64_pal(self, texbuf, fmt, depth):
# extract texture properties and rasters from buffer
def from_bytes(self, texbuf: TexBuffer):
# strip area prefix and original extension suffix
raw_name = decode_null_terminated_ascii(texbuf.get(32))
self.img_name = raw_name[4:-3]
self.raw_ext = raw_name[-3:]
self.img_name = decode_null_terminated_ascii(texbuf.get(32))

(
self.aux_width,
Expand Down Expand Up @@ -339,10 +337,6 @@ def get_json_entry(self):
out = {}
out["name"] = self.img_name

# only a single texture in 'tst_tex' has 'rgb', otherwise this is always 'tif'
if self.raw_ext != "tif":
out["ext"] = self.raw_ext

out["main"] = {
"format": get_format_name(self.main_fmt, self.main_depth),
"hwrap": wrap_modes.get(self.main_hwrap),
Expand Down Expand Up @@ -439,9 +433,8 @@ def pack_color(r, g, b, a):
def add_bytes(self, tex_name: str, bytes: bytearray):
pos = len(bytes)

# form raw name and write to header
raw_name = tex_name[:4] + self.img_name + self.raw_ext
name_bytes = raw_name.encode("ascii")
# write name to header
name_bytes = self.img_name.encode("ascii")
bytes += name_bytes

# pad name out to 32 bytes
Expand Down Expand Up @@ -491,7 +484,7 @@ def add_bytes(self, tex_name: str, bytes: bytearray):
bytes += self.aux_pal

size = len(bytes) - pos
assert size == self.expected_size(), f"{raw_name}: size mismatch: {size} != {self.expected_size()}"
assert size == self.expected_size(), f"{self.img_name}: size mismatch: {size} != {self.expected_size()}"

def expected_size(self) -> int:
"""
Expand Down

0 comments on commit ecfc5b7

Please sign in to comment.