Partial ratio text implementation

Text/Line vectors could've been added to even if Reddog was never enabled, thus only ever expanding in size as they couldn't update.

.github/workflows/build-flatpak.yml

@@ -1,73 +0,0 @@
-name: Build Project (Flatpak)
-
-on:
-  workflow_dispatch:
-
-env:
-  FLATPAK_ID: io.github.hedge_dev.unleashedrecomp
-  FREEDESKTOP_VERSION: 23.08
-  LLVM_VERSION: 18
-
-jobs:
-  build-flatpak:
-    name: Build Flatpak
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.ORG_TOKEN }}
-
-      - name: Checkout private repository
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.ASSET_REPO }}
-          token: ${{ secrets.ASSET_REPO_TOKEN }}
-          path: flatpak/private
-
-      - name: Install dependencies
-        run: |-
-          sudo apt update
-          sudo apt install -y flatpak-builder ccache
-
-      - name: Cache ccache directory
-        uses: actions/cache@v4
-        with:
-          path: /tmp/ccache
-          key: ccache-${{ runner.os }}
-
-      - name: Prepare Flatpak
-        run: |
-          flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak --user install -y flathub org.freedesktop.Sdk//${{ env.FREEDESKTOP_VERSION }}
-          flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm${{ env.LLVM_VERSION }}//${{ env.FREEDESKTOP_VERSION }}
-
-      - name: Build Flatpak
-        run: |
-          echo "commit_message=$(git log -1 --pretty=%s)" >> $GITHUB_ENV
-          export CCACHE_DIR=/tmp/ccache
-          flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo --ccache builddir ./flatpak/${{ env.FLATPAK_ID }}.json
-          flatpak build-bundle repo ./${{ env.FLATPAK_ID }}.flatpak ${{ env.FLATPAK_ID }} --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
-
-# Uploads the built flatpak bundle to GitHub
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: UnleashedRecomp-flatpak
-#          path: ./${{ env.FLATPAK_ID }}.flatpak
-      
-      - name: Upload artifact to Discord
-        env: 
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        if: ${{ env.DISCORD_WEBHOOK != '' }}
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ env.DISCORD_WEBHOOK }}
-          content: |
-            OS: Linux
-            Summary: ${{ env.commit_message }}
-            Commit: ${{ github.sha }}
-            Branch: ${{ github.ref_name }}
-          filename: ./${{ env.FLATPAK_ID }}.flatpak

.github/workflows/build-windows.yml

@@ -1,94 +0,0 @@
-name: Build Project (Windows)
-
-on:
-  workflow_dispatch:
-
-env:
-  CMAKE_PRESET: x64-Clang-Release
-
-jobs:
-  build:
-    name: Build Windows
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.ORG_TOKEN }}
-
-      - name: Checkout private repository
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.ASSET_REPO }}
-          token: ${{ secrets.ASSET_REPO_TOKEN }}
-          path: .\private
-
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ccache-${{ runner.os }}
-
-      - name: Cache vcpkg
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./thirdparty/vcpkg/downloads
-            ./thirdparty/vcpkg/packages
-          key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
-          restore-keys: |
-              vcpkg-${{ runner.os }}-
-
-      - name: Install dependencies
-        run: |
-          choco install ninja
-          Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-      
-      - name: Configure Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Prepare Project
-        run: |
-          $commitMessage = git log -1 --pretty=%s
-          Add-Content -Path $env:GITHUB_ENV -Value "commit_message=$commitMessage"
-          copy .\private\* .\UnleashedRecompLib\private
-
-      - name: Configure Project
-        run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
-
-      - name: Build Project
-        run: cmake --build .\out\build\${{ env.CMAKE_PRESET }} --target UnleashedRecomp
-      
-      - name: Pack Release
-        run: |
-          New-Item -ItemType Directory -Path .\release
-          New-Item -ItemType Directory -Path .\release\D3D12
-
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\D3D12\D3D12Core.dll" -Destination ".\release\D3D12\D3D12Core.dll"
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\dxcompiler.dll" -Destination ".\release\dxcompiler.dll"
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\dxil.dll" -Destination ".\release\dxil.dll"
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\UnleashedRecomp.exe" -Destination ".\release\UnleashedRecomp.exe"
-
-          Compress-Archive -Path .\release\* -DestinationPath .\UnleashedRecomp-Windows.zip
-
-# Uploads the packed zip file to GitHub
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: UnleashedRecomp-Windows
-#          path: .\UnleashedRecomp-Windows.zip
-      
-      - name: Upload artifact to Discord
-        env: 
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        if: ${{ env.DISCORD_WEBHOOK != '' }}
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ env.DISCORD_WEBHOOK }}
-          content: |
-            OS: Windows
-            Summary: ${{ env.commit_message }}
-            Commit: ${{ github.sha }}
-            Branch: ${{ github.ref_name }}
-          filename: .\UnleashedRecomp-Windows.zip

.gitmodules

@@ -1,12 +1,12 @@
-[submodule "tools/XenonRecomp"]
+[submodule "thirdparty/PowerRecomp"]
-	path = tools/XenonRecomp
+	path = tools/PowerRecomp
-	url = https://github.com/hedge-dev/XenonRecomp.git
+	url = https://github.com/hedge-dev/PowerRecomp
 [submodule "thirdparty/ddspp"]
 	path = thirdparty/ddspp
 	url = https://github.com/redorav/ddspp.git
-[submodule "tools/XenosRecomp"]
+[submodule "thirdparty/ShaderRecomp"]
-	path = tools/XenosRecomp
+	path = tools/ShaderRecomp
-	url = https://github.com/hedge-dev/XenosRecomp.git
+	url = https://github.com/hedge-dev/ShaderRecomp.git
 [submodule "thirdparty/libmspack"]
 	path = thirdparty/libmspack
 	url = https://github.com/kyz/libmspack
@@ -61,6 +61,3 @@
 [submodule "thirdparty/implot"]
 	path = thirdparty/implot
 	url = https://github.com/epezent/implot.git
-[submodule "thirdparty/json"]
-	path = thirdparty/json
-	url = https://github.com/nlohmann/json

CMakeLists.txt

@@ -5,8 +5,8 @@ if(NOT DEFINED ENV{VCPKG_ROOT})
 endif()
 
 include($ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
-set(UNLEASHED_RECOMP_THIRDPARTY_ROOT ${CMAKE_SOURCE_DIR}/thirdparty)
+set(SWA_THIRDPARTY_ROOT ${CMAKE_SOURCE_DIR}/thirdparty)
-set(UNLEASHED_RECOMP_TOOLS_ROOT ${CMAKE_SOURCE_DIR}/tools)
+set(SWA_TOOLS_ROOT ${CMAKE_SOURCE_DIR}/tools)
 set(CMAKE_CXX_STANDARD 20)
 set(BUILD_SHARED_LIBS OFF)
 
@@ -18,13 +18,8 @@ endif()
 
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-# Target Sandy Bridge for all projects
+add_subdirectory(${SWA_THIRDPARTY_ROOT})
-add_compile_options(
+add_subdirectory(${SWA_TOOLS_ROOT})
-    -march=sandybridge
-)
-
-add_subdirectory(${UNLEASHED_RECOMP_THIRDPARTY_ROOT})
-add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT})
 
 project("UnleashedRecomp-ALL")
 

CMakePresets.json

@@ -23,7 +23,8 @@
                 "type": "equals",
                 "lhs": "${hostSystemName}",
                 "rhs": "Windows"
-            }
+            },
+            "toolset": "ClangCL"
         },
         {
             "name": "x64-Clang-Debug",

UnleashedRecomp/CMakeLists.txt

@@ -1,13 +1,16 @@
 project("UnleashedRecomp")
+set(TARGET_NAME "SWA")
 
 if (WIN32)
-    option(UNLEASHED_RECOMP_D3D12 "Add D3D12 support for rendering" ON)
+    option(SWA_D3D12 "Add D3D12 support for rendering" ON)
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF)
+    option(SWA_FLATPAK "Configure the build for Flatpak compatibility." OFF)
 endif()
 
+option(SWA_XAUDIO2 "Use XAudio2 for audio playback" OFF)
+
 function(BIN2C)
     cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN})
 
@@ -39,7 +42,9 @@ function(BIN2C)
 endfunction()
 
 add_compile_options(
+    -march=sandybridge
     -fno-strict-aliasing
+
     -Wno-switch
     -Wno-unused-function
     -Wno-unused-variable
@@ -59,15 +64,16 @@ else()
 endif()
 
 add_compile_definitions(
+    SWA_IMPL
     SDL_MAIN_HANDLED
     _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # Microsoft wtf?
     _CRT_SECURE_NO_WARNINGS)
 
-set(UNLEASHED_RECOMP_PRECOMPILED_HEADERS
+set(SWA_PRECOMPILED_HEADERS
     "stdafx.h"
 )
 
-set(UNLEASHED_RECOMP_KERNEL_CXX_SOURCES
+set(SWA_KERNEL_CXX_SOURCES
     "kernel/imports.cpp"
     "kernel/xdm.cpp"
     "kernel/heap.cpp"
@@ -76,13 +82,21 @@ set(UNLEASHED_RECOMP_KERNEL_CXX_SOURCES
     "kernel/io/file_system.cpp"
 )
 
-set(UNLEASHED_RECOMP_LOCALE_CXX_SOURCES
+set(SWA_LOCALE_CXX_SOURCES
     "locale/config_locale.cpp"
     "locale/locale.cpp"
 )
 
+set(SWA_OS_CXX_SOURCES
+    "os/logger.cpp"
+    "os/media.cpp"
+    "os/process.cpp"
+    "os/user.cpp"
+    "os/version.cpp"
+)
+
 if (WIN32)
-    set(UNLEASHED_RECOMP_OS_CXX_SOURCES
+    list(APPEND SWA_OS_CXX_SOURCES
         "os/win32/logger_win32.cpp"
         "os/win32/media_win32.cpp"
         "os/win32/process_win32.cpp"
@@ -90,7 +104,7 @@ if (WIN32)
         "os/win32/version_win32.cpp"
     )
 elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(UNLEASHED_RECOMP_OS_CXX_SOURCES
+    list(APPEND SWA_OS_CXX_SOURCES
         "os/linux/logger_linux.cpp"
         "os/linux/media_linux.cpp"
         "os/linux/process_linux.cpp"
@@ -99,11 +113,11 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
     )
 endif()
 
-set(UNLEASHED_RECOMP_CPU_CXX_SOURCES
+set(SWA_CPU_CXX_SOURCES
     "cpu/guest_thread.cpp"
 )
 
-set(UNLEASHED_RECOMP_GPU_CXX_SOURCES
+set(SWA_GPU_CXX_SOURCES
     "gpu/video.cpp"
     "gpu/imgui/imgui_common.cpp"
     "gpu/imgui/imgui_font_builder.cpp"
@@ -111,34 +125,38 @@ set(UNLEASHED_RECOMP_GPU_CXX_SOURCES
     "gpu/rhi/plume_vulkan.cpp"
 )
 
-if (UNLEASHED_RECOMP_D3D12)
+if (SWA_D3D12)
-    list(APPEND UNLEASHED_RECOMP_GPU_CXX_SOURCES
+    list(APPEND SWA_GPU_CXX_SOURCES
         "gpu/rhi/plume_d3d12.cpp"
     )
 endif()
 
-set(UNLEASHED_RECOMP_APU_CXX_SOURCES
+set(SWA_APU_CXX_SOURCES
     "apu/audio.cpp"
-    "apu/embedded_player.cpp"
+    "apu/embedded_player.cpp"
-    "apu/driver/sdl2_driver.cpp"
 )
 
-set(UNLEASHED_RECOMP_HID_CXX_SOURCES
+if (SWA_XAUDIO2)
+    list(APPEND SWA_APU_CXX_SOURCES "apu/driver/xaudio_driver.cpp")
+else()
+    list(APPEND SWA_APU_CXX_SOURCES "apu/driver/sdl2_driver.cpp")
+endif()
+
+set(SWA_HID_CXX_SOURCES
     "hid/hid.cpp"
     "hid/driver/sdl_hid.cpp"
 )
 
-set(UNLEASHED_RECOMP_PATCHES_CXX_SOURCES
+set(SWA_PATCHES_CXX_SOURCES
+    "patches/ui/CHudPause_patches.cpp"
+    "patches/ui/CTitleStateIntro_patches.cpp"
+    "patches/ui/CTitleStateMenu_patches.cpp"
+    "patches/ui/frontend_listener.cpp"
     "patches/aspect_ratio_patches.cpp"
     "patches/audio_patches.cpp"
     "patches/camera_patches.cpp"
-    "patches/CGameModeStageTitle_patches.cpp"
+    "patches/debug_patches.cpp"
-    "patches/CHudPause_patches.cpp"
-    "patches/CTitleStateIntro_patches.cpp"
-    "patches/CTitleStateMenu_patches.cpp"
     "patches/fps_patches.cpp"
-    "patches/frontend_listener.cpp"
-    "patches/input_patches.cpp"
     "patches/inspire_patches.cpp"
     "patches/misc_patches.cpp"
     "patches/object_patches.cpp"
@@ -147,25 +165,32 @@ set(UNLEASHED_RECOMP_PATCHES_CXX_SOURCES
     "patches/video_patches.cpp"
 )
 
-set(UNLEASHED_RECOMP_UI_CXX_SOURCES
+set(SWA_UI_CXX_SOURCES
+    "ui/reddog/windows/counter_window.cpp"
+    "ui/reddog/windows/exports_window.cpp"
+    "ui/reddog/windows/view_window.cpp"
+    "ui/reddog/windows/welcome_window.cpp"
+    "ui/reddog/windows/window_list.cpp"
+    "ui/reddog/reddog_controls.cpp"
+    "ui/reddog/reddog_manager.cpp"
+    "ui/reddog/reddog_window.cpp"
+    "ui/reddog/debug_draw.cpp"
     "ui/achievement_menu.cpp"
-    "ui/achievement_overlay.cpp"
+    "ui/achievement_overlay.cpp"
-    "ui/black_bar.cpp"
+    "ui/installer_wizard.cpp"
     "ui/button_guide.cpp"
     "ui/fader.cpp"
-    "ui/game_window.cpp"
-    "ui/imgui_utils.cpp"
-    "ui/installer_wizard.cpp"
     "ui/message_window.cpp"
-    "ui/options_menu.cpp"
     "ui/options_menu_thumbnails.cpp"
+    "ui/options_menu.cpp"
+    "ui/sdl_listener.cpp"
+    "ui/game_window.cpp"
 )
 
-set(UNLEASHED_RECOMP_INSTALL_CXX_SOURCES
+set(SWA_INSTALL_CXX_SOURCES
     "install/installer.cpp"
     "install/iso_file_system.cpp"
     "install/memory_mapped_file.cpp"
-    "install/update_checker.cpp"
     "install/xcontent_file_system.cpp"
     "install/xex_patcher.cpp"
     "install/hashes/apotos_shamar.cpp"
@@ -178,145 +203,97 @@ set(UNLEASHED_RECOMP_INSTALL_CXX_SOURCES
     "install/hashes/update.cpp"
 )
 
-set(UNLEASHED_RECOMP_USER_CXX_SOURCES
+set(SWA_USER_CXX_SOURCES
     "user/achievement_data.cpp"
-    "user/achievement_manager.cpp"
+    "user/config.cpp"
-    "user/config.cpp"
-    "user/registry.cpp"
-    "user/paths.cpp"
 )
 
-set(UNLEASHED_RECOMP_MOD_CXX_SOURCES
+set(SWA_MOD_CXX_SOURCES
     "mod/mod_loader.cpp"
 )
 
-set(UNLEASHED_RECOMP_THIRDPARTY_SOURCES
+set(SWA_THIRDPARTY_SOURCES
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/backends/imgui_impl_sdl2.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/backends/imgui_impl_sdl2.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_demo.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_demo.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_draw.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_draw.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_tables.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_tables.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_widgets.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_widgets.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot.cpp"
+    "${SWA_THIRDPARTY_ROOT}/implot/implot.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_demo.cpp"
+    "${SWA_THIRDPARTY_ROOT}/implot/implot_demo.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_items.cpp"
+    "${SWA_THIRDPARTY_ROOT}/implot/implot_items.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/libmspack/libmspack/mspack/lzxd.c"
+    "${SWA_THIRDPARTY_ROOT}/libmspack/libmspack/mspack/lzxd.c"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/tiny-AES-c/aes.c"
+    "${SWA_THIRDPARTY_ROOT}/tiny-AES-c/aes.c"
-    "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source/smolv.cpp"
+    "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source/smolv.cpp"
 )
 
-set(UNLEASHED_RECOMP_THIRDPARTY_INCLUDES
+set(SWA_THIRDPARTY_INCLUDES
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/concurrentqueue"
+    "${SWA_THIRDPARTY_ROOT}/concurrentqueue"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/ddspp"
+    "${SWA_THIRDPARTY_ROOT}/ddspp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui"
+    "${SWA_THIRDPARTY_ROOT}/imgui"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot"
+    "${SWA_THIRDPARTY_ROOT}/implot"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/json/include"
+    "${SWA_THIRDPARTY_ROOT}/libmspack/libmspack/mspack"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/libmspack/libmspack/mspack"
+    "${SWA_THIRDPARTY_ROOT}/magic_enum/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/magic_enum/include"
+    "${SWA_THIRDPARTY_ROOT}/stb"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/stb"
+    "${SWA_THIRDPARTY_ROOT}/tiny-AES-c"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/tiny-AES-c"
+    "${SWA_THIRDPARTY_ROOT}/TinySHA1"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/TinySHA1"
+    "${SWA_THIRDPARTY_ROOT}/unordered_dense/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/unordered_dense/include"
+    "${SWA_THIRDPARTY_ROOT}/volk"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/volk"
+    "${SWA_THIRDPARTY_ROOT}/Vulkan-Headers/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/Vulkan-Headers/include"
+    "${SWA_THIRDPARTY_ROOT}/VulkanMemoryAllocator/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/VulkanMemoryAllocator/include"
+    "${SWA_TOOLS_ROOT}/bc_diff"
-    "${UNLEASHED_RECOMP_TOOLS_ROOT}/bc_diff"
+    "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source"
-    "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source"
 )
 
-if (UNLEASHED_RECOMP_D3D12)
+if (SWA_D3D12)
-    list(APPEND UNLEASHED_RECOMP_THIRDPARTY_INCLUDES "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/D3D12MemoryAllocator/include")
+    list(APPEND SWA_THIRDPARTY_INCLUDES "${SWA_THIRDPARTY_ROOT}/D3D12MemoryAllocator/include")
-    list(APPEND UNLEASHED_RECOMP_THIRDPARTY_SOURCES "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/D3D12MemoryAllocator/src/D3D12MemAlloc.cpp")
+    list(APPEND SWA_THIRDPARTY_SOURCES "${SWA_THIRDPARTY_ROOT}/D3D12MemoryAllocator/src/D3D12MemAlloc.cpp")
 endif()
 
-set_source_files_properties(${UNLEASHED_RECOMP_THIRDPARTY_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+set_source_files_properties(${SWA_THIRDPARTY_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 
-set(UNLEASHED_RECOMP_CXX_SOURCES
+set(SWA_CXX_SOURCES
     "app.cpp"
     "exports.cpp"
     "main.cpp"
     "misc_impl.cpp"
-    "sdl_listener.cpp"
     "stdafx.cpp"
     "version.cpp"
     
-    ${UNLEASHED_RECOMP_KERNEL_CXX_SOURCES}
+    ${SWA_KERNEL_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_LOCALE_CXX_SOURCES}
+    ${SWA_LOCALE_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_OS_CXX_SOURCES}
+    ${SWA_OS_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_CPU_CXX_SOURCES}
+    ${SWA_CPU_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_GPU_CXX_SOURCES}
+    ${SWA_GPU_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_APU_CXX_SOURCES}
+    ${SWA_APU_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_HID_CXX_SOURCES}
+    ${SWA_HID_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_PATCHES_CXX_SOURCES}
+    ${SWA_PATCHES_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_UI_CXX_SOURCES}
+    ${SWA_UI_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_INSTALL_CXX_SOURCES}
+    ${SWA_INSTALL_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_USER_CXX_SOURCES}
+    ${SWA_USER_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_MOD_CXX_SOURCES}
+    ${SWA_MOD_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_THIRDPARTY_SOURCES}
+    ${SWA_THIRDPARTY_SOURCES}
-)
+)
-
-include("version.cmake")
-
-set(VERSION_TXT "${PROJECT_SOURCE_DIR}/res/version.txt")
-
-# Only show Git info and build type if not Release.
-set(SHOW_GIT_INFO_AND_BUILD_TYPE 0)
-if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Release")
-    set(SHOW_GIT_INFO_AND_BUILD_TYPE 1)
-endif()
-
-GenerateVersionSources(
-    OUTPUT_DIR ${PROJECT_SOURCE_DIR}
-    VERSION_TXT ${VERSION_TXT}
-    H_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.h.template"
-    CXX_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.cpp.template"
-    BUILD_TYPE ${CMAKE_BUILD_TYPE}
-    SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-    SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-)
 
 if (WIN32)
-    # Create binary version number for Win32 integer attributes.
+    # Set up Win32 resources for application icon.
-    CreateVersionString(
+    set(ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico")
-        VERSION_TXT ${VERSION_TXT}
-        OUTPUT_CSV 1
-        OUTPUT_VAR WIN32_VERSION_BINARY
-    )
-
-    # Create string version number for Win32 detailed attributes.
-    CreateVersionString(
-        VERSION_TXT ${VERSION_TXT}
-        BUILD_TYPE ${CMAKE_BUILD_TYPE}
-        SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-        SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-        OUTPUT_VAR WIN32_VERSION_STRING
-    )
-
-    # Set Win32 icon path.
-    set(WIN32_ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico")
-
     configure_file("res/win32/res.rc.template" "${CMAKE_BINARY_DIR}/res.rc" @ONLY)
-    add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc")
+    add_executable(UnleashedRecomp ${SWA_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc")
-
-    # Hide console for release configurations.
-    if (${CMAKE_BUILD_TYPE} MATCHES "Release")
-        target_link_options(UnleashedRecomp PRIVATE "/SUBSYSTEM:WINDOWS" "/ENTRY:mainCRTStartup")
-    endif()
 else()
-    add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES})
+    add_executable(UnleashedRecomp ${SWA_CXX_SOURCES})
 endif()
 
-if (UNLEASHED_RECOMP_FLATPAK)
+set_target_properties(UnleashedRecomp PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-    target_compile_definitions(UnleashedRecomp PRIVATE 
+
-        "UNLEASHED_RECOMP_FLATPAK"
+if (SWA_FLATPAK)
-        "GAME_INSTALL_DIRECTORY=\"/var/data\""
+    target_compile_definitions(UnleashedRecomp PRIVATE "GAME_INSTALL_DIRECTORY=\"/var/data\"")
-    )
 endif()
 
-if (UNLEASHED_RECOMP_D3D12)
+if (SWA_D3D12)
     find_package(directx-headers CONFIG REQUIRED)
     find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_D3D12)
+    target_compile_definitions(UnleashedRecomp PRIVATE SWA_D3D12)
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -324,9 +301,8 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 endif()
 
 find_package(directx-dxc REQUIRED)
-find_package(CURL REQUIRED)
 
-if (UNLEASHED_RECOMP_D3D12)
+if (SWA_D3D12)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12)
     add_custom_command(TARGET UnleashedRecomp POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> ${CMAKE_CURRENT_BINARY_DIR}/D3D12
@@ -351,12 +327,10 @@ file(CHMOD ${DIRECTX_DXC_TOOL} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 if (WIN32)
     target_link_libraries(UnleashedRecomp PRIVATE
-        comctl32
+        comctl32
-        dwmapi
+        ntdll
-        ntdll
-        Shcore
-        Synchronization
         winmm
+        Synchronization
     )
 endif()
 
@@ -366,19 +340,18 @@ target_link_libraries(UnleashedRecomp PRIVATE
     msdf-atlas-gen::msdf-atlas-gen
     nfd::nfd
     o1heap
-    XenonUtils
+    PowerUtils
     SDL2::SDL2-static
     SDL2_mixer
     tomlplusplus::tomlplusplus
     UnleashedRecompLib
     xxHash::xxhash
-    CURL::libcurl
 )
 
 target_include_directories(UnleashedRecomp PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     "${CMAKE_CURRENT_SOURCE_DIR}/api"
-    ${UNLEASHED_RECOMP_THIRDPARTY_INCLUDES}
+    ${SWA_THIRDPARTY_INCLUDES}
 )
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -387,12 +360,12 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     target_link_libraries(UnleashedRecomp PRIVATE ${X11_LIBRARIES})
 endif()
 
-target_precompile_headers(UnleashedRecomp PUBLIC ${UNLEASHED_RECOMP_PRECOMPILED_HEADERS})
+target_precompile_headers(UnleashedRecomp PUBLIC ${SWA_PRECOMPILED_HEADERS})
 
 function(compile_shader FILE_PATH TARGET_NAME)
     set(FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gpu/shader/${FILE_PATH}.hlsl)
     cmake_path(GET FILE_PATH STEM VARIABLE_NAME)
-    if (UNLEASHED_RECOMP_D3D12)
+    if (SWA_D3D12)
         add_custom_command(
             OUTPUT ${FILE_PATH}.dxil.h
             COMMAND ${DIRECTX_DXC_TOOL} -T ${TARGET_NAME} -HV 2021 -all-resources-bound -Wno-ignored-attributes -Fh ${FILE_PATH}.dxil.h ${FILE_PATH} -Vn g_${VARIABLE_NAME}_dxil
@@ -416,10 +389,7 @@ function(compile_pixel_shader FILE_PATH)
     compile_shader(${FILE_PATH} ps_6_0)
 endfunction()
 
-compile_pixel_shader(blend_color_alpha_ps)
+compile_vertex_shader(copy_vs)
-compile_vertex_shader(copy_vs)
-compile_pixel_shader(copy_color_ps)
-compile_pixel_shader(copy_depth_ps)
 compile_pixel_shader(csd_filter_ps)
 compile_vertex_shader(csd_no_tex_vs)
 compile_vertex_shader(csd_vs)
@@ -432,10 +402,7 @@ compile_pixel_shader(gamma_correction_ps)
 compile_pixel_shader(imgui_ps)
 compile_vertex_shader(imgui_vs)
 compile_pixel_shader(movie_ps)
-compile_vertex_shader(movie_vs)
+compile_vertex_shader(movie_vs)
-compile_pixel_shader(resolve_msaa_color_2x)
-compile_pixel_shader(resolve_msaa_color_4x)
-compile_pixel_shader(resolve_msaa_color_8x)
 compile_pixel_shader(resolve_msaa_depth_2x)
 compile_pixel_shader(resolve_msaa_depth_4x)
 compile_pixel_shader(resolve_msaa_depth_8x)
@@ -469,6 +436,23 @@ generate_aggregate_header(
     "${CMAKE_CURRENT_SOURCE_DIR}/api/SWA.h"
 )
 
+# Only show build type if not Release.
+set(IS_BUILD_TYPE_IN_VER_STRING 0)
+if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Release")
+    set(IS_BUILD_TYPE_IN_VER_STRING 1)
+endif()
+
+include("version.cmake")
+GenerateVersionSources(
+    OUTPUT_DIR "${PROJECT_SOURCE_DIR}"
+    VERSION_TXT "${PROJECT_SOURCE_DIR}/res/version.txt"
+    H_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.h.template"
+    CXX_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.cpp.template"
+    BUILD_TYPE ${CMAKE_BUILD_TYPE}
+    IS_BUILD_TYPE_IN_VER_STRING ${IS_BUILD_TYPE_IN_VER_STRING}
+    IS_GIT_REPO 1
+)
+
 set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources")
 set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res")
 
@@ -480,8 +464,26 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/co
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/general_window.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/general_window.dds" ARRAY_NAME "g_general_window" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/hedge-dev.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/hedge-dev.dds" ARRAY_NAME "g_hedgedev" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/kbm.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/kbm.dds" ARRAY_NAME "g_kbm" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select.dds" ARRAY_NAME "g_select" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select_fade.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select_fade.dds" ARRAY_NAME "g_select_fade" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/light.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/light.dds" ARRAY_NAME "g_light" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select_fill.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select_fill.dds" ARRAY_NAME "g_select_fill" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_close_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_close_1.dds" ARRAY_NAME "g_button_close_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_close_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_close_2.dds" ARRAY_NAME "g_button_close_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_minimum_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_minimum_1.dds" ARRAY_NAME "g_button_minimum_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_minimum_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_minimum_2.dds" ARRAY_NAME "g_button_minimum_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_pin_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_pin_1.dds" ARRAY_NAME "g_button_pin_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_pin_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_pin_2.dds" ARRAY_NAME "g_button_pin_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/checkbox_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/checkbox_1.dds" ARRAY_NAME "g_checkbox_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/checkbox_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/checkbox_2.dds" ARRAY_NAME "g_checkbox_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/common_button_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/common_button_1.dds" ARRAY_NAME "g_common_button_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/common_button_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/common_button_2.dds" ARRAY_NAME "g_common_button_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/common_icon.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/common_icon.dds" ARRAY_NAME "g_common_icon")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/debug_icon.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/debug_icon.dds" ARRAY_NAME "g_debug_icon")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor.bmp" ARRAY_NAME "g_mouse_cursor")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_h.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_h.bmp" ARRAY_NAME "g_mouse_cursor_h")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_slant_l.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_slant_l.bmp" ARRAY_NAME "g_mouse_cursor_slant_l")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_slant_r.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_slant_r.bmp" ARRAY_NAME "g_mouse_cursor_slant_r")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_v.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_v.bmp" ARRAY_NAME "g_mouse_cursor_v")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/title_bar.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/title_bar.dds" ARRAY_NAME "g_title_bar")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/arrow_circle.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/arrow_circle.dds" ARRAY_NAME "g_arrow_circle" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_001.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_001.dds" ARRAY_NAME "g_install_001" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_002.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_002.dds" ARRAY_NAME "g_install_002" COMPRESSION_TYPE "zstd")
@@ -495,6 +497,7 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/in
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/pulse_install.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/pulse_install.dds" ARRAY_NAME "g_pulse_install" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" ARRAY_NAME "g_achievement_notifications" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_background_input.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_background_input.dds" ARRAY_NAME "g_allow_background_input" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_dpad_movement.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_dpad_movement.dds" ARRAY_NAME "g_allow_dpad_movement" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing.dds" ARRAY_NAME "g_antialiasing" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" ARRAY_NAME "g_aspect_ratio" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/battle_theme.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/battle_theme.dds" ARRAY_NAME "g_battle_theme" COMPRESSION_TYPE "zstd")
@@ -508,7 +511,8 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/op
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" ARRAY_NAME "g_gi_texture_filtering_bilinear" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" ARRAY_NAME "g_gi_texture_filtering_bicubic" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/hints.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/hints.dds" ARRAY_NAME "g_hints" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" ARRAY_NAME "g_horizontal_camera" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/invert_camera_x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/invert_camera_x.dds" ARRAY_NAME "g_invert_camera_x" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/invert_camera_y.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/invert_camera_y.dds" ARRAY_NAME "g_invert_camera_y" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/language.dds" ARRAY_NAME "g_language" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/master_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/master_volume.dds" ARRAY_NAME "g_master_volume" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/monitor.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/monitor.dds" ARRAY_NAME "g_monitor" COMPRESSION_TYPE "zstd")
@@ -530,13 +534,13 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/op
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/time_of_day_transition_playstation.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/time_of_day_transition_playstation.dds" ARRAY_NAME "g_time_of_day_transition_playstation" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" ARRAY_NAME "g_transparency_antialiasing_false" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" ARRAY_NAME "g_transparency_antialiasing_true" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_alignment_mode.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_alignment_mode.dds" ARRAY_NAME "g_ui_alignment_mode" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_scale_mode.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_scale_mode.dds" ARRAY_NAME "g_ui_scale_mode" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vertical_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vertical_camera.dds" ARRAY_NAME "g_vertical_camera" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/voice_language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/voice_language.dds" ARRAY_NAME "g_voice_language" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vibration.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vibration.dds" ARRAY_NAME "g_vibration" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vsync.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vsync.dds" ARRAY_NAME "g_vsync" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/window_size.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/window_size.dds" ARRAY_NAME "g_window_size" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" ARRAY_NAME "g_xbox_color_correction" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction_false.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction_false.dds" ARRAY_NAME "g_xbox_color_correction_false" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction_true.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction_true.dds" ARRAY_NAME "g_xbox_color_correction_true" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/miles_electric.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/miles_electric.dds" ARRAY_NAME "g_miles_electric" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_NAME "g_game_icon")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_NAME "g_game_icon_night")

UnleashedRecomp/api/CSD/Manager/csdmNode.inl

@@ -9,41 +9,41 @@ namespace Chao::CSD
 
     inline void CNode::SetText(const char* in_pText)
     {
-        GuestToHostFunction<int>(sub_830BF640, this, in_pText);
+        GuestToHostFunction<int>(0x830BF640, this, in_pText);
     }
 
     inline void CNode::SetText(const wchar_t* in_pText)
     {
-        GuestToHostFunction<int>(sub_830BF640, this, in_pText);
+        GuestToHostFunction<int>(0x830BF640, this, in_pText);
     }
 
     inline void CNode::GetPosition(Hedgehog::Math::CVector2& out_rResult) const
     {
-        GuestToHostFunction<void>(sub_830BF008, &out_rResult, this);
+        GuestToHostFunction<void>(0x830BF008, &out_rResult, this);
     }
 
     inline void CNode::SetPosition(float in_X, float in_Y)
     {
-        GuestToHostFunction<int>(sub_830BF078, this, in_X, in_Y);
+        GuestToHostFunction<int>(0x830BF078, this, in_X, in_Y);
     }
 
     inline void CNode::SetHideFlag(uint32_t in_HideFlag)
     {
-        GuestToHostFunction<int>(sub_830BF080, this, in_HideFlag);
+        GuestToHostFunction<int>(0x830BF080, this, in_HideFlag);
     }
 
     inline void CNode::SetRotation(float in_Rotation)
     {
-        GuestToHostFunction<int>(sub_830BF088, this, in_Rotation);
+        GuestToHostFunction<int>(0x830BF088, this, in_Rotation);
     }
 
     inline void CNode::SetScale(float in_X, float in_Y)
     {
-        GuestToHostFunction<int>(sub_830BF090, this, in_X, in_Y);
+        GuestToHostFunction<int>(0x830BF090, this, in_X, in_Y);
     }
 
     inline void CNode::SetPatternIndex(uint32_t in_PatternIndex)
     {
-        GuestToHostFunction<int>(sub_830BF300, this, in_PatternIndex);
+        GuestToHostFunction<int>(0x830BF300, this, in_PatternIndex);
     }
 }

UnleashedRecomp/api/CSD/Manager/csdmProject.inl

@@ -5,20 +5,20 @@ namespace Chao::CSD
     inline RCPtr<CScene> CProject::CreateScene(const char* in_pName) const
     {
         RCPtr<CScene> rcScene;
-        GuestToHostFunction<void>(sub_830BEE00, this, rcScene, in_pName, nullptr);
+        GuestToHostFunction<void>(0x830BEE00, this, rcScene, in_pName, nullptr);
         return rcScene;
     }
 
     inline RCPtr<CScene> CProject::CreateScene(const char* in_pName, const char* in_pMotionName) const
     {
         RCPtr<CScene> rcScene;
-        GuestToHostFunction<void>(sub_830BECE0, this, rcScene, in_pName, in_pMotionName, nullptr);
+        GuestToHostFunction<void>(0x830BECE0, this, rcScene, in_pName, in_pMotionName, nullptr);
         return rcScene;
     }
 
     inline void CProject::DestroyScene(CScene* in_pScene)
     {
-        GuestToHostFunction<void>(sub_830BE298, this, in_pScene);
+        GuestToHostFunction<void>(0x830BE298, this, in_pScene);
     }
 
     inline void CProject::DestroyScene(RCPtr<CScene>& inout_rcScene)

UnleashedRecomp/api/CSD/Manager/csdmRCObject.inl

@@ -30,6 +30,6 @@ namespace Chao::CSD
 
     inline void RCPtrAbs::RCObject::Release()
     {
-        GuestToHostFunction<void>(sub_830BA068, this);
+        GuestToHostFunction<void>(0x830BA068, this);
     }
 }

UnleashedRecomp/api/CSD/Manager/csdmRCPtrAbs.inl

@@ -27,12 +27,12 @@ namespace Chao::CSD
 
     inline void RCPtrAbs::AttachAbs(void* in_pMemory)
     {
-        GuestToHostFunction<void>(sub_830BA298, this, in_pMemory);
+        GuestToHostFunction<void>(0x830BA298, this, in_pMemory);
     }
 
     inline void RCPtrAbs::SetAbs(const RCPtrAbs& in_rPtr)
     {
-        GuestToHostFunction<void>(sub_830BA328, this, in_rPtr);
+        GuestToHostFunction<void>(0x830BA328, this, in_rPtr);
     }
 
     inline void* RCPtrAbs::operator*() const

UnleashedRecomp/api/CSD/Manager/csdmScene.inl

@@ -22,7 +22,7 @@ namespace Chao::CSD
 
     inline bool CScene::SetMotion(const char* in_pName)
     {
-        return GuestToHostFunction<bool>(sub_830BA760, this, in_pName);
+        return GuestToHostFunction<bool>(0x830BA760, this, in_pName);
     }
 
     inline void CScene::SetMotionFrame(float in_MotionFrame)
@@ -33,21 +33,21 @@ namespace Chao::CSD
 
     inline void CScene::SetPosition(float in_X, float in_Y)
     {
-        GuestToHostFunction<void>(sub_830BB550, this, in_X, in_Y);
+        GuestToHostFunction<void>(0x830BB550, this, in_X, in_Y);
     }
 
     inline void CScene::SetHideFlag(uint32_t in_HideFlag)
     {
-        GuestToHostFunction<void>(sub_830BB378, this, in_HideFlag);
+        GuestToHostFunction<void>(0x830BB378, this, in_HideFlag);
     }
 
     inline void CScene::SetRotation(float in_Angle)
     {
-        GuestToHostFunction<void>(sub_830BB5F8, this, in_Angle);
+        GuestToHostFunction<void>(0x830BB5F8, this, in_Angle);
     }
 
     inline void CScene::SetScale(float in_X, float in_Y)
     {
-        GuestToHostFunction<void>(sub_830BB650, this, in_X, in_Y);
+        GuestToHostFunction<void>(0x830BB650, this, in_X, in_Y);
     }
 }

UnleashedRecomp/api/Hedgehog/Math/Aabb.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Math
+{
+    class CAabb // Eigen::AlignedBox3f
+    {
+    public:
+        Hedgehog::Math::CVector min;
+        Hedgehog::Math::CVector max;
+
+        CVector Center() const;
+    };
+
+    SWA_ASSERT_SIZEOF(CAabb, 0x18);
+}
+
+#include "Aabb.inl"

UnleashedRecomp/api/Hedgehog/Math/Aabb.inl

@@ -0,0 +1,12 @@
+namespace Hedgehog::Math
+{
+    inline CVector Hedgehog::Math::CAabb::Center() const
+    {
+        // return (min + max) / 2;
+        Hedgehog::Math::CVector result;
+        result.X = (max.X + min.X) * 0.5f;
+        result.Y = (max.Y + min.Y) * 0.5f;
+        result.Z = 0.5f * (max.Z + min.Z);
+        return result;
+    }
+}

UnleashedRecomp/api/Hedgehog/Math/Matrix.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Math
+{
+    class CMatrix
+    {
+    public:
+        be<float> data[16]; // Eigen::Affine3f
+    };
+
+    class CMatrix44
+    {
+    public:
+        be<float> data[16]; // Eigen::Matrix4f
+    };
+
+    SWA_ASSERT_SIZEOF(CMatrix, 0x40);
+    SWA_ASSERT_SIZEOF(CMatrix44, 0x40);
+}

UnleashedRecomp/api/Hedgehog/Math/Quaternion.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Math
+{
+    class CQuaternion //Eigen::Quaternionf;
+    {
+    public:
+        be<float> X;
+        be<float> Y;
+        be<float> Z;
+        be<float> W;
+    };
+
+    SWA_ASSERT_SIZEOF(CQuaternion, 0x10);
+}

UnleashedRecomp/api/Hedgehog/Math/Vector.h

@@ -17,7 +17,6 @@ namespace Hedgehog::Math
         be<float> X;
         be<float> Y;
         be<float> Z;
-        be<float> W;
     };
 
     class CVector4
@@ -29,3 +28,5 @@ namespace Hedgehog::Math
         be<float> W;
     };
 }
+
+#include "Vector.inl"

UnleashedRecomp/api/Hedgehog/Math/Vector.inl

@@ -0,0 +1,4 @@
+namespace Hedgehog::Math
+{
+
+}

UnleashedRecomp/api/Hedgehog/MirageCore/Camera/hhCamera.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Mirage
+{
+    class CCamera : Base::CObject
+    {
+    public:
+        Math::CMatrix m_View;
+        Math::CMatrix44 m_Projection;
+        Math::CVector m_Position;
+        Math::CVector m_Direction;
+        be<float> m_AspectRatio;
+        be<float> m_Near;
+        be<float> m_Far;
+    };
+}

UnleashedRecomp/api/Hedgehog/Universe/Engine/hhStateMachineBase.h

@@ -1,32 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-#include <Hedgehog/Base/hhObject.h>
-#include <Hedgehog/Universe/Engine/hhMessageProcess.h>
-#include <Hedgehog/Universe/Engine/hhStateMachineMessageReceiver.h>
-
-namespace Hedgehog::Universe
-{
-    class CStateMachineBase : public IStateMachineMessageReceiver, public Base::CObject
-    {
-    public:
-        class CStateBase : public IMessageProcess
-        {
-        public:
-            SWA_INSERT_PADDING(0x08);
-            xpointer<void> m_pContext;
-            xpointer<CStateMachineBase> m_pStateMachine;
-            be<float> m_Time;
-            SWA_INSERT_PADDING(0x4C);
-
-            void* GetContextBase() const;
-
-            template<typename T>
-            T* GetContextBase() const;
-        };
-
-        SWA_INSERT_PADDING(0x60);
-    };
-}
-
-#include <Hedgehog/Universe/Engine/hhStateMachineBase.inl>

UnleashedRecomp/api/Hedgehog/Universe/Engine/hhStateMachineBase.inl

@@ -1,13 +0,0 @@
-namespace Hedgehog::Universe
-{
-    inline void* CStateMachineBase::CStateBase::GetContextBase() const
-    {
-        return m_pContext;
-    }
-
-    template<typename T>
-    inline T* CStateMachineBase::CStateBase::GetContextBase() const
-    {
-        return (T*)m_pContext.get();
-    }
-}

UnleashedRecomp/api/Hedgehog/Universe/Engine/hhStateMachineMessageReceiver.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace Hedgehog::Universe
-{
-    class IStateMachineMessageReceiver
-    {
-    public:
-        IStateMachineMessageReceiver(const swa_null_ctor&) {}
-    };
-}

UnleashedRecomp/api/SWA.h

@@ -27,7 +27,11 @@
 #include "Hedgehog/Base/Type/hhSharedString.h"
 #include "Hedgehog/Base/hhObject.h"
 #include "Hedgehog/Database/System/hhDatabaseData.h"
+#include "Hedgehog/Math/Aabb.h"
+#include "Hedgehog/Math/Matrix.h"
+#include "Hedgehog/Math/Quaternion.h"
 #include "Hedgehog/Math/Vector.h"
+#include "Hedgehog/MirageCore/Camera/hhCamera.h"
 #include "Hedgehog/MirageCore/Misc/hhVertexDeclarationPtr.h"
 #include "Hedgehog/MirageCore/RenderData/hhMaterialData.h"
 #include "Hedgehog/MirageCore/RenderData/hhMeshData.h"
@@ -47,12 +51,9 @@
 #include "Hedgehog/Sparkle/hhParticleMaterial.h"
 #include "Hedgehog/Universe/Engine/hhMessageActor.h"
 #include "Hedgehog/Universe/Engine/hhMessageProcess.h"
-#include "Hedgehog/Universe/Engine/hhStateMachineBase.h"
-#include "Hedgehog/Universe/Engine/hhStateMachineMessageReceiver.h"
 #include "Hedgehog/Universe/Engine/hhUpdateInfo.h"
 #include "Hedgehog/Universe/Engine/hhUpdateUnit.h"
 #include "Hedgehog/Universe/Thread/hhParallelJob.h"
-#include "SWA/Achievement/AchievementID.h"
 #include "SWA/Achievement/AchievementManager.h"
 #include "SWA/Achievement/AchievementTest.h"
 #include "SWA/CSD/CsdDatabaseWrapper.h"
@@ -60,12 +61,6 @@
 #include "SWA/CSD/CsdTexListMirage.h"
 #include "SWA/CSD/GameObjectCSD.h"
 #include "SWA/Camera/Camera.h"
-#include "SWA/Camera/CameraController.h"
-#include "SWA/CharacterUtility/CharacterProxy.h"
-#include "SWA/ExtraStage/Tails/Enemy/Boss/ExStageBoss.h"
-#include "SWA/ExtraStage/Tails/Enemy/Boss/State/StateBase.h"
-#include "SWA/ExtraStage/Tails/Enemy/Boss/State/StateBattle.h"
-#include "SWA/ExtraStage/Tails/Player/ExPlayerTails.h"
 #include "SWA/Globals.h"
 #include "SWA/HUD/GeneralWindow/GeneralWindow.h"
 #include "SWA/HUD/Loading/Loading.h"
@@ -81,10 +76,10 @@
 #include "SWA/Inspire/InspireTextureAnimationInfo.h"
 #include "SWA/Inspire/InspireTextureOverlay.h"
 #include "SWA/Inspire/InspireTextureOverlayInfo.h"
-#include "SWA/Menu/MenuWindowBase.h"
 #include "SWA/Movie/MovieDisplayer.h"
 #include "SWA/Movie/MovieManager.h"
-#include "SWA/Object/Common/DashPanel/ObjDashPanel.h"
+#include "SWA/Path/PathController.h"
+#include "SWA/Path/Animation/PathAnimation.h"
 #include "SWA/Player/Character/EvilSonic/EvilSonic.h"
 #include "SWA/Player/Character/EvilSonic/EvilSonicContext.h"
 #include "SWA/Player/Character/EvilSonic/Hud/EvilHudGuide.h"
@@ -103,19 +98,14 @@
 #include "SWA/System/GameMode/GameMode.h"
 #include "SWA/System/GameMode/GameModeStage.h"
 #include "SWA/System/GameMode/GameModeStageMovie.h"
-#include "SWA/System/GameMode/GameModeStageTitle.h"
 #include "SWA/System/GameMode/Title/TitleMenu.h"
 #include "SWA/System/GameMode/Title/TitleStateBase.h"
-#include "SWA/System/GameMode/Title/TitleStateIntro.h"
-#include "SWA/System/GameMode/Title/TitleStateMenu.h"
-#include "SWA/System/GameMode/Title/TitleStateWorldMap.h"
-#include "SWA/System/GameMode/WorldMap/WorldMapCamera.h"
-#include "SWA/System/GameMode/WorldMap/WorldMapCursor.h"
 #include "SWA/System/GameObject.h"
 #include "SWA/System/GameParameter.h"
 #include "SWA/System/GammaController.h"
 #include "SWA/System/InputState.h"
 #include "SWA/System/PadState.h"
+#include "SWA/System/StageManager.h"
 #include "SWA/System/World.h"
 #include "boost/smart_ptr/make_shared_object.h"
 #include "boost/smart_ptr/shared_ptr.h"

UnleashedRecomp/api/SWA/Achievement/AchievementID.h

@@ -1,55 +0,0 @@
-#pragma once
-
-enum EAchievementID : uint32_t
-{
-    eAchievementID_StillBroken = 24,
-    eAchievementID_LookingBetter,
-    eAchievementID_StillAJigsawPuzzle,
-    eAchievementID_PickingUpThePieces,
-    eAchievementID_AlmostThere,
-    eAchievementID_OneMoreToGo,
-    eAchievementID_WorldSavior = 31,
-    eAchievementID_PartlyCloudy,
-    eAchievementID_Sunny,
-    eAchievementID_HalfMoon,
-    eAchievementID_FullMoon,
-    eAchievementID_BlueStreak,
-    eAchievementID_PowerOverwhelming,
-    eAchievementID_GettingTheHangOfThings,
-    eAchievementID_CreatureOfTheNight,
-    eAchievementID_HelpingHand,
-    eAchievementID_LayTheSmackdown,
-    eAchievementID_WallCrawler,
-    eAchievementID_Airdevil,
-    eAchievementID_Hyperdrive,
-    eAchievementID_Basher,
-    eAchievementID_Smasher,
-    eAchievementID_Crasher,
-    eAchievementID_Thrasher,
-    eAchievementID_SocialButterfly,
-    eAchievementID_HungryHungryHedgehog,
-    eAchievementID_AcePilot,
-    eAchievementID_DayTripper,
-    eAchievementID_HardDaysNight,
-    eAchievementID_GetOnTheExorciseBandwagon,
-    eAchievementID_GyroWithRelish = 64,
-    eAchievementID_PigInABlanket,
-    eAchievementID_ExoticToppings,
-    eAchievementID_SausageFriedRice,
-    eAchievementID_IcedHotdog,
-    eAchievementID_KebabOnABun,
-    eAchievementID_KetchupAndMustard,
-    eAchievementID_HardBoiled,
-    eAchievementID_FriedClamRoll,
-    eAchievementID_FirstTimeCustomer,
-    eAchievementID_OhYouShouldntHave,
-    eAchievementID_ThatsEnoughSeriously,
-    eAchievementID_Hedgehunk,
-    eAchievementID_IAintAfraidOfNoGhost,
-    eAchievementID_BFFs,
-    eAchievementID_SpeedingTicket,
-    eAchievementID_ComboKing,
-    eAchievementID_RingLeader,
-    eAchievementID_KnockoutBrawler,
-    eAchievementID_BlueMeteor
-};

UnleashedRecomp/api/SWA/Achievement/AchievementManager.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <SWA.inl>
-#include <SWA/Achievement/AchievementID.h>
 
 namespace SWA::Achievement
 {
@@ -12,7 +11,7 @@ namespace SWA::Achievement
         {
         public:
             SWA_INSERT_PADDING(0x08);
-            be<EAchievementID> m_AchievementID;
+            be<uint32_t> m_AchievementID;
         };
 
         SWA_INSERT_PADDING(0x98);

UnleashedRecomp/api/SWA/Achievement/AchievementTest.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <SWA.inl>
-#include <SWA/Achievement/AchievementID.h>
 
 namespace SWA
 {
@@ -10,7 +9,7 @@ namespace SWA
     public:
         SWA_INSERT_PADDING(0x38);
         be<uint32_t> m_Unk1;
-        be<EAchievementID> m_AchievementID;
+        be<uint32_t> m_AchievementID;
         uint8_t m_Unk2;
     };
 }

UnleashedRecomp/api/SWA/CSD/CsdDatabaseWrapper.inl

@@ -3,7 +3,7 @@ namespace SWA
     inline boost::shared_ptr<CCsdProject> CCsdDatabaseWrapper::GetCsdProject(const Hedgehog::Base::CSharedString& in_rName)
     {
         boost::shared_ptr<CCsdProject> spCsdProject;
-        GuestToHostFunction<void>(sub_825E2B40, &in_rName, this, &spCsdProject, 0);
+        GuestToHostFunction<void>(0x825E2B40, &in_rName, this, &spCsdProject, 0);
         return spCsdProject;
     }
 }

UnleashedRecomp/api/SWA/Camera/Camera.h

@@ -9,7 +9,8 @@ namespace SWA
     {
     public:
         xpointer<void> m_pVftable;
-        SWA_INSERT_PADDING(0xC4);
+        // SWA::CCamera::MyCamera
+        SWA_INSERT_PADDING(0xC4); 
         be<float> m_VertAspectRatio;
         SWA_INSERT_PADDING(0x48);
         be<float> m_HorzAspectRatio;

UnleashedRecomp/api/SWA/Camera/CameraController.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CCameraController : public Hedgehog::Universe::CStateMachineBase::CStateBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x04);
-        be<float> m_FieldOfView;
-        SWA_INSERT_PADDING(0x68);
-    };
-
-    SWA_ASSERT_OFFSETOF(CCameraController, m_FieldOfView, 0x64);
-    SWA_ASSERT_SIZEOF(CCameraController, 0xD0);
-}

UnleashedRecomp/api/SWA/CharacterUtility/CharacterProxy.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <Hedgehog/Math/Vector.h>
-
-namespace SWA
-{
-    class CCharacterProxy
-    {
-    public:
-        SWA_INSERT_PADDING(0x120);
-        Hedgehog::Math::CVector m_Position;
-        Hedgehog::Math::CVector m_Velocity;
-    };
-}

UnleashedRecomp/api/SWA/ExtraStage/Tails/Enemy/Boss/ExStageBoss.h

@@ -1,36 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CExStageBoss
-    {
-    public:
-        class CStateBase;
-        class CStateBattle;
-
-        class CExStageBossStateContext
-        {
-        public:
-            SWA_INSERT_PADDING(0x14C);
-            be<float> m_SplineProgress;
-            SWA_INSERT_PADDING(0x0C);
-            be<float> m_SplineSpeed;
-            SWA_INSERT_PADDING(0x28);
-            be<float> m_Field188;
-            be<float> m_Field18C;
-            SWA_INSERT_PADDING(0x21);
-            bool m_IsBattleStart;
-            SWA_INSERT_PADDING(0x36E);
-            be<float> m_Field520;
-        };
-    };
-
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CExStageBossStateContext, m_SplineProgress, 0x14C);
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CExStageBossStateContext, m_SplineSpeed, 0x15C);
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CExStageBossStateContext, m_Field188, 0x188);
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CExStageBossStateContext, m_Field18C, 0x18C);
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CExStageBossStateContext, m_IsBattleStart, 0x1B1);
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CExStageBossStateContext, m_Field520, 0x520);
-}

UnleashedRecomp/api/SWA/ExtraStage/Tails/Enemy/Boss/State/StateBase.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-#include "SWA/ExtraStage/Tails/Enemy/Boss/ExStageBoss.h"
-
-namespace SWA
-{
-    class CExStageBoss::CStateBase : public Hedgehog::Universe::CStateMachineBase::CStateBase {};
-}

UnleashedRecomp/api/SWA/ExtraStage/Tails/Enemy/Boss/State/StateBattle.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-#include "SWA/ExtraStage/Tails/Enemy/Boss/ExStageBoss.h"
-
-namespace SWA
-{
-    class CExStageBoss::CStateBattle : public CExStageBoss::CStateBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x08);
-        be<float> m_Field68;
-        be<float> m_FramesSinceLastMissile;
-    };
-
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CStateBattle, m_Field68, 0x68);
-    SWA_ASSERT_OFFSETOF(CExStageBoss::CStateBattle, m_FramesSinceLastMissile, 0x6C);
-}

UnleashedRecomp/api/SWA/ExtraStage/Tails/Player/ExPlayerTails.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CExPlayerTails
-    {
-    public:
-        class CExPlayerTailsStateContext
-        {
-        public:
-            SWA_INSERT_PADDING(0x1F8);
-            be<float> m_SplineBossStart;
-            be<float> m_SplineEnd;
-            SWA_INSERT_PADDING(0x30);
-            be<float> m_SplineProgress;
-            SWA_INSERT_PADDING(0x10);
-            xpointer<void> m_Field244;
-            SWA_INSERT_PADDING(0x18);
-            be<float> m_SplineSpeed;
-            SWA_INSERT_PADDING(0x0C);
-            be<uint32_t> m_State; // 0 - Intro; 1 - Boss Intro; 3 - Boss
-        };
-
-        class CStateBase : public Hedgehog::Universe::CStateMachineBase::CStateBase {};
-    };
-
-    SWA_ASSERT_OFFSETOF(CExPlayerTails::CExPlayerTailsStateContext, m_SplineBossStart, 0x1F8);
-    SWA_ASSERT_OFFSETOF(CExPlayerTails::CExPlayerTailsStateContext, m_SplineEnd, 0x1FC);
-    SWA_ASSERT_OFFSETOF(CExPlayerTails::CExPlayerTailsStateContext, m_SplineProgress, 0x230);
-    SWA_ASSERT_OFFSETOF(CExPlayerTails::CExPlayerTailsStateContext, m_Field244, 0x244);
-    SWA_ASSERT_OFFSETOF(CExPlayerTails::CExPlayerTailsStateContext, m_SplineSpeed, 0x260);
-    SWA_ASSERT_OFFSETOF(CExPlayerTails::CExPlayerTailsStateContext, m_State, 0x270);
-}

UnleashedRecomp/api/SWA/HUD/GeneralWindow/GeneralWindow.h

@@ -4,15 +4,6 @@
 
 namespace SWA
 {
-    enum EWindowStatus : uint32_t
-    {
-        eWindowStatus_Closed,
-        eWindowStatus_OpeningMessage = 2,
-        eWindowStatus_DisplayingMessage,
-        eWindowStatus_OpeningControls,
-        eWindowStatus_DisplayingControls
-    };
-
     class CGeneralWindow
     {
     public:
@@ -23,20 +14,5 @@ namespace SWA
         Chao::CSD::RCPtr<Chao::CSD::CScene> m_rcWindow_2;
         Chao::CSD::RCPtr<Chao::CSD::CScene> m_rcWindowSelect;
         Chao::CSD::RCPtr<Chao::CSD::CScene> m_rcFooter;
-        SWA_INSERT_PADDING(0x58);
-        be<EWindowStatus> m_Status;
-        be<uint32_t> m_CursorIndex;
-        SWA_INSERT_PADDING(0x04);
-        be<uint32_t> m_SelectedIndex;
     };
-
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_rcGeneral, 0xD0);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_rcBg, 0xD8);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_rcWindow, 0xE0);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_rcWindow_2, 0xE8);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_rcWindowSelect, 0xF0);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_rcFooter, 0xF8);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_Status, 0x158);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_CursorIndex, 0x15C);
-    SWA_ASSERT_OFFSETOF(CGeneralWindow, m_SelectedIndex, 0x164);
 }

UnleashedRecomp/api/SWA/HUD/Loading/Loading.h

@@ -21,20 +21,14 @@ namespace SWA
     {
     public:
         SWA_INSERT_PADDING(0xD8);
-        be<uint32_t> m_FieldD8;
+        be<uint32_t> m_pUnk;
         SWA_INSERT_PADDING(0x3C);
         Chao::CSD::RCPtr<Chao::CSD::CScene> m_rcNightToDay;
         SWA_INSERT_PADDING(0x0C);
         be<uint32_t> m_IsVisible;
         SWA_INSERT_PADDING(0x0C);
         be<ELoadingDisplayType> m_LoadingDisplayType;
-        SWA_INSERT_PADDING(0x61);
+        SWA_INSERT_PADDING(0x65);
         bool m_IsNightToDay;
     };
-
-    SWA_ASSERT_OFFSETOF(CLoading, m_FieldD8, 0xD8);
-    SWA_ASSERT_OFFSETOF(CLoading, m_rcNightToDay, 0x118);
-    SWA_ASSERT_OFFSETOF(CLoading, m_IsVisible, 0x12C);
-    SWA_ASSERT_OFFSETOF(CLoading, m_LoadingDisplayType, 0x13C);
-    SWA_ASSERT_OFFSETOF(CLoading, m_IsNightToDay, 0x1A1);
 }

UnleashedRecomp/api/SWA/HUD/Pause/HudPause.h

@@ -48,7 +48,8 @@ namespace SWA
     class CHudPause : public CGameObject
     {
     public:
-        SWA_INSERT_PADDING(0x30);
+        xpointer<void> m_pVftable;
+        SWA_INSERT_PADDING(0x2C);
         RCPtr<CProject> m_rcPause;
         RCPtr<CScene> m_rcBg;
         RCPtr<CScene> m_rcBg1;
@@ -57,32 +58,12 @@ namespace SWA
         RCPtr<CScene> m_rcBg1Select_2;
         RCPtr<CScene> m_rcStatusTitle;
         RCPtr<CScene> m_rcFooterA;
-        SWA_INSERT_PADDING(0x59);
+        SWA_INSERT_PADDING(0x5C);
-        bool m_IsVisible;
-        SWA_INSERT_PADDING(0x02);
         be<EActionType> m_Action;
         be<EMenuType> m_Menu;
         be<EStatusType> m_Status;
         be<ETransitionType> m_Transition;
-        SWA_INSERT_PADDING(0x04);
+        SWA_INSERT_PADDING(0x20);
-        be<uint32_t> m_Submenu;
-        SWA_INSERT_PADDING(0x18);
         bool m_IsShown;
     };
-
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcPause, 0xEC);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg, 0xF4);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1, 0xFC);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1_2, 0x104);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1Select, 0x10C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1Select_2, 0x114);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcStatusTitle, 0x11C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcFooterA, 0x124);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_IsVisible, 0x185);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Action, 0x188);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Menu, 0x18C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Status, 0x190);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Transition, 0x194);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Submenu, 0x19C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_IsShown, 0x1B8);
 }

UnleashedRecomp/api/SWA/Menu/MenuWindowBase.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CMenuWindowBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x10);
-    };
-}

UnleashedRecomp/api/SWA/Object/Common/DashPanel/ObjDashPanel.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CObjDashPanel
-    {
-    public:
-        SWA_INSERT_PADDING(0xE8);
-        be<float> m_FieldE8;
-        be<float> m_Speed;
-    };
-}

UnleashedRecomp/api/SWA/Path/Animation/PathAnimation.h

@@ -0,0 +1,22 @@
+#pragma once
+
+
+namespace SWA::PathAnimation
+{
+    class Entity
+    {
+    public:
+        xpointer<void> m_pVftable;
+        SWA_INSERT_PADDING(0x18);
+    };
+
+
+    class Controller
+    {
+    public:
+        xpointer<void> m_pVftable;
+        SWA_INSERT_PADDING(0x1C);
+        be<float> m_DistanceAlongPath;
+    };
+    SWA_ASSERT_OFFSETOF(Controller, m_DistanceAlongPath, 0x20);
+}

UnleashedRecomp/api/SWA/Path/PathController.h

@@ -0,0 +1,13 @@
+#pragma once
+#include "Animation/PathAnimation.h"
+
+namespace SWA
+{
+    class CPathController
+    {
+    public:
+        be<uint32_t> m_Field000;
+        be<uint32_t> m_Field004;
+        boost::shared_ptr<PathAnimation::Controller> m_spPathAnimationController;
+    };
+}

UnleashedRecomp/api/SWA/System/GameDocument.h

@@ -29,14 +29,13 @@ namespace SWA
                 SWA_INSERT_PADDING(0x10);
             };
 
-            SWA_INSERT_PADDING(0x1C);
+            SWA_INSERT_PADDING(0x10);
+            hh::map<Hedgehog::Base::CSharedString, boost::shared_ptr<SWA::CWorld>> m_Worlds;
             boost::shared_ptr<Hedgehog::Database::CDatabase> m_spDatabase;
             SWA_INSERT_PADDING(0x88);
             Hedgehog::Base::CSharedString m_StageName;
             xpointer<CSoundAdministrator> m_pSoundAdministrator;
-            SWA_INSERT_PADDING(0x48);
+            SWA_INSERT_PADDING(0x124);
-            xpointer<CGeneralWindow> m_pGeneralWindow;
-            SWA_INSERT_PADDING(0xD8);
             SScoreInfo m_ScoreInfo;
             SWA_INSERT_PADDING(0x0C);
         };
@@ -62,7 +61,6 @@ namespace SWA
     SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spDatabase, 0x1C);
     SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_StageName, 0xAC);
     SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pSoundAdministrator, 0xB0);
-    SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pGeneralWindow, 0xFC);
     SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_ScoreInfo, 0x1D8);
     SWA_ASSERT_SIZEOF(CGameDocument::CMember, 0x230);
 

UnleashedRecomp/api/SWA/System/GameMode/GameMode.h

@@ -4,9 +4,10 @@
 
 namespace SWA
 {
-    class CGameMode : public Hedgehog::Universe::CStateMachineBase::CStateBase
+    class CGameMode // : Hedgehog::Universe::TStateMachine<SWA::CGame>::TState
     {
     public:
+        SWA_INSERT_PADDING(0x60); // base
         SWA_INSERT_PADDING(0x08);
     };
 }

UnleashedRecomp/api/SWA/System/GameMode/GameModeStageTitle.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CGameModeStageTitle : public CGameModeStage
-    {
-    public:
-        SWA_INSERT_PADDING(0x0E);
-        bool m_IsPlayingAdvertiseMovie;
-        be<float> m_AdvertiseMovieWaitTime;
-    };
-}

UnleashedRecomp/api/SWA/System/GameMode/Title/TitleMenu.h

@@ -4,36 +4,10 @@
 
 namespace SWA
 {
-    class CTitleMenu : public CMenuWindowBase
+    class CTitleMenu
     {
     public:
-        SWA_INSERT_PADDING(0x28);
+        SWA_INSERT_PADDING(0x44);
-        be<uint32_t> m_Field38;
-        bool m_Field3C; // Seems to be related to exit transition.
-        SWA_INSERT_PADDING(0x04);
         be<uint32_t> m_CursorIndex;
-        SWA_INSERT_PADDING(0x0C);
-        bool m_Field54; // Seems to be related to exit transition.
-        SWA_INSERT_PADDING(0x0B);
-        be<float> m_Field60;
-        SWA_INSERT_PADDING(0x34);
-        bool m_Field98;
-        bool m_IsDeleteCheckMessageOpen;
-        bool m_Field9A; // Seems to be related to cursor selection.
-        SWA_INSERT_PADDING(0x04);
-        bool m_Field9F;
-        SWA_INSERT_PADDING(0x02);
-        bool m_IsDLCInfoMessageOpen;
     };
-
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field38, 0x38);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field3C, 0x3C);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_CursorIndex, 0x44);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field54, 0x54);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field60, 0x60);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field98, 0x98);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_IsDeleteCheckMessageOpen, 0x99);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field9A, 0x9A);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_Field9F, 0x9F);
-    SWA_ASSERT_OFFSETOF(CTitleMenu, m_IsDLCInfoMessageOpen, 0xA2);
 }

UnleashedRecomp/api/SWA/System/GameMode/Title/TitleStateBase.h

@@ -4,14 +4,19 @@
 
 namespace SWA
 {
-    class CTitleStateBase : public Hedgehog::Universe::CStateMachineBase::CStateBase
+    class CTitleStateBase // : Hedgehog::Universe::TStateMachine<SWA::CTitleManager>::TState
     {
     public:
-        class CTitleStateContext
+        class CMember
         {
         public:
             SWA_INSERT_PADDING(0x1E8);
             xpointer<CTitleMenu> m_pTitleMenu;
         };
+
+        SWA_INSERT_PADDING(0x08);
+        xpointer<CMember> m_pMember;
+        SWA_INSERT_PADDING(0x5C);
+        be<uint32_t> m_State;
     };
 }

UnleashedRecomp/api/SWA/System/GameMode/Title/TitleStateIntro.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CTitleStateIntro : public CTitleStateBase {};
-}

UnleashedRecomp/api/SWA/System/GameMode/Title/TitleStateMenu.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CTitleStateMenu : public CTitleStateBase {};
-}

UnleashedRecomp/api/SWA/System/GameMode/Title/TitleStateWorldMap.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-#include <SWA/System/GameMode/WorldMap/WorldMapCursor.h>
-
-namespace SWA
-{
-    class CTitleStateWorldMap : public CTitleStateBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x08);
-        xpointer<CWorldMapCursor> m_pWorldMapCursor;
-    };
-}

UnleashedRecomp/api/SWA/System/GameMode/WorldMap/WorldMapCamera.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CWorldMapCamera : public CCameraController
-    {
-    public:
-        be<float> m_Pitch;
-        be<float> m_Yaw;
-        be<float> m_Distance;
-        be<float> m_RotationSpeed;
-        SWA_INSERT_PADDING(0x08);
-        bool m_CanMove;
-        SWA_INSERT_PADDING(0x34);
-        be<float> m_TiltToEarthTransitionSpeed;
-    };
-
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_Pitch, 0xD0);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_Yaw, 0xD4);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_Distance, 0xD8);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_RotationSpeed, 0xDC);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_CanMove, 0xE8);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_TiltToEarthTransitionSpeed, 0x120);
-}

UnleashedRecomp/api/SWA/System/GameMode/WorldMap/WorldMapCursor.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CWorldMapCursor : public CMenuWindowBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x24);
-        be<float> m_LeftStickVertical;
-        be<float> m_LeftStickHorizontal;
-        bool m_IsCursorMoving;
-        SWA_INSERT_PADDING(0x07);
-        be<float> m_CursorY;
-        be<float> m_CursorX;
-    };
-
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_LeftStickVertical, 0x34);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_LeftStickHorizontal, 0x38);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_IsCursorMoving, 0x3C);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_CursorY, 0x44);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_CursorX, 0x48);
-}

UnleashedRecomp/api/SWA/System/StageManager.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "SWA.inl"
+#include "Hedgehog/Base/Thread/hhSynchronizedObject.h"
+#include "Hedgehog/Universe/Engine/hhMessageActor.h"
+#include "SWA/System/GameObject.h"
+
+
+namespace SWA
+{
+    class CStageManager //: public SWA::CGameObject, public Hedgehog::Base::CSynchronizedObject
+    {
+    public:
+        SWA_INSERT_PADDING(0xC4);
+        boost::shared_ptr<SWA::CPathController> m_spStageGuidePathController; //xpointer<SWA::CPathController> m_pStageGuidePathController;
+        SWA_INSERT_PADDING(0x4);
+        Hedgehog::Math::CVector m_PlayerPosition;
+        be<float> m_Field0DC; // Sonic's air distance from path??
+        SWA_INSERT_PADDING(0x3C);
+        be<float> m_StageGuidePathRatio; // Not updated in retail
+        be<float> m_StageGuidePathLength;
+        SWA_INSERT_PADDING(0x9C);
+    };
+
+    SWA_ASSERT_OFFSETOF(CStageManager, m_spStageGuidePathController, 0xC4);
+    SWA_ASSERT_OFFSETOF(CStageManager, m_PlayerPosition, 0xD0);
+    SWA_ASSERT_OFFSETOF(CStageManager, m_StageGuidePathRatio, 0x11C);
+    SWA_ASSERT_OFFSETOF(CStageManager, m_StageGuidePathLength, 0x120);
+    SWA_ASSERT_SIZEOF(CStageManager, 0x1C0);
+}

UnleashedRecomp/api/SWA/System/World.h

@@ -12,9 +12,21 @@ namespace SWA
         class CMember
         {
         public:
-            SWA_INSERT_PADDING(0x80);
+            //boost::shared_ptr<Hedgehog::Mirage::CRenderScene> m_spRenderScene;
+            //Hedgehog::Base::CSharedString m_Name;
+            SWA_INSERT_PADDING(0xC);
+            boost::shared_ptr<CCamera> m_spCamera;
+            boost::shared_ptr<CCamera> m_spOverrideCamera;
+            SWA_INSERT_PADDING(0x64);
         };
 
         xpointer<CMember> m_pMember;
+
+        boost::shared_ptr<CCamera> GetCamera() const;
     };
+
+    //SWA_ASSERT_OFFSETOF(CWorld::CMember, m_spCamera, 0xC);
+    //SWA_ASSERT_SIZEOF(CWorld::CMember, 0x80);
 }
+
+#include "World.inl"

UnleashedRecomp/api/SWA/System/World.inl

@@ -0,0 +1,7 @@
+namespace SWA
+{
+    inline boost::shared_ptr<CCamera> CWorld::GetCamera() const
+    {
+        return m_pMember->m_spOverrideCamera ? m_pMember->m_spOverrideCamera : m_pMember->m_spCamera;
+    }
+}

UnleashedRecomp/api/boost/smart_ptr/shared_ptr.h

@@ -115,7 +115,7 @@ namespace boost
         }
 
     public:
-        shared_ptr() : px(), pn() {}
+        shared_ptr() : px(nullptr), pn(nullptr) {}
 
         // TODO
         explicit shared_ptr(T* p) = delete;

UnleashedRecomp/app.cpp

@@ -1,4 +1,4 @@
-#include "app.h"
+#include <app.h>
 #include <api/SWA.h>
 #include <gpu/video.h>
 #include <install/installer.h>
@@ -8,8 +8,6 @@
 #include <patches/inspire_patches.h>
 #include <ui/game_window.h>
 #include <user/config.h>
-#include <user/paths.h>
-#include <user/registry.h>
 
 void App::Restart(std::vector<std::string> restartArgs)
 {
@@ -37,7 +35,6 @@ PPC_FUNC(sub_824EB490)
     App::s_language = Config::Language;
 
     SWA::SGlobals::Init();
-    Registry::Save();
 
     __imp__sub_824EB490(ctx, base);
 }

UnleashedRecomp/app.h

@@ -9,7 +9,6 @@ public:
     static inline bool s_isMissingDLC;
     static inline bool s_isLoading;
     static inline bool s_isWerehog;
-    static inline bool s_isSaveDataCorrupt;
 
     static inline ELanguage s_language;
 

UnleashedRecomp/apu/audio.h

@@ -7,10 +7,11 @@
 // Number of samples in a frame
 #define XAUDIO_NUM_SAMPLES 256
 
+#ifdef SWA_IMPL
 void XAudioInitializeSystem();
 void XAudioRegisterClient(PPCFunc* callback, uint32_t param);
 void XAudioSubmitFrame(void* samples);
-void XAudioConfigValueChangedCallback(class IConfigDef* configDef);
+#endif
 
 uint32_t XAudioRegisterRenderDriverClient(be<uint32_t>* callback, be<uint32_t>* driver);
 uint32_t XAudioUnregisterRenderDriverClient(uint32_t driver);

UnleashedRecomp/apu/driver/sdl2_driver.cpp

@@ -1,29 +1,26 @@
-#include <apu/audio.h>
+#include "sdl2_driver.h"
 #include <cpu/guest_thread.h>
 #include <kernel/heap.h>
-#include <user/config.h>
 
 static PPCFunc* g_clientCallback{};
 static uint32_t g_clientCallbackParam{}; // pointer in guest memory
 static SDL_AudioDeviceID g_audioDevice{};
 static bool g_downMixToStereo;
 
-static void CreateAudioDevice()
+void XAudioInitializeSystem()
 {
-    if (g_audioDevice != NULL)
+    SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback");
-        SDL_CloseAudioDevice(g_audioDevice);
+    SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "Unleashed Recompiled");
-
+    SDL_InitSubSystem(SDL_INIT_AUDIO);
-    bool surround = Config::ChannelConfiguration == EChannelConfiguration::Surround;
-    int allowedChanges = surround ? SDL_AUDIO_ALLOW_CHANNELS_CHANGE : 0;
 
     SDL_AudioSpec desired{}, obtained{};
     desired.freq = XAUDIO_SAMPLES_HZ;
     desired.format = AUDIO_F32SYS;
-    desired.channels = surround ? XAUDIO_NUM_CHANNELS : 2;
+    desired.channels = XAUDIO_NUM_CHANNELS;
     desired.samples = XAUDIO_NUM_SAMPLES;
-    g_audioDevice = SDL_OpenAudioDevice(nullptr, 0, &desired, &obtained, allowedChanges);
+    g_audioDevice = SDL_OpenAudioDevice(nullptr, 0, &desired, &obtained, SDL_AUDIO_ALLOW_CHANNELS_CHANGE);
 
-    if (obtained.channels != 2 && obtained.channels != XAUDIO_NUM_CHANNELS) // This check may fail only when surround sound is enabled.
+    if (obtained.channels != 2 && obtained.channels != XAUDIO_NUM_CHANNELS)
     {
         SDL_CloseAudioDevice(g_audioDevice);
         g_audioDevice = SDL_OpenAudioDevice(nullptr, 0, &desired, &obtained, 0);
@@ -32,16 +29,7 @@ static void CreateAudioDevice()
     g_downMixToStereo = (obtained.channels == 2);
 }
 
-void XAudioInitializeSystem()
-{
-    SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback");
-    SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "Unleashed Recompiled");
-    SDL_InitSubSystem(SDL_INIT_AUDIO);
-    CreateAudioDevice();
-}
-
 static std::unique_ptr<std::thread> g_audioThread;
-static volatile bool g_audioThreadShouldExit;
 
 static void AudioThread()
 {
@@ -51,7 +39,7 @@ static void AudioThread()
 
     size_t channels = g_downMixToStereo ? 2 : XAUDIO_NUM_CHANNELS;
 
-    while (!g_audioThreadShouldExit)
+    while (true)
     {
         uint32_t queuedAudioSize = SDL_GetQueuedAudioSize(g_audioDevice);
         constexpr size_t MAX_LATENCY = 10;
@@ -74,13 +62,6 @@ static void AudioThread()
     }
 }
 
-static void CreateAudioThread()
-{
-    SDL_PauseAudioDevice(g_audioDevice, 0);
-    g_audioThreadShouldExit = false;
-    g_audioThread = std::make_unique<std::thread>(AudioThread);
-}
-
 void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
 {
     auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param)));
@@ -89,13 +70,12 @@ void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
     g_clientCallbackParam = g_memory.MapVirtual(pClientParam);
     g_clientCallback = callback;
 
-    CreateAudioThread();
+    SDL_PauseAudioDevice(g_audioDevice, 0);
+    g_audioThread = std::make_unique<std::thread>(AudioThread);
 }
 
 void XAudioSubmitFrame(void* samples)
 {
-    auto floatSamples = reinterpret_cast<be<float>*>(samples);
-
     if (g_downMixToStereo)
     {
         // 0: left 1.0f, right 0.0f
@@ -105,6 +85,8 @@ void XAudioSubmitFrame(void* samples)
         // 4: left 1.0f, right 0.0f
         // 5: left 0.0f, right 1.0f
 
+        auto floatSamples = reinterpret_cast<be<float>*>(samples);
+
         std::array<float, 2 * XAUDIO_NUM_SAMPLES> audioFrames;
 
         for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
@@ -116,37 +98,24 @@ void XAudioSubmitFrame(void* samples)
             float ch4 = floatSamples[4 * XAUDIO_NUM_SAMPLES + i];
             float ch5 = floatSamples[5 * XAUDIO_NUM_SAMPLES + i];
 
-            audioFrames[i * 2 + 0] = (ch0 + ch2 * 0.75f + ch4) * Config::MasterVolume;
+            audioFrames[i * 2 + 0] = ch0 + ch2 * 0.75f + ch4;
-            audioFrames[i * 2 + 1] = (ch1 + ch2 * 0.75f + ch5) * Config::MasterVolume;
+            audioFrames[i * 2 + 1] = ch1 + ch2 * 0.75f + ch5;
         }
 
         SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames));
     }
     else
     {
-        std::array<float, XAUDIO_NUM_CHANNELS * XAUDIO_NUM_SAMPLES> audioFrames;
+        auto rawSamples = reinterpret_cast<be<uint32_t>*>(samples);
+
+        std::array<uint32_t, XAUDIO_NUM_CHANNELS * XAUDIO_NUM_SAMPLES> audioFrames;
 
         for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
         {
             for (size_t j = 0; j < XAUDIO_NUM_CHANNELS; j++)
-                audioFrames[i * XAUDIO_NUM_CHANNELS + j] = floatSamples[j * XAUDIO_NUM_SAMPLES + i] * Config::MasterVolume;
+                audioFrames[i * XAUDIO_NUM_CHANNELS + j] = rawSamples[j * XAUDIO_NUM_SAMPLES + i];
         }
 
         SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames));
     }
 }
-
-void XAudioConfigValueChangedCallback(IConfigDef* configDef)
-{
-    if (configDef == &Config::ChannelConfiguration)
-    {
-        if (g_audioThread->joinable())
-        {
-            g_audioThreadShouldExit = true;
-            g_audioThread->join();
-        }
-
-        CreateAudioDevice();
-        CreateAudioThread();
-    }
-}

UnleashedRecomp/apu/driver/sdl2_driver.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include <apu/audio.h>

UnleashedRecomp/apu/driver/xaudio_driver.cpp

@@ -0,0 +1,121 @@
+#include <stdafx.h>
+#include "xaudio_driver.h"
+#include <xaudio2.h>
+#include <cpu/guest_thread.h>
+#include <cpu/ppc_context.h>
+#include <kernel/heap.h>
+
+#define XAUDIO_DRIVER_KEY (uint32_t)('XAUD')
+
+PPCFunc* volatile g_clientCallback{};
+DWORD g_clientCallbackParam{}; // pointer in guest memory
+DWORD g_driverThread{};
+
+// TODO: Should use a counted ptr
+IXAudio2* g_audio{};
+IXAudio2MasteringVoice* g_masteringVoice{};
+IXAudio2SourceVoice* g_sourceVoice{};
+
+constexpr uint32_t g_semaphoreCount = 16;
+constexpr uint32_t g_audioFrameSize = 256 * 6;
+HANDLE g_audioSemaphore{ CreateSemaphoreA(nullptr, g_semaphoreCount, g_semaphoreCount, nullptr) };
+uint32_t g_audioFrames[g_audioFrameSize * g_semaphoreCount];
+uint32_t g_audioFrameIndex = 0;
+
+class VoiceCallback : public IXAudio2VoiceCallback
+{
+    STDMETHOD_(void, OnVoiceProcessingPassStart)(UINT32 BytesRequired) override {}
+    STDMETHOD_(void, OnVoiceProcessingPassEnd)() override {}
+
+    STDMETHOD_(void, OnBufferStart)(void* pBufferContext) override {}
+    STDMETHOD_(void, OnBufferEnd)(void* pBufferContext) override
+    {
+        ReleaseSemaphore(g_audioSemaphore, 1, nullptr);
+    }
+
+    STDMETHOD_(void, OnStreamEnd)() override {}
+
+    STDMETHOD_(void, OnLoopEnd)(void* pBufferContext) override {}
+    STDMETHOD_(void, OnVoiceError)(void* pBufferContext, HRESULT Error) override {}
+} gVoiceCallback;
+
+PPC_FUNC(DriverLoop)
+{
+    GuestThread::SetThreadName(GetCurrentThreadId(), "Audio Driver");
+
+    while (true)
+    {
+        if (!g_clientCallback)
+        {
+            continue;
+        }
+
+        WaitForSingleObject(g_audioSemaphore, INFINITE);
+
+        ctx.r3.u64 = g_clientCallbackParam;
+        g_clientCallback(ctx, g_memory.base);
+    }
+}
+
+void XAudioInitializeSystem()
+{
+    if (g_audio)
+    {
+        return;
+    }
+
+    //reinterpret_cast<decltype(&XAudio2Create)>(
+    //	GetProcAddress(LoadLibraryA("XAudio2_8.dll"), "XAudio2Create"))(&gAudio, 0, 1);
+
+    XAudio2Create(&g_audio);
+    g_audio->CreateMasteringVoice(&g_masteringVoice);
+
+    WAVEFORMATIEEEFLOATEX format{};
+    format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+    format.Format.cbSize = sizeof(format) - sizeof(format.Format);
+    format.Format.nChannels = XAUDIO_NUM_CHANNELS;
+    format.Format.nSamplesPerSec = XAUDIO_SAMPLES_HZ;
+    format.Format.wBitsPerSample = XAUDIO_SAMPLE_BITS;
+    format.Format.nBlockAlign = (format.Format.nChannels * format.Format.wBitsPerSample) / 8;
+    format.Format.nAvgBytesPerSec = format.Format.nSamplesPerSec * format.Format.nBlockAlign;
+
+    format.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+    format.Samples.wValidBitsPerSample = format.Format.wBitsPerSample;
+    format.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT |
+        SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
+
+    g_audio->CreateSourceVoice(&g_sourceVoice, &format.Format, 0, 1024, &gVoiceCallback);
+    g_sourceVoice->Start();
+
+    KeInsertHostFunction(XAUDIO_DRIVER_KEY, DriverLoop);
+    GuestThread::Start({ XAUDIO_DRIVER_KEY, 0, 0 }, nullptr);
+}
+
+void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
+{
+    auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param)));
+    ByteSwapInplace(param);
+    *pClientParam = param;
+    g_clientCallbackParam = g_memory.MapVirtual(pClientParam);
+
+    g_clientCallback = callback;
+}
+
+void XAudioSubmitFrame(void* samples)
+{
+    uint32_t* audioFrame = &g_audioFrames[g_audioFrameSize * g_audioFrameIndex];
+    g_audioFrameIndex = (g_audioFrameIndex + 1) % g_semaphoreCount;
+
+    for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
+    {
+        for (size_t j = 0; j < 6; j++)
+            audioFrame[i * XAUDIO_NUM_CHANNELS + j] = ByteSwap(((uint32_t*)samples)[j * XAUDIO_NUM_SAMPLES + i]);
+    }
+
+    XAUDIO2_BUFFER buffer{};
+    buffer.pAudioData = (BYTE*)audioFrame;
+    buffer.AudioBytes = XAUDIO_NUM_SAMPLES * XAUDIO_NUM_CHANNELS * sizeof(float);
+    buffer.PlayLength = XAUDIO_NUM_SAMPLES;
+
+    g_sourceVoice->SubmitSourceBuffer(&buffer);
+}

UnleashedRecomp/apu/driver/xaudio_driver.h

@@ -0,0 +1,2 @@
+#pragma once
+#include <apu/audio.h>

UnleashedRecomp/apu/embedded_player.cpp

@@ -93,7 +93,7 @@ static void PlayEmbeddedSound(EmbeddedSound s)
 
 void EmbeddedPlayer::Init() 
 {
-    Mix_OpenAudio(XAUDIO_SAMPLES_HZ, AUDIO_F32SYS, 2, 256);
+    Mix_OpenAudio(XAUDIO_SAMPLES_HZ, AUDIO_F32SYS, XAUDIO_NUM_CHANNELS, 256);
 
     s_isActive = true;
 }

UnleashedRecomp/cpu/guest_thread.cpp

@@ -165,7 +165,11 @@ int GetThreadPriorityImpl(GuestThreadHandle* hThread)
 
 uint32_t SetThreadIdealProcessorImpl(GuestThreadHandle* hThread, uint32_t dwIdealProcessor)
 {
+#ifdef _WIN32
+    return SetThreadIdealProcessor(hThread == GetKernelObject(CURRENT_THREAD_HANDLE) ? GetCurrentThread() : hThread->thread.native_handle(), dwIdealProcessor);
+#else
     return 0;
+#endif
 }
 
 GUEST_FUNCTION_HOOK(sub_82DFA2E8, SetThreadNameImpl);

UnleashedRecomp/framework.h

@@ -7,8 +7,6 @@
     typedef returnType _##procName(__VA_ARGS__); \
     _##procName* procName = (_##procName*)PROC_ADDRESS(libraryName, #procName);
 
-#define STR(x) #x
-
 template<typename T>
 inline T RoundUp(const T& in_rValue, uint32_t in_round)
 {

UnleashedRecomp/gpu/imgui/imgui_common.h

@@ -1,16 +1,14 @@
 #pragma once
 
-#define IMGUI_SHADER_MODIFIER_NONE                     0
+#define IMGUI_SHADER_MODIFIER_NONE            0
-#define IMGUI_SHADER_MODIFIER_SCANLINE                 1
+#define IMGUI_SHADER_MODIFIER_SCANLINE        1
-#define IMGUI_SHADER_MODIFIER_CHECKERBOARD             2
+#define IMGUI_SHADER_MODIFIER_CHECKERBOARD    2
-#define IMGUI_SHADER_MODIFIER_SCANLINE_BUTTON          3
+#define IMGUI_SHADER_MODIFIER_SCANLINE_BUTTON 3
-#define IMGUI_SHADER_MODIFIER_TEXT_SKEW                4
+#define IMGUI_SHADER_MODIFIER_TEXT_SKEW       4
-#define IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE  5
+#define IMGUI_SHADER_MODIFIER_MARQUEE_FADE    5
-#define IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE    6
+#define IMGUI_SHADER_MODIFIER_GRAYSCALE       6
-#define IMGUI_SHADER_MODIFIER_GRAYSCALE                7
+#define IMGUI_SHADER_MODIFIER_TITLE_BEVEL     7
-#define IMGUI_SHADER_MODIFIER_TITLE_BEVEL              8
+#define IMGUI_SHADER_MODIFIER_CATEGORY_BEVEL  8
-#define IMGUI_SHADER_MODIFIER_CATEGORY_BEVEL           9
-#define IMGUI_SHADER_MODIFIER_RECTANGLE_BEVEL          10
 
 #ifdef __cplusplus
 
@@ -24,7 +22,6 @@ enum class ImGuiCallback : int32_t
     SetOutline = -6,
     SetProceduralOrigin = -7,
     // -8 is ImDrawCallback_ResetRenderState, don't use!
-    SetAdditive = -9
 };
 
 union ImGuiCallbackData
@@ -33,10 +30,8 @@ union ImGuiCallbackData
     {
         float boundsMin[2];
         float boundsMax[2];
-        uint32_t gradientTopLeft;
+        uint32_t gradientTop;
-        uint32_t gradientTopRight;
+        uint32_t gradientBottom;
-        uint32_t gradientBottomRight;
-        uint32_t gradientBottomLeft;
     } setGradient;
 
     struct
@@ -69,11 +64,6 @@ union ImGuiCallbackData
     {
         float proceduralOrigin[2];
     } setProceduralOrigin;
-
-    struct
-    {
-        bool enabled;
-    } setAdditive;
 };
 
 extern ImGuiCallbackData* AddImGuiCallback(ImGuiCallback callback);

UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp

@@ -221,8 +221,6 @@ static bool FontBuilder_Build(ImFontAtlas* atlas)
     for (size_t i = 0; i < atlas->ConfigData.size(); i++)
     {
         auto& config = atlas->ConfigData[i];
-        bool increaseSpacing = strstr(config.Name, "Seurat") != nullptr;
-
         auto& [index, count] = ranges[i];
         for (size_t j = 0; j < count; j++)
         {
@@ -230,11 +228,6 @@ static bool FontBuilder_Build(ImFontAtlas* atlas)
             double x0, y0, x1, y1, u0, v0, u1, v1;
             glyph.getQuadPlaneBounds(x0, y0, x1, y1);
             glyph.getQuadAtlasBounds(u0, v0, u1, v1);
-
-            double advance = glyph.getAdvance();
-            if (increaseSpacing && glyph.getCodepoint() == ' ')
-                advance *= 1.5;
-
             config.DstFont->AddGlyph(
                 &config,
                 glyph.getCodepoint(),
@@ -246,7 +239,7 @@ static bool FontBuilder_Build(ImFontAtlas* atlas)
                 v1 / packer.height, 
                 u1 / packer.width, 
                 v0 / packer.height, 
-                advance);
+                glyph.getAdvance());
         }
 
         config.DstFont->BuildLookupTable();

UnleashedRecomp/gpu/rhi/plume_d3d12.cpp

@@ -27,8 +27,6 @@
 //#   define D3D12_DEBUG_LAYER_GPU_BASED_VALIDATION_ENABLED
 #endif
 
-//#define D3D12_DEBUG_SET_STABLE_POWER_STATE
-
 // Old Windows SDK versions don't provide this macro, so we workaround it by making sure it is defined.
 #ifndef D3D12_RESOURCE_STATE_ALL_SHADER_RESOURCE
 #define D3D12_RESOURCE_STATE_ALL_SHADER_RESOURCE (D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE)
@@ -694,20 +692,6 @@ namespace plume {
         );
     }
 
-    static D3D12_RESOLVE_MODE toD3D12(RenderResolveMode resolveMode) {
-        switch (resolveMode) {
-        case RenderResolveMode::MIN:
-            return D3D12_RESOLVE_MODE_MIN;
-        case RenderResolveMode::MAX:
-            return D3D12_RESOLVE_MODE_MAX;
-        case RenderResolveMode::AVERAGE:
-            return D3D12_RESOLVE_MODE_AVERAGE;
-        default:
-            assert(false && "Unknown resolve mode.");
-            return D3D12_RESOLVE_MODE_AVERAGE;
-        }
-    }
-
     static void setObjectName(ID3D12Object *object, const std::string &name) {
         const std::wstring wideCharName = Utf8ToUtf16(name);
         object->SetName(wideCharName.c_str());
@@ -1932,7 +1916,7 @@ namespace plume {
         resetSamplePositions();
     }
 
-    void D3D12CommandList::resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect, RenderResolveMode resolveMode) {
+    void D3D12CommandList::resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect) {
         assert(dstTexture != nullptr);
         assert(srcTexture != nullptr);
 
@@ -1947,7 +1931,7 @@ namespace plume {
         }
 
         setSamplePositions(interfaceDstTexture);
-        d3d->ResolveSubresourceRegion(interfaceDstTexture->d3d, 0, dstX, dstY, interfaceSrcTexture->d3d, 0, (srcRect != nullptr) ? &rect : nullptr, toDXGI(interfaceDstTexture->desc.format), toD3D12(resolveMode));
+        d3d->ResolveSubresourceRegion(interfaceDstTexture->d3d, 0, dstX, dstY, interfaceSrcTexture->d3d, 0, (srcRect != nullptr) ? &rect : nullptr, toDXGI(interfaceDstTexture->desc.format), D3D12_RESOLVE_MODE_AVERAGE);
         resetSamplePositions();
     }
 
@@ -3340,14 +3324,6 @@ namespace plume {
                 dynamicDepthBiasOption = d3d12Options16.DynamicDepthBiasSupported;
             }
 
-            // Check if the architecture has UMA.
-            bool uma = false;
-            D3D12_FEATURE_DATA_ARCHITECTURE1 architecture1 = {};
-            res = deviceOption->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE1, &architecture1, sizeof(architecture1));
-            if (SUCCEEDED(res)) {
-                uma = architecture1.UMA;
-            }
-
             // Pick this adapter and device if it has better feature support than the current one.
             bool preferOverNothing = (adapter == nullptr) || (d3d == nullptr);
             bool preferVideoMemory = adapterDesc.DedicatedVideoMemory > description.dedicatedVideoMemory;
@@ -3370,7 +3346,6 @@ namespace plume {
                 capabilities.sampleLocations = samplePositionsOption;
                 capabilities.triangleFan = triangleFanSupportOption;
                 capabilities.dynamicDepthBias = dynamicDepthBiasOption;
-                capabilities.uma = uma;
                 description.name = Utf16ToUtf8(adapterDesc.Description);
                 description.dedicatedVideoMemory = adapterDesc.DedicatedVideoMemory;
 
@@ -3389,10 +3364,6 @@ namespace plume {
             return;
         }
 
-        #ifdef D3D12_DEBUG_SET_STABLE_POWER_STATE
-            d3d->SetStablePowerState(TRUE);
-        #endif
-
         D3D12MA::ALLOCATOR_DESC allocatorDesc = {};
         allocatorDesc.pDevice = d3d;
         allocatorDesc.pAdapter = adapter;

UnleashedRecomp/gpu/rhi/plume_d3d12.h

@@ -192,7 +192,7 @@ namespace plume {
         void copyBuffer(const RenderBuffer *dstBuffer, const RenderBuffer *srcBuffer) override;
         void copyTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) override;
         void resolveTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) override;
-        void resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect, RenderResolveMode resolveMode) override;
+        void resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect) override;
         void buildBottomLevelAS(const RenderAccelerationStructure *dstAccelerationStructure, RenderBufferReference scratchBuffer, const RenderBottomLevelASBuildInfo &buildInfo) override;
         void buildTopLevelAS(const RenderAccelerationStructure *dstAccelerationStructure, RenderBufferReference scratchBuffer, RenderBufferReference instancesBuffer, const RenderTopLevelASBuildInfo &buildInfo) override;
         void discardTexture(const RenderTexture* texture) override;

UnleashedRecomp/gpu/rhi/plume_render_interface.h

@@ -143,7 +143,7 @@ namespace plume {
         virtual void copyBuffer(const RenderBuffer *dstBuffer, const RenderBuffer *srcBuffer) = 0;
         virtual void copyTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) = 0;
         virtual void resolveTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) = 0;
-        virtual void resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect = nullptr, RenderResolveMode resolveMode = RenderResolveMode::AVERAGE) = 0;
+        virtual void resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect = nullptr) = 0;
         virtual void buildBottomLevelAS(const RenderAccelerationStructure *dstAccelerationStructure, RenderBufferReference scratchBuffer, const RenderBottomLevelASBuildInfo &buildInfo) = 0;
         virtual void buildTopLevelAS(const RenderAccelerationStructure *dstAccelerationStructure, RenderBufferReference scratchBuffer, RenderBufferReference instancesBuffer, const RenderTopLevelASBuildInfo &buildInfo) = 0;
         virtual void discardTexture(const RenderTexture* texture) = 0; // D3D12 only.

UnleashedRecomp/gpu/rhi/plume_render_interface_types.h

@@ -475,20 +475,6 @@ namespace plume {
 
     typedef uint32_t RenderSampleCounts;
 
-    enum class RenderDeviceType {
-        UNKNOWN,
-        INTEGRATED,
-        DISCRETE,
-        VIRTUAL,
-        CPU
-    };
-
-    enum class RenderResolveMode {
-        MIN,
-        MAX,
-        AVERAGE
-    };
-
     // Global functions.
 
     constexpr uint32_t RenderFormatSize(RenderFormat format) {
@@ -1141,7 +1127,7 @@ namespace plume {
             desc.srcBlend = RenderBlend::SRC_ALPHA;
             desc.dstBlend = RenderBlend::INV_SRC_ALPHA;
             desc.blendOp = RenderBlendOperation::ADD;
-            desc.srcBlendAlpha = RenderBlend::SRC_ALPHA;
+            desc.srcBlendAlpha = RenderBlend::ONE;
             desc.dstBlendAlpha = RenderBlend::INV_SRC_ALPHA;
             desc.blendOpAlpha = RenderBlendOperation::ADD;
             return desc;
@@ -1283,9 +1269,9 @@ namespace plume {
         RenderFilter minFilter = RenderFilter::LINEAR;
         RenderFilter magFilter = RenderFilter::LINEAR;
         RenderMipmapMode mipmapMode = RenderMipmapMode::LINEAR;
-        RenderTextureAddressMode addressU = RenderTextureAddressMode::CLAMP;
+        RenderTextureAddressMode addressU = RenderTextureAddressMode::WRAP;
-        RenderTextureAddressMode addressV = RenderTextureAddressMode::CLAMP;
+        RenderTextureAddressMode addressV = RenderTextureAddressMode::WRAP;
-        RenderTextureAddressMode addressW = RenderTextureAddressMode::CLAMP;
+        RenderTextureAddressMode addressW = RenderTextureAddressMode::WRAP;
         float mipLODBias = 0.0f;
         uint32_t maxAnisotropy = 16;
         bool anisotropyEnabled = false;
@@ -1768,7 +1754,6 @@ namespace plume {
 
     struct RenderDeviceDescription {
         std::string name = "Unknown";
-        RenderDeviceType type = RenderDeviceType::UNKNOWN;
         uint32_t driverVersion = 0;
         uint64_t dedicatedVideoMemory = 0;
     };
@@ -1795,9 +1780,6 @@ namespace plume {
         // Draw.
         bool triangleFan = false;
         bool dynamicDepthBias = false;
-
-        // UMA.
-        bool uma = false;
     };
 
     struct RenderInterfaceCapabilities {

UnleashedRecomp/gpu/rhi/plume_vulkan.cpp

@@ -705,21 +705,6 @@ namespace plume {
         }
     }
 
-    static RenderDeviceType toDeviceType(VkPhysicalDeviceType type) {
-        switch (type) {
-        case VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU:
-            return RenderDeviceType::INTEGRATED;
-        case VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU:
-            return RenderDeviceType::DISCRETE;
-        case VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU:
-            return RenderDeviceType::VIRTUAL;
-        case VK_PHYSICAL_DEVICE_TYPE_CPU:
-            return RenderDeviceType::CPU;
-        default:
-            return RenderDeviceType::UNKNOWN;
-        }
-    }
-
     static void setObjectName(VkDevice device, VkDebugReportObjectTypeEXT objectType, uint64_t object, const std::string &name) {
 #   ifdef VULKAN_OBJECT_NAMES_ENABLED
         VkDebugMarkerObjectNameInfoEXT nameInfo = {};
@@ -3074,13 +3059,12 @@ namespace plume {
     }
 
     void VulkanCommandList::resolveTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) {
-        resolveTextureRegion(dstTexture, 0, 0, srcTexture, nullptr, RenderResolveMode::AVERAGE);
+        resolveTextureRegion(dstTexture, 0, 0, srcTexture, nullptr);
     }
 
-    void VulkanCommandList::resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect, RenderResolveMode resolveMode) {
+    void VulkanCommandList::resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect) {
         assert(dstTexture != nullptr);
         assert(srcTexture != nullptr);
-        assert(resolveMode == RenderResolveMode::AVERAGE && "Vulkan only supports AVERAGE resolve mode.");
 
         thread_local std::vector<VkImageResolve> imageResolves;
         imageResolves.clear();
@@ -3512,7 +3496,6 @@ namespace plume {
             if (preferOption) {
                 physicalDevice = physicalDevices[i];
                 description.name = std::string(deviceProperties.deviceName);
-                description.type = toDeviceType(deviceProperties.deviceType);
                 description.driverVersion = deviceProperties.driverVersion;
                 currentDeviceTypeScore = deviceTypeScore;
             }

UnleashedRecomp/gpu/rhi/plume_vulkan.h

@@ -315,7 +315,7 @@ namespace plume {
         void copyBuffer(const RenderBuffer *dstBuffer, const RenderBuffer *srcBuffer) override;
         void copyTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) override;
         void resolveTexture(const RenderTexture *dstTexture, const RenderTexture *srcTexture) override;
-        void resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect, RenderResolveMode resolveMode) override;
+        void resolveTextureRegion(const RenderTexture *dstTexture, uint32_t dstX, uint32_t dstY, const RenderTexture *srcTexture, const RenderRect *srcRect) override;
         void buildBottomLevelAS(const RenderAccelerationStructure *dstAccelerationStructure, RenderBufferReference scratchBuffer, const RenderBottomLevelASBuildInfo &buildInfo) override;
         void buildTopLevelAS(const RenderAccelerationStructure *dstAccelerationStructure, RenderBufferReference scratchBuffer, RenderBufferReference instancesBuffer, const RenderTopLevelASBuildInfo &buildInfo) override;
         void discardTexture(const RenderTexture* texture) override;

UnleashedRecomp/gpu/shader/blend_color_alpha_ps.hlsl

@@ -1,41 +0,0 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
-
-#ifdef __spirv__
-
-#define g_SrcAlpha_DestAlpha vk::RawBufferLoad<float4>(g_PushConstants.PixelShaderConstants + 2400, 0x10)
-#define s0_Texture2DDescriptorIndex vk::RawBufferLoad<uint>(g_PushConstants.SharedConstants + 0)
-#define s0_SamplerDescriptorIndex vk::RawBufferLoad<uint>(g_PushConstants.SharedConstants + 192)
-
-#else
-
-cbuffer PixelShaderConstants : register(b1, space4)
-{
-    float4 g_SrcAlpha_DestAlpha : packoffset(c150);
-};
-
-cbuffer SharedConstants : register(b2, space4)
-{
-    uint s0_Texture2DDescriptorIndex : packoffset(c0.x);
-    uint s0_SamplerDescriptorIndex : packoffset(c12.x);
-    DEFINE_SHARED_CONSTANTS();
-};
-
-#endif
-
-float4 main(
-    in float4 iPos : SV_Position,
-    in float4 iTexCoord0 : TEXCOORD0) : SV_Target0
-{
-    Texture2D<float4> texture = g_Texture2DDescriptorHeap[s0_Texture2DDescriptorIndex];
-    SamplerState samplerState = g_SamplerDescriptorHeap[s0_SamplerDescriptorIndex];
-    
-    float4 color = texture.Sample(samplerState, iTexCoord0.xy);
-    
-    if (any(or(iTexCoord0.xy < 0.0, iTexCoord0.xy > 1.0)))
-        color = float4(0.0, 0.0, 0.0, 1.0);
-    
-    color.rgb *= color.a * g_SrcAlpha_DestAlpha.x;
-    color.a = g_SrcAlpha_DestAlpha.y + (1.0 - color.a) * g_SrcAlpha_DestAlpha.x;
-    
-    return color;
-}

UnleashedRecomp/gpu/shader/copy_color_ps.hlsl

@@ -1,8 +0,0 @@
-#include "copy_common.hlsli"
-
-Texture2D<float4> g_Texture2DDescriptorHeap[] : register(t0, space0);
-
-float4 main(in float4 position : SV_Position) : SV_Target
-{
-    return g_Texture2DDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int3(position.xy, 0));
-}

UnleashedRecomp/gpu/shader/copy_common.hlsli

@@ -1,8 +0,0 @@
-#pragma once
-
-struct PushConstants
-{
-    uint ResourceDescriptorIndex;
-};
-
-[[vk::push_constant]] ConstantBuffer<PushConstants> g_PushConstants : register(b3, space4);

UnleashedRecomp/gpu/shader/copy_depth_ps.hlsl

@@ -1,8 +0,0 @@
-#include "copy_common.hlsli"
-
-Texture2D<float> g_Texture2DDescriptorHeap[] : register(t0, space0);
-
-float main(in float4 position : SV_Position) : SV_Depth
-{
-    return g_Texture2DDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int3(position.xy, 0));
-}

UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 

UnleashedRecomp/gpu/shader/csd_no_tex_vs.hlsl

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 

UnleashedRecomp/gpu/shader/csd_vs.hlsl

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 

UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 
@@ -38,7 +38,7 @@ cbuffer SharedConstants : register(b2, space4)
 
 #endif
 
-float4 main(in float4 position : SV_Position, in float4 texCoord : TEXCOORD0) : SV_Target
+float4 main(in float4 position : SV_Position, in float2 texCoord : TEXCOORD0) : SV_Target
 {
     Texture2D<float4> sampColor = g_Texture2DDescriptorHeap[sampColor_Texture2DDescriptorIndex];
     Texture2D<float4> sampVelocityMap = g_Texture2DDescriptorHeap[sampVelocityMap_Texture2DDescriptorIndex];
@@ -48,19 +48,19 @@ float4 main(in float4 position : SV_Position, in float4 texCoord : TEXCOORD0) :
     SamplerState sampVelocityMap_s = g_SamplerDescriptorHeap[sampVelocityMap_SamplerDescriptorIndex];   
     SamplerState sampZBuffer_s = g_SamplerDescriptorHeap[sampZBuffer_SamplerDescriptorIndex];
     
-    float depth = sampZBuffer.SampleLevel(sampZBuffer_s, texCoord.xy, 0).x;
+    float depth = sampZBuffer.SampleLevel(sampZBuffer_s, texCoord, 0).x;
-    float4 velocityMap = sampVelocityMap.SampleLevel(sampVelocityMap_s, texCoord.xy, 0);
+    float4 velocityMap = sampVelocityMap.SampleLevel(sampVelocityMap_s, texCoord, 0);
     float2 velocity = (velocityMap.xz + velocityMap.yw / 255.0) * 2.0 - 1.0;
 
     int sampleCount = min(64, round(length(velocity * g_ViewportSize.xy)));
     float2 sampleOffset = velocity / (float) sampleCount;
 
-    float3 color = sampColor.SampleLevel(sampColor_s, texCoord.xy, 0).rgb;
+    float3 color = sampColor.SampleLevel(sampColor_s, texCoord, 0).rgb;
     int count = 1;
 
     for (int i = 1; i <= sampleCount; i++)
     {
-        float2 sampleCoord = texCoord.xy + sampleOffset * i;
+        float2 sampleCoord = texCoord + sampleOffset * i;
         float3 sampleColor = sampColor.SampleLevel(sampColor_s, sampleCoord, 0).rgb;
         float sampleDepth = sampZBuffer.SampleLevel(sampZBuffer_s, sampleCoord, 0).x;
 

UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 

UnleashedRecomp/gpu/shader/gaussian_blur.hlsli

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 

UnleashedRecomp/gpu/shader/imgui_common.hlsli

@@ -6,10 +6,8 @@ struct PushConstants
 {
     float2 BoundsMin;
     float2 BoundsMax;
-    uint GradientTopLeft;
+    uint GradientTop;
-    uint GradientTopRight;
+    uint GradientBottom;
-    uint GradientBottomRight;
-    uint GradientBottomLeft;
     uint ShaderModifier;
     uint Texture2DDescriptorIndex;
     float2 InverseDisplaySize;

UnleashedRecomp/gpu/shader/imgui_ps.hlsl

@@ -60,17 +60,17 @@ float4 SampleLinear(float2 uvTexspace)
 }
 
 float4 PixelAntialiasing(float2 uvTexspace)
-{    
+{
-    if ((g_PushConstants.InverseDisplaySize.y / g_PushConstants.InverseDisplaySize.x) >= (4.0 / 3.0))
-        uvTexspace *= g_PushConstants.InverseDisplaySize.y * 720.0f;
-    else
-        uvTexspace *= g_PushConstants.InverseDisplaySize.x * 960.0f;
-
     float2 seam = floor(uvTexspace + 0.5);
     uvTexspace = (uvTexspace - seam) / fwidth(uvTexspace) + seam;
     uvTexspace = clamp(uvTexspace, seam - 0.5, seam + 0.5);
     
-    return SampleLinear(uvTexspace - 0.5);
+    if ((g_PushConstants.InverseDisplaySize.y / g_PushConstants.InverseDisplaySize.x) >= (4.0 / 3.0))
+        uvTexspace *= g_PushConstants.InverseDisplaySize.y * 720.0f;
+    else
+        uvTexspace *= g_PushConstants.InverseDisplaySize.x * 960.0f;
+    
+    return SampleLinear(uvTexspace);
 }
 
 float median(float r, float g, float b)
@@ -81,7 +81,7 @@ float median(float r, float g, float b)
 float4 main(in Interpolators interpolators) : SV_Target
 {
     float4 color = interpolators.Color;
-    color *= PixelAntialiasing(interpolators.Position.xy - g_PushConstants.ProceduralOrigin);
+    color *= PixelAntialiasing(interpolators.Position.xy - (g_PushConstants.ProceduralOrigin + 0.5));
     
     if (g_PushConstants.Texture2DDescriptorIndex != 0)
     {
@@ -135,18 +135,10 @@ float4 main(in Interpolators interpolators) : SV_Target
         }
     }
     
-    if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE)
+    if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_MARQUEE_FADE)
     {
         float minAlpha = saturate((interpolators.Position.x - g_PushConstants.BoundsMin.x) / g_PushConstants.Scale.x);
-        float maxAlpha = saturate((g_PushConstants.BoundsMax.x - interpolators.Position.x) / g_PushConstants.Scale.y);
+        float maxAlpha = saturate((g_PushConstants.BoundsMax.x - interpolators.Position.x) / g_PushConstants.Scale.x);
-        
-        color.a *= minAlpha;
-        color.a *= maxAlpha;
-    }
-    else if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE)
-    {
-        float minAlpha = saturate((interpolators.Position.y - g_PushConstants.BoundsMin.y) / g_PushConstants.Scale.x);
-        float maxAlpha = saturate((g_PushConstants.BoundsMax.y - interpolators.Position.y) / g_PushConstants.Scale.y);
         
         color.a *= minAlpha;
         color.a *= maxAlpha;
@@ -154,29 +146,7 @@ float4 main(in Interpolators interpolators) : SV_Target
     else if (any(g_PushConstants.BoundsMin != g_PushConstants.BoundsMax))
     {
         float2 factor = saturate((interpolators.Position.xy - g_PushConstants.BoundsMin) / (g_PushConstants.BoundsMax - g_PushConstants.BoundsMin));
-        
+        color *= lerp(DecodeColor(g_PushConstants.GradientTop), DecodeColor(g_PushConstants.GradientBottom), smoothstep(0.0, 1.0, factor.y));
-        if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_RECTANGLE_BEVEL)
-        {
-            float bevelSize = 0.9;
-
-            float shadow = saturate((factor.x - bevelSize) / (1.0 - bevelSize));
-            shadow = max(shadow, saturate((factor.y - bevelSize) / (1.0 - bevelSize)));
-
-            float rim = saturate((1.0 - factor.x - bevelSize) / (1.0 - bevelSize));
-            rim = max(rim, saturate((1.0 - factor.y - bevelSize) / (1.0 - bevelSize)));
-
-            float3 rimColor = float3(1, 0.8, 0.29);
-            float3 shadowColor = float3(0.84, 0.57, 0);
-
-            color.rgb = lerp(color.rgb, rimColor, smoothstep(0.0, 1.0, rim));
-            color.rgb = lerp(color.rgb, shadowColor, smoothstep(0.0, 1.0, shadow));
-        }
-        else
-        {
-            float4 top = lerp(DecodeColor(g_PushConstants.GradientTopLeft), DecodeColor(g_PushConstants.GradientTopRight), smoothstep(0.0, 1.0, factor.x));
-            float4 bottom = lerp(DecodeColor(g_PushConstants.GradientBottomLeft), DecodeColor(g_PushConstants.GradientBottomRight), smoothstep(0.0, 1.0, factor.x));
-            color *= lerp(top, bottom, smoothstep(0.0, 1.0, factor.y));
-        }
     }
         
     if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_GRAYSCALE)

UnleashedRecomp/gpu/shader/imgui_vs.hlsl

@@ -7,8 +7,7 @@ void main(in float2 position : POSITION, in float2 uv : TEXCOORD, in float4 colo
         if (position.y < g_PushConstants.Origin.y)
             position.x += g_PushConstants.Scale.x;
     }
-    else if (g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE && 
+    else if (g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_MARQUEE_FADE)
-        g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE)
     {
         position.xy = g_PushConstants.Origin + (position.xy - g_PushConstants.Origin) * g_PushConstants.Scale;
     }

UnleashedRecomp/gpu/shader/movie_common.hlsli

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 

UnleashedRecomp/gpu/shader/resolve_msaa_color.hlsli

@@ -1,15 +0,0 @@
-#pragma once
-
-#include "copy_common.hlsli"
-
-Texture2DMS<float4, SAMPLE_COUNT> g_Texture2DMSDescriptorHeap[] : register(t0, space0);
-
-float4 main(in float4 position : SV_Position) : SV_Target
-{
-    float4 result = g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int2(position.xy), 0);
-    
-    [unroll] for (int i = 1; i < SAMPLE_COUNT; i++)
-        result += g_Texture2DMSDescriptorHeap[g_PushConstants.ResourceDescriptorIndex].Load(int2(position.xy), i);
-
-    return result / SAMPLE_COUNT;
-}

UnleashedRecomp/gpu/shader/resolve_msaa_color_2x.hlsl

@@ -1,2 +0,0 @@
-#define SAMPLE_COUNT 2
-#include "resolve_msaa_color.hlsli"

UnleashedRecomp/gpu/shader/resolve_msaa_color_4x.hlsl

@@ -1,2 +0,0 @@
-#define SAMPLE_COUNT 4
-#include "resolve_msaa_color.hlsli"

UnleashedRecomp/gpu/shader/resolve_msaa_color_8x.hlsl

@@ -1,2 +0,0 @@
-#define SAMPLE_COUNT 8
-#include "resolve_msaa_color.hlsli"

UnleashedRecomp/gpu/shader/resolve_msaa_depth.hlsli

@@ -1,6 +1,11 @@
 #pragma once
 
-#include "copy_common.hlsli"
+struct PushConstants
+{
+    uint ResourceDescriptorIndex;
+};
+
+[[vk::push_constant]] ConstantBuffer<PushConstants> g_PushConstants : register(b3, space4);
 
 Texture2DMS<float, SAMPLE_COUNT> g_Texture2DMSDescriptorHeap[] : register(t0, space0);
 

UnleashedRecomp/gpu/video.h

@@ -18,11 +18,14 @@ struct Video
     static inline uint32_t s_viewportWidth;
     static inline uint32_t s_viewportHeight;
 
-    static bool CreateHostDevice(const char *sdlVideoDriver);
+    static void CreateHostDevice(const char *sdlVideoDriver);
     static void WaitOnSwapChain();
     static void Present();
     static void StartPipelinePrecompilation();
     static void WaitForGPU();
+    static void DrawCounter();
+    static void DrawFPS(ImFont* font);
+    static struct GuestSurface* GetBackBuffer();
     static void ComputeViewportDimensions();
 };
 
@@ -158,7 +161,6 @@ struct GuestTexture : GuestBaseTexture
     void* mappedMemory = nullptr;
     std::unique_ptr<RenderFramebuffer> framebuffer;
     std::unique_ptr<GuestTexture> patchedTexture;
-    struct GuestSurface* sourceSurface = nullptr;
 };
 
 struct GuestLockedRect
@@ -206,7 +208,6 @@ struct GuestSurface : GuestBaseTexture
     uint32_t guestFormat = 0;
     ankerl::unordered_dense::map<const RenderTexture*, std::unique_ptr<RenderFramebuffer>> framebuffers;
     RenderSampleCounts sampleCount = RenderSampleCount::COUNT_1;
-    ankerl::unordered_dense::set<GuestTexture*> destinationTextures;
 };
 
 enum GuestDeclType
@@ -287,7 +288,7 @@ struct GuestShader : GuestResource
     std::unique_ptr<RenderShader> shader;
     struct ShaderCacheEntry* shaderCacheEntry = nullptr;
     ankerl::unordered_dense::map<uint32_t, std::unique_ptr<RenderShader>> linkedShaders;
-#ifdef UNLEASHED_RECOMP_D3D12
+#ifdef SWA_D3D12
     std::vector<ComPtr<IDxcBlob>> shaderBlobs;
     ComPtr<IDxcBlobEncoding> libraryBlob;
 #endif

UnleashedRecomp/hid/driver/sdl_hid.cpp

@@ -1,8 +1,7 @@
 #include <stdafx.h>
 #include <SDL.h>
 #include <user/config.h>
-#include <hid/hid.h>
+#include <hid/hid_detail.h>
-#include <os/logger.h>
 #include <ui/game_window.h>
 #include <kernel/xdm.h>
 #include <app.h>
@@ -41,17 +40,17 @@ public:
         return SDL_GameControllerTypeForIndex(index);
     }
 
-    hid::EInputDevice GetInputDevice() const
+    hid::detail::EInputDevice GetInputDevice() const
     {
         switch (GetControllerType())
         {
             case SDL_CONTROLLER_TYPE_PS3:
             case SDL_CONTROLLER_TYPE_PS4:
             case SDL_CONTROLLER_TYPE_PS5:
-                return hid::EInputDevice::PlayStation;
+                return hid::detail::EInputDevice::PlayStation;
         }
 
-        return hid::EInputDevice::Xbox;
+        return hid::detail::EInputDevice::Xbox;
     }
 
     void Close()
@@ -68,7 +67,7 @@ public:
 
     bool CanPoll()
     {
-        return controller;
+        return controller && (GameWindow::s_isFocused || Config::AllowBackgroundInput);
     }
 
     void PollAxis()
@@ -127,11 +126,6 @@ public:
 
         SDL_GameControllerRumble(controller, vibration.wLeftMotorSpeed * 256, vibration.wRightMotorSpeed * 256, VIBRATION_TIMEOUT_MS);
     }
-
-    void SetLED(const uint8_t r, const uint8_t g, const uint8_t b) const
-    {
-        SDL_GameControllerSetLED(controller, r, g, b);
-    }
 };
 
 std::array<Controller, 4> g_controllers;
@@ -174,26 +168,8 @@ static void SetControllerInputDevice(Controller* controller)
     if (App::s_isLoading)
         return;
 
-    hid::g_inputDevice = controller->GetInputDevice();
+    hid::detail::g_inputDevice = controller->GetInputDevice();
-    hid::g_inputDeviceController = hid::g_inputDevice;
+    hid::detail::g_inputDeviceController = hid::detail::g_inputDevice;
-
-    auto controllerType = (hid::EInputDeviceExplicit)controller->GetControllerType();
-
-    if (hid::g_inputDeviceExplicit != controllerType)
-    {
-        hid::g_inputDeviceExplicit = controllerType;
-
-        LOGFN("Detected controller: {}", hid::GetInputDeviceName());
-    }
-}
-
-static void SetControllerTimeOfDayLED(Controller& controller, bool isNight)
-{
-    auto r = isNight ? 22 : 0;
-    auto g = isNight ? 0 : 37;
-    auto b = isNight ? 101 : 184;
-
-    controller.SetLED(r, g, b);
 }
 
 int HID_OnSDLEvent(void*, SDL_Event* event)
@@ -205,13 +181,7 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
             const auto freeIndex = FindFreeController();
 
             if (freeIndex != -1)
-            {
+                g_controllers[freeIndex] = Controller(event->cdevice.which);
-                auto controller = Controller(event->cdevice.which);
-
-                g_controllers[freeIndex] = controller;
-
-                SetControllerTimeOfDayLED(controller, App::s_isWerehog);
-            }
 
             break;
         }
@@ -229,7 +199,6 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
         case SDL_CONTROLLERBUTTONDOWN:
         case SDL_CONTROLLERBUTTONUP:
         case SDL_CONTROLLERAXISMOTION:
-        case SDL_CONTROLLERTOUCHPADDOWN:
         {
             auto* controller = FindController(event->cdevice.which);
 
@@ -239,16 +208,12 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
             if (event->type == SDL_CONTROLLERAXISMOTION)
             {
                 if (abs(event->caxis.value) > 8000)
-                {
-                    SDL_ShowCursor(SDL_DISABLE);
                     SetControllerInputDevice(controller);
-                }
 
                 controller->PollAxis();
             }
             else
             {
-                SDL_ShowCursor(SDL_DISABLE);
                 SetControllerInputDevice(controller);
 
                 controller->Poll();
@@ -259,20 +224,14 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
 
         case SDL_KEYDOWN:
         case SDL_KEYUP:
-            hid::g_inputDevice = hid::EInputDevice::Keyboard;
+            hid::detail::g_inputDevice = hid::detail::EInputDevice::Keyboard;
             break;
 
         case SDL_MOUSEMOTION:
         case SDL_MOUSEBUTTONDOWN:
         case SDL_MOUSEBUTTONUP:
-        {
+            hid::detail::g_inputDevice = hid::detail::EInputDevice::Mouse;
-            if (!GameWindow::IsFullscreen() || GameWindow::s_isFullscreenCursorVisible)
-                SDL_ShowCursor(SDL_ENABLE);
-
-            hid::g_inputDevice = hid::EInputDevice::Mouse;
-
             break;
-        }
 
         case SDL_WINDOWEVENT:
         {
@@ -288,8 +247,17 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
 
         case SDL_USER_EVILSONIC:
         {
-            for (auto& controller : g_controllers)
+            auto* controller = FindController(event->cdevice.which);
-                SetControllerTimeOfDayLED(controller, event->user.code);
+
+            if (!controller)
+                break;
+
+            auto isNight = event->user.code;
+            auto r = isNight ? 22 : 0;
+            auto g = isNight ? 0 : 37;
+            auto b = isNight ? 101 : 184;
+
+            SDL_GameControllerSetLED(controller->controller, r, g, b);
 
             break;
         }
@@ -298,17 +266,14 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
     return 0;
 }
 
-void hid::Init()
+void hid::detail::Init()
 {
-    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1");
     SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1");
     SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
     SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
     SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
     SDL_SetHint(SDL_HINT_XINPUT_ENABLED, "1");
 
     SDL_InitSubSystem(SDL_INIT_EVENTS);
@@ -317,7 +282,7 @@ void hid::Init()
     SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
 }
 
-uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
+uint32_t hid::detail::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
 {
     static uint32_t packet;
 
@@ -336,7 +301,7 @@ uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
     return ERROR_SUCCESS;
 }
 
-uint32_t hid::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
+uint32_t hid::detail::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
 {
     if (!pVibration)
         return ERROR_BAD_ARGUMENTS;
@@ -349,7 +314,7 @@ uint32_t hid::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
     return ERROR_SUCCESS;
 }
 
-uint32_t hid::GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps)
+uint32_t hid::detail::GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps)
 {
     if (!pCaps)
         return ERROR_BAD_ARGUMENTS;

UnleashedRecomp/hid/hid.cpp

@@ -1,81 +1,39 @@
+#include <stdafx.h>
 #include "hid.h"
-#include <ui/game_window.h>
+#include "hid_detail.h"
-#include <user/config.h>
 
-hid::EInputDevice hid::g_inputDevice;
+hid::detail::EInputDevice hid::detail::g_inputDevice;
-hid::EInputDevice hid::g_inputDeviceController;
+hid::detail::EInputDevice hid::detail::g_inputDeviceController;
-hid::EInputDeviceExplicit hid::g_inputDeviceExplicit;
 
-uint16_t hid::g_prohibitedButtons;
+uint16_t hid::detail::g_prohibitedButtons;
+
+void hid::Init()
+{
+    detail::Init();
+}
 
 void hid::SetProhibitedButtons(uint16_t wButtons)
 {
-    hid::g_prohibitedButtons = wButtons;
+    hid::detail::g_prohibitedButtons = wButtons;
 }
 
-bool hid::IsInputAllowed()
+uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
 {
-    return GameWindow::s_isFocused || Config::AllowBackgroundInput;
+    return detail::GetState(dwUserIndex, pState);
 }
 
-bool hid::IsInputDeviceController()
+uint32_t hid::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
 {
-    return hid::g_inputDevice != hid::EInputDevice::Keyboard &&
+    return detail::SetState(dwUserIndex, pVibration);
-        hid::g_inputDevice != hid::EInputDevice::Mouse;
 }
 
-std::string hid::GetInputDeviceName()
+uint32_t hid::GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps)
 {
-    switch (g_inputDevice)
+    return detail::GetCapabilities(dwUserIndex, pCaps);
-    {
+}
-        case EInputDevice::Keyboard:
+
-            return "Keyboard";
+bool hid::detail::IsInputDeviceController()
-
+{
-        case EInputDevice::Mouse:
+    return hid::detail::g_inputDevice != hid::detail::EInputDevice::Keyboard &&
-            return "Mouse";
+        hid::detail::g_inputDevice != hid::detail::EInputDevice::Mouse;
-    }
-
-    switch (g_inputDeviceExplicit)
-    {
-        case EInputDeviceExplicit::Xbox360:
-            return "Xbox 360";
-
-        case EInputDeviceExplicit::XboxOne:
-            return "Xbox One";
-
-        case EInputDeviceExplicit::DualShock3:
-            return "DualShock 3";
-
-        case EInputDeviceExplicit::DualShock4:
-            return "DualShock 4";
-
-        case EInputDeviceExplicit::SwitchPro:
-            return "Nintendo Switch Pro";
-
-        case EInputDeviceExplicit::Virtual:
-            return "Virtual";
-
-        case EInputDeviceExplicit::DualSense:
-            return "DualSense";
-
-        case EInputDeviceExplicit::Luna:
-            return "Amazon Luna";
-
-        case EInputDeviceExplicit::Stadia:
-            return "Google Stadia";
-
-        case EInputDeviceExplicit::NvShield:
-            return "NVIDIA Shield";
-
-        case EInputDeviceExplicit::SwitchJCLeft:
-            return "Nintendo Switch Joy-Con (Left)";
-
-        case EInputDeviceExplicit::SwitchJCRight:
-            return "Nintendo Switch Joy-Con (Right)";
-
-        case EInputDeviceExplicit::SwitchJCPair:
-            return "Nintendo Switch Joy-Con (Pair)";
-    }
-
-    return "Unknown";
 }

UnleashedRecomp/hid/hid.h

@@ -1,47 +1,13 @@
 #pragma once
 
+union SDL_Event;
+
 namespace hid
 {
-    enum class EInputDevice
-    {
-        Keyboard,
-        Mouse,
-        Xbox,
-        PlayStation
-    };
-
-    enum class EInputDeviceExplicit
-    {
-        Unknown,
-        Xbox360,
-        XboxOne,
-        DualShock3,
-        DualShock4,
-        SwitchPro,
-        Virtual,
-        DualSense,
-        Luna,
-        Stadia,
-        NvShield,
-        SwitchJCLeft,
-        SwitchJCRight,
-        SwitchJCPair
-    };
-
-    extern EInputDevice g_inputDevice;
-    extern EInputDevice g_inputDeviceController;
-    extern EInputDeviceExplicit g_inputDeviceExplicit;
-
-    extern uint16_t g_prohibitedButtons;
-
     void Init();
+    void SetProhibitedButtons(uint16_t wButtons);
 
     uint32_t GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState);
     uint32_t SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration);
     uint32_t GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps);
-
-    void SetProhibitedButtons(uint16_t wButtons);
-    bool IsInputAllowed();
-    bool IsInputDeviceController();
-    std::string GetInputDeviceName();
 }

UnleashedRecomp/hid/hid_detail.h

@@ -0,0 +1,25 @@
+#pragma once
+
+namespace hid::detail 
+{
+    enum class EInputDevice
+    {
+        Keyboard,
+        Mouse,
+        Xbox,
+        PlayStation
+    };
+
+    extern EInputDevice g_inputDevice;
+    extern EInputDevice g_inputDeviceController;
+
+    extern uint16_t g_prohibitedButtons;
+
+    void Init();
+
+    uint32_t GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState);
+    uint32_t SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration);
+    uint32_t GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps);
+
+    bool IsInputDeviceController();
+}

UnleashedRecomp/install/installer.cpp

@@ -67,7 +67,7 @@ static std::unique_ptr<VirtualFileSystem> createFileSystemFromPath(const std::fi
     }
 }
 
-static bool copyFile(const FilePair &pair, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, const std::filesystem::path &targetDirectory, bool skipHashChecks, std::vector<uint8_t> &fileData, Journal &journal, const std::function<bool()> &progressCallback) {
+static bool copyFile(const FilePair &pair, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, const std::filesystem::path &targetDirectory, bool skipHashChecks, std::vector<uint8_t> &fileData, Journal &journal, const std::function<void()> &progressCallback) {
     const std::string filename(pair.first);
     const uint32_t hashCount = pair.second;
     if (!sourceVfs.exists(filename))
@@ -139,13 +139,7 @@ static bool copyFile(const FilePair &pair, const uint64_t *fileHashes, VirtualFi
     }
 
     journal.progressCounter += fileData.size();
-    
+    progressCallback();
-    if (!progressCallback())
-    {
-        journal.lastResult = Journal::Result::Cancelled;
-        journal.lastErrorMessage = "Installation was cancelled.";
-        return false;
-    }
 
     return true;
 }
@@ -207,17 +201,7 @@ static DLC detectDLC(const std::filesystem::path &sourcePath, VirtualFileSystem
 bool Installer::checkGameInstall(const std::filesystem::path &baseDirectory, std::filesystem::path &modulePath)
 {
     modulePath = baseDirectory / PatchedDirectory / GameExecutableFile;
-
+    return std::filesystem::exists(modulePath);
-    if (!std::filesystem::exists(modulePath))
-        return false;
-
-    if (!std::filesystem::exists(baseDirectory / UpdateDirectory / UpdateExecutablePatchFile))
-        return false;
-
-    if (!std::filesystem::exists(baseDirectory / GameDirectory / GameExecutableFile))
-        return false;
-
-    return true;
 }
 
 bool Installer::checkDLCInstall(const std::filesystem::path &baseDirectory, DLC dlc)
@@ -272,7 +256,7 @@ bool Installer::computeTotalSize(std::span<const FilePair> filePairs, const uint
     return true;
 }
 
-bool Installer::copyFiles(std::span<const FilePair> filePairs, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, const std::filesystem::path &targetDirectory, const std::string &validationFile, bool skipHashChecks, Journal &journal, const std::function<bool()> &progressCallback)
+bool Installer::copyFiles(std::span<const FilePair> filePairs, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, const std::filesystem::path &targetDirectory, const std::string &validationFile, bool skipHashChecks, Journal &journal, const std::function<void()> &progressCallback)
 {
     std::error_code ec;
     if (!std::filesystem::exists(targetDirectory) && !std::filesystem::create_directories(targetDirectory, ec))
@@ -435,7 +419,7 @@ bool Installer::parseSources(const Input &input, Journal &journal, Sources &sour
     return true;
 }
 
-bool Installer::install(const Sources &sources, const std::filesystem::path &targetDirectory, bool skipHashChecks, Journal &journal, std::chrono::seconds endWaitTime, const std::function<bool()> &progressCallback)
+bool Installer::install(const Sources &sources, const std::filesystem::path &targetDirectory, bool skipHashChecks, Journal &journal, const std::function<void()> &progressCallback)
 {
     // Install files in reverse order of importance. In case of a process crash or power outage, this will increase the likelihood of the installation
     // missing critical files required for the game to run. These files are used as the way to detect if the game is installed.
@@ -503,22 +487,7 @@ bool Installer::install(const Sources &sources, const std::filesystem::path &tar
 
     // Update the progress with the artificial amount attributed to the patching.
     journal.progressCounter += PatcherContribution;
-    
+    progressCallback();
-    for (uint32_t i = 0; i < 2; i++)
-    {
-        if (!progressCallback())
-        {
-            journal.lastResult = Journal::Result::Cancelled;
-            journal.lastErrorMessage = "Installation was cancelled.";
-            return false;
-        }
-
-        if (i == 0)
-        {
-            // Wait the specified amount of time to allow the consumer of the callbacks to animate, halt or cancel the installation for a while after it's finished.
-            std::this_thread::sleep_for(endWaitTime);
-        }
-    }
 
     return true;
 }

UnleashedRecomp/install/installer.h

@@ -22,7 +22,6 @@ struct Journal
     enum class Result
     {
         Success,
-        Cancelled,
         VirtualFileSystemFailed,
         DirectoryCreationFailed,
         FileMissing,
@@ -76,10 +75,10 @@ struct Installer
     static bool checkDLCInstall(const std::filesystem::path &baseDirectory, DLC dlc);
     static bool checkAllDLC(const std::filesystem::path &baseDirectory);
     static bool computeTotalSize(std::span<const FilePair> filePairs, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, Journal &journal, uint64_t &totalSize);
-    static bool copyFiles(std::span<const FilePair> filePairs, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, const std::filesystem::path &targetDirectory, const std::string &validationFile, bool skipHashChecks, Journal &journal, const std::function<bool()> &progressCallback);
+    static bool copyFiles(std::span<const FilePair> filePairs, const uint64_t *fileHashes, VirtualFileSystem &sourceVfs, const std::filesystem::path &targetDirectory, const std::string &validationFile, bool skipHashChecks, Journal &journal, const std::function<void()> &progressCallback);
     static bool parseContent(const std::filesystem::path &sourcePath, std::unique_ptr<VirtualFileSystem> &targetVfs, Journal &journal);
     static bool parseSources(const Input &input, Journal &journal, Sources &sources);
-    static bool install(const Sources &sources, const std::filesystem::path &targetDirectory, bool skipHashChecks, Journal &journal, std::chrono::seconds endWaitTime, const std::function<bool()> &progressCallback);
+    static bool install(const Sources &sources, const std::filesystem::path &targetDirectory, bool skipHashChecks, Journal &journal, const std::function<void()> &progressCallback);
     static void rollback(Journal &journal);
 
     // Convenience method for checking if the specified file contains the game. This should be used when the user selects the file.

UnleashedRecomp/install/update_checker.cpp

@@ -1,170 +0,0 @@
-#include "update_checker.h"
-
-#include <curl/curl.h>
-#include <nlohmann/json.hpp>
-
-#include "version.h"
-
-#ifdef WIN32
-#include <shellapi.h>
-#endif
-
-// UpdateChecker
-
-using json = nlohmann::json;
-
-static const char *CHECK_URL = "https://api.github.com/repos/hedge-dev/UnleashedRecomp/releases/latest";
-static const char *VISIT_URL = "https://github.com/hedge-dev/UnleashedRecomp/releases/latest";
-static const char *USER_AGENT = "UnleashedRecomp-Agent";
-
-static std::atomic<bool> g_updateCheckerInProgress = false;
-static std::atomic<bool> g_updateCheckerFinished = false;
-static UpdateChecker::Result g_updateCheckerResult = UpdateChecker::Result::NotStarted;
-
-size_t updateCheckerWriteCallback(void *contents, size_t size, size_t nmemb, std::string *output)
-{
-    size_t totalSize = size * nmemb;
-    output->append((char *)contents, totalSize);
-    return totalSize;
-}
-
-static bool parseVersion(const std::string &versionStr, int &major, int &minor, int &revision)
-{
-    size_t start = 0;
-    if (versionStr[0] == 'v')
-    {
-        start = 1;
-    }
-
-    size_t firstDot = versionStr.find('.', start);
-    size_t secondDot = versionStr.find('.', firstDot + 1);
-
-    if (firstDot == std::string::npos || secondDot == std::string::npos)
-    {
-        return false;
-    }
-
-    try
-    {
-        major = std::stoi(versionStr.substr(start, firstDot - start));
-        minor = std::stoi(versionStr.substr(firstDot + 1, secondDot - firstDot - 1));
-        revision = std::stoi(versionStr.substr(secondDot + 1));
-    }
-    catch (const std::exception &e)
-    {
-        fmt::println("Error while parsing version: {}.", e.what());
-        return false;
-    }
-
-    return true;
-}
-
-void updateCheckerThread()
-{
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    int major, minor, revision;
-    std::string response;
-    curl_easy_setopt(curl, CURLOPT_URL, CHECK_URL);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, updateCheckerWriteCallback);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-    curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT);
-
-    res = curl_easy_perform(curl);
-    if (res == CURLE_OK)
-    {
-        try
-        {
-            json root = json::parse(response);
-            auto tag_name_element = root.find("tag_name");
-            if (tag_name_element != root.end() && tag_name_element->is_string())
-            {
-                if (parseVersion(*tag_name_element, major, minor, revision))
-                {
-                    if ((g_versionMajor < major) || (g_versionMajor == major  && g_versionMinor < minor) || (g_versionMajor == major && g_versionMinor == minor && g_versionRevision < revision))
-                    {
-                        g_updateCheckerResult = UpdateChecker::Result::UpdateAvailable;
-                    }
-                    else
-                    {
-                        g_updateCheckerResult = UpdateChecker::Result::AlreadyUpToDate;
-                    }
-                }
-                else
-                {
-                    fmt::println("Error while parsing response: tag_name does not contain a valid version string.");
-                    g_updateCheckerResult = UpdateChecker::Result::Failed;
-                }
-            }
-            else
-            {
-                fmt::println("Error while parsing response: tag_name not found or not the right type.");
-                g_updateCheckerResult = UpdateChecker::Result::Failed;
-            }
-        }
-        catch (const json::exception &e)
-        {
-            fmt::println("Error while parsing response: {}", e.what());
-            g_updateCheckerResult = UpdateChecker::Result::Failed;
-        }
-    }
-    else
-    {
-        fmt::println("Error while performing request: {}", curl_easy_strerror(res));
-        g_updateCheckerResult = UpdateChecker::Result::Failed;
-    }
-
-    curl_easy_cleanup(curl);
-
-    g_updateCheckerFinished = true;
-    g_updateCheckerInProgress = false;
-}
-
-void UpdateChecker::initialize()
-{
-    curl_global_init(CURL_GLOBAL_DEFAULT);
-}
-
-bool UpdateChecker::start()
-{
-    if (g_updateCheckerInProgress)
-    {
-        return false;
-    }
-
-    g_updateCheckerInProgress = true;
-    g_updateCheckerFinished = false;
-    std::thread thread(&updateCheckerThread);
-    thread.detach();
-
-    return true;
-}
-
-UpdateChecker::Result UpdateChecker::check()
-{
-    if (g_updateCheckerFinished)
-    {
-        return g_updateCheckerResult;
-    }
-    else if (g_updateCheckerInProgress)
-    {
-        return UpdateChecker::Result::InProgress;
-    }
-    else
-    {
-        return UpdateChecker::Result::NotStarted;
-    }
-}
-
-void UpdateChecker::visitWebsite()
-{
-#if defined(WIN32)
-    ShellExecuteA(0, 0, VISIT_URL, 0, 0, SW_SHOW);
-#elif defined(__linux__)
-    std::string command = "xdg-open " + std::string(VISIT_URL) + " &";
-    std::system(command.c_str());
-#else
-    static_assert(false, "Visit website not implemented for this platform.");
-#endif
-}