Merge branch 'main' of https://github.com/Fast-64/fast64

Author: Jameriquiah

README.md

@@ -3,7 +3,7 @@
 > [!IMPORTANT]
 > This is the updated version of HM's fork of Fast64, the old version of HM's fork is [here](https://github.com/HarbourMasters/fast64/tree/legacy)
 
-This requires Blender 3.2 - 5.0.1. Blender 4.0+ is recommended.
+This requires Blender 3.2 - 5.1.2. Blender 4.0+ is recommended.
 
 Forked from [kurethedead/fast64 on BitBucket](https://bitbucket.org/kurethedead/fast64/src).
 

fast64_internal/f3d/f3d_parser.py

@@ -371,13 +371,16 @@ def math_eval(s, f3d):
     def _eval(node):
         if isinstance(node, ast.Expression):
             return _eval(node.body)
-        elif isinstance(node, ast.Str):
-            return node.s
+        elif isinstance(node, ast.Constant):
+            if isinstance(node.value, str):
+                return node.value
+            elif isinstance(node.value, int):
+                return int(node.value)
+            else:
+                raise Exception("Unsupported constant type {}".format(type(node.value)))
         elif isinstance(node, ast.Name):
             if hasattr(f3d, node.id):
                 return getattr(f3d, node.id)
-        elif isinstance(node, ast.Num):
-            return node.n
         elif isinstance(node, ast.UnaryOp):
             if isinstance(node.op, ast.USub):
                 return -1 * _eval(node.operand)
@@ -1861,7 +1864,7 @@ def deleteMaterialContext(self):
             raise PluginError("Attempting to delete material context that is None.")
 
     # if deleteMaterialContext is False, then manually call self.deleteMaterialContext() later.
-    def createMesh(self, obj, removeDoubles, importNormals, callDeleteMaterialContext: bool):
+    def createMesh(self, obj: bpy.types.Object, removeDoubles, importNormals, callDeleteMaterialContext: bool):
         mesh = obj.data
         if len(self.verts) % 3 != 0:
             print(len(self.verts))
@@ -1899,13 +1902,26 @@ def createMesh(self, obj, removeDoubles, importNormals, callDeleteMaterialContex
             # There will be one loop for every vertex
             uv_layer[i].uv = self.verts[i].uv
 
-        color_layer = mesh.vertex_colors.new(name="Col").data
-        for i in range(len(mesh.loops)):
-            color_layer[i].color = self.verts[i].rgb.to_4d()
-
-        alpha_layer = mesh.vertex_colors.new(name="Alpha").data
-        for i in range(len(mesh.loops)):
-            alpha_layer[i].color = [self.verts[i].alpha] * 3 + [1]
+        # The mesh.vertex_colors API is deprecated since Blender 3.2,
+        # and its usage by fast64 here breaks in Blender 5.1 somehow.
+        # (can't replicate in simple cases)
+        if bpy.app.version < (3, 2, 0):
+            color_layer = mesh.vertex_colors.new(name="Col").data
+            for i in range(len(mesh.loops)):
+                color_layer[i].color = self.verts[i].rgb.to_4d()
+
+            alpha_layer = mesh.vertex_colors.new(name="Alpha").data
+            for i in range(len(mesh.loops)):
+                alpha_layer[i].color = [self.verts[i].alpha] * 3 + [1]
+        else:
+            col_attr = mesh.color_attributes.new("Col", "BYTE_COLOR", "CORNER")
+            for i in range(len(mesh.loops)):
+                col_attr.data[i].color = (*self.verts[i].rgb, 1)
+
+            alpha_attr = mesh.color_attributes.new("Alpha", "BYTE_COLOR", "CORNER")
+            for i in range(len(mesh.loops)):
+                a = self.verts[i].alpha
+                alpha_attr.data[i].color = (a, a, a, 1)
 
         if bpy.context.mode != "OBJECT":
             bpy.ops.object.mode_set(mode="OBJECT")

fast64_internal/sm64/animation/classes.py

@@ -115,7 +115,7 @@ def read_binary(self, indices_reader: RomReader, values_reader: RomReader, bone_
         indices_values = np.frombuffer(indices_reader.read_data(indices_size), dtype=">u2")
         for i in range(0, len(indices_values), 2):
             max_frame, offset = indices_values[i], indices_values[i + 1]
-            address, size = values_reader.start_address + (offset * 2), max_frame * 2
+            address, size = values_reader.start_address + int(offset * 2), int(max_frame) * 2
 
             values = np.frombuffer(values_reader.read_data(size, address), dtype=">i2", count=max_frame)
             self.pairs.append(SM64_AnimPair(values, address, address + size, offset).clean_frames())

fast64_internal/sm64/sm64_level_writer.py

@@ -543,16 +543,19 @@ def add_act_selector_ignore(base_path, level_enum):
     file_path = os.path.join(base_path, "src/game/level_update.c")
     data = getDataFromFile(file_path)
 
-    function_start = re.search("s32\s*lvl\_set\_current\_level\s*\((((?!\)).)*)\)\s*\{", data, re.DOTALL)
-
-    if function_start is None:
+    try:
+        function_start = re.search("s32\s*lvl\_set\_current\_level\s*\((((?!\)).)*)\)\s*\{", data, re.DOTALL).end()
+    except:
         raise PluginError('Could not find lvl_set_current_level in "' + file_path + '".')
 
-    function_end = re.search("\s*return\s*\!gDebugLevelSelect;\s*", data, re.DOTALL)
-    if function_end is None:
-        raise PluginError('Could not find return in lvl_set_current_level in "' + file_path + '".')
+    try:
+        function_end = (
+            re.search("\s*return\s*(?:(?!(0|FALSE)).)*?;", data[function_start:], re.DOTALL).start() + function_start
+        )
+    except:
+        raise PluginError('Could not find final return in lvl_set_current_level in "' + file_path + '".')
 
-    function_contents = data[function_start.end() : function_end.start()]
+    function_contents = data[function_start:function_end]
 
     check_result = re.search(
         "if\s*\(gCurrLevelNum\s*==\s*" + level_enum + "\)\s*return\s*0;", function_contents, re.DOTALL
@@ -562,7 +565,7 @@ def add_act_selector_ignore(base_path, level_enum):
 
     function_contents += "\n\tif (gCurrLevelNum == " + level_enum + ") return 0;"
 
-    new_data = data[: function_start.end()] + function_contents + data[function_end.start() :]
+    new_data = data[:function_start] + function_contents + data[function_end:]
 
     saveDataToFile(file_path, new_data)
 
@@ -571,23 +574,26 @@ def remove_act_selector_ignore(base_path, level_enum):
     file_path = os.path.join(base_path, "src/game/level_update.c")
     data = getDataFromFile(file_path)
 
-    function_start = re.search("s32\s*lvl\_set\_current\_level\s*\((((?!\)).)*)\)\s*\{", data, re.DOTALL)
-
-    if function_start is None:
+    try:
+        function_start = re.search("s32\s*lvl\_set\_current\_level\s*\((((?!\)).)*)\)\s*\{", data, re.DOTALL).end()
+    except:
         raise PluginError('Could not find lvl_set_current_level in "' + file_path + '".')
 
-    function_end = re.search("\s*return\s*\!gDebugLevelSelect;\s*", data, re.DOTALL)
-    if function_end is None:
-        raise PluginError('Could not find return in lvl_set_current_level in "' + file_path + '".')
+    try:
+        function_end = (
+            re.search("\s*return\s*(?:(?!(0|FALSE)).)*?;", data[function_start:], re.DOTALL).start() + function_start
+        )
+    except:
+        raise PluginError('Could not find final return in lvl_set_current_level in "' + file_path + '".')
 
-    function_contents = data[function_start.end() : function_end.start()]
+    function_contents = data[function_start:function_end]
 
     new_function_contents = re.sub(
         "\s*?if\s*\(gCurrLevelNum\s*==\s*" + level_enum + "\)\s*return\s*0;", "", function_contents, re.DOTALL
     )
 
     if function_contents != new_function_contents:
-        new_data = data[: function_start.end()] + new_function_contents + data[function_end.start() :]
+        new_data = data[:function_start] + new_function_contents + data[function_end:]
         saveDataToFile(file_path, new_data)
 
 

fast64_internal/utility.py

@@ -1510,6 +1510,7 @@ def bytesToHexClean(value, byteSize=4):
 
 
 def intToHex(value, byte_size=4, signed=True):
+    value = int(value)
     return format(value if signed else cast_integer(value, byte_size * 8, False), f"#0{(byte_size * 2 + 2)}x")