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

Jump to bottom

[SM64] Fix #421 - Custom path DL/Geolayout exports #422

Merged
merged 3 commits into from
Aug 16, 2024
Merged

[SM64] Fix #421 - Custom path DL/Geolayout exports #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49dded1
[SM64] Fix Custom path DL/Geolayout imports
SonicTheHedgeHog64 Aug 15, 2024
9276640
Lilaa3 Suggestion
SonicTheHedgeHog64 Aug 15, 2024
c2a04ea
Lilaa3 Suggestion
SonicTheHedgeHog64 Aug 15, 2024
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
2 changes: 2 additions & 0 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 @@ -377,6 +377,8 @@ def sm64ExportF3DtoC(
scrollName = "actor_dl_" + name
elif headerType == "Level":
scrollName = levelName + "_level_dl_" + name
elif headerType == "Custom":
scrollName = "dl_" + name

gfxFormatter = SM64GfxFormatter(ScrollMethod.Vertex)
exportData = fModel.to_c(TextureExportSettings(texSeparate, savePNG, texDir, modelDirPath), gfxFormatter)
Expand Down
2 changes: 2 additions & 0 deletions fast64_internal/sm64/sm64_geolayout_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,8 @@ def saveGeolayoutC(
scrollName = "actor_geo_" + dirName
elif headerType == "Level":
scrollName = levelName + "_level_geo_" + dirName
elif headerType == "Custom":
scrollName = "geo_" + dirName

gfxFormatter = SM64GfxFormatter(ScrollMethod.Vertex)
if not customExport and headerType == "Level":
Expand Down
Loading