Skip to content

Fix F3DEX3 binary export of triangles and light counts #739

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

Merged
Dragorn421 merged 1 commit into from
Sep 22, 2026
Merged

Fix F3DEX3 binary export of triangles and light counts #739

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
10 changes: 5 additions & 5 deletions fast64_internal/f3d/f3d_gbi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1757,9 +1757,9 @@ def CALC_DXT_4b(self, width):
return int(((1 << self.G_TX_DXT_FRAC) + self.TXL2WORDS_4b(width) - 1) / self.TXL2WORDS_4b(width))

def NUML(self, n):
if self.F3DEX_GBI_3:
return n * 0x10
nVal = self.numLights[n]
if self.F3DEX_GBI_3:
return nVal * 0x10
return ((nVal) * 24) if self.F3DEX_GBI_2 else (((nVal) + 1) * 32 + 0x80000000)

def getLightMWO_a(self, n: str):
Expand Down Expand Up @@ -3629,7 +3629,7 @@ def _gsSP1Triangle_w1(v0, v1, v2):


def _gsSP1Triangle_w1f(v0, v1, v2, flag, f3d):
if f3d.F3DLP_GBI or f3d.F3DEX_GBI:
if not f3d.F3D_OLD_GBI:
if flag == 0:
return _gsSP1Triangle_w1(v0, v1, v2)
elif flag == 1:
Expand Down Expand Up @@ -3740,7 +3740,7 @@ class SP2Triangles(GbiMacro):
flag1: int

def to_binary(self, f3d, segments):
if f3d.F3DLP_GBI or f3d.F3DEX_GBI:
if not f3d.F3D_OLD_GBI:
words = (
_SHIFTL(f3d.G_TRI2, 24, 8) | _gsSP1Triangle_w1f(self.v00, self.v01, self.v02, self.flag0, f3d)
), _gsSP1Triangle_w1f(self.v10, self.v11, self.v12, self.flag1, f3d)
Expand All @@ -3760,7 +3760,7 @@ class SPCullDisplayList(GbiMacro):
vend: int

def to_binary(self, f3d, segments):
if f3d.F3DLP_GBI or f3d.F3DEX_GBI:
if not f3d.F3D_OLD_GBI:
words = _SHIFTL(f3d.G_CULLDL, 24, 8) | _SHIFTL((self.vstart) * 2, 0, 16), _SHIFTL((self.vend) * 2, 0, 16)
else:
words = _SHIFTL(f3d.G_CULLDL, 24, 8) | ((0x0F & (self.vstart)) * 40), ((0x0F & ((self.vend) + 1)) * 40)
Expand Down
Loading