From 96d7b9acf4f4d718d31026e9162075df6052dc72 Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 18 Apr 2020 21:43:50 -0400 Subject: [PATCH] move rumble controls to device window; add labels --- tests/joysticks.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/joysticks.c b/tests/joysticks.c index 038c9a13..4c2fd28f 100644 --- a/tests/joysticks.c +++ b/tests/joysticks.c @@ -238,11 +238,6 @@ int main(void) { if (nk_button_label(nk, joystick_label(joysticks[i]))) nk_window_set_focus(nk, joystick_label(joysticks[i])); - - slowRumble[i] = nk_slide_float(nk, 0.0f, slowRumble[i], 1.0f, 0.05f); - fastRumble[i] = nk_slide_float(nk, 0.0f, fastRumble[i], 1.0f, 0.05f); - - glfwSetJoystickRumble(joysticks[i], slowRumble[i], fastRumble[i]); } } else @@ -335,6 +330,16 @@ int main(void) nk_layout_row_dynamic(nk, 30, 8); hat_widget(nk, hat); + + nk_layout_row_dynamic(nk, 30, 2); + nk_label(nk, "Slow rumble motor intensity", NK_TEXT_LEFT); + nk_label(nk, "Fast rumble motor intensity", NK_TEXT_LEFT); + + nk_layout_row_dynamic(nk, 30, 2); + slowRumble[i] = nk_slide_float(nk, 0.0f, slowRumble[i], 1.0f, 0.05f); + fastRumble[i] = nk_slide_float(nk, 0.0f, fastRumble[i], 1.0f, 0.05f); + + glfwSetJoystickRumble(joysticks[i], slowRumble[i], fastRumble[i]); } else nk_label(nk, "Joystick has no gamepad mapping", NK_TEXT_LEFT);