Browse Source

Ignore mouseDelta (set to zero) after locking and unlocking cursor.

tags/v1.1.4
Andrew Belt 5 years ago
parent
commit
2bc7c82fc1
1 changed files with 11 additions and 0 deletions
  1. +11
    -0
      src/window.cpp

+ 11
- 0
src/window.cpp View File

@@ -93,6 +93,8 @@ struct Window::Internal {
int lastWindowY = 0; int lastWindowY = 0;
int lastWindowWidth = 0; int lastWindowWidth = 0;
int lastWindowHeight = 0; int lastWindowHeight = 0;

bool ignoreNextMouseDelta = false;
}; };




@@ -123,6 +125,13 @@ static void cursorPosCallback(GLFWwindow* win, double xpos, double ypos) {
math::Vec mousePos = math::Vec(xpos, ypos).div(window->pixelRatio / window->windowRatio).round(); math::Vec mousePos = math::Vec(xpos, ypos).div(window->pixelRatio / window->windowRatio).round();
math::Vec mouseDelta = mousePos.minus(window->mousePos); math::Vec mouseDelta = mousePos.minus(window->mousePos);


// Workaround for GLFW warping mouse to a different position when the cursor is locked or unlocked.
if (window->internal->ignoreNextMouseDelta) {
window->internal->ignoreNextMouseDelta = false;
mouseDelta = math::Vec();
}
DEBUG("(%f %f) (%f %f)", VEC_ARGS(mouseDelta), VEC_ARGS(mousePos));

int cursorMode = glfwGetInputMode(win, GLFW_CURSOR); int cursorMode = glfwGetInputMode(win, GLFW_CURSOR);
(void) cursorMode; (void) cursorMode;


@@ -472,12 +481,14 @@ void Window::cursorLock() {
#else #else
glfwSetInputMode(win, GLFW_CURSOR, GLFW_CURSOR_DISABLED); glfwSetInputMode(win, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
#endif #endif
internal->ignoreNextMouseDelta = true;
} }
} }


void Window::cursorUnlock() { void Window::cursorUnlock() {
if (settings::allowCursorLock) { if (settings::allowCursorLock) {
glfwSetInputMode(win, GLFW_CURSOR, GLFW_CURSOR_NORMAL); glfwSetInputMode(win, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
internal->ignoreNextMouseDelta = true;
} }
} }




Loading…
Cancel
Save