From b27c89902a39c7989e3e15746b28c3b2b7e43424 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Wed, 28 Oct 2020 06:03:51 +0700 Subject: [PATCH] Fix trigger method generate --- app/src/main/jni/input_bridge.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/jni/input_bridge.c b/app/src/main/jni/input_bridge.c index 08eb328ed..c70dc22b1 100644 --- a/app/src/main/jni/input_bridge.c +++ b/app/src/main/jni/input_bridge.c @@ -143,24 +143,24 @@ void addInputToQueue(struct GLFWInputEvent event) { } // TODO merge other defines to -#define ADD_TRIGGER_WWIN(NAME, VALUES) \ +#define ADD_TRIGGER(NAME, VALUES) \ void trigger##NAME(struct GLFWInputEvent event) { \ if (GLFW_invoke_##NAME) { \ - GLFW_invoke_##NAME(VALUES); \ + GLFW_invoke_##NAME VALUES; \ } \ } -ADD_TRIGGER_WWIN(Char, (event.ui1)); -ADD_TRIGGER_WWIN(CharMods, (event.ui1, event.i2)); -ADD_TRIGGER_WWIN(CursorEnter, (event.i1)); -ADD_TRIGGER_WWIN(CursorPos, ((double) event.i1, (double) event.i2)); -ADD_TRIGGER_WWIN(FramebufferSize, (event.i1, event.i2)); -ADD_TRIGGER_WWIN(Key, (event.i1, event.i2, event.i3, event.i4)); -ADD_TRIGGER_WWIN(MouseButton, (event.i1, event.i2, event.i3)); -ADD_TRIGGER_WWIN(Scroll, ((double) event.i1, (double) event.i2)); -ADD_TRIGGER_WWIN(WindowSize, (event.i1, event.i2)); +ADD_TRIGGER(Char, (showingWindow, event.ui1)); +ADD_TRIGGER(CharMods, (showingWindow, event.ui1, event.i2)); +ADD_TRIGGER(CursorEnter, (showingWindow, event.i1)); +ADD_TRIGGER(CursorPos, (showingWindow, (double) event.i1, (double) event.i2)); +ADD_TRIGGER(FramebufferSize, (showingWindow, event.i1, event.i2)); +ADD_TRIGGER(Key, (showingWindow, event.i1, event.i2, event.i3, event.i4)); +ADD_TRIGGER(MouseButton, (showingWindow, event.i1, event.i2, event.i3)); +ADD_TRIGGER(Scroll, (showingWindow, (double) event.i1, (double) event.i2)); +ADD_TRIGGER(WindowSize, (showingWindow, event.i1, event.i2)); -#undef ADD_TRIGGER_WWIN +#undef ADD_TRIGGER /* void triggerChar(struct GLFWInputEvent event) {