benkyd/inferno-hart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops

Browse Source
This commit is contained in:
Ben Kyd
2023-04-24 11:09:19 +01:00
parent d166d6c4a3
commit 2ed5212b35
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/inferno.cpp
View File

@@ -80,15 +80,15 @@ void inferno_move_input(InfernoApp *app)
// pan only get on hold // pan only get on hold
static glm::dvec2 lastMousePos; static glm::dvec2 lastMousePos;
static int firstClick = 0; static int firstClick = 0;
if (glfwGetMouseButton(app->Win->getGLFWWindow(), GLFW_MOUSE_BUTTON_1) == GLFW_PRESS) if (glfwGetMouseButton(graphics::window_get_glfw_window(), GLFW_MOUSE_BUTTON_1) == GLFW_PRESS)
{ {
firstClick++; firstClick++;
if (firstClick == 1) if (firstClick == 1)
{ {
glfwGetCursorPos(app->Win->getGLFWWindow(), &lastMousePos.x, &lastMousePos.y); glfwGetCursorPos(graphics::window_get_glfw_window(), &lastMousePos.x, &lastMousePos.y);
} }
glm::dvec2 tempMousePos = { 0.0f, 0.0f }; glm::dvec2 tempMousePos = { 0.0f, 0.0f };
glfwGetCursorPos(app->Win->getGLFWWindow(), &tempMousePos.x, &tempMousePos.y); glfwGetCursorPos(graphics::window_get_glfw_window(), &tempMousePos.x, &tempMousePos.y);
app->Input->MouseDelta = lastMousePos - tempMousePos; app->Input->MouseDelta = lastMousePos - tempMousePos;
lastMousePos = tempMousePos; lastMousePos = tempMousePos;
} else } else
@@ -99,17 +99,17 @@ void inferno_move_input(InfernoApp *app)
} }
app->Input->MovementDelta = 0b00000000; app->Input->MovementDelta = 0b00000000;
if (glfwGetKey(app->Win->getGLFWWindow(), GLFW_KEY_W) == GLFW_PRESS) if (glfwGetKey(graphics::window_get_glfw_window(), GLFW_KEY_W) == GLFW_PRESS)
app->Input->MovementDelta |= 0b10000000; app->Input->MovementDelta |= 0b10000000;
if (glfwGetKey(app->Win->getGLFWWindow(), GLFW_KEY_A) == GLFW_PRESS) if (glfwGetKey(graphics::window_get_glfw_window(), GLFW_KEY_A) == GLFW_PRESS)
app->Input->MovementDelta |= 0b01000000; app->Input->MovementDelta |= 0b01000000;
if (glfwGetKey(app->Win->getGLFWWindow(), GLFW_KEY_S) == GLFW_PRESS) if (glfwGetKey(graphics::window_get_glfw_window(), GLFW_KEY_S) == GLFW_PRESS)
app->Input->MovementDelta |= 0b00100000; app->Input->MovementDelta |= 0b00100000;
if (glfwGetKey(app->Win->getGLFWWindow(), GLFW_KEY_D) == GLFW_PRESS) if (glfwGetKey(graphics::window_get_glfw_window(), GLFW_KEY_D) == GLFW_PRESS)
app->Input->MovementDelta |= 0b00010000; app->Input->MovementDelta |= 0b00010000;
if (glfwGetKey(app->Win->getGLFWWindow(), GLFW_KEY_SPACE) == GLFW_PRESS) if (glfwGetKey(graphics::window_get_glfw_window(), GLFW_KEY_SPACE) == GLFW_PRESS)
app->Input->MovementDelta |= 0b00001000; app->Input->MovementDelta |= 0b00001000;
if (glfwGetKey(app->Win->getGLFWWindow(), GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS) if (glfwGetKey(graphics::window_get_glfw_window(), GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS)
app->Input->MovementDelta |= 0b00000100; app->Input->MovementDelta |= 0b00000100;
} }