derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete input refactor

Browse Source
This commit is contained in:
4VRDriver
2020-09-10 20:59:39 +02:00
parent 146392ae22
commit 04e55ad2ba
6 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/EventHandler.cpp
View File

@@ -3,9 +3,11 @@
#include <iostream>
bool EventHandler::cameraActionRegister[CAMERA_ACTION_NUM_ITEMS] = {0};
double EventHandler::cameraMouseActionRegister[CAMERA_MOUSE_ACTION_NUM_ITEMS] = {0.0, 0.0};
bool EventHandler::windowActionRegister[WINDOW_ACTION_NUM_ITEMS] = {0};
bool EventHandler::firstMouseInput = 1;
float EventHandler::mouseSensitivity = 0.08f;
EventHandler::EventHandler(GLFWwindow *window)
@@ -14,42 +16,26 @@ EventHandler::EventHandler(GLFWwindow *window)
glfwSetKeyCallback(window, key_callback);
// Currently disabled because callbacks are shitty
//glfwSetCursorPosCallback(window, mouse_callback);
glfwSetCursorPosCallback(window, mouse_callback);
}
void EventHandler::handleEvents() {
for(int i = 0; i < CAMERA_MOUSE_ACTION_NUM_ITEMS; i++)
cameraMouseActionRegister[i] = 0.0;
glfwPollEvents();
for(int i=0; i<CAMERA_ACTION_NUM_ITEMS; i++) {
cameraActionRegister[i] = 0;
}
updateMouseDelta();
if(glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS)
glfwSetWindowShouldClose(window, true);
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS)
cameraActionRegister[cameraForward] = 1;
if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS)
cameraActionRegister[cameraBackward] = 1;
if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS)
cameraActionRegister[cameraUp] = 1;
if (glfwGetKey(window, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS)
cameraActionRegister[cameraDown] = 1;
if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS)
cameraActionRegister[cameraLeft] = 1;
if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS)
cameraActionRegister[cameraRight] = 1;
}
void EventHandler::key_callback(GLFWwindow *window, int key, int scancode, int action, int mods) {
// Silence warnings of unused variables.
(void)window; (void)scancode; (void)mods; (void)key; (void)action;
if(key==GLFW_KEY_ESCAPE && action == GLFW_PRESS)
glfwSetWindowShouldClose(window, true);
if(key==GLFW_KEY_O && action == GLFW_PRESS)
windowActionRegister[wireFrameToggle] = 1;
if(key==GLFW_KEY_LEFT_CONTROL && action == GLFW_PRESS) {
@@ -57,16 +43,48 @@ void EventHandler::key_callback(GLFWwindow *window, int key, int scancode, int a
firstMouseInput = 1;
}
// Movement press
if(key==GLFW_KEY_W && action == GLFW_PRESS)
cameraActionRegister[cameraForward] = 1;
if(key==GLFW_KEY_S && action == GLFW_PRESS)
cameraActionRegister[cameraBackward] = 1;
if(key==GLFW_KEY_SPACE && action == GLFW_PRESS)
cameraActionRegister[cameraUp] = 1;
if(key==GLFW_KEY_LEFT_SHIFT && action == GLFW_PRESS)
cameraActionRegister[cameraDown] = 1;
if(key==GLFW_KEY_A && action == GLFW_PRESS)
cameraActionRegister[cameraLeft] = 1;
if(key==GLFW_KEY_D && action == GLFW_PRESS)
cameraActionRegister[cameraRight] = 1;
// Movement release
if(key==GLFW_KEY_W && action == GLFW_RELEASE)
cameraActionRegister[cameraForward] = 0;
if(key==GLFW_KEY_S && action == GLFW_RELEASE)
cameraActionRegister[cameraBackward] = 0;
if(key==GLFW_KEY_SPACE && action == GLFW_RELEASE)
cameraActionRegister[cameraUp] = 0;
if(key==GLFW_KEY_LEFT_SHIFT && action == GLFW_RELEASE)
cameraActionRegister[cameraDown] = 0;
if(key==GLFW_KEY_A && action == GLFW_RELEASE)
cameraActionRegister[cameraLeft] = 0;
if(key==GLFW_KEY_D && action == GLFW_RELEASE)
cameraActionRegister[cameraRight] = 0;
}
void EventHandler::updateMouseDelta() {
double xPos, yPos;
glfwGetCursorPos(window, &xPos, &yPos);
void EventHandler::mouse_callback(GLFWwindow* window, double xpos, double ypos) {
deltaCursorPosX = xPos - lastCursorPosX;
deltaCursorPosY = -(yPos - lastCursorPosY);
lastCursorPosX = xPos;
lastCursorPosY = yPos;
(void)window;
static double lastCursorPosX = 0.0;
static double lastCursorPosY = 0.0;
double deltaCursorPosX = xpos - lastCursorPosX;
double deltaCursorPosY = -(ypos - lastCursorPosY);
lastCursorPosX = xpos;
lastCursorPosY = ypos;
// Check if this is the first VALID mouse event after window being resized
if(firstMouseInput && !(deltaCursorPosX == 0 && deltaCursorPosY == 0)) {
@@ -77,4 +95,8 @@ void EventHandler::updateMouseDelta() {
deltaCursorPosX *= mouseSensitivity;
deltaCursorPosY *= mouseSensitivity;
cameraMouseActionRegister[cameraMouseDeltaX] = deltaCursorPosX;
cameraMouseActionRegister[cameraMouseDeltaY] = deltaCursorPosY;
}