Custom pack source

.github/workflows/all_builds.yml

@@ -28,7 +28,7 @@ env:
   # TODO: change this back to godotengine/godot and target master when #109685 and #109475 are merged
   GODOT_REPOSITORY: nikitalita/godot
   # Change the README too
-  GODOT_MAIN_SYNC_REF: gdre-wb-a8643700ce8
+  GODOT_MAIN_SYNC_REF: gdre-wb-df6235838b6
   SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes deprecated=yes angle=yes accesskit=no
   SCONSFLAGS_TEMPLATE: disable_path_overrides=no no_editor_splash=yes module_camera_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_websocket_enabled=no module_csg_enabled=yes module_gridmap_enabled=yes use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes disable_3d=no
   SCONS_CACHE_MSVC_CONFIG: true

.scripts/clang_format.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-CLANG_FORMAT_MAJOR="18"
-DEFAULT_CLANG_FORMAT=clang-format-18
+CLANG_FORMAT_MAJOR="21"
+DEFAULT_CLANG_FORMAT=clang-format-21
 CLANG_FORMAT=${CLANG_FORMAT:-$DEFAULT_CLANG_FORMAT}
 # check if $CLANG_FORMAT is available, use --version
 if ! command -v "$CLANG_FORMAT" &> /dev/null; then

.scripts/rebase_godot.sh

@@ -34,6 +34,13 @@ BRANCHES_TO_MERGE=(
 	fix-compat-array-shapes
 	fix-diraccess-windows
 	fix-cli-parser
+	gltf-fix-skeleton-bone
+	gltf-fix-double-precision
+	gltf-fix-vertex-colors
+	ensure-bptc-textures
+	fix-v3-meshes
+	fix-clearcoat-gloss
+	fix-blend-export
 )
 
 # set fail on error

README.md

@@ -155,7 +155,7 @@ During SCons configure, the module auto-applies the patches under `modules/gdsde
 
 ### Requirements
 
-[Our fork of godot](https://github.com/nikitalita/godot) @ branch `gdre-wb-a8643700ce8`
+[Our fork of godot](https://github.com/nikitalita/godot) @ branch `gdre-wb-df6235838b6`
 
 - Support for building on 3.x has been dropped and no new features are being pushed
   - Godot RE Tools still retains the ability to decompile 3.x and 2.x projects, however.

SCsub

@@ -1,38 +1,28 @@
 #!/usr/bin/env python
 
+from SCons.Script.SConscript import SConsEnvironment
 import os
 from typing import TYPE_CHECKING
 
-from build import gdre_icon_builder
-from build.common import add_libs_to_env, add_source_groups, append_cpppaths, find_llvm_prebuild_path, get_sources
-from build.mono_decomp import build_godot_mono_decomp, get_godot_mono_decomp_lib_dir
-from build.paths import *
-from build.versioning import write_version_header
-from build.vtracer import build_vtracer, get_vtracer_lib_dir
+from build import gdre_icon_builder  # pyright: ignore[reportImplicitRelativeImport]
+from build.common import add_source_groups, append_cpppaths  # pyright: ignore[reportImplicitRelativeImport]
+from build.mono_decomp import (  # pyright: ignore[reportImplicitRelativeImport]
+    build_godot_mono_decomp,
+    get_godot_mono_decomp_lib_dir,
+)
+from build.paths import *  # pyright: ignore[reportImplicitRelativeImport]
+from build.versioning import write_version_header  # pyright: ignore[reportImplicitRelativeImport]
+from build.vtracer import build_vtracer, get_vtracer_lib_dir  # pyright: ignore[reportImplicitRelativeImport]
 
 if TYPE_CHECKING:
-    from SCons.Environment import Environment
-    from SCons.Builder import Builder
-    from SCons import Import
+    from ...misc.utility.scons_hints import *
 
-env: Environment = None
-env_modules: Environment = None
-env_gdsdecomp: Environment = None
 
 Import("env")
 Import("env_modules")
 
-opts = Variables([], ARGUMENTS)
-opts.Add(BoolVariable("disable_godot_mono_decomp", "Disable Godot Mono Decompilation", False))
-opts.Add(BoolVariable("disable_gifski", "Disable Gifski", False))
-opts.Update(env)
-
 MODULE_DIR = get_module_dir(env)
 BUILD_DIR = get_build_dir(env)
-EXTERNAL_DIR = get_external_dir(MODULE_DIR)
-VTRACER_DIR = get_vtracer_dir(MODULE_DIR)
-VTRACER_BUILD_DIR = get_vtracer_build_dir(MODULE_DIR)
-GODOT_MONO_DECOMP_DIR = get_godot_mono_decomp_dir(MODULE_DIR)
 
 INCLUDE_DIRS = [
     VTRACER_INCLUDE_DIR,
@@ -43,40 +33,67 @@ INCLUDE_DIRS = [
     LIBVORBIS_THIRDPARTY_DIR,
     LIBTHEORA_THIRDPARTY_DIR,
     MBEDTLS_THIRDPARTY_DIR,
-    UNSIGNED_HASH_INCLUDE_DIR
+    UNSIGNED_HASH_INCLUDE_DIR,
+    AXML_DEC_INCLUDE_DIR,
 ]
 
-# TODO: Keep static branch intact for future use. Runtime/dotnet issues still block rollout.
-mono_native_lib_type = "Shared"
-is_using_clang = env["CXX"].lower().endswith("clang++")
-if env["platform"] == "android" or (is_using_clang and env["platform"] == "macos"):
-    mono_native_lib_type = "Shared"
-
-# hack to force the minimum macOS version to 10.15; it is currently hard-coded to 10.13
-# TODO: remove this hack once the minimum macOS version is updated to 10.15
-if env["platform"] == "macos" and env["arch"] == "x86_64":
-    min_version_flag = "-mmacosx-version-min=10.15"
-    for build_env in [env, env_modules]:
-        build_env.Append(CPPFLAGS=[min_version_flag])
-        build_env.Append(LINKFLAGS=[min_version_flag])
-        build_env.Append(CXXFLAGS=[min_version_flag])
-        build_env.Append(ASFLAGS=[min_version_flag])
 
 env_gdsdecomp = env_modules.Clone()
-opts.Update(env_gdsdecomp)
+
+# spirv-interop
+spirv_interop_obj = []
+
+spirv_interop_sources: list[str] = []
+
+# if metal isn't being built, we have to build spirv-cross ourselves because it's not being built by the engine
+if not "metal" in env or not env["metal"]:
+    thirdparty_spirv_headers_dir = "#thirdparty/spirv-headers/"
+    thirdparty_dir = "#thirdparty/spirv-cross/"
+    spirv_interop_sources = [
+        "spirv_cfg.cpp",
+        "spirv_cross.cpp",
+        "spirv_parser.cpp",
+        "spirv_msl.cpp",
+        "spirv_reflect.cpp",
+        "spirv_glsl.cpp",
+        "spirv_cross_parsed_ir.cpp",
+        "spirv_cross_util.cpp",
+    ]
+    spirv_interop_sources = [thirdparty_dir + file for file in spirv_interop_sources]
+spirv_interop_sources.append(SPIRV_INTEROP_DIR + "spirv-transpiler.cpp")
+
+env_spirv_interop = env_gdsdecomp.Clone()
+env_spirv_interop.disable_warnings()
+env_spirv_interop.add_source_files(spirv_interop_obj, spirv_interop_sources)
+if env.msvc:
+    if "_HAS_EXCEPTIONS" in env_spirv_interop["CPPDEFINES"]:
+        env_spirv_interop["CPPDEFINES"].remove("_HAS_EXCEPTIONS")
+    env_spirv_interop.Append(CXXFLAGS=["/EHsc"])
+else:
+    if "-fno-exceptions" in env_spirv_interop["CXXFLAGS"]:
+        env_spirv_interop["CXXFLAGS"].remove("-fno-exceptions")
+    env_spirv_interop.Append(CXXFLAGS=["-fexceptions"])
+append_cpppaths(
+    env_spirv_interop,
+    [
+        SPIRV_INTEROP_DIR,
+        SPIRV_CROSS_THIRDPARTY_DIR,
+        SPIRV_CROSS_THIRDPARTY_INCLUDE_DIR,
+        SPIRV_HEADERS_THIRDPARTY_DIR,
+    ],
+)
+env.modules_sources += spirv_interop_obj  # pyright: ignore[reportAttributeAccessIssue]
+
 
 if env["tests"]:
     env_gdsdecomp.Append(CPPDEFINES=["TESTS_ENABLED"])
-    append_cpppaths(
-        env,
-        INCLUDE_DIRS,
-    )
 
 append_cpppaths(
     env_gdsdecomp,
     INCLUDE_DIRS,
 )
 
+
 if env["disable_exceptions"]:
     env_gdsdecomp.Append(CPPDEFINES=["DOCTEST_CONFIG_NO_EXCEPTIONS_BUT_WITH_ALL_ASSERTS"])
 env_gdsdecomp.Append(CPPDEFINES=["ENABLE_3_X_SCENE_LOADING"])
@@ -99,11 +116,7 @@ env_gdsdecomp.Prepend(CPPPATH=[MMP3_THIRDPARTY_DIR])
 if env["builtin_libwebp"]:
     env_gdsdecomp.Prepend(CPPPATH=[WEBP_THIRDPARTY_DIR, WEBP_THIRDPARTY_DIR + "src/"])
 
-env.Append(LIBPATH=[get_vtracer_lib_dir(env, VTRACER_BUILD_DIR)])
 env.Append(LIBPATH=[BUILD_DIR])
-env.Append(
-    LIBPATH=[get_godot_mono_decomp_lib_dir(GODOT_MONO_DECOMP_DIR, env["platform"], env["arch"], env.get("dev_build", False))]
-)
 
 module_obj = []
 common_sources = [
@@ -116,54 +129,57 @@ common_sources = [
     "main/*.cpp",
     "plugin_manager/*.cpp",
     "utility/*.cpp",
+    "external/axmldec/lib/jitana/util/*.cpp",
     "external/tga/*.cpp",
     "external/tinygltf/tiny_gltf.cc",
     "module_etc_decompress/*.cpp",
-    f'{UNSIGNED_HASH_SRC_DIR}/*.cpp',
-    f'{UNSIGNED_HASH_SRC_DIR}/*.c',
+    f"{UNSIGNED_HASH_SRC_DIR}/*.cpp",
+    f"{UNSIGNED_HASH_SRC_DIR}/*.c",
 ]
 add_source_groups(env_gdsdecomp, module_obj, common_sources)
 if env["target"] == "editor":
     add_source_groups(env_gdsdecomp, module_obj, ["editor/*.cpp"])
-if env["tests"]:
-    add_source_groups(env_gdsdecomp, module_obj, ["tests/*.cpp"])
-
-build_vtracer(
-    root_env=env,
-    env_gdsdecomp=env_gdsdecomp,
-    module_obj=module_obj,
-    module_dir=MODULE_DIR,
-    external_dir=EXTERNAL_DIR,
-    vtracer_prefix=VTRACER_PREFIX,
-    vtracer_dir=VTRACER_DIR,
-    vtracer_build_dir=VTRACER_BUILD_DIR,
-    vtracer_libs=VTRACER_LIBS,
-    get_sources=get_sources,
-    add_libs_to_env=add_libs_to_env,
-    builder_class=Builder,
-    find_llvm_prebuild_path=find_llvm_prebuild_path,
-)
+
+
+build_vtracer(root_env=env, env_gdsdecomp=env_gdsdecomp, module_obj=module_obj)
 
 if "disable_gifski" in env and env["disable_gifski"]:
     env_gdsdecomp.Append(CPPDEFINES=["GIFSKI_DISABLED"])
 if "disable_godot_mono_decomp" in env and env["disable_godot_mono_decomp"]:
     env_gdsdecomp.Append(CPPDEFINES=["GODOT_MONO_DECOMP_DISABLED"])
 else:
-    build_godot_mono_decomp(
-        env=env,
-        env_gdsdecomp=env_gdsdecomp,
-        module_obj=module_obj,
-        module_dir=MODULE_DIR,
-        build_dir=BUILD_DIR,
-        mono_native_lib_type=mono_native_lib_type,
-        godot_mono_decomp_parent=GODOT_MONO_DECOMP_PARENT,
-        godot_mono_decomp_dir=GODOT_MONO_DECOMP_DIR,
-        godot_mono_decomp_libs=GODOT_MONO_DECOMP_LIBS,
-        get_sources=get_sources,
-        add_libs_to_env=add_libs_to_env,
-        builder_class=Builder,
-        copy_action=Copy,
+    build_godot_mono_decomp(env=env, env_gdsdecomp=env_gdsdecomp, module_obj=module_obj)
+
+
+if env["tests"]:
+    import glob
+    import sys
+
+    test_obj = []
+    env_tests = env_gdsdecomp.Clone()
+    force_link_sources = glob.glob(os.path.join(MODULE_DIR, "tests", "*.cpp"))
+
+    add_source_groups(env_tests, test_obj, ["#modules/gdsdecomp/tests/*.cpp"])
+    env.modules_sources += test_obj  # pyright: ignore[reportAttributeAccessIssue]
+
+    test_builders_module_dir = env.Dir("#tests").abspath
+    sys.path.insert(0, test_builders_module_dir)
+    from test_builders import force_link_builder  # pyright: ignore[reportMissingImports]
+
+    def gen_tests_header_fixed(target, source, env):
+        force_link_builder(target, source, env)
+        contents = open(str(target[0].abspath), "r", encoding="utf-8").read()
+        with open(str(target[0].abspath), "w", encoding="utf-8") as file:
+            file.write(contents.replace("force_link_tests()", "force_link_gdre_tests()"))
+    sys.path.remove(test_builders_module_dir)
+
+    force_link_header = env.CommandNoCache(
+        "#modules/gdsdecomp/tests/gdre_tests_force_link.gen.h",
+        env.Value(force_link_sources),
+        env.Run(gen_tests_header_fixed),
     )
 
-env.modules_sources += module_obj
+    env.Depends("#modules/modules_tests.gen.h", force_link_header)
+
 
+env.modules_sources += module_obj  # pyright: ignore[reportAttributeAccessIssue]

build/common.py

@@ -61,19 +61,16 @@ def get_cmd_env(build_env):
     return cmd_env
 
 
-def add_libs_to_env(env, env_gdsdecomp, module_obj, libs, sources):
+def add_libs_to_env(env, libs):
     for lib in libs:
-        env_gdsdecomp.Depends(lib, sources)
         if env.msvc:
             if not lib.endswith(".lib"):
                 lib = lib.rsplit(".", 1)[0] + ".lib"
             env.Append(LINKFLAGS=[lib])
             continue
 
         lib_name = os.path.basename(lib).split(".")[0]
-        print("LIB NAME", lib_name)
         env.Append(LIBS=[lib_name])
-    env.Depends(module_obj, libs)
 
 
 # TODO: This helper is currently unused in SCsub.
@@ -107,4 +104,3 @@ def append_cpppaths(build_env, paths):
 def add_source_groups(build_env, module_obj, source_globs):
     for source_glob in source_globs:
         build_env.add_source_files(module_obj, source_glob)
-