custom dl name export

Author: Jameriquiah

fast64_internal/z64/f3d/operators.py

@@ -14,7 +14,7 @@
 from ...f3d.f3d_parser import importMeshC, getImportData
 from ...f3d.f3d_gbi import DLFormat, TextureExportSettings, ScrollMethod, get_F3D_GBI
 from ...f3d.f3d_writer import TriangleConverterInfo, removeDL, saveStaticModel, getInfoDict
-from ..utility import ootGetObjectPath, ootGetObjectHeaderPath, getOOTScale
+from ..utility import ootGetObjectPath, ootGetObjectHeaderPath, getOOTScale, checkEmptyName
 from ..model_classes import OOTF3DContext, ootGetIncludedAssetData
 from ..texture_array import ootReadTextureArrays
 from ..model_classes import OOTModel, OOTGfxFormatter
@@ -72,11 +72,22 @@ def resolve_custom_export_base(settings: "OOTDLExportSettings") -> str:
     return base_path
 
 
-def resolve_custom_export_folder(base_path: str, folder_name: str) -> str:
-    folder_path = os.path.join(base_path, folder_name)
-    if not os.path.exists(folder_path):
-        os.makedirs(folder_path, exist_ok=True)
-    return folder_path
+def resolve_custom_export_folder(base_path: str, folder_name: str) -> str:
+    folder_path = os.path.join(base_path, folder_name)
+    if not os.path.exists(folder_path):
+        os.makedirs(folder_path, exist_ok=True)
+    return folder_path
+
+
+def resolve_dl_export_name(originalObj: bpy.types.Object, settings: "OOTDLExportSettings") -> str:
+    if settings.useCustomDLName:
+        custom_name = (settings.customDLName or "").strip()
+        checkEmptyName(custom_name)
+        name = toAlnum(custom_name)
+        checkEmptyName(name)
+        return name
+
+    return toAlnum(originalObj.name)
 
 
 class OOTF3DGfxFormatter(OOTGfxFormatter):
@@ -99,7 +110,7 @@ def ootConvertMeshToC(
     exportPath = resolve_custom_export_base(settings)
     isCustomExport = settings.isCustom
     removeVanillaData = settings.removeVanillaData
-    name = toAlnum(originalObj.name)
+    name = resolve_dl_export_name(originalObj, settings)
     overlayName = settings.actorOverlayName
     flipbookUses2DArray = settings.flipbookUses2DArray
     flipbookArrayIndex2D = settings.flipbookArrayIndex2D if flipbookUses2DArray else None
@@ -170,7 +181,7 @@ def ootConvertMeshToXML(
     folderName = settings.folder
     exportPath = resolve_custom_export_base(settings)
     isCustomExport = settings.isCustom
-    name = toAlnum(originalObj.name)
+    name = resolve_dl_export_name(originalObj, settings)
     overlayName = settings.actorOverlayName
     flipbookUses2DArray = settings.flipbookUses2DArray
     flipbookArrayIndex2D = settings.flipbookArrayIndex2D if flipbookUses2DArray else None

fast64_internal/z64/f3d/properties.py

@@ -59,6 +59,10 @@ class OOTDLExportSettings(PropertyGroup):
         name="Use Custom Filename", description="Override filename instead of basing it off of the Blender name"
     )
     filename: StringProperty(name="Filename")
+    useCustomDLName: BoolProperty(
+        name="Use Custom DL Name", description="Use a custom DL name instead of the object name"
+    )
+    customDLName: StringProperty(name="DL Name")
     folder: StringProperty(name="DL Folder", default="objects/gameplay_keep")
     customPath: StringProperty(name="Custom DL Path", subtype="FILE_PATH")
     isCustom: BoolProperty(
@@ -77,6 +81,9 @@ class OOTDLExportSettings(PropertyGroup):
       )
 
     def draw_props(self, layout: UILayout, context: bpy.types.Context | None = None):
+          layout.prop(self, "useCustomDLName")
+          if self.useCustomDLName:
+              prop_split(layout, self, "customDLName", "DL Name")
           prop_split(layout, self, "folder", "Internal Path")
           prop_split(layout, self, "customPath", "Path")
           prop_split(layout, self, "actorOverlayName", "Overlay (Optional)")