Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-16 12:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

move rumble controls to device window; add labels

Browse Source
This commit is contained in:
Nikita 2020-04-18 21:43:50 -04:00
parent 1da1879025
commit 96d7b9acf4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/joysticks.c
View File

@ -238,11 +238,6 @@ int main(void)
{ {
if (nk_button_label(nk, joystick_label(joysticks[i]))) if (nk_button_label(nk, joystick_label(joysticks[i])))
nk_window_set_focus(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 else
@ -335,6 +330,16 @@ int main(void)
nk_layout_row_dynamic(nk, 30, 8); nk_layout_row_dynamic(nk, 30, 8);
hat_widget(nk, hat); 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 else
nk_label(nk, "Joystick has no gamepad mapping", NK_TEXT_LEFT); nk_label(nk, "Joystick has no gamepad mapping", NK_TEXT_LEFT);