From 2ef80983d5d11aec60c4a4fbe0958a261e42fb6b Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 21 Nov 2017 19:07:43 -0800 Subject: Initial work on Nuklear-based UI --HG-- branch : nuklear_ui --- nuklear_ui/blastem_nuklear.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 nuklear_ui/blastem_nuklear.h (limited to 'nuklear_ui/blastem_nuklear.h') diff --git a/nuklear_ui/blastem_nuklear.h b/nuklear_ui/blastem_nuklear.h new file mode 100644 index 0000000..bcdeda3 --- /dev/null +++ b/nuklear_ui/blastem_nuklear.h @@ -0,0 +1,16 @@ +#ifndef BLASTEM_NUKLEAR_H_ +#define BLASTEM_NUKLEAR_H_ + +#define NK_INCLUDE_FIXED_TYPES +#define NK_INCLUDE_STANDARD_IO +#define NK_INCLUDE_STANDARD_VARARGS +#define NK_INCLUDE_DEFAULT_ALLOCATOR +#define NK_INCLUDE_VERTEX_BUFFER_OUTPUT +#define NK_INCLUDE_FONT_BAKING +#include +#include "nuklear.h" +#include "nuklear_sdl_gles2.h" + +void blastem_nuklear_init(uint8_t file_loaded); + +#endif //BLASTEM_NUKLEAR_H_ -- cgit v1.2.3 From b21ebe75d412c72441be8a63c202641cc5ff4dfa Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Wed, 22 Nov 2017 11:18:36 -0800 Subject: Pause menu now triggered on ui.exit event --HG-- branch : nuklear_ui --- nuklear_ui/blastem_nuklear.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nuklear_ui/blastem_nuklear.h') diff --git a/nuklear_ui/blastem_nuklear.h b/nuklear_ui/blastem_nuklear.h index bcdeda3..a7cf377 100644 --- a/nuklear_ui/blastem_nuklear.h +++ b/nuklear_ui/blastem_nuklear.h @@ -12,5 +12,7 @@ #include "nuklear_sdl_gles2.h" void blastem_nuklear_init(uint8_t file_loaded); +void show_pause_menu(void); +uint8_t is_nuklear_active(void); #endif //BLASTEM_NUKLEAR_H_ -- cgit v1.2.3 From f4767bb05392fa4a04d72969fa35aa91b688c8cb Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 25 Nov 2017 20:43:20 -0800 Subject: Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable --HG-- branch : nuklear_ui --- nuklear_ui/blastem_nuklear.h | 1 + 1 file changed, 1 insertion(+) (limited to 'nuklear_ui/blastem_nuklear.h') diff --git a/nuklear_ui/blastem_nuklear.h b/nuklear_ui/blastem_nuklear.h index a7cf377..df61ee7 100644 --- a/nuklear_ui/blastem_nuklear.h +++ b/nuklear_ui/blastem_nuklear.h @@ -14,5 +14,6 @@ void blastem_nuklear_init(uint8_t file_loaded); void show_pause_menu(void); uint8_t is_nuklear_active(void); +uint8_t is_nuklear_available(void); #endif //BLASTEM_NUKLEAR_H_ -- cgit v1.2.3 From 3b2e343a1088abc7fe1cf1dffcf6a20aa97b0918 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sun, 26 Nov 2017 19:22:09 -0800 Subject: Pause game execution when in the new UI pause menu --HG-- branch : nuklear_ui --- nuklear_ui/blastem_nuklear.h | 1 + 1 file changed, 1 insertion(+) (limited to 'nuklear_ui/blastem_nuklear.h') diff --git a/nuklear_ui/blastem_nuklear.h b/nuklear_ui/blastem_nuklear.h index df61ee7..be26805 100644 --- a/nuklear_ui/blastem_nuklear.h +++ b/nuklear_ui/blastem_nuklear.h @@ -15,5 +15,6 @@ void blastem_nuklear_init(uint8_t file_loaded); void show_pause_menu(void); uint8_t is_nuklear_active(void); uint8_t is_nuklear_available(void); +void ui_idle_loop(void); #endif //BLASTEM_NUKLEAR_H_ -- cgit v1.2.3 From c9b14bee9ad8354633bff888abacc600a778b54d Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Thu, 7 Dec 2017 18:57:38 -0800 Subject: Fix GL include issue for 32-bit builds --HG-- branch : nuklear_ui --- nuklear_ui/blastem_nuklear.h | 1 - 1 file changed, 1 deletion(-) (limited to 'nuklear_ui/blastem_nuklear.h') diff --git a/nuklear_ui/blastem_nuklear.h b/nuklear_ui/blastem_nuklear.h index be26805..c179b69 100644 --- a/nuklear_ui/blastem_nuklear.h +++ b/nuklear_ui/blastem_nuklear.h @@ -7,7 +7,6 @@ #define NK_INCLUDE_DEFAULT_ALLOCATOR #define NK_INCLUDE_VERTEX_BUFFER_OUTPUT #define NK_INCLUDE_FONT_BAKING -#include #include "nuklear.h" #include "nuklear_sdl_gles2.h" -- cgit v1.2.3