Merge f590788379 into 3c1badf183

CMakeLists.txt

@@ -23,10 +23,6 @@ if (APPLE)
     enable_language(OBJC OBJCXX)
 endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
-endif()
-
 if (CMAKE_OSX_ARCHITECTURES)
     set(UNLEASHED_RECOMP_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
 elseif(CMAKE_SYSTEM_PROCESSOR)

UnleashedRecomp/CMakeLists.txt

@@ -352,23 +352,13 @@ if (UNLEASHED_RECOMP_FLATPAK)
     )
 endif()
 
-if (UNLEASHED_RECOMP_D3D12)
-    find_package(directx-headers CONFIG REQUIRED)
-    find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(UnleashedRecomp PRIVATE 
-        UNLEASHED_RECOMP_D3D12
-        D3D12MA_USING_DIRECTX_HEADERS
-        D3D12MA_OPTIONS16_SUPPORTED
-    )
-endif()
-
-if (SDL_VULKAN_ENABLED)
-    target_compile_definitions(UnleashedRecomp PRIVATE SDL_VULKAN_ENABLED)
-endif()
-
 find_package(CURL REQUIRED)
 
 if (UNLEASHED_RECOMP_D3D12)
+    find_package(directx-headers CONFIG REQUIRED)
+    find_package(directx12-agility CONFIG REQUIRED)
+    target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_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> $<TARGET_FILE_DIR:UnleashedRecomp>/D3D12
@@ -379,9 +369,6 @@ if (UNLEASHED_RECOMP_D3D12)
     )
 
     target_link_libraries(UnleashedRecomp PRIVATE
-        Microsoft::DirectX-Headers 
-        Microsoft::DirectX-Guids 
-        Microsoft::DirectX12-Agility
         Microsoft::DirectXShaderCompiler
         Microsoft::DXIL
         dxgi
@@ -395,7 +382,7 @@ if (WIN32)
         ntdll
         Shcore
         Synchronization
-        winmm
+        winmm
         windowsapp
     )
 endif()

UnleashedRecomp/gpu/video.cpp

@@ -3052,6 +3052,24 @@ void Video::ComputeViewportDimensions()
 
         break;
     }
+    
+    case EAspectRatio::Custom:
+    {
+        float customAspectRatio = Config::CustomAspectRatio;
+
+        if (aspectRatio > customAspectRatio)
+        {
+            s_viewportWidth = height * customAspectRatio;
+            s_viewportHeight = height;
+        }
+        else
+        {
+            s_viewportWidth = width;
+            s_viewportHeight = width * (1. / customAspectRatio);
+        }
+
+        break;
+    }
 
     default:
         s_viewportWidth = width;

UnleashedRecomp/locale/config_locale.cpp

@@ -546,7 +546,8 @@ CONFIG_DEFINE_ENUM_LOCALE(EAspectRatio)
             { EAspectRatio::Auto, { "AUTO", "Auto: the aspect ratio will dynamically adjust to the window size." } },
             { EAspectRatio::Wide, { "16:9", "16:9: locks the game to a widescreen aspect ratio." } },
             { EAspectRatio::Narrow, { "4:3", "4:3: locks the game to a narrow aspect ratio." } },
-            { EAspectRatio::OriginalNarrow, { "ORIGINAL 4:3", "Original 4:3: locks the game to a narrow aspect ratio and retains parity with the game's original implementation." } }
+            { EAspectRatio::OriginalNarrow, { "ORIGINAL 4:3", "Original 4:3: locks the game to a narrow aspect ratio and retains parity with the game's original implementation." } },
+            { EAspectRatio::Custom, { "Custom", "Custom:\nThe aspect ratio is set by using the CustomAspectRatio value in the config.toml file." } }
         }
     },
     {
@@ -564,7 +565,8 @@ CONFIG_DEFINE_ENUM_LOCALE(EAspectRatio)
             { EAspectRatio::Auto, { "AUTO", "Auto: Das Seitenverhältnis passt sich automatisch der Fenstergröße an." } },
             { EAspectRatio::Wide, { "16:9", "16:9: Stellt das Spiel in einem Breitbildschirm-Format dar." } },
             { EAspectRatio::Narrow, { "4:3", "4:3: Stellt das Spiel in einem Mittel-Format dar." } },
-            { EAspectRatio::OriginalNarrow, { "ORIGINAL 4:3", "Original 4:3: Stellt das Spiel in einem Mittel-Format dar, was der ursprünglichen Implementation originalgetreut bleibt." } }
+            { EAspectRatio::OriginalNarrow, { "ORIGINAL 4:3", "Original 4:3: Stellt das Spiel in einem Mittel-Format dar, was der ursprünglichen Implementation originalgetreut bleibt." } },
+            { EAspectRatio::Custom, { "Benutzerdefiniert", "Benutzerdefiniert:\nDas Seitenverhältnis entspricht dem Wert CustomAspectRatio in der Datei config.toml." } }
         }
     },
     {

UnleashedRecomp/user/config.cpp

@@ -322,6 +322,7 @@ CONFIG_DEFINE_ENUM_TEMPLATE(EAspectRatio)
     { "16:9", EAspectRatio::Wide },
     { "4:3",  EAspectRatio::Narrow },
     { "Original 4:3",  EAspectRatio::OriginalNarrow },
+    { "Custom",  EAspectRatio::Custom },
 };
 
 CONFIG_DEFINE_ENUM_TEMPLATE(ETripleBuffering)

UnleashedRecomp/user/config.h

@@ -85,7 +85,8 @@ enum class EAspectRatio : uint32_t
     Auto,
     Wide,
     Narrow,
-    OriginalNarrow
+    OriginalNarrow,
+    Custom
 };
 
 enum class ETripleBuffering : uint32_t

UnleashedRecomp/user/config_def.h

@@ -56,6 +56,7 @@ CONFIG_DEFINE("Video", int32_t, WindowHeight, 720);
 CONFIG_DEFINE_ENUM("Video", EWindowState, WindowState, EWindowState::Normal);
 CONFIG_DEFINE_LOCALISED("Video", int32_t, Monitor, 0);
 CONFIG_DEFINE_ENUM_LOCALISED("Video", EAspectRatio, AspectRatio, EAspectRatio::Auto);
+CONFIG_DEFINE("Video", float, CustomAspectRatio, (16.0f / 9.0f));
 CONFIG_DEFINE_LOCALISED("Video", float, ResolutionScale, 1.0f);
 CONFIG_DEFINE_LOCALISED("Video", bool, Fullscreen, true);
 CONFIG_DEFINE_LOCALISED("Video", bool, VSync, true);

thirdparty/CMakeLists.txt

@@ -15,6 +15,14 @@ set(SDL2MIXER_OPUS OFF)
 set(SDL2MIXER_VORBIS "VORBISFILE")
 set(SDL2MIXER_WAVPACK OFF)
 
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
+endif()
+
+if (WIN32)
+    set(D3D12_AGILITY_SDK_ENABLED ON CACHE BOOL "")
+endif()
+
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/o1heap")

thirdparty/plume

@@ -1 +1 @@
-Subproject commit fffeb35f836d8c945697ec82b735e77db401e2de
+Subproject commit 11926860e878e68626ea99ec88562ce2b8badc4f