YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally fixed mouse input on GLFW Platforms

Browse Source
This commit is contained in:
Dominic Masters
2021-08-31 16:27:22 -07:00
parent 46752c6d22
commit 16873a1e1b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/glfw/glwfwplatform.c
View File

@ -73,6 +73,8 @@ int32_t main() {
inputBind(input, INPUT_ACCEPT, (inputsource_t)GLFW_KEY_E); inputBind(input, INPUT_ACCEPT, (inputsource_t)GLFW_KEY_E);
inputBind(input, INPUT_ACCEPT, (inputsource_t)GLFW_KEY_ENTER); inputBind(input, INPUT_ACCEPT, (inputsource_t)GLFW_KEY_ENTER);
inputBind(input, INPUT_ACCEPT, (inputsource_t)GLFW_KEY_SPACE); inputBind(input, INPUT_ACCEPT, (inputsource_t)GLFW_KEY_SPACE);
inputBind(input, INPUT_MOUSE_X, GLFW_PLATFORM_INPUT_MOUSE_X);
inputBind(input, INPUT_MOUSE_Y, GLFW_PLATFORM_INPUT_MOUSE_Y);
// Bind the fake inputs // Bind the fake inputs
inputBind(input, INPUT_MOUSE_X, (inputsource_t)INPUT_MOUSE_X); inputBind(input, INPUT_MOUSE_X, (inputsource_t)INPUT_MOUSE_X);
@ -132,6 +134,6 @@ void glfwOnError(int error, const char* description) {
void glfwOnCursor(GLFWwindow *window, double x, double y) { void glfwOnCursor(GLFWwindow *window, double x, double y) {
input_t *input = &GAME_STATE->engine.input; input_t *input = &GAME_STATE->engine.input;
input->buffer[INPUT_MOUSE_X] = (float)x; input->buffer[GLFW_PLATFORM_INPUT_MOUSE_X] = (float)x;
input->buffer[INPUT_MOUSE_Y] = (float)y; input->buffer[GLFW_PLATFORM_INPUT_MOUSE_Y] = (float)y;
} }

3
platform/glfw/glwfwplatform.h
View File

@ -13,6 +13,9 @@
#define WINDOW_WIDTH_DEFAULT 1280 #define WINDOW_WIDTH_DEFAULT 1280
#define WINDOW_HEIGHT_DEFAULT WINDOW_WIDTH_DEFAULT/16*9 #define WINDOW_HEIGHT_DEFAULT WINDOW_WIDTH_DEFAULT/16*9
#define GLFW_PLATFORM_INPUT_MOUSE_X (inputsource_t)512
#define GLFW_PLATFORM_INPUT_MOUSE_Y (inputsource_t)513
/** The current running game state. */ /** The current running game state. */
extern game_t *GAME_STATE; extern game_t *GAME_STATE;