Merge remote-tracking branch 'modbase/main' into vanilla-merge

.github/scripts/releases/extract_build_unix.sh

@@ -32,4 +32,4 @@ cp -r $SOURCE/decompiler/config $DEST/data/decompiler/
 cp -r $SOURCE/goal_src $DEST/data
 cp -r $SOURCE/game/assets $DEST/data/game/
 cp -r $SOURCE/game/graphics/opengl_renderer/shaders $DEST/data/game/graphics/opengl_renderer
-cp -r $SOURCE/custom_levels $DEST/data
+cp -r $SOURCE/custom_assets $DEST/data

.github/scripts/releases/extract_build_windows.sh

@@ -24,4 +24,4 @@ cp -r $SOURCE/decompiler/config $DEST/data/decompiler/
 cp -r $SOURCE/goal_src $DEST/data
 cp -r $SOURCE/game/assets $DEST/data/game/
 cp -r $SOURCE/game/graphics/opengl_renderer/shaders $DEST/data/game/graphics/opengl_renderer
-cp -r $SOURCE/custom_levels $DEST/data
+cp -r $SOURCE/custom_assets $DEST/data

.github/workflows/compiler-output-check.yaml

@@ -0,0 +1,96 @@
+name: Compilation Check
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Compare
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          ref: master
+
+      - name: Install Package Dependencies
+        run: |
+          sudo apt update
+          sudo apt install build-essential cmake \
+            clang gcc g++ lcov make nasm libxrandr-dev \
+            libxinerama-dev libxcursor-dev libpulse-dev \
+            libxi-dev zip ninja-build libgl1-mesa-dev libssl-dev
+
+      - name: Setup sccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          variant: sccache
+          key: linux-ubuntu-20.04--Release-linux-clang-asan-${{ github.sha }}
+          restore-keys: linux-ubuntu-20.04--Release-linux-clang-asan
+          max-size: 1000M
+
+      - name: CMake Generation (master)
+        env:
+          CC: clang
+          CXX: clang++
+        run: |
+          cmake -B build --preset=Release-linux-clang-asan \
+            -DCMAKE_C_COMPILER_LAUNCHER=sccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+
+      - name: Build goalc (master)
+        run: cmake --build build --parallel $((`nproc`)) --target goalc
+
+      - name: Compile and preserve (master)
+        run: |
+          ./build/goalc/goalc --game jak1 --cmd "(make-group \"all-code\")"
+          ./build/goalc/goalc --game jak2 --cmd "(make-group \"all-code\")"
+          ./build/goalc/goalc --game jak3 --cmd "(make-group \"all-code\")"
+          mv ./out/jak1/obj ./out/jak1/obj.master
+          mv ./out/jak2/obj ./out/jak2/obj.master
+          mv ./out/jak3/obj ./out/jak3/obj.master
+
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          clean: "false"
+
+      - name: CMake Generation (PR)
+        env:
+          CC: clang
+          CXX: clang++
+        run: |
+          cmake -B build --preset=Release-linux-clang-asan \
+            -DCMAKE_C_COMPILER_LAUNCHER=sccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+
+      - name: Build goalc (PR)
+        run: cmake --build build --parallel $((`nproc`)) --target goalc
+
+      - name: Compile and preserve (PR)
+        run: |
+          ./build/goalc/goalc --game jak1 --cmd "(make-group \"all-code\")"
+          ./build/goalc/goalc --game jak2 --cmd "(make-group \"all-code\")"
+          ./build/goalc/goalc --game jak3 --cmd "(make-group \"all-code\")"
+          mv ./out/jak1/obj ./out/jak1/obj.pr
+          mv ./out/jak2/obj ./out/jak2/obj.pr
+          mv ./out/jak3/obj ./out/jak3/obj.pr
+
+      - name: Compare Results and Produce Report
+        run: |
+          ls -l ./out/jak1
+          ls -l ./out/jak2
+          ls -l ./out/jak3
+          set +e
+          python ./scripts/gsrc/compare-compilation-outputs.py --base "./out/jak1/obj.master,./out/jak2/obj.master,./out/jak3/obj.master" --compare "./out/jak1/obj.pr,./out/jak2/obj.pr,./out/jak3/obj.pr" --markdown
+          SCRIPT_EXIT_CODE=$?
+          cat ./comp-diff-report.md >> $GITHUB_STEP_SUMMARY
+          if [ "$SCRIPT_EXIT_CODE" -ne 0 ]; then
+            exit 1
+          fi
+
+

.github/workflows/linux-build-clang.yaml

@@ -35,7 +35,7 @@ jobs:
             libudev-dev libopenal-dev libflac-dev libogg-dev libvorbis-dev
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].12
+        uses: hendrikmuhs/[email protected].13
         with:
           variant: sccache
           key: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/linux-build-gcc.yaml

@@ -34,7 +34,7 @@ jobs:
             sudo update-alternatives --set g++ /usr/bin/g++-10
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].12
+        uses: hendrikmuhs/[email protected].13
         with:
           variant: sccache
           key: linux-ubuntu-20.04-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/macos-build-arm.yaml

@@ -27,7 +27,7 @@ jobs:
         run: arch -arm64 brew install cmake ninja
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].12
+        uses: hendrikmuhs/[email protected].13
         with:
           variant: sccache
           key: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/macos-build.yaml

@@ -28,7 +28,7 @@ jobs:
         run: brew install cmake nasm ninja
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].12
+        uses: hendrikmuhs/[email protected].13
         with:
           variant: sccache
           key: macos-12-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/windows-build-clang.yaml

@@ -36,7 +36,7 @@ jobs:
           }
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].12
+        uses: hendrikmuhs/[email protected].13
         with:
           variant: sccache
           key: windows-2022-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.github/workflows/windows-build-msvc.yaml

@@ -31,7 +31,7 @@ jobs:
           }
 
       - name: Setup sccache
-        uses: hendrikmuhs/[email protected].12
+        uses: hendrikmuhs/[email protected].13
         with:
           variant: sccache
           key: windows-2022-${{ inputs.cachePrefix }}-${{ inputs.cmakePreset }}-${{ github.sha }}

.gitignore

@@ -32,13 +32,15 @@ linux-default/
 *.bin
 *.log
 *.p2s
+out/
 savestate-out/
 savestate_out/
 failures/
 ee-results*.json
 search-results.json
 .env
 /search-results.json
+comp-diff-report.md
 
 # graphics debug
 debug_out/
@@ -53,6 +55,26 @@ imgui.ini
 # website stuff
 node_modules/
 
+# texture replacements
+# custom_assets/jak1/texture_replacements/*
+# custom_assets/jak2/texture_replacements/*
+# custom_assets/jak3/texture_replacements/*
+
+# merc replacements
+custom_assets/jak1/merc_replacements/*
+custom_assets/jak2/merc_replacements/*
+custom_assets/jak3/merc_replacements/*
+
+# merc replacements
+custom_assets/jak1/merc_replacements/*
+custom_assets/jak2/merc_replacements/*
+custom_assets/jak3/merc_replacements/*
+
+# merc replacements
+custom_assets/jak1/merc_replacements/*
+custom_assets/jak2/merc_replacements/*
+custom_assets/jak3/merc_replacements/*
+
 # generated cmake files
 svnrev.h
 common/versions/revision.h
@@ -92,4 +114,5 @@ out/jak2/fr3.rar
 *.diff
 
 # blender backup files
-*.blend1
+*.blend1
+goalc-report.html