sdl3

.github/workflows/generate-builds.yml

@@ -32,19 +32,21 @@ jobs:
           ${{ runner.os }}-otr-build-
         path: |
           build-cmake
-          SDL2-2.30.3
+          SDL3-3.1.8
           tinyxml2-10.0.0
     - name: Install latest SDL
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "SDL2-2.30.3" ]; then
-          wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz
-          tar -xzf SDL2-2.30.3.tar.gz
+        if [ ! -d "SDL3-3.1.8" ]; then
+          wget https://www.libsdl.org/release/SDL3-3.1.8.tar.gz
+          tar -xzf SDL3-3.1.8.tar.gz
         fi
-        cd SDL2-2.30.3
-        ./configure --enable-hidapi-libusb
-        make -j 10
-        sudo make install
+        cd SDL3-3.1.8
+        mkdir -p build
+        cd build
+        cmake -S .. -B .
+        cmake --build .
+        sudo cmake --install . --prefix /usr/local 
         sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
     - name: Install latest tinyxml2
       run: |
@@ -118,7 +120,7 @@ jobs:
         name: soh.otr
     - name: Build SoH
       run: |
-        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_REMOTE_CONTROL=1
+        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_REMOTE_CONTROL=0
         cmake --build build-cmake --config Release --parallel 10
         mv soh.otr build-cmake/soh
         (cd build-cmake && cpack)
@@ -158,21 +160,23 @@ jobs:
           linux-build-${{ github.ref }}
           linux-build-
         path: |
-          SDL2-2.30.3
+          SDL3-3.1.8
           SDL2_net-2.2.0
           tinyxml2-10.0.0
           libzip-1.10.1
     - name: Install latest SDL
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        if [ ! -d "SDL2-2.30.3" ]; then
-          wget https://www.libsdl.org/release/SDL2-2.30.3.tar.gz
-          tar -xzf SDL2-2.30.3.tar.gz
+        if [ ! -d "SDL3-3.1.8" ]; then
+          wget https://www.libsdl.org/release/SDL3-3.1.8.tar.gz
+          tar -xzf SDL3-3.1.8.tar.gz
         fi
-        cd SDL2-2.30.3
-        ./configure --enable-hidapi-libusb
-        make -j 10
-        sudo make install
+        cd SDL3-3.1.8
+        mkdir -p build
+        cd build
+        cmake -S .. -B .
+        cmake --build .
+        sudo cmake --install . --prefix /usr/local 
         sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
     - name: Install latest SDL_net
       run: |
@@ -221,7 +225,7 @@ jobs:
     - name: Build SoH
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_REMOTE_CONTROL=1
+        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_REMOTE_CONTROL=0
         cmake --build build-cmake --config Release -j3
         (cd build-cmake && cpack -G External)
 
@@ -275,7 +279,7 @@ jobs:
         VCPKG_ROOT: ${{github.workspace}}/vcpkg
       run: |
         set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
-        cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DBUILD_REMOTE_CONTROL=1
+        cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DBUILD_REMOTE_CONTROL=0
         cmake --build build-windows --config Release --parallel 10
 
         mkdir soh-windows

.github/workflows/macports-deps.txt

@@ -1 +1 @@
-libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal
+SDL3-devel +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal

CMakeLists.txt

@@ -79,7 +79,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(VCPKG_TARGET_TRIPLET x64-windows-static)
 
     vcpkg_bootstrap()
-    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog)
+    vcpkg_install_packages(zlib bzip2 libzip libpng sdl3 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog)
 
     if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache")
         set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)

soh/CMakeLists.txt

@@ -303,8 +303,8 @@ endif()
 ################################################################################
 # Compile definitions
 ################################################################################
-find_package(SDL2)
-set(SDL2-INCLUDE ${SDL2_INCLUDE_DIRS})
+find_package(SDL3)
+set(SDL3-INCLUDE ${SDL3_INCLUDE_DIRS})
 
 if (BUILD_REMOTE_CONTROL)
     find_package(SDL2_net)
@@ -644,8 +644,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 			"libultraship;"
 			"ZAPDLib;"
 			"glu32;"
-			"SDL2::SDL2;"
-			"SDL2::SDL2main;"
+			"SDL3::SDL3;"
             "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net-static>"
 			"glfw;"
 			"winmm;"
@@ -658,44 +657,22 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 			"libultraship;"
 			"ZAPDLib;"
 			"glu32;"
-			"SDL2::SDL2;"
-			"SDL2::SDL2main;"
+			"SDL3::SDL3;"
 			"glfw;"
 			"winmm;"
 			"imm32;"
 			"version;"
 			"setupapi"
 		)
 	endif()
-elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
-    find_package(SDL2)
-    set(THREADS_PREFER_PTHREAD_FLAG ON)
-    find_package(Threads REQUIRED)
-    set(ADDITIONAL_LIBRARY_DEPENDENCIES
-        "libultraship;"
-        SDL2::SDL2
-        -lglad
-        Threads::Threads
-    )
-elseif(CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
-    find_package(SDL2 REQUIRED)
-    set(ADDITIONAL_LIBRARY_DEPENDENCIES
-        "libultraship;"
-        SDL2::SDL2-static
-
-        "$<$<CONFIG:Debug>:-Wl,--wrap=abort>"
-    )
-    target_include_directories(${PROJECT_NAME} PRIVATE
-        ${DEVKITPRO}/portlibs/wiiu/include/
-    )
 else()
-    find_package(SDL2)
+    find_package(SDL3)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
  	set(ADDITIONAL_LIBRARY_DEPENDENCIES
         "libultraship;"
 		"ZAPDLib;"
-		SDL2::SDL2
+		SDL3::SDL3
         "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net>"
 		${CMAKE_DL_LIBS}
 		Threads::Threads

soh/include/functions.h

@@ -61,10 +61,10 @@ u32 Locale_IsRegionNative(void);
 void _assert(const char* exp, const char* file, s32 line);
 #elif defined(__linux__)
 void __assert(const char* exp, const char* file, s32 line) __THROW;
-#elif !defined(__APPLE__) && !defined(__SWITCH__)
+#elif !defined(SDL_PLATFORM_APPLE) && !defined(__SWITCH__)
 void __assert(const char* exp, const char* file, s32 line);
 #endif
-#if defined(__APPLE__) && defined(NDEBUG)
+#if defined(SDL_PLATFORM_APPLE) && defined(NDEBUG)
 void __assert(const char* exp, const char* file, s32 line);
 #endif
 void isPrintfInit(void);

soh/soh/Enhancements/controls/SohInputEditorWindow.cpp

@@ -330,9 +330,9 @@ void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, N64Butt
                             ->GetControlDeck()
                             ->GetDeviceIndexMappingManager()
                             ->GetDeviceIndexMappingFromShipDeviceIndex(mapping->GetShipDeviceIndex());
-    auto sdlIndexMapping = std::dynamic_pointer_cast<Ship::ShipDeviceIndexToSDLDeviceIndexMapping>(indexMapping);
+    auto sdlInstanceIDMapping = std::dynamic_pointer_cast<Ship::ShipDeviceIndexToSDLInstanceIDMapping>(indexMapping);
 
-    if (sdlIndexMapping != nullptr && sdlAxisDirectionToButtonMapping != nullptr) {
+    if (sdlInstanceIDMapping != nullptr && sdlAxisDirectionToButtonMapping != nullptr) {
         ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.5f));
         auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button);
         auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered);
@@ -360,14 +360,14 @@ void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, N64Butt
             if (sdlAxisDirectionToButtonMapping->AxisIsStick()) {
                 ImGui::Text("Stick axis threshold:");
 
-                int32_t stickAxisThreshold = sdlIndexMapping->GetStickAxisThresholdPercentage();
+                int32_t stickAxisThreshold = sdlInstanceIDMapping->GetStickAxisThresholdPercentage();
                 if (stickAxisThreshold == 0) {
                     ImGui::BeginDisabled();
                 }
                 ImGui::PushButtonRepeat(true);
                 if (ImGui::Button(StringHelper::Sprintf("-##Stick Axis Threshold%s", id.c_str()).c_str())) {
-                    sdlIndexMapping->SetStickAxisThresholdPercentage(stickAxisThreshold - 1);
-                    sdlIndexMapping->SaveToConfig();
+                    sdlInstanceIDMapping->SetStickAxisThresholdPercentage(stickAxisThreshold - 1);
+                    sdlInstanceIDMapping->SaveToConfig();
                 }
                 ImGui::PopButtonRepeat();
                 if (stickAxisThreshold == 0) {
@@ -377,17 +377,17 @@ void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, N64Butt
                 ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f));
                 if (ImGui::SliderInt(StringHelper::Sprintf("##Stick Axis Threshold%s", id.c_str()).c_str(),
                                      &stickAxisThreshold, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp)) {
-                    sdlIndexMapping->SetStickAxisThresholdPercentage(stickAxisThreshold);
-                    sdlIndexMapping->SaveToConfig();
+                    sdlInstanceIDMapping->SetStickAxisThresholdPercentage(stickAxisThreshold);
+                    sdlInstanceIDMapping->SaveToConfig();
                 }
                 ImGui::SameLine(0.0f, 0.0f);
                 if (stickAxisThreshold == 100) {
                     ImGui::BeginDisabled();
                 }
                 ImGui::PushButtonRepeat(true);
                 if (ImGui::Button(StringHelper::Sprintf("+##Stick Axis Threshold%s", id.c_str()).c_str())) {
-                    sdlIndexMapping->SetStickAxisThresholdPercentage(stickAxisThreshold + 1);
-                    sdlIndexMapping->SaveToConfig();
+                    sdlInstanceIDMapping->SetStickAxisThresholdPercentage(stickAxisThreshold + 1);
+                    sdlInstanceIDMapping->SaveToConfig();
                 }
                 ImGui::PopButtonRepeat();
                 if (stickAxisThreshold == 100) {
@@ -398,14 +398,14 @@ void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, N64Butt
             if (sdlAxisDirectionToButtonMapping->AxisIsTrigger()) {
                 ImGui::Text("Trigger axis threshold:");
 
-                int32_t triggerAxisThreshold = sdlIndexMapping->GetTriggerAxisThresholdPercentage();
+                int32_t triggerAxisThreshold = sdlInstanceIDMapping->GetTriggerAxisThresholdPercentage();
                 if (triggerAxisThreshold == 0) {
                     ImGui::BeginDisabled();
                 }
                 ImGui::PushButtonRepeat(true);
                 if (ImGui::Button(StringHelper::Sprintf("-##Trigger Axis Threshold%s", id.c_str()).c_str())) {
-                    sdlIndexMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold - 1);
-                    sdlIndexMapping->SaveToConfig();
+                    sdlInstanceIDMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold - 1);
+                    sdlInstanceIDMapping->SaveToConfig();
                 }
                 ImGui::PopButtonRepeat();
                 if (triggerAxisThreshold == 0) {
@@ -415,17 +415,17 @@ void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, N64Butt
                 ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f));
                 if (ImGui::SliderInt(StringHelper::Sprintf("##Trigger Axis Threshold%s", id.c_str()).c_str(),
                                      &triggerAxisThreshold, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp)) {
-                    sdlIndexMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold);
-                    sdlIndexMapping->SaveToConfig();
+                    sdlInstanceIDMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold);
+                    sdlInstanceIDMapping->SaveToConfig();
                 }
                 ImGui::SameLine(0.0f, 0.0f);
                 if (triggerAxisThreshold == 100) {
                     ImGui::BeginDisabled();
                 }
                 ImGui::PushButtonRepeat(true);
                 if (ImGui::Button(StringHelper::Sprintf("+##Trigger Axis Threshold%s", id.c_str()).c_str())) {
-                    sdlIndexMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold + 1);
-                    sdlIndexMapping->SaveToConfig();
+                    sdlInstanceIDMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold + 1);
+                    sdlInstanceIDMapping->SaveToConfig();
                 }
                 ImGui::PopButtonRepeat();
                 if (triggerAxisThreshold == 100) {
@@ -1657,24 +1657,24 @@ void SohInputEditorWindow::DrawDeviceVisibilityButtons() {
                                         ->GetControlDeck()
                                         ->GetDeviceIndexMappingManager()
                                         ->GetAllDeviceIndexMappingsFromConfig()) {
-        auto sdlIndexMapping = std::static_pointer_cast<Ship::ShipDeviceIndexToSDLDeviceIndexMapping>(mapping);
-        if (sdlIndexMapping == nullptr) {
+        auto sdlInstanceIDMapping = std::static_pointer_cast<Ship::ShipDeviceIndexToSDLInstanceIDMapping>(mapping);
+        if (sdlInstanceIDMapping == nullptr) {
             continue;
         }
 
-        indexMappings[lusIndex] = { sdlIndexMapping->GetSDLControllerName(), -1 };
+        indexMappings[lusIndex] = { sdlInstanceIDMapping->GetSDLControllerName(), -1 };
     }
 
     for (auto [lusIndex, mapping] : Ship::Context::GetInstance()
                                         ->GetControlDeck()
                                         ->GetDeviceIndexMappingManager()
                                         ->GetAllDeviceIndexMappings()) {
-        auto sdlIndexMapping = std::static_pointer_cast<Ship::ShipDeviceIndexToSDLDeviceIndexMapping>(mapping);
-        if (sdlIndexMapping == nullptr) {
+        auto sdlInstanceIDMapping = std::static_pointer_cast<Ship::ShipDeviceIndexToSDLInstanceIDMapping>(mapping);
+        if (sdlInstanceIDMapping == nullptr) {
             continue;
         }
 
-        indexMappings[lusIndex] = { sdlIndexMapping->GetSDLControllerName(), sdlIndexMapping->GetSDLDeviceIndex() };
+        indexMappings[lusIndex] = { sdlInstanceIDMapping->GetSDLControllerName(), sdlInstanceIDMapping->GetSDLInstanceID() };
     }
 
     auto keyboardButtonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button);
@@ -2015,12 +2015,12 @@ void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) {
                                             ->GetControlDeck()
                                             ->GetDeviceIndexMappingManager()
                                             ->GetAllDeviceIndexMappings()) {
-            auto sdlIndexMapping = std::static_pointer_cast<Ship::ShipDeviceIndexToSDLDeviceIndexMapping>(mapping);
-            if (sdlIndexMapping == nullptr) {
+            auto sdlInstanceIDMapping = std::static_pointer_cast<Ship::ShipDeviceIndexToSDLInstanceIDMapping>(mapping);
+            if (sdlInstanceIDMapping == nullptr) {
                 continue;
             }
 
-            indexMappings[lusIndex] = { sdlIndexMapping->GetSDLControllerName(), sdlIndexMapping->GetSDLDeviceIndex() };
+            indexMappings[lusIndex] = { sdlInstanceIDMapping->GetSDLControllerName(), sdlInstanceIDMapping->GetSDLInstanceID() };
         }
 
         bool shouldClose = false;

soh/soh/Enhancements/randomizer/draw.cpp

@@ -20,6 +20,11 @@
 #include "soh_assets.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 
+// no idea why this suddently decided it didn't exist on windows
+#ifndef M_PI_2
+#define M_PI_2 1.57079632679489661923
+#endif
+
 extern "C" {
 extern SaveContext gSaveContext;
 }

soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp

@@ -103,7 +103,7 @@ void AdvancedResolutionSettingsWindow::DrawElement() {
     const bool disabled_everything = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled", 0);
     const bool disabled_pixelCount = !CVarGetInteger(CVAR_PREFIX_ADVANCED_RESOLUTION ".VerticalResolutionToggle", 0);
 
-#ifdef __APPLE__
+#ifdef SDL_PLATFORM_APPLE
     // Display HiDPI warning. (Remove this once we can definitively say it's fixed.)
     ImGui::TextColored(messageColor[MESSAGE_INFO],
                         ICON_FA_INFO_CIRCLE " These settings may behave incorrectly on Retina displays.");

soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h

@@ -33,7 +33,7 @@ class SpeechSynthesizer {
 
 #ifdef _WIN32
 #include "SAPISpeechSynthesizer.h"
-#elif defined(__APPLE__)
+#elif defined(SDL_PLATFORM_APPLE)
 #include "DarwinSpeechSynthesizer.h"
 #endif