Fix individual DL export

HarbourMasters · Jul 8, 2024 · 8859794 · 8859794
1 parent 10b9bd2
commit 8859794
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/fast64_internal/oot/f3d/operators.py b/fast64_internal/oot/f3d/operators.py
@@ -4,7 +4,7 @@
 from bpy.path import abspath
 from bpy.utils import register_class, unregister_class
 from mathutils import Matrix
-from ...utility import CData, PluginError, raisePluginError, writeCData, toAlnum
+from ...utility import CData, PluginError, raisePluginError, writeCData, writeXMLData, toAlnum
 from ...f3d.f3d_parser import importMeshC, getImportData
 from ...f3d.f3d_gbi import DLFormat, F3D, TextureExportSettings, ScrollMethod, get_F3D_GBI
 from ...f3d.f3d_writer import TriangleConverterInfo, removeDL, saveStaticModel, getInfoDict
@@ -31,7 +31,6 @@ def ootConvertMeshToC(
     DLFormat: DLFormat,
     saveTextures: bool,
     settings: OOTDLExportSettings,
-    logging_func,
 ):
     folderName = settings.folder
     exportPath = bpy.path.abspath(settings.customPath)
@@ -157,35 +156,28 @@ def ootConvertMeshToXML(
         raise Exception(str(e))
 
     logging_func(
-        {"INFO"}, "ootConvertMeshToXML 9 exportPath=" + (str(exportPath) if exportPath is not None else "None")
+        {"INFO"}, "ootConvertMeshToXML 9.1 exportPath=" + (str(exportPath) if exportPath is not None else "None")
     )
     logging_func(
         {"INFO"},
-        "ootConvertMeshToXML 9 settings.customAssetIncludeDir="
+        "ootConvertMeshToXML 9.2 settings.customAssetIncludeDir="
         + (str(settings.customAssetIncludeDir) if settings.customAssetIncludeDir is not None else "None"),
     )
 
     path = ootGetPath(exportPath, isCustomExport, "assets/objects/", folderName, False, True)
 
-    logging_func({"INFO"}, "ootConvertMeshToXML 10 path=" + (str(path) if path is not None else "None"))
+    logging_func({"INFO"}, "ootConvertMeshToXML 10.1 path=" + (str(path) if path is not None else "None"))
+    logging_func({"INFO"}, "ootConvertMeshToXML 10.2 folderName=" + (str(folderName) if folderName is not None else "None"))
 
-    includeDir = settings.customAssetIncludeDir if settings.isCustom else f"assets/objects/{folderName}"
+    data = fModel.to_soh_xml(exportPath, folderName, logging_func)
 
     logging_func({"INFO"}, "ootConvertMeshToXML 11")
 
-    data = fModel.to_soh_xml(path, path, logging_func)
-
-    logging_func({"INFO"}, "ootConvertMeshToXML 12")
-
     if isCustomExport:
         textureArrayData = writeTextureArraysNewXML(fModel, flipbookArrayIndex2D)
-        data.append(textureArrayData)
-
-    logging_func({"INFO"}, "ootConvertMeshToXML 13")
+        data += textureArrayData
 
-    writeXMLData(data, os.path.join(path, name + ".xml"))
-
-    logging_func({"INFO"}, "ootConvertMeshToXML 14")
+    logging_func({"INFO"}, "ootConvertMeshToXML 12")
 
 
 def writeTextureArraysNewXML(fModel: OOTModel, arrayIndex: int):