black formatting

Author: Jameriquiah

__init__.py

@@ -522,13 +522,15 @@ def register():
 
     # Register HM64 extensions (XML export, MM support, etc.)
     from .fast64_internal.hm64 import hm64_register
+
     hm64_register()
 
 
 # called on add-on disabling
 def unregister():
     # Unregister HM64 extensions first
     from .fast64_internal.hm64 import hm64_unregister
+
     hm64_unregister()
 
     utility_anim_unregister()

fast64_internal/f3d/f3d_gbi.py

@@ -106,6 +106,7 @@ class GfxMatWriteMethod(enum.Enum):
     "OOT": oot_default_draw_layers,
 }
 
+
 def normalize_hex_pointer(name: str) -> str:
     stripped = name.strip()
     if stripped.lower().startswith("0x"):
@@ -129,6 +130,7 @@ def format_asset_path(objectPath: str | None, name: str | None) -> str:
         return sanitized_name
     return sanitized_path
 
+
 CCMUXDict = {
     "COMBINED": 0,
     "TEXEL0": 1,
@@ -1879,7 +1881,6 @@ def __init__(self):
         self.interval = 1
 
 
-
 def tile_func(direction: str, speed: int, cmd_num: int):
     if speed == 0 or speed is None:
         return None
@@ -2144,7 +2145,6 @@ def to_binary(self):
             + bytearray(self.colorOrNormal)
         )
 
-
     def to_c(self):
         def spc(x):
             return "{" + ", ".join([str(a) for a in x]) + "}"
@@ -2232,7 +2232,6 @@ def to_binary(self):
             data.extend(vert.to_binary())
         return data
 
-
     def to_c(self):
         data = CData()
         data.header = f"extern Vtx {self.name}[{len(self.vertices)}];\n"
@@ -2325,7 +2324,6 @@ def to_c(self, f3d, name_override: Optional[str] = None):
 
         return data
 
-
     def toO2R(self, folderPath: str, segments: dict | None = None):
         data = bytearray(0)
 
@@ -2334,13 +2332,15 @@ def toO2R(self, folderPath: str, segments: dict | None = None):
         data.extend(struct.pack("<I", 1))
         data.extend(struct.pack(">IIQIQIQQQI", 0x4F444C54, 0, 0xDEADBEEFDEADBEEF, 0, 0, 0, 0, 0, 0, 0))
 
-        data.extend(struct.pack(
-            ">bBHI",
-            4,
-            0xFF,
-            0xFFFF,
-            0xFFFFFFFF,
-        ))
+        data.extend(
+            struct.pack(
+                ">bBHI",
+                4,
+                0xFF,
+                0xFFFF,
+                0xFFFFFFFF,
+            )
+        )
 
         data.extend(struct.pack(">II", 0x33 << 24, 0xBEEFBEEF))
 
@@ -2833,7 +2833,6 @@ def to_c_material_revert(self, gfxFormatter):
             data.append(self.materialRevert.to_c(self.f3d))
         return data
 
-
     def to_c(self, textureExportSettings: TextureExportSettings, gfxFormatter: GfxFormatter):
         texCSeparate = textureExportSettings.texCSeparate
         savePNG = textureExportSettings.savePNG
@@ -2951,8 +2950,6 @@ def save_textures(self, exportPath):
             image.filepath = oldpath
         return texturesSaved
 
-
-
     def freePalettes(self):
         pass
 
@@ -3141,8 +3138,6 @@ def save_binary(self, romfile, f3d, segments):
         for cmd_list in self.draw_overrides:
             cmd_list.save_binary(romfile, f3d, segments)
 
-
-
     def to_c(self, f3d: F3D, gfxFormatter: GfxFormatter):
         staticData = CData()
 
@@ -3191,7 +3186,6 @@ def save_binary(self, romfile, f3d, segments):
             self.triList.save_binary(romfile, f3d, segments)
         self.vertexList.save_binary(romfile)
 
-
     def to_c(self, f3d, gfxFormatter):
         data = CData()
         data.append(self.vertexList.to_c())
@@ -3228,12 +3222,13 @@ def has_scroll_data(self):
             True if either texture has non-zero scroll values
         """
         return (
-            self.tile_scroll_tex0.s != 0 or self.tile_scroll_tex0.t != 0 or
-            self.tile_scroll_tex1.s != 0 or self.tile_scroll_tex1.t != 0
+            self.tile_scroll_tex0.s != 0
+            or self.tile_scroll_tex0.t != 0
+            or self.tile_scroll_tex1.s != 0
+            or self.tile_scroll_tex1.t != 0
         )
 
 
-
 def get_f3d_mat_from_version(material: bpy.types.Material):
     return material.f3d_mat if material.mat_ver > 3 else material
 
@@ -3325,7 +3320,6 @@ def save_binary(self, romfile, f3d, segments):
         if self.revert is not None and self.revert.tag.Export:
             self.revert.save_binary(romfile, f3d, segments)
 
-
     def to_c(self, f3d):
         data = CData()
         if self.material.tag.Export:
@@ -3622,9 +3616,7 @@ def textureTypeO2R(self) -> int:
     def toO2R(self, folderPath: str):
         data = bytearray(0)
 
-        print(
-            f"FImage.toO2R {self.name} {self.fmt} {self.bitSize} {self.width}x{self.height} {len(self.data)} bytes"
-        )
+        print(f"FImage.toO2R {self.name} {self.fmt} {self.bitSize} {self.width}x{self.height} {len(self.data)} bytes")
 
         data.extend(struct.pack("<IIIQIQIQQQI", 0, 0x4F544558, 0, 0xDEADBEEFDEADBEEF, 0, 0, 0, 0, 0, 0, 0))
         data.extend(struct.pack("<IIII", self.textureTypeO2R(), self.width, self.height, len(self.data)))
@@ -3749,7 +3741,6 @@ def _resolve_matrix_address(self):
                 pass
         return address
 
-
     def toO2R(self, folderPath: str):
         data = bytearray(0)
 
@@ -3803,6 +3794,7 @@ def to_c(self, static=True):
                 header += "segmented_to_virtual(" + self.vertList.name + " + " + str(self.offset) + ")"
             else:
                 header += self.vertList.name + " + " + str(self.offset)
+
         return header + ", " + str(self.count) + ", " + str(self.index) + ")"
 
     def toO2R(self, folderPath: str):
@@ -3825,7 +3817,6 @@ def toO2R(self, folderPath: str):
         return data
 
 
-
 @dataclass(unsafe_hash=True)
 class SPViewport(GbiMacro):
     # v = seg pointer, n = count, v0  = ?
@@ -3864,7 +3855,6 @@ def to_c(self, static=True):
         else:
             return "glistp = " + self.displayList.name + "(glistp)"
 
-
     def toO2R(self, folderPath: str):
         data = bytearray(0)
 
@@ -3911,7 +3901,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 # SPSprite2DBase
 
 
@@ -4032,7 +4021,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class SPLine3D(GbiMacro):
     v0: int
@@ -4091,7 +4079,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 # F3DEX3 TODO: Encoding of _g*SP5Triangles commands (SPTriangleStrip, SPTriangleFan)
 # and support for these in export including tri reordering
 
@@ -4109,7 +4096,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class SPSegment(GbiMacro):
     segment: int
@@ -4494,7 +4480,6 @@ def size(self, f3d):
             return GFX_SIZE * (2 + max(len(self.lights.l), 1))
 
 
-
 # F3DEX3 TODO: SPCameraWorld
 
 # Reflection/Hiliting Macros
@@ -4620,7 +4605,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 # SPTextureL
 
 
@@ -4691,7 +4675,6 @@ def to_binary(self, f3d, segments):
             return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class SPClearGeometryMode(GbiMacro):
     flagList: set[str] = field(default_factory=set)
@@ -4705,7 +4688,6 @@ def to_binary(self, f3d, segments):
             return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class SPLoadGeometryMode(GbiMacro):
     flagList: set[str]
@@ -4784,7 +4766,6 @@ def to_binary(self, f3d, segments):
         return gsSPSetOtherMode(cmd, sft, self.length, data, f3d)
 
 
-
 @dataclass(unsafe_hash=True)
 class SPSetOtherModeSub(GbiMacro):
     mode: str
@@ -4875,7 +4856,6 @@ def to_binary(self, f3d, segments):
         return gsSPSetOtherMode(f3d.G_SETOTHERMODE_H, f3d.G_MDSFT_TEXTLUT, 2, modeVal, f3d)
 
 
-
 @dataclass(unsafe_hash=True)
 class DPSetTextureFilter(SPSetOtherModeHSub):
     def to_binary(self, f3d, segments):
@@ -5059,7 +5039,6 @@ def toO2R(self, folderPath: str):
         return data
 
 
-
 def gsDPSetCombine(muxs0, muxs1, f3d):
     words = _SHIFTL(f3d.G_SETCOMBINE, 24, 8) | _SHIFTL(muxs0, 0, 24), muxs1
     return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
@@ -5125,7 +5104,6 @@ def to_binary(self, f3d, segments):
         )
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
-
     def to_c(self, static=True):
         if static:
             return f"gsDPSetCombineLERP({', '.join( self.getargs(static) )})"
@@ -5142,8 +5120,6 @@ def sDPRGBColor(cmd, r, g, b, a):
     return gsDPSetColor(cmd, (_SHIFTL(r, 24, 8) | _SHIFTL(g, 16, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)))
 
 
-
-
 @dataclass(unsafe_hash=True)
 class DPSetEnvColor(GbiMacro):
     r: int
@@ -5157,7 +5133,6 @@ def to_binary(self, f3d, segments):
         return sDPRGBColor(f3d.G_SETENVCOLOR, self.r, self.g, self.b, self.a)
 
 
-
 @dataclass(unsafe_hash=True)
 class DPSetBlendColor(GbiMacro):
     r: int
@@ -5215,7 +5190,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class SPLightToRDP(GbiMacro):
     light: int
@@ -5292,7 +5266,6 @@ def is_LOADTILE(self, f3d):
         return self.tile == f3d.G_TX_LOADTILE
 
 
-
 @dataclass(unsafe_hash=True)
 class DPLoadTile(GbiMacro):
     tile: int
@@ -5305,7 +5278,6 @@ def to_binary(self, f3d, segments):
         return gsDPLoadTileGeneric(f3d.G_LOADTILE, self.tile, self.uls, self.ult, self.lrs, self.lrt)
 
 
-
 @dataclass(unsafe_hash=True)
 class DPSetTile(GbiMacro):
     fmt: str
@@ -5347,7 +5319,6 @@ def is_LOADTILE(self, f3d):
         return self.tile == f3d.G_TX_LOADTILE
 
 
-
 @dataclass(unsafe_hash=True)
 class DPLoadBlock(GbiMacro):
     tile: int
@@ -5365,7 +5336,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class DPLoadTLUTCmd(GbiMacro):
     tile: int
@@ -5376,7 +5346,6 @@ def to_binary(self, f3d, segments):
         return words[0].to_bytes(4, "big") + words[1].to_bytes(4, "big")
 
 
-
 @dataclass(unsafe_hash=True)
 class DPLoadTextureBlock(GbiMacro):
     timg: FImage
@@ -6017,28 +5986,24 @@ def to_binary(self, f3d, segments):
         return gsDPNoParam(f3d.G_RDPFULLSYNC)
 
 
-
 @dataclass(unsafe_hash=True)
 class DPTileSync(GbiMacro):
     def to_binary(self, f3d, segments):
         return gsDPNoParam(f3d.G_RDPTILESYNC)
 
 
-
 @dataclass(unsafe_hash=True)
 class DPPipeSync(GbiMacro):
     def to_binary(self, f3d, segments):
         return gsDPNoParam(f3d.G_RDPPIPESYNC)
 
 
-
 @dataclass(unsafe_hash=True)
 class DPLoadSync(GbiMacro):
     def to_binary(self, f3d, segments):
         return gsDPNoParam(f3d.G_RDPLOADSYNC)
 
 
-
 F3DClassesWithPointers = [
     SPVertex,
     SPDisplayList,
@@ -6058,4 +6023,3 @@ def to_binary(self, f3d, segments):
     DPLoadTLUT_pal256,
     DPLoadTLUT,
 ]
-