Fix space key triggering error in Windows

xfangfang · Feb 19, 2024 · cc9bf1e · cc9bf1e
1 parent 0910a7b
commit cc9bf1e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -81,7 +81,7 @@ if (PLATFORM_DESKTOP)
             set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
             add_subdirectory(${BOREALIS_PATH}/lib/extern/SDL EXCLUDE_FROM_ALL)
         endif ()
-        list(APPEND BRLS_PLATFORM_LIBS SDL2::SDL2-static)
+        list(APPEND BRLS_PLATFORM_LIBS SDL2::SDL2-static SDL2::SDL2main)
         list(APPEND BRLS_PLATFORM_OPTION -D__SDL2__)
         list(APPEND BOREALIS_SOURCE ${BOREALIS_PATH}/lib/platforms/sdl)
         if (APPLE)

diff --git a/library/lib/platforms/glfw/glfw_input.cpp b/library/lib/platforms/glfw/glfw_input.cpp
@@ -263,9 +263,9 @@ void GLFWInputManager::updateUnifiedControllerState(ControllerState* state)
 
     state->buttons[BUTTON_X] |= (glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS);
 
-    state->buttons[BUTTON_BACKSPACE] |= glfwGetKey(this->window, GLFW_KEY_BACKSPACE);
-    state->buttons[BUTTON_SPACE] |= glfwGetKey(this->window, GLFW_KEY_SPACE);
-    state->buttons[BUTTON_F] |= glfwGetKey(this->window, GLFW_KEY_F);
+    state->buttons[BUTTON_BACKSPACE] = glfwGetKey(this->window, GLFW_KEY_BACKSPACE);
+    state->buttons[BUTTON_SPACE] = glfwGetKey(this->window, GLFW_KEY_SPACE);
+    state->buttons[BUTTON_F] = glfwGetKey(this->window, GLFW_KEY_F);
 
     state->buttons[BUTTON_NAV_UP] |= state->buttons[BUTTON_UP];
     state->buttons[BUTTON_NAV_RIGHT] |= state->buttons[BUTTON_RIGHT];

diff --git a/library/lib/platforms/sdl/sdl_input.cpp b/library/lib/platforms/sdl/sdl_input.cpp
@@ -256,9 +256,9 @@ void SDLInputManager::updateUnifiedControllerState(ControllerState* state)
     state->buttons[BUTTON_B] |= getKeyboardKeys(SDL_SCANCODE_AC_BACK);
 
     // pc shortcuts
-    state->buttons[BUTTON_SPACE] |= getKeyboardKeys(SDL_SCANCODE_SPACE);
-    state->buttons[BUTTON_BACKSPACE] |= getKeyboardKeys(SDL_SCANCODE_BACKSPACE);
-    state->buttons[BUTTON_F] |= getKeyboardKeys(SDL_SCANCODE_F);
+    state->buttons[BUTTON_SPACE] = getKeyboardKeys(SDL_SCANCODE_SPACE);
+    state->buttons[BUTTON_BACKSPACE] = getKeyboardKeys(SDL_SCANCODE_BACKSPACE);
+    state->buttons[BUTTON_F] = getKeyboardKeys(SDL_SCANCODE_F);
 
     state->buttons[BUTTON_NAV_UP] |= state->buttons[BUTTON_UP];
     state->buttons[BUTTON_NAV_RIGHT] |= state->buttons[BUTTON_RIGHT];