Revert "black fix (HarbourMasters#56)" (HarbourMasters#57)

This reverts commit b872b71.

Author: Jameriquiah

fast64_internal/f3d/f3d_gbi.py

@@ -107,7 +107,6 @@ class GfxMatWriteMethod(enum.Enum):
     "OOT": oot_default_draw_layers,
 }
 
-
 def normalize_hex_pointer(name: str) -> str:
     stripped = name.strip()
     if stripped.lower().startswith("0x"):
@@ -131,7 +130,6 @@ def format_asset_path(objectPath: str | None, name: str | None) -> str:
         return sanitized_name
     return sanitized_path
 
-
 CCMUXDict = {
     "COMBINED": 0,
     "TEXEL0": 1,
@@ -2163,7 +2161,7 @@ def to_binary(self):
         )
 
     def to_soh_xml(self):
-        baseStr = '<Vtx X="{pX}" Y="{pY}" Z="{pZ}" S="{s}" T="{t}" R="{r}" G="{g}" B="{b}" A="{a}"/>'
+        baseStr = "<Vtx X=\"{pX}\" Y=\"{pY}\" Z=\"{pZ}\" S=\"{s}\" T=\"{t}\" R=\"{r}\" G=\"{g}\" B=\"{b}\" A=\"{a}\"/>"
         return baseStr.format(
             pX=self.position[0],
             pY=self.position[1],
@@ -2264,7 +2262,7 @@ def to_binary(self):
         return data
 
     def to_soh_xml(self):
-        data = '<Vertex Version="0">\n'
+        data = "<Vertex Version=\"0\">\n"
         for vert in self.vertices:
             data += "\t" + vert.to_soh_xml() + "\n"
         data += "</Vertex>\n"
@@ -2363,7 +2361,7 @@ def to_c(self, f3d, name_override: Optional[str] = None):
         return data
 
     def to_soh_xml(self, modelDirPath, objectPath):
-        data = '<DisplayList Version="0">\n'
+        data = "<DisplayList Version=\"0\">\n"
         for command in self.commands:
             if isinstance(command, (SPDisplayList, SPBranchList, SPVertex, DPSetTextureImage)):
                 data += "\t" + command.to_soh_xml(objectPath) + "\n"
@@ -2382,15 +2380,13 @@ 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))
 
@@ -2898,7 +2894,7 @@ def to_soh_xml(self, modelDirPath, objectPath, include_cull_vertices=True, combi
 
             if combined_call_lines or combined_other_lines:
                 data += (
-                    '<DisplayList Version="0">\n'
+                    "<DisplayList Version=\"0\">\n"
                     + "".join(combined_call_lines + combined_other_lines)
                     + "</DisplayList>\n\n"
                 )
@@ -3444,7 +3440,7 @@ def to_soh_xml(self, modelDirPath, objectPath, include_cull_vertices=True, write
             return ""
 
         call_lines, other_lines = self.get_soh_root_draw_lines(objectPath)
-        drawData = '<DisplayList Version="0">\n' + "".join(call_lines + other_lines) + "</DisplayList>\n\n"
+        drawData = "<DisplayList Version=\"0\">\n" + "".join(call_lines + other_lines) + "</DisplayList>\n\n"
         writeXMLData(drawData, os.path.join(modelDirPath, self.draw.name))
         return drawData
 
@@ -3540,10 +3536,8 @@ 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 to_soh_xml(self):
@@ -3970,7 +3964,9 @@ 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)))
@@ -4153,7 +4149,6 @@ 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):
@@ -4176,7 +4171,7 @@ def toO2R(self, folderPath: str):
         return data
 
     def to_soh_xml(self, objectPath=""):
-        baseStr = '<LoadVertices Path="{parent}/{vertexPath}" VertexBufferIndex="{bufferIndex}" VertexOffset="{vertexOffset}" Count="{count}"/>'
+        baseStr = "<LoadVertices Path=\"{parent}/{vertexPath}\" VertexBufferIndex=\"{bufferIndex}\" VertexOffset=\"{vertexOffset}\" Count=\"{count}\"/>"
         return baseStr.format(
             parent=objectPath,
             vertexPath=self.vertList.name,
@@ -5109,7 +5104,6 @@ def to_soh_xml(self, objectPath=""):
         flags = ",".join(sorted(self.flagList))
         return f'<GeometryFlags Mode="Load" Flags="{flags}"/>'
 
-
 def gsSPSetOtherMode(cmd, sft, length, data, f3d):
     if f3d.F3DEX_GBI_2:
         words = _SHIFTL(cmd, 24, 8) | _SHIFTL(32 - (sft) - (length), 8, 8) | _SHIFTL((length) - 1, 0, 8), data
@@ -5458,13 +5452,11 @@ def toO2R(self, folderPath: str):
         return data
 
     def to_soh_xml(self, objectPath=""):
-        prefix = (
-            self.image.internal_path
-            if self.image.internal_path
-            else (objectPath if self.image.filename is not None else "")
-        )
+        prefix = self.image.internal_path if self.image.internal_path else (objectPath if self.image.filename is not None else "")
         imagePath = format_asset_path(prefix, self.image.name if self.image.name else "")
-        return f'<SetTextureImage Path="{imagePath}" Format="{self.fmt}" Size="{self.siz}" Width="{self.width}"/>'
+        return (
+            f'<SetTextureImage Path="{imagePath}" Format="{self.fmt}" Size="{self.siz}" Width="{self.width}"/>'
+        )
 
 
 def gsDPSetCombine(muxs0, muxs1, f3d):
@@ -5540,7 +5532,7 @@ def _ac(name: str) -> str:
             return name if name.startswith("G_ACMUX_") else f"G_ACMUX_{name}"
 
         return (
-            "<SetCombineLERP "
+            '<SetCombineLERP '
             f'A0="{_cc(self.a0)}" B0="{_cc(self.b0)}" C0="{_cc(self.c0)}" D0="{_cc(self.d0)}" '
             f'Aa0="{_ac(self.Aa0)}" Ab0="{_ac(self.Ab0)}" Ac0="{_ac(self.Ac0)}" Ad0="{_ac(self.Ad0)}" '
             f'A1="{_cc(self.a1)}" B1="{_cc(self.b1)}" C1="{_cc(self.c1)}" D1="{_cc(self.d1)}" '
@@ -5590,7 +5582,7 @@ def to_binary(self, f3d, segments):
     def to_soh_xml(self, objectPath=""):
         return (
             f'<SetEnvColor R="{self.r}" G="{self.g}" B="{self.b}" A="{self.a}"'
-            f"{getDynamicCosmeticXmlAttrs(self.cosmeticEntry, self.cosmeticCategory)}/>"
+            f'{getDynamicCosmeticXmlAttrs(self.cosmeticEntry, self.cosmeticCategory)}/>'
         )
 
 
@@ -5653,7 +5645,7 @@ def to_binary(self, f3d, segments):
     def to_soh_xml(self, objectPath=""):
         return (
             f'<SetPrimColor M="{self.m}" L="{self.l}" R="{self.r}" G="{self.g}" B="{self.b}" A="{self.a}"'
-            f"{getDynamicCosmeticXmlAttrs(self.cosmeticEntry, self.cosmeticCategory)}/>"
+            f'{getDynamicCosmeticXmlAttrs(self.cosmeticEntry, self.cosmeticCategory)}/>'
         )
 
 
@@ -5733,7 +5725,10 @@ def is_LOADTILE(self, f3d):
         return self.tile == f3d.G_TX_LOADTILE
 
     def to_soh_xml(self, objectPath=""):
-        return f'<SetTileSize T="{self.tile}" Uls="{self.uls}" Ult="{self.ult}" ' f'Lrs="{self.lrs}" Lrt="{self.lrt}"/>'
+        return (
+            f'<SetTileSize T="{self.tile}" Uls="{self.uls}" Ult="{self.ult}" '
+            f'Lrs="{self.lrs}" Lrt="{self.lrt}"/>'
+        )
 
 
 @dataclass(unsafe_hash=True)
@@ -5748,7 +5743,10 @@ def to_binary(self, f3d, segments):
         return gsDPLoadTileGeneric(f3d.G_LOADTILE, self.tile, self.uls, self.ult, self.lrs, self.lrt)
 
     def to_soh_xml(self, objectPath=""):
-        return f'<LoadTile Tile="{self.tile}" Uls="{self.uls}" Ult="{self.ult}" ' f'Lrs="{self.lrs}" Lrt="{self.lrt}"/>'
+        return (
+            f'<LoadTile Tile="{self.tile}" Uls="{self.uls}" Ult="{self.ult}" '
+            f'Lrs="{self.lrs}" Lrt="{self.lrt}"/>'
+        )
 
 
 @dataclass(unsafe_hash=True)
@@ -5818,7 +5816,8 @@ def to_binary(self, f3d, segments):
 
     def to_soh_xml(self, objectPath=""):
         return (
-            f'<LoadBlock Tile="{self.tile}" Uls="{self.uls}" Ult="{self.ult}" ' f'Lrs="{self.lrs}" Dxt="{self.dxt}" />'
+            f'<LoadBlock Tile="{self.tile}" Uls="{self.uls}" Ult="{self.ult}" '
+            f'Lrs="{self.lrs}" Dxt="{self.dxt}" />'
         )
 
 
@@ -6523,4 +6522,5 @@ def to_soh_xml(self):
     DPLoadTLUT_pal16,
     DPLoadTLUT_pal256,
     DPLoadTLUT,
-]
+]
+

fast64_internal/f3d/f3d_material.py

@@ -1948,9 +1948,7 @@ def get_preview_light_entries(
 
         color = [float(light.color[0]), float(light.color[1]), float(light.color[2]), 1.0]
         light_objects = [
-            obj
-            for obj in bpy.context.scene.objects
-            if obj.type == "LIGHT" and obj.data == getattr(light, "original", light)
+            obj for obj in bpy.context.scene.objects if obj.type == "LIGHT" and obj.data == getattr(light, "original", light)
         ]
         if not light_objects:
             light_objects = [None]
@@ -2014,7 +2012,6 @@ def compress_preview_lights(light_entries: list[dict[str, Any]]) -> list[dict[st
         )
     return compressed
 
-
 def update_light_colors(material, context):
     f3dMat: "F3DMaterialProperty" = material.f3d_mat
     nodes = material.node_tree.nodes
@@ -5638,3 +5635,4 @@ def mat_unregister():
         "Vertex Colored Texture (No Vertex Alpha)",
     ),
 ]
+

fast64_internal/f3d/f3d_texture_writer.py

@@ -21,6 +21,7 @@
 from ..utility import *
 
 
+
 def UVtoSTLarge(obj, loopIndex, uv_data, texDimensions):
     uv = uv_data[loopIndex].uv.copy()
     uv[1] = 1 - uv[1]
@@ -422,7 +423,9 @@ def saveOrGetPaletteDefinition(
             fPalette.skip_export = texProp.is_vanilla_texture
         return paletteKey, fPalette
 
-    paletteName, filename = getTextureNamesFromBasename(palBaseName, palFmt, parent, True, skip_pal_suffix)
+    paletteName, filename = getTextureNamesFromBasename(
+        palBaseName, palFmt, parent, True, skip_pal_suffix
+    )
     fPalette = FImage(paletteName, palFormat, "G_IM_SIZ_16b", 1, palLen, filename)
     if texProp:
         fPalette.internal_path = sanitize_internal_asset_path(texProp.texture_internal_path)