Gdre main loop

.github/workflows/all_builds.yml

@@ -28,8 +28,8 @@ 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-babc272d44e
-  SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes deprecated=yes
+  GODOT_MAIN_SYNC_REF: gdre-wb-a8643700ce8
+  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
 
@@ -137,6 +137,11 @@ jobs:
             bin: ./bin/godot.macos.editor.arm64
 
     steps:
+      - name: Set git to use LF
+        if: matrix.platform == 'windows'
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
       - name: checkout-godot
         uses: actions/checkout@v4
         with:
@@ -189,10 +194,36 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
+      - name: Download pre-built ANGLE
+        if: matrix.platform == 'macos' || matrix.platform == 'windows'
+        shell: sh
+        id: angle-sdk
+        run: |
+          if python ./misc/scripts/install_angle.py; then
+            echo "ANGLE_ENABLED=yes" >> "$GITHUB_OUTPUT"
+          else
+            echo "::warning::ANGLE SDK installation failed, building without ANGLE support."
+            echo "ANGLE_ENABLED=no" >> "$GITHUB_OUTPUT"
+          fi
+
+      # TODO: Enable this when we figure out how to resolve linking issues with AccessKit; getting duplicate symbols for `_rust_eh_personality`.
+      # - name: Download pre-built AccessKit
+      #   shell: sh
+      #   id: accesskit-sdk
+      #   if: matrix.platform == 'macos' || matrix.platform == 'windows' || matrix.platform == 'linux'
+      #   run: |
+      #     if python ./misc/scripts/install_accesskit.py; then
+      #       echo "ACCESSKIT_ENABLED=yes" >> "$GITHUB_OUTPUT"
+      #     else
+      #       echo "::warning::AccessKit SDK installation failed, building without AccessKit support."
+      #       echo "ACCESSKIT_ENABLED=no" >> "$GITHUB_OUTPUT"
+      #     fi
+
       - name: Setup Vulkan SDK
         if: matrix.platform == 'macos'
         run: |
           sh misc/scripts/install_vulkan_sdk_macos.sh
+
       - name: Download Direct3D 12 SDK components
         if: matrix.platform == 'windows'
         shell: sh
@@ -205,6 +236,7 @@ jobs:
             echo "D3D12_ENABLED=no" >> "$GITHUB_OUTPUT"
           fi
         continue-on-error: true
+
       - name: Show targets
         shell: sh
         run: |
@@ -228,16 +260,7 @@ jobs:
 
       - name: Download pre-built Android Swappy Frame Pacing Library
         if: matrix.platform == 'android'
-        uses: dsaltares/fetch-gh-release-asset@1.1.2
-        with:
-          repo: godotengine/godot-swappy
-          version: tags/from-source-2025-01-31
-          file: godot-swappy.7z
-          target: swappy/godot-swappy.7z
-
-      - name: Extract pre-built Android Swappy Frame Pacing Library
-        if: matrix.platform == 'android'
-        run: 7za x -y swappy/godot-swappy.7z -o${{github.workspace}}/thirdparty/swappy-frame-pacing
+        run: python ./misc/scripts/install_swappy_android.py
 
       - name: Compile Editor
         if: matrix.target == 'editor'
@@ -462,15 +485,17 @@ jobs:
         if: matrix.platform == 'android' && github.event_name != 'pull_request'
         run: |
           set -Eeuo pipefail
-          if [ -z "${{ secrets.ANDROID_RELEASE_KEYSTORE }}" ]; then
-            echo "ANDROID_RELEASE_KEYSTORE is not set"
+          if [ -z "${{ secrets.ANDROID_RELEASE_KEYSTORE }}" ] || [ -z "${{ secrets.ANDROID_KEY_ALIAS }}" ] || [ -z "${{ secrets.ANDROID_KEY_PASSWORD }}" ]; then
+            echo "One or more Android signing secrets are missing (ANDROID_RELEASE_KEYSTORE, ANDROID_KEY_ALIAS, ANDROID_KEY_PASSWORD)"
+            echo "Android release build will be signed with a generated keystore"
             exit 1
           fi
           echo "${{ secrets.ANDROID_RELEASE_KEYSTORE }}" > release.keystore.b64
           openssl base64 -d -out ~/release.keystore -in release.keystore.b64
           echo "GODOT_ANDROID_KEYSTORE_RELEASE_PATH=$HOME/release.keystore" >> "$GITHUB_ENV"
           echo "GODOT_ANDROID_KEYSTORE_RELEASE_USER=${{ secrets.ANDROID_KEY_ALIAS }}" >> "$GITHUB_ENV"
           echo "GODOT_ANDROID_KEYSTORE_RELEASE_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> "$GITHUB_ENV"
+        continue-on-error: true
 
       - name: Export standalone GDRE Tools
         shell: pwsh

.github/workflows/static_checks.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   static-check-clang-format:
-    runs-on: "ubuntu-24.04"
+    runs-on: "ubuntu-26.04"
     name: Static checks (clang-format)
     steps:
     - name: checkout-gdsdecomp
@@ -28,7 +28,7 @@ jobs:
     - name: Install Linux deps
       run: |
         sudo apt-get update
-        sudo apt-get install clang-format-18
-        sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-18 100
+        sudo apt-get install clang-format-21
+        sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-21 100
     - name: check clang_format
       run: bash ./.scripts/clang_format.sh

.scripts/rebase_godot.sh

@@ -31,10 +31,9 @@ BRANCHES_TO_MERGE=(
 	material-fix-deprecated-param
 	fix-pack-error
 	convert-3.x-escn
-	fix-svg
 	fix-compat-array-shapes
 	fix-diraccess-windows
-	gltf-fix-value-track-interpolation
+	fix-cli-parser
 )
 
 # set fail on error
@@ -55,7 +54,7 @@ else
     sed_in_place() { sed -i "$@"; }
 fi
 
-git push nikitalita $NEW_BRANCH_NAME --set-upstream
+# git push nikitalita $NEW_BRANCH_NAME --set-upstream
 
 # change the branch name in .github/workflows/all_builds.yml and the README.md
 sed_in_place "s/GODOT_MAIN_SYNC_REF: .*/GODOT_MAIN_SYNC_REF: $NEW_BRANCH_NAME/" "$GDRE_PATH/.github/workflows/all_builds.yml"

README.md

@@ -63,8 +63,10 @@ Main commands:
 --bin-to-txt=<FILE>                           Convert binary scene or resource files to text-based format (can be repeated)
 --patch-translations=<CSV_FILE>=<SRC_PATH>    Patch translations with the specified CSV file and source path
                                                  (e.g. "/path/to/translation.csv=res://translations/translation.csv") (can be repeated)
---gdre-help                                   Print the help message and exit
---gdre-version                                Print the version of GDRE tools and exit
+--godot-version                               Print the version of Godot engine and exit
+--godot-help                                  Print the help message of Godot engine and exit
+--help, --gdre-help                           Print this help message and exit
+--version, --gdre-version                     Print this version of GDRE tools and exit
 
 Recover/Extract Options:
 
@@ -141,15 +143,19 @@ Support has yet to be implemented for converting the following resources:
 Clone this repository into Godot's `modules` subfolder as `gdsdecomp`.
 Rebuild Godot engine as described in https://docs.godotengine.org/en/latest/development/compiling/index.html.
 
-You will also need [rustup](https://rustup.rs) and [dotnet 9 sdk](https://dotnet.microsoft.com/en-us/download/dotnet/9.0).
+You will also need [rustup](https://rustup.rs) and [dotnet 10 sdk](https://dotnet.microsoft.com/en-us/download/dotnet/10.0).
 
 For ease of bootstrapping development, we have included launch, build, and settings templates for vscode in the .vscode directory. Once you have read the instructions for compiling Godot above and set up your build environment: put these in the .vscode folder in the Godot directory (not gdsdecomp), remove the ".template" from each, and launch vscode from the Godot directory.
 
-Note: Make sure to build the editor build first, and to launch the editor to edit the project in the `standalone` directory at least once so that resources are imported before running.
+Make sure to build the editor build first, and to launch the editor to edit the project in the `standalone` directory at least once so that resources are imported before running.
+
+### Note:
+
+During SCons configure, the module auto-applies the patches under `modules/gdsdecomp/patches/` to Godot core files (currently just `main/main.cpp`, to hook `gdre::modify_cli_args` into CLI parsing). The application is idempotent: re-running `scons` is a no-op once patched. If you remove the module or want to restore the originals, revert the affected files manually with `git checkout -- main/main.cpp`.
 
 ### Requirements
 
-[Our fork of godot](https://github.com/nikitalita/godot) @ branch `gdre-wb-babc272d44e`
+[Our fork of godot](https://github.com/nikitalita/godot) @ branch `gdre-wb-a8643700ce8`
 
 - 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

@@ -34,6 +34,18 @@ 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,
+    GODOT_MONO_DECOMP_INCLUDE_DIR,
+    MODULE_INCLUDE_DIR,
+    MMP3_THIRDPARTY_DIR,
+    LIBOGG_THIRDPARTY_DIR,
+    LIBVORBIS_THIRDPARTY_DIR,
+    LIBTHEORA_THIRDPARTY_DIR,
+    MBEDTLS_THIRDPARTY_DIR,
+    UNSIGNED_HASH_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++")
@@ -57,26 +69,12 @@ if env["tests"]:
     env_gdsdecomp.Append(CPPDEFINES=["TESTS_ENABLED"])
     append_cpppaths(
         env,
-        [
-            VTRACER_INCLUDE_DIR,
-            GODOT_MONO_DECOMP_INCLUDE_DIR,
-            MODULE_INCLUDE_DIR,
-            MMP3_THIRDPARTY_DIR,
-            LIBOGG_THIRDPARTY_DIR,
-            LIBVORBIS_THIRDPARTY_DIR,
-        ],
+        INCLUDE_DIRS,
     )
 
 append_cpppaths(
     env_gdsdecomp,
-    [
-        VTRACER_INCLUDE_DIR,
-        GODOT_MONO_DECOMP_INCLUDE_DIR,
-        MODULE_INCLUDE_DIR,
-        THORSVG_THIRDPARTY_DIR,
-        LIBTHEORA_THIRDPARTY_DIR,
-        MBEDTLS_THIRDPARTY_DIR,
-    ],
+    INCLUDE_DIRS,
 )
 
 if env["disable_exceptions"]:
@@ -115,11 +113,14 @@ common_sources = [
     "crypto/*.cpp",
     "exporters/*.cpp",
     "gui/*.cpp",
+    "main/*.cpp",
     "plugin_manager/*.cpp",
     "utility/*.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',
 ]
 add_source_groups(env_gdsdecomp, module_obj, common_sources)
 if env["target"] == "editor":

build/patches.py

@@ -0,0 +1,54 @@
+import os
+import subprocess
+
+from SCons.Errors import UserError
+
+
+CORE_PATCHES = [
+    {
+        "patch": "modules/gdsdecomp/patches/main-cli-parse-inject.patch",
+        "target": "main/main.cpp",
+        "marker": "gdre::modify_cli_args",
+    },
+]
+
+
+def _is_applied(repo_root, target, marker):
+    target_path = os.path.join(repo_root, target)
+    try:
+        with open(target_path, "r", encoding="utf-8") as f:
+            return marker in f.read()
+    except OSError as e:
+        raise UserError(f"gdsdecomp: cannot read {target} to verify patch state: {e}")
+
+
+def _git_apply(repo_root, patch_rel_path):
+    patch_abs_path = os.path.join(repo_root, patch_rel_path)
+    if not os.path.isfile(patch_abs_path):
+        raise UserError(f"gdsdecomp: patch file not found at {patch_rel_path}")
+    result = subprocess.run(
+        ["git", "-C", repo_root, "apply", "--whitespace=nowarn", patch_rel_path],
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode != 0:
+        raise UserError(
+            "gdsdecomp: failed to apply "
+            + patch_rel_path
+            + "\n"
+            + (result.stderr or result.stdout or "<no output>")
+        )
+
+
+def apply_core_patches(env):
+    repo_root = env.Dir("#").abspath
+    for entry in CORE_PATCHES:
+        patch_rel = entry["patch"]
+        target = entry["target"]
+        marker = entry["marker"]
+        patch_name = os.path.basename(patch_rel)
+        if _is_applied(repo_root, target, marker):
+            print(f"gdsdecomp: {patch_name} already applied to {target}, skipping")
+            continue
+        _git_apply(repo_root, patch_rel)
+        print(f"gdsdecomp: applied {patch_name} to {target}")

build/paths.py

@@ -10,6 +10,9 @@
 LIBVORBIS_THIRDPARTY_DIR = "#thirdparty/libvorbis/"
 WEBP_THIRDPARTY_DIR = "#thirdparty/libwebp/"
 THORSVG_THIRDPARTY_DIR = "#thirdparty/thorsvg/"
+UNSIGNED_HASH_DIR = "#modules/gdsdecomp/external/unsigned-hash-cpp"
+UNSIGNED_HASH_INCLUDE_DIR = f'{UNSIGNED_HASH_DIR}/include'
+UNSIGNED_HASH_SRC_DIR = f'{UNSIGNED_HASH_DIR}/src'
 MODULE_INCLUDE_DIR = "#modules/gdsdecomp/"
 VTRACER_INCLUDE_DIR = "#modules/gdsdecomp/external/vtracer/include"
 GODOT_MONO_DECOMP_INCLUDE_DIR = "#modules/gdsdecomp/godot-mono-decomp/GodotMonoDecompNativeAOT/include"