[SM64] Settings Rework

__init__.py

@@ -1,7 +1,17 @@
 import bpy
 from bpy.utils import register_class, unregister_class
+from bpy.path import abspath
+
 from . import addon_updater_ops
-from .fast64_internal.utility import prop_split, multilineLabel
+
+from .fast64_internal.utility import prop_split, multilineLabel, draw_and_check_tab
+
+from .fast64_internal.repo_settings import (
+    draw_repo_settings,
+    load_repo_settings,
+    repo_settings_operators_register,
+    repo_settings_operators_unregister,
+)
 
 from .fast64_internal.sm64 import sm64_register, sm64_unregister
 from .fast64_internal.sm64.settings.properties import SM64_Properties
@@ -105,13 +115,14 @@ def draw(self, context):
         prop_split(col, scene, "gameEditorMode", "Game")
         col.prop(scene, "exportHiddenGeometry")
         col.prop(scene, "fullTraceback")
-        prop_split(col, fast64_settings, "anim_range_choice", "Anim Range")
 
-        col.separator()
+        prop_split(col, fast64_settings, "anim_range_choice", "Anim Range")
 
-        col.prop(fast64_settings, "auto_pick_texture_format")
-        if fast64_settings.auto_pick_texture_format:
-            col.prop(fast64_settings, "prefer_rgba_over_ci")
+        draw_repo_settings(col.box(), context)
+        if not fast64_settings.repo_settings_tab:
+            col.prop(fast64_settings, "auto_pick_texture_format")
+            if fast64_settings.auto_pick_texture_format:
+                col.prop(fast64_settings, "prefer_rgba_over_ci")
 
 
 class Fast64_GlobalToolsPanel(bpy.types.Panel):
@@ -134,6 +145,10 @@ def draw(self, context):
         addon_updater_ops.update_notice_box_ui(self, context)
 
 
+def repo_path_update(self, context):
+    load_repo_settings(context.scene, abspath(self.repo_settings_path), True)
+
+
 class Fast64Settings_Properties(bpy.types.PropertyGroup):
     """Settings affecting exports for all games found in scene.fast64.settings"""
 
@@ -176,6 +191,14 @@ class Fast64Settings_Properties(bpy.types.PropertyGroup):
         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",
     )
 
+    repo_settings_tab: bpy.props.BoolProperty(default=True, name="Repo Settings")
+    repo_settings_path: bpy.props.StringProperty(name="Path", subtype="FILE_PATH", update=repo_path_update)
+    auto_repo_load_settings: bpy.props.BoolProperty(
+        name="Auto Load Repo's Settings",
+        description="When enabled, this will make fast64 automatically load repo settings if they are found after picking a decomp path",
+        default=True,
+    )
+
 
 class Fast64_Properties(bpy.types.PropertyGroup):
     """
@@ -363,6 +386,8 @@ def register():
     sm64_register(True)
     oot_register(True)
 
+    repo_settings_operators_register()
+
     for cls in classes:
         register_class(cls)
 
@@ -424,6 +449,8 @@ def unregister():
     del bpy.types.Bone.fast64
     del bpy.types.Object.fast64
 
+    repo_settings_operators_unregister()
+
     for cls in classes:
         unregister_class(cls)
 

fast64_internal/f3d/f3d_gbi.py

@@ -2328,6 +2328,7 @@ def __init__(
         self.LODGroups: dict[str, FLODGroup] = {}
         self.DLFormat: "DLFormat" = DLFormat
         self.matWriteMethod: GfxMatWriteMethod = matWriteMethod
+        self.no_light_direction = False
         self.global_data: FGlobalData = FGlobalData()
         self.texturesSavedLastExport: int = 0  # hacky
 
@@ -4010,16 +4011,19 @@ def to_binary(self, f3d, segments):
 class SPLightColor(GbiMacro):
     # n is macro name (string)
     n: str
-    col: int
+    col: Sequence[int]
+
+    def color_to_int(self):
+        return self.col[0] * 0x1000000 + self.col[1] * 0x10000 + self.col[2] * 0x100 + 0xFF
 
     def to_binary(self, f3d, segments):
-        return gsMoveWd(f3d.G_MW_LIGHTCOL, f3d.getLightMWO_a(self.n), self.col, f3d) + gsMoveWd(
+        return gsMoveWd(f3d.G_MW_LIGHTCOL, f3d.getLightMWO_a(self.n), self.color_to_int(), f3d) + gsMoveWd(
             f3d.G_MW_LIGHTCOL, f3d.getLightMWO_b(self.n), self.col, f3d
         )
 
     def to_c(self, static=True):
         header = "gsSPLightColor(" if static else "gSPLightColor(glistp++, "
-        return header + str(self.n) + ", 0x" + format(self.col, "08X") + ")"
+        return header + f"{self.n}, 0x" + format(self.color_to_int(), "08X") + ")"
 
 
 @dataclass(unsafe_hash=True)