[OoT] Fix include reading for DL imports (Fast-64#691)

Author: Dragorn421

fast64_internal/z64/animation/importer/functions.py

@@ -69,7 +69,7 @@ def ootImportNonLinkAnimationC(armatureObj, filepath, animName, actorScale, isCu
     animData = getImportData([filepath])
     if not isCustomImport:
         basePath = bpy.path.abspath(bpy.context.scene.ootDecompPath)
-        animData = ootGetIncludedAssetData(basePath, [filepath], animData) + animData
+        animData = ootGetIncludedAssetData([basePath], [filepath], animData) + animData
 
     matchResult = re.search(re.escape(animName) + r"\s*=\s*\{(.*?)\}\s*;", animData, re.DOTALL | re.MULTILINE)
 
@@ -195,8 +195,8 @@ def ootImportLinkAnimationC(
     animData = getImportData([animFilepath])
     if not isCustomImport:
         basePath = bpy.path.abspath(bpy.context.scene.ootDecompPath)
-        animHeaderData = ootGetIncludedAssetData(basePath, [animHeaderFilepath], animHeaderData) + animHeaderData
-        animData = ootGetIncludedAssetData(basePath, [animFilepath], animData) + animData
+        animHeaderData = ootGetIncludedAssetData([basePath], [animHeaderFilepath], animHeaderData) + animHeaderData
+        animData = ootGetIncludedAssetData([basePath], [animFilepath], animData) + animData
 
     matchResult = re.search(
         re.escape(animHeaderName) + r"\s*=\s*\{(.*?)\}\s*;", animHeaderData, re.DOTALL | re.MULTILINE

fast64_internal/z64/f3d/operators.py

@@ -172,7 +172,17 @@ def execute(self, context):
 
             scale = None
             if not isCustomImport:
-                filedata = ootGetIncludedAssetData(basePath, paths, filedata) + filedata
+                filedata = (
+                    ootGetIncludedAssetData(
+                        [
+                            basePath,
+                            str(Path(basePath) / context.scene.fast64.oot.get_extracted_path()),
+                        ],
+                        paths,
+                        filedata,
+                    )
+                    + filedata
+                )
 
                 if overlayName is not None:
                     ootReadTextureArrays(basePath, overlayName, name, f3dContext, False, flipbookArrayIndex2D)

fast64_internal/z64/model_classes.py

@@ -42,15 +42,23 @@
 
 
 # read included asset data
-def ootGetIncludedAssetData(basePath: str, currentPaths: list[str], data: str) -> str:
+def ootGetIncludedAssetData(basePaths: list[str], currentPaths: list[str], data: str) -> str:
     includeData = ""
     searchedPaths = currentPaths[:]
 
     print("Included paths:")
 
     # search assets
     for includeMatch in re.finditer(r"\#include\s*\"(assets/objects/(.*?)\.h)\"", data):
-        h_p = Path(basePath) / includeMatch.group(1)
+        h_p = None
+        for basePath in basePaths:
+            candidate_h_p = Path(basePath) / includeMatch.group(1)
+            if candidate_h_p.exists():
+                h_p = candidate_h_p
+                break
+        if h_p is None:
+            print("Could not find included file:", includeMatch.group(1))
+            continue
         print("", str(h_p))
         includeData += getImportData([str(h_p)]) + "\n"
         for path_p in h_p.parent.glob("*.c"):

fast64_internal/z64/skeleton/importer/functions.py

@@ -316,7 +316,7 @@ def ootImportSkeletonC(basePath: str, importSettings: OOTSkeletonImportSettings)
 
     skeletonData = getImportData(filepaths)
     if overlayName is not None or isLink:
-        skeletonData = ootGetIncludedAssetData(basePath, filepaths, skeletonData) + skeletonData
+        skeletonData = ootGetIncludedAssetData([basePath], filepaths, skeletonData) + skeletonData
 
     skel_info = ootGetSkeleton(skeletonData, skeletonName, False)
     assert skel_info is not None

fast64_internal/z64/texture_array.py

@@ -29,7 +29,7 @@ def ootReadTextureArrays(
     else:
         actorData = ootGetLinkData(basePath)
         currentPaths = [os.path.join(basePath, f"src/code/z_player_lib.c")]
-    actorData = ootGetIncludedAssetData(basePath, currentPaths, actorData) + actorData
+    actorData = ootGetIncludedAssetData([basePath], currentPaths, actorData) + actorData
 
     actorData = removeComments(actorData)