cleanup and fixes (HarbourMasters#43)

Author: Jameriquiah

__init__.py

@@ -1,5 +1,4 @@
 import bpy
-
 from bpy.utils import register_class, unregister_class
 from bpy.path import abspath
 
@@ -27,7 +26,8 @@
 from .fast64_internal.z64.actor.properties import initOOTActorProperties
 from .fast64_internal.utility_anim import utility_anim_register, utility_anim_unregister, ArmatureApplyWithMeshOperator
 
-from .fast64_internal.mk64 import MK64_Properties, mk64_register, mk64_unregister
+from .fast64_internal.mk64 import mk64_register, mk64_unregister
+from .fast64_internal.mk64.mk64_properties import MK64_ObjectProperties, MK64_Properties
 from .fast64_internal.mk64.mk64_constants import mk64_world_defaults
 
 from .fast64_internal.f3d.f3d_gbi import get_F3D_GBI
@@ -72,7 +72,7 @@
     "version": (2, 5, 3),
     "author": "kurethedead",
     "location": "3DView",
-    "description": "Plugin for exporting F3D display lists and other game data related to Nintendo 64 games. Modified for HM64 Ship of Harkinian.",
+    "description": "Plugin for exporting F3D display lists and other game data related to Nintendo 64 games.",
     "category": "Import-Export",
     "blender": (3, 2, 0),
 }
@@ -291,7 +291,7 @@ class Fast64_ObjectProperties(bpy.types.PropertyGroup):
 
     sm64: bpy.props.PointerProperty(type=SM64_ObjectProperties, name="SM64 Object Properties")
     oot: bpy.props.PointerProperty(type=OOT_ObjectProperties, name="Z64 Object Properties")
-    mk64: bpy.props.PointerProperty(type=MK64_ObjectProperties, name="MK64 Object Properties")
+    mk64: bpy.props.PointerProperty(type=MK64_Properties, name="MK64 Object Properties")
 
 
 class Fast64_CurveProperties(bpy.types.PropertyGroup):
@@ -300,7 +300,7 @@ class Fast64_CurveProperties(bpy.types.PropertyGroup):
     All new object properties should be children of this property group.
     """
 
-    mk64: bpy.props.PointerProperty(type=MK64_ObjectProperties, name="MK64 Curve Properties")
+    mk64: bpy.props.PointerProperty(type=MK64_Properties, name="MK64 Curve Properties")
 
 
 class UpgradeF3DMaterialsDialog(bpy.types.Operator):

addon_updater_ops.py

@@ -1523,7 +1523,7 @@ def register(bl_info):
     # Note: updater.include_branch_list defaults to ['master'] branch if set to
     # none. Example targeting another multiple branches allowed to pull from:
     # updater.include_branch_list = ['master', 'dev']
-    updater.include_branch_list = ["hm64"]
+    updater.include_branch_list = ["main"]
 
     # Only allow manual install, thus prompting the user to open
     # the addon's web page to download, specifically: updater.website

fast64_internal/f3d/f3d_gbi.py

@@ -8,7 +8,6 @@
 import struct
 import re
 import bpy, os, enum, copy
-from struct import pack
 
 from ..utility import *
 
@@ -2688,7 +2687,6 @@ def addMesh(
         self.meshes[final_name] = mesh = FMesh(final_name, self.DLFormat)
         self.onAddMesh(mesh, contextObj)
         return mesh
->>>>>>> hm64
 
     def onAddMesh(self, fMesh, contextObj):
         return
@@ -5084,7 +5082,6 @@ def to_binary(self, f3d, segments):
             words = _SHIFTL(f3d.G_CLEARGEOMETRYMODE, 24, 8), word
             return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
-
     def to_soh_xml(self, objectPath=""):
         if not self.flagList:
             return "<ClearGeometryMode/>"
@@ -6525,5 +6522,5 @@ def to_soh_xml(self):
     DPLoadTLUT_pal16,
     DPLoadTLUT_pal256,
     DPLoadTLUT,
-]
-
+]
+

fast64_internal/f3d/f3d_writer.py

@@ -1888,6 +1888,7 @@ def removeDL(sourcePath, headerPath, DLName):
     if DLDataH != originalDataH:
         writeFile(headerPath, DLDataH)
 
+
 class Fast64_DLRedirectPanel(bpy.types.Panel):
     bl_idname = "FAST64_PT_f3d_redirect"
     bl_label = "F3D Exporter"
@@ -1924,5 +1925,5 @@ def f3d_writer_unregister():
 
     del bpy.types.Scene.DLTexDir
     del bpy.types.Scene.DLExportPath
-    del bpy.types.Scene.matWriteMethod
-
+    del bpy.types.Scene.matWriteMethod
+

fast64_internal/utility.py

@@ -264,6 +264,7 @@ def parentObject(parent, child):
     setActiveObject(parent)
     bpy.ops.object.parent_set(type="OBJECT", keep_transform=True)
 
+
 def getFMeshName(
     fModel,
     vertexGroup,

fast64_internal/z64/__init__.py

@@ -77,11 +77,13 @@
     oot_operator_unregister,
 )
 
+
 feature_set_enum = (
     ("default", "Default", "Default"),
     ("hackeroot", "HackerOoT", "HackerOoT"),
 )
 
+
 oot_versions_items = [
     ("Custom", "Custom", "Custom", 0),
     ("ntsc-1.0", "ntsc-1.0", "ntsc-1.0", 11),

fast64_internal/z64/exporter/skeleton/classes.py

@@ -2,7 +2,7 @@
 import os
 
 from ....f3d.f3d_writer import GfxList
-from ....utility import CData, toAlnum
+from ....utility import CData, toAlnum, writeXMLData
 
 
 class OOTSkeleton:

fast64_internal/z64/exporter/skeleton/functions.py

@@ -229,119 +229,6 @@ def ootConvertArmatureToSkeletonWithMesh(
     )
 
 
-def ootConvertArmatureToXML(
-    originalArmatureObj: bpy.types.Object,
-    convertTransformMatrix: mathutils.Matrix,
-    DLFormat: DLFormat,
-    savePNG: bool,
-    drawLayer: str,
-    settings: OOTSkeletonExportSettings,
-    logging_func,
-):
-    logging_func({"INFO"}, "ootConvertArmatureToXML 0")
-
-    if settings.mode != "Generic" and not settings.isCustom:
-        importInfo = ootSkeletonImportDict[settings.mode]
-        skeletonName = importInfo.skeletonName
-        folderName = importInfo.folderName
-        overlayName = importInfo.actorOverlayName
-        flipbookUses2DArray = importInfo.flipbookArrayIndex2D is not None
-        flipbookArrayIndex2D = importInfo.flipbookArrayIndex2D
-        isLink = importInfo.isLink
-    else:
-        skeletonName = toAlnum(originalArmatureObj.name)
-        folderName = settings.customAssetIncludeDir
-        overlayName = settings.actorOverlayName if not settings.isCustom else None
-        flipbookUses2DArray = settings.flipbookUses2DArray
-        flipbookArrayIndex2D = settings.flipbookArrayIndex2D if flipbookUses2DArray else None
-        isLink = False
-
-    logging_func(
-        {"INFO"}, "ootConvertArmatureToXML 1 skeletonName = " + (skeletonName if skeletonName is not None else "<None>")
-    )
-
-    exportPath = bpy.path.abspath(settings.customPath)
-    isCustomExport = settings.isCustom
-    removeVanillaData = settings.removeVanillaData
-    optimize = settings.optimize
-    fModel = OOTModel(skeletonName, DLFormat, drawLayer)
-    logging_func({"INFO"}, "ootConvertArmatureToXML 1.5")
-    skeleton, fModel = ootConvertArmatureToSkeletonWithMesh(
-        originalArmatureObj, convertTransformMatrix, fModel, skeletonName, not savePNG, drawLayer, optimize
-    )
-
-    logging_func({"INFO"}, "ootConvertArmatureToXML 2")
-
-    if originalArmatureObj.ootSkeleton.LOD is not None:
-        lodSkeleton, fModel = ootConvertArmatureToSkeletonWithMesh(
-            originalArmatureObj.ootSkeleton.LOD,
-            convertTransformMatrix,
-            fModel,
-            skeletonName + "_lod",
-            not savePNG,
-            drawLayer,
-            optimize,
-        )
-    else:
-        lodSkeleton = None
-
-    logging_func({"INFO"}, "ootConvertArmatureToXML 3")
-
-    if lodSkeleton is not None:
-        skeleton.hasLOD = True
-        limbList = skeleton.createLimbList()
-        lodLimbList = lodSkeleton.createLimbList()
-
-        if len(limbList) != len(lodLimbList):
-            raise PluginError(
-                originalArmatureObj.name
-                + " cannot use "
-                + originalArmatureObj.ootSkeleton.LOD.name
-                + "as LOD because they do not have the same bone structure."
-            )
-
-        for i in range(len(limbList)):
-            limbList[i].lodDL = lodLimbList[i].DL
-            limbList[i].isFlex |= lodLimbList[i].isFlex
-
-    # data = CData()
-    # data.source += '#include "ultra64.h"\n#include "global.h"\n'
-    # if not isCustomExport:
-    # data.source += '#include "' + folderName + '.h"\n\n'
-    # else:
-    # data.source += "\n"
-
-    data = ""
-
-    logging_func({"INFO"}, "ootConvertArmatureToXML 4")
-
-    path = ootGetPath(exportPath, isCustomExport, "assets/objects/", folderName, False, True)
-    logging_func({"INFO"}, "ootConvertArmatureToXML 4.1")
-    exportData = fModel.to_xml(path, settings.customAssetIncludeDir, logging_func)
-    logging_func({"INFO"}, "ootConvertArmatureToXML 4.2")
-    skeletonXML = skeleton.toXML(path, settings.customAssetIncludeDir)
-    logging_func({"INFO"}, "ootConvertArmatureToXML 4.3")
-
-    data += exportData
-    data += skeletonXML
-
-    # if isCustomExport:
-    #    textureArrayData = writeTextureArraysNew(fModel, flipbookArrayIndex2D)
-    #    data.append(textureArrayData)
-
-    logging_func({"INFO"}, "ootConvertArmatureToXML 5")
-
-    writeXMLData(data, os.path.join(path, skeletonName))
-
-    logging_func({"INFO"}, "ootConvertArmatureToXML 6")
-
-    # if not isCustomExport:
-    #    writeTextureArraysExisting(bpy.context.scene.ootDecompPath, overlayName, isLink, flipbookArrayIndex2D, fModel)
-    #    addIncludeFiles(folderName, path, skeletonName)
-    #    if removeVanillaData:
-    #        ootRemoveSkeleton(path, folderName, skeletonName)
-
-
 def ootConvertArmatureToC(
     originalArmatureObj: bpy.types.Object,
     convertTransformMatrix: mathutils.Matrix,

fast64_internal/z64/scene/operators.py

@@ -142,6 +142,7 @@ def execute(self, context):
                 settings = context.scene.ootSceneExportSettings
                 levelName = settings.name
                 option = settings.option
+
                 bootOptions = context.scene.fast64.oot.bootupSceneOptions
                 is_hackeroot_features = is_hackeroot()
 

fast64_internal/z64/scene/panels.py

@@ -37,6 +37,7 @@ def draw(self, context):
         if not settings.customExport:
             self.drawSceneSearchOp(exportBox, settings.option, "Export")
         settings.draw_props(exportBox)
+
         exportBox.operator(OOT_ExportScene.bl_idname)
 
         # Scene Importer