Skip to content

[OoT] Fixed DL Exporter using the wrong filename #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yanis002 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[OoT] Fixed DL Exporter using the wrong filename #640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions fast64_internal/z64/f3d/operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,31 @@ def ootConvertMeshToC(
exportPath = bpy.path.abspath(settings.customPath)
isCustomExport = settings.isCustom
removeVanillaData = settings.removeVanillaData
name = toAlnum(originalObj.name)
filename = toAlnum(settings.filename) if settings.isCustomFilename else toAlnum(originalObj.name)
assert filename is not None
overlayName = settings.actorOverlayName
flipbookUses2DArray = settings.flipbookUses2DArray
flipbookArrayIndex2D = settings.flipbookArrayIndex2D if flipbookUses2DArray else None

try:
obj, allObjs = ootDuplicateHierarchy(originalObj, None, False, OOTObjectCategorizer())

fModel = OOTModel(name, DLFormat, None)
fModel = OOTModel(filename, DLFormat, None)
triConverterInfo = TriangleConverterInfo(obj, None, fModel.f3d, finalTransform, getInfoDict(obj))
fMeshes = saveStaticModel(
triConverterInfo, fModel, obj, finalTransform, fModel.name, not saveTextures, False, "oot"
)

# Since we provide a draw layer override, there should only be one fMesh.
for fMesh in fMeshes.values():
fMesh.draw.name = name
fMesh.draw.name = filename

ootCleanupScene(originalObj, allObjs)

except Exception as e:
ootCleanupScene(originalObj, allObjs)
raise Exception(str(e))

filename = settings.filename if settings.isCustomFilename else name
data = CData()
data.header = f"#ifndef {filename.upper()}_H\n" + f"#define {filename.upper()}_H\n\n" + '#include "ultra64.h"\n'

Expand Down Expand Up @@ -104,11 +104,11 @@ def ootConvertMeshToC(

if not isCustomExport:
writeTextureArraysExisting(bpy.context.scene.ootDecompPath, overlayName, False, flipbookArrayIndex2D, fModel)
addIncludeFiles(folderName, path, name)
addIncludeFiles(folderName, path, filename)
if removeVanillaData:
headerPath = os.path.join(path, folderName + ".h")
sourcePath = os.path.join(path, folderName + ".c")
removeDL(sourcePath, headerPath, name)
removeDL(sourcePath, headerPath, filename)


class OOT_ImportDL(Operator):
Expand Down