TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused defines and parameters

Browse Source
This commit is contained in:
vurtun 2017-03-15 18:19:21 +01:00
parent 99ea7c4b53
commit e77b723d98
6 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/glfw_opengl2/main.c
View File

@ -27,9 +27,6 @@
#define WINDOW_WIDTH 1200 #define WINDOW_WIDTH 1200
#define WINDOW_HEIGHT 800 #define WINDOW_HEIGHT 800
#define MAX_VERTEX_BUFFER 512 * 1024
#define MAX_ELEMENT_BUFFER 128 * 1024
#define UNUSED(a) (void)a #define UNUSED(a) (void)a
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) < (b) ? (b) : (a)) #define MAX(a,b) ((a) < (b) ? (b) : (a))
@ -155,7 +152,7 @@ int main(void)
* with blending, scissor, face culling and depth test and defaults everything * with blending, scissor, face culling and depth test and defaults everything
* back into a default state. Make sure to either save and restore or * back into a default state. Make sure to either save and restore or
* reset your own state after drawing rendering the UI. */ * reset your own state after drawing rendering the UI. */
nk_glfw3_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER); nk_glfw3_render(NK_ANTI_ALIASING_ON);
glfwSwapBuffers(win);} glfwSwapBuffers(win);}
} }
nk_glfw3_shutdown(); nk_glfw3_shutdown();

6
demo/glfw_opengl2/nuklear_glfw_gl2.h
View File

@ -1,7 +1,7 @@
/* /*
* Nuklear - v1.32.0 - public domain * Nuklear - v1.32.0 - public domain
* no warrenty implied; use at your own risk. * no warrenty implied; use at your own risk.
* authored from 2015-2016 by Micha Mettke * authored from 2015-2017 by Micha Mettke
*/ */
/* /*
* ============================================================== * ==============================================================
@ -24,7 +24,7 @@ NK_API void nk_glfw3_font_stash_begin(struct nk_font_atlas **atl
NK_API void nk_glfw3_font_stash_end(void); NK_API void nk_glfw3_font_stash_end(void);
NK_API void nk_glfw3_new_frame(void); NK_API void nk_glfw3_new_frame(void);
NK_API void nk_glfw3_render(enum nk_anti_aliasing , int max_vertex_buffer, int max_element_buffer); NK_API void nk_glfw3_render(enum nk_anti_aliasing);
NK_API void nk_glfw3_shutdown(void); NK_API void nk_glfw3_shutdown(void);
NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint); NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint);
@ -83,7 +83,7 @@ nk_glfw3_device_upload_atlas(const void *image, int width, int height)
} }
NK_API void NK_API void
nk_glfw3_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) nk_glfw3_render(enum nk_anti_aliasing AA)
{ {
/* setup global state */ /* setup global state */
struct nk_glfw_device *dev = &glfw.ogl; struct nk_glfw_device *dev = &glfw.ogl;

5
demo/sdl_opengl2/main.c
View File

@ -28,9 +28,6 @@
#define WINDOW_WIDTH 1200 #define WINDOW_WIDTH 1200
#define WINDOW_HEIGHT 800 #define WINDOW_HEIGHT 800
#define MAX_VERTEX_MEMORY 512 * 1024
#define MAX_ELEMENT_MEMORY 128 * 1024
#define UNUSED(a) (void)a #define UNUSED(a) (void)a
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) < (b) ? (b) : (a)) #define MAX(a,b) ((a) < (b) ? (b) : (a))
@ -167,7 +164,7 @@ main(int argc, char* argv[])
* defaults everything back into a default state. * defaults everything back into a default state.
* Make sure to either a.) save and restore or b.) reset your own state after * Make sure to either a.) save and restore or b.) reset your own state after
* rendering the UI. */ * rendering the UI. */
nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY); nk_sdl_render(NK_ANTI_ALIASING_ON);
SDL_GL_SwapWindow(win);} SDL_GL_SwapWindow(win);}
} }

6
demo/sdl_opengl2/nuklear_sdl_gl2.h
View File

@ -1,7 +1,7 @@
/* /*
* Nuklear - 1.32.0 - public domain * Nuklear - 1.32.0 - public domain
* no warrenty implied; use at your own risk. * no warrenty implied; use at your own risk.
* authored from 2015-2016 by Micha Mettke * authored from 2015-2017 by Micha Mettke
*/ */
/* /*
* ============================================================== * ==============================================================
@ -18,7 +18,7 @@ NK_API struct nk_context* nk_sdl_init(SDL_Window *win);
NK_API void nk_sdl_font_stash_begin(struct nk_font_atlas **atlas); NK_API void nk_sdl_font_stash_begin(struct nk_font_atlas **atlas);
NK_API void nk_sdl_font_stash_end(void); NK_API void nk_sdl_font_stash_end(void);
NK_API int nk_sdl_handle_event(SDL_Event *evt); NK_API int nk_sdl_handle_event(SDL_Event *evt);
NK_API void nk_sdl_render(enum nk_anti_aliasing , int max_vertex_buffer, int max_element_buffer); NK_API void nk_sdl_render(enum nk_anti_aliasing);
NK_API void nk_sdl_shutdown(void); NK_API void nk_sdl_shutdown(void);
#endif #endif
@ -63,7 +63,7 @@ nk_sdl_device_upload_atlas(const void *image, int width, int height)
} }
NK_API void NK_API void
nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) nk_sdl_render(enum nk_anti_aliasing AA)
{ {
/* setup global state */ /* setup global state */
struct nk_sdl_device *dev = &sdl.ogl; struct nk_sdl_device *dev = &sdl.ogl;

5
demo/sfml_opengl2/main.cpp
View File

@ -28,9 +28,6 @@
#define WINDOW_WIDTH 1200 #define WINDOW_WIDTH 1200
#define WINDOW_HEIGHT 800 #define WINDOW_HEIGHT 800
#define MAX_VERTEX_BUFFER 512 * 1024
#define MAX_ELEMENT_BUFFER 128 * 1024
#define UNUSED(a) (void)a #define UNUSED(a) (void)a
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) < (b) ? (b) : (a)) #define MAX(a,b) ((a) < (b) ? (b) : (a))
@ -153,7 +150,7 @@ int main(void)
* with blending, scissor, face culling and depth test and defaults everything * with blending, scissor, face culling and depth test and defaults everything
* back into a default state. Make sure to either save and restore or * back into a default state. Make sure to either save and restore or
* reset your own state after drawing rendering the UI. */ * reset your own state after drawing rendering the UI. */
nk_sfml_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER); nk_sfml_render(NK_ANTI_ALIASING_ON);
win.display(); win.display();
} }
nk_sfml_shutdown(); nk_sfml_shutdown();

4
demo/sfml_opengl2/nuklear_sfml_gl2.h
View File

@ -19,7 +19,7 @@ NK_API struct nk_context* nk_sfml_init(sf::Window* window);
NK_API void nk_sfml_font_stash_begin(struct nk_font_atlas** atlas); NK_API void nk_sfml_font_stash_begin(struct nk_font_atlas** atlas);
NK_API void nk_sfml_font_stash_end(void); NK_API void nk_sfml_font_stash_end(void);
NK_API int nk_sfml_handle_event(sf::Event* event); NK_API int nk_sfml_handle_event(sf::Event* event);
NK_API void nk_sfml_render(enum nk_anti_aliasing, int max_vertex_buffer, int max_element_buffer); NK_API void nk_sfml_render(enum nk_anti_aliasing);
NK_API void nk_sfml_shutdown(void); NK_API void nk_sfml_shutdown(void);
#endif #endif
@ -64,7 +64,7 @@ nk_sfml_device_upload_atlas(const void* image, int width, int height)
} }
NK_API void NK_API void
nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) nk_sfml_render(enum nk_anti_aliasing AA)
{ {
/* setup global state */ /* setup global state */
struct nk_sfml_device* dev = &sfml.ogl; struct nk_sfml_device* dev = &sfml.ogl;