[F3D] Implement Animal Crossing F3DZEX Extensions

__init__.py

@@ -36,6 +36,7 @@
     mat_unregister,
     check_or_ask_color_management,
 )
+from .fast64_internal.f3d.f3d_enums import enum_ac_tri_type
 from .fast64_internal.f3d.f3d_writer import f3d_writer_register, f3d_writer_unregister
 from .fast64_internal.f3d.f3d_parser import f3d_parser_register, f3d_parser_unregister
 from .fast64_internal.f3d.flipbook import flipbook_register, flipbook_unregister
@@ -93,6 +94,8 @@ def draw(self, context):
         col = self.layout.column()
         col.scale_y = 1.1  # extra padding
         prop_split(col, context.scene, "f3d_type", "Microcode")
+        if context.scene.f3d_type == "F3DZEX2 (Emu64)":
+            prop_split(col, context.scene.fast64.settings, "ac_tri_type", "Triangle Export Type")
         if context.scene.f3d_type in {"F3DEX3", "T3D"}:
             prop_split(col, context.scene, "packed_normals_algorithm", "Packed normals alg")
         col.prop(context.scene, "saveTextures")
@@ -104,6 +107,8 @@ def draw(self, context):
                 "While inlining, all meshes will be restored to world default values.\n         You can configure these values in the world properties tab.",
                 icon="INFO",
             )
+        if context.scene.f3d_type == "F3DZEX2 (Emu64)":
+            col.box().label(text="Emu64 supports ignore texture restrictions!", icon="INFO")
         col.prop(context.scene, "ignoreTextureRestrictions")
         if context.scene.ignoreTextureRestrictions:
             col.box().label(text="Width/height must be < 1024. Must be png format.")
@@ -206,6 +211,8 @@ class Fast64Settings_Properties(bpy.types.PropertyGroup):
         name="Prefer RGBA Over CI",
         description="When enabled, fast64 will default colored textures's format to RGBA even if they fit CI requirements, with the exception of textures that would not fit into TMEM otherwise",
     )
+    ac_tri_type: bpy.props.EnumProperty(name="Triangle Export Type", items=enum_ac_tri_type)
+
     dont_ask_color_management: bpy.props.BoolProperty(name="Don't ask to set color management properties")
 
     repo_settings_tab: bpy.props.BoolProperty(default=True, name="Repo Settings")
@@ -332,9 +339,9 @@ def upgrade_changed_props():
     OOT_ObjectProperties.upgrade_changed_props()
     for scene in bpy.data.scenes:
         settings: Fast64Settings_Properties = scene.fast64.settings
-        if settings.internal_game_update_ver != 1:
+        if settings.internal_game_update_ver < 2:
             set_game_defaults(scene, False)
-            settings.internal_game_update_ver = 1
+            settings.internal_game_update_ver = 2
         if scene.get("decomp_compatible", False):
             scene.gameEditorMode = "Homebrew"
             del scene["decomp_compatible"]

fast64_internal/f3d/f3d_bleed.py

@@ -34,6 +34,10 @@
     SPLine3D,
     SPLineW3D,
     SP2Triangles,
+    SPNTrianglesInit_5b,
+    SPNTriangles_5b,
+    SPNTrianglesInit_7b,
+    SPNTriangles_7b,
     SPCullDisplayList,
     SPSegment,
     SPBranchLessZraw,
@@ -45,13 +49,16 @@
     SPSetOtherMode,
     DPLoadBlock,
     DPLoadTLUTCmd,
+    DPLoadTLUT_Dolphin,
     DPFullSync,
     DPSetRenderMode,
     DPSetTextureImage,
+    DPSetTextureImage_Dolphin,
     DPPipeSync,
     DPLoadSync,
     DPTileSync,
     DPSetTile,
+    DPSetTile_Dolphin,
     DPSetTileSize,
     DPLoadTile,
     FModel,
@@ -65,6 +72,17 @@
     get_F3D_GBI,
 )
 
+TRI_CMDS = [
+    SP2Triangles,
+    SP1Triangle,
+    SPLine3D,
+    SPLineW3D,
+    SPNTrianglesInit_5b,
+    SPNTriangles_5b,
+    SPNTrianglesInit_7b,
+    SPNTriangles_7b,
+]
+
 
 def get_geo_cmds(
     clear_modes: set[str], set_modes: set[str], is_ex2: bool, matWriteMethod: GfxMatWriteMethod
@@ -155,9 +173,14 @@ def place_in_flaglist(flag: bool, enum: str, set_list: SPSetGeometryMode, clear_
         place_in_flaglist(defaults.g_tex_gen, "G_TEXTURE_GEN", setGeo, clearGeo)
         place_in_flaglist(defaults.g_tex_gen_linear, "G_TEXTURE_GEN_LINEAR", setGeo, clearGeo)
         place_in_flaglist(defaults.g_shade_smooth, "G_SHADING_SMOOTH", setGeo, clearGeo)
-        if bpy.context.scene.f3d_type == "F3DEX_GBI_2" or bpy.context.scene.f3d_type == "F3DEX_GBI":
+        if self.f3d.F3DEX_GBI:
             place_in_flaglist(defaults.g_clipping, "G_CLIPPING", setGeo, clearGeo)
-
+        if self.f3d.POINT_LIT_GBI:
+            place_in_flaglist(defaults.g_lighting_positional, "G_LIGHTING_POSITIONAL", setGeo, clearGeo)
+        if self.f3d.F3DZEX2_EMU64:
+            place_in_flaglist(defaults.g_decal_gequal, "G_DECAL_GEQUAL", setGeo, clearGeo)
+            place_in_flaglist(defaults.g_decal_equal, "G_DECAL_EQUAL", setGeo, clearGeo)
+            place_in_flaglist(defaults.g_decal_special, "G_DECAL_SPECIAL", setGeo, clearGeo)
         self.default_load_geo = SPLoadGeometryMode(setGeo.flagList)
         self.default_set_geo = setGeo
         self.default_clear_geo = clearGeo
@@ -310,14 +333,17 @@ def build_tmem_dict(self, cmd_list: GfxList):
         tmem_dict = dict()
         tile_dict = {i: 0 for i in range(8)}  # an assumption that hopefully never needs correction
         for cmd in cmd_list.commands:
-            if type(cmd) == DPSetTextureImage:
+            if type(cmd) in (DPSetTextureImage, DPSetTextureImage_Dolphin):
                 im_buffer = cmd
                 continue
+            elif type(cmd) == DPSetTile_Dolphin:
+                tmem_dict[cmd.name + 15] = im_buffer
+            elif type(cmd) == DPLoadTLUT_Dolphin:
+                tmem_dict[cmd.tlut_name] = cmd  # loadtlut_dolphin loads on its own
             if type(cmd) == DPSetTile:
                 tile_dict[cmd.tile] = cmd.tmem
             if type(cmd) in (DPLoadTLUTCmd, DPLoadTile, DPLoadBlock):
                 tmem_dict[tile_dict[cmd.tile]] = im_buffer
-                continue
         return tmem_dict
 
     def bleed_textures(self, cur_fmat: FMaterial, last_mat: FMaterial, bleed_state: int):
@@ -344,7 +370,7 @@ def bleed_textures(self, cur_fmat: FMaterial, last_mat: FMaterial, bleed_state:
                     continue
                 if rm_load and type(cmd) == DPSetTile:
                     commands_bled.commands[j] = None
-                if rm_load and type(cmd) in (DPLoadTLUTCmd, DPLoadTile, DPLoadBlock):
+                if rm_load and type(cmd) in (DPLoadTLUTCmd, DPLoadTLUT_Dolphin, DPLoadTile, DPLoadBlock):
                     commands_bled.commands[j] = None
                     rm_load = None
                     continue
@@ -633,20 +659,20 @@ def bleed_individual_cmd(
             SPViewport,
             SPDisplayList,
             SPBranchList,
-            SP1Triangle,
-            SPLine3D,
-            SPLineW3D,
-            SP2Triangles,
             SPCullDisplayList,
             SPSegment,
             SPBranchLessZraw,
             SPModifyVertex,
             SPEndDisplayList,
             DPSetTextureImage,
+            DPSetTextureImage_Dolphin,
+            DPSetTile_Dolphin,
             DPLoadBlock,
             DPLoadTile,
             DPLoadTLUTCmd,
+            DPLoadTLUT_Dolphin,
             DPFullSync,
+            *TRI_CMDS,
         ]:
             return False
 

fast64_internal/f3d/f3d_enums.py

@@ -185,6 +185,11 @@
     ("G_TF_BILERP", "Bilinear", "Standard N64 filtering with 3 point sample"),
 ]
 
+enumTextAdjust = [
+    ("G_TA_N64", "N64", "Center origin"),
+    ("G_TA_DOLPHIN", "Dolphin", "Top left"),
+]
+
 enumTextLUT = [
     ("G_TT_NONE", "None", "None"),
     ("G_TT_RGBA16", "RGBA16", "RGBA16"),
@@ -390,7 +395,14 @@
         "Variant of F3DEX2 family using vertex rejection instead of clipping",
         5,
     ),
+    (
+        "F3DEX2_PL",
+        "F3DEX2 (Point Lit)",
+        "Variant of F3DEX2 family with support for point lighting used in a few games including MM",
+        11,
+    ),
     ("F3DEX3", "F3DEX3", "Custom microcode by Sauraen", 6),
+    ("F3DZEX2 (Emu64)", "F3DZEX2 (Emu64)", "Microcode used in Animal Crossing (GC), extended version of F3DZEX", 12),
     ("", "Homebrew", "", 8),
     ("RDPQ", "RDPQ", "Base libdragon microcode", 9),
     ("T3D", "Tiny3D", "Custom libdragon microcode by HailToDodongo", 10),
@@ -455,3 +467,13 @@
     ("Segment", "Segment", "Call a segmented DL to set the tint, can change at runtime"),
     ("Light", "From Light", "Automatically load tint color from selectable light slot. Tint level stored in DL"),
 ]
+
+enum_ac_tri_type = [
+    (
+        "Auto",
+        "Auto",
+        "Pick between 5 bit and 7 bit commands depending on triangle count, 7 bit can access more of the vertex buffer, 5 bit has smaller commands",
+    ),
+    ("5b", "5 Bit", "Always use 5 bit commands"),
+    ("7b", "7 Bit", "Always use 7 bit commands"),
+]