Merge branch 'android-dev' into android

Author: ManIsCat2

.github/workflows/build-coop.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
     build-linux:
         if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '[build]') }}
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout repository
               uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
 
     build-steamos:
         if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '[build]') }}
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout repository
               uses: actions/checkout@v4

Makefile

@@ -285,7 +285,7 @@ endif
 # Including an option to disable it.
 
 # Level 0 produces no debug information at all. Thus, -g0 negates -g.
-# Level 1 produces minimal information, enough for making backtraces in parts of the program that you don’t plan to debug. This includes descriptions of functions and external variables, and line number tables, but no information about local variables.
+# Level 1 produces minimal information, enough for making backtraces in parts of the program that you don't plan to debug. This includes descriptions of functions and external variables, and line number tables, but no information about local variables.
 # Level 3 includes extra information, such as all the macro definitions present in the program. Some debuggers support macro expansion when you use -g3.
 # From https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
 ifeq ($(DEBUG_INFO_LEVEL),3)

autogen/autogen.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+python3 ./autogen/gen_math.py $1
 python3 ./autogen/convert_structs.py $1
 python3 ./autogen/convert_functions.py $1
 python3 ./autogen/convert_constants.py $1

autogen/common.py

@@ -21,7 +21,6 @@
 exclude_structs = [
     'SPTask',
     'VblankHandler',
-    'GraphNodeRoot',
     'MarioAnimDmaRelatedThing',
     'UnusedArea28',
 ]
@@ -234,7 +233,10 @@ def translate_type_to_lua(ptype):
         ptype = ptype.split(' ')[1].replace('*', '')
         return ptype, 'structs.md#%s' % ptype
 
-    if 'Vec3' in ptype:
+    if ptype in VECP_TYPES:
+        return VECP_TYPES[ptype], 'structs.md#%s' % VECP_TYPES[ptype]
+
+    if ptype in VEC_TYPES:
         return ptype, 'structs.md#%s' % ptype
 
     if ptype.startswith('enum '):
@@ -268,7 +270,7 @@ def translate_type_to_lua(ptype):
 
     if ptype.count('*') == 1 and '???' not in translate_type_to_lvt(ptype):
         ptype = ptype.replace('const', '').replace('*', '').strip()
-        s = '`Pointer` <%s>' % translate_type_to_lua(ptype)[0]
+        s = '`Pointer` <`%s`>' % translate_type_to_lua(ptype)[0].replace('`', '').strip()
         return s, None
 
     if not ptype.startswith('`'):

autogen/convert_constants.py

@@ -1,5 +1,6 @@
 from common import *
 from extract_constants import *
+from vec_types import *
 import sys
 
 in_filename = 'autogen/lua_constants/built-in.lua'
@@ -365,12 +366,30 @@ def build_files(processed_files):
 
     return s
 
+def build_vec_type_constant(type_name, vec_type, constant, values):
+    txt = 'g%s%s = create_read_only_table({' % (type_name, constant)
+    txt += ','.join([
+        '%s=%s' % (lua_field, str(values[i]))
+        for i, lua_field in enumerate(vec_type["fields_mapping"])
+    ])
+    txt += '})'
+    return txt
+
 def build_to_c(built_files):
     txt = ''
+
+    # Built-in and deprecated
     for filename in [in_filename, deprecated_filename]:
         with open(get_path(filename), 'r') as f:
             for line in f.readlines():
                 txt += line.strip() + '\n'
+
+    # Vec types constants
+    for type_name, vec_type in VEC_TYPES.items():
+        for constant, values in vec_type.get("constants", {}).items():
+            txt += build_vec_type_constant(type_name, vec_type, constant, values) + '\n'
+
+    # Source files
     txt += '\n' + built_files
 
     while ('\n\n' in txt):
@@ -505,6 +524,14 @@ def build_to_def(processed_files):
         s += f.read()
         s += '\n'
 
+    s += '\n\n-------------------------\n'
+    s += '-- vec types constants --\n'
+    s += '-------------------------\n\n'
+    for type_name, vec_type in VEC_TYPES.items():
+        for constant, values in vec_type.get("constants", {}).items():
+            s += '--- @type %s\n' % (type_name)
+            s += build_vec_type_constant(type_name, vec_type, constant, values) + '\n\n'
+
     for file in processed_files:
         constants = file['constants']
         skip_constant = False
@@ -523,15 +550,15 @@ def main():
 
     built_c = build_to_c(built_files)
 
-    with open(get_path(out_filename), 'w') as out:
+    with open(get_path(out_filename), 'w', encoding='utf-8', newline='\n') as out:
         out.write(built_c)
 
     doc = doc_files(processed_files)
-    with open(get_path(out_filename_docs), 'w') as out:
+    with open(get_path(out_filename_docs), 'w', encoding='utf-8', newline='\n') as out:
         out.write(doc)
 
     defs = build_to_def(processed_files)
-    with open(get_path(out_filename_defs), 'w') as out:
+    with open(get_path(out_filename_defs), 'w', encoding='utf-8', newline='\n') as out:
         out.write(defs)
 
     global totalConstants

autogen/convert_functions.py

@@ -16,6 +16,11 @@
 in_files = [
     "src/audio/external.h",
     "src/engine/math_util.h",
+    "src/engine/math_util.inl",
+    "src/engine/math_util_vec3f.inl",
+    "src/engine/math_util_vec3i.inl",
+    "src/engine/math_util_vec3s.inl",
+    "src/engine/math_util_mat4.inl",
     "src/engine/surface_collision.h",
     "src/engine/surface_load.h",
     "src/game/camera.h",
@@ -49,7 +54,6 @@
     "src/pc/lua/utils/smlua_camera_utils.h",
     "src/pc/lua/utils/smlua_gfx_utils.h",
     "src/pc/lua/utils/smlua_collision_utils.h",
-    "src/pc/lua/utils/smlua_math_utils.h",
     "src/pc/lua/utils/smlua_model_utils.h",
     "src/pc/lua/utils/smlua_text_utils.h",
     "src/pc/lua/utils/smlua_audio_utils.h",
@@ -73,7 +77,8 @@
     "src/game/first_person_cam.h",
     "src/engine/behavior_script.h",
     "src/audio/seqplayer.h",
-    "src/engine/lighting_engine.h"
+    "src/engine/lighting_engine.h",
+    "src/pc/network/sync_object.h"
 ]
 
 override_allowed_functions = {
@@ -91,12 +96,12 @@
     "src/game/area.h":                      [ "get_mario_spawn_type", "area_get_warp_node", "area_get_any_warp_node", "play_transition" ],
     "src/engine/level_script.h":            [ "area_create_warp_node" ],
     "src/game/ingame_menu.h":               [ "set_min_dialog_width", "set_dialog_override_pos", "reset_dialog_override_pos", "set_dialog_override_color", "reset_dialog_override_color", "set_menu_mode", "create_dialog_box", "create_dialog_box_with_var", "create_dialog_inverted_box", "create_dialog_box_with_response", "reset_dialog_render_state", "set_dialog_box_state", ],
-    "src/audio/seqplayer.h":                [ "sequence_player_set_tempo", "sequence_player_set_tempo_acc", "sequence_player_set_transposition", "sequence_player_get_tempo", "sequence_player_get_tempo_acc", "sequence_player_get_transposition", "sequence_player_get_volume", "sequence_player_get_fade_volume", "sequence_player_get_mute_volume_scale" ]
+    "src/audio/seqplayer.h":                [ "sequence_player_set_tempo", "sequence_player_set_tempo_acc", "sequence_player_set_transposition", "sequence_player_get_tempo", "sequence_player_get_tempo_acc", "sequence_player_get_transposition", "sequence_player_get_volume", "sequence_player_get_fade_volume", "sequence_player_get_mute_volume_scale" ],
+    "src/pc/network/sync_object.h":         [ "sync_object_is_initialized", "sync_object_is_owned_locally", "sync_object_get_object" ]
 }
 
 override_disallowed_functions = {
     "src/audio/external.h":                     [ " func_" ],
-    "src/engine/math_util.h":                   [ "atan2f", "vec3s_sub" ],
     "src/engine/surface_load.h":                [ "load_area_terrain", "alloc_surface_pools", "clear_dynamic_surfaces", "get_area_terrain_size" ],
     "src/engine/surface_collision.h":           [ " debug_", "f32_find_wall_collision" ],
     "src/game/mario_actions_airborne.c":        [ "^[us]32 act_.*" ],
@@ -892,9 +897,7 @@ def build_param(fid, param, i):
         else:
             s = '  ' + s
 
-        sanity_check = '    if (lua_isnil(L, %d)) { return 0; }\n' % (i)
-
-        return sanity_check + s + '\n'
+        return s + '\n'
 
 def build_param_after(param, i):
     ptype = param['type']
@@ -918,6 +921,9 @@ def build_call(function):
     elif ftype == 'void *':
         return '    %s;\n' % ccall
 
+    if ftype in VECP_TYPES:
+        return '    %s;\n' % ccall
+
     flot = translate_type_to_lot(ftype)
 
     lfunc = 'UNIMPLEMENTED -->'
@@ -991,6 +997,10 @@ def build_function(function, do_extern):
         i += 1
     s += '\n'
 
+    # To allow chaining vector functions calls, return the table corresponding to `dest` parameter
+    if function['type'] in VECP_TYPES:
+        s += '    lua_settop(L, 1);\n'
+
     s += '    return 1;\n}\n'
 
     if fid in override_function_version_excludes:
@@ -1192,7 +1202,7 @@ def output_fuzz_file():
     global fuzz_functions
     with open(fuzz_from) as f:
         file_str = f.read()
-    with open(fuzz_to, 'w') as f:
+    with open(fuzz_to, 'w', encoding='utf-8', newline='\n') as f:
         f.write(file_str.replace('-- $[FUNCS]', fuzz_functions))
 
 ############################################################################
@@ -1381,7 +1391,7 @@ def doc_files(processed_files):
 
         buffer = buffer.replace('$[FUNCTION_NAV_HERE', function_nav)
 
-        with open(get_path(out_filename_docs % page_name), 'w', newline='\n') as out:
+        with open(get_path(out_filename_docs % page_name), 'w', encoding='utf-8', newline='\n') as out:
             out.write(buffer)
 
 ############################################################################
@@ -1439,7 +1449,10 @@ def def_files(processed_files):
     for def_pointer in def_pointers:
         s += '--- @alias %s %s\n' % (def_pointer, def_pointer[8:])
 
-    with open(get_path(out_filename_defs), 'w', newline='\n') as out:
+    for vecp_type, vec_type in VECP_TYPES.items():
+        s += '--- @alias %s %s\n' % (vecp_type, vec_type)
+
+    with open(get_path(out_filename_defs), 'w', encoding='utf-8', newline='\n') as out:
         out.write(s)
 
 ############################################################################
@@ -1460,7 +1473,7 @@ def main():
         .replace("$[BINDS]", built_binds)         \
         .replace("$[INCLUDES]", built_includes)
 
-    with open(filename, 'w', newline='\n') as out:
+    with open(filename, 'w', encoding='utf-8', newline='\n') as out:
         out.write(gen)
 
     if rejects != "":

autogen/convert_structs.py

@@ -70,9 +70,6 @@
 #endif
 """
 
-override_field_names = {
-}
-
 override_field_types = {
     "Surface": { "normal": "Vec3f" },
     "Object": { "oAnimations": "ObjectAnimPointer*" },
@@ -94,7 +91,8 @@
     "Mod": [ "files", "showedScriptWarning" ],
     "MarioState": [ "visibleToEnemies" ],
     "NetworkPlayer": [ "gag", "moderator", "discordId" ],
-    "GraphNode": [ "_guard1", "_guard2" ],
+    "GraphNode": [ "_guard1", "_guard2", "padding" ],
+    "GraphNodeRoot": ["unk15", "views"],
     "FnGraphNode": [ "luaTokenIndex" ],
     "Object": [ "firstSurface" ],
     "ModAudio": [ "sound", "decoder", "buffer", "bufferSize", "sampleCopiesTail" ],
@@ -114,8 +112,8 @@
     "Object": ["oSyncID", "coopFlags", "oChainChompSegments", "oWigglerSegments", "oHauntedChairUnk100", "oTTCTreadmillBigSurface", "oTTCTreadmillSmallSurface", "bhvStackIndex", "respawnInfoType", "numSurfaces" ],
     "GlobalObjectAnimations": [ "*"],
     "SpawnParticlesInfo": [ "model" ],
-    "MarioBodyState": [ "updateTorsoTime" ],
-    "Area": [ "localAreaTimer", "nextSyncID", "unk04", "objectSpawnInfos", "paintingWarpNodes", "warpNodes" ],
+    "MarioBodyState": [ "updateTorsoTime", "updateHeadPosTime", "animPartsPos", "currAnimPart" ],
+    "Area": [ "localAreaTimer", "nextSyncID", "objectSpawnInfos", "paintingWarpNodes", "warpNodes" ],
     "Mod": [ "*" ],
     "ModFile": [ "*" ],
     "Painting": [ "id", "imageCount", "textureType", "textureWidth", "textureHeight" ],
@@ -129,6 +127,7 @@
     "GraphNodeObjectParent": [ "sharedChild" ],
     "GraphNodePerspective": [ "unused" ],
     "GraphNodeSwitchCase": [ "fnNode", "unused" ],
+    "GraphNodeRoot": ["node", "areaIndex", "numViews"],
     "ObjectWarpNode": [ "next "],
     "Animation": [ "length" ],
     "AnimationTable": [ "count" ],
@@ -413,7 +412,7 @@ def output_fuzz_file():
     global fuzz_structs_calls
     with open(fuzz_from) as f:
         file_str = f.read()
-    with open(fuzz_to, 'w') as f:
+    with open(fuzz_to, 'w', encoding='utf-8', newline='\n') as f:
         f.write(file_str.replace('-- $[STRUCTS]', fuzz_structs).replace('-- $[FUZZ-STRUCTS]', fuzz_structs_calls))
 
 ############################################################################
@@ -461,9 +460,6 @@ def get_struct_field_info(struct, field):
     ftype = field['type']
     size = 1
 
-    if sid in override_field_names and fid in override_field_names[sid]:
-        fid = override_field_names[sid][fid]
-
     if sid in override_field_types and fid in override_field_types[sid]:
         ftype = override_field_types[sid][fid]
 
@@ -727,7 +723,7 @@ def doc_structs(structs):
             continue
         s += doc_struct(struct) + '\n'
 
-    with open(get_path(out_filename_docs), 'w', newline='\n') as out:
+    with open(get_path(out_filename_docs), 'w', encoding='utf-8', newline='\n') as out:
         out.write(s)
 
 ############################################################################
@@ -775,7 +771,7 @@ def def_structs(structs):
     for def_pointer in def_pointers:
         s += '--- @alias %s %s\n' % (def_pointer, def_pointer[8:])
 
-    with open(get_path(out_filename_defs), 'w', newline='\n') as out:
+    with open(get_path(out_filename_defs), 'w', encoding='utf-8', newline='\n') as out:
         out.write(s)
 
 ############################################################################
@@ -797,11 +793,11 @@ def build_files():
     built_include = build_includes()
 
     out_c_filename = get_path(out_filename_c)
-    with open(out_c_filename, 'w', newline='\n') as out:
+    with open(out_c_filename, 'w', encoding='utf-8', newline='\n') as out:
         out.write(c_template.replace("$[BODY]", built_body).replace('$[INCLUDES]', built_include))
 
     out_h_filename = get_path(out_filename_h)
-    with open(out_h_filename, 'w', newline='\n') as out:
+    with open(out_h_filename, 'w', encoding='utf-8', newline='\n') as out:
         out.write(h_template.replace("$[BODY]", built_enum))
 
     doc_structs(parsed)

autogen/extract_display_lists.py

@@ -81,14 +81,17 @@
 def main():
     verbose = len(sys.argv) > 1 and (sys.argv[1] == "-v" or sys.argv[1] == "--verbose")
     pattern = re.compile(r"[\W]+")
-    display_lists = []
+    display_lists = set()
     for dir in DIRECTORIES:
-        for root, _, filenames in os.walk(dir):
+        for root, dirs, filenames in os.walk(dir):
+            dirs.sort()
+            filenames.sort()
             for filename in filenames:
                 if filename[filename.rfind("."):] in FILE_EXTENSIONS:
                     display_lists_in_file = []
                     filepath = os.path.join(root, filename)
-                    lines = open(filepath, "r").readlines()
+                    with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
+                        lines = f.readlines()
                     ignore = False
                     for line in lines:
                         if ("#ifdef VERSION_EU" in line or
@@ -102,17 +105,17 @@ def main():
                             index_gfx = identifiers.index("Gfx")
                             name = identifiers[index_gfx + 1]
                             if name not in display_lists:
-                                display_lists.append(name)
+                                display_lists.add(name)
                                 if verbose:
                                     display_lists_in_file.append(name)
                     if verbose and display_lists_in_file:
                         print("%s\n    %s" % (filepath, "\n    ".join(display_lists_in_file)))
 
     # Add these manually because they are defined by a macro
-    display_lists += CUSTOM_DEFINED
+    display_lists.update(CUSTOM_DEFINED)
 
-    with open("include/display_lists.inl", "w") as f:
-        for name in display_lists:
+    with open("include/display_lists.inl", "w", encoding="utf-8", newline="\n") as f:
+        for name in sorted(display_lists):
             f.write("DISPLAY_LIST(%s)\n" % (name))
 
     print("Total display lists: %d" % (len(display_lists)))

autogen/extract_functions.py

@@ -13,6 +13,9 @@
     'BAD_RETURN(u64)': 'void',
     'BAD_RETURN(f32)': 'void',
     'BAD_RETURN(f64)': 'void',
+    'INLINE': '',
+    'NOINLINE': '',
+    'OPTIMIZE_O3': '',
 }
 
 def extract_functions(filename):