SDL3transition

.github/workflows/cmake_linux_gcc_64bit.yml

@@ -24,16 +24,19 @@ jobs:
     - name: Install gcc
       run: sudo apt-get update && sudo apt-get install gcc-11 g++-11
 
-    - name: Install dependencies
+    - name: Install SDL dependencies
       run: |
-        sudo apt-get install libx11-dev libxrandr-dev libudev-dev \
-        libglu1-mesa-dev freeglut3-dev mesa-common-dev libflac-dev libogg-dev \
-        libvorbis-dev libopenal-dev libxcursor-dev
+        sudo apt-get install build-essential git make \
+        pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
+        libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
+        libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
+        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev libusb-1.0-0-dev
 
     - name: actions-setup-cmake
-      uses: jwlawson/actions-setup-cmake@v2.0.2
+      uses: jwlawson/actions-setup-cmake@v2.2.0
       with:
-        cmake-version: '3.28.x'
+        cmake-version: '4.4.0'
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/build

.github/workflows/cmake_macos.yml

@@ -22,9 +22,9 @@ jobs:
       id: cpu-cores
 
     - name: actions-setup-cmake
-      uses: jwlawson/actions-setup-cmake@v2.0.2
+      uses: jwlawson/actions-setup-cmake@v2.2.0
       with:
-        cmake-version: '3.28.x'
+        cmake-version: '4.4.x'
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/build

.github/workflows/cmake_windows_mingw-w64.yml

@@ -15,7 +15,6 @@ jobs:
       matrix:
         include:
           - { sys: ucrt64, env: ucrt-x86_64 }
-          - { sys: mingw32, env: i686 }
 
     runs-on: windows-latest
     defaults:
@@ -35,11 +34,11 @@ jobs:
 
     - name: Downloading cmake
       run: |
-        curl -O "https://repo.msys2.org/mingw/${{matrix.sys}}/mingw-w64-${{matrix.env}}-cmake-4.1.1-1-any.pkg.tar.zst"
+        curl -O -f "https://repo.msys2.org/mingw/${{matrix.sys}}/mingw-w64-${{matrix.env}}-cmake-4.4.0-1-any.pkg.tar.zst"
 
     - name: Installing cmake
       run: |
-        pacman -U --noconfirm "mingw-w64-${{matrix.env}}-cmake-4.1.1-1-any.pkg.tar.zst"
+        pacman -U --noconfirm "mingw-w64-${{matrix.env}}-cmake-4.4.0-1-any.pkg.tar.zst"
 
     - name: Create Build Environment
       run: cmake -E make_directory "${{github.workspace}}\build"

.github/workflows/codeql.yml

@@ -39,16 +39,19 @@ jobs:
     - name: Install gcc
       run: sudo apt-get update && sudo apt-get install gcc-11 g++-11
 
-    - name: Install dependencies
+    - name: Install SDL dependencies
       run: |
-        sudo apt-get install libx11-dev libxrandr-dev libudev-dev \
-        libglu1-mesa-dev freeglut3-dev mesa-common-dev libflac-dev libogg-dev \
-        libvorbis-dev libopenal-dev libxcursor-dev
+        sudo apt-get install build-essential git make \
+        pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
+        libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
+        libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
+        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev libusb-1.0-0-dev
 
     - name: actions-setup-cmake
-      uses: jwlawson/actions-setup-cmake@v2.0.2
+      uses: jwlawson/actions-setup-cmake@v2.2.0
       with:
-        cmake-version: '3.28.x'
+        cmake-version: '4.4.0'
 
     - name: Handling project dependencies
       shell: bash

CMakeLists.txt

@@ -47,12 +47,6 @@ if(APPLE)
     add_compile_options(-Wno-nullability-extension)
 endif()
 
-if(NOT WIN32)
-    set(FGE_SDL_MAIN "")
-else()
-    set(FGE_SDL_MAIN "SDL2::SDL2main")
-endif()
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 #Get the GIT version target
@@ -356,7 +350,8 @@ target_sources(${FGE_LIB_NAME} PRIVATE
 
 target_sources(${FGE_LIB_NAME} PRIVATE
         sources/accessor/C_animation.cpp
-        sources/accessor/C_texture.cpp)
+        sources/accessor/C_texture.cpp
+        sources/accessor/C_audio.cpp)
 
 target_sources(${FGE_LIB_NAME} PRIVATE
         sources/C_commandHandler.cpp
@@ -447,7 +442,7 @@ if(WIN32)
 endif()
 
 target_link_libraries(${FGE_LIB_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV glslang::glslang)
-target_link_libraries(${FGE_LIB_NAME} PUBLIC SDL2::SDL2 SDL2_image::SDL2_image SDL2_mixer::SDL2_mixer)
+target_link_libraries(${FGE_LIB_NAME} PUBLIC SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer)
 target_link_libraries(${FGE_LIB_NAME} PRIVATE BZip2::bz2_static)
 target_link_libraries(${FGE_LIB_NAME} PRIVATE LZ4::lz4_static)
 target_link_libraries(${FGE_LIB_NAME} PRIVATE fmt::fmt-header-only)
@@ -457,7 +452,7 @@ target_link_libraries(${FGE_LIB_NAME} PUBLIC glm::glm-header-only volk::volk_hea
 target_link_libraries(${FGE_LIB_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 
 target_link_libraries(${FGE_SERVER_LIB_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV glslang::glslang)
-target_link_libraries(${FGE_SERVER_LIB_NAME} PUBLIC SDL2::SDL2 SDL2_image::SDL2_image)
+target_link_libraries(${FGE_SERVER_LIB_NAME} PUBLIC SDL3::SDL3 SDL3_image::SDL3_image)
 target_link_libraries(${FGE_SERVER_LIB_NAME} PRIVATE BZip2::bz2_static)
 target_link_libraries(${FGE_SERVER_LIB_NAME} PRIVATE LZ4::lz4_static)
 target_link_libraries(${FGE_SERVER_LIB_NAME} PRIVATE fmt::fmt-header-only)
@@ -547,8 +542,8 @@ function(CopyFilesToRuntimeDirectory FILE_PATHS MAIN_TARGET_NAME)
 endfunction()
 
 if (WIN32)
-    CopyTargetDllsToRuntimeDirectory("SDL2::SDL2;SDL2_image::SDL2_image;SDL2_mixer::SDL2_mixer" FgeClientExeDeps)
-    CopyTargetDllsToRuntimeDirectory("SDL2::SDL2;SDL2_image::SDL2_image" FgeServerExeDeps)
+    CopyTargetDllsToRuntimeDirectory("SDL3::SDL3;SDL3_image::SDL3_image;SDL3_mixer::SDL3_mixer" FgeClientExeDeps)
+    CopyTargetDllsToRuntimeDirectory("SDL3::SDL3;SDL3_image::SDL3_image" FgeServerExeDeps)
 endif()
 
 add_custom_target(ResourcesSymlink
@@ -562,8 +557,8 @@ add_dependencies(FgeClientExeDeps ResourcesSymlink)
 add_dependencies(FgeServerExeDeps ResourcesSymlink)
 
 #Set some helper variables for executables
-set(FGE_CLIENT_LIBS ${FGE_SDL_MAIN} SDL2::SDL2 SDL2_image::SDL2_image SDL2_mixer::SDL2_mixer ${FGE_LIB_NAME})
-set(FGE_SERVER_LIBS SDL2::SDL2 SDL2_image::SDL2_image ${FGE_SERVER_LIB_NAME})
+set(FGE_CLIENT_LIBS SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer ${FGE_LIB_NAME})
+set(FGE_SERVER_LIBS SDL3::SDL3 SDL3_image::SDL3_image ${FGE_SERVER_LIB_NAME})
 
 #Tests
 if (FGE_BUILD_TESTS)

README.md

@@ -46,14 +46,14 @@ limitations under the License.
 FastEngine must be built using a C++20 compatible compiler :
 - For GNU/Linux : GCC-11 minimum
 - For Windows : MINGW-W64, GCC-11 minimum
-- - (32bits or UCRT 64bits)
+- - UCRT 64bits
 - For MAC : AppleClang 13 minimum
 
 Unsupported compiler/tools :
 - Microsoft compiler, (it should work but is not tested on)
 
 Working/supported architecture :
-- 32bits
+- 32bits (not on windows, not tested)
 - 64bits
 - ARM
 

deps/CMakeLists.txt

@@ -114,28 +114,28 @@ AddCmakeDependency(freetype
         "-DFT_DISABLE_HARFBUZZ=ON -DFT_DISABLE_ZLIB=ON -DFT_DISABLE_PNG=ON -DFT_DISABLE_BROTLI=ON -DFT_DISABLE_BZIP2=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
         "")
 
-AddCmakeDependency(SDL2
+AddCmakeDependency(SDL3
         https://github.com/libsdl-org/SDL.git
-        release-2.32.10
+        release-3.4.12
         ON
-        "-DSDL_TEST=OFF -DSDL_STATIC_PIC=ON"
+        "-DSDL_TESTS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
         "")
 
-AddCmakeDependency(SDL2_image
+AddCmakeDependency(SDL3_image
         https://github.com/libsdl-org/SDL_image.git
-        release-2.8.8
+        release-3.4.4
         ON
-        "-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DSDL2IMAGE_AVIF=OFF -DDAV1D_ASM=OFF -DSDL2IMAGE_SAMPLES=OFF -DSDL2IMAGE_DEPS_SHARED=OFF -DSDL2IMAGE_VENDORED=ON -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}/libs/SDL2"
+        "-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DSDL3IMAGE_AVIF=OFF -DDAV1D_ASM=OFF -DSDL3IMAGE_SAMPLES=OFF -DSDL3IMAGE_DEPS_SHARED=OFF -DSDL3IMAGE_VENDORED=ON -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}/libs/SDL3"
         "")
-add_dependencies(SDL2_image SDL2)
+add_dependencies(SDL3_image SDL3)
 
-AddCmakeDependency(SDL2_mixer
+AddCmakeDependency(SDL3_mixer
         https://github.com/libsdl-org/SDL_mixer.git
-        release-2.8.1
+        release-3.2.4
         ON
-        "-DSDL2MIXER_VENDORED=ON -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}/libs/SDL2"
+        "-DSDL3MIXER_VENDORED=ON -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}/libs/SDL3"
         "")
-add_dependencies(SDL2_mixer SDL2)
+add_dependencies(SDL3_mixer SDL3)
 
 AddCmakeDependency(glm
         https://github.com/g-truc/glm.git

examples/clientServerLifeSimulator_004/client/main.cpp

@@ -30,7 +30,8 @@
 #include "FastEngine/object/C_objText.hpp"
 #include "FastEngine/object/C_objTextinputbox.hpp"
 #include "FastEngine/object/C_objWindow.hpp"
-#include "SDL.h"
+#include "SDL3/SDL.h"
+#include "SDL3/SDL_main.h"
 #include "definition.hpp"
 
 #include "C_creature.hpp"
@@ -57,7 +58,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
     Context::enumerateExtensions();
 
     SurfaceSDLWindow window(instance, FGE_WINDOWPOS_CENTERED, {LIFESIM_MAP_WIDTH, LIFESIM_MAP_HEIGHT},
-                            SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+                            SDL_WINDOW_RESIZABLE);
 
     // Check that the window was successfully created
     if (!window.isCreated())
@@ -252,7 +253,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
     {
         //Process events
         event.process();
-        if (event.isEventType(SDL_QUIT))
+        if (event.isEventType(SDL_EVENT_QUIT))
         {
             running = false;
         }

examples/clientServerLifeSimulator_004/share/C_creature.cpp

@@ -349,7 +349,7 @@ FGE_OBJ_UPDATE_BODY(Creature)
         this->_speakDelay = std::chrono::milliseconds(fge::_random.range(6000, 50000));
         this->_speakSound = "ugandan" + fge::string::ToStr(fge::_random.range(1, 2));
 
-        Mix_PlayChannel(-1, this->_speakSound.retrieve(), 0);
+        this->_speakSound.playAudio();
     }
 
     this->updateMoveable(*this, deltaTime);

examples/clientServerLifeSimulator_004/share/includes/C_creature.hpp

@@ -22,7 +22,7 @@
 #include "FastEngine/accessor/C_animation.hpp"
 #include "FastEngine/accessor/C_font.hpp"
 #ifndef FGE_DEF_SERVER
-    #include "FastEngine/accessor/C_soundBuffer.hpp"
+    #include "FastEngine/accessor/C_audio.hpp"
 #endif // FGE_DEF_SERVER
 #include "FastEngine/manager/texture_manager.hpp"
 #include "FastEngine/network/C_packet.hpp"
@@ -110,7 +110,7 @@ class Creature : public ls::CustomObject, public fge::Subscriber
 
 #ifndef FGE_DEF_SERVER
     fge::Clock _speakClock;
-    fge::SoundBuffer _speakSound;
+    fge::Audio _speakSound;
     std::chrono::milliseconds _speakDelay;
 
     fge::Animation _anim;

examples/deepText_005/main.cpp

@@ -28,7 +28,8 @@
 #include "FastEngine/object/C_objText.hpp"
 #include "FastEngine/object/C_objTextinputbox.hpp"
 #include "FastEngine/vulkan/vulkanGlobal.hpp"
-#include "SDL.h"
+#include "SDL3/SDL.h"
+#include "SDL3/SDL_main.h"
 #include <cmath>
 #include <iostream>
 
@@ -118,7 +119,7 @@ class MainScene : public fge::Scene
         {
             //Update event
             event.process();
-            if (event.isEventType(SDL_QUIT))
+            if (event.isEventType(SDL_EVENT_QUIT))
             {
                 running = false;
             }
@@ -183,7 +184,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
     auto instance = Context::init(SDL_INIT_VIDEO | SDL_INIT_EVENTS, "example 005: deepText");
     Context::enumerateExtensions();
 
-    SurfaceSDLWindow window(instance, FGE_WINDOWPOS_CENTERED, {800, 600}, SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+    SurfaceSDLWindow window(instance, FGE_WINDOWPOS_CENTERED, {800, 600}, SDL_WINDOW_RESIZABLE);
 
     // Check that the window was successfully created
     if (!window.isCreated())

examples/guiWindow_003/main.cpp

@@ -24,7 +24,8 @@
 #include "FastEngine/object/C_objSlider.hpp"
 #include "FastEngine/object/C_objTextList.hpp"
 #include "FastEngine/object/C_objWindow.hpp"
-#include "SDL.h"
+#include "SDL3/SDL.h"
+#include "SDL3/SDL_main.h"
 #include <iostream>
 
 //Create the MainScene class
@@ -43,9 +44,17 @@ class MainScene : public fge::Scene
         this->setCallbackContext({&event, &guiElementHandler});
 
         //Init texture manager
-        fge::texture::gManager.initialize();
+        if (!fge::texture::gManager.initialize())
+        {
+            std::cout << "Failed to initialize texture manager" << std::endl;
+            return;
+        }
         //Init font manager
-        fge::font::gManager.initialize();
+        if (!fge::font::gManager.initialize())
+        {
+            std::cout << "Failed to initialize font manager" << std::endl;
+            return;
+        }
 
         //Load texture
         fge::texture::gManager.loadFromFile("close", "resources/images/window/close.png");
@@ -129,7 +138,7 @@ class MainScene : public fge::Scene
 
         //Add a callback to duplicate the window
         event._onKeyDown.addLambda([&]([[maybe_unused]] fge::Event const& event, SDL_KeyboardEvent const& keyEvent) {
-            if (keyEvent.keysym.sym == SDLK_SPACE)
+            if (keyEvent.key == SDLK_SPACE)
             {
                 auto* newWindow =
                         this->duplicateObject(objWindow->_myObjectData.lock()->getSid())->getObject<fge::ObjWindow>();
@@ -163,11 +172,11 @@ class MainScene : public fge::Scene
         {
             //Update event
             event.process();
-            if (event.isEventType(SDL_QUIT))
+            if (event.isEventType(SDL_EVENT_QUIT))
             {
                 running = false;
             }
-            if (event.isEventType(SDL_WINDOWEVENT))
+            if (event.isEventType(SDL_EVENT_WINDOW_RESIZED))
             {
                 auto view = renderWindow.getView();
                 view.resizeFixCenter({event.getWindowSize().x, event.getWindowSize().y});
@@ -208,7 +217,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
     auto instance = Context::init(SDL_INIT_VIDEO | SDL_INIT_EVENTS, "example 003: guiWindow");
     Context::enumerateExtensions();
 
-    SurfaceSDLWindow window(instance, FGE_WINDOWPOS_CENTERED, {800, 600}, SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+    SurfaceSDLWindow window(instance, FGE_WINDOWPOS_CENTERED, {800, 600}, SDL_WINDOW_RESIZABLE);
 
     // Check that the window was successfully created
     if (!window.isCreated())
@@ -221,7 +230,11 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
     Context vulkanContext(window);
     vulkanContext._garbageCollector.enable(true);
 
-    fge::shader::gManager.initialize();
+    if (!fge::shader::gManager.initialize())
+    {
+        std::cout << "Could not initialize shader manager" << std::endl;
+        return 1;
+    }
     fge::shader::gManager.loadFromFile(FGE_OBJSHAPE_INSTANCES_SHADER_VERTEX,
                                        "resources/shaders/objShapeInstances_vertex.vert", Shader::Type::SHADER_VERTEX,
                                        fge::shader::ShaderInputTypes::SHADER_GLSL);