diff --git a/CMakeLists.txt b/CMakeLists.txt index 676ae2ae8..cc67c7e66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,7 @@ include_directories(${glm_SOURCE_DIR}/src) FetchContent_Declare(vkbootstrap GIT_REPOSITORY https://github.com/charles-lunarg/vk-bootstrap.git - GIT_TAG main) + GIT_TAG v1.4.339) FetchContent_MakeAvailable(vkbootstrap) include_directories(${vkbootstrap_SOURCE_DIR}/src) diff --git a/include/VESystem.h b/include/VESystem.h index 21d24a9f7..5176afd4a 100644 --- a/include/VESystem.h +++ b/include/VESystem.h @@ -125,7 +125,7 @@ namespace vve { //------------------------------------------------------------------------------------------------ /** @brief Message for mouse move events */ - struct MsgMouseMove : public MsgBase { MsgMouseMove(double dt, float x, float y); float m_x; float m_y; }; + struct MsgMouseMove : public MsgBase { MsgMouseMove(double dt, float x, float y, float xrel, float yrel); float m_x; float m_y; float m_xrel; float m_yrel; }; /** @brief Message for mouse button down events */ struct MsgMouseButtonDown : public MsgBase { MsgMouseButtonDown(double dt, int button); int m_button; }; /** @brief Message for mouse button up events */ diff --git a/src/VESystem.cpp b/src/VESystem.cpp index e8e1dda90..256f931ef 100644 --- a/src/VESystem.cpp +++ b/src/VESystem.cpp @@ -36,7 +36,7 @@ namespace vve { //------------------------------------------------------------------------ - System::MsgMouseMove:: MsgMouseMove(double dt, float x, float y): MsgBase{"SDL_MOUSE_MOVE", dt}, m_x{x}, m_y{y} {}; + System::MsgMouseMove:: MsgMouseMove(double dt, float x, float y, float xrel, float yrel): MsgBase{"SDL_MOUSE_MOVE", dt}, m_x{x}, m_y{y}, m_xrel{xrel}, m_yrel{yrel} {}; System::MsgMouseButtonDown:: MsgMouseButtonDown(double dt, int button): MsgBase{"SDL_MOUSE_BUTTON_DOWN", dt}, m_button{button} {}; System::MsgMouseButtonUp::MsgMouseButtonUp(double dt, int button): MsgBase{"SDL_MOUSE_BUTTON_UP", dt}, m_button{button} {}; System::MsgMouseButtonRepeat::MsgMouseButtonRepeat(double dt, int button): MsgBase{"SDL_MOUSE_BUTTON_REPEAT", dt}, m_button{button} {}; diff --git a/src/VEWindowSDL.cpp b/src/VEWindowSDL.cpp index b6ab1ac99..4f7b17cb0 100644 --- a/src/VEWindowSDL.cpp +++ b/src/VEWindowSDL.cpp @@ -149,7 +149,7 @@ namespace vve { wstate().m_isMinimized = false; break; case SDL_EVENT_MOUSE_MOTION: - m_engine.SendMsg( MsgMouseMove{message.GetDt(), event.motion.x, event.motion.y} ); + m_engine.SendMsg( MsgMouseMove{message.GetDt(), event.motion.x, event.motion.y, event.motion.xrel, event.motion.yrel} ); break; case SDL_EVENT_MOUSE_BUTTON_DOWN: m_engine.SendMsg( MsgMouseButtonDown{message.GetDt(), event.button.button} );