mirror of
https://github.com/zeldaret/oot
synced 2026-06-17 07:07:57 -04:00
1e556e3a3d
* wip: New assets system tm
Builds gc-eu-mq-dbg OK from clean after
1) make setup
2) python3 -m tools.assets.extract -j
3) replace 0x80A8E610 with sShadowTex in extracted/gc-eu-mq-dbg/assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c
4) make various symbols in extracted data like sTex static
* use variables from config.yml for gMtxClear and sShadowTex addresses
* Write source with static for overlays using `HACK_IS_STATIC_ON` hack
* gc-eu-mq-dbg OK from clean with `make setup && make`
* implement more skeleton-related types, cleanups, fixups
* fix extracted data to no longer produce compilation warnings
* implement more of RoomShapeImage types
* yeet XmlPath from ExternalFile usage
* Implement PlayerAnimationDataResource (link_animetion data)
* fix csdis CS_TIME extra arg
* dmadata file names no longer hardcoded for gc-eu-mq-dbg
* ntsc-1.0 OK
* xml fixes
* slightly improve standard output
* rm extract_assets.py
* generate and use Limb enums (TODO: check Skin skels and implement for Curve skels)
* handle dependencies between xmls
* introduce RawPointers xml attribute to ignore specific pointers and keep them raw
* add tools/extract_assets.sh
* fixups
* only extract if xmls changed or if -f (force) is used
* fixups, gc-eu OK
* all versions OK
* check attributes of xml resources elements
* Implement legacy skelanime resources
* fix ASSET_FILES_BIN_EXTRACTED/COMMITTED: look for .u8.bin specifically instead of just .bin
* implement JFIFResource
* fix png/jpg wildcards: look specifically for .u64.png .u32.png .u64.jpg
* Makefile: Add rules to build .png, .bin and .jpg in assets/ too
* start writing actual docs
* extract sTransCircleDL and sTransWipeDL
* misc cleanup/fixes, pygfxd 1.0.3
* refactor CDataExt.set_write callback args to use a dataclass
* Move {} to in-source
* misc
* more progress on spec
* fix missing braces in n64dd_error_textures.c
* finish xml spec doc
* assets xmls fixes
* some cleanup, use `gNameTex_WIDTH/HEIGHT` macros in dlists
* handle hackmode_syotes_room, fix compile
* C build_from_png
* rm tools/assets/bin2c
* rm ZAPD
* format
* remove rule to generate dmadata_table.py
* CC0 license (and some import cleanup)
* dont try to build zapd (rmd)
* simplify palettes with single user (ci images with a non-shared palette)
* add docs on how images are handled
* bss
* allow -j N
* fix n64texconv python bindings memory management
* move -j at the end of calling extraction script
* with -j, update last_extracts.json as each job completes rather than only if all complete
* make interrupting less jank by making child processes ignore sigint
* use enum names in `SCENE_CMD_SKYBOX_SETTINGS`
* `multiprocessing.get_context("fork")`
* import rich, except ImportError s
* fix optional rich usage
* .bss
* .bss
* .bss
* assets extraction: -j -> -j$(N_THREADS)
* .bss
* change LIMB_NONE/MAX defaults to be FILE_OFFSET instead of SKELNAME
* 0XHEX -> 0xHEX
* fix bss
* Proper includes for assets
mostly proper, some includes like dlists resources always causing a sys_matrix.h include (when not every dlist references gIdentityMtx) could be done better
* rm z64.h
* rm z64.h take two
* bss
* Make .u64 suffix for pngs optional
* fixup: rm .u64 suffix from n64dd image paths
* Remove elemtype suffixes from .bin and .jpg files
* Update images.md
* some build_from_png cleanup, more error handling, comments
* Handle skybox textures
Introduce "sub-format" suffix for pngs, with sub-formats split_lo and split_hi being used for skybox textures
* fixup for older python
* improve collision output some
* fully use SURFACETYPE[01] macros in writing extracted surface types
* use WATERBOX_PROPERTIES in extracted waterboxes
* some SceneCommandsResource cleanup
* format EnvLightSettingsList output
357 lines
11 KiB
Python
357 lines
11 KiB
Python
# SPDX-FileCopyrightText: © 2025 ZeldaRET
|
|
# SPDX-License-Identifier: CC0-1.0
|
|
|
|
import abc
|
|
from typing import TYPE_CHECKING
|
|
|
|
from ..extase import (
|
|
RESOURCE_PARSE_SUCCESS,
|
|
ResourceParseInProgress,
|
|
ResourceParseWaiting,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from ..extase.memorymap import MemoryContext
|
|
|
|
from ..extase.cdata_resources import (
|
|
CDataResource,
|
|
CDataArrayResource,
|
|
CDataExt_Value,
|
|
CDataExt_Struct,
|
|
CDataExt_Array,
|
|
CDataExtWriteContext,
|
|
cdata_ext_Vec3s,
|
|
)
|
|
|
|
from . import dlist_resources
|
|
|
|
|
|
class StandardLimbResource(CDataResource):
|
|
def write_limb_index(
|
|
resource, memory_context: "MemoryContext", v, wctx: CDataExtWriteContext
|
|
):
|
|
assert isinstance(v, int)
|
|
f = wctx.f
|
|
f.write(wctx.line_prefix)
|
|
if resource.skeleton_resource is None:
|
|
f.write(f"{v}")
|
|
else:
|
|
f.write(f"/* {v} */ ")
|
|
if v == 0xFF:
|
|
f.write("LIMB_DONE")
|
|
else:
|
|
f.write(
|
|
resource.skeleton_resource.limbs_array_resource.limbs[
|
|
v
|
|
].enum_member_name
|
|
)
|
|
f.write(" - 1")
|
|
return True
|
|
|
|
cdata_ext = CDataExt_Struct(
|
|
(
|
|
("jointPos", cdata_ext_Vec3s),
|
|
("child", CDataExt_Value("B").set_write(write_limb_index)),
|
|
("sibling", CDataExt_Value("B").set_write(write_limb_index)),
|
|
("dList", dlist_resources.cdata_ext_gfx_segmented),
|
|
)
|
|
)
|
|
|
|
def __init__(self, file, range_start, name):
|
|
super().__init__(file, range_start, name)
|
|
self.enum_member_name = f"LIMB_{file.name.upper()}_{range_start:06X}"
|
|
self.skeleton_resource: "SkeletonResourceBaseABC | None" = None
|
|
|
|
def set_enum_member_name(self, enum_member_name: str):
|
|
self.enum_member_name = enum_member_name
|
|
|
|
def get_c_declaration_base(self):
|
|
return f"StandardLimb {self.symbol_name}"
|
|
|
|
def get_c_reference(self, resource_offset: int):
|
|
if resource_offset == 0:
|
|
return f"&{self.symbol_name}"
|
|
else:
|
|
raise ValueError()
|
|
|
|
def get_h_includes(self):
|
|
return ("z64animation.h",)
|
|
|
|
|
|
class LODLimbResource(CDataResource):
|
|
cdata_ext = CDataExt_Struct(
|
|
(
|
|
("jointPos", cdata_ext_Vec3s),
|
|
(
|
|
"child",
|
|
CDataExt_Value("B").set_write(StandardLimbResource.write_limb_index),
|
|
),
|
|
(
|
|
"sibling",
|
|
CDataExt_Value("B").set_write(StandardLimbResource.write_limb_index),
|
|
),
|
|
("dLists", CDataExt_Array(dlist_resources.cdata_ext_gfx_segmented, 2)),
|
|
)
|
|
)
|
|
|
|
def __init__(self, file, range_start, name):
|
|
super().__init__(file, range_start, name)
|
|
self.enum_member_name = f"LIMB_{file.name.upper()}_{range_start:06X}"
|
|
|
|
def set_enum_member_name(self, enum_member_name: str):
|
|
self.enum_member_name = enum_member_name
|
|
|
|
def get_c_declaration_base(self):
|
|
return f"LodLimb {self.symbol_name}"
|
|
|
|
def get_c_reference(self, resource_offset: int):
|
|
if resource_offset == 0:
|
|
return f"&{self.symbol_name}"
|
|
else:
|
|
raise ValueError()
|
|
|
|
def get_h_includes(self):
|
|
return ("z64animation.h",)
|
|
|
|
|
|
class LimbsArrayResourceABC(CDataArrayResource):
|
|
limb_type: type[CDataResource]
|
|
c_limb_type: str
|
|
|
|
def write_limb_element(
|
|
resource, memory_context: "MemoryContext", v, wctx: CDataExtWriteContext
|
|
):
|
|
assert isinstance(v, int)
|
|
address = v
|
|
wctx.f.write(wctx.line_prefix)
|
|
wctx.f.write(memory_context.get_c_reference_at_segmented(address))
|
|
return True
|
|
|
|
elem_cdata_ext = CDataExt_Value("I").set_write(write_limb_element)
|
|
|
|
def __init__(self, file, range_start, name):
|
|
super().__init__(file, range_start, name)
|
|
self.limbs = None
|
|
|
|
def try_parse_data(self, memory_context):
|
|
ret = super().try_parse_data(memory_context)
|
|
assert ret == RESOURCE_PARSE_SUCCESS
|
|
self.limbs: list[self.limb_type] = []
|
|
for address in self.cdata_unpacked:
|
|
limb = memory_context.report_resource_at_segmented(
|
|
self,
|
|
address,
|
|
self.limb_type,
|
|
lambda file, offset: self.limb_type(
|
|
file,
|
|
offset,
|
|
f"{self.name}_{address:08X}_{self.c_limb_type}",
|
|
),
|
|
)
|
|
self.limbs.append(limb)
|
|
return RESOURCE_PARSE_SUCCESS
|
|
|
|
def get_c_declaration_base(self):
|
|
return f"void* {self.symbol_name}[]"
|
|
|
|
|
|
class StandardLimbsArrayResource(LimbsArrayResourceABC):
|
|
limb_type = StandardLimbResource
|
|
c_limb_type = "StandardLimb"
|
|
|
|
|
|
class LODLimbsArrayResource(LimbsArrayResourceABC):
|
|
limb_type = LODLimbResource
|
|
c_limb_type = "LodLimb"
|
|
|
|
|
|
class SkeletonResourceBaseABC(CDataResource):
|
|
limbs_array_type: type[LimbsArrayResourceABC]
|
|
|
|
def __init__(self, file, range_start, name):
|
|
super().__init__(file, range_start, name)
|
|
self.enum_name = f"{self.symbol_name}Limb"
|
|
self.enum_member_name_none = f"LIMB_{file.name.upper()}_{range_start:06X}_NONE"
|
|
self.enum_member_name_max = f"LIMB_{file.name.upper()}_{range_start:06X}_MAX"
|
|
self.limbs_array_resource = None
|
|
|
|
def set_enum_name(self, enum_name: str):
|
|
self.enum_name = enum_name
|
|
|
|
def set_enum_member_name_none(self, enum_member_name_none: str):
|
|
self.enum_member_name_none = enum_member_name_none
|
|
|
|
def set_enum_member_name_max(self, enum_member_name_max: str):
|
|
self.enum_member_name_max = enum_member_name_max
|
|
|
|
def try_parse_data(self, memory_context):
|
|
if self.limbs_array_resource is None:
|
|
ret = super().try_parse_data(memory_context)
|
|
assert ret == RESOURCE_PARSE_SUCCESS
|
|
data = self.get_skeleton_header_cdata_unpacked()
|
|
segment_resolve_result = memory_context.resolve_segmented(data["segment"])
|
|
self.limbs_array_resource = segment_resolve_result.get_resource(
|
|
self.limbs_array_type
|
|
)
|
|
if self.limbs_array_resource.limbs is None:
|
|
raise ResourceParseInProgress(
|
|
new_progress_done=["reported limbs array"],
|
|
waiting_for=["self.limbs_array_resource.limbs"],
|
|
)
|
|
else:
|
|
if self.limbs_array_resource.limbs is None:
|
|
raise ResourceParseWaiting(
|
|
waiting_for=["self.limbs_array_resource.limbs"],
|
|
)
|
|
for limb in self.limbs_array_resource.limbs:
|
|
limb.skeleton_resource = self
|
|
return RESOURCE_PARSE_SUCCESS
|
|
|
|
def write_c_declaration(self, h):
|
|
h.write(f"typedef enum {self.enum_name} {{\n")
|
|
limb_enum_members = (
|
|
self.enum_member_name_none,
|
|
*(limb.enum_member_name for limb in self.limbs_array_resource.limbs),
|
|
self.enum_member_name_max,
|
|
)
|
|
h.write(
|
|
",\n".join(
|
|
f" /* {i:2} */ {enum_member}"
|
|
for i, enum_member in enumerate(limb_enum_members)
|
|
)
|
|
+ "\n"
|
|
)
|
|
h.write(f"}} {self.enum_name};\n")
|
|
super().write_c_declaration(h)
|
|
return True
|
|
|
|
@abc.abstractmethod
|
|
def get_skeleton_header_cdata_unpacked(self) -> dict: ...
|
|
|
|
|
|
class SkeletonResourceABC(SkeletonResourceBaseABC):
|
|
|
|
def report_segment(resource, memory_context: "MemoryContext", v):
|
|
assert isinstance(v, int)
|
|
address = v
|
|
resource_limbs = memory_context.report_resource_at_segmented(
|
|
resource,
|
|
address,
|
|
resource.limbs_array_type,
|
|
lambda file, offset: resource.limbs_array_type(
|
|
file,
|
|
offset,
|
|
f"{resource.name}_{address:08X}_Limbs",
|
|
),
|
|
)
|
|
resource_limbs.set_length(
|
|
resource.get_skeleton_header_cdata_unpacked()["limbCount"]
|
|
)
|
|
|
|
def write_segment(
|
|
resource, memory_context: "MemoryContext", v, wctx: CDataExtWriteContext
|
|
):
|
|
assert isinstance(v, int)
|
|
address = v
|
|
wctx.f.write(wctx.line_prefix)
|
|
wctx.f.write(memory_context.get_c_reference_at_segmented(address))
|
|
return True
|
|
|
|
def write_limbCount(
|
|
resource, memory_context: "MemoryContext", v, wctx: CDataExtWriteContext
|
|
):
|
|
wctx.f.write(wctx.line_prefix)
|
|
wctx.f.write(
|
|
memory_context.get_c_expression_length_at_segmented(
|
|
resource.get_skeleton_header_cdata_unpacked()["segment"]
|
|
)
|
|
)
|
|
return True
|
|
|
|
cdata_ext = CDataExt_Struct(
|
|
(
|
|
(
|
|
"segment",
|
|
CDataExt_Value("I").set_report(report_segment).set_write(write_segment),
|
|
),
|
|
(
|
|
"limbCount",
|
|
CDataExt_Value("B").set_write(write_limbCount),
|
|
),
|
|
("pad5", CDataExt_Value.pad8),
|
|
("pad6", CDataExt_Value.pad16),
|
|
)
|
|
)
|
|
|
|
def get_skeleton_header_cdata_unpacked(self):
|
|
return self.cdata_unpacked
|
|
|
|
def get_c_reference(self, resource_offset: int):
|
|
if resource_offset == 0:
|
|
return f"&{self.symbol_name}"
|
|
else:
|
|
raise ValueError()
|
|
|
|
def get_c_declaration_base(self):
|
|
return f"SkeletonHeader {self.symbol_name}"
|
|
|
|
def get_c_includes(self):
|
|
return ("array_count.h",)
|
|
|
|
def get_h_includes(self):
|
|
return ("z64animation.h",)
|
|
|
|
|
|
class SkeletonNormalResource(SkeletonResourceABC):
|
|
limbs_array_type = StandardLimbsArrayResource
|
|
|
|
|
|
class SkeletonNormalLODResource(SkeletonResourceABC):
|
|
limbs_array_type = LODLimbsArrayResource
|
|
|
|
|
|
class SkeletonFlexResourceABC(SkeletonResourceBaseABC):
|
|
skeleton_type: type[SkeletonResourceABC]
|
|
|
|
# For SkeletonResourceABC.report_segment
|
|
@property
|
|
def limbs_array_type(self):
|
|
return self.skeleton_type.limbs_array_type
|
|
|
|
def __init__(self, file, range_start, name):
|
|
self.cdata_ext = CDataExt_Struct(
|
|
(
|
|
("sh", self.skeleton_type.cdata_ext),
|
|
("dListCount", CDataExt_Value.u8),
|
|
("pad9", CDataExt_Value.pad8),
|
|
("pad10", CDataExt_Value.pad16),
|
|
)
|
|
)
|
|
super().__init__(file, range_start, name)
|
|
|
|
def get_skeleton_header_cdata_unpacked(self):
|
|
return self.cdata_unpacked["sh"]
|
|
|
|
def get_c_reference(self, resource_offset: int):
|
|
if resource_offset == 0:
|
|
return f"&{self.symbol_name}"
|
|
else:
|
|
raise ValueError()
|
|
|
|
def get_c_declaration_base(self):
|
|
return f"FlexSkeletonHeader {self.symbol_name}"
|
|
|
|
def get_c_includes(self):
|
|
return ("array_count.h",)
|
|
|
|
def get_h_includes(self):
|
|
return ("z64animation.h",)
|
|
|
|
|
|
class SkeletonFlexResource(SkeletonFlexResourceABC):
|
|
skeleton_type = SkeletonNormalResource
|
|
|
|
|
|
class SkeletonFlexLODResource(SkeletonFlexResourceABC):
|
|
skeleton_type = SkeletonNormalLODResource
|