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

[F3D Bleed] Fix rendermode not being reverted #462

Closed
wants to merge 1 commit into from
Closed

[F3D Bleed] Fix rendermode not being reverted #462

Show file tree
Hide file tree
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
11 changes: 8 additions & 3 deletions fast64_internal/f3d/f3d_bleed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
GfxList,
FTriGroup,
GbiMacro,
get_F3D_GBI,
)


Expand All @@ -58,6 +59,7 @@ class BleedGraphics:
def __init__(self):
self.bled_gfx_lists = dict()
# build world default cmds to compare against, f3d types needed for reset cmd building
self.f3d = get_F3D_GBI()
self.is_f3d_old = bpy.context.scene.f3d_type == "F3D"
self.is_f3dex2 = "F3DEX2" in bpy.context.scene.f3d_type
self.build_default_geo()
Expand Down Expand Up @@ -298,7 +300,7 @@ def inline_triGroup(
tri_cmds = [c for c in tri_list.commands if type(c) == SP1Triangle or type(c) == SP2Triangles]
if tri_cmds:
reset_cmd_dict[DPPipeSync] = DPPipeSync()
[bleed_gfx_lists.add_reset_cmd(cmd, reset_cmd_dict) for cmd in bleed_gfx_lists.bled_mats]
[bleed_gfx_lists.add_reset_cmd(self.f3d, cmd, reset_cmd_dict) for cmd in bleed_gfx_lists.bled_mats]

# pre processes cmd_list and removes cmds deemed useless. subclass and override if this causes a game specific issue
def on_bleed_start(self, cmd_list: GfxList):
Expand Down Expand Up @@ -524,7 +526,7 @@ class BleedGfxLists:
bled_mats: GfxList = field(default_factory=list)
bled_tex: GfxList = field(default_factory=list)

def add_reset_cmd(self, cmd: GbiMacro, reset_cmd_dict: dict[GbiMacro]):
def add_reset_cmd(self, f3d: F3D, cmd: GbiMacro, reset_cmd_dict: dict[GbiMacro]):
reset_cmd_list = (
SPLoadGeometryMode,
SPSetGeometryMode,
Expand All @@ -533,7 +535,10 @@ def add_reset_cmd(self, cmd: GbiMacro, reset_cmd_dict: dict[GbiMacro]):
)
# separate other mode H and othermode L
if type(cmd) == SPSetOtherMode:
reset_cmd_dict[cmd.cmd] = cmd
if cmd.cmd in reset_cmd_dict:
reset_cmd_dict[cmd.cmd].add_diff(f3d, cmd)
else:
reset_cmd_dict[cmd.cmd] = copy.deepcopy(cmd)

if type(cmd) in reset_cmd_list:
reset_cmd_dict[type(cmd)] = cmd
Expand Down
11 changes: 11 additions & 0 deletions fast64_internal/f3d/f3d_gbi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4329,6 +4329,17 @@ class SPSetOtherMode(GbiMacro):
length: int
flagList: list

def add_diff(self, f3d, other: SPSetOtherMode):
for flag in self.flagList.copy(): # remove any flag overriden by other
if (getattr(f3d, str(flag), flag) << other.sft) & other.length:
self.flagList.remove(flag)
# add other's flags
self.flagList = list(set(self.flagList + other.flagList))

min_max = min(self.sft, other.sft), max(self.sft, other.sft) + max(self.length, other.length)
self.sft = min_max[0]
self.length = min_max[1] - min_max[0]

def to_binary(self, f3d, segments):
data = 0
for flag in self.flagList:
Expand Down
Loading