[OOT/MM] Rename OoT to Z64 and remove the OoT prefix from the files (#540)

* `fast64_internal/oot` -> `fast64_internal/z64`

* remove oot prefix (and delete `oot_spline.py`)

* remove another useless file

* load issues

__init__.py

@@ -19,10 +19,10 @@ from .fast64_internal.sm64.settings.properties import SM64_Properties
 from .fast64_internal.sm64.sm64_geolayout_bone import SM64_BoneProperties
 from .fast64_internal.sm64.sm64_objects import SM64_ObjectProperties
 
-from .fast64_internal.oot import OOT_Properties, oot_register, oot_unregister
-from .fast64_internal.oot.oot_constants import oot_world_defaults
-from .fast64_internal.oot.props_panel_main import OOT_ObjectProperties
-from .fast64_internal.oot.actor.properties import initOOTActorProperties
+from .fast64_internal.z64 import OOT_Properties, oot_register, oot_unregister
+from .fast64_internal.z64.constants import oot_world_defaults
+from .fast64_internal.z64.props_panel_main import OOT_ObjectProperties
+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

fast64_internal/__init__.py

@@ -1,5 +0,0 @@
-from .f3d_material_converter import *
-from .f3d import *
-from .sm64 import *
-from .oot import *  # is this really needed?
-from .panels import *

fast64_internal/oot/oot_spline.py

@@ -1,38 +0,0 @@
-import bpy
-from ..utility import PluginError, toAlnum
-
-
-class OOTPath:
-    def __init__(self, ownerName, objName: str):
-        self.ownerName = toAlnum(ownerName)
-        self.objName = objName
-        self.points = []
-
-    def pathName(self, headerIndex, index):
-        return f"{self.ownerName}_pathwayList{index}_header{headerIndex}"
-
-
-def ootConvertPath(name, obj, transformMatrix):
-    path = OOTPath(name, obj.name)
-
-    spline = obj.data.splines[0]
-    for point in spline.points:
-        position = transformMatrix @ point.co.xyz
-        path.points.append(position)
-
-    return path
-
-
-def onSplineTypeSet(self, context):
-    self.splines.active.order_u = 1
-
-
-def assertCurveValid(obj):
-    curve = obj.data
-    if not isinstance(curve, bpy.types.Curve) or curve.splines[0].type != "NURBS":
-        # Curve was likely not intended to be exported
-        return False
-    if len(curve.splines) != 1:
-        # Curve was intended to be exported but has multiple disconnected segments
-        raise PluginError("Exported curves should have only one single segment, found " + str(len(curve.splines)))
-    return True

fast64_internal/z64/__init__.py

@@ -12,7 +12,7 @@ from .scene.panels import scene_panels_register, scene_panels_unregister
 from .props_panel_main import oot_obj_panel_register, oot_obj_panel_unregister, oot_obj_register, oot_obj_unregister
 from .skeleton.properties import OOTSkeletonImportSettings, OOTSkeletonExportSettings
 from .collection_utility import collections_register, collections_unregister
-from .oot_utility import setAllActorsVisibility
+from .utility import setAllActorsVisibility
 from .file_settings import file_register, file_unregister
 from .collision.properties import OOTCollisionExportSettings
 

fast64_internal/z64/actor/operators.py

@@ -3,7 +3,7 @@ from bpy.types import Operator
 from bpy.props import EnumProperty, StringProperty
 from bpy.utils import register_class, unregister_class
 from ...utility import PluginError
-from ..oot_constants import ootData
+from ..constants import ootData
 
 
 class OOT_SearchChestContentEnumOperator(Operator):

fast64_internal/z64/actor/properties.py

@@ -4,8 +4,8 @@ from bpy.types import Object, PropertyGroup, UILayout
 from bpy.utils import register_class, unregister_class
 from bpy.props import EnumProperty, StringProperty, IntProperty, BoolProperty, CollectionProperty, PointerProperty
 from ...utility import PluginError, prop_split, label_split
-from ..oot_constants import ootData, ootEnumCamTransition
-from ..oot_upgrade import upgradeActors
+from ..constants import ootData, ootEnumCamTransition
+from ..upgrade import upgradeActors
 from ..scene.properties import OOTAlternateSceneHeaderProperty
 from ..room.properties import OOTAlternateRoomHeaderProperty
 from ..collection_utility import drawAddButton, drawCollectionOps
@@ -15,7 +15,7 @@ from .operators import (
     OOT_SearchNaviMsgIDEnumOperator,
 )
 
-from ..oot_utility import (
+from ..utility import (
     getRoomObj,
     getEnumName,
     drawEnumWithCustom,

fast64_internal/z64/animation/importer/functions.py

@@ -4,7 +4,7 @@ import re
 import math
 from ....utility import PluginError, hexOrDecInt, get_include_data, removeComments
 from ....f3d.f3d_parser import getImportData
-from ...oot_model_classes import ootGetIncludedAssetData
+from ...model_classes import ootGetIncludedAssetData
 
 from ....utility_anim import (
     getTranslationRelativeToRest,
@@ -12,7 +12,7 @@ from ....utility_anim import (
     stashActionInArmature,
 )
 
-from ...oot_utility import (
+from ...utility import (
     getStartBone,
     getNextBone,
 )

fast64_internal/z64/animation/operators.py

@@ -8,7 +8,7 @@ from .properties import OOTAnimExportSettingsProperty, OOTAnimImportSettingsProp
 from ..exporter.animation import ootExportLinkAnimation, ootExportNonLinkAnimation
 from .importer import ootImportLinkAnimationC, ootImportNonLinkAnimationC
 
-from ..oot_utility import (
+from ..utility import (
     ootGetPath,
     addIncludeFiles,
     checkEmptyName,

fast64_internal/z64/collision/operators.py

@@ -4,7 +4,7 @@ from bpy.ops import object
 from mathutils import Matrix
 
 from ...utility import PluginError, raisePluginError
-from ..oot_utility import getOOTScale
+from ..utility import getOOTScale
 from ..exporter.collision import CollisionHeader
 from .properties import OOTCollisionExportSettings
 

fast64_internal/z64/collision/properties.py

@@ -3,8 +3,8 @@ from bpy.props import StringProperty, PointerProperty, IntProperty, EnumProperty
 from bpy.types import PropertyGroup, Camera, Object, Material, UILayout
 from bpy.utils import register_class, unregister_class
 from ...utility import prop_split
-from ..oot_utility import drawEnumWithCustom
-from ..oot_constants import ootEnumSceneID
+from ..utility import drawEnumWithCustom
+from ..constants import ootEnumSceneID
 from .constants import (
     ootEnumFloorSetting,
     ootEnumWallSetting,

fast64_internal/z64/cutscene/classes.py

@@ -3,7 +3,7 @@ import bpy
 from dataclasses import dataclass, field
 from bpy.types import Object
 from typing import Optional
-from ..oot_constants import ootData
+from ..constants import ootData
 from .motion.utility import getBlenderPosition, getBlenderRotation, getRotation, getInteger
 
 

fast64_internal/z64/cutscene/constants.py

@@ -1,4 +1,4 @@
-from ..oot_constants import ootData
+from ..constants import ootData
 from .classes import (
     CutsceneCmdActorCueList,
     CutsceneCmdActorCue,

fast64_internal/z64/cutscene/motion/operators.py

@@ -6,7 +6,7 @@ from bpy.props import StringProperty, EnumProperty, BoolProperty
 import mathutils
 from dataclasses import dataclass
 from ....utility import PluginError
-from ...oot_constants import ootData
+from ...constants import ootData
 from ..classes import CutsceneObjectFactory
 from ..constants import ootEnumCSActorCueListCommandType
 from ..preview import initFirstFrame, setupCompositorNodes

fast64_internal/z64/cutscene/motion/properties.py

@@ -3,9 +3,9 @@ import bpy
 from bpy.types import PropertyGroup, Object, UILayout, Armature, Bone, Scene, EditBone
 from bpy.props import IntProperty, StringProperty, PointerProperty, EnumProperty, FloatProperty
 from bpy.utils import register_class, unregister_class
-from ...oot_upgrade import upgradeCutsceneMotion
-from ...oot_utility import getEnumName
-from ...oot_constants import ootData
+from ...upgrade import upgradeCutsceneMotion
+from ...utility import getEnumName
+from ...constants import ootData
 from ..constants import ootEnumCSMotionCamMode, ootEnumCSActorCueListCommandType
 
 from .operators import (

fast64_internal/z64/cutscene/motion/utility.py

@@ -4,7 +4,7 @@ from struct import unpack
 from bpy.types import Object, Bone, Context, EditBone, Armature
 from mathutils import Vector
 from ....utility import yUpToZUp
-from ...oot_utility import ootParseRotation
+from ...utility import ootParseRotation
 
 
 class BoneData:

fast64_internal/z64/cutscene/operators.py

@@ -7,7 +7,7 @@ from bpy.types import Scene, Operator, Object
 from bpy.utils import register_class, unregister_class
 from ...utility import PluginError, raisePluginError
 from ..collection_utility import getCollection
-from ..oot_constants import ootData
+from ..constants import ootData
 from .constants import ootEnumCSTextboxType, ootEnumCSListType
 from .importer import importCutsceneData
 from ..exporter.cutscene import Cutscene

fast64_internal/z64/cutscene/properties.py

@@ -3,9 +3,9 @@ from bpy.props import StringProperty, EnumProperty, IntProperty, BoolProperty, C
 from bpy.utils import register_class, unregister_class
 from ...utility import PluginError, prop_split
 from ..collection_utility import OOTCollectionAdd, drawCollectionOps
-from ..oot_utility import getEnumName
-from ..oot_constants import ootData
-from ..oot_upgrade import upgradeCutsceneSubProps, upgradeCSListProps, upgradeCutsceneProperty
+from ..utility import getEnumName
+from ..constants import ootData
+from ..upgrade import upgradeCutsceneSubProps, upgradeCSListProps, upgradeCutsceneProperty
 from .operators import OOTCSTextAdd, OOT_SearchCSDestinationEnumOperator, OOTCSListAdd, OOT_SearchCSSeqOperator
 from .motion.preview import previewFrameHandler
 from .motion.utility import getCutsceneCamera

fast64_internal/z64/exporter/__init__.py

@@ -4,8 +4,8 @@ import os
 from mathutils import Matrix
 from bpy.types import Object
 from ...f3d.f3d_gbi import DLFormat, TextureExportSettings
-from ..oot_model_classes import OOTModel
-from ..oot_f3d_writer import writeTextureArraysNew, writeTextureArraysExisting1D
+from ..model_classes import OOTModel
+from ..f3d_writer import writeTextureArraysNew, writeTextureArraysExisting1D
 from .scene import Scene
 from .decomp_edit import Files
 
@@ -19,7 +19,7 @@ from ...utility import (
     writeFile,
 )
 
-from ..oot_utility import (
+from ..utility import (
     ExportInfo,
     OOTObjectCategorizer,
     ootDuplicateHierarchy,

fast64_internal/z64/exporter/animation/functions.py

@@ -14,7 +14,7 @@ from ....utility_anim import (
     stashActionInArmature,
 )
 
-from ...oot_utility import (
+from ...utility import (
     checkForStartBone,
     getStartBone,
     getSortedChildren,

fast64_internal/z64/exporter/collision/__init__.py

@@ -9,7 +9,7 @@ from bpy.ops import object
 from typing import Optional
 
 from ....utility import PluginError, CData, toAlnum, unhideAllAndGetHiddenState, restoreHiddenState, indent
-from ...oot_utility import (
+from ...utility import (
     OOTObjectCategorizer,
     convertIntTo2sComplement,
     ootDuplicateHierarchy,

fast64_internal/z64/exporter/collision/camera.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass, field
 from mathutils import Quaternion, Matrix
 from bpy.types import Object
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getObjectList
+from ...utility import getObjectList
 from ...collision.constants import decomp_compat_map_CameraSType
 from ...collision.properties import OOTCameraPositionProperty
 from ..utility import Utility

fast64_internal/z64/exporter/collision/surface.py

@@ -3,7 +3,7 @@ import bpy
 from dataclasses import dataclass
 
 from ....utility import CData, indent
-from ...oot_constants import ootData
+from ...constants import ootData
 
 
 @dataclass(unsafe_hash=True)

fast64_internal/z64/exporter/collision/waterbox.py

@@ -7,7 +7,7 @@ from mathutils import Matrix
 from bpy.types import Object
 
 from ....utility import CData, hexOrDecInt, checkIdentityRotation, indent, yUpToZUp
-from ...oot_utility import getObjectList
+from ...utility import getObjectList
 from ..utility import Utility
 
 

fast64_internal/z64/exporter/cutscene/__init__.py

@@ -6,7 +6,7 @@ from typing import Optional
 from bpy.types import Object
 
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getCustomProperty
+from ...utility import getCustomProperty
 from ...scene.properties import OOTSceneHeaderProperty
 from .data import CutsceneData
 

fast64_internal/z64/exporter/cutscene/actor_cue.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from ....utility import PluginError, indent
-from ...oot_constants import ootData
+from ...constants import ootData
 from ...cutscene.motion.utility import getRotation, getInteger
 from .common import CutsceneCmdBase
 

fast64_internal/z64/exporter/cutscene/common.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 from ....utility import PluginError, indent
-from ...oot_constants import ootData
+from ...constants import ootData
 from ...cutscene.motion.utility import getInteger
 
 

fast64_internal/z64/exporter/cutscene/data.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 from bpy.types import Object, Bone
 from ....utility import PluginError
-from ...oot_constants import ootData
+from ...constants import ootData
 from .actor_cue import CutsceneCmdActorCueList, CutsceneCmdActorCue
 from .seq import CutsceneCmdStartStopSeqList, CutsceneCmdFadeSeqList, CutsceneCmdStartStopSeq, CutsceneCmdFadeSeq
 from .text import CutsceneCmdTextList, CutsceneCmdText, CutsceneCmdTextNone, CutsceneCmdTextOcarinaAction

fast64_internal/z64/exporter/decomp_edit/__init__.py

@@ -2,7 +2,7 @@ import os
 import re
 import shutil
 
-from ...oot_utility import ExportInfo, RemoveInfo, getSceneDirFromLevelName
+from ...utility import ExportInfo, RemoveInfo, getSceneDirFromLevelName
 from ..scene import Scene
 from ..file import SceneFile
 from .scene_table import SceneTableUtility

fast64_internal/z64/exporter/decomp_edit/scene_table.py

@@ -4,7 +4,7 @@ import bpy
 from dataclasses import dataclass, field
 from typing import Optional
 from ....utility import PluginError, writeFile
-from ...oot_constants import ootEnumSceneID, ootSceneNameToID
+from ...constants import ootEnumSceneID, ootSceneNameToID
 
 ADDED_SCENES_COMMENT = "// Added scenes"
 

fast64_internal/z64/exporter/decomp_edit/spec.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Optional
 from ....utility import PluginError, writeFile, indent
-from ...oot_utility import ExportInfo, getSceneDirFromLevelName
+from ...utility import ExportInfo, getSceneDirFromLevelName
 from ..scene import Scene
 from ..file import SceneFile
 

fast64_internal/z64/exporter/room/__init__.py

@@ -5,8 +5,8 @@ from bpy.types import Object
 from ....utility import PluginError, CData, indent
 from ....f3d.f3d_gbi import ScrollMethod, TextureExportSettings
 from ...room.properties import OOTRoomHeaderProperty
-from ...oot_object import addMissingObjectsToAllRoomHeaders
-from ...oot_model_classes import OOTModel, OOTGfxFormatter
+from ...object import addMissingObjectsToAllRoomHeaders
+from ...model_classes import OOTModel, OOTGfxFormatter
 from ..file import RoomFile
 from ..utility import Utility, altHeaderList
 from .header import RoomAlternateHeader, RoomHeader

fast64_internal/z64/exporter/room/header.py

@@ -5,8 +5,8 @@ from typing import Optional
 from mathutils import Matrix
 from bpy.types import Object
 from ....utility import CData, indent
-from ...oot_utility import getObjectList
-from ...oot_constants import ootData
+from ...utility import getObjectList
+from ...constants import ootData
 from ...room.properties import OOTRoomHeaderProperty
 from ...actor.properties import OOTActorProperty
 from ..utility import Utility

fast64_internal/z64/exporter/room/shape.py

@@ -8,13 +8,13 @@ from ....utility import PluginError, CData, toAlnum, indent
 from ....f3d.f3d_gbi import SPDisplayList, SPEndDisplayList, GfxListTag, GfxList, DLFormat
 from ....f3d.f3d_writer import TriangleConverterInfo, saveStaticModel, getInfoDict
 from ...room.properties import OOTRoomHeaderProperty, OOTBGProperty
-from ...oot_model_classes import OOTModel
+from ...model_classes import OOTModel
 from ..utility import Utility
 from bpy.types import Object
 from mathutils import Matrix, Vector
 from ....f3d.occlusion_planes.exporter import addOcclusionQuads, OcclusionPlaneCandidatesList
 
-from ...oot_utility import (
+from ...utility import (
     CullGroup,
     checkUniformScale,
     ootConvertTranslation,

fast64_internal/z64/exporter/scene/__init__.py

@@ -7,7 +7,7 @@ from typing import Optional
 from ....utility import PluginError, CData, indent
 from ....f3d.f3d_gbi import TextureExportSettings, ScrollMethod
 from ...scene.properties import OOTSceneHeaderProperty
-from ...oot_model_classes import OOTModel, OOTGfxFormatter
+from ...model_classes import OOTModel, OOTGfxFormatter
 from ..file import SceneFile
 from ..utility import Utility, altHeaderList
 from ..collision import CollisionHeader

fast64_internal/z64/exporter/scene/actors.py

@@ -6,8 +6,8 @@ from mathutils import Matrix
 from bpy.types import Object
 
 from ....utility import PluginError, CData, hexOrDecInt, indent
-from ...oot_utility import getObjectList, getEvalParams
-from ...oot_constants import ootData
+from ...utility import getObjectList, getEvalParams
+from ...constants import ootData
 from ...actor.properties import OOTActorProperty
 from ..utility import Utility
 from ..actor import Actor

fast64_internal/z64/exporter/scene/general.py

@@ -5,7 +5,7 @@ from bpy.types import Object
 
 from ....utility import PluginError, CData, exportColor, ootGetBaseOrCustomLight, hexOrDecInt, indent
 from ...scene.properties import OOTSceneHeaderProperty, OOTLightProperty
-from ...oot_utility import getEvalParamsInt
+from ...utility import getEvalParamsInt
 from ..utility import Utility
 
 

fast64_internal/z64/exporter/scene/pathways.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass, field
 from mathutils import Matrix
 from bpy.types import Object
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getObjectList
+from ...utility import getObjectList
 from ..utility import Utility
 
 

fast64_internal/z64/exporter/scene/rooms.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass
 from mathutils import Matrix
 from bpy.types import Object
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getObjectList
-from ...oot_model_classes import OOTModel
+from ...utility import getObjectList
+from ...model_classes import OOTModel
 from ..room import Room
 
 

fast64_internal/z64/exporter/skeleton/functions.py

@@ -5,8 +5,8 @@ import os
 from pathlib import Path
 from ....f3d.f3d_gbi import DLFormat, FMesh, TextureExportSettings, ScrollMethod
 from ....f3d.f3d_writer import getInfoDict
-from ...oot_f3d_writer import ootProcessVertexGroup, writeTextureArraysNew, writeTextureArraysExisting
-from ...oot_model_classes import OOTModel, OOTGfxFormatter
+from ...f3d_writer import ootProcessVertexGroup, writeTextureArraysNew, writeTextureArraysExisting
+from ...model_classes import OOTModel, OOTGfxFormatter
 from ...skeleton.constants import ootSkeletonImportDict
 from ...skeleton.properties import OOTSkeletonExportSettings
 from ...skeleton.utility import ootDuplicateArmatureAndRemoveRotations, getGroupIndices, ootRemoveSkeleton
@@ -21,7 +21,7 @@ from ....utility import (
     cleanupDuplicatedObjects,
 )
 
-from ...oot_utility import (
+from ...utility import (
     checkEmptyName,
     checkForStartBone,
     getStartBone,

fast64_internal/z64/exporter/utility.py

@@ -2,7 +2,7 @@ from math import radians
 from mathutils import Quaternion, Matrix
 from bpy.types import Object
 from ...utility import PluginError, indent
-from ..oot_utility import ootConvertTranslation, ootConvertRotation
+from ..utility import ootConvertTranslation, ootConvertRotation
 from ..actor.properties import OOTActorHeaderProperty
 
 

fast64_internal/z64/f3d/operators.py

@@ -11,14 +11,14 @@ from ...utility import CData, PluginError, raisePluginError, writeCData, 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
-from ..oot_utility import ootGetObjectPath, ootGetObjectHeaderPath, getOOTScale
-from ..oot_model_classes import OOTF3DContext, ootGetIncludedAssetData
-from ..oot_texture_array import ootReadTextureArrays
-from ..oot_model_classes import OOTModel, OOTGfxFormatter
-from ..oot_f3d_writer import ootReadActorScale, writeTextureArraysNew, writeTextureArraysExisting
+from ..utility import ootGetObjectPath, ootGetObjectHeaderPath, getOOTScale
+from ..model_classes import OOTF3DContext, ootGetIncludedAssetData
+from ..texture_array import ootReadTextureArrays
+from ..model_classes import OOTModel, OOTGfxFormatter
+from ..f3d_writer import ootReadActorScale, writeTextureArraysNew, writeTextureArraysExisting
 from .properties import OOTDLImportSettings, OOTDLExportSettings
 
-from ..oot_utility import (
+from ..utility import (
     OOTObjectCategorizer,
     ootDuplicateHierarchy,
     ootCleanupScene,

fast64_internal/z64/f3d_writer.py

@@ -7,8 +7,8 @@ from typing import Optional
 from ..utility import CData, getGroupIndexFromname, readFile, writeFile
 from ..f3d.flipbook import flipbook_to_c, flipbook_2d_to_c, flipbook_data_to_c
 from ..f3d.f3d_material import createF3DMat, F3DMaterial_UpdateLock, update_preset_manual
-from .oot_utility import replaceMatchContent, getOOTScale
-from .oot_texture_array import TextureFlipbook
+from .utility import replaceMatchContent, getOOTScale
+from .texture_array import TextureFlipbook
 
 from ..f3d.f3d_writer import (
     checkForF3dMaterialInFaces,
@@ -17,7 +17,7 @@ from ..f3d.f3d_writer import (
     saveMeshByFaces,
 )
 
-from .oot_model_classes import (
+from .model_classes import (
     OOTTriangleConverterInfo,
     OOTModel,
     ootGetActorData,

fast64_internal/z64/importer/actor.py

@@ -4,8 +4,8 @@ import bpy
 from ...utility import parentObject, hexOrDecInt
 from ..exporter.scene.actors import SceneTransitionActors
 from ..scene.properties import OOTSceneHeaderProperty
-from ..oot_utility import setCustomProperty, getEvalParams, getEvalParamsInt
-from ..oot_constants import ootEnumCamTransition, ootData
+from ..utility import setCustomProperty, getEvalParams, getEvalParamsInt
+from ..constants import ootEnumCamTransition, ootData
 from .classes import SharedSceneData
 from .constants import actorsWithRotAsParam
 

fast64_internal/z64/importer/classes.py

@@ -1,5 +1,5 @@
 from ...utility import PluginError
-from ..oot_utility import getHeaderSettings
+from ..utility import getHeaderSettings
 from .constants import headerNames
 
 

fast64_internal/z64/importer/room_header.py

@@ -4,10 +4,10 @@ import re
 from pathlib import Path
 
 from ...utility import PluginError, hexOrDecInt
-from ..oot_utility import setCustomProperty
-from ..oot_model_classes import OOTF3DContext
+from ..utility import setCustomProperty
+from ..model_classes import OOTF3DContext
 from ..room.properties import OOTRoomHeaderProperty
-from ..oot_constants import ootData, ootEnumLinkIdle, ootEnumRoomBehaviour
+from ..constants import ootData, ootEnumLinkIdle, ootEnumRoomBehaviour
 from .utility import getDataMatch, stripName, parse_commands_data
 from .classes import SharedSceneData
 from .constants import headerNames

fast64_internal/z64/importer/room_shape.py

@@ -5,9 +5,9 @@ import mathutils
 
 from ...utility import parentObject, hexOrDecInt, yUpToZUp
 from ...f3d.f3d_parser import importMeshC
-from ..oot_model_classes import OOTF3DContext
+from ..model_classes import OOTF3DContext
 from ..room.properties import OOTRoomHeaderProperty
-from ..oot_constants import ootEnumRoomShapeType
+from ..constants import ootEnumRoomShapeType
 from .classes import SharedSceneData
 from .utility import getDataMatch, stripName
 

fast64_internal/z64/importer/scene.py

@@ -9,15 +9,15 @@ from ...utility import PluginError, readFile, hexOrDecInt
 from ...f3d.f3d_parser import parseMatrices
 from ...f3d.f3d_gbi import get_F3D_GBI
 from ...f3d.flipbook import TextureFlipbook
-from ..oot_model_classes import OOTF3DContext
+from ..model_classes import OOTF3DContext
 from ..exporter.decomp_edit.scene_table import SceneTableUtility
 from ..scene.properties import OOTImportSceneSettingsProperty
-from ..oot_constants import ootEnumDrawConfig
+from ..constants import ootEnumDrawConfig
 from ..cutscene.importer import importCutsceneData
 from .scene_header import parseSceneCommands
 from .classes import SharedSceneData
 
-from ..oot_utility import (
+from ..utility import (
     getSceneDirFromLevelName,
     setCustomProperty,
     sceneNameFromID,

fast64_internal/z64/importer/scene_collision.py

@@ -11,8 +11,8 @@ from ..exporter.collision.surface import SurfaceType
 from ..exporter.collision.polygons import CollisionPoly
 from ..exporter.collision.waterbox import WaterBox
 from ..collision.properties import OOTMaterialCollisionProperty
-from ..oot_f3d_writer import getColliderMat
-from ..oot_utility import setCustomProperty, ootParseRotation
+from ..f3d_writer import getColliderMat
+from ..utility import setCustomProperty, ootParseRotation
 from .utility import getDataMatch, getBits, checkBit, createCurveFromPoints, stripName
 from .classes import SharedSceneData
 

fast64_internal/z64/importer/scene_header.py

@@ -10,9 +10,9 @@ from typing import Optional
 from ...utility import PluginError, readFile, parentObject, hexOrDecInt, gammaInverse
 from ...f3d.f3d_parser import parseMatrices
 from ..exporter.scene.general import EnvLightSettings
-from ..oot_model_classes import OOTF3DContext
+from ..model_classes import OOTF3DContext
 from ..scene.properties import OOTSceneHeaderProperty, OOTLightProperty
-from ..oot_utility import getEvalParams, setCustomProperty
+from ..utility import getEvalParams, setCustomProperty
 from .constants import headerNames
 from .utility import getDataMatch, stripName, parse_commands_data
 from .classes import SharedSceneData
@@ -21,7 +21,7 @@ from .actor import parseTransActorList, parseSpawnList, parseEntranceList
 from .scene_collision import parseCollisionHeader
 from .scene_pathways import parsePathList
 
-from ..oot_constants import (
+from ..constants import (
     ootEnumAudioSessionPreset,
     ootEnumNightSeq,
     ootEnumMusicSeq,

fast64_internal/z64/importer/utility.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from ...utility import PluginError, hexOrDecInt, removeComments, get_include_data, yUpToZUp
 from ..actor.properties import OOTActorProperty, OOTActorHeaderProperty
-from ..oot_utility import ootParseRotation
+from ..utility import ootParseRotation
 from .constants import headerNames, actorsWithRotAsParam
 from .classes import SharedSceneData
 

fast64_internal/z64/object.py

@@ -1,6 +1,6 @@
 from bpy.types import Object
 from ..utility import ootGetSceneOrRoomHeader
-from .oot_constants import ootData
+from .constants import ootData
 from .exporter.room.header import RoomHeader
 
 

fast64_internal/z64/props_panel_main.py

@@ -1,7 +1,7 @@
 import bpy
 from bpy.utils import register_class, unregister_class
 from ..utility import prop_split, gammaInverse
-from .oot_utility import getSceneObj, getRoomObj
+from .utility import getSceneObj, getRoomObj
 from .scene.properties import OOTSceneProperties
 from .room.properties import OOTObjectProperty, OOTRoomHeaderProperty, OOTAlternateRoomHeaderProperty
 from .collision.properties import OOTWaterBoxProperty

fast64_internal/z64/room/operators.py

@@ -3,7 +3,7 @@ from bpy.types import Operator
 from bpy.utils import register_class, unregister_class
 from bpy.props import EnumProperty, IntProperty, StringProperty
 from ...utility import ootGetSceneOrRoomHeader
-from ..oot_constants import ootData
+from ..constants import ootData
 
 
 class OOT_SearchObjectEnumOperator(Operator):

fast64_internal/z64/room/properties.py

@@ -3,8 +3,8 @@ from bpy.types import PropertyGroup, UILayout, Image, Object
 from bpy.utils import register_class, unregister_class
 from ...utility import prop_split
 from ..collection_utility import drawCollectionOps, drawAddButton
-from ..oot_utility import onMenuTabChange, onHeaderMenuTabChange, drawEnumWithCustom
-from ..oot_upgrade import upgradeRoomHeaders
+from ..utility import onMenuTabChange, onHeaderMenuTabChange, drawEnumWithCustom
+from ..upgrade import upgradeRoomHeaders
 from .operators import OOT_SearchObjectEnumOperator
 
 from bpy.props import (
@@ -18,7 +18,7 @@ from bpy.props import (
     IntVectorProperty,
 )
 
-from ..oot_constants import (
+from ..constants import (
     ootData,
     ootEnumRoomBehaviour,
     ootEnumLinkIdle,