comparison nuklear_ui/blastem_nuklear.c @ 1840:3d0b20e9a187

Merge
author Michael Pavone <pavone@retrodev.com>
date Thu, 18 Apr 2019 19:48:04 -0700
parents 478ab1f4ff94
children 5d10b8494b02
comparison
equal deleted inserted replaced
1838:0c1491818f4b 1840:3d0b20e9a187
3 #define NK_RAWFB_IMPLEMENTATION 3 #define NK_RAWFB_IMPLEMENTATION
4 #define RAWFB_RGBX_8888 4 #define RAWFB_RGBX_8888
5 5
6 #include <stdlib.h> 6 #include <stdlib.h>
7 #include <limits.h> 7 #include <limits.h>
8 #include <math.h>
8 #include "blastem_nuklear.h" 9 #include "blastem_nuklear.h"
9 #include "nuklear_rawfb.h" 10 #include "nuklear_rawfb.h"
10 #include "font.h" 11 #include "font.h"
11 #include "../render.h" 12 #include "../render.h"
12 #include "../render_sdl.h" 13 #include "../render_sdl.h"
2056 } 2057 }
2057 2058
2058 static void context_created(void) 2059 static void context_created(void)
2059 { 2060 {
2060 context = nk_sdl_init(render_get_window()); 2061 context = nk_sdl_init(render_get_window());
2062 nk_sdl_device_create();
2061 style_init(); 2063 style_init();
2062 texture_init(); 2064 texture_init();
2063 } 2065 }
2064 2066
2065 void show_pause_menu(void) 2067 void show_pause_menu(void)