mirror of
https://github.com/pmret/papermario.git
synced 2024-10-18 10:42:43 +02:00
revert texture renaming (#1185)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
parent
d35bdf466b
commit
f2ef0713ff
@ -30,11 +30,6 @@ def img_from_json(json_data, tex_name: str, asset_stack: Tuple[Path, ...]) -> Te
|
|||||||
|
|
||||||
ret.img_name = json_data["name"]
|
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
|
# read data for main tile
|
||||||
main_data = json_data.get("main")
|
main_data = json_data.get("main")
|
||||||
if main_data == None:
|
if main_data == None:
|
||||||
|
@ -222,9 +222,7 @@ class TexImage:
|
|||||||
# extract texture properties and rasters from buffer
|
# extract texture properties and rasters from buffer
|
||||||
def from_bytes(self, texbuf: TexBuffer):
|
def from_bytes(self, texbuf: TexBuffer):
|
||||||
# strip area prefix and original extension suffix
|
# strip area prefix and original extension suffix
|
||||||
raw_name = decode_null_terminated_ascii(texbuf.get(32))
|
self.img_name = decode_null_terminated_ascii(texbuf.get(32))
|
||||||
self.img_name = raw_name[4:-3]
|
|
||||||
self.raw_ext = raw_name[-3:]
|
|
||||||
|
|
||||||
(
|
(
|
||||||
self.aux_width,
|
self.aux_width,
|
||||||
@ -339,10 +337,6 @@ class TexImage:
|
|||||||
out = {}
|
out = {}
|
||||||
out["name"] = self.img_name
|
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"] = {
|
out["main"] = {
|
||||||
"format": get_format_name(self.main_fmt, self.main_depth),
|
"format": get_format_name(self.main_fmt, self.main_depth),
|
||||||
"hwrap": wrap_modes.get(self.main_hwrap),
|
"hwrap": wrap_modes.get(self.main_hwrap),
|
||||||
@ -439,9 +433,8 @@ class TexImage:
|
|||||||
def add_bytes(self, tex_name: str, bytes: bytearray):
|
def add_bytes(self, tex_name: str, bytes: bytearray):
|
||||||
pos = len(bytes)
|
pos = len(bytes)
|
||||||
|
|
||||||
# form raw name and write to header
|
# write name to header
|
||||||
raw_name = tex_name[:4] + self.img_name + self.raw_ext
|
name_bytes = self.img_name.encode("ascii")
|
||||||
name_bytes = raw_name.encode("ascii")
|
|
||||||
bytes += name_bytes
|
bytes += name_bytes
|
||||||
|
|
||||||
# pad name out to 32 bytes
|
# pad name out to 32 bytes
|
||||||
@ -491,7 +484,7 @@ class TexImage:
|
|||||||
bytes += self.aux_pal
|
bytes += self.aux_pal
|
||||||
|
|
||||||
size = len(bytes) - pos
|
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:
|
def expected_size(self) -> int:
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user