start on sdl input

Author: Sulfrix

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Encore/thirdparty/sdl"]
+	path = Encore/thirdparty/sdl
+	url = https://github.com/libsdl-org/SDL

Encore/CMakeLists.txt

@@ -41,9 +41,12 @@ if (NOT json_FOUND)
     FetchContent_MakeAvailable(json)
   endif()
 endif()
+
 option(JSON_Diagnostics "" ON)
 
 option(SUPPORT_FILEFORMAT_JPG "Support loading JPG as textures" ON)
+
+add_subdirectory(thirdparty/sdl EXCLUDE_FROM_ALL)
 # Add all subdirectories of src
 
 file(GLOB_RECURSE SRC_FILES "src/*.cpp" "include/*.cpp" "include/*.c")
@@ -77,6 +80,8 @@ if(WIN32)
     find_library(BASSOPUS NAMES bassopus PATHS "lib/bass/windows/x64/")
     file(COPY "lib/bass/windows/x64/bassopus.dll" DESTINATION ${CMAKE_BINARY_DIR}/Encore)
   endif()
+  target_compile_definitions(${PROJECT_NAME} PRIVATE
+          "-DGLFW_EXPOSE_NATIVE_WIN32")
 endif()
 if(UNIX AND NOT APPLE)
   if (CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -88,6 +93,10 @@ if(UNIX AND NOT APPLE)
     file(COPY "lib/bass/linux/x86_64/libbassopus.so" DESTINATION ${CMAKE_BINARY_DIR}/Encore)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
   endif()
+  target_compile_definitions(${PROJECT_NAME} PRIVATE
+          "-DGLFW_EXPOSE_NATIVE_X11")
+  target_compile_definitions(${PROJECT_NAME} PRIVATE
+          "-DGLFW_EXPOSE_NATIVE_WAYLAND")
 endif()
 if(APPLE)
   find_library(DISCORD_GAME_SDK NAMES discord_game_sdk PATHS "lib/discord-rpc/macos")
@@ -135,5 +144,5 @@ set_property(TARGET Encore PROPERTY CXX_STANDARD 20)
 
 
 
-target_link_libraries(Encore raylib nlohmann_json::nlohmann_json ${BASS} ${BASSOPUS} ${DISCORD_GAME_SDK})
+target_link_libraries(Encore raylib nlohmann_json::nlohmann_json ${BASS} ${BASSOPUS} ${DISCORD_GAME_SDK} SDL3::SDL3)
 

Encore/src/gameplay/inputCallbacks.cpp

@@ -36,6 +36,8 @@ void keyCallback(GLFWwindow *wind, int key, int scancode, int action, int mods)
     TheMenuManager.ActiveMenu->KeyboardInputCallback(key, scancode, action, mods);
 }
 
+void
+
 void gamepadStateCallback(int joypadID, GLFWgamepadstate state) {
     //Encore::EncoreLog(
     //    LOG_DEBUG,

Encore/src/main.cpp

@@ -11,6 +11,8 @@
 
 #include <cassert>
 
+#include "SDL3/SDL.h"
+
 #include "settings/keybinds.h"
 #include "song/cacheload.h"
 #define assertm(exp, msg) assert((void(msg), exp))
@@ -253,6 +255,13 @@ int main(int argc, char *argv[]) {
     }
 
 
+    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
+    if (!SDL_Init(SDL_INIT_GAMEPAD | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_EVENTS)) {
+        SDL_Log("Unable to initialize SDL: %s", SDL_GetError());
+        return 0;
+    }
+    Encore::EncoreLog(LOG_INFO, TextFormat("SDL Initialzed: revision %s", SDL_GetRevision()));
+
     if (TheGameSettings.Framerate > 0)
         Encore::EncoreLog(
             LOG_INFO, TextFormat("Target FPS: %d", TheGameSettings.Framerate)
@@ -266,6 +275,22 @@ int main(int argc, char *argv[]) {
         glfwSwapInterval(TheGameSettings.VerticalSync ? 1 : 0);
         u.calcUnits();
 
+
+        SDL_Event event;
+        while (SDL_PollEvent(&event)) {
+            Encore::EncoreLog(LOG_INFO, TextFormat("SDL event %i", event.type));
+            switch (event.type) {
+            case SDL_EVENT_GAMEPAD_ADDED:
+                SDL_OpenGamepad(event.gdevice.which);
+                break;
+            case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
+                Encore::EncoreLog(LOG_INFO, TextFormat("SDL button press %i", event.gbutton.button));
+                break;
+            case SDL_EVENT_QUIT:
+                return 0;
+            }
+        }
+
         if (GetRenderWidth() < minWidth) {
             if (GetRenderHeight() < minHeight)
                 SetWindowSize(minWidth, minHeight);