From: Brendan Hansen Date: Wed, 9 Mar 2022 04:07:21 +0000 (-0600) Subject: added glfwGetKeyName using cptr X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=a822fa7f65c31191208ca21bec17241e681172f8;p=onyx.git added glfwGetKeyName using cptr --- diff --git a/modules/glfw3/module.onyx b/modules/glfw3/module.onyx index d425f612..0e181a17 100644 --- a/modules/glfw3/module.onyx +++ b/modules/glfw3/module.onyx @@ -1,5 +1,7 @@ package glfw3 +use package core { cptr } + // Temporary path #library "onyx_glfw3" @@ -46,7 +48,7 @@ GLFWgammaramp :: struct { glfwGetInputMode :: (window: GLFWwindow_p, mode: i32) -> i32 --- glfwSetInputMode :: (window: GLFWwindow_p, mode, value: i32) -> void --- glfwRawMouseMotionSupported :: () -> i32 --- - // glfwGetKeyName :: (key, scancode: i32) -> cstr --- + glfwGetKeyName :: (key, scancode: i32) -> cptr(u8) --- glfwGetKeyScancode :: (key: i32) -> i32 --- glfwGetKey :: (window: GLFWwindow_p, key: i32) -> i32 --- glfwGetMouseButton :: (window: GLFWwindow_p, button: i32) -> i32 --- diff --git a/modules/glfw3/onyx_glfw3.c b/modules/glfw3/onyx_glfw3.c index cf84de94..dcbfb7b9 100644 --- a/modules/glfw3/onyx_glfw3.c +++ b/modules/glfw3/onyx_glfw3.c @@ -248,7 +248,11 @@ ONYX_DEF(glfwRawMouseMotionSupported, (), (INT)) { return NULL; } -// // glfwGetKeyName :: (key, scancode: i32) -> cstr --- +ONYX_DEF(glfwGetKeyName, (INT, INT), (LONG)) { + wasm_val_init_ptr(&results->data[0], glfwGetKeyName(params->data[0].of.i32, params->data[1].of.i32)); + return NULL; +} + ONYX_DEF(glfwGetKeyScancode, (INT), (INT)) { results->data[0] = WASM_I32_VAL(params->data[0].of.i32); return NULL; @@ -528,6 +532,7 @@ ONYX_LIBRARY { ONYX_FUNC(glfwGetInputMode) ONYX_FUNC(glfwSetInputMode) ONYX_FUNC(glfwRawMouseMotionSupported) + ONYX_FUNC(glfwGetKeyName) ONYX_FUNC(glfwGetKeyScancode) ONYX_FUNC(glfwGetKey) ONYX_FUNC(glfwGetMouseButton) diff --git a/modules/glfw3/onyx_glfw3.so b/modules/glfw3/onyx_glfw3.so index 7649fd89..d73d1198 100755 Binary files a/modules/glfw3/onyx_glfw3.so and b/modules/glfw3/onyx_glfw3.so differ