Skip to content
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

[SM64] Bring binary dl exporter up-to-date #459

Merged
merged 2 commits into from
Feb 11, 2025
Merged

[SM64] Bring binary dl exporter up-to-date #459

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a907cd
[SM64] Bring binary dl exporter up-to-date
Lilaa3 Sep 15, 2024
507abc6
DLFormat.Static
Lilaa3 Jan 9, 2025
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
51 changes: 42 additions & 9 deletions fast64_internal/sm64/sm64_f3d_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,20 @@ def sm64ExportF3DtoC(


def exportF3DtoBinary(romfile, exportRange, transformMatrix, obj, segmentData, includeChildren):
fModel = SM64Model(obj.name, DLFormat, GfxMatWriteMethod.WriteDifferingAndRevert)
fMeshes = exportF3DCommon(obj, fModel, transformMatrix, includeChildren, obj.name, DLFormat.Static, True)
fMesh = fMeshes[fModel.getDrawLayerV3(obj)]
inline = bpy.context.scene.exportInlineF3D
fModel = SM64Model(
obj.name,
DLFormat,
Lilaa3 marked this conversation as resolved.
Show resolved Hide resolved
GfxMatWriteMethod.WriteDifferingAndRevert if not inline else GfxMatWriteMethod.WriteAll,
)
fMeshes = exportF3DCommon(obj, fModel, transformMatrix, includeChildren, obj.name, DLFormat, True)

if inline:
bleed_gfx = BleedGraphics()
bleed_gfx.bleed_fModel(fModel, fMeshes)
fModel.freePalettes()
assert len(fMeshes) == 1, "Less or more than one fmesh"
fMesh = list(fMeshes.values())[0]

addrRange = fModel.set_addr(exportRange[0])
if addrRange[1] > exportRange[1]:
Expand All @@ -508,9 +518,21 @@ def exportF3DtoBinary(romfile, exportRange, transformMatrix, obj, segmentData, i


def exportF3DtoBinaryBank0(romfile, exportRange, transformMatrix, obj, RAMAddr, includeChildren):
fModel = SM64Model(obj.name, DLFormat, GfxMatWriteMethod.WriteDifferingAndRevert)
fMeshes = exportF3DCommon(obj, fModel, transformMatrix, includeChildren, obj.name, DLFormat.Static, True)
fMesh = fMeshes[fModel.getDrawLayerV3(obj)]
inline = bpy.context.scene.exportInlineF3D
fModel = SM64Model(
obj.name,
DLFormat,
GfxMatWriteMethod.WriteDifferingAndRevert if not inline else GfxMatWriteMethod.WriteAll,
)
fMeshes = exportF3DCommon(obj, fModel, transformMatrix, includeChildren, obj.name, DLFormat, True)

if inline:
bleed_gfx = BleedGraphics()
bleed_gfx.bleed_fModel(fModel, fMeshes)
fModel.freePalettes()
assert len(fMeshes) == 1, "Less or more than one fmesh"
fMesh = list(fMeshes.values())[0]

segmentData = copy.copy(bank0Segment)

data, startRAM = getBinaryBank0F3DData(fModel, RAMAddr, exportRange)
Expand All @@ -528,9 +550,20 @@ def exportF3DtoBinaryBank0(romfile, exportRange, transformMatrix, obj, RAMAddr,


def exportF3DtoInsertableBinary(filepath, transformMatrix, obj, includeChildren):
fModel = SM64Model(obj.name, DLFormat, GfxMatWriteMethod.WriteDifferingAndRevert)
fMeshes = exportF3DCommon(obj, fModel, transformMatrix, includeChildren, obj.name, DLFormat.Static, True)
fMesh = fMeshes[fModel.getDrawLayerV3(obj)]
inline = bpy.context.scene.exportInlineF3D
fModel = SM64Model(
obj.name,
DLFormat,
GfxMatWriteMethod.WriteDifferingAndRevert if not inline else GfxMatWriteMethod.WriteAll,
)
fMeshes = exportF3DCommon(obj, fModel, transformMatrix, includeChildren, obj.name, DLFormat, True)

if inline:
bleed_gfx = BleedGraphics()
bleed_gfx.bleed_fModel(fModel, fMeshes)
fModel.freePalettes()
assert len(fMeshes) == 1, "Less or more than one fmesh"
fMesh = list(fMeshes.values())[0]

data, startRAM = getBinaryBank0F3DData(fModel, 0, [0, 0xFFFFFF])
# must happen after getBinaryBank0F3DData
Expand Down
Loading