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

First round of F3DEX3 changes for basic features #258

Merged
merged 18 commits into from
Nov 8, 2023
Merged

First round of F3DEX3 changes for basic features #258

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e8686ee
Porting former CustomMicrocode branch to latest fast64 and latest F3D…
sauraen Oct 9, 2023
98aa706
Finished import of old changes
sauraen Oct 10, 2023
6693471
Ported geom UI working
sauraen Oct 11, 2023
eee76f5
Removed passing around GBI type and hardware V1 flag
sauraen Oct 14, 2023
23f03ed
Fixing bugs in F3DEX3 import
sauraen Oct 14, 2023
94c1bd6
Fixed bugs in F3DEX3 import
sauraen Oct 14, 2023
8358194
Fixed presets
sauraen Oct 15, 2023
f7b0c44
blacked
sauraen Oct 15, 2023
20ffb23
Addressed Yanies comments
sauraen Oct 17, 2023
2fe441f
Additional type hints
sauraen Oct 17, 2023
20e2149
blacked
sauraen Oct 17, 2023
e62c405
Fixed some missing F3DEX3 checks
sauraen Oct 17, 2023
9a67d80
Removed hardware v1 support, cleaned up some othermode code
sauraen Oct 19, 2023
a13b3de
Fixes
sauraen Oct 21, 2023
37575ed
Merge remote-tracking branch 'origin/main' into F3DEX3Basics
sauraen Oct 21, 2023
a0a38ad
Converted some things to f-strings
sauraen Oct 29, 2023
000ff56
Fixed import issues
sauraen Oct 29, 2023
1069f27
Fixed bug with normals import
sauraen Oct 29, 2023
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
39 changes: 30 additions & 9 deletions fast64_internal/f3d/f3d_enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@

enumTextConv = [
("G_TC_CONV", "Convert", "Convert YUV to RGB"),
("G_TC_FILTCONV", "Filter And Convert", "Applies chosen filter on cycle 1 and converts YUB to RGB in the second cycle"),
(
"G_TC_FILTCONV",
"Filter And Convert",
"Applies chosen filter on cycle 1 and converts YUB to RGB in the second cycle",
),
("G_TC_FILT", "Filter", "Applies chosen filter on textures with no color conversion"),
]

Expand All @@ -189,11 +193,19 @@

enumTextLOD = [
("G_TL_TILE", "Tile", "Shows selected color combiner tiles"),
("G_TL_LOD", "LoD", "Enables LoD calculations, LoD tile is base tile + clamp(log2(texel/pixel)), remainder of log2(texel/pixel) ratio gets stored to LoD Fraction in the color combiner"),
(
"G_TL_LOD",
"LoD",
"Enables LoD calculations, LoD tile is base tile + clamp(log2(texel/pixel)), remainder of log2(texel/pixel) ratio gets stored to LoD Fraction in the color combiner",
),
]

enumTextDetail = [
("G_TD_CLAMP", "Clamp", "Shows base tile for texel0 and texel 1 when magnifying (>1 texel/pixel), else shows LoD tiles"),
(
"G_TD_CLAMP",
"Clamp",
"Shows base tile for texel0 and texel 1 when magnifying (>1 texel/pixel), else shows LoD tiles",
),
("G_TD_SHARPEN", "Sharpen", "Sharpens pixel colors when magnifying (<1 texel/pixel), always shows LoD tiles"),
("G_TD_DETAIL", "Detail", "Shows base tile when magnifying (<1 texel/pixel), else shows LoD tiles + 1"),
]
Expand All @@ -213,8 +225,16 @@
enumColorDither = [("G_CD_DISABLE", "Disable", "Disable"), ("G_CD_ENABLE", "Enable", "Enable")]

enumPipelineMode = [
("G_PM_1PRIMITIVE", "1 Primitive", "Adds in pipe sync after every tri draw. Adds significant amounts of lag. Only use in vanilla SM64 hacking projects"),
("G_PM_NPRIMITIVE", "N Primitive", "No additional syncs are added after tri draws. Default option for every game but vanilla SM64"),
(
"G_PM_1PRIMITIVE",
"1 Primitive",
"Adds in pipe sync after every tri draw. Adds significant amounts of lag. Only use in vanilla SM64 hacking projects",
),
(
"G_PM_NPRIMITIVE",
"N Primitive",
"No additional syncs are added after tri draws. Default option for every game but vanilla SM64",
),
]

enumAlphaCompare = [
Expand Down Expand Up @@ -357,12 +377,13 @@
}

enumF3D = [
("F3D", "F3D", "F3D"),
("F3DEX/LX", "F3DEX/LX", "F3DEX/LX"),
("F3D", "F3D", "Original microcode used in SM64"),
("F3DEX/LX", "F3DEX/LX", "F3DEX version 1"),
("F3DLX.Rej", "F3DLX.Rej", "F3DLX.Rej"),
("F3DLP.Rej", "F3DLP.Rej", "F3DLP.Rej"),
("F3DEX2/LX2", "F3DEX2/LX2", "F3DEX2/LX2"),
("F3DEX2.Rej/LX2.Rej", "F3DEX2.Rej/LX2.Rej", "F3DEX2.Rej/LX2.Rej"),
("F3DEX2/LX2", "F3DEX2/LX2/ZEX", "Family of microcodes used in later N64 games including OoT and MM"),
("F3DEX2.Rej/LX2.Rej", "F3DEX2.Rej/LX2.Rej", "Variant of F3DEX2 family using vertex rejection instead of clipping"),
("F3DEX3", "F3DEX3", "Custom microcode by Sauraen"),
]

enumLargeEdges = [
Expand Down
Loading