diff options
| author | Michael Pavone <pavone@retrodev.com> | 2019-05-08 23:44:40 -0700 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2019-05-08 23:44:40 -0700 |
| commit | adf1a574067b9d8debc86d4984502b018d38b123 (patch) | |
| tree | b7b24eead4cbc430b1357682a2e50b1dee917e9b /nuklear_ui | |
| parent | fb7c8ebe5b784e2bd5c8983565f4314ced2e58b7 (diff) | |
Basic UI navigation with controller
Diffstat (limited to 'nuklear_ui')
| -rw-r--r-- | nuklear_ui/blastem_nuklear.c | 2 | ||||
| -rw-r--r-- | nuklear_ui/nuklear_sdl_gles2.h | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/nuklear_ui/blastem_nuklear.c b/nuklear_ui/blastem_nuklear.c index 05ccb75..8773b90 100644 --- a/nuklear_ui/blastem_nuklear.c +++ b/nuklear_ui/blastem_nuklear.c @@ -2001,6 +2001,7 @@ void blastem_nuklear_render(void) void ui_idle_loop(void) { + render_enable_gamepad_events(1); const uint32_t MIN_UI_DELAY = 15; static uint32_t last; while (current_view != view_play) @@ -2017,6 +2018,7 @@ void ui_idle_loop(void) persist_config(config); config_dirty = 0; } + render_enable_gamepad_events(0); } static void handle_event(SDL_Event *event) { diff --git a/nuklear_ui/nuklear_sdl_gles2.h b/nuklear_ui/nuklear_sdl_gles2.h index 31a4b8b..9dd3852 100644 --- a/nuklear_ui/nuklear_sdl_gles2.h +++ b/nuklear_ui/nuklear_sdl_gles2.h @@ -414,6 +414,30 @@ nk_sdl_handle_event(SDL_Event *evt) else nk_input_key(ctx, NK_KEY_RIGHT, down); } else return 0; return 1; + } else if (evt->type == SDL_CONTROLLERBUTTONDOWN || evt->type == SDL_CONTROLLERBUTTONUP) { + int down = evt->type == SDL_CONTROLLERBUTTONDOWN; + if (evt->cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_UP) { + nk_input_key(ctx, NK_KEY_UP, down); + } else if (evt->cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN) { + nk_input_key(ctx, NK_KEY_DOWN, down); + } else if (evt->cbutton.button == SDL_CONTROLLER_BUTTON_A || evt->cbutton.button == SDL_CONTROLLER_BUTTON_START) { + nk_input_key(ctx, NK_KEY_ENTER, down); + } + } else if (evt->type == SDL_CONTROLLERAXISMOTION) { + if (evt->caxis.axis == SDL_CONTROLLER_AXIS_LEFTY || evt->caxis.axis == SDL_CONTROLLER_AXIS_RIGHTY) { + int down = abs(evt->caxis.value) > 2000; + if (evt->caxis.value >= 0) { + if (ctx->input.keyboard.keys[NK_KEY_UP].down) { + nk_input_key(ctx, NK_KEY_UP, 0); + } + nk_input_key(ctx, NK_KEY_DOWN, down); + } else { + if (ctx->input.keyboard.keys[NK_KEY_DOWN].down) { + nk_input_key(ctx, NK_KEY_DOWN, 0); + } + nk_input_key(ctx, NK_KEY_UP, down); + } + } } else if (evt->type == SDL_MOUSEBUTTONDOWN || evt->type == SDL_MOUSEBUTTONUP) { /* mouse button */ int down = evt->type == SDL_MOUSEBUTTONDOWN; |