From 34450093d71c304df0f8ffdd6ceae8008c9866a3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 26 Mar 2021 09:19:50 +0100 Subject: [PATCH 01/89] Add example to use Nuklear with SDL2 SDL_Renderer and SDL_RenderGeometry() --- demo/sdl_sdlrenderer/Makefile | 27 ++ demo/sdl_sdlrenderer/main.c | 212 ++++++++++++ .../sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h | 314 ++++++++++++++++++ 3 files changed, 553 insertions(+) create mode 100644 demo/sdl_sdlrenderer/Makefile create mode 100644 demo/sdl_sdlrenderer/main.c create mode 100644 demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h diff --git a/demo/sdl_sdlrenderer/Makefile b/demo/sdl_sdlrenderer/Makefile new file mode 100644 index 0000000..362eed4 --- /dev/null +++ b/demo/sdl_sdlrenderer/Makefile @@ -0,0 +1,27 @@ +# Install +BIN = demo + +# Flags +CFLAGS += -std=c99 -pedantic -O0 +CFLAGS += `sdl2-config --cflags` + +SRC = main.c +OBJ = $(SRC:.c=.o) + +ifeq ($(OS),Windows_NT) +#TODO +#BIN := $(BIN).exe +#LIBS = -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lm -lGLU32 +else + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) +#TODO LIBS = -lSDL2 -framework OpenGL -lm + else + LIBS += -lm -ldl `sdl2-config --libs` + endif +endif + +$(BIN): + @mkdir -p bin + rm -f bin/$(BIN) $(OBJS) + $(CC) $(SRC) $(CFLAGS) -o bin/$(BIN) $(LIBS) diff --git a/demo/sdl_sdlrenderer/main.c b/demo/sdl_sdlrenderer/main.c new file mode 100644 index 0000000..45c5134 --- /dev/null +++ b/demo/sdl_sdlrenderer/main.c @@ -0,0 +1,212 @@ +/* nuklear - 1.32.0 - public domain */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#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 +#define NK_INCLUDE_DEFAULT_FONT +#define NK_IMPLEMENTATION +#define NK_SDL_GL2_IMPLEMENTATION +#include "../../nuklear.h" +#include "nuklear_sdl_sdlrenderer.h" + +#define WINDOW_WIDTH 1200 +#define WINDOW_HEIGHT 800 + +/* =============================================================== + * + * EXAMPLE + * + * ===============================================================*/ +/* This are some code examples to provide a small overview of what can be + * done with this library. To try out an example uncomment the defines */ +/*#define INCLUDE_ALL */ +/*#define INCLUDE_STYLE */ +/*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_OVERVIEW */ +/*#define INCLUDE_NODE_EDITOR */ + +#ifdef INCLUDE_ALL + #define INCLUDE_STYLE + #define INCLUDE_CALCULATOR + #define INCLUDE_OVERVIEW + #define INCLUDE_NODE_EDITOR +#endif + +#ifdef INCLUDE_STYLE + #include "../style.c" +#endif +#ifdef INCLUDE_CALCULATOR + #include "../calculator.c" +#endif +#ifdef INCLUDE_OVERVIEW + #include "../overview.c" +#endif +#ifdef INCLUDE_NODE_EDITOR + #include "../node_editor.c" +#endif + +/* =============================================================== + * + * DEMO + * + * ===============================================================*/ +int +main(int argc, char *argv[]) +{ + /* Platform */ + SDL_Window *win; + SDL_Renderer *renderer; + int running = 1; + + /* GUI */ + struct nk_context *ctx; + struct nk_colorf bg; + + /* SDL setup */ + SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "0"); + SDL_Init(SDL_INIT_VIDEO); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); + SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); + win = SDL_CreateWindow("Demo", + SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, + WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_ALLOW_HIGHDPI); + + if (win == NULL) { + SDL_Log("Error SDL_CreateWindow %s", SDL_GetError()); + exit(-1); + } + + int flags = 0; + flags |= SDL_RENDERER_ACCELERATED; + flags |= SDL_RENDERER_PRESENTVSYNC; + +#if 0 + SDL_SetHint(SDL_HINT_RENDER_BATCHING, "1"); + SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software"); + SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl"); + SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software"); + SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengles2"); +#endif + + renderer = SDL_CreateRenderer(win, -1, flags); + + if (renderer == NULL) { + SDL_Log("Error SDL_CreateRenderer %s", SDL_GetError()); + exit(-1); + } + + + /* GUI */ + ctx = nk_sdl_init(win, renderer); + /* Load Fonts: if none of these are loaded a default font will be used */ + /* Load Cursor: if you uncomment cursor loading please hide the cursor */ + {struct nk_font_atlas *atlas; + nk_sdl_font_stash_begin(&atlas); + /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, 0);*/ + /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16, 0);*/ + /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, 0);*/ + /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, 0);*/ + /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);*/ + /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);*/ + nk_sdl_font_stash_end(); + /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ + /*nk_style_set_font(ctx, &roboto->handle)*/;} + + #ifdef INCLUDE_STYLE + /*set_style(ctx, THEME_WHITE);*/ + /*set_style(ctx, THEME_RED);*/ + /*set_style(ctx, THEME_BLUE);*/ + /*set_style(ctx, THEME_DARK);*/ + #endif + + bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f; + while (running) + { + /* Input */ + SDL_Event evt; + nk_input_begin(ctx); + while (SDL_PollEvent(&evt)) { + if (evt.type == SDL_QUIT) goto cleanup; + nk_sdl_handle_event(&evt); + } + nk_input_end(ctx); + + /* GUI */ + if (nk_begin(ctx, "Demo", nk_rect(50, 50, 230, 250), + NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE| + NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) + { + enum {EASY, HARD}; + static int op = EASY; + static int property = 20; + + nk_layout_row_static(ctx, 30, 80, 1); + if (nk_button_label(ctx, "button")) + fprintf(stdout, "button pressed\n"); + nk_layout_row_dynamic(ctx, 30, 2); + if (nk_option_label(ctx, "easy", op == EASY)) op = EASY; + if (nk_option_label(ctx, "hard", op == HARD)) op = HARD; + nk_layout_row_dynamic(ctx, 25, 1); + nk_property_int(ctx, "Compression:", 0, &property, 100, 10, 1); + + nk_layout_row_dynamic(ctx, 20, 1); + nk_label(ctx, "background:", NK_TEXT_LEFT); + nk_layout_row_dynamic(ctx, 25, 1); + if (nk_combo_begin_color(ctx, nk_rgb_cf(bg), nk_vec2(nk_widget_width(ctx),400))) { + nk_layout_row_dynamic(ctx, 120, 1); + bg = nk_color_picker(ctx, bg, NK_RGBA); + nk_layout_row_dynamic(ctx, 25, 1); + bg.r = nk_propertyf(ctx, "#R:", 0, bg.r, 1.0f, 0.01f,0.005f); + bg.g = nk_propertyf(ctx, "#G:", 0, bg.g, 1.0f, 0.01f,0.005f); + bg.b = nk_propertyf(ctx, "#B:", 0, bg.b, 1.0f, 0.01f,0.005f); + bg.a = nk_propertyf(ctx, "#A:", 0, bg.a, 1.0f, 0.01f,0.005f); + nk_combo_end(ctx); + } + } + nk_end(ctx); + + /* -------------- EXAMPLES ---------------- */ + #ifdef INCLUDE_CALCULATOR + calculator(ctx); + #endif + #ifdef INCLUDE_OVERVIEW + overview(ctx); + #endif + #ifdef INCLUDE_NODE_EDITOR + node_editor(ctx); + #endif + /* ----------------------------------------- */ + + SDL_SetRenderDrawColor(renderer, bg.r * 255, bg.g * 255, bg.b * 255, bg.a * 255); + SDL_RenderClear(renderer); + + nk_sdl_render(NK_ANTI_ALIASING_ON); + + SDL_RenderPresent(renderer); + } + +cleanup: + nk_sdl_shutdown(); + SDL_DestroyRenderer(renderer); + SDL_DestroyWindow(win); + SDL_Quit(); + return 0; +} + diff --git a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h new file mode 100644 index 0000000..8cae6e1 --- /dev/null +++ b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h @@ -0,0 +1,314 @@ +/* + * Nuklear - 1.32.0 - public domain + */ +/* + * ============================================================== + * + * API + * + * =============================================================== + */ +#ifndef NK_SDL_GL2_H_ +#define NK_SDL_GL2_H_ + +#include +NK_API struct nk_context* nk_sdl_init(SDL_Window *win, SDL_Renderer *renderer); +NK_API void nk_sdl_font_stash_begin(struct nk_font_atlas **atlas); +NK_API void nk_sdl_font_stash_end(void); +NK_API int nk_sdl_handle_event(SDL_Event *evt); +NK_API void nk_sdl_render(enum nk_anti_aliasing); +NK_API void nk_sdl_shutdown(void); + +#endif +/* + * ============================================================== + * + * IMPLEMENTATION + * + * =============================================================== + */ +#ifdef NK_SDL_GL2_IMPLEMENTATION + +struct nk_sdl_device { + struct nk_buffer cmds; + struct nk_draw_null_texture null; + SDL_Texture *font_tex; +}; + +struct nk_sdl_vertex { + float position[2]; + float uv[2]; + nk_byte col[4]; +}; + +static struct nk_sdl { + SDL_Window *win; + SDL_Renderer *renderer; + struct nk_sdl_device ogl; + struct nk_context ctx; + struct nk_font_atlas atlas; +} sdl; + + + +NK_INTERN void +nk_sdl_device_upload_atlas(const void *image, int width, int height) +{ + struct nk_sdl_device *dev = &sdl.ogl; + + SDL_Texture *g_SDLFontTexture = SDL_CreateTexture(sdl.renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, width, height); + if (g_SDLFontTexture == NULL) { + SDL_Log("error creating texture"); + return; + } + SDL_UpdateTexture(g_SDLFontTexture, NULL, image, 4 * width); + SDL_SetTextureBlendMode(g_SDLFontTexture, SDL_BLENDMODE_BLEND); + dev->font_tex = g_SDLFontTexture; +} + +NK_API void +nk_sdl_render(enum nk_anti_aliasing AA) +{ + /* setup global state */ + struct nk_sdl_device *dev = &sdl.ogl; + + { + int vs = sizeof(struct nk_sdl_vertex); + size_t vp = offsetof(struct nk_sdl_vertex, position); + size_t vt = offsetof(struct nk_sdl_vertex, uv); + size_t vc = offsetof(struct nk_sdl_vertex, col); + + /* convert from command queue into draw list and draw to screen */ + const struct nk_draw_command *cmd; + const nk_draw_index *offset = NULL; + struct nk_buffer vbuf, ebuf; + + /* fill converting configuration */ + struct nk_convert_config config; + static const struct nk_draw_vertex_layout_element vertex_layout[] = { + {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sdl_vertex, position)}, + {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sdl_vertex, uv)}, + {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)}, + {NK_VERTEX_LAYOUT_END} + }; + NK_MEMSET(&config, 0, sizeof(config)); + config.vertex_layout = vertex_layout; + config.vertex_size = sizeof(struct nk_sdl_vertex); + config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex); + config.null = dev->null; + config.circle_segment_count = 22; + config.curve_segment_count = 22; + config.arc_segment_count = 22; + config.global_alpha = 1.0f; + config.shape_AA = AA; + config.line_AA = AA; + + /* convert shapes into vertexes */ + nk_buffer_init_default(&vbuf); + nk_buffer_init_default(&ebuf); + nk_convert(&sdl.ctx, &dev->cmds, &vbuf, &ebuf, &config); + + /* iterate over and execute each draw command */ + offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf); + nk_draw_foreach(cmd, &sdl.ctx, &dev->cmds) + { + if (!cmd->elem_count) continue; + + { + SDL_Rect r; + r.x = cmd->clip_rect.x; + r.y = cmd->clip_rect.y; + r.w = cmd->clip_rect.w; + r.h = cmd->clip_rect.h; + SDL_RenderSetClipRect(sdl.renderer, &r); + } + + const void *vertices = nk_buffer_memory_const(&vbuf); + + int ret = SDL_RenderGeometryRaw(sdl.renderer, + (SDL_Texture *)cmd->texture.ptr, + (const void*)((const nk_byte*)vertices + vp), vs, + (const void*)((const nk_byte*)vertices + vc), vs, + (const void*)((const nk_byte*)vertices + vt), vs, + (vbuf.needed / vs), + (void *) offset, cmd->elem_count, 2); + + offset += cmd->elem_count; + + } + nk_clear(&sdl.ctx); + nk_buffer_clear(&dev->cmds); + nk_buffer_free(&vbuf); + nk_buffer_free(&ebuf); + } +} + +static void +nk_sdl_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) +{ + const char *text = SDL_GetClipboardText(); + if (text) nk_textedit_paste(edit, text, nk_strlen(text)); + (void)usr; +} + +static void +nk_sdl_clipboard_copy(nk_handle usr, const char *text, int len) +{ + char *str = 0; + (void)usr; + if (!len) return; + str = (char*)malloc((size_t)len+1); + if (!str) return; + memcpy(str, text, (size_t)len); + str[len] = '\0'; + SDL_SetClipboardText(str); + free(str); +} + +NK_API struct nk_context* +nk_sdl_init(SDL_Window *win, SDL_Renderer *renderer) +{ + sdl.win = win; + sdl.renderer = renderer; + nk_init_default(&sdl.ctx, 0); + sdl.ctx.clip.copy = nk_sdl_clipboard_copy; + sdl.ctx.clip.paste = nk_sdl_clipboard_paste; + sdl.ctx.clip.userdata = nk_handle_ptr(0); + nk_buffer_init_default(&sdl.ogl.cmds); + return &sdl.ctx; +} + +NK_API void +nk_sdl_font_stash_begin(struct nk_font_atlas **atlas) +{ + nk_font_atlas_init_default(&sdl.atlas); + nk_font_atlas_begin(&sdl.atlas); + *atlas = &sdl.atlas; +} + +NK_API void +nk_sdl_font_stash_end(void) +{ + const void *image; int w, h; + image = nk_font_atlas_bake(&sdl.atlas, &w, &h, NK_FONT_ATLAS_RGBA32); + nk_sdl_device_upload_atlas(image, w, h); + nk_font_atlas_end(&sdl.atlas, nk_handle_ptr(sdl.ogl.font_tex), &sdl.ogl.null); + if (sdl.atlas.default_font) + nk_style_set_font(&sdl.ctx, &sdl.atlas.default_font->handle); +} + +NK_API int +nk_sdl_handle_event(SDL_Event *evt) +{ + struct nk_context *ctx = &sdl.ctx; + + /* optional grabbing behavior */ + if (ctx->input.mouse.grab) { + SDL_SetRelativeMouseMode(SDL_TRUE); + ctx->input.mouse.grab = 0; + } else if (ctx->input.mouse.ungrab) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + SDL_SetRelativeMouseMode(SDL_FALSE); + SDL_WarpMouseInWindow(sdl.win, x, y); + ctx->input.mouse.ungrab = 0; + } + if (evt->type == SDL_KEYUP || evt->type == SDL_KEYDOWN) { + /* key events */ + int down = evt->type == SDL_KEYDOWN; + const Uint8* state = SDL_GetKeyboardState(0); + SDL_Keycode sym = evt->key.keysym.sym; + if (sym == SDLK_RSHIFT || sym == SDLK_LSHIFT) + nk_input_key(ctx, NK_KEY_SHIFT, down); + else if (sym == SDLK_DELETE) + nk_input_key(ctx, NK_KEY_DEL, down); + else if (sym == SDLK_RETURN) + nk_input_key(ctx, NK_KEY_ENTER, down); + else if (sym == SDLK_TAB) + nk_input_key(ctx, NK_KEY_TAB, down); + else if (sym == SDLK_BACKSPACE) + nk_input_key(ctx, NK_KEY_BACKSPACE, down); + else if (sym == SDLK_HOME) { + nk_input_key(ctx, NK_KEY_TEXT_START, down); + nk_input_key(ctx, NK_KEY_SCROLL_START, down); + } else if (sym == SDLK_END) { + nk_input_key(ctx, NK_KEY_TEXT_END, down); + nk_input_key(ctx, NK_KEY_SCROLL_END, down); + } else if (sym == SDLK_PAGEDOWN) { + nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); + } else if (sym == SDLK_PAGEUP) { + nk_input_key(ctx, NK_KEY_SCROLL_UP, down); + } else if (sym == SDLK_z) + nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_r) + nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_c) + nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_v) + nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_x) + nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_b) + nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_e) + nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); + else if (sym == SDLK_UP) + nk_input_key(ctx, NK_KEY_UP, down); + else if (sym == SDLK_DOWN) + nk_input_key(ctx, NK_KEY_DOWN, down); + else if (sym == SDLK_LEFT) { + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); + else nk_input_key(ctx, NK_KEY_LEFT, down); + } else if (sym == SDLK_RIGHT) { + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); + else nk_input_key(ctx, NK_KEY_RIGHT, down); + } else return 0; + return 1; + } else if (evt->type == SDL_MOUSEBUTTONDOWN || evt->type == SDL_MOUSEBUTTONUP) { + /* mouse button */ + int down = evt->type == SDL_MOUSEBUTTONDOWN; + const int x = evt->button.x, y = evt->button.y; + if (evt->button.button == SDL_BUTTON_LEFT) { + if (evt->button.clicks > 1) + nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); + nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); + } else if (evt->button.button == SDL_BUTTON_MIDDLE) + nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); + else if (evt->button.button == SDL_BUTTON_RIGHT) + nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); + return 1; + } else if (evt->type == SDL_MOUSEMOTION) { + /* mouse motion */ + if (ctx->input.mouse.grabbed) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); + } else nk_input_motion(ctx, evt->motion.x, evt->motion.y); + return 1; + } else if (evt->type == SDL_TEXTINPUT) { + /* text input */ + nk_glyph glyph; + memcpy(glyph, evt->text.text, NK_UTF_SIZE); + nk_input_glyph(ctx, glyph); + return 1; + } else if (evt->type == SDL_MOUSEWHEEL) { + /* mouse wheel */ + nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); + return 1; + } + return 0; +} + +NK_API +void nk_sdl_shutdown(void) +{ + struct nk_sdl_device *dev = &sdl.ogl; + nk_font_atlas_clear(&sdl.atlas); + nk_free(&sdl.ctx); + SDL_DestroyTexture(dev->font_tex); + //glDeleteTextures(1, &dev->font_tex); + nk_buffer_free(&dev->cmds); + memset(&sdl, 0, sizeof(sdl)); +} + +#endif From 3552e131a91dc656f197cdaca31cb1dbdd1aa6bc Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 30 Mar 2021 17:09:57 +0200 Subject: [PATCH 02/89] Remove setting GL attributes --- demo/sdl_sdlrenderer/main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/demo/sdl_sdlrenderer/main.c b/demo/sdl_sdlrenderer/main.c index 45c5134..0acd0ca 100644 --- a/demo/sdl_sdlrenderer/main.c +++ b/demo/sdl_sdlrenderer/main.c @@ -79,14 +79,10 @@ main(int argc, char *argv[]) /* SDL setup */ SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "0"); SDL_Init(SDL_INIT_VIDEO); - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); - SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); + win = SDL_CreateWindow("Demo", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, - WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN|SDL_WINDOW_ALLOW_HIGHDPI); + WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN|SDL_WINDOW_ALLOW_HIGHDPI); if (win == NULL) { SDL_Log("Error SDL_CreateWindow %s", SDL_GetError()); From 6b5cfe5f2bf0c3f91fb74da7ae3b2d492fd793eb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Sat, 3 Apr 2021 20:53:19 +0200 Subject: [PATCH 03/89] Save and restore the cliprect --- demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h index 8cae6e1..8033154 100644 --- a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h +++ b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h @@ -107,9 +107,13 @@ nk_sdl_render(enum nk_anti_aliasing AA) nk_buffer_init_default(&vbuf); nk_buffer_init_default(&ebuf); nk_convert(&sdl.ctx, &dev->cmds, &vbuf, &ebuf, &config); - + /* iterate over and execute each draw command */ offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf); + + SDL_Rect saved_clip; + SDL_RenderGetClipRect(sdl.renderer, &saved_clip); + nk_draw_foreach(cmd, &sdl.ctx, &dev->cmds) { if (!cmd->elem_count) continue; @@ -125,8 +129,8 @@ nk_sdl_render(enum nk_anti_aliasing AA) const void *vertices = nk_buffer_memory_const(&vbuf); - int ret = SDL_RenderGeometryRaw(sdl.renderer, - (SDL_Texture *)cmd->texture.ptr, + int ret = SDL_RenderGeometryRaw(sdl.renderer, + (SDL_Texture *)cmd->texture.ptr, (const void*)((const nk_byte*)vertices + vp), vs, (const void*)((const nk_byte*)vertices + vc), vs, (const void*)((const nk_byte*)vertices + vt), vs, @@ -136,6 +140,9 @@ nk_sdl_render(enum nk_anti_aliasing AA) offset += cmd->elem_count; } + + SDL_RenderSetClipRect(sdl.renderer, &saved_clip); + nk_clear(&sdl.ctx); nk_buffer_clear(&dev->cmds); nk_buffer_free(&vbuf); From fb698ba7ef1b2b0f4908ae920fc11428fd251b77 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Sat, 3 Apr 2021 23:40:13 +0200 Subject: [PATCH 04/89] Set back clipping_enabled --- demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h index 8033154..4dabb3e 100644 --- a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h +++ b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h @@ -112,6 +112,7 @@ nk_sdl_render(enum nk_anti_aliasing AA) offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf); SDL_Rect saved_clip; + SDL_bool clipping_enabled = SDL_RenderIsClipEnabled(sdl.renderer); SDL_RenderGetClipRect(sdl.renderer, &saved_clip); nk_draw_foreach(cmd, &sdl.ctx, &dev->cmds) @@ -142,6 +143,9 @@ nk_sdl_render(enum nk_anti_aliasing AA) } SDL_RenderSetClipRect(sdl.renderer, &saved_clip); + if (!clipping_enabled) { + SDL_RenderSetClipRect(sdl.renderer, NULL); + } nk_clear(&sdl.ctx); nk_buffer_clear(&dev->cmds); From 4c728a0adfecac4bd54a161979bd305830eefedb Mon Sep 17 00:00:00 2001 From: "A. Tammy" Date: Thu, 22 Apr 2021 11:28:38 -0400 Subject: [PATCH 05/89] create-tag github action for future tags Closes: https://github.com/Immediate-Mode-UI/Nuklear/issues/136 Signed-off-by: Aisha Tammy --- .github/workflows/create-tag.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/create-tag.yml diff --git a/.github/workflows/create-tag.yml b/.github/workflows/create-tag.yml new file mode 100644 index 0000000..6d5acd3 --- /dev/null +++ b/.github/workflows/create-tag.yml @@ -0,0 +1,15 @@ +name: Create Tag + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: butlerlogic/action-autotag@stable + with: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 1e4eacca2e3e4abd4d8b793c580c71f2e5315651 Mon Sep 17 00:00:00 2001 From: Wladislav Artsimovich Date: Sun, 16 May 2021 22:54:56 +0200 Subject: [PATCH 06/89] change NK_MEMSET to memset(), because NK_MEMSET is NK internal --- demo/glfw_opengl2/nuklear_glfw_gl2.h | 2 +- demo/glfw_opengl3/nuklear_glfw_gl3.h | 2 +- demo/glfw_opengl4/nuklear_glfw_gl4.h | 2 +- demo/sdl2surface_rawfb/sdl2surface_rawfb.h | 4 ++-- demo/sdl_opengl2/nuklear_sdl_gl2.h | 2 +- demo/sdl_opengl3/nuklear_sdl_gl3.h | 2 +- demo/sdl_opengles2/nuklear_sdl_gles2.h | 2 +- demo/sfml_opengl2/nuklear_sfml_gl2.h | 2 +- demo/sfml_opengl3/nuklear_sfml_gl3.h | 2 +- demo/x11/nuklear_xlib.h | 2 +- demo/x11_opengl2/nuklear_xlib_gl2.h | 2 +- demo/x11_opengl3/nuklear_xlib_gl3.h | 2 +- demo/x11_rawfb/nuklear_rawfb.h | 4 ++-- demo/x11_rawfb/nuklear_xlib.h | 2 +- demo/x11_xft/nuklear_xlib.h | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/demo/glfw_opengl2/nuklear_glfw_gl2.h b/demo/glfw_opengl2/nuklear_glfw_gl2.h index 2d2f51e..a197e90 100644 --- a/demo/glfw_opengl2/nuklear_glfw_gl2.h +++ b/demo/glfw_opengl2/nuklear_glfw_gl2.h @@ -136,7 +136,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA) {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_glfw_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex); diff --git a/demo/glfw_opengl3/nuklear_glfw_gl3.h b/demo/glfw_opengl3/nuklear_glfw_gl3.h index 1204c78..aa678fb 100644 --- a/demo/glfw_opengl3/nuklear_glfw_gl3.h +++ b/demo/glfw_opengl3/nuklear_glfw_gl3.h @@ -262,7 +262,7 @@ nk_glfw3_render(struct nk_glfw* glfw, enum nk_anti_aliasing AA, int max_vertex_b {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_glfw_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex); diff --git a/demo/glfw_opengl4/nuklear_glfw_gl4.h b/demo/glfw_opengl4/nuklear_glfw_gl4.h index 587e595..e6af210 100644 --- a/demo/glfw_opengl4/nuklear_glfw_gl4.h +++ b/demo/glfw_opengl4/nuklear_glfw_gl4.h @@ -403,7 +403,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA) {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_glfw_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex); diff --git a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h index 0056448..94496ff 100644 --- a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h +++ b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h @@ -813,7 +813,7 @@ nk_sdlsurface_init(SDL_Surface *fb, float fontSize) if (!sdlsurface) return NULL; - NK_MEMSET(sdlsurface, 0, sizeof(struct sdlsurface_context)); + memset(sdlsurface, 0, sizeof(struct sdlsurface_context)); sdlsurface->fb = fb; @@ -1001,7 +1001,7 @@ nk_sdlsurface_shutdown(struct sdlsurface_context *sdlsurface) if (sdlsurface) { SDL_FreeSurface(sdlsurface->font_tex); nk_free(&sdlsurface->ctx); - NK_MEMSET(sdlsurface, 0, sizeof(struct sdlsurface_context)); + memset(sdlsurface, 0, sizeof(struct sdlsurface_context)); free(sdlsurface); } } diff --git a/demo/sdl_opengl2/nuklear_sdl_gl2.h b/demo/sdl_opengl2/nuklear_sdl_gl2.h index 1abfed2..da2a080 100644 --- a/demo/sdl_opengl2/nuklear_sdl_gl2.h +++ b/demo/sdl_opengl2/nuklear_sdl_gl2.h @@ -116,7 +116,7 @@ nk_sdl_render(enum nk_anti_aliasing AA) {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_sdl_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex); diff --git a/demo/sdl_opengl3/nuklear_sdl_gl3.h b/demo/sdl_opengl3/nuklear_sdl_gl3.h index d1caf39..e393628 100644 --- a/demo/sdl_opengl3/nuklear_sdl_gl3.h +++ b/demo/sdl_opengl3/nuklear_sdl_gl3.h @@ -243,7 +243,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_sdl_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex); diff --git a/demo/sdl_opengles2/nuklear_sdl_gles2.h b/demo/sdl_opengles2/nuklear_sdl_gles2.h index 565114f..061550b 100644 --- a/demo/sdl_opengles2/nuklear_sdl_gles2.h +++ b/demo/sdl_opengles2/nuklear_sdl_gles2.h @@ -241,7 +241,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_sdl_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex); diff --git a/demo/sfml_opengl2/nuklear_sfml_gl2.h b/demo/sfml_opengl2/nuklear_sfml_gl2.h index 9b1f735..cff7278 100644 --- a/demo/sfml_opengl2/nuklear_sfml_gl2.h +++ b/demo/sfml_opengl2/nuklear_sfml_gl2.h @@ -114,7 +114,7 @@ nk_sfml_render(enum nk_anti_aliasing AA) {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sfml_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_sfml_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex); diff --git a/demo/sfml_opengl3/nuklear_sfml_gl3.h b/demo/sfml_opengl3/nuklear_sfml_gl3.h index 0ff666a..a074ef0 100644 --- a/demo/sfml_opengl3/nuklear_sfml_gl3.h +++ b/demo/sfml_opengl3/nuklear_sfml_gl3.h @@ -244,7 +244,7 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_ {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_sfml_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex); diff --git a/demo/x11/nuklear_xlib.h b/demo/x11/nuklear_xlib.h index 33175b4..6701ad9 100644 --- a/demo/x11/nuklear_xlib.h +++ b/demo/x11/nuklear_xlib.h @@ -864,7 +864,7 @@ nk_xlib_shutdown(void) nk_xsurf_del(xlib.surf); nk_free(&xlib.ctx); XFreeCursor(xlib.dpy, xlib.cursor); - NK_MEMSET(&xlib, 0, sizeof(xlib)); + memset(&xlib, 0, sizeof(xlib)); } NK_API void diff --git a/demo/x11_opengl2/nuklear_xlib_gl2.h b/demo/x11_opengl2/nuklear_xlib_gl2.h index 2b80763..c8483fe 100644 --- a/demo/x11_opengl2/nuklear_xlib_gl2.h +++ b/demo/x11_opengl2/nuklear_xlib_gl2.h @@ -146,7 +146,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_x11_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_x11_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex); diff --git a/demo/x11_opengl3/nuklear_xlib_gl3.h b/demo/x11_opengl3/nuklear_xlib_gl3.h index 28b1ef6..44d9335 100644 --- a/demo/x11_opengl3/nuklear_xlib_gl3.h +++ b/demo/x11_opengl3/nuklear_xlib_gl3.h @@ -532,7 +532,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_x11_vertex, col)}, {NK_VERTEX_LAYOUT_END} }; - NK_MEMSET(&config, 0, sizeof(config)); + memset(&config, 0, sizeof(config)); config.vertex_layout = vertex_layout; config.vertex_size = sizeof(struct nk_x11_vertex); config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex); diff --git a/demo/x11_rawfb/nuklear_rawfb.h b/demo/x11_rawfb/nuklear_rawfb.h index 8683b4c..710065e 100644 --- a/demo/x11_rawfb/nuklear_rawfb.h +++ b/demo/x11_rawfb/nuklear_rawfb.h @@ -821,7 +821,7 @@ nk_rawfb_init(void *fb, void *tex_mem, const unsigned int w, const unsigned int if (!rawfb) return NULL; - NK_MEMSET(rawfb, 0, sizeof(struct rawfb_context)); + memset(rawfb, 0, sizeof(struct rawfb_context)); rawfb->font_tex.pixels = tex_mem; rawfb->font_tex.format = NK_FONT_ATLAS_ALPHA8; rawfb->font_tex.w = rawfb->font_tex.h = 0; @@ -1015,7 +1015,7 @@ nk_rawfb_shutdown(struct rawfb_context *rawfb) { if (rawfb) { nk_free(&rawfb->ctx); - NK_MEMSET(rawfb, 0, sizeof(struct rawfb_context)); + memset(rawfb, 0, sizeof(struct rawfb_context)); free(rawfb); } } diff --git a/demo/x11_rawfb/nuklear_xlib.h b/demo/x11_rawfb/nuklear_xlib.h index ddbdf48..3a13931 100644 --- a/demo/x11_rawfb/nuklear_xlib.h +++ b/demo/x11_rawfb/nuklear_xlib.h @@ -287,7 +287,7 @@ nk_xlib_shutdown(void) XDestroyImage(xlib.ximg); shmdt(xlib.xsi.shmaddr); shmctl(xlib.xsi.shmid, IPC_RMID, NULL); - } NK_MEMSET(&xlib, 0, sizeof(xlib)); + } memset(&xlib, 0, sizeof(xlib)); } NK_API void diff --git a/demo/x11_xft/nuklear_xlib.h b/demo/x11_xft/nuklear_xlib.h index c32c7b7..cb14e68 100644 --- a/demo/x11_xft/nuklear_xlib.h +++ b/demo/x11_xft/nuklear_xlib.h @@ -942,7 +942,7 @@ nk_xlib_shutdown(void) nk_xsurf_del(xlib.surf); nk_free(&xlib.ctx); XFreeCursor(xlib.dpy, xlib.cursor); - NK_MEMSET(&xlib, 0, sizeof(xlib)); + memset(&xlib, 0, sizeof(xlib)); } NK_API void From 67c72d0484523026404aad03a2f579ddc2c10e38 Mon Sep 17 00:00:00 2001 From: Mikhail Sokolovskiy Date: Sun, 1 Aug 2021 19:14:51 +0300 Subject: [PATCH 07/89] Fix warning about unused parameter --- nuklear.h | 3 +++ package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_layout.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index ba2bd97..3c19f93 100644 --- a/nuklear.h +++ b/nuklear.h @@ -21311,6 +21311,8 @@ nk_layout_row_calculate_usable_space(const struct nk_style *style, enum nk_panel struct nk_vec2 spacing; + NK_UNUSED(type); + spacing = style->window.spacing; /* calculate the usable panel space */ @@ -29173,6 +29175,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/03/17 (4.07.1) - Fix warning about unused parameter /// - 2021/03/17 (4.07.0) - Fix nk_property hover bug /// - 2021/03/15 (4.06.4) - Change nk_propertyi back to int /// - 2021/03/15 (4.06.3) - Update documentation for functions that now return nk_bool diff --git a/package.json b/package.json index c2a0a8a..229cb0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.07.0", + "version": "4.07.1", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index d2d8228..90e9d74 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/03/17 (4.07.1) - Fix warning about unused parameter /// - 2021/03/17 (4.07.0) - Fix nk_property hover bug /// - 2021/03/15 (4.06.4) - Change nk_propertyi back to int /// - 2021/03/15 (4.06.3) - Update documentation for functions that now return nk_bool diff --git a/src/nuklear_layout.c b/src/nuklear_layout.c index 351d283..ae85d0d 100644 --- a/src/nuklear_layout.c +++ b/src/nuklear_layout.c @@ -49,6 +49,8 @@ nk_layout_row_calculate_usable_space(const struct nk_style *style, enum nk_panel struct nk_vec2 spacing; + NK_UNUSED(type); + spacing = style->window.spacing; /* calculate the usable panel space */ From cd217d6c6ae1c532d8c8e1a53c0ef6bc261fb9a2 Mon Sep 17 00:00:00 2001 From: Bernhard Feichtinger <43303168+BieHDC@users.noreply.github.com> Date: Fri, 28 May 2021 19:22:55 +0200 Subject: [PATCH 08/89] Fix wrong scrolling in nk_edit_* when multiline is enabled --- nuklear.h | 3 ++- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_edit.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nuklear.h b/nuklear.h index 3c19f93..0e039ad 100644 --- a/nuklear.h +++ b/nuklear.h @@ -26855,7 +26855,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, /* vertical scroll */ if (cursor_pos.y < edit->scrollbar.y) edit->scrollbar.y = NK_MAX(0.0f, cursor_pos.y - row_height); - if (cursor_pos.y >= edit->scrollbar.y + area.h) + if (cursor_pos.y >= edit->scrollbar.y + row_height) edit->scrollbar.y = edit->scrollbar.y + row_height; } else edit->scrollbar.y = 0; } @@ -29175,6 +29175,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset /// - 2021/03/17 (4.07.1) - Fix warning about unused parameter /// - 2021/03/17 (4.07.0) - Fix nk_property hover bug /// - 2021/03/15 (4.06.4) - Change nk_propertyi back to int diff --git a/package.json b/package.json index 229cb0b..5abd84a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.07.1", + "version": "4.07.2", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 90e9d74..7f3f87c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset /// - 2021/03/17 (4.07.1) - Fix warning about unused parameter /// - 2021/03/17 (4.07.0) - Fix nk_property hover bug /// - 2021/03/15 (4.06.4) - Change nk_propertyi back to int diff --git a/src/nuklear_edit.c b/src/nuklear_edit.c index 1441c61..2c53a6e 100644 --- a/src/nuklear_edit.c +++ b/src/nuklear_edit.c @@ -471,7 +471,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, /* vertical scroll */ if (cursor_pos.y < edit->scrollbar.y) edit->scrollbar.y = NK_MAX(0.0f, cursor_pos.y - row_height); - if (cursor_pos.y >= edit->scrollbar.y + area.h) + if (cursor_pos.y >= edit->scrollbar.y + row_height) edit->scrollbar.y = edit->scrollbar.y + row_height; } else edit->scrollbar.y = 0; } From 7ef8fd65cc040f053e0cdda8aa2776a5b0741e69 Mon Sep 17 00:00:00 2001 From: Komari Spaghetti <3759175+Hejsil@users.noreply.github.com> Date: Mon, 19 Jul 2021 16:05:29 +0000 Subject: [PATCH 09/89] Fix crash when baking merged fonts fixes #316 --- nuklear.h | 11 +++++++---- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_font.c | 10 ++++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/nuklear.h b/nuklear.h index 0e039ad..022836a 100644 --- a/nuklear.h +++ b/nuklear.h @@ -16432,11 +16432,13 @@ nk_font_bake_pack(struct nk_font_baker *baker, } /* setup font baker from temporary memory */ for (config_iter = config_list; config_iter; config_iter = config_iter->next) { - struct stbtt_fontinfo *font_info = &baker->build[i++].info; it = config_iter; - font_info->userdata = alloc; - do {if (!stbtt_InitFont(font_info, (const unsigned char*)it->ttf_blob, 0)) - return nk_false; + do { + struct stbtt_fontinfo *font_info = &baker->build[i++].info; + font_info->userdata = alloc; + + if (!stbtt_InitFont(font_info, (const unsigned char*)it->ttf_blob, 0)) + return nk_false; } while ((it = it->n) != config_iter); } *height = 0; @@ -29175,6 +29177,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts /// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset /// - 2021/03/17 (4.07.1) - Fix warning about unused parameter /// - 2021/03/17 (4.07.0) - Fix nk_property hover bug diff --git a/package.json b/package.json index 5abd84a..4a0788a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.07.2", + "version": "4.07.3", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 7f3f87c..f332107 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts /// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset /// - 2021/03/17 (4.07.1) - Fix warning about unused parameter /// - 2021/03/17 (4.07.0) - Fix nk_property hover bug diff --git a/src/nuklear_font.c b/src/nuklear_font.c index e03a63b..311b943 100644 --- a/src/nuklear_font.c +++ b/src/nuklear_font.c @@ -189,11 +189,13 @@ nk_font_bake_pack(struct nk_font_baker *baker, } /* setup font baker from temporary memory */ for (config_iter = config_list; config_iter; config_iter = config_iter->next) { - struct stbtt_fontinfo *font_info = &baker->build[i++].info; it = config_iter; - font_info->userdata = alloc; - do {if (!stbtt_InitFont(font_info, (const unsigned char*)it->ttf_blob, 0)) - return nk_false; + do { + struct stbtt_fontinfo *font_info = &baker->build[i++].info; + font_info->userdata = alloc; + + if (!stbtt_InitFont(font_info, (const unsigned char*)it->ttf_blob, 0)) + return nk_false; } while ((it = it->n) != config_iter); } *height = 0; From 0b49ee5db0700824ce3aa9b4c4b268347c844452 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 15 Aug 2021 15:30:49 -0400 Subject: [PATCH 10/89] Fix warnings about sign conversion (#323) --- nuklear.h | 13 ++++++------- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_layout.c | 2 +- src/nuklear_panel.c | 6 +++--- src/nuklear_pool.c | 2 +- src/nuklear_scrollbar.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nuklear.h b/nuklear.h index 022836a..71a3c2c 100644 --- a/nuklear.h +++ b/nuklear.h @@ -19024,7 +19024,7 @@ nk_pool_init_fixed(struct nk_pool *pool, void *memory, nk_size size) NK_ASSERT(size >= sizeof(struct nk_page)); if (size < sizeof(struct nk_page)) return; /* first nk_page_element is embedded in nk_page, additional elements follow in adjacent space */ - pool->capacity = 1 + (unsigned)(size - sizeof(struct nk_page)) / sizeof(struct nk_page_element); + pool->capacity = (unsigned)(1 + (size - sizeof(struct nk_page)) / sizeof(struct nk_page_element)); pool->pages = (struct nk_page*)memory; pool->type = NK_BUFFER_FIXED; pool->size = size; @@ -19330,8 +19330,8 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan /* window movement */ if ((win->flags & NK_WINDOW_MOVABLE) && !(win->flags & NK_WINDOW_ROM)) { - int left_mouse_down; - int left_mouse_clicked; + nk_bool left_mouse_down; + unsigned int left_mouse_clicked; int left_mouse_click_in_cursor; /* calculate draggable window space */ @@ -19346,7 +19346,7 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan /* window movement by dragging */ left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down; - left_mouse_clicked = (int)in->mouse.buttons[NK_BUTTON_LEFT].clicked; + left_mouse_clicked = in->mouse.buttons[NK_BUTTON_LEFT].clicked; left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in, NK_BUTTON_LEFT, header, nk_true); if (left_mouse_down && left_mouse_click_in_cursor && !left_mouse_clicked) { @@ -21865,7 +21865,7 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx, panel_space = nk_layout_row_calculate_usable_space(&ctx->style, layout->type, layout->bounds.w, layout->row.columns); - #define NK_FRAC(x) (x - (int)x) /* will be used to remove fookin gaps */ + #define NK_FRAC(x) (x - (float)(int)x) /* will be used to remove fookin gaps */ /* calculate the width of one item inside the current layout space */ switch (layout->row.type) { case NK_LAYOUT_DYNAMIC_FIXED: { @@ -25074,7 +25074,7 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in, { nk_flags ws = 0; int left_mouse_down; - int left_mouse_clicked; + unsigned int left_mouse_clicked; int left_mouse_click_in_cursor; float scroll_delta; @@ -29508,4 +29508,3 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// in libraries and brought me to create some of my own. Finally Apoorva Joshi /// for his single header file packer. */ - diff --git a/package.json b/package.json index 4a0788a..c1f4356 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.07.3", + "version": "4.07.4", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index f332107..b9aab98 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings /// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts /// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset /// - 2021/03/17 (4.07.1) - Fix warning about unused parameter diff --git a/src/nuklear_layout.c b/src/nuklear_layout.c index ae85d0d..1c4b1ec 100644 --- a/src/nuklear_layout.c +++ b/src/nuklear_layout.c @@ -601,7 +601,7 @@ nk_layout_widget_space(struct nk_rect *bounds, const struct nk_context *ctx, panel_space = nk_layout_row_calculate_usable_space(&ctx->style, layout->type, layout->bounds.w, layout->row.columns); - #define NK_FRAC(x) (x - (int)x) /* will be used to remove fookin gaps */ + #define NK_FRAC(x) (x - (float)(int)x) /* will be used to remove fookin gaps */ /* calculate the width of one item inside the current layout space */ switch (layout->row.type) { case NK_LAYOUT_DYNAMIC_FIXED: { diff --git a/src/nuklear_panel.c b/src/nuklear_panel.c index c8ae494..6a006ae 100644 --- a/src/nuklear_panel.c +++ b/src/nuklear_panel.c @@ -122,8 +122,8 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan /* window movement */ if ((win->flags & NK_WINDOW_MOVABLE) && !(win->flags & NK_WINDOW_ROM)) { - int left_mouse_down; - int left_mouse_clicked; + nk_bool left_mouse_down; + unsigned int left_mouse_clicked; int left_mouse_click_in_cursor; /* calculate draggable window space */ @@ -138,7 +138,7 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan /* window movement by dragging */ left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down; - left_mouse_clicked = (int)in->mouse.buttons[NK_BUTTON_LEFT].clicked; + left_mouse_clicked = in->mouse.buttons[NK_BUTTON_LEFT].clicked; left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in, NK_BUTTON_LEFT, header, nk_true); if (left_mouse_down && left_mouse_click_in_cursor && !left_mouse_clicked) { diff --git a/src/nuklear_pool.c b/src/nuklear_pool.c index 044bd83..57419e8 100644 --- a/src/nuklear_pool.c +++ b/src/nuklear_pool.c @@ -37,7 +37,7 @@ nk_pool_init_fixed(struct nk_pool *pool, void *memory, nk_size size) NK_ASSERT(size >= sizeof(struct nk_page)); if (size < sizeof(struct nk_page)) return; /* first nk_page_element is embedded in nk_page, additional elements follow in adjacent space */ - pool->capacity = 1 + (unsigned)(size - sizeof(struct nk_page)) / sizeof(struct nk_page_element); + pool->capacity = (unsigned)(1 + (size - sizeof(struct nk_page)) / sizeof(struct nk_page_element)); pool->pages = (struct nk_page*)memory; pool->type = NK_BUFFER_FIXED; pool->size = size; diff --git a/src/nuklear_scrollbar.c b/src/nuklear_scrollbar.c index aad175d..2e76680 100644 --- a/src/nuklear_scrollbar.c +++ b/src/nuklear_scrollbar.c @@ -15,7 +15,7 @@ nk_scrollbar_behavior(nk_flags *state, struct nk_input *in, { nk_flags ws = 0; int left_mouse_down; - int left_mouse_clicked; + unsigned int left_mouse_clicked; int left_mouse_click_in_cursor; float scroll_delta; From f42712c9de6a138ef551329ab3db2bddd9867066 Mon Sep 17 00:00:00 2001 From: Komari Spaghetti <3759175+Hejsil@users.noreply.github.com> Date: Fri, 18 Jun 2021 18:03:39 +0200 Subject: [PATCH 11/89] Replace usage of memset in nk_font_atlas_bake with NK_MEMSET --- nuklear.h | 5 ++++- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_font.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nuklear.h b/nuklear.h index 71a3c2c..6dd90fc 100644 --- a/nuklear.h +++ b/nuklear.h @@ -17428,7 +17428,7 @@ nk_font_atlas_bake(struct nk_font_atlas *atlas, int *width, int *height, tmp = atlas->temporary.alloc(atlas->temporary.userdata,0, tmp_size); NK_ASSERT(tmp); if (!tmp) goto failed; - memset(tmp,0,tmp_size); + NK_MEMSET(tmp,0,tmp_size); /* allocate glyph memory for all fonts */ baker = nk_font_baker(tmp, atlas->glyph_count, atlas->font_num, &atlas->temporary); @@ -29177,6 +29177,8 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET +/// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings /// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts /// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset /// - 2021/03/17 (4.07.1) - Fix warning about unused parameter @@ -29508,3 +29510,4 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// in libraries and brought me to create some of my own. Finally Apoorva Joshi /// for his single header file packer. */ + diff --git a/package.json b/package.json index c1f4356..8439f8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.07.4", + "version": "4.07.5", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index b9aab98..3e4d0d3 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET /// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings /// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts /// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset diff --git a/src/nuklear_font.c b/src/nuklear_font.c index 311b943..541bf48 100644 --- a/src/nuklear_font.c +++ b/src/nuklear_font.c @@ -1185,7 +1185,7 @@ nk_font_atlas_bake(struct nk_font_atlas *atlas, int *width, int *height, tmp = atlas->temporary.alloc(atlas->temporary.userdata,0, tmp_size); NK_ASSERT(tmp); if (!tmp) goto failed; - memset(tmp,0,tmp_size); + NK_MEMSET(tmp,0,tmp_size); /* allocate glyph memory for all fonts */ baker = nk_font_baker(tmp, atlas->glyph_count, atlas->font_num, &atlas->temporary); From 6322f53cb569bb989873ee8a1b71ae705b230708 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 17 Aug 2021 22:34:52 +0200 Subject: [PATCH 12/89] Add support for 9-slice/9-patch (#304) --- .gitignore | 1 + nuklear.h | 631 ++++++++++++++++++++++++++++++--------- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear.h | 31 +- src/nuklear_9slice.c | 106 +++++++ src/nuklear_button.c | 16 +- src/nuklear_chart.c | 19 +- src/nuklear_combo.c | 119 +++++--- src/nuklear_draw.c | 70 +++++ src/nuklear_edit.c | 23 +- src/nuklear_image.c | 31 +- src/nuklear_panel.c | 37 ++- src/nuklear_progress.c | 32 +- src/nuklear_property.c | 21 +- src/nuklear_scrollbar.c | 32 +- src/nuklear_selectable.c | 19 +- src/nuklear_slider.c | 19 +- src/nuklear_style.c | 14 +- src/nuklear_tree.c | 40 ++- src/paq.bat | 2 +- src/paq.sh | 2 +- 22 files changed, 983 insertions(+), 285 deletions(-) create mode 100644 src/nuklear_9slice.c diff --git a/.gitignore b/.gitignore index 8a7695f..65a3136 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ docs/src *.tmp *.swo *.swp +/private/ diff --git a/nuklear.h b/nuklear.h index 6dd90fc..6f832d1 100644 --- a/nuklear.h +++ b/nuklear.h @@ -480,7 +480,8 @@ struct nk_rect {float x,y,w,h;}; struct nk_recti {short x,y,w,h;}; typedef char nk_glyph[NK_UTF_SIZE]; typedef union {void *ptr; int id;} nk_handle; -struct nk_image {nk_handle handle;unsigned short w,h;unsigned short region[4];}; +struct nk_image {nk_handle handle; nk_ushort w, h; nk_ushort region[4];}; +struct nk_nine_slice {struct nk_image img; nk_ushort l, t, r, b;}; struct nk_cursor {struct nk_image img; struct nk_vec2 size, offset;}; struct nk_scroll {nk_uint x, y;}; @@ -3714,9 +3715,21 @@ NK_API struct nk_image nk_image_handle(nk_handle); NK_API struct nk_image nk_image_ptr(void*); NK_API struct nk_image nk_image_id(int); NK_API nk_bool nk_image_is_subimage(const struct nk_image* img); -NK_API struct nk_image nk_subimage_ptr(void*, unsigned short w, unsigned short h, struct nk_rect sub_region); -NK_API struct nk_image nk_subimage_id(int, unsigned short w, unsigned short h, struct nk_rect sub_region); -NK_API struct nk_image nk_subimage_handle(nk_handle, unsigned short w, unsigned short h, struct nk_rect sub_region); +NK_API struct nk_image nk_subimage_ptr(void*, nk_ushort w, nk_ushort h, struct nk_rect sub_region); +NK_API struct nk_image nk_subimage_id(int, nk_ushort w, nk_ushort h, struct nk_rect sub_region); +NK_API struct nk_image nk_subimage_handle(nk_handle, nk_ushort w, nk_ushort h, struct nk_rect sub_region); +/* ============================================================================= + * + * 9-SLICE + * + * ============================================================================= */ +NK_API struct nk_nine_slice nk_nine_slice_handle(nk_handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_nine_slice_ptr(void*, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_nine_slice_id(int, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API int nk_nine_slice_is_sub9slice(const struct nk_nine_slice* img); +NK_API struct nk_nine_slice nk_sub9slice_ptr(void*, nk_ushort w, nk_ushort h, struct nk_rect sub_region, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_sub9slice_id(int, nk_ushort w, nk_ushort h, struct nk_rect sub_region, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_sub9slice_handle(nk_handle, nk_ushort w, nk_ushort h, struct nk_rect sub_region, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); /* ============================================================================= * * MATH @@ -4608,6 +4621,7 @@ NK_API void nk_fill_polygon(struct nk_command_buffer*, float*, int point_count, /* misc */ NK_API void nk_draw_image(struct nk_command_buffer*, struct nk_rect, const struct nk_image*, struct nk_color); +NK_API void nk_draw_nine_slice(struct nk_command_buffer*, struct nk_rect, const struct nk_nine_slice*, struct nk_color); NK_API void nk_draw_text(struct nk_command_buffer*, struct nk_rect, const char *text, int len, const struct nk_user_font*, struct nk_color, struct nk_color); NK_API void nk_push_scissor(struct nk_command_buffer*, struct nk_rect); NK_API void nk_push_custom(struct nk_command_buffer*, struct nk_rect, nk_command_custom_callback, nk_handle usr); @@ -4825,12 +4839,14 @@ NK_API void nk_draw_list_push_userdata(struct nk_draw_list*, nk_handle userdata) * ===============================================================*/ enum nk_style_item_type { NK_STYLE_ITEM_COLOR, - NK_STYLE_ITEM_IMAGE + NK_STYLE_ITEM_IMAGE, + NK_STYLE_ITEM_NINE_SLICE }; union nk_style_item_data { - struct nk_image image; struct nk_color color; + struct nk_image image; + struct nk_nine_slice slice; }; struct nk_style_item { @@ -5256,8 +5272,9 @@ struct nk_style { struct nk_style_window window; }; -NK_API struct nk_style_item nk_style_item_image(struct nk_image img); NK_API struct nk_style_item nk_style_item_color(struct nk_color); +NK_API struct nk_style_item nk_style_item_image(struct nk_image img); +NK_API struct nk_style_item nk_style_item_nine_slice(struct nk_nine_slice slice); NK_API struct nk_style_item nk_style_item_hide(void); /*============================================================== @@ -9196,6 +9213,76 @@ nk_draw_image(struct nk_command_buffer *b, struct nk_rect r, cmd->col = col; } NK_API void +nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r, + const struct nk_nine_slice *slc, struct nk_color col) +{ + const struct nk_image *slcimg = (const struct nk_image*)slc; + nk_ushort rgnX, rgnY, rgnW, rgnH; + rgnX = slcimg->region[0]; + rgnY = slcimg->region[1]; + rgnW = slcimg->region[2]; + rgnH = slcimg->region[3]; + + /* top-left */ + struct nk_image img = {slcimg->handle, slcimg->w, slcimg->h, + {rgnX, rgnY, slc->l, slc->t}}; + nk_draw_image(b, + nk_rect(r.x, r.y, (float)slc->l, (float)slc->t), + &img, col); + +#define IMG_RGN(x, y, w, h) img.region[0] = (nk_ushort)(x); img.region[1] = (nk_ushort)(y); img.region[2] = (nk_ushort)(w); img.region[3] = (nk_ushort)(h); + + /* top-center */ + IMG_RGN(rgnX + slc->l, rgnY, rgnW - slc->l - slc->r, slc->t); + nk_draw_image(b, + nk_rect(r.x + (float)slc->l, r.y, (float)(r.w - slc->l - slc->r), (float)slc->t), + &img, col); + + /* top-right */ + IMG_RGN(rgnX + rgnW - slc->r, rgnY, slc->r, slc->t); + nk_draw_image(b, + nk_rect(r.x + r.w - (float)slc->r, r.y, (float)slc->r, (float)slc->t), + &img, col); + + /* center-left */ + IMG_RGN(rgnX, rgnY + slc->t, slc->l, rgnH - slc->t - slc->b); + nk_draw_image(b, + nk_rect(r.x, r.y + (float)slc->t, (float)slc->l, (float)(r.h - slc->t - slc->b)), + &img, col); + + /* center */ + IMG_RGN(rgnX + slc->l, rgnY + slc->t, rgnW - slc->l - slc->r, rgnH - slc->t - slc->b); + nk_draw_image(b, + nk_rect(r.x + (float)slc->l, r.y + (float)slc->t, (float)(r.w - slc->l - slc->r), (float)(r.h - slc->t - slc->b)), + &img, col); + + /* center-right */ + IMG_RGN(rgnX + rgnW - slc->r, rgnY + slc->t, slc->r, rgnH - slc->t - slc->b); + nk_draw_image(b, + nk_rect(r.x + r.w - (float)slc->r, r.y + (float)slc->t, (float)slc->r, (float)(r.h - slc->t - slc->b)), + &img, col); + + /* bottom-left */ + IMG_RGN(rgnX, rgnY + rgnH - slc->b, slc->l, slc->b); + nk_draw_image(b, + nk_rect(r.x, r.y + r.h - (float)slc->b, (float)slc->l, (float)slc->b), + &img, col); + + /* bottom-center */ + IMG_RGN(rgnX + slc->l, rgnY + rgnH - slc->b, rgnW - slc->l - slc->r, slc->b); + nk_draw_image(b, + nk_rect(r.x + (float)slc->l, r.y + r.h - (float)slc->b, (float)(r.w - slc->l - slc->r), (float)slc->b), + &img, col); + + /* bottom-right */ + IMG_RGN(rgnX + rgnW - slc->r, rgnY + rgnH - slc->b, slc->r, slc->b); + nk_draw_image(b, + nk_rect(r.x + r.w - (float)slc->r, r.y + r.h - (float)slc->b, (float)slc->r, (float)slc->b), + &img, col); + +#undef IMG_RGN +} +NK_API void nk_push_custom(struct nk_command_buffer *b, struct nk_rect r, nk_command_custom_callback cb, nk_handle usr) { @@ -17931,6 +18018,14 @@ nk_style_get_color_by_name(enum nk_style_colors c) return nk_color_names[c]; } NK_API struct nk_style_item +nk_style_item_color(struct nk_color col) +{ + struct nk_style_item i; + i.type = NK_STYLE_ITEM_COLOR; + i.data.color = col; + return i; +} +NK_API struct nk_style_item nk_style_item_image(struct nk_image img) { struct nk_style_item i; @@ -17939,11 +18034,11 @@ nk_style_item_image(struct nk_image img) return i; } NK_API struct nk_style_item -nk_style_item_color(struct nk_color col) +nk_style_item_nine_slice(struct nk_nine_slice slice) { struct nk_style_item i; - i.type = NK_STYLE_ITEM_COLOR; - i.data.color = col; + i.type = NK_STYLE_ITEM_NINE_SLICE; + i.data.slice = slice; return i; } NK_API struct nk_style_item @@ -19424,12 +19519,20 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan /* draw header background */ header.h += 1.0f; - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(out, header, 0, background->data.color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0,0,0,0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(out, header, 0, background->data.color); + break; } /* window close button */ @@ -19490,7 +19593,7 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan label.h = font->height + 2 * style->window.header.label_padding.y; label.w = t + 2 * style->window.header.spacing.x; label.w = NK_CLAMP(0, label.w, header.x + header.w - label.x); - nk_widget_text(out, label,(const char*)title, text_len, &text, NK_TEXT_LEFT, font);} + nk_widget_text(out, label, (const char*)title, text_len, &text, NK_TEXT_LEFT, font);} } /* draw window background */ @@ -19500,9 +19603,18 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan body.w = win->bounds.w; body.y = (win->bounds.y + layout->header_height); body.h = (win->bounds.h - layout->header_height); - if (style->window.fixed_background.type == NK_STYLE_ITEM_IMAGE) - nk_draw_image(out, body, &style->window.fixed_background.data.image, nk_white); - else nk_fill_rect(out, body, 0, style->window.fixed_background.data.color); + + switch(style->window.fixed_background.type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, body, &style->window.fixed_background.data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, body, &style->window.fixed_background.data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, body, 0, style->window.fixed_background.data.color); + break; + } } /* set clipping rectangle */ @@ -22075,14 +22187,19 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type, widget_state = nk_widget(&header, ctx); if (type == NK_TREE_TAB) { const struct nk_style_item *background = &style->tab.background; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, header, &background->data.image, nk_white); - text.background = nk_rgba(0,0,0,0); - } else { - text.background = background->data.color; - nk_fill_rect(out, header, 0, style->tab.border_color); - nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), - style->tab.rounding, background->data.color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, header, 0, style->tab.border_color); + nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), + style->tab.rounding, background->data.color); + break; } } else text.background = style->window.background; @@ -22260,12 +22377,19 @@ nk_tree_element_image_push_hashed_base(struct nk_context *ctx, enum nk_tree_type widget_state = nk_widget(&header, ctx); if (type == NK_TREE_TAB) { const struct nk_style_item *background = &style->tab.background; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, header, &background->data.image, nk_white); - } else { - nk_fill_rect(out, header, 0, style->tab.border_color); - nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), - style->tab.rounding, background->data.color); + + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, header, 0, style->tab.border_color); + nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), + style->tab.rounding, background->data.color); + break; } } @@ -23231,43 +23355,42 @@ nk_handle_id(int id) return handle; } NK_API struct nk_image -nk_subimage_ptr(void *ptr, unsigned short w, unsigned short h, struct nk_rect r) +nk_subimage_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect r) { struct nk_image s; nk_zero(&s, sizeof(s)); s.handle.ptr = ptr; s.w = w; s.h = h; - s.region[0] = (unsigned short)r.x; - s.region[1] = (unsigned short)r.y; - s.region[2] = (unsigned short)r.w; - s.region[3] = (unsigned short)r.h; + s.region[0] = (nk_ushort)r.x; + s.region[1] = (nk_ushort)r.y; + s.region[2] = (nk_ushort)r.w; + s.region[3] = (nk_ushort)r.h; return s; } NK_API struct nk_image -nk_subimage_id(int id, unsigned short w, unsigned short h, struct nk_rect r) +nk_subimage_id(int id, nk_ushort w, nk_ushort h, struct nk_rect r) { struct nk_image s; nk_zero(&s, sizeof(s)); s.handle.id = id; s.w = w; s.h = h; - s.region[0] = (unsigned short)r.x; - s.region[1] = (unsigned short)r.y; - s.region[2] = (unsigned short)r.w; - s.region[3] = (unsigned short)r.h; + s.region[0] = (nk_ushort)r.x; + s.region[1] = (nk_ushort)r.y; + s.region[2] = (nk_ushort)r.w; + s.region[3] = (nk_ushort)r.h; return s; } NK_API struct nk_image -nk_subimage_handle(nk_handle handle, unsigned short w, unsigned short h, - struct nk_rect r) +nk_subimage_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect r) { struct nk_image s; nk_zero(&s, sizeof(s)); s.handle = handle; s.w = w; s.h = h; - s.region[0] = (unsigned short)r.x; - s.region[1] = (unsigned short)r.y; - s.region[2] = (unsigned short)r.w; - s.region[3] = (unsigned short)r.h; + s.region[0] = (nk_ushort)r.x; + s.region[1] = (nk_ushort)r.y; + s.region[2] = (nk_ushort)r.w; + s.region[3] = (nk_ushort)r.h; return s; } NK_API struct nk_image @@ -23351,6 +23474,113 @@ nk_image_color(struct nk_context *ctx, struct nk_image img, struct nk_color col) +/* =============================================================== + * + * 9-SLICE + * + * ===============================================================*/ +NK_API struct nk_nine_slice +nk_sub9slice_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle.ptr = ptr; + i->w = w; i->h = h; + i->region[0] = (nk_ushort)rgn.x; + i->region[1] = (nk_ushort)rgn.y; + i->region[2] = (nk_ushort)rgn.w; + i->region[3] = (nk_ushort)rgn.h; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_sub9slice_id(int id, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle.id = id; + i->w = w; i->h = h; + i->region[0] = (nk_ushort)rgn.x; + i->region[1] = (nk_ushort)rgn.y; + i->region[2] = (nk_ushort)rgn.w; + i->region[3] = (nk_ushort)rgn.h; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_sub9slice_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle = handle; + i->w = w; i->h = h; + i->region[0] = (nk_ushort)rgn.x; + i->region[1] = (nk_ushort)rgn.y; + i->region[2] = (nk_ushort)rgn.w; + i->region[3] = (nk_ushort)rgn.h; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_nine_slice_handle(nk_handle handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle = handle; + i->w = 0; i->h = 0; + i->region[0] = 0; + i->region[1] = 0; + i->region[2] = 0; + i->region[3] = 0; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_nine_slice_ptr(void *ptr, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + NK_ASSERT(ptr); + i->handle.ptr = ptr; + i->w = 0; i->h = 0; + i->region[0] = 0; + i->region[1] = 0; + i->region[2] = 0; + i->region[3] = 0; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_nine_slice_id(int id, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle.id = id; + i->w = 0; i->h = 0; + i->region[0] = 0; + i->region[1] = 0; + i->region[2] = 0; + i->region[3] = 0; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API int +nk_nine_slice_is_sub9slice(const struct nk_nine_slice* slice) +{ + NK_ASSERT(slice); + return !(slice->img.w == 0 && slice->img.h == 0); +} + + + + + /* ============================================================== * * BUTTON @@ -23448,11 +23678,17 @@ nk_draw_button(struct nk_command_buffer *out, background = &style->active; else background = &style->normal; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - } else { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; } return background; } @@ -24380,12 +24616,19 @@ nk_draw_selectable(struct nk_command_buffer *out, } } /* draw selectable background and text */ - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - text.background = nk_rgba(0,0,0,0); - } else { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - text.background = background->data.color; + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + break; } if (icon) { if (img) nk_draw_image(out, *icon, img, nk_white); @@ -24752,11 +24995,17 @@ nk_draw_slider(struct nk_command_buffer *out, nk_flags state, fill.h = bar.h; /* draw background */ - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - } else { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; } /* draw slider bar */ @@ -24766,7 +25015,8 @@ nk_draw_slider(struct nk_command_buffer *out, nk_flags state, /* draw cursor */ if (cursor->type == NK_STYLE_ITEM_IMAGE) nk_draw_image(out, *visual_cursor, &cursor->data.image, nk_white); - else nk_fill_circle(out, *visual_cursor, cursor->data.color); + else + nk_fill_circle(out, *visual_cursor, cursor->data.color); } NK_LIB float nk_do_slider(nk_flags *state, @@ -24976,16 +25226,32 @@ nk_draw_progress(struct nk_command_buffer *out, nk_flags state, } /* draw background */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); - } else nk_draw_image(out, *bounds, &background->data.image, nk_white); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; + } /* draw cursor */ - if (cursor->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *scursor, style->rounding, cursor->data.color); - nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color); - } else nk_draw_image(out, *scursor, &cursor->data.image, nk_white); + switch(cursor->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *scursor, &cursor->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *scursor, &cursor->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *scursor, style->rounding, cursor->data.color); + nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color); + break; + } } NK_LIB nk_size nk_do_progress(nk_flags *state, @@ -25162,18 +25428,32 @@ nk_draw_scrollbar(struct nk_command_buffer *out, nk_flags state, } /* draw background */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); - } else { - nk_draw_image(out, *bounds, &background->data.image, nk_white); + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; } /* draw cursor */ - if (cursor->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *scroll, style->rounding_cursor, cursor->data.color); - nk_stroke_rect(out, *scroll, style->rounding_cursor, style->border_cursor, style->cursor_border_color); - } else nk_draw_image(out, *scroll, &cursor->data.image, nk_white); + switch (cursor->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *scroll, &cursor->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *scroll, &cursor->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *scroll, style->rounding_cursor, cursor->data.color); + nk_stroke_rect(out, *scroll, style->rounding_cursor, style->border_cursor, style->cursor_border_color); + break; + } } NK_LIB float nk_do_scrollbarv(nk_flags *state, @@ -26715,10 +26995,19 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, else background = &style->normal; /* draw background frame */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, bounds, style->rounding, background->data.color); - nk_stroke_rect(out, bounds, style->rounding, style->border, style->border_color); - } else nk_draw_image(out, bounds, &background->data.image, nk_white);} + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, bounds, style->rounding, background->data.color); + nk_stroke_rect(out, bounds, style->rounding, style->border, style->border_color); + break; + }} + area.w = NK_MAX(0, area.w - style->cursor_size); if (edit->active) @@ -26921,7 +27210,8 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, } if (background->type == NK_STYLE_ITEM_IMAGE) background_color = nk_rgba(0,0,0,0); - else background_color = background->data.color; + else + background_color = background->data.color; if (edit->select_start == edit->select_end) { @@ -27028,7 +27318,8 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, } if (background->type == NK_STYLE_ITEM_IMAGE) background_color = nk_rgba(0,0,0,0); - else background_color = background->data.color; + else + background_color = background->data.color; nk_edit_draw_text(out, style, area.x - edit->scrollbar.x, area.y - edit->scrollbar.y, 0, begin, l, row_height, font, background_color, text_color, nk_false); @@ -27282,13 +27573,20 @@ nk_draw_property(struct nk_command_buffer *out, const struct nk_style_property * } /* draw background */ - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - text.background = nk_rgba(0,0,0,0); - } else { - text.background = background->data.color; - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, background->data.color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, background->data.color); + break; } /* draw label */ @@ -27749,12 +28047,19 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type, /* draw chart background */ background = &style->background; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(&win->buffer, bounds, &background->data.image, nk_white); - } else { - nk_fill_rect(&win->buffer, bounds, style->rounding, style->border_color); - nk_fill_rect(&win->buffer, nk_shrink_rect(bounds, style->border), - style->rounding, style->background.data.color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(&win->buffer, bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(&win->buffer, bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(&win->buffer, bounds, style->rounding, style->border_color); + nk_fill_rect(&win->buffer, nk_shrink_rect(bounds, style->border), + style->rounding, style->background.data.color); + break; } return 1; } @@ -28296,13 +28601,21 @@ nk_combo_begin_text(struct nk_context *ctx, const char *selected, int len, background = &style->combo.normal; text.text = style->combo.label_normal; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { /* print currently selected text item */ @@ -28392,11 +28705,17 @@ nk_combo_begin_color(struct nk_context *ctx, struct nk_color color, struct nk_ve background = &style->combo.hover; else background = &style->combo.normal; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(&win->buffer, header, &background->data.image,nk_white); - } else { - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect content; @@ -28484,13 +28803,20 @@ nk_combo_begin_symbol(struct nk_context *ctx, enum nk_symbol_type symbol, struct symbol_color = style->combo.symbol_hover; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - sym_background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - sym_background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + sym_background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + sym_background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + sym_background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect bounds = {0,0,0,0}; @@ -28573,13 +28899,21 @@ nk_combo_begin_symbol_text(struct nk_context *ctx, const char *selected, int len symbol_color = style->combo.symbol_normal; text.text = style->combo.label_normal; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect content; @@ -28660,11 +28994,17 @@ nk_combo_begin_image(struct nk_context *ctx, struct nk_image img, struct nk_vec2 background = &style->combo.hover; else background = &style->combo.normal; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect bounds = {0,0,0,0}; @@ -28750,13 +29090,21 @@ nk_combo_begin_image_text(struct nk_context *ctx, const char *selected, int len, background = &style->combo.normal; text.text = style->combo.label_normal; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect content; @@ -29177,6 +29525,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles /// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET /// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings /// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts diff --git a/package.json b/package.json index 8439f8d..646c364 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.07.5", + "version": "4.08.0", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 3e4d0d3..ae3c726 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles /// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET /// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings /// - 2021/08/08 (4.07.3) - Fix crash when baking merged fonts diff --git a/src/nuklear.h b/src/nuklear.h index d9cb211..45fb747 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -259,7 +259,8 @@ struct nk_rect {float x,y,w,h;}; struct nk_recti {short x,y,w,h;}; typedef char nk_glyph[NK_UTF_SIZE]; typedef union {void *ptr; int id;} nk_handle; -struct nk_image {nk_handle handle;unsigned short w,h;unsigned short region[4];}; +struct nk_image {nk_handle handle; nk_ushort w, h; nk_ushort region[4];}; +struct nk_nine_slice {struct nk_image img; nk_ushort l, t, r, b;}; struct nk_cursor {struct nk_image img; struct nk_vec2 size, offset;}; struct nk_scroll {nk_uint x, y;}; @@ -3493,9 +3494,21 @@ NK_API struct nk_image nk_image_handle(nk_handle); NK_API struct nk_image nk_image_ptr(void*); NK_API struct nk_image nk_image_id(int); NK_API nk_bool nk_image_is_subimage(const struct nk_image* img); -NK_API struct nk_image nk_subimage_ptr(void*, unsigned short w, unsigned short h, struct nk_rect sub_region); -NK_API struct nk_image nk_subimage_id(int, unsigned short w, unsigned short h, struct nk_rect sub_region); -NK_API struct nk_image nk_subimage_handle(nk_handle, unsigned short w, unsigned short h, struct nk_rect sub_region); +NK_API struct nk_image nk_subimage_ptr(void*, nk_ushort w, nk_ushort h, struct nk_rect sub_region); +NK_API struct nk_image nk_subimage_id(int, nk_ushort w, nk_ushort h, struct nk_rect sub_region); +NK_API struct nk_image nk_subimage_handle(nk_handle, nk_ushort w, nk_ushort h, struct nk_rect sub_region); +/* ============================================================================= + * + * 9-SLICE + * + * ============================================================================= */ +NK_API struct nk_nine_slice nk_nine_slice_handle(nk_handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_nine_slice_ptr(void*, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_nine_slice_id(int, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API int nk_nine_slice_is_sub9slice(const struct nk_nine_slice* img); +NK_API struct nk_nine_slice nk_sub9slice_ptr(void*, nk_ushort w, nk_ushort h, struct nk_rect sub_region, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_sub9slice_id(int, nk_ushort w, nk_ushort h, struct nk_rect sub_region, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); +NK_API struct nk_nine_slice nk_sub9slice_handle(nk_handle, nk_ushort w, nk_ushort h, struct nk_rect sub_region, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b); /* ============================================================================= * * MATH @@ -4387,6 +4400,7 @@ NK_API void nk_fill_polygon(struct nk_command_buffer*, float*, int point_count, /* misc */ NK_API void nk_draw_image(struct nk_command_buffer*, struct nk_rect, const struct nk_image*, struct nk_color); +NK_API void nk_draw_nine_slice(struct nk_command_buffer*, struct nk_rect, const struct nk_nine_slice*, struct nk_color); NK_API void nk_draw_text(struct nk_command_buffer*, struct nk_rect, const char *text, int len, const struct nk_user_font*, struct nk_color, struct nk_color); NK_API void nk_push_scissor(struct nk_command_buffer*, struct nk_rect); NK_API void nk_push_custom(struct nk_command_buffer*, struct nk_rect, nk_command_custom_callback, nk_handle usr); @@ -4604,12 +4618,14 @@ NK_API void nk_draw_list_push_userdata(struct nk_draw_list*, nk_handle userdata) * ===============================================================*/ enum nk_style_item_type { NK_STYLE_ITEM_COLOR, - NK_STYLE_ITEM_IMAGE + NK_STYLE_ITEM_IMAGE, + NK_STYLE_ITEM_NINE_SLICE }; union nk_style_item_data { - struct nk_image image; struct nk_color color; + struct nk_image image; + struct nk_nine_slice slice; }; struct nk_style_item { @@ -5035,8 +5051,9 @@ struct nk_style { struct nk_style_window window; }; -NK_API struct nk_style_item nk_style_item_image(struct nk_image img); NK_API struct nk_style_item nk_style_item_color(struct nk_color); +NK_API struct nk_style_item nk_style_item_image(struct nk_image img); +NK_API struct nk_style_item nk_style_item_nine_slice(struct nk_nine_slice slice); NK_API struct nk_style_item nk_style_item_hide(void); /*============================================================== diff --git a/src/nuklear_9slice.c b/src/nuklear_9slice.c new file mode 100644 index 0000000..ed8c67f --- /dev/null +++ b/src/nuklear_9slice.c @@ -0,0 +1,106 @@ +#include "nuklear.h" +#include "nuklear_internal.h" + +/* =============================================================== + * + * 9-SLICE + * + * ===============================================================*/ +NK_API struct nk_nine_slice +nk_sub9slice_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle.ptr = ptr; + i->w = w; i->h = h; + i->region[0] = (nk_ushort)rgn.x; + i->region[1] = (nk_ushort)rgn.y; + i->region[2] = (nk_ushort)rgn.w; + i->region[3] = (nk_ushort)rgn.h; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_sub9slice_id(int id, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle.id = id; + i->w = w; i->h = h; + i->region[0] = (nk_ushort)rgn.x; + i->region[1] = (nk_ushort)rgn.y; + i->region[2] = (nk_ushort)rgn.w; + i->region[3] = (nk_ushort)rgn.h; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_sub9slice_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle = handle; + i->w = w; i->h = h; + i->region[0] = (nk_ushort)rgn.x; + i->region[1] = (nk_ushort)rgn.y; + i->region[2] = (nk_ushort)rgn.w; + i->region[3] = (nk_ushort)rgn.h; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_nine_slice_handle(nk_handle handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle = handle; + i->w = 0; i->h = 0; + i->region[0] = 0; + i->region[1] = 0; + i->region[2] = 0; + i->region[3] = 0; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_nine_slice_ptr(void *ptr, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + NK_ASSERT(ptr); + i->handle.ptr = ptr; + i->w = 0; i->h = 0; + i->region[0] = 0; + i->region[1] = 0; + i->region[2] = 0; + i->region[3] = 0; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API struct nk_nine_slice +nk_nine_slice_id(int id, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) +{ + struct nk_nine_slice s; + nk_zero(&s, sizeof(s)); + struct nk_image *i = &s.img; + i->handle.id = id; + i->w = 0; i->h = 0; + i->region[0] = 0; + i->region[1] = 0; + i->region[2] = 0; + i->region[3] = 0; + s.l = l; s.t = t; s.r = r; s.b = b; + return s; +} +NK_API int +nk_nine_slice_is_sub9slice(const struct nk_nine_slice* slice) +{ + NK_ASSERT(slice); + return !(slice->img.w == 0 && slice->img.h == 0); +} + diff --git a/src/nuklear_button.c b/src/nuklear_button.c index 078bff5..54f02f7 100644 --- a/src/nuklear_button.c +++ b/src/nuklear_button.c @@ -98,11 +98,17 @@ nk_draw_button(struct nk_command_buffer *out, background = &style->active; else background = &style->normal; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - } else { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; } return background; } diff --git a/src/nuklear_chart.c b/src/nuklear_chart.c index bc501d7..d4fd902 100644 --- a/src/nuklear_chart.c +++ b/src/nuklear_chart.c @@ -56,12 +56,19 @@ nk_chart_begin_colored(struct nk_context *ctx, enum nk_chart_type type, /* draw chart background */ background = &style->background; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(&win->buffer, bounds, &background->data.image, nk_white); - } else { - nk_fill_rect(&win->buffer, bounds, style->rounding, style->border_color); - nk_fill_rect(&win->buffer, nk_shrink_rect(bounds, style->border), - style->rounding, style->background.data.color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(&win->buffer, bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(&win->buffer, bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(&win->buffer, bounds, style->rounding, style->border_color); + nk_fill_rect(&win->buffer, nk_shrink_rect(bounds, style->border), + style->rounding, style->background.data.color); + break; } return 1; } diff --git a/src/nuklear_combo.c b/src/nuklear_combo.c index 1f183c5..df1db0a 100644 --- a/src/nuklear_combo.c +++ b/src/nuklear_combo.c @@ -82,13 +82,21 @@ nk_combo_begin_text(struct nk_context *ctx, const char *selected, int len, background = &style->combo.normal; text.text = style->combo.label_normal; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { /* print currently selected text item */ @@ -178,11 +186,17 @@ nk_combo_begin_color(struct nk_context *ctx, struct nk_color color, struct nk_ve background = &style->combo.hover; else background = &style->combo.normal; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(&win->buffer, header, &background->data.image,nk_white); - } else { - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect content; @@ -270,13 +284,20 @@ nk_combo_begin_symbol(struct nk_context *ctx, enum nk_symbol_type symbol, struct symbol_color = style->combo.symbol_hover; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - sym_background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - sym_background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + sym_background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + sym_background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + sym_background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect bounds = {0,0,0,0}; @@ -359,13 +380,21 @@ nk_combo_begin_symbol_text(struct nk_context *ctx, const char *selected, int len symbol_color = style->combo.symbol_normal; text.text = style->combo.label_normal; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect content; @@ -446,11 +475,17 @@ nk_combo_begin_image(struct nk_context *ctx, struct nk_image img, struct nk_vec2 background = &style->combo.hover; else background = &style->combo.normal; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect bounds = {0,0,0,0}; @@ -536,13 +571,21 @@ nk_combo_begin_image_text(struct nk_context *ctx, const char *selected, int len, background = &style->combo.normal; text.text = style->combo.label_normal; } - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); - nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(&win->buffer, header, style->combo.rounding, background->data.color); + nk_stroke_rect(&win->buffer, header, style->combo.rounding, style->combo.border, style->combo.border_color); + break; } { struct nk_rect content; diff --git a/src/nuklear_draw.c b/src/nuklear_draw.c index ae01ea6..30d278e 100644 --- a/src/nuklear_draw.c +++ b/src/nuklear_draw.c @@ -415,6 +415,76 @@ nk_draw_image(struct nk_command_buffer *b, struct nk_rect r, cmd->col = col; } NK_API void +nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r, + const struct nk_nine_slice *slc, struct nk_color col) +{ + const struct nk_image *slcimg = (const struct nk_image*)slc; + nk_ushort rgnX, rgnY, rgnW, rgnH; + rgnX = slcimg->region[0]; + rgnY = slcimg->region[1]; + rgnW = slcimg->region[2]; + rgnH = slcimg->region[3]; + + /* top-left */ + struct nk_image img = {slcimg->handle, slcimg->w, slcimg->h, + {rgnX, rgnY, slc->l, slc->t}}; + nk_draw_image(b, + nk_rect(r.x, r.y, (float)slc->l, (float)slc->t), + &img, col); + +#define IMG_RGN(x, y, w, h) img.region[0] = (nk_ushort)(x); img.region[1] = (nk_ushort)(y); img.region[2] = (nk_ushort)(w); img.region[3] = (nk_ushort)(h); + + /* top-center */ + IMG_RGN(rgnX + slc->l, rgnY, rgnW - slc->l - slc->r, slc->t); + nk_draw_image(b, + nk_rect(r.x + (float)slc->l, r.y, (float)(r.w - slc->l - slc->r), (float)slc->t), + &img, col); + + /* top-right */ + IMG_RGN(rgnX + rgnW - slc->r, rgnY, slc->r, slc->t); + nk_draw_image(b, + nk_rect(r.x + r.w - (float)slc->r, r.y, (float)slc->r, (float)slc->t), + &img, col); + + /* center-left */ + IMG_RGN(rgnX, rgnY + slc->t, slc->l, rgnH - slc->t - slc->b); + nk_draw_image(b, + nk_rect(r.x, r.y + (float)slc->t, (float)slc->l, (float)(r.h - slc->t - slc->b)), + &img, col); + + /* center */ + IMG_RGN(rgnX + slc->l, rgnY + slc->t, rgnW - slc->l - slc->r, rgnH - slc->t - slc->b); + nk_draw_image(b, + nk_rect(r.x + (float)slc->l, r.y + (float)slc->t, (float)(r.w - slc->l - slc->r), (float)(r.h - slc->t - slc->b)), + &img, col); + + /* center-right */ + IMG_RGN(rgnX + rgnW - slc->r, rgnY + slc->t, slc->r, rgnH - slc->t - slc->b); + nk_draw_image(b, + nk_rect(r.x + r.w - (float)slc->r, r.y + (float)slc->t, (float)slc->r, (float)(r.h - slc->t - slc->b)), + &img, col); + + /* bottom-left */ + IMG_RGN(rgnX, rgnY + rgnH - slc->b, slc->l, slc->b); + nk_draw_image(b, + nk_rect(r.x, r.y + r.h - (float)slc->b, (float)slc->l, (float)slc->b), + &img, col); + + /* bottom-center */ + IMG_RGN(rgnX + slc->l, rgnY + rgnH - slc->b, rgnW - slc->l - slc->r, slc->b); + nk_draw_image(b, + nk_rect(r.x + (float)slc->l, r.y + r.h - (float)slc->b, (float)(r.w - slc->l - slc->r), (float)slc->b), + &img, col); + + /* bottom-right */ + IMG_RGN(rgnX + rgnW - slc->r, rgnY + rgnH - slc->b, slc->r, slc->b); + nk_draw_image(b, + nk_rect(r.x + r.w - (float)slc->r, r.y + r.h - (float)slc->b, (float)slc->r, (float)slc->b), + &img, col); + +#undef IMG_RGN +} +NK_API void nk_push_custom(struct nk_command_buffer *b, struct nk_rect r, nk_command_custom_callback cb, nk_handle usr) { diff --git a/src/nuklear_edit.c b/src/nuklear_edit.c index 2c53a6e..8cab48e 100644 --- a/src/nuklear_edit.c +++ b/src/nuklear_edit.c @@ -329,10 +329,19 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, else background = &style->normal; /* draw background frame */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, bounds, style->rounding, background->data.color); - nk_stroke_rect(out, bounds, style->rounding, style->border, style->border_color); - } else nk_draw_image(out, bounds, &background->data.image, nk_white);} + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, bounds, style->rounding, background->data.color); + nk_stroke_rect(out, bounds, style->rounding, style->border, style->border_color); + break; + }} + area.w = NK_MAX(0, area.w - style->cursor_size); if (edit->active) @@ -535,7 +544,8 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, } if (background->type == NK_STYLE_ITEM_IMAGE) background_color = nk_rgba(0,0,0,0); - else background_color = background->data.color; + else + background_color = background->data.color; if (edit->select_start == edit->select_end) { @@ -642,7 +652,8 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out, } if (background->type == NK_STYLE_ITEM_IMAGE) background_color = nk_rgba(0,0,0,0); - else background_color = background->data.color; + else + background_color = background->data.color; nk_edit_draw_text(out, style, area.x - edit->scrollbar.x, area.y - edit->scrollbar.y, 0, begin, l, row_height, font, background_color, text_color, nk_false); diff --git a/src/nuklear_image.c b/src/nuklear_image.c index af2aea9..5267144 100644 --- a/src/nuklear_image.c +++ b/src/nuklear_image.c @@ -22,43 +22,42 @@ nk_handle_id(int id) return handle; } NK_API struct nk_image -nk_subimage_ptr(void *ptr, unsigned short w, unsigned short h, struct nk_rect r) +nk_subimage_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect r) { struct nk_image s; nk_zero(&s, sizeof(s)); s.handle.ptr = ptr; s.w = w; s.h = h; - s.region[0] = (unsigned short)r.x; - s.region[1] = (unsigned short)r.y; - s.region[2] = (unsigned short)r.w; - s.region[3] = (unsigned short)r.h; + s.region[0] = (nk_ushort)r.x; + s.region[1] = (nk_ushort)r.y; + s.region[2] = (nk_ushort)r.w; + s.region[3] = (nk_ushort)r.h; return s; } NK_API struct nk_image -nk_subimage_id(int id, unsigned short w, unsigned short h, struct nk_rect r) +nk_subimage_id(int id, nk_ushort w, nk_ushort h, struct nk_rect r) { struct nk_image s; nk_zero(&s, sizeof(s)); s.handle.id = id; s.w = w; s.h = h; - s.region[0] = (unsigned short)r.x; - s.region[1] = (unsigned short)r.y; - s.region[2] = (unsigned short)r.w; - s.region[3] = (unsigned short)r.h; + s.region[0] = (nk_ushort)r.x; + s.region[1] = (nk_ushort)r.y; + s.region[2] = (nk_ushort)r.w; + s.region[3] = (nk_ushort)r.h; return s; } NK_API struct nk_image -nk_subimage_handle(nk_handle handle, unsigned short w, unsigned short h, - struct nk_rect r) +nk_subimage_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect r) { struct nk_image s; nk_zero(&s, sizeof(s)); s.handle = handle; s.w = w; s.h = h; - s.region[0] = (unsigned short)r.x; - s.region[1] = (unsigned short)r.y; - s.region[2] = (unsigned short)r.w; - s.region[3] = (unsigned short)r.h; + s.region[0] = (nk_ushort)r.x; + s.region[1] = (nk_ushort)r.y; + s.region[2] = (nk_ushort)r.w; + s.region[3] = (nk_ushort)r.h; return s; } NK_API struct nk_image diff --git a/src/nuklear_panel.c b/src/nuklear_panel.c index 6a006ae..f170d7c 100644 --- a/src/nuklear_panel.c +++ b/src/nuklear_panel.c @@ -216,12 +216,20 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan /* draw header background */ header.h += 1.0f; - if (background->type == NK_STYLE_ITEM_IMAGE) { - text.background = nk_rgba(0,0,0,0); - nk_draw_image(&win->buffer, header, &background->data.image, nk_white); - } else { - text.background = background->data.color; - nk_fill_rect(out, header, 0, background->data.color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0,0,0,0); + nk_draw_image(&win->buffer, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(&win->buffer, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(out, header, 0, background->data.color); + break; } /* window close button */ @@ -282,7 +290,7 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan label.h = font->height + 2 * style->window.header.label_padding.y; label.w = t + 2 * style->window.header.spacing.x; label.w = NK_CLAMP(0, label.w, header.x + header.w - label.x); - nk_widget_text(out, label,(const char*)title, text_len, &text, NK_TEXT_LEFT, font);} + nk_widget_text(out, label, (const char*)title, text_len, &text, NK_TEXT_LEFT, font);} } /* draw window background */ @@ -292,9 +300,18 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan body.w = win->bounds.w; body.y = (win->bounds.y + layout->header_height); body.h = (win->bounds.h - layout->header_height); - if (style->window.fixed_background.type == NK_STYLE_ITEM_IMAGE) - nk_draw_image(out, body, &style->window.fixed_background.data.image, nk_white); - else nk_fill_rect(out, body, 0, style->window.fixed_background.data.color); + + switch(style->window.fixed_background.type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, body, &style->window.fixed_background.data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, body, &style->window.fixed_background.data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, body, 0, style->window.fixed_background.data.color); + break; + } } /* set clipping rectangle */ diff --git a/src/nuklear_progress.c b/src/nuklear_progress.c index 79cc82e..65578ca 100644 --- a/src/nuklear_progress.c +++ b/src/nuklear_progress.c @@ -60,16 +60,32 @@ nk_draw_progress(struct nk_command_buffer *out, nk_flags state, } /* draw background */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); - } else nk_draw_image(out, *bounds, &background->data.image, nk_white); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; + } /* draw cursor */ - if (cursor->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *scursor, style->rounding, cursor->data.color); - nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color); - } else nk_draw_image(out, *scursor, &cursor->data.image, nk_white); + switch(cursor->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *scursor, &cursor->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *scursor, &cursor->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *scursor, style->rounding, cursor->data.color); + nk_stroke_rect(out, *scursor, style->rounding, style->border, style->border_color); + break; + } } NK_LIB nk_size nk_do_progress(nk_flags *state, diff --git a/src/nuklear_property.c b/src/nuklear_property.c index 9a5c94a..1dbbde4 100644 --- a/src/nuklear_property.c +++ b/src/nuklear_property.c @@ -86,13 +86,20 @@ nk_draw_property(struct nk_command_buffer *out, const struct nk_style_property * } /* draw background */ - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - text.background = nk_rgba(0,0,0,0); - } else { - text.background = background->data.color; - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, background->data.color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, background->data.color); + break; } /* draw label */ diff --git a/src/nuklear_scrollbar.c b/src/nuklear_scrollbar.c index 2e76680..7377333 100644 --- a/src/nuklear_scrollbar.c +++ b/src/nuklear_scrollbar.c @@ -103,18 +103,32 @@ nk_draw_scrollbar(struct nk_command_buffer *out, nk_flags state, } /* draw background */ - if (background->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); - } else { - nk_draw_image(out, *bounds, &background->data.image, nk_white); + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; } /* draw cursor */ - if (cursor->type == NK_STYLE_ITEM_COLOR) { - nk_fill_rect(out, *scroll, style->rounding_cursor, cursor->data.color); - nk_stroke_rect(out, *scroll, style->rounding_cursor, style->border_cursor, style->cursor_border_color); - } else nk_draw_image(out, *scroll, &cursor->data.image, nk_white); + switch (cursor->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *scroll, &cursor->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *scroll, &cursor->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *scroll, style->rounding_cursor, cursor->data.color); + nk_stroke_rect(out, *scroll, style->rounding_cursor, style->border_cursor, style->cursor_border_color); + break; + } } NK_LIB float nk_do_scrollbarv(nk_flags *state, diff --git a/src/nuklear_selectable.c b/src/nuklear_selectable.c index f35c5e2..e5f7278 100644 --- a/src/nuklear_selectable.c +++ b/src/nuklear_selectable.c @@ -42,12 +42,19 @@ nk_draw_selectable(struct nk_command_buffer *out, } } /* draw selectable background and text */ - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - text.background = nk_rgba(0,0,0,0); - } else { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - text.background = background->data.color; + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + text.background = nk_rgba(0, 0, 0, 0); + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + text.background = background->data.color; + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + break; } if (icon) { if (img) nk_draw_image(out, *icon, img, nk_white); diff --git a/src/nuklear_slider.c b/src/nuklear_slider.c index 0b0d650..188f7f4 100644 --- a/src/nuklear_slider.c +++ b/src/nuklear_slider.c @@ -91,11 +91,17 @@ nk_draw_slider(struct nk_command_buffer *out, nk_flags state, fill.h = bar.h; /* draw background */ - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, *bounds, &background->data.image, nk_white); - } else { - nk_fill_rect(out, *bounds, style->rounding, background->data.color); - nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, *bounds, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, *bounds, style->rounding, background->data.color); + nk_stroke_rect(out, *bounds, style->rounding, style->border, style->border_color); + break; } /* draw slider bar */ @@ -105,7 +111,8 @@ nk_draw_slider(struct nk_command_buffer *out, nk_flags state, /* draw cursor */ if (cursor->type == NK_STYLE_ITEM_IMAGE) nk_draw_image(out, *visual_cursor, &cursor->data.image, nk_white); - else nk_fill_circle(out, *visual_cursor, cursor->data.color); + else + nk_fill_circle(out, *visual_cursor, cursor->data.color); } NK_LIB float nk_do_slider(nk_flags *state, diff --git a/src/nuklear_style.c b/src/nuklear_style.c index 46e5599..0e0851e 100644 --- a/src/nuklear_style.c +++ b/src/nuklear_style.c @@ -55,6 +55,14 @@ nk_style_get_color_by_name(enum nk_style_colors c) return nk_color_names[c]; } NK_API struct nk_style_item +nk_style_item_color(struct nk_color col) +{ + struct nk_style_item i; + i.type = NK_STYLE_ITEM_COLOR; + i.data.color = col; + return i; +} +NK_API struct nk_style_item nk_style_item_image(struct nk_image img) { struct nk_style_item i; @@ -63,11 +71,11 @@ nk_style_item_image(struct nk_image img) return i; } NK_API struct nk_style_item -nk_style_item_color(struct nk_color col) +nk_style_item_nine_slice(struct nk_nine_slice slice) { struct nk_style_item i; - i.type = NK_STYLE_ITEM_COLOR; - i.data.color = col; + i.type = NK_STYLE_ITEM_NINE_SLICE; + i.data.slice = slice; return i; } NK_API struct nk_style_item diff --git a/src/nuklear_tree.c b/src/nuklear_tree.c index 773c383..ef37ff0 100644 --- a/src/nuklear_tree.c +++ b/src/nuklear_tree.c @@ -49,14 +49,19 @@ nk_tree_state_base(struct nk_context *ctx, enum nk_tree_type type, widget_state = nk_widget(&header, ctx); if (type == NK_TREE_TAB) { const struct nk_style_item *background = &style->tab.background; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, header, &background->data.image, nk_white); - text.background = nk_rgba(0,0,0,0); - } else { - text.background = background->data.color; - nk_fill_rect(out, header, 0, style->tab.border_color); - nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), - style->tab.rounding, background->data.color); + + switch(background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, header, 0, style->tab.border_color); + nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), + style->tab.rounding, background->data.color); + break; } } else text.background = style->window.background; @@ -234,12 +239,19 @@ nk_tree_element_image_push_hashed_base(struct nk_context *ctx, enum nk_tree_type widget_state = nk_widget(&header, ctx); if (type == NK_TREE_TAB) { const struct nk_style_item *background = &style->tab.background; - if (background->type == NK_STYLE_ITEM_IMAGE) { - nk_draw_image(out, header, &background->data.image, nk_white); - } else { - nk_fill_rect(out, header, 0, style->tab.border_color); - nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), - style->tab.rounding, background->data.color); + + switch (background->type) { + case NK_STYLE_ITEM_IMAGE: + nk_draw_image(out, header, &background->data.image, nk_white); + break; + case NK_STYLE_ITEM_NINE_SLICE: + nk_draw_nine_slice(out, header, &background->data.slice, nk_white); + break; + case NK_STYLE_ITEM_COLOR: + nk_fill_rect(out, header, 0, style->tab.border_color); + nk_fill_rect(out, nk_shrink_rect(header, style->tab.border), + style->tab.rounding, background->data.color); + break; } } diff --git a/src/paq.bat b/src/paq.bat index a8973d8..eb258b5 100644 --- a/src/paq.bat +++ b/src/paq.bat @@ -1 +1 @@ -build.py --macro NK --intro HEADER --pub nuklear.h --priv1 nuklear_internal.h,nuklear_math.c,nuklear_util.c,nuklear_color.c,nuklear_utf8.c,nuklear_buffer.c,nuklear_string.c,nuklear_draw.c,nuklear_vertex.c --extern stb_rect_pack.h,stb_truetype.h --priv2 nuklear_font.c,nuklear_input.c,nuklear_style.c,nuklear_context.c,nuklear_pool.c,nuklear_page_element.c,nuklear_table.c,nuklear_panel.c,nuklear_window.c,nuklear_popup.c,nuklear_contextual.c,nuklear_menu.c,nuklear_layout.c,nuklear_tree.c,nuklear_group.c,nuklear_list_view.c,nuklear_widget.c,nuklear_text.c,nuklear_image.c,nuklear_button.c,nuklear_toggle.c,nuklear_selectable.c,nuklear_slider.c,nuklear_progress.c,nuklear_scrollbar.c,nuklear_text_editor.c,nuklear_edit.c,nuklear_property.c,nuklear_chart.c,nuklear_color_picker.c,nuklear_combo.c,nuklear_tooltip.c --outro LICENSE,CHANGELOG,CREDITS > ..\nuklear.h +build.py --macro NK --intro HEADER --pub nuklear.h --priv1 nuklear_internal.h,nuklear_math.c,nuklear_util.c,nuklear_color.c,nuklear_utf8.c,nuklear_buffer.c,nuklear_string.c,nuklear_draw.c,nuklear_vertex.c --extern stb_rect_pack.h,stb_truetype.h --priv2 nuklear_font.c,nuklear_input.c,nuklear_style.c,nuklear_context.c,nuklear_pool.c,nuklear_page_element.c,nuklear_table.c,nuklear_panel.c,nuklear_window.c,nuklear_popup.c,nuklear_contextual.c,nuklear_menu.c,nuklear_layout.c,nuklear_tree.c,nuklear_group.c,nuklear_list_view.c,nuklear_widget.c,nuklear_text.c,nuklear_image.c,nuklear_9slice.c,nuklear_button.c,nuklear_toggle.c,nuklear_selectable.c,nuklear_slider.c,nuklear_progress.c,nuklear_scrollbar.c,nuklear_text_editor.c,nuklear_edit.c,nuklear_property.c,nuklear_chart.c,nuklear_color_picker.c,nuklear_combo.c,nuklear_tooltip.c --outro LICENSE,CHANGELOG,CREDITS > ..\nuklear.h diff --git a/src/paq.sh b/src/paq.sh index 37d9d69..45ce4b7 100755 --- a/src/paq.sh +++ b/src/paq.sh @@ -1,3 +1,3 @@ #!/bin/sh -python build.py --macro NK --intro HEADER --pub nuklear.h --priv1 nuklear_internal.h,nuklear_math.c,nuklear_util.c,nuklear_color.c,nuklear_utf8.c,nuklear_buffer.c,nuklear_string.c,nuklear_draw.c,nuklear_vertex.c --extern stb_rect_pack.h,stb_truetype.h --priv2 nuklear_font.c,nuklear_input.c,nuklear_style.c,nuklear_context.c,nuklear_pool.c,nuklear_page_element.c,nuklear_table.c,nuklear_panel.c,nuklear_window.c,nuklear_popup.c,nuklear_contextual.c,nuklear_menu.c,nuklear_layout.c,nuklear_tree.c,nuklear_group.c,nuklear_list_view.c,nuklear_widget.c,nuklear_text.c,nuklear_image.c,nuklear_button.c,nuklear_toggle.c,nuklear_selectable.c,nuklear_slider.c,nuklear_progress.c,nuklear_scrollbar.c,nuklear_text_editor.c,nuklear_edit.c,nuklear_property.c,nuklear_chart.c,nuklear_color_picker.c,nuklear_combo.c,nuklear_tooltip.c --outro LICENSE,CHANGELOG,CREDITS > ../nuklear.h +python build.py --macro NK --intro HEADER --pub nuklear.h --priv1 nuklear_internal.h,nuklear_math.c,nuklear_util.c,nuklear_color.c,nuklear_utf8.c,nuklear_buffer.c,nuklear_string.c,nuklear_draw.c,nuklear_vertex.c --extern stb_rect_pack.h,stb_truetype.h --priv2 nuklear_font.c,nuklear_input.c,nuklear_style.c,nuklear_context.c,nuklear_pool.c,nuklear_page_element.c,nuklear_table.c,nuklear_panel.c,nuklear_window.c,nuklear_popup.c,nuklear_contextual.c,nuklear_menu.c,nuklear_layout.c,nuklear_tree.c,nuklear_group.c,nuklear_list_view.c,nuklear_widget.c,nuklear_text.c,nuklear_image.c,nuklear_9slice.c,nuklear_button.c,nuklear_toggle.c,nuklear_selectable.c,nuklear_slider.c,nuklear_progress.c,nuklear_scrollbar.c,nuklear_text_editor.c,nuklear_edit.c,nuklear_property.c,nuklear_chart.c,nuklear_color_picker.c,nuklear_combo.c,nuklear_tooltip.c --outro LICENSE,CHANGELOG,CREDITS > ../nuklear.h From ebdb341750752a0c6b1c653295c144a949d3ecfa Mon Sep 17 00:00:00 2001 From: Komari Spaghetti <3759175+Hejsil@users.noreply.github.com> Date: Sun, 20 Jun 2021 19:01:06 +0200 Subject: [PATCH 13/89] Use compiler builtins for NK_OFFSETOF when possible --- nuklear.h | 21 +++++++++++++-------- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear.h | 20 ++++++++++++-------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/nuklear.h b/nuklear.h index 6f832d1..bcf0843 100644 --- a/nuklear.h +++ b/nuklear.h @@ -5697,12 +5697,10 @@ struct nk_context { #define NK_ALIGN_PTR_BACK(x, mask)\ (NK_UINT_TO_PTR((NK_PTR_TO_UINT((nk_byte*)(x)) & ~(mask-1)))) +#if defined(__GNUC__) || defined(__clang__) +#define NK_OFFSETOF(st,m) (__builtin_offsetof(st,m)) +#else #define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m)) -#define NK_CONTAINER_OF(ptr,type,member)\ - (type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member))) - -#ifdef __cplusplus -} #endif #ifdef __cplusplus @@ -5712,12 +5710,18 @@ template struct nk_helper{enum {value = nk_alignof::value};} template struct nk_alignof{struct Big {T x; char c;}; enum { diff = sizeof(Big) - sizeof(T), value = nk_helper::value};}; #define NK_ALIGNOF(t) (nk_alignof::value) -#elif defined(_MSC_VER) -#define NK_ALIGNOF(t) (__alignof(t)) #else -#define NK_ALIGNOF(t) ((char*)(&((struct {char c; t _h;}*)0)->_h) - (char*)0) +#define NK_ALIGNOF(t) NK_OFFSETOF(struct {char c; t _h;}, _h) #endif +#define NK_CONTAINER_OF(ptr,type,member)\ + (type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member))) + +#ifdef __cplusplus +} +#endif + + #endif /* NK_NUKLEAR_H_ */ #ifdef NK_IMPLEMENTATION @@ -29525,6 +29529,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible /// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles /// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET /// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings diff --git a/package.json b/package.json index 646c364..970e6c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.0", + "version": "4.08.1", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index ae3c726..92448cb 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible /// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles /// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET /// - 2021/08/15 (4.07.4) - Fix conversion and sign conversion warnings diff --git a/src/nuklear.h b/src/nuklear.h index 45fb747..65db6a1 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -5476,12 +5476,10 @@ struct nk_context { #define NK_ALIGN_PTR_BACK(x, mask)\ (NK_UINT_TO_PTR((NK_PTR_TO_UINT((nk_byte*)(x)) & ~(mask-1)))) +#if defined(__GNUC__) || defined(__clang__) +#define NK_OFFSETOF(st,m) (__builtin_offsetof(st,m)) +#else #define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m)) -#define NK_CONTAINER_OF(ptr,type,member)\ - (type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member))) - -#ifdef __cplusplus -} #endif #ifdef __cplusplus @@ -5491,10 +5489,16 @@ template struct nk_helper{enum {value = nk_alignof::value};} template struct nk_alignof{struct Big {T x; char c;}; enum { diff = sizeof(Big) - sizeof(T), value = nk_helper::value};}; #define NK_ALIGNOF(t) (nk_alignof::value) -#elif defined(_MSC_VER) -#define NK_ALIGNOF(t) (__alignof(t)) #else -#define NK_ALIGNOF(t) ((char*)(&((struct {char c; t _h;}*)0)->_h) - (char*)0) +#define NK_ALIGNOF(t) NK_OFFSETOF(struct {char c; t _h;}, _h) #endif +#define NK_CONTAINER_OF(ptr,type,member)\ + (type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member))) + +#ifdef __cplusplus +} +#endif + + #endif /* NK_NUKLEAR_H_ */ From a859103836b59aa16b30d17c3798d20d53f0e063 Mon Sep 17 00:00:00 2001 From: Phoenix Date: Wed, 8 Sep 2021 12:12:06 -0400 Subject: [PATCH 14/89] Fix canvas example not rendering fully on macOS (#288) --- example/canvas.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/example/canvas.c b/example/canvas.c index af8c397..ed7d833 100644 --- a/example/canvas.c +++ b/example/canvas.c @@ -477,7 +477,10 @@ int main(int argc, char *argv[]) canvas_end(&ctx, &canvas);} /* Draw */ - glfwGetWindowSize(win, &width, &height); + /* Framebuffer size is used instead of window size because the window size is in screen coordinates instead of pixels. + * See https://www.glfw.org/docs/latest/window_guide.html#window_size for more info + */ + glfwGetFramebufferSize(win, &width, &height); glViewport(0, 0, width, height); glClear(GL_COLOR_BUFFER_BIT); glClearColor(0.2f, 0.2f, 0.2f, 1.0f); From 73a2062d707735e06964e77d4d10007af0252089 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Mon, 30 Aug 2021 14:12:46 +0100 Subject: [PATCH 15/89] Fix warnings in C89 builds --- nuklear.h | 24 ++++++++++++++++-------- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_9slice.c | 12 ++++++------ src/nuklear_draw.c | 11 +++++++++-- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/nuklear.h b/nuklear.h index bcf0843..93e3d94 100644 --- a/nuklear.h +++ b/nuklear.h @@ -9220,6 +9220,7 @@ NK_API void nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r, const struct nk_nine_slice *slc, struct nk_color col) { + struct nk_image img; const struct nk_image *slcimg = (const struct nk_image*)slc; nk_ushort rgnX, rgnY, rgnW, rgnH; rgnX = slcimg->region[0]; @@ -9228,8 +9229,14 @@ nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r, rgnH = slcimg->region[3]; /* top-left */ - struct nk_image img = {slcimg->handle, slcimg->w, slcimg->h, - {rgnX, rgnY, slc->l, slc->t}}; + img.handle = slcimg->handle; + img.w = slcimg->w; + img.h = slcimg->h; + img.region[0] = rgnX; + img.region[1] = rgnY; + img.region[2] = slc->l; + img.region[3] = slc->t; + nk_draw_image(b, nk_rect(r.x, r.y, (float)slc->l, (float)slc->t), &img, col); @@ -23487,8 +23494,8 @@ NK_API struct nk_nine_slice nk_sub9slice_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle.ptr = ptr; i->w = w; i->h = h; i->region[0] = (nk_ushort)rgn.x; @@ -23502,8 +23509,8 @@ NK_API struct nk_nine_slice nk_sub9slice_id(int id, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle.id = id; i->w = w; i->h = h; i->region[0] = (nk_ushort)rgn.x; @@ -23517,8 +23524,8 @@ NK_API struct nk_nine_slice nk_sub9slice_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle = handle; i->w = w; i->h = h; i->region[0] = (nk_ushort)rgn.x; @@ -23532,8 +23539,8 @@ NK_API struct nk_nine_slice nk_nine_slice_handle(nk_handle handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle = handle; i->w = 0; i->h = 0; i->region[0] = 0; @@ -23547,8 +23554,8 @@ NK_API struct nk_nine_slice nk_nine_slice_ptr(void *ptr, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); NK_ASSERT(ptr); i->handle.ptr = ptr; i->w = 0; i->h = 0; @@ -23563,8 +23570,8 @@ NK_API struct nk_nine_slice nk_nine_slice_id(int id, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle.id = id; i->w = 0; i->h = 0; i->region[0] = 0; @@ -29529,6 +29536,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds /// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible /// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles /// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET diff --git a/package.json b/package.json index 970e6c4..288ded5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.1", + "version": "4.08.2", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 92448cb..2afb6bc 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds /// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible /// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles /// - 2021/08/16 (4.07.5) - Replace usage of memset in nk_font_atlas_bake with NK_MEMSET diff --git a/src/nuklear_9slice.c b/src/nuklear_9slice.c index ed8c67f..ae1bc22 100644 --- a/src/nuklear_9slice.c +++ b/src/nuklear_9slice.c @@ -10,8 +10,8 @@ NK_API struct nk_nine_slice nk_sub9slice_ptr(void *ptr, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle.ptr = ptr; i->w = w; i->h = h; i->region[0] = (nk_ushort)rgn.x; @@ -25,8 +25,8 @@ NK_API struct nk_nine_slice nk_sub9slice_id(int id, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle.id = id; i->w = w; i->h = h; i->region[0] = (nk_ushort)rgn.x; @@ -40,8 +40,8 @@ NK_API struct nk_nine_slice nk_sub9slice_handle(nk_handle handle, nk_ushort w, nk_ushort h, struct nk_rect rgn, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle = handle; i->w = w; i->h = h; i->region[0] = (nk_ushort)rgn.x; @@ -55,8 +55,8 @@ NK_API struct nk_nine_slice nk_nine_slice_handle(nk_handle handle, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle = handle; i->w = 0; i->h = 0; i->region[0] = 0; @@ -70,8 +70,8 @@ NK_API struct nk_nine_slice nk_nine_slice_ptr(void *ptr, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); NK_ASSERT(ptr); i->handle.ptr = ptr; i->w = 0; i->h = 0; @@ -86,8 +86,8 @@ NK_API struct nk_nine_slice nk_nine_slice_id(int id, nk_ushort l, nk_ushort t, nk_ushort r, nk_ushort b) { struct nk_nine_slice s; - nk_zero(&s, sizeof(s)); struct nk_image *i = &s.img; + nk_zero(&s, sizeof(s)); i->handle.id = id; i->w = 0; i->h = 0; i->region[0] = 0; diff --git a/src/nuklear_draw.c b/src/nuklear_draw.c index 30d278e..efdf9c5 100644 --- a/src/nuklear_draw.c +++ b/src/nuklear_draw.c @@ -418,6 +418,7 @@ NK_API void nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r, const struct nk_nine_slice *slc, struct nk_color col) { + struct nk_image img; const struct nk_image *slcimg = (const struct nk_image*)slc; nk_ushort rgnX, rgnY, rgnW, rgnH; rgnX = slcimg->region[0]; @@ -426,8 +427,14 @@ nk_draw_nine_slice(struct nk_command_buffer *b, struct nk_rect r, rgnH = slcimg->region[3]; /* top-left */ - struct nk_image img = {slcimg->handle, slcimg->w, slcimg->h, - {rgnX, rgnY, slc->l, slc->t}}; + img.handle = slcimg->handle; + img.w = slcimg->w; + img.h = slcimg->h; + img.region[0] = rgnX; + img.region[1] = rgnY; + img.region[2] = slc->l; + img.region[3] = slc->t; + nk_draw_image(b, nk_rect(r.x, r.y, (float)slc->l, (float)slc->t), &img, col); From 44b57076ba61eff626d5b2d7b5e8985045f324d4 Mon Sep 17 00:00:00 2001 From: ph3b3 Date: Sun, 12 Sep 2021 18:19:12 +1000 Subject: [PATCH 16/89] removed unneccessary whitespace from build --- doc/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/build.sh b/doc/build.sh index 560dd59..98fe196 100755 --- a/doc/build.sh +++ b/doc/build.sh @@ -1,4 +1,2 @@ #!/bin/sh cat ../nuklear.h|./doc > nuklear.html - - From 618008ee330472f9126da292ce92f58aec4f7746 Mon Sep 17 00:00:00 2001 From: ph3b3 Date: Sun, 12 Sep 2021 18:21:19 +1000 Subject: [PATCH 17/89] added page title --- doc/nuklear.html | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/nuklear.html b/doc/nuklear.html index fd94595..590dd63 100644 --- a/doc/nuklear.html +++ b/doc/nuklear.html @@ -1,5 +1,6 @@ +Nuklear # Nuklear ![](https://cloud.githubusercontent.com/assets/8057201/11761525/ae06f0ca-a0c6-11e5-819d-5610b25f6ef4.gif) ## Contents From f28e4827e5ffbdf9aa7cff232e86d96ea2471dc0 Mon Sep 17 00:00:00 2001 From: Komari Spaghetti <3759175+Hejsil@users.noreply.github.com> Date: Wed, 15 Sep 2021 16:38:03 +0200 Subject: [PATCH 18/89] Fix "Templates cannot be declared to have 'C' Linkage" --- nuklear.h | 8 +++++--- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear.h | 7 ++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nuklear.h b/nuklear.h index 93e3d94..d7ea569 100644 --- a/nuklear.h +++ b/nuklear.h @@ -5703,6 +5703,10 @@ struct nk_context { #define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m)) #endif +#ifdef __cplusplus +} +#endif + #ifdef __cplusplus template struct nk_alignof; template struct nk_helper{enum {value = size_diff};}; @@ -5717,9 +5721,6 @@ template struct nk_alignof{struct Big {T x; char c;}; enum { #define NK_CONTAINER_OF(ptr,type,member)\ (type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member))) -#ifdef __cplusplus -} -#endif #endif /* NK_NUKLEAR_H_ */ @@ -29536,6 +29537,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" /// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds /// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible /// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles diff --git a/package.json b/package.json index 288ded5..b478490 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.2", + "version": "4.08.3", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 2afb6bc..149a242 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" /// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds /// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible /// - 2021/08/17 (4.08.0) - Implemented 9-slice scaling support for widget styles diff --git a/src/nuklear.h b/src/nuklear.h index 65db6a1..55a670c 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -5482,6 +5482,10 @@ struct nk_context { #define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m)) #endif +#ifdef __cplusplus +} +#endif + #ifdef __cplusplus template struct nk_alignof; template struct nk_helper{enum {value = size_diff};}; @@ -5496,9 +5500,6 @@ template struct nk_alignof{struct Big {T x; char c;}; enum { #define NK_CONTAINER_OF(ptr,type,member)\ (type*)((void*)((char*)(1 ? (ptr): &((type*)0)->member) - NK_OFFSETOF(type, member))) -#ifdef __cplusplus -} -#endif #endif /* NK_NUKLEAR_H_ */ From 4be905921b10ca76a2ac24d22ba6766a761083c0 Mon Sep 17 00:00:00 2001 From: gpetersson Date: Wed, 15 Sep 2021 16:34:06 -0400 Subject: [PATCH 19/89] Fix "'num_len' may be used uninitialized" in nk_do_property --- nuklear.h | 3 ++- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_property.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nuklear.h b/nuklear.h index d7ea569..b978691 100644 --- a/nuklear.h +++ b/nuklear.h @@ -27621,7 +27621,7 @@ nk_do_property(nk_flags *ws, nk_filter_float }; nk_bool active, old; - int num_len, name_len; + int num_len = 0, name_len; char string[NK_MAX_NUMBER_BUFFER]; float size; @@ -29537,6 +29537,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property /// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" /// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds /// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible diff --git a/package.json b/package.json index b478490..f15d2bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.3", + "version": "4.08.4", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 149a242..cda2744 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property /// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" /// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds /// - 2021/09/08 (4.08.1) - Use compiler builtins for NK_OFFSETOF when possible diff --git a/src/nuklear_property.c b/src/nuklear_property.c index 1dbbde4..3470873 100644 --- a/src/nuklear_property.c +++ b/src/nuklear_property.c @@ -122,7 +122,7 @@ nk_do_property(nk_flags *ws, nk_filter_float }; nk_bool active, old; - int num_len, name_len; + int num_len = 0, name_len; char string[NK_MAX_NUMBER_BUFFER]; float size; From 7eaaccb929988877128a468d08390b3b8ff4f85e Mon Sep 17 00:00:00 2001 From: gpetersson Date: Wed, 22 Sep 2021 18:10:50 -0400 Subject: [PATCH 20/89] GCC __builtin_offsetof only exists in version 4 and later --- nuklear.h | 3 ++- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nuklear.h b/nuklear.h index b978691..3d26118 100644 --- a/nuklear.h +++ b/nuklear.h @@ -5697,7 +5697,7 @@ struct nk_context { #define NK_ALIGN_PTR_BACK(x, mask)\ (NK_UINT_TO_PTR((NK_PTR_TO_UINT((nk_byte*)(x)) & ~(mask-1)))) -#if defined(__GNUC__) || defined(__clang__) +#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__) #define NK_OFFSETOF(st,m) (__builtin_offsetof(st,m)) #else #define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m)) @@ -29537,6 +29537,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later /// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property /// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" /// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds diff --git a/package.json b/package.json index f15d2bf..cbb491a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.4", + "version": "4.08.5", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index cda2744..85e41a0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later /// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property /// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" /// - 2021/09/08 (4.08.2) - Fix warnings in C89 builds diff --git a/src/nuklear.h b/src/nuklear.h index 55a670c..c195690 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -5476,7 +5476,7 @@ struct nk_context { #define NK_ALIGN_PTR_BACK(x, mask)\ (NK_UINT_TO_PTR((NK_PTR_TO_UINT((nk_byte*)(x)) & ~(mask-1)))) -#if defined(__GNUC__) || defined(__clang__) +#if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__clang__) #define NK_OFFSETOF(st,m) (__builtin_offsetof(st,m)) #else #define NK_OFFSETOF(st,m) ((nk_ptr)&(((st*)0)->m)) From cd731ae558fc997793231d781e464e418345e229 Mon Sep 17 00:00:00 2001 From: Michael Aganier Date: Sun, 26 Sep 2021 09:11:25 -0400 Subject: [PATCH 21/89] Fix "may be used uninitialized" warnings in nk_widget --- nuklear.h | 5 ++++- package.json | 2 +- src/CHANGELOG | 1 + src/nuklear_layout.c | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nuklear.h b/nuklear.h index 3d26118..7c950e0 100644 --- a/nuklear.h +++ b/nuklear.h @@ -22128,8 +22128,10 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) NK_ASSERT(ctx); NK_ASSERT(ctx->current); NK_ASSERT(ctx->current->layout); - if (!ctx || !ctx->current || !ctx->current->layout) + if (!ctx || !ctx->current || !ctx->current->layout) { + *bounds = nk_rect(0,0,0,0); return; + } win = ctx->current; layout = win->layout; @@ -29537,6 +29539,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later /// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property /// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" diff --git a/package.json b/package.json index cbb491a..6acf1fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.5", + "version": "4.08.6", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 85e41a0..b88b388 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later /// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property /// - 2021/09/15 (4.08.3) - Fix "Templates cannot be declared to have 'C' Linkage" diff --git a/src/nuklear_layout.c b/src/nuklear_layout.c index 1c4b1ec..bfd99c2 100644 --- a/src/nuklear_layout.c +++ b/src/nuklear_layout.c @@ -740,8 +740,10 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) NK_ASSERT(ctx); NK_ASSERT(ctx->current); NK_ASSERT(ctx->current->layout); - if (!ctx || !ctx->current || !ctx->current->layout) + if (!ctx || !ctx->current || !ctx->current->layout) { + *bounds = nk_rect(0,0,0,0); return; + } win = ctx->current; layout = win->layout; From a37a5633156f032754e7aa32915aa5733c0cc292 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Sat, 9 Oct 2021 19:52:00 -0700 Subject: [PATCH 22/89] Add select all shortcut to glfw4 demo --- demo/glfw_opengl4/nuklear_glfw_gl4.h | 1 + 1 file changed, 1 insertion(+) diff --git a/demo/glfw_opengl4/nuklear_glfw_gl4.h b/demo/glfw_opengl4/nuklear_glfw_gl4.h index e6af210..4b644a4 100644 --- a/demo/glfw_opengl4/nuklear_glfw_gl4.h +++ b/demo/glfw_opengl4/nuklear_glfw_gl4.h @@ -608,6 +608,7 @@ nk_glfw3_new_frame(void) nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, glfwGetKey(win, GLFW_KEY_RIGHT) == GLFW_PRESS); nk_input_key(ctx, NK_KEY_TEXT_LINE_START, glfwGetKey(win, GLFW_KEY_B) == GLFW_PRESS); nk_input_key(ctx, NK_KEY_TEXT_LINE_END, glfwGetKey(win, GLFW_KEY_E) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TEXT_SELECT_ALL, glfwGetKey(win, GLFW_KEY_A) == GLFW_PRESS); } else { nk_input_key(ctx, NK_KEY_LEFT, glfwGetKey(win, GLFW_KEY_LEFT) == GLFW_PRESS); nk_input_key(ctx, NK_KEY_RIGHT, glfwGetKey(win, GLFW_KEY_RIGHT) == GLFW_PRESS); From ff62698de8e7e94797cff380f4e84ecb9ec19d96 Mon Sep 17 00:00:00 2001 From: Joel Davis Date: Wed, 15 Sep 2021 20:21:59 -0700 Subject: [PATCH 23/89] Added nk_spacer to help adjusting layout --- nuklear.h | 22 ++++++++++++++++++++++ package.json | 2 +- src/CHANGELOG | 1 + src/nuklear.h | 15 +++++++++++++++ src/nuklear_layout.c | 6 ++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index 7c950e0..e125865 100644 --- a/nuklear.h +++ b/nuklear.h @@ -2577,6 +2577,21 @@ NK_API struct nk_rect nk_layout_space_rect_to_screen(struct nk_context*, struct /// Returns transformed `nk_rect` in layout space coordinates */ NK_API struct nk_rect nk_layout_space_rect_to_local(struct nk_context*, struct nk_rect); + +/*/// #### nk_spacer +/// Spacer is a dummy widget that consumes space as usual but doesn't draw anything +/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +/// void nk_spacer(struct nk_context* ); +/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/// +/// Parameter | Description +/// ------------|----------------------------------------------------------- +/// __ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +/// +*/ +NK_API void nk_spacer(struct nk_context* ); + + /* ============================================================================= * * GROUP @@ -22148,6 +22163,12 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) layout->at_y = y; layout->row.index = index; } +NK_API void +nk_spacer(struct nk_context *ctx ) +{ + struct nk_rect dummy_rect = {0}; + nk_panel_alloc_space( &dummy_rect, ctx ); +} @@ -29539,6 +29560,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/10/16 (4.09.0) - Added nk_spacer() widget /// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later /// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property diff --git a/package.json b/package.json index 6acf1fe..65aa3eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.08.6", + "version": "4.09.0", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index b88b388..ce587c8 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/10/16 (4.09.0) - Added nk_spacer() widget /// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later /// - 2021/09/15 (4.08.4) - Fix "'num_len' may be used uninitialized" in nk_do_property diff --git a/src/nuklear.h b/src/nuklear.h index c195690..89a75b6 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -2356,6 +2356,21 @@ NK_API struct nk_rect nk_layout_space_rect_to_screen(struct nk_context*, struct /// Returns transformed `nk_rect` in layout space coordinates */ NK_API struct nk_rect nk_layout_space_rect_to_local(struct nk_context*, struct nk_rect); + +/*/// #### nk_spacer +/// Spacer is a dummy widget that consumes space as usual but doesn't draw anything +/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +/// void nk_spacer(struct nk_context* ); +/// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/// +/// Parameter | Description +/// ------------|----------------------------------------------------------- +/// __ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +/// +*/ +NK_API void nk_spacer(struct nk_context* ); + + /* ============================================================================= * * GROUP diff --git a/src/nuklear_layout.c b/src/nuklear_layout.c index bfd99c2..b737aca 100644 --- a/src/nuklear_layout.c +++ b/src/nuklear_layout.c @@ -760,4 +760,10 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) layout->at_y = y; layout->row.index = index; } +NK_API void +nk_spacer(struct nk_context *ctx ) +{ + struct nk_rect dummy_rect = {0}; + nk_panel_alloc_space( &dummy_rect, ctx ); +} From 019df39478d37ed379d400924e3a8bad9d011de6 Mon Sep 17 00:00:00 2001 From: Andrew Kravchuk Date: Tue, 2 Nov 2021 19:22:01 +0300 Subject: [PATCH 24/89] Fix warning in Allegro5 demo --- demo/allegro5/nuklear_allegro5.h | 1 + 1 file changed, 1 insertion(+) diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h index f697317..df45ced 100644 --- a/demo/allegro5/nuklear_allegro5.h +++ b/demo/allegro5/nuklear_allegro5.h @@ -98,6 +98,7 @@ NK_API void nk_allegro5_del_image(struct nk_image* image) static float nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text, int len) { + (void)height; NkAllegro5Font *font = (NkAllegro5Font*)handle.ptr; if (!font || !text) { return 0; From 297e463d378427fbd989731ee30f1d4c06bffc01 Mon Sep 17 00:00:00 2001 From: luz paz Date: Tue, 30 Nov 2021 21:45:48 -0500 Subject: [PATCH 25/89] Fix various typos Found via `codespell -q 3 -L acount,modifyable,nd,pixelx,seperator,te,vertexes` --- Readme.md | 4 +- demo/overview.c | 2 +- demo/x11_opengl3/nuklear_xlib_gl3.h | 2 +- doc/nuklear.html | 108 ++++++++++++------------ doc/stddoc.c | 2 +- example/stb_image.h | 12 +-- nuklear.h | 122 ++++++++++++++-------------- src/CHANGELOG | 22 ++--- src/HEADER | 2 +- src/nuklear.h | 86 ++++++++++---------- src/nuklear_vertex.c | 8 +- src/stb_rect_pack.h | 2 +- src/stb_truetype.h | 2 +- 13 files changed, 187 insertions(+), 187 deletions(-) diff --git a/Readme.md b/Readme.md index 3d42f2d..446b853 100644 --- a/Readme.md +++ b/Readme.md @@ -92,7 +92,7 @@ nk_end(&ctx); ![example](https://cloud.githubusercontent.com/assets/8057201/10187981/584ecd68-675c-11e5-897c-822ef534a876.png) ## Bindings -There are a number of nuklear bindings for different languges created by other authors. +There are a number of nuklear bindings for different languages created by other authors. I cannot attest for their quality since I am not necessarily proficient in any of these languages. Furthermore there are no guarantee that all bindings will always be kept up to date: @@ -185,7 +185,7 @@ Reviewing changes to `src/*` and `nuklear.h`: * Variable/function name casing. * Indentation. * Curly bracket (`{}`) placement. -* Ensure that the contributer have bumped the appropriate version in +* Ensure that the contributor has bumped the appropriate version in [package.json](https://github.com/Immediate-Mode-UI/Nuklear/blob/master/package.json) and added their changes to the [CHANGELOG](https://github.com/Immediate-Mode-UI/Nuklear/blob/master/src/CHANGELOG). diff --git a/demo/overview.c b/demo/overview.c index 5d8dadc..afd182d 100644 --- a/demo/overview.c +++ b/demo/overview.c @@ -765,7 +765,7 @@ overview(struct nk_context *ctx) if (nk_popup_begin(ctx, NK_POPUP_STATIC, "Error", 0, s)) { nk_layout_row_dynamic(ctx, 25, 1); - nk_label(ctx, "A terrible error as occured", NK_TEXT_LEFT); + nk_label(ctx, "A terrible error as occurred", NK_TEXT_LEFT); nk_layout_row_dynamic(ctx, 25, 2); if (nk_button_label(ctx, "OK")) { popup_active = 0; diff --git a/demo/x11_opengl3/nuklear_xlib_gl3.h b/demo/x11_opengl3/nuklear_xlib_gl3.h index 44d9335..bc25109 100644 --- a/demo/x11_opengl3/nuklear_xlib_gl3.h +++ b/demo/x11_opengl3/nuklear_xlib_gl3.h @@ -265,7 +265,7 @@ nk_load_opengl(struct opengl_info *gl) glGetIntegerv(GL_MAJOR_VERSION, &gl->major_version); glGetIntegerv(GL_MINOR_VERSION, &gl->minor_version); if (gl->major_version < 2) { - fprintf(stderr, "[GL]: Graphics card does not fullfill minimum OpenGL 2.0 support\n"); + fprintf(stderr, "[GL]: Graphics card does not fulfill minimum OpenGL 2.0 support\n"); return 0; } gl->version = (float)gl->major_version + (float)gl->minor_version * 0.1f; diff --git a/doc/nuklear.html b/doc/nuklear.html index fd94595..89336a4 100644 --- a/doc/nuklear.html +++ b/doc/nuklear.html @@ -72,7 +72,7 @@ in header only mode or in implementation mode. The header only mode is used by default when included and allows including this header in other headers and does not contain the actual implementation.

The implementation mode requires to define the preprocessor macro -NK_IMPLEMENTATION in *one* .c/.cpp file before #includeing this file, e.g.: +NK_IMPLEMENTATION in *one* .c/.cpp file before #including this file, e.g.: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~C #define NK_IMPLEMENTATION #include "nuklear.h" @@ -320,7 +320,7 @@ while (GetEvent(&evt)) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #### Usage Input state needs to be provided to nuklear by first calling `nk_input_begin` -which resets internal state like delta mouse position and button transistions. +which resets internal state like delta mouse position and button transitions. After `nk_input_begin` all current input state needs to be provided. This includes mouse motion, button and key pressed and released, text input and scrolling. Both event- or state-based input handling are supported by this API @@ -718,7 +718,7 @@ NK_CONVERT_SUCCESS | Signals a successful draw command to vertex bu NK_CONVERT_INVALID_PARAM | An invalid argument was passed in the function call NK_CONVERT_COMMAND_BUFFER_FULL | The provided buffer for storing draw commands is full or failed to allocate more memory NK_CONVERT_VERTEX_BUFFER_FULL | The provided buffer for storing vertices is full or failed to allocate more memory -NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indicies is full or failed to allocate more memory +NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indices is full or failed to allocate more memory #### nk__draw_begin Returns a draw vertex command buffer iterator to iterate over the vertex draw command buffer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c @@ -883,8 +883,8 @@ NK_WINDOW_NO_INPUT | Prevents window of scaling, moving or getting focu #### nk_collapse_states State | Description ----------------|----------------------------------------------------------- -__NK_MINIMIZED__| UI section is collased and not visibile until maximized -__NK_MAXIMIZED__| UI section is extended and visibile until minimized +__NK_MINIMIZED__| UI section is collased and not visible until maximized +__NK_MAXIMIZED__| UI section is extended and visible until minimized

#### nk_begin Starts a new window; needs to be called every frame for every @@ -1744,7 +1744,7 @@ is required to check the return value of `nk_group_begin_xxx` and only process widgets inside the window if the value is not 0. Nesting groups is possible and even encouraged since many layouting schemes can only be achieved by nesting. Groups, unlike windows, need `nk_group_end` -to be only called if the corosponding `nk_group_begin_xxx` call does not return 0: +to be only called if the corresponding `nk_group_begin_xxx` call does not return 0: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c if (nk_group_begin_xxx(ctx, ...) { // [... widgets ...] @@ -1801,7 +1801,7 @@ nk_free(&ctx); Function | Description --------------------------------|------------------------------------------- nk_group_begin | Start a new group with internal scrollbar handling -nk_group_begin_titled | Start a new group with separeted name and title and internal scrollbar handling +nk_group_begin_titled | Start a new group with separated name and title and internal scrollbar handling nk_group_end | Ends a group. Should only be called if nk_group_begin returned non-zero nk_group_scrolled_offset_begin | Start a new group with manual separated handling of scrollbar x- and y-offset nk_group_scrolled_begin | Start a new group with manual scrollbar handling @@ -1897,12 +1897,12 @@ __id__ | The id of the group to scroll __x_offset__ | The x offset to scroll to __y_offset__ | The y offset to scroll to ### Tree -Trees represent two different concept. First the concept of a collapsable -UI section that can be either in a hidden or visibile state. They allow the UI +Trees represent two different concept. First the concept of a collapsible +UI section that can be either in a hidden or visible state. They allow the UI user to selectively minimize the current set of visible UI to comprehend. The second concept are tree widgets for visual UI representation of trees.

Trees thereby can be nested for tree representations and multiple nested -collapsable UI sections. All trees are started by calling of the +collapsible UI sections. All trees are started by calling of the `nk_tree_xxx_push_tree` functions and ended by calling one of the `nk_tree_xxx_pop_xxx()` functions. Each starting functions takes a title label and optionally an image to be displayed and the initial collapse state from @@ -1915,7 +1915,7 @@ function `nk_tree_push_id` or completely provided from outside by user with function `nk_tree_push_hashed`. #### Usage To create a tree you have to call one of the seven `nk_tree_xxx_push_xxx` -functions to start a collapsable UI section and `nk_tree_xxx_pop` to mark the +functions to start a collapsible UI section and `nk_tree_xxx_pop` to mark the end. Each starting function will either return `false(0)` if the tree is collapsed or hidden and therefore does not need to be filled with content or `true(1)` @@ -1936,25 +1936,25 @@ if (nk_tree_push(ctx, NK_TREE_TAB, "Tree", NK_MINIMIZED)) { #### Reference Function | Description ----------------------------|------------------------------------------- -nk_tree_push | Start a collapsable UI section with internal state management -nk_tree_push_id | Start a collapsable UI section with internal state management callable in a look -nk_tree_push_hashed | Start a collapsable UI section with internal state management with full control over internal unique ID use to store state -nk_tree_image_push | Start a collapsable UI section with image and label header -nk_tree_image_push_id | Start a collapsable UI section with image and label header and internal state management callable in a look -nk_tree_image_push_hashed | Start a collapsable UI section with image and label header and internal state management with full control over internal unique ID use to store state -nk_tree_pop | Ends a collapsable UI section -nk_tree_state_push | Start a collapsable UI section with external state management -nk_tree_state_image_push | Start a collapsable UI section with image and label header and external state management +nk_tree_push | Start a collapsible UI section with internal state management +nk_tree_push_id | Start a collapsible UI section with internal state management callable in a look +nk_tree_push_hashed | Start a collapsible UI section with internal state management with full control over internal unique ID use to store state +nk_tree_image_push | Start a collapsible UI section with image and label header +nk_tree_image_push_id | Start a collapsible UI section with image and label header and internal state management callable in a look +nk_tree_image_push_hashed | Start a collapsible UI section with image and label header and internal state management with full control over internal unique ID use to store state +nk_tree_pop | Ends a collapsible UI section +nk_tree_state_push | Start a collapsible UI section with external state management +nk_tree_state_image_push | Start a collapsible UI section with image and label header and external state management nk_tree_state_pop | Ends a collapsabale UI section #### nk_tree_type Flag | Description ----------------|---------------------------------------- -NK_TREE_NODE | Highlighted tree header to mark a collapsable UI section -NK_TREE_TAB | Non-highighted tree header closer to tree representations +NK_TREE_NODE | Highlighted tree header to mark a collapsible UI section +NK_TREE_TAB | Non-highlighted tree header closer to tree representations #### nk_tree_push -Starts a collapsable UI section with internal state management +Starts a collapsible UI section with internal state management !!! WARNING - To keep track of the runtime tree collapsable state this function uses + To keep track of the runtime tree collapsible state this function uses defines `__FILE__` and `__LINE__` to generate a unique ID. If you want to call this function in a loop please use `nk_tree_push_id` or `nk_tree_push_hashed` instead. @@ -1969,7 +1969,7 @@ __title__ | Label printed in the tree header __state__ | Initial tree state value out of nk_collapse_states Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise #### nk_tree_push_id -Starts a collapsable UI section with internal state management callable in a look +Starts a collapsible UI section with internal state management callable in a look ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c #define nk_tree_push_id(ctx, type, title, state, id) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1982,7 +1982,7 @@ __state__ | Initial tree state value out of nk_collapse_states __id__ | Loop counter index if this function is called in a loop Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise #### nk_tree_push_hashed -Start a collapsable UI section with internal state management with full +Start a collapsible UI section with internal state management with full control over internal unique ID used to store state ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c int nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); @@ -1998,9 +1998,9 @@ __len__ | Size of passed memory block or string in __hash__ __seed__ | Seeding value if this function is called in a loop or default to `0` Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise #### nk_tree_image_push -Start a collapsable UI section with image and label header +Start a collapsible UI section with image and label header !!! WARNING - To keep track of the runtime tree collapsable state this function uses + To keep track of the runtime tree collapsible state this function uses defines `__FILE__` and `__LINE__` to generate a unique ID. If you want to call this function in a loop please use `nk_tree_image_push_id` or `nk_tree_image_push_hashed` instead. @@ -2016,7 +2016,7 @@ __title__ | Label printed in the tree header __state__ | Initial tree state value out of nk_collapse_states Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise #### nk_tree_image_push_id -Start a collapsable UI section with image and label header and internal state +Start a collapsible UI section with image and label header and internal state management callable in a look ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c #define nk_tree_image_push_id(ctx, type, img, title, state, id) @@ -2031,7 +2031,7 @@ __state__ | Initial tree state value out of nk_collapse_states __id__ | Loop counter index if this function is called in a loop Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise #### nk_tree_image_push_hashed -Start a collapsable UI section with internal state management with full +Start a collapsible UI section with internal state management with full control over internal unique ID used to store state ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c int nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); @@ -2056,7 +2056,7 @@ Parameter | Description ------------|----------------------------------------------------------- __ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` #### nk_tree_state_push -Start a collapsable UI section with external state management +Start a collapsible UI section with external state management ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c int nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2068,7 +2068,7 @@ __title__ | Label printed in the tree header __state__ | Persistent state to update Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise #### nk_tree_state_image_push -Start a collapsable UI section with image and label header and external state management +Start a collapsible UI section with image and label header and external state management ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c int nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2093,10 +2093,10 @@ Properties are the main value modification widgets in Nuklear. Changing a value can be achieved by dragging, adding/removing incremental steps on button click or by directly typing a number. #### Usage -Each property requires a unique name for identifaction that is also used for +Each property requires a unique name for identification that is also used for displaying a label. If you want to use the same name multiple times make sure add a '#' before your name. The '#' will not be shown but will generate a -unique ID. Each propery also takes in a minimum and maximum value. If you want +unique ID. Each property also takes in a minimum and maximum value. If you want to make use of the complete number range of a type just use the provided type limits from `limits.h`. For example `INT_MIN` and `INT_MAX` for `nk_property_int` and `nk_propertyi`. In additional each property takes in @@ -2148,14 +2148,14 @@ nk_free(&ctx); #### Reference Function | Description --------------------|------------------------------------------- -nk_property_int | Integer property directly modifing a passed in value -nk_property_float | Float property directly modifing a passed in value -nk_property_double | Double property directly modifing a passed in value +nk_property_int | Integer property directly modifying a passed in value +nk_property_float | Float property directly modifying a passed in value +nk_property_double | Double property directly modifying a passed in value nk_propertyi | Integer property returning the modified int value nk_propertyf | Float property returning the modified float value nk_propertyd | Double property returning the modified double value #### nk_property_int -Integer property directly modifing a passed in value +Integer property directly modifying a passed in value !!! WARNING To generate a unique property ID using the same label make sure to insert a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -2172,7 +2172,7 @@ __max__ | Maximum value not allowed to be overflown __step__ | Increment added and subtracted on increment and decrement button __inc_per_pixel__ | Value per pixel added or subtracted on dragging #### nk_property_float -Float property directly modifing a passed in value +Float property directly modifying a passed in value !!! WARNING To generate a unique property ID using the same label make sure to insert a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -2189,7 +2189,7 @@ __max__ | Maximum value not allowed to be overflown __step__ | Increment added and subtracted on increment and decrement button __inc_per_pixel__ | Value per pixel added or subtracted on dragging #### nk_property_double -Double property directly modifing a passed in value +Double property directly modifying a passed in value !!! WARNING To generate a unique property ID using the same label make sure to insert a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -2206,7 +2206,7 @@ __max__ | Maximum value not allowed to be overflown __step__ | Increment added and subtracted on increment and decrement button __inc_per_pixel__ | Value per pixel added or subtracted on dragging #### nk_propertyi -Integer property modifing a passed in value and returning the new value +Integer property modifying a passed in value and returning the new value !!! WARNING To generate a unique property ID using the same label make sure to insert a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -2224,7 +2224,7 @@ __step__ | Increment added and subtracted on increment and decrement __inc_per_pixel__ | Value per pixel added or subtracted on dragging Returns the new modified integer value #### nk_propertyf -Float property modifing a passed in value and returning the new value +Float property modifying a passed in value and returning the new value !!! WARNING To generate a unique property ID using the same label make sure to insert a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -2242,7 +2242,7 @@ __step__ | Increment added and subtracted on increment and decrement __inc_per_pixel__ | Value per pixel added or subtracted on dragging Returns the new modified float value #### nk_propertyd -Float property modifing a passed in value and returning the new value +Float property modifying a passed in value and returning the new value !!! WARNING To generate a unique property ID using the same label make sure to insert a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -2341,7 +2341,7 @@ X...XXXXXXXXXXXXX...X - " - 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process. - 2018/01/31 (3.00.4) - Removed name collision with stb_truetype. - 2018/01/28 (3.00.3) - Fixed panel window border drawing bug. -- 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separed group identifier and title. +- 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separated group identifier and title. - 2018/01/07 (3.00.1) - Started to change documentation style. - 2018/01/05 (3.00.0) - BREAKING CHANGE: The previous color picker API was broken because of conversions between float and byte color representation. @@ -2352,13 +2352,13 @@ X...XXXXXXXXXXXXX...X - " - 2017/12/23 (2.00.7) - Fixed small warning. - 2017/12/23 (2.00.7) - Fixed `nk_edit_buffer` behavior if activated to allow input. - 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior. -- 2017/12/04 (2.00.6) - Added formated string tooltip widget. +- 2017/12/04 (2.00.6) - Added formatted string tooltip widget. - 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag `NK_WINDOW_NO_INPUT`. - 2017/11/15 (2.00.4) - Fixed font merging. - 2017/11/07 (2.00.3) - Fixed window size and position modifier functions. - 2017/09/14 (2.00.2) - Fixed `nk_edit_buffer` and `nk_edit_focus` behavior. - 2017/09/14 (2.00.1) - Fixed window closing behavior. -- 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifing window position and size funtions now +- 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifying window position and size functions now require the name of the window and must happen outside the window building process (between function call nk_begin and nk_end). - 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last. @@ -2385,7 +2385,7 @@ X...XXXXXXXXXXXXX...X - " - 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a `nk_layout_xxx` function. - 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer. - 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped. -- 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundries. +- 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundaries. - 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space. - 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size. - 2017/05/06 (1.38.0) - Added platform double-click support. @@ -2402,7 +2402,7 @@ X...XXXXXXXXXXXXX...X - " - 2017/03/04 (1.34.2) - Fixed text edit filtering. - 2017/03/04 (1.34.1) - Fixed group closable flag. - 2017/02/25 (1.34.0) - Added custom draw command for better language binding support. -- 2017/01/24 (1.33.0) - Added programatic way of remove edit focus. +- 2017/01/24 (1.33.0) - Added programmatic way to remove edit focus. - 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows. - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows. - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing. @@ -2447,7 +2447,7 @@ X...XXXXXXXXXXXXX...X - " text in every edit widget if one of them is scrolled. - 2016/09/28 (1.22.3) - Fixed small bug in edit widgets if not active. The wrong text length is passed. It should have been in bytes but - was passed as glyphes. + was passed as glyphs. - 2016/09/20 (1.22.2) - Fixed color button size calculation. - 2016/09/20 (1.22.1) - Fixed some `nk_vsnprintf` behavior bugs and removed `` again from `NK_INCLUDE_STANDARD_VARARGS`. @@ -2527,13 +2527,13 @@ X...XXXXXXXXXXXXX...X - " - 2016/08/16 (1.09.5) - Fixed ROM mode for deeper levels of popup windows parents. - 2016/08/15 (1.09.4) - Editbox are now still active if enter was pressed with flag `NK_EDIT_SIG_ENTER`. Main reasoning is to be able to keep - typing after commiting. + typing after committing. - 2016/08/15 (1.09.4) - Removed redundant code. - 2016/08/15 (1.09.4) - Fixed negative numbers in `nk_strtoi` and remove unused variable. - 2016/08/15 (1.09.3) - Fixed `NK_WINDOW_BACKGROUND` flag behavior to select a background window only as selected by hovering and not by clicking. - 2016/08/14 (1.09.2) - Fixed a bug in font atlas which caused wrong loading - of glyphes for font with multiple ranges. + of glyphs for font with multiple ranges. - 2016/08/12 (1.09.1) - Added additional function to check if window is currently hidden and therefore not visible. - 2016/08/12 (1.09.1) - nk_window_is_closed now queries the correct flag `NK_WINDOW_CLOSED` @@ -2549,8 +2549,8 @@ X...XXXXXXXXXXXXX...X - " precision. - 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`. - 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading - to wrong wiget width calculation which results in widgets falsly - becomming tagged as not inside window and cannot be accessed. + to wrong wiget width calculation which results in widgets falsely + becoming tagged as not inside window and cannot be accessed. - 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown by using `nk_window_show` and closed by either clicking the close @@ -2597,7 +2597,7 @@ X...XXXXXXXXXXXXX...X - " - 2016/07/15 (1.01.0) - Removed internal font baking API and simplified font atlas memory management by converting pointer arrays for fonts and font configurations to lists. -- 2016/07/15 (1.00.0) - Changed button API to use context dependend button +- 2016/07/15 (1.00.0) - Changed button API to use context dependent button behavior instead of passing it for every function call. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## Gallery diff --git a/doc/stddoc.c b/doc/stddoc.c index 461ddc1..2f7661a 100644 --- a/doc/stddoc.c +++ b/doc/stddoc.c @@ -71,7 +71,7 @@ int main() { /// 1. Numbered /// 1. List! /// -/// Symbol substitutions: a 45-degree turn; som x -> y arrows; some whoa ==> fancy <==> arrows. +/// Symbol substitutions: a 45-degree turn; some x -> y arrows; some whoa ==> fancy <==> arrows. /// /// Is this a definition list? /// : Looks like one to me diff --git a/example/stb_image.h b/example/stb_image.h index 0a9de39..1f4d468 100644 --- a/example/stb_image.h +++ b/example/stb_image.h @@ -4081,13 +4081,13 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r // we make a separate pass to expand bits to pixels; for performance, // this could run two scanlines behind the above code, so it won't - // intefere with filtering but will still be in the cache. + // interfere with filtering but will still be in the cache. if (depth < 8) { for (j=0; j < y; ++j) { stbi_uc *cur = a->out + stride*j; stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit - // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop + // png guarantee byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range // note that the final byte might overshoot and write more data than desired. @@ -4231,7 +4231,7 @@ static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n); if (p == NULL) return stbi__err("outofmem", "Out of memory"); - // between here and free(out) below, exitting would leak + // between here and free(out) below, exiting would leak temp_out = p; if (pal_img_n == 3) { @@ -4899,7 +4899,7 @@ static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int int RLE_repeating = 0; int read_next_pixel = 1; - // do a tiny bit of precessing + // do a tiny bit of processing if ( tga_image_type >= 8 ) { tga_image_type -= 8; @@ -5161,7 +5161,7 @@ static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int // Else if n is 128, noop. // Endloop - // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data, + // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, // which we're going to just skip. stbi__skip(s, h * channelCount * 2 ); @@ -6429,7 +6429,7 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int 1.31 (2011-06-20) a few more leak fixes, bug in PNG handling (SpartanJ) 1.30 (2011-06-11) - added ability to load files via callbacks to accomidate custom input streams (Ben Wenger) + added ability to load files via callbacks to accommodate custom input streams (Ben Wenger) removed deprecated format-specific test/load functions removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) diff --git a/nuklear.h b/nuklear.h index e125865..ecc3beb 100644 --- a/nuklear.h +++ b/nuklear.h @@ -77,7 +77,7 @@ /// and does not contain the actual implementation.

/// /// The implementation mode requires to define the preprocessor macro -/// NK_IMPLEMENTATION in *one* .c/.cpp file before #includeing this file, e.g.: +/// NK_IMPLEMENTATION in *one* .c/.cpp file before #including this file, e.g.: /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~C /// #define NK_IMPLEMENTATION @@ -712,7 +712,7 @@ NK_API void nk_set_user_data(struct nk_context*, nk_handle handle); /// /// #### Usage /// Input state needs to be provided to nuklear by first calling `nk_input_begin` -/// which resets internal state like delta mouse position and button transistions. +/// which resets internal state like delta mouse position and button transitions. /// After `nk_input_begin` all current input state needs to be provided. This includes /// mouse motion, button and key pressed and released, text input and scrolling. /// Both event- or state-based input handling are supported by this API @@ -1255,7 +1255,7 @@ NK_API const struct nk_command* nk__next(struct nk_context*, const struct nk_com /// NK_CONVERT_INVALID_PARAM | An invalid argument was passed in the function call /// NK_CONVERT_COMMAND_BUFFER_FULL | The provided buffer for storing draw commands is full or failed to allocate more memory /// NK_CONVERT_VERTEX_BUFFER_FULL | The provided buffer for storing vertices is full or failed to allocate more memory -/// NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indicies is full or failed to allocate more memory +/// NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indices is full or failed to allocate more memory */ NK_API nk_flags nk_convert(struct nk_context*, struct nk_buffer *cmds, struct nk_buffer *vertices, struct nk_buffer *elements, const struct nk_convert_config*); /*/// #### nk__draw_begin @@ -1462,8 +1462,8 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* /// #### nk_collapse_states /// State | Description /// ----------------|----------------------------------------------------------- -/// __NK_MINIMIZED__| UI section is collased and not visibile until maximized -/// __NK_MAXIMIZED__| UI section is extended and visibile until minimized +/// __NK_MINIMIZED__| UI section is collased and not visible until maximized +/// __NK_MAXIMIZED__| UI section is extended and visible until minimized ///

*/ enum nk_panel_flags { @@ -2612,7 +2612,7 @@ NK_API void nk_spacer(struct nk_context* ); /// widgets inside the window if the value is not 0. /// Nesting groups is possible and even encouraged since many layouting schemes /// can only be achieved by nesting. Groups, unlike windows, need `nk_group_end` -/// to be only called if the corosponding `nk_group_begin_xxx` call does not return 0: +/// to be only called if the corresponding `nk_group_begin_xxx` call does not return 0: /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// if (nk_group_begin_xxx(ctx, ...) { @@ -2672,7 +2672,7 @@ NK_API void nk_spacer(struct nk_context* ); /// Function | Description /// --------------------------------|------------------------------------------- /// nk_group_begin | Start a new group with internal scrollbar handling -/// nk_group_begin_titled | Start a new group with separeted name and title and internal scrollbar handling +/// nk_group_begin_titled | Start a new group with separated name and title and internal scrollbar handling /// nk_group_end | Ends a group. Should only be called if nk_group_begin returned non-zero /// nk_group_scrolled_offset_begin | Start a new group with manual separated handling of scrollbar x- and y-offset /// nk_group_scrolled_begin | Start a new group with manual scrollbar handling @@ -2802,13 +2802,13 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of * * ============================================================================= /// ### Tree -/// Trees represent two different concept. First the concept of a collapsable -/// UI section that can be either in a hidden or visibile state. They allow the UI +/// Trees represent two different concept. First the concept of a collapsible +/// UI section that can be either in a hidden or visible state. They allow the UI /// user to selectively minimize the current set of visible UI to comprehend. /// The second concept are tree widgets for visual UI representation of trees.

/// /// Trees thereby can be nested for tree representations and multiple nested -/// collapsable UI sections. All trees are started by calling of the +/// collapsible UI sections. All trees are started by calling of the /// `nk_tree_xxx_push_tree` functions and ended by calling one of the /// `nk_tree_xxx_pop_xxx()` functions. Each starting functions takes a title label /// and optionally an image to be displayed and the initial collapse state from @@ -2823,7 +2823,7 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of /// /// #### Usage /// To create a tree you have to call one of the seven `nk_tree_xxx_push_xxx` -/// functions to start a collapsable UI section and `nk_tree_xxx_pop` to mark the +/// functions to start a collapsible UI section and `nk_tree_xxx_pop` to mark the /// end. /// Each starting function will either return `false(0)` if the tree is collapsed /// or hidden and therefore does not need to be filled with content or `true(1)` @@ -2848,28 +2848,28 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of /// #### Reference /// Function | Description /// ----------------------------|------------------------------------------- -/// nk_tree_push | Start a collapsable UI section with internal state management -/// nk_tree_push_id | Start a collapsable UI section with internal state management callable in a look -/// nk_tree_push_hashed | Start a collapsable UI section with internal state management with full control over internal unique ID use to store state -/// nk_tree_image_push | Start a collapsable UI section with image and label header -/// nk_tree_image_push_id | Start a collapsable UI section with image and label header and internal state management callable in a look -/// nk_tree_image_push_hashed | Start a collapsable UI section with image and label header and internal state management with full control over internal unique ID use to store state -/// nk_tree_pop | Ends a collapsable UI section +/// nk_tree_push | Start a collapsible UI section with internal state management +/// nk_tree_push_id | Start a collapsible UI section with internal state management callable in a look +/// nk_tree_push_hashed | Start a collapsible UI section with internal state management with full control over internal unique ID use to store state +/// nk_tree_image_push | Start a collapsible UI section with image and label header +/// nk_tree_image_push_id | Start a collapsible UI section with image and label header and internal state management callable in a look +/// nk_tree_image_push_hashed | Start a collapsible UI section with image and label header and internal state management with full control over internal unique ID use to store state +/// nk_tree_pop | Ends a collapsible UI section // -/// nk_tree_state_push | Start a collapsable UI section with external state management -/// nk_tree_state_image_push | Start a collapsable UI section with image and label header and external state management +/// nk_tree_state_push | Start a collapsible UI section with external state management +/// nk_tree_state_image_push | Start a collapsible UI section with image and label header and external state management /// nk_tree_state_pop | Ends a collapsabale UI section /// /// #### nk_tree_type /// Flag | Description /// ----------------|---------------------------------------- -/// NK_TREE_NODE | Highlighted tree header to mark a collapsable UI section -/// NK_TREE_TAB | Non-highighted tree header closer to tree representations +/// NK_TREE_NODE | Highlighted tree header to mark a collapsible UI section +/// NK_TREE_TAB | Non-highlighted tree header closer to tree representations */ /*/// #### nk_tree_push -/// Starts a collapsable UI section with internal state management +/// Starts a collapsible UI section with internal state management /// !!! WARNING -/// To keep track of the runtime tree collapsable state this function uses +/// To keep track of the runtime tree collapsible state this function uses /// defines `__FILE__` and `__LINE__` to generate a unique ID. If you want /// to call this function in a loop please use `nk_tree_push_id` or /// `nk_tree_push_hashed` instead. @@ -2889,7 +2889,7 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of */ #define nk_tree_push(ctx, type, title, state) nk_tree_push_hashed(ctx, type, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),__LINE__) /*/// #### nk_tree_push_id -/// Starts a collapsable UI section with internal state management callable in a look +/// Starts a collapsible UI section with internal state management callable in a look /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// #define nk_tree_push_id(ctx, type, title, state, id) /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2906,7 +2906,7 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of */ #define nk_tree_push_id(ctx, type, title, state, id) nk_tree_push_hashed(ctx, type, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),id) /*/// #### nk_tree_push_hashed -/// Start a collapsable UI section with internal state management with full +/// Start a collapsible UI section with internal state management with full /// control over internal unique ID used to store state /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); @@ -2926,9 +2926,9 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of */ NK_API nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); /*/// #### nk_tree_image_push -/// Start a collapsable UI section with image and label header +/// Start a collapsible UI section with image and label header /// !!! WARNING -/// To keep track of the runtime tree collapsable state this function uses +/// To keep track of the runtime tree collapsible state this function uses /// defines `__FILE__` and `__LINE__` to generate a unique ID. If you want /// to call this function in a loop please use `nk_tree_image_push_id` or /// `nk_tree_image_push_hashed` instead. @@ -2949,7 +2949,7 @@ NK_API nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const */ #define nk_tree_image_push(ctx, type, img, title, state) nk_tree_image_push_hashed(ctx, type, img, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),__LINE__) /*/// #### nk_tree_image_push_id -/// Start a collapsable UI section with image and label header and internal state +/// Start a collapsible UI section with image and label header and internal state /// management callable in a look /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c @@ -2969,7 +2969,7 @@ NK_API nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const */ #define nk_tree_image_push_id(ctx, type, img, title, state, id) nk_tree_image_push_hashed(ctx, type, img, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),id) /*/// #### nk_tree_image_push_hashed -/// Start a collapsable UI section with internal state management with full +/// Start a collapsible UI section with internal state management with full /// control over internal unique ID used to store state /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); @@ -3001,7 +3001,7 @@ NK_API nk_bool nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, */ NK_API void nk_tree_pop(struct nk_context*); /*/// #### nk_tree_state_push -/// Start a collapsable UI section with external state management +/// Start a collapsible UI section with external state management /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -3017,7 +3017,7 @@ NK_API void nk_tree_pop(struct nk_context*); */ NK_API nk_bool nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); /*/// #### nk_tree_state_image_push -/// Start a collapsable UI section with image and label header and external state management +/// Start a collapsible UI section with image and label header and external state management /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state); /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -3244,10 +3244,10 @@ NK_API nk_bool nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_colo /// or by directly typing a number. /// /// #### Usage -/// Each property requires a unique name for identifaction that is also used for +/// Each property requires a unique name for identification that is also used for /// displaying a label. If you want to use the same name multiple times make sure /// add a '#' before your name. The '#' will not be shown but will generate a -/// unique ID. Each propery also takes in a minimum and maximum value. If you want +/// unique ID. Each property also takes in a minimum and maximum value. If you want /// to make use of the complete number range of a type just use the provided /// type limits from `limits.h`. For example `INT_MIN` and `INT_MAX` for /// `nk_property_int` and `nk_propertyi`. In additional each property takes in @@ -3301,16 +3301,16 @@ NK_API nk_bool nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_colo /// #### Reference /// Function | Description /// --------------------|------------------------------------------- -/// nk_property_int | Integer property directly modifing a passed in value -/// nk_property_float | Float property directly modifing a passed in value -/// nk_property_double | Double property directly modifing a passed in value +/// nk_property_int | Integer property directly modifying a passed in value +/// nk_property_float | Float property directly modifying a passed in value +/// nk_property_double | Double property directly modifying a passed in value /// nk_propertyi | Integer property returning the modified int value /// nk_propertyf | Float property returning the modified float value /// nk_propertyd | Double property returning the modified double value /// */ /*/// #### nk_property_int -/// Integer property directly modifing a passed in value +/// Integer property directly modifying a passed in value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3331,7 +3331,7 @@ NK_API nk_bool nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_colo */ NK_API void nk_property_int(struct nk_context*, const char *name, int min, int *val, int max, int step, float inc_per_pixel); /*/// #### nk_property_float -/// Float property directly modifing a passed in value +/// Float property directly modifying a passed in value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3352,7 +3352,7 @@ NK_API void nk_property_int(struct nk_context*, const char *name, int min, int * */ NK_API void nk_property_float(struct nk_context*, const char *name, float min, float *val, float max, float step, float inc_per_pixel); /*/// #### nk_property_double -/// Double property directly modifing a passed in value +/// Double property directly modifying a passed in value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3373,7 +3373,7 @@ NK_API void nk_property_float(struct nk_context*, const char *name, float min, f */ NK_API void nk_property_double(struct nk_context*, const char *name, double min, double *val, double max, double step, float inc_per_pixel); /*/// #### nk_propertyi -/// Integer property modifing a passed in value and returning the new value +/// Integer property modifying a passed in value and returning the new value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3396,7 +3396,7 @@ NK_API void nk_property_double(struct nk_context*, const char *name, double min, */ NK_API int nk_propertyi(struct nk_context*, const char *name, int min, int val, int max, int step, float inc_per_pixel); /*/// #### nk_propertyf -/// Float property modifing a passed in value and returning the new value +/// Float property modifying a passed in value and returning the new value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3419,7 +3419,7 @@ NK_API int nk_propertyi(struct nk_context*, const char *name, int min, int val, */ NK_API float nk_propertyf(struct nk_context*, const char *name, float min, float val, float max, float step, float inc_per_pixel); /*/// #### nk_propertyd -/// Float property modifing a passed in value and returning the new value +/// Float property modifying a passed in value and returning the new value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -4012,7 +4012,7 @@ struct nk_font_config { unsigned char pixel_snap; /* align every character to pixel boundary (if true set oversample (1,1)) */ unsigned char oversample_v, oversample_h; - /* rasterize at hight quality for sub-pixel position */ + /* rasterize at high quality for sub-pixel position */ unsigned char padding[3]; float size; @@ -9604,14 +9604,14 @@ nk_draw_list_alloc_vertices(struct nk_draw_list *list, nk_size count) /* This assert triggers because your are drawing a lot of stuff and nuklear * defined `nk_draw_index` as `nk_ushort` to safe space be default. * - * So you reached the maximum number of indicies or rather vertexes. - * To solve this issue please change typdef `nk_draw_index` to `nk_uint` + * So you reached the maximum number of indices or rather vertexes. + * To solve this issue please change typedef `nk_draw_index` to `nk_uint` * and don't forget to specify the new element size in your drawing * backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements` - * instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`. + * instead of specifying `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`. * Sorry for the inconvenience. */ if(sizeof(nk_draw_index)==2) NK_ASSERT((list->vertex_count < NK_USHORT_MAX && - "To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem")); + "To many vertices for 16-bit vertex indices. Please read comment above on how to solve this problem")); return vtx; } NK_INTERN nk_draw_index* @@ -11026,7 +11026,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0 if (node->y > min_y) { /* raise min_y higher. */ /* we've accounted for all waste up to min_y, */ - /* but we'll now add more waste for everything we've visted */ + /* but we'll now add more waste for everything we've visited */ waste_area += visited_width * (node->y - min_y); min_y = node->y; /* the first time through, visited_width might be reduced */ @@ -11992,7 +11992,7 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip); /* If skip != 0, this tells stb_truetype to skip any codepoints for which */ /* there is no corresponding glyph. If skip=0, which is the default, then */ -/* codepoints without a glyph recived the font's "missing character" glyph, */ +/* codepoints without a glyph received the font's "missing character" glyph, */ /* typically an empty box by convention. */ STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, /* same data as above */ @@ -29617,7 +29617,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process. /// - 2018/01/31 (3.00.4) - Removed name collision with stb_truetype. /// - 2018/01/28 (3.00.3) - Fixed panel window border drawing bug. -/// - 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separed group identifier and title. +/// - 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separated group identifier and title. /// - 2018/01/07 (3.00.1) - Started to change documentation style. /// - 2018/01/05 (3.00.0) - BREAKING CHANGE: The previous color picker API was broken /// because of conversions between float and byte color representation. @@ -29628,13 +29628,13 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2017/12/23 (2.00.7) - Fixed small warning. /// - 2017/12/23 (2.00.7) - Fixed `nk_edit_buffer` behavior if activated to allow input. /// - 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior. -/// - 2017/12/04 (2.00.6) - Added formated string tooltip widget. +/// - 2017/12/04 (2.00.6) - Added formatted string tooltip widget. /// - 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag `NK_WINDOW_NO_INPUT`. /// - 2017/11/15 (2.00.4) - Fixed font merging. /// - 2017/11/07 (2.00.3) - Fixed window size and position modifier functions. /// - 2017/09/14 (2.00.2) - Fixed `nk_edit_buffer` and `nk_edit_focus` behavior. /// - 2017/09/14 (2.00.1) - Fixed window closing behavior. -/// - 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifing window position and size funtions now +/// - 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifying window position and size functions now /// require the name of the window and must happen outside the window /// building process (between function call nk_begin and nk_end). /// - 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last. @@ -29661,7 +29661,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a `nk_layout_xxx` function. /// - 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer. /// - 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped. -/// - 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundries. +/// - 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundaries. /// - 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space. /// - 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size. /// - 2017/05/06 (1.38.0) - Added platform double-click support. @@ -29678,7 +29678,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2017/03/04 (1.34.2) - Fixed text edit filtering. /// - 2017/03/04 (1.34.1) - Fixed group closable flag. /// - 2017/02/25 (1.34.0) - Added custom draw command for better language binding support. -/// - 2017/01/24 (1.33.0) - Added programatic way of remove edit focus. +/// - 2017/01/24 (1.33.0) - Added programmatic way to remove edit focus. /// - 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows. /// - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows. /// - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing. @@ -29723,7 +29723,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// text in every edit widget if one of them is scrolled. /// - 2016/09/28 (1.22.3) - Fixed small bug in edit widgets if not active. The wrong /// text length is passed. It should have been in bytes but -/// was passed as glyphes. +/// was passed as glyphs. /// - 2016/09/20 (1.22.2) - Fixed color button size calculation. /// - 2016/09/20 (1.22.1) - Fixed some `nk_vsnprintf` behavior bugs and removed `` /// again from `NK_INCLUDE_STANDARD_VARARGS`. @@ -29803,13 +29803,13 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2016/08/16 (1.09.5) - Fixed ROM mode for deeper levels of popup windows parents. /// - 2016/08/15 (1.09.4) - Editbox are now still active if enter was pressed with flag /// `NK_EDIT_SIG_ENTER`. Main reasoning is to be able to keep -/// typing after commiting. +/// typing after committing. /// - 2016/08/15 (1.09.4) - Removed redundant code. /// - 2016/08/15 (1.09.4) - Fixed negative numbers in `nk_strtoi` and remove unused variable. /// - 2016/08/15 (1.09.3) - Fixed `NK_WINDOW_BACKGROUND` flag behavior to select a background /// window only as selected by hovering and not by clicking. /// - 2016/08/14 (1.09.2) - Fixed a bug in font atlas which caused wrong loading -/// of glyphes for font with multiple ranges. +/// of glyphs for font with multiple ranges. /// - 2016/08/12 (1.09.1) - Added additional function to check if window is currently /// hidden and therefore not visible. /// - 2016/08/12 (1.09.1) - nk_window_is_closed now queries the correct flag `NK_WINDOW_CLOSED` @@ -29825,8 +29825,8 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// precision. /// - 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`. /// - 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading -/// to wrong wiget width calculation which results in widgets falsly -/// becomming tagged as not inside window and cannot be accessed. +/// to wrong wiget width calculation which results in widgets falsely +/// becoming tagged as not inside window and cannot be accessed. /// - 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and /// closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown /// by using `nk_window_show` and closed by either clicking the close @@ -29873,7 +29873,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - 2016/07/15 (1.01.0) - Removed internal font baking API and simplified /// font atlas memory management by converting pointer /// arrays for fonts and font configurations to lists. -/// - 2016/07/15 (1.00.0) - Changed button API to use context dependend button +/// - 2016/07/15 (1.00.0) - Changed button API to use context dependent button /// behavior instead of passing it for every function call. /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /// ## Gallery diff --git a/src/CHANGELOG b/src/CHANGELOG index ce587c8..4e40836 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -65,7 +65,7 @@ /// - 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process. /// - 2018/01/31 (3.00.4) - Removed name collision with stb_truetype. /// - 2018/01/28 (3.00.3) - Fixed panel window border drawing bug. -/// - 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separed group identifier and title. +/// - 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separated group identifier and title. /// - 2018/01/07 (3.00.1) - Started to change documentation style. /// - 2018/01/05 (3.00.0) - BREAKING CHANGE: The previous color picker API was broken /// because of conversions between float and byte color representation. @@ -76,13 +76,13 @@ /// - 2017/12/23 (2.00.7) - Fixed small warning. /// - 2017/12/23 (2.00.7) - Fixed `nk_edit_buffer` behavior if activated to allow input. /// - 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior. -/// - 2017/12/04 (2.00.6) - Added formated string tooltip widget. +/// - 2017/12/04 (2.00.6) - Added formatted string tooltip widget. /// - 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag `NK_WINDOW_NO_INPUT`. /// - 2017/11/15 (2.00.4) - Fixed font merging. /// - 2017/11/07 (2.00.3) - Fixed window size and position modifier functions. /// - 2017/09/14 (2.00.2) - Fixed `nk_edit_buffer` and `nk_edit_focus` behavior. /// - 2017/09/14 (2.00.1) - Fixed window closing behavior. -/// - 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifing window position and size funtions now +/// - 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifying window position and size functions now /// require the name of the window and must happen outside the window /// building process (between function call nk_begin and nk_end). /// - 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last. @@ -109,7 +109,7 @@ /// - 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a `nk_layout_xxx` function. /// - 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer. /// - 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped. -/// - 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundries. +/// - 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundaries. /// - 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space. /// - 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size. /// - 2017/05/06 (1.38.0) - Added platform double-click support. @@ -126,7 +126,7 @@ /// - 2017/03/04 (1.34.2) - Fixed text edit filtering. /// - 2017/03/04 (1.34.1) - Fixed group closable flag. /// - 2017/02/25 (1.34.0) - Added custom draw command for better language binding support. -/// - 2017/01/24 (1.33.0) - Added programatic way of remove edit focus. +/// - 2017/01/24 (1.33.0) - Added programmatic way to remove edit focus. /// - 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows. /// - 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows. /// - 2017/01/21 (1.32.1) - Fixed slider behavior and drawing. @@ -171,7 +171,7 @@ /// text in every edit widget if one of them is scrolled. /// - 2016/09/28 (1.22.3) - Fixed small bug in edit widgets if not active. The wrong /// text length is passed. It should have been in bytes but -/// was passed as glyphes. +/// was passed as glyphs. /// - 2016/09/20 (1.22.2) - Fixed color button size calculation. /// - 2016/09/20 (1.22.1) - Fixed some `nk_vsnprintf` behavior bugs and removed `` /// again from `NK_INCLUDE_STANDARD_VARARGS`. @@ -251,13 +251,13 @@ /// - 2016/08/16 (1.09.5) - Fixed ROM mode for deeper levels of popup windows parents. /// - 2016/08/15 (1.09.4) - Editbox are now still active if enter was pressed with flag /// `NK_EDIT_SIG_ENTER`. Main reasoning is to be able to keep -/// typing after commiting. +/// typing after committing. /// - 2016/08/15 (1.09.4) - Removed redundant code. /// - 2016/08/15 (1.09.4) - Fixed negative numbers in `nk_strtoi` and remove unused variable. /// - 2016/08/15 (1.09.3) - Fixed `NK_WINDOW_BACKGROUND` flag behavior to select a background /// window only as selected by hovering and not by clicking. /// - 2016/08/14 (1.09.2) - Fixed a bug in font atlas which caused wrong loading -/// of glyphes for font with multiple ranges. +/// of glyphs for font with multiple ranges. /// - 2016/08/12 (1.09.1) - Added additional function to check if window is currently /// hidden and therefore not visible. /// - 2016/08/12 (1.09.1) - nk_window_is_closed now queries the correct flag `NK_WINDOW_CLOSED` @@ -273,8 +273,8 @@ /// precision. /// - 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`. /// - 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading -/// to wrong wiget width calculation which results in widgets falsly -/// becomming tagged as not inside window and cannot be accessed. +/// to wrong wiget width calculation which results in widgets falsely +/// becoming tagged as not inside window and cannot be accessed. /// - 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and /// closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown /// by using `nk_window_show` and closed by either clicking the close @@ -321,6 +321,6 @@ /// - 2016/07/15 (1.01.0) - Removed internal font baking API and simplified /// font atlas memory management by converting pointer /// arrays for fonts and font configurations to lists. -/// - 2016/07/15 (1.00.0) - Changed button API to use context dependend button +/// - 2016/07/15 (1.00.0) - Changed button API to use context dependent button /// behavior instead of passing it for every function call. /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/HEADER b/src/HEADER index 0f6b672..a0c749f 100644 --- a/src/HEADER +++ b/src/HEADER @@ -76,7 +76,7 @@ /// and does not contain the actual implementation.

/// /// The implementation mode requires to define the preprocessor macro -/// NK_IMPLEMENTATION in *one* .c/.cpp file before #includeing this file, e.g.: +/// NK_IMPLEMENTATION in *one* .c/.cpp file before #including this file, e.g.: /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~C /// #define NK_IMPLEMENTATION diff --git a/src/nuklear.h b/src/nuklear.h index 89a75b6..b97c95c 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -491,7 +491,7 @@ NK_API void nk_set_user_data(struct nk_context*, nk_handle handle); /// /// #### Usage /// Input state needs to be provided to nuklear by first calling `nk_input_begin` -/// which resets internal state like delta mouse position and button transistions. +/// which resets internal state like delta mouse position and button transitions. /// After `nk_input_begin` all current input state needs to be provided. This includes /// mouse motion, button and key pressed and released, text input and scrolling. /// Both event- or state-based input handling are supported by this API @@ -1034,7 +1034,7 @@ NK_API const struct nk_command* nk__next(struct nk_context*, const struct nk_com /// NK_CONVERT_INVALID_PARAM | An invalid argument was passed in the function call /// NK_CONVERT_COMMAND_BUFFER_FULL | The provided buffer for storing draw commands is full or failed to allocate more memory /// NK_CONVERT_VERTEX_BUFFER_FULL | The provided buffer for storing vertices is full or failed to allocate more memory -/// NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indicies is full or failed to allocate more memory +/// NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indices is full or failed to allocate more memory */ NK_API nk_flags nk_convert(struct nk_context*, struct nk_buffer *cmds, struct nk_buffer *vertices, struct nk_buffer *elements, const struct nk_convert_config*); /*/// #### nk__draw_begin @@ -1241,8 +1241,8 @@ NK_API const struct nk_draw_command* nk__draw_next(const struct nk_draw_command* /// #### nk_collapse_states /// State | Description /// ----------------|----------------------------------------------------------- -/// __NK_MINIMIZED__| UI section is collased and not visibile until maximized -/// __NK_MAXIMIZED__| UI section is extended and visibile until minimized +/// __NK_MINIMIZED__| UI section is collased and not visible until maximized +/// __NK_MAXIMIZED__| UI section is extended and visible until minimized ///

*/ enum nk_panel_flags { @@ -2391,7 +2391,7 @@ NK_API void nk_spacer(struct nk_context* ); /// widgets inside the window if the value is not 0. /// Nesting groups is possible and even encouraged since many layouting schemes /// can only be achieved by nesting. Groups, unlike windows, need `nk_group_end` -/// to be only called if the corosponding `nk_group_begin_xxx` call does not return 0: +/// to be only called if the corresponding `nk_group_begin_xxx` call does not return 0: /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// if (nk_group_begin_xxx(ctx, ...) { @@ -2451,7 +2451,7 @@ NK_API void nk_spacer(struct nk_context* ); /// Function | Description /// --------------------------------|------------------------------------------- /// nk_group_begin | Start a new group with internal scrollbar handling -/// nk_group_begin_titled | Start a new group with separeted name and title and internal scrollbar handling +/// nk_group_begin_titled | Start a new group with separated name and title and internal scrollbar handling /// nk_group_end | Ends a group. Should only be called if nk_group_begin returned non-zero /// nk_group_scrolled_offset_begin | Start a new group with manual separated handling of scrollbar x- and y-offset /// nk_group_scrolled_begin | Start a new group with manual scrollbar handling @@ -2581,13 +2581,13 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of * * ============================================================================= /// ### Tree -/// Trees represent two different concept. First the concept of a collapsable -/// UI section that can be either in a hidden or visibile state. They allow the UI +/// Trees represent two different concept. First the concept of a collapsible +/// UI section that can be either in a hidden or visible state. They allow the UI /// user to selectively minimize the current set of visible UI to comprehend. /// The second concept are tree widgets for visual UI representation of trees.

/// /// Trees thereby can be nested for tree representations and multiple nested -/// collapsable UI sections. All trees are started by calling of the +/// collapsible UI sections. All trees are started by calling of the /// `nk_tree_xxx_push_tree` functions and ended by calling one of the /// `nk_tree_xxx_pop_xxx()` functions. Each starting functions takes a title label /// and optionally an image to be displayed and the initial collapse state from @@ -2602,7 +2602,7 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of /// /// #### Usage /// To create a tree you have to call one of the seven `nk_tree_xxx_push_xxx` -/// functions to start a collapsable UI section and `nk_tree_xxx_pop` to mark the +/// functions to start a collapsible UI section and `nk_tree_xxx_pop` to mark the /// end. /// Each starting function will either return `false(0)` if the tree is collapsed /// or hidden and therefore does not need to be filled with content or `true(1)` @@ -2627,28 +2627,28 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of /// #### Reference /// Function | Description /// ----------------------------|------------------------------------------- -/// nk_tree_push | Start a collapsable UI section with internal state management -/// nk_tree_push_id | Start a collapsable UI section with internal state management callable in a look -/// nk_tree_push_hashed | Start a collapsable UI section with internal state management with full control over internal unique ID use to store state -/// nk_tree_image_push | Start a collapsable UI section with image and label header -/// nk_tree_image_push_id | Start a collapsable UI section with image and label header and internal state management callable in a look -/// nk_tree_image_push_hashed | Start a collapsable UI section with image and label header and internal state management with full control over internal unique ID use to store state -/// nk_tree_pop | Ends a collapsable UI section +/// nk_tree_push | Start a collapsible UI section with internal state management +/// nk_tree_push_id | Start a collapsible UI section with internal state management callable in a look +/// nk_tree_push_hashed | Start a collapsible UI section with internal state management with full control over internal unique ID use to store state +/// nk_tree_image_push | Start a collapsible UI section with image and label header +/// nk_tree_image_push_id | Start a collapsible UI section with image and label header and internal state management callable in a look +/// nk_tree_image_push_hashed | Start a collapsible UI section with image and label header and internal state management with full control over internal unique ID use to store state +/// nk_tree_pop | Ends a collapsible UI section // -/// nk_tree_state_push | Start a collapsable UI section with external state management -/// nk_tree_state_image_push | Start a collapsable UI section with image and label header and external state management +/// nk_tree_state_push | Start a collapsible UI section with external state management +/// nk_tree_state_image_push | Start a collapsible UI section with image and label header and external state management /// nk_tree_state_pop | Ends a collapsabale UI section /// /// #### nk_tree_type /// Flag | Description /// ----------------|---------------------------------------- -/// NK_TREE_NODE | Highlighted tree header to mark a collapsable UI section -/// NK_TREE_TAB | Non-highighted tree header closer to tree representations +/// NK_TREE_NODE | Highlighted tree header to mark a collapsible UI section +/// NK_TREE_TAB | Non-highlighted tree header closer to tree representations */ /*/// #### nk_tree_push -/// Starts a collapsable UI section with internal state management +/// Starts a collapsible UI section with internal state management /// !!! WARNING -/// To keep track of the runtime tree collapsable state this function uses +/// To keep track of the runtime tree collapsible state this function uses /// defines `__FILE__` and `__LINE__` to generate a unique ID. If you want /// to call this function in a loop please use `nk_tree_push_id` or /// `nk_tree_push_hashed` instead. @@ -2668,7 +2668,7 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of */ #define nk_tree_push(ctx, type, title, state) nk_tree_push_hashed(ctx, type, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),__LINE__) /*/// #### nk_tree_push_id -/// Starts a collapsable UI section with internal state management callable in a look +/// Starts a collapsible UI section with internal state management callable in a look /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// #define nk_tree_push_id(ctx, type, title, state, id) /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2685,7 +2685,7 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of */ #define nk_tree_push_id(ctx, type, title, state, id) nk_tree_push_hashed(ctx, type, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),id) /*/// #### nk_tree_push_hashed -/// Start a collapsable UI section with internal state management with full +/// Start a collapsible UI section with internal state management with full /// control over internal unique ID used to store state /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); @@ -2705,9 +2705,9 @@ NK_API void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_of */ NK_API nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); /*/// #### nk_tree_image_push -/// Start a collapsable UI section with image and label header +/// Start a collapsible UI section with image and label header /// !!! WARNING -/// To keep track of the runtime tree collapsable state this function uses +/// To keep track of the runtime tree collapsible state this function uses /// defines `__FILE__` and `__LINE__` to generate a unique ID. If you want /// to call this function in a loop please use `nk_tree_image_push_id` or /// `nk_tree_image_push_hashed` instead. @@ -2728,7 +2728,7 @@ NK_API nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const */ #define nk_tree_image_push(ctx, type, img, title, state) nk_tree_image_push_hashed(ctx, type, img, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),__LINE__) /*/// #### nk_tree_image_push_id -/// Start a collapsable UI section with image and label header and internal state +/// Start a collapsible UI section with image and label header and internal state /// management callable in a look /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c @@ -2748,7 +2748,7 @@ NK_API nk_bool nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const */ #define nk_tree_image_push_id(ctx, type, img, title, state, id) nk_tree_image_push_hashed(ctx, type, img, title, state, NK_FILE_LINE,nk_strlen(NK_FILE_LINE),id) /*/// #### nk_tree_image_push_hashed -/// Start a collapsable UI section with internal state management with full +/// Start a collapsible UI section with internal state management with full /// control over internal unique ID used to store state /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); @@ -2780,7 +2780,7 @@ NK_API nk_bool nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, */ NK_API void nk_tree_pop(struct nk_context*); /*/// #### nk_tree_state_push -/// Start a collapsable UI section with external state management +/// Start a collapsible UI section with external state management /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2796,7 +2796,7 @@ NK_API void nk_tree_pop(struct nk_context*); */ NK_API nk_bool nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); /*/// #### nk_tree_state_image_push -/// Start a collapsable UI section with image and label header and external state management +/// Start a collapsible UI section with image and label header and external state management /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c /// nk_bool nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state); /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -3023,10 +3023,10 @@ NK_API nk_bool nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_colo /// or by directly typing a number. /// /// #### Usage -/// Each property requires a unique name for identifaction that is also used for +/// Each property requires a unique name for identification that is also used for /// displaying a label. If you want to use the same name multiple times make sure /// add a '#' before your name. The '#' will not be shown but will generate a -/// unique ID. Each propery also takes in a minimum and maximum value. If you want +/// unique ID. Each property also takes in a minimum and maximum value. If you want /// to make use of the complete number range of a type just use the provided /// type limits from `limits.h`. For example `INT_MIN` and `INT_MAX` for /// `nk_property_int` and `nk_propertyi`. In additional each property takes in @@ -3080,16 +3080,16 @@ NK_API nk_bool nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_colo /// #### Reference /// Function | Description /// --------------------|------------------------------------------- -/// nk_property_int | Integer property directly modifing a passed in value -/// nk_property_float | Float property directly modifing a passed in value -/// nk_property_double | Double property directly modifing a passed in value +/// nk_property_int | Integer property directly modifying a passed in value +/// nk_property_float | Float property directly modifying a passed in value +/// nk_property_double | Double property directly modifying a passed in value /// nk_propertyi | Integer property returning the modified int value /// nk_propertyf | Float property returning the modified float value /// nk_propertyd | Double property returning the modified double value /// */ /*/// #### nk_property_int -/// Integer property directly modifing a passed in value +/// Integer property directly modifying a passed in value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3110,7 +3110,7 @@ NK_API nk_bool nk_color_pick(struct nk_context*, struct nk_colorf*, enum nk_colo */ NK_API void nk_property_int(struct nk_context*, const char *name, int min, int *val, int max, int step, float inc_per_pixel); /*/// #### nk_property_float -/// Float property directly modifing a passed in value +/// Float property directly modifying a passed in value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3131,7 +3131,7 @@ NK_API void nk_property_int(struct nk_context*, const char *name, int min, int * */ NK_API void nk_property_float(struct nk_context*, const char *name, float min, float *val, float max, float step, float inc_per_pixel); /*/// #### nk_property_double -/// Double property directly modifing a passed in value +/// Double property directly modifying a passed in value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3152,7 +3152,7 @@ NK_API void nk_property_float(struct nk_context*, const char *name, float min, f */ NK_API void nk_property_double(struct nk_context*, const char *name, double min, double *val, double max, double step, float inc_per_pixel); /*/// #### nk_propertyi -/// Integer property modifing a passed in value and returning the new value +/// Integer property modifying a passed in value and returning the new value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3175,7 +3175,7 @@ NK_API void nk_property_double(struct nk_context*, const char *name, double min, */ NK_API int nk_propertyi(struct nk_context*, const char *name, int min, int val, int max, int step, float inc_per_pixel); /*/// #### nk_propertyf -/// Float property modifing a passed in value and returning the new value +/// Float property modifying a passed in value and returning the new value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3198,7 +3198,7 @@ NK_API int nk_propertyi(struct nk_context*, const char *name, int min, int val, */ NK_API float nk_propertyf(struct nk_context*, const char *name, float min, float val, float max, float step, float inc_per_pixel); /*/// #### nk_propertyd -/// Float property modifing a passed in value and returning the new value +/// Float property modifying a passed in value and returning the new value /// !!! WARNING /// To generate a unique property ID using the same label make sure to insert /// a `#` at the beginning. It will not be shown but guarantees correct behavior. @@ -3791,7 +3791,7 @@ struct nk_font_config { unsigned char pixel_snap; /* align every character to pixel boundary (if true set oversample (1,1)) */ unsigned char oversample_v, oversample_h; - /* rasterize at hight quality for sub-pixel position */ + /* rasterize at high quality for sub-pixel position */ unsigned char padding[3]; float size; diff --git a/src/nuklear_vertex.c b/src/nuklear_vertex.c index 8e94f88..fe881c8 100644 --- a/src/nuklear_vertex.c +++ b/src/nuklear_vertex.c @@ -227,14 +227,14 @@ nk_draw_list_alloc_vertices(struct nk_draw_list *list, nk_size count) /* This assert triggers because your are drawing a lot of stuff and nuklear * defined `nk_draw_index` as `nk_ushort` to safe space be default. * - * So you reached the maximum number of indicies or rather vertexes. - * To solve this issue please change typdef `nk_draw_index` to `nk_uint` + * So you reached the maximum number of indices or rather vertexes. + * To solve this issue please change typedef `nk_draw_index` to `nk_uint` * and don't forget to specify the new element size in your drawing * backend (OpenGL, DirectX, ...). For example in OpenGL for `glDrawElements` - * instead of specifing `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`. + * instead of specifying `GL_UNSIGNED_SHORT` you have to define `GL_UNSIGNED_INT`. * Sorry for the inconvenience. */ if(sizeof(nk_draw_index)==2) NK_ASSERT((list->vertex_count < NK_USHORT_MAX && - "To many verticies for 16-bit vertex indicies. Please read comment above on how to solve this problem")); + "To many vertices for 16-bit vertex indices. Please read comment above on how to solve this problem")); return vtx; } NK_INTERN nk_draw_index* diff --git a/src/stb_rect_pack.h b/src/stb_rect_pack.h index 5c848de..6a57eee 100644 --- a/src/stb_rect_pack.h +++ b/src/stb_rect_pack.h @@ -310,7 +310,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0 if (node->y > min_y) { // raise min_y higher. // we've accounted for all waste up to min_y, - // but we'll now add more waste for everything we've visted + // but we'll now add more waste for everything we've visited waste_area += visited_width * (node->y - min_y); min_y = node->y; // the first time through, visited_width might be reduced diff --git a/src/stb_truetype.h b/src/stb_truetype.h index 935a6de..7549275 100644 --- a/src/stb_truetype.h +++ b/src/stb_truetype.h @@ -647,7 +647,7 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip); // If skip != 0, this tells stb_truetype to skip any codepoints for which // there is no corresponding glyph. If skip=0, which is the default, then -// codepoints without a glyph recived the font's "missing character" glyph, +// codepoints without a glyph received the font's "missing character" glyph, // typically an empty box by convention. STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, // same data as above From 5ea1a668cbb50235baf9e4921fdb1a9dde4fbb93 Mon Sep 17 00:00:00 2001 From: Andrew Kravchuk Date: Tue, 14 Dec 2021 09:15:00 +0300 Subject: [PATCH 26/89] Use NK_UNUSED macro Co-authored-by: Rob Loach --- demo/allegro5/nuklear_allegro5.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h index df45ced..6bda7fd 100644 --- a/demo/allegro5/nuklear_allegro5.h +++ b/demo/allegro5/nuklear_allegro5.h @@ -98,7 +98,7 @@ NK_API void nk_allegro5_del_image(struct nk_image* image) static float nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text, int len) { - (void)height; + NK_UNUSED(height); NkAllegro5Font *font = (NkAllegro5Font*)handle.ptr; if (!font || !text) { return 0; From 9af0103cacae2955632f0937c2098cdd9d50ac4a Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 27 Feb 2019 14:02:44 +0000 Subject: [PATCH 27/89] Build all demos as C89 --- demo/allegro5/Makefile | 2 +- demo/allegro5/main.c | 7 +- demo/allegro5/nuklear_allegro5.h | 57 ++++++++++------ demo/d3d11/nuklear_d3d11.h | 12 ++-- demo/d3d9/main.c | 3 +- demo/d3d9/nuklear_d3d9.h | 29 ++++++--- demo/gdi/nuklear_gdi.h | 76 +++++++++++++--------- demo/gdip/nuklear_gdip.h | 40 ++++++++---- demo/glfw_opengl2/Makefile | 2 +- demo/glfw_opengl3/Makefile | 2 +- demo/glfw_opengl3/nuklear_glfw_gl3.h | 4 +- demo/glfw_opengl4/Makefile | 2 +- demo/glfw_opengl4/nuklear_glfw_gl4.h | 2 +- demo/overview.c | 4 +- demo/sdl2surface_rawfb/Makefile | 2 +- demo/sdl2surface_rawfb/main.c | 4 +- demo/sdl2surface_rawfb/sdl2surface_rawfb.h | 7 +- demo/sdl_opengl2/Makefile | 2 +- demo/sdl_opengl3/Makefile | 2 +- demo/sdl_opengles2/Makefile | 2 +- demo/sdl_opengles2/main.c | 24 +++---- demo/x11_opengl2/Makefile | 2 +- demo/x11_opengl3/Makefile | 2 +- demo/x11_rawfb/nuklear_rawfb.h | 2 +- demo/x11_rawfb/nuklear_xlib.h | 2 +- demo/x11_xft/nuklear_xlib.h | 15 +++-- 26 files changed, 190 insertions(+), 118 deletions(-) diff --git a/demo/allegro5/Makefile b/demo/allegro5/Makefile index 090a126..48e0b7a 100644 --- a/demo/allegro5/Makefile +++ b/demo/allegro5/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/allegro5/main.c b/demo/allegro5/main.c index 2f3cb54..ea9391b 100644 --- a/demo/allegro5/main.c +++ b/demo/allegro5/main.c @@ -55,6 +55,8 @@ int main(void) /* Platform */ ALLEGRO_DISPLAY *display = NULL; ALLEGRO_EVENT_QUEUE *event_queue = NULL; + NkAllegro5Font *font; + struct nk_context *ctx; if (!al_init()) { fprintf(stdout, "failed to initialize allegro5!\n"); @@ -85,9 +87,7 @@ int main(void) al_register_event_source(event_queue, al_get_mouse_event_source()); al_register_event_source(event_queue, al_get_keyboard_event_source()); - NkAllegro5Font *font; font = nk_allegro5_font_create_from_file("../../../extra_font/Roboto-Regular.ttf", 12, 0); - struct nk_context *ctx; ctx = nk_allegro5_init(font, display, WINDOW_WIDTH, WINDOW_HEIGHT); @@ -99,11 +99,12 @@ int main(void) while(1) { + bool get_event; ALLEGRO_EVENT ev; ALLEGRO_TIMEOUT timeout; al_init_timeout(&timeout, 0.06); - bool get_event = al_wait_for_event_until(event_queue, &ev, &timeout); + get_event = al_wait_for_event_until(event_queue, &ev, &timeout); if (get_event && ev.type == ALLEGRO_EVENT_DISPLAY_CLOSE) { break; diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h index 6bda7fd..c2f483c 100644 --- a/demo/allegro5/nuklear_allegro5.h +++ b/demo/allegro5/nuklear_allegro5.h @@ -70,18 +70,20 @@ static struct nk_allegro5 { NK_API struct nk_image* nk_allegro5_create_image(const char* file_name) { + ALLEGRO_BITMAP *bitmap; + struct nk_image *image; if (!al_init_image_addon()) { fprintf(stdout, "Unable to initialize required allegro5 image addon\n"); exit(1); } - ALLEGRO_BITMAP* bitmap = al_load_bitmap(file_name); + bitmap = al_load_bitmap(file_name); if (bitmap == NULL) { fprintf(stdout, "Unable to load image file: %s\n", file_name); return NULL; } - struct nk_image *image = (struct nk_image*)calloc(1, sizeof(struct nk_image)); + image = (struct nk_image*)calloc(1, sizeof(struct nk_image)); image->handle.ptr = bitmap; image->w = al_get_bitmap_width(bitmap); image->h = al_get_bitmap_height(bitmap); @@ -98,8 +100,10 @@ NK_API void nk_allegro5_del_image(struct nk_image* image) static float nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text, int len) { - NK_UNUSED(height); + float width; + char *strcpy; NkAllegro5Font *font = (NkAllegro5Font*)handle.ptr; + NK_UNUSED(height); if (!font || !text) { return 0; } @@ -107,16 +111,19 @@ nk_allegro5_font_get_text_width(nk_handle handle, float height, const char *text as nuklear uses variable size buffers and al_get_text_width doesn't accept a length, it infers length from null-termination (which is unsafe API design by allegro devs!) */ - char strcpy[len+1]; - strncpy((char*)&strcpy, text, len); + strcpy = malloc(len + 1); + strncpy(strcpy, text, len); strcpy[len] = '\0'; - return al_get_text_width(font->font, strcpy); + width = al_get_text_width(font->font, strcpy); + free(strcpy); + return width; } /* Flags are identical to al_load_font() flags argument */ NK_API NkAllegro5Font* nk_allegro5_font_create_from_file(const char *file_name, int font_size, int flags) { + NkAllegro5Font *font; if (!al_init_image_addon()) { fprintf(stdout, "Unable to initialize required allegro5 image addon\n"); exit(1); @@ -129,7 +136,7 @@ nk_allegro5_font_create_from_file(const char *file_name, int font_size, int flag fprintf(stdout, "Unable to initialize required allegro5 TTF font addon\n"); exit(1); } - NkAllegro5Font *font = (NkAllegro5Font*)calloc(1, sizeof(NkAllegro5Font)); + font = (NkAllegro5Font*)calloc(1, sizeof(NkAllegro5Font)); font->font = al_load_font(file_name, font_size, flags); if (font->font == NULL) { @@ -201,18 +208,18 @@ nk_allegro5_render() (float)r->rounding, color); } break; case NK_COMMAND_CIRCLE: { + float xr, yr; const struct nk_command_circle *c = (const struct nk_command_circle *)cmd; color = nk_color_to_allegro_color(c->color); - float xr, yr; xr = (float)c->w/2; yr = (float)c->h/2; al_draw_ellipse(((float)(c->x)) + xr, ((float)c->y) + yr, xr, yr, color, (float)c->line_thickness); } break; case NK_COMMAND_CIRCLE_FILLED: { + float xr, yr; const struct nk_command_circle_filled *c = (const struct nk_command_circle_filled *)cmd; color = nk_color_to_allegro_color(c->color); - float xr, yr; xr = (float)c->w/2; yr = (float)c->h/2; al_draw_filled_ellipse(((float)(c->x)) + xr, ((float)c->y) + yr, @@ -231,10 +238,11 @@ nk_allegro5_render() (float)t->b.y, (float)t->c.x, (float)t->c.y, color); } break; case NK_COMMAND_POLYGON: { - const struct nk_command_polygon *p = (const struct nk_command_polygon*)cmd; - color = nk_color_to_allegro_color(p->color); int i; - float vertices[p->point_count * 2]; + float *vertices; + const struct nk_command_polygon *p = (const struct nk_command_polygon*)cmd; + vertices = calloc(p->point_count * 2, sizeof(float)); + color = nk_color_to_allegro_color(p->color); for (i = 0; i < p->point_count; i++) { vertices[i*2] = p->points[i].x; vertices[(i*2) + 1] = p->points[i].y; @@ -242,23 +250,27 @@ nk_allegro5_render() al_draw_polyline((const float*)&vertices, (2 * sizeof(float)), (int)p->point_count, ALLEGRO_LINE_JOIN_ROUND, ALLEGRO_LINE_CAP_CLOSED, color, (float)p->line_thickness, 0.0); + free(vertices); } break; case NK_COMMAND_POLYGON_FILLED: { - const struct nk_command_polygon_filled *p = (const struct nk_command_polygon_filled *)cmd; - color = nk_color_to_allegro_color(p->color); int i; - float vertices[p->point_count * 2]; + float *vertices; + const struct nk_command_polygon_filled *p = (const struct nk_command_polygon_filled *)cmd; + vertices = calloc(p->point_count * 2, sizeof(float)); + color = nk_color_to_allegro_color(p->color); for (i = 0; i < p->point_count; i++) { vertices[i*2] = p->points[i].x; vertices[(i*2) + 1] = p->points[i].y; } al_draw_filled_polygon((const float*)&vertices, (int)p->point_count, color); + free(vertices); } break; case NK_COMMAND_POLYLINE: { - const struct nk_command_polyline *p = (const struct nk_command_polyline *)cmd; - color = nk_color_to_allegro_color(p->color); int i; - float vertices[p->point_count * 2]; + float *vertices; + const struct nk_command_polyline *p = (const struct nk_command_polyline *)cmd; + vertices = calloc(p->point_count * 2, sizeof(float)); + color = nk_color_to_allegro_color(p->color); for (i = 0; i < p->point_count; i++) { vertices[i*2] = p->points[i].x; vertices[(i*2) + 1] = p->points[i].y; @@ -266,19 +278,21 @@ nk_allegro5_render() al_draw_polyline((const float*)&vertices, (2 * sizeof(float)), (int)p->point_count, ALLEGRO_LINE_JOIN_ROUND, ALLEGRO_LINE_CAP_ROUND, color, (float)p->line_thickness, 0.0); + free(vertices); } break; case NK_COMMAND_TEXT: { + NkAllegro5Font *font; const struct nk_command_text *t = (const struct nk_command_text*)cmd; color = nk_color_to_allegro_color(t->foreground); - NkAllegro5Font *font = (NkAllegro5Font*)t->font->userdata.ptr; + font = (NkAllegro5Font*)t->font->userdata.ptr; al_draw_text(font->font, color, (float)t->x, (float)t->y, 0, (const char*)t->string); } break; case NK_COMMAND_CURVE: { + float points[8]; const struct nk_command_curve *q = (const struct nk_command_curve *)cmd; color = nk_color_to_allegro_color(q->color); - float points[8]; points[0] = (float)q->begin.x; points[1] = (float)q->begin.y; points[2] = (float)q->ctrl[0].x; @@ -466,12 +480,13 @@ NK_API struct nk_context* nk_allegro5_init(NkAllegro5Font *allegro5font, ALLEGRO_DISPLAY *dsp, unsigned int width, unsigned int height) { + struct nk_user_font *font; if (!al_init_primitives_addon()) { fprintf(stdout, "Unable to initialize required allegro5 primitives addon\n"); exit(1); } - struct nk_user_font *font = &allegro5font->nk; + font = &allegro5font->nk; allegro5.dsp = dsp; allegro5.width = width; diff --git a/demo/d3d11/nuklear_d3d11.h b/demo/d3d11/nuklear_d3d11.h index fe69c02..b716632 100644 --- a/demo/d3d11/nuklear_d3d11.h +++ b/demo/d3d11/nuklear_d3d11.h @@ -179,11 +179,15 @@ nk_d3d11_get_projection_matrix(int width, int height, float *result) const float B = (float)height; float matrix[4][4] = { - { 2.0f / (R - L), 0.0f, 0.0f, 0.0f }, - { 0.0f, 2.0f / (T - B), 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.5f, 0.0f }, - { (R + L) / (L - R), (T + B) / (B - T), 0.5f, 1.0f }, + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.5f, 0.0f }, + { 0.0f, 0.0f, 0.5f, 1.0f }, }; + matrix[0][0] = 2.0f / (R - L); + matrix[1][1] = 2.0f / (T - B); + matrix[3][0] = (R + L) / (L - R); + matrix[3][1] = (T + B) / (B - T); memcpy(result, matrix, sizeof(matrix)); } diff --git a/demo/d3d9/main.c b/demo/d3d9/main.c index cdd0fb3..76c8f81 100644 --- a/demo/d3d9/main.c +++ b/demo/d3d9/main.c @@ -82,10 +82,11 @@ WindowProc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) if (width != 0 && height != 0 && (width != present.BackBufferWidth || height != present.BackBufferHeight)) { + HRESULT hr; nk_d3d9_release(); present.BackBufferWidth = width; present.BackBufferHeight = height; - HRESULT hr = IDirect3DDevice9_Reset(device, &present); + hr = IDirect3DDevice9_Reset(device, &present); NK_ASSERT(SUCCEEDED(hr)); nk_d3d9_resize(width, height); } diff --git a/demo/d3d9/nuklear_d3d9.h b/demo/d3d9/nuklear_d3d9.h index 3f23e1e..9a6fe4c 100644 --- a/demo/d3d9/nuklear_d3d9.h +++ b/demo/d3d9/nuklear_d3d9.h @@ -204,11 +204,15 @@ nk_d3d9_get_projection_matrix(int width, int height, float *result) const float T = 0.5f; const float B = (float)height + 0.5f; float matrix[4][4] = { - { 2.0f / (R - L), 0.0f, 0.0f, 0.0f }, - { 0.0f, 2.0f / (T - B), 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f, 0.0f }, - { (R + L) / (L - R), (T + B) / (B - T), 0.0f, 1.0f }, + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 1.0f }, }; + matrix[0][0] = 2.0f / (R - L); + matrix[1][1] = 2.0f / (T - B); + matrix[3][0] = (R + L) / (L - R); + matrix[3][1] = (T + B) / (B - T); memcpy(result, matrix, sizeof(matrix)); } @@ -426,30 +430,35 @@ nk_d3d9_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) static void nk_d3d9_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { + HGLOBAL mem; + SIZE_T size; + LPCWSTR wstr; + int utf8size; + (void)usr; if (!IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) { return; } - HGLOBAL mem = GetClipboardData(CF_UNICODETEXT); + mem = GetClipboardData(CF_UNICODETEXT); if (!mem) { CloseClipboard(); return; } - SIZE_T size = GlobalSize(mem) - 1; + size = GlobalSize(mem) - 1; if (!size) { CloseClipboard(); return; } - LPCWSTR wstr = (LPCWSTR)GlobalLock(mem); + wstr = (LPCWSTR)GlobalLock(mem); if (!wstr) { CloseClipboard(); return; } - int utf8size = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)size / sizeof(wchar_t), NULL, 0, NULL, NULL); + utf8size = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)size / sizeof(wchar_t), NULL, 0, NULL, NULL); if (utf8size) { char *utf8 = (char *)malloc(utf8size); if (utf8) { @@ -466,12 +475,14 @@ nk_d3d9_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) static void nk_d3d9_clipboard_copy(nk_handle usr, const char *text, int len) { + int wsize; + (void)usr; if (!OpenClipboard(NULL)) { return; } - int wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0); + wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0); if (wsize) { HGLOBAL mem = GlobalAlloc(GMEM_MOVEABLE, (wsize + 1) * sizeof(wchar_t)); if (mem) { diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index 6937016..aef8425 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -62,6 +62,13 @@ nk_create_image(struct nk_image * image, const char * frame_buffer, const int wi { if (image && frame_buffer && (width > 0) && (height > 0)) { + const unsigned char * src = (const unsigned char *)frame_buffer; + INT row = ((width * 3 + 3) & ~3); + LPBYTE lpBuf, pb = NULL; + BITMAPINFO bi = { 0 }; + HBITMAP hbm; + int v, i; + image->w = width; image->h = height; image->region[0] = 0; @@ -69,8 +76,6 @@ nk_create_image(struct nk_image * image, const char * frame_buffer, const int wi image->region[2] = width; image->region[3] = height; - INT row = ((width * 3 + 3) & ~3); - BITMAPINFO bi = { 0 }; bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bi.bmiHeader.biWidth = width; bi.bmiHeader.biHeight = height; @@ -79,15 +84,13 @@ nk_create_image(struct nk_image * image, const char * frame_buffer, const int wi bi.bmiHeader.biCompression = BI_RGB; bi.bmiHeader.biSizeImage = row * height; - LPBYTE lpBuf, pb = NULL; - HBITMAP hbm = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, (void**)&lpBuf, NULL, 0); + hbm = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, (void**)&lpBuf, NULL, 0); pb = lpBuf + row * height; - unsigned char * src = (unsigned char *)frame_buffer; - for (int v = 0; vx = x; + p->y = y; + return TRUE; +} + static void nk_gdi_fill_triangle(HDC dc, short x0, short y0, short x1, short y1, short x2, short y2, struct nk_color col) { COLORREF color = convert_color(col); - POINT points[] = { - { x0, y0 }, - { x1, y1 }, - { x2, y2 }, - }; + POINT points[3]; + + SetPoint(&points[0], x0, y0); + SetPoint(&points[1], x1, y1); + SetPoint(&points[2], x2, y2); SetDCPenColor(dc, color); SetDCBrushColor(dc, color); @@ -283,14 +298,14 @@ nk_gdi_stroke_triangle(HDC dc, short x0, short y0, short x1, short y1, short x2, short y2, unsigned short line_thickness, struct nk_color col) { COLORREF color = convert_color(col); - POINT points[] = { - { x0, y0 }, - { x1, y1 }, - { x2, y2 }, - { x0, y0 }, - }; - + POINT points[4]; HPEN pen = NULL; + + SetPoint(&points[0], x0, y0); + SetPoint(&points[1], x1, y1); + SetPoint(&points[2], x2, y2); + SetPoint(&points[3], x0, y0); + if (line_thickness == 1) { SetDCPenColor(dc, color); } else { @@ -414,14 +429,14 @@ nk_gdi_stroke_curve(HDC dc, struct nk_vec2i p1, unsigned short line_thickness, struct nk_color col) { COLORREF color = convert_color(col); - POINT p[] = { - { p1.x, p1.y }, - { p2.x, p2.y }, - { p3.x, p3.y }, - { p4.x, p4.y }, - }; - + POINT p[4]; HPEN pen = NULL; + + SetPoint(&p[0], p1.x, p1.y); + SetPoint(&p[1], p2.x, p2.y); + SetPoint(&p[2], p3.x, p3.y); + SetPoint(&p[3], p4.x, p4.y); + if (line_thickness == 1) { SetDCPenColor(dc, color); } else { @@ -462,7 +477,8 @@ static void nk_gdi_clear(HDC dc, struct nk_color col) { COLORREF color = convert_color(col); - RECT rect = { 0, 0, gdi.width, gdi.height }; + RECT rect; + SetRect(&rect, 0, 0, gdi.width, gdi.height); SetBkColor(dc, color); ExtTextOutW(dc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); diff --git a/demo/gdip/nuklear_gdip.h b/demo/gdip/nuklear_gdip.h index 3a0a2f0..5681876 100644 --- a/demo/gdip/nuklear_gdip.h +++ b/demo/gdip/nuklear_gdip.h @@ -471,15 +471,25 @@ nk_gdip_fill_rect(short x, short y, unsigned short w, } } +static BOOL +SetPoint(POINT *p, LONG x, LONG y) +{ + if (!p) + return FALSE; + p->x = x; + p->y = y; + return TRUE; +} + static void nk_gdip_fill_triangle(short x0, short y0, short x1, short y1, short x2, short y2, struct nk_color col) { - POINT points[] = { - { x0, y0 }, - { x1, y1 }, - { x2, y2 }, - }; + POINT points[3]; + + SetPoint(&points[0], x0, y0); + SetPoint(&points[1], x1, y1); + SetPoint(&points[2], x2, y2); GdipSetSolidFillColor(gdip.brush, convert_color(col)); GdipFillPolygonI(gdip.memory, gdip.brush, points, 3, FillModeAlternate); @@ -489,12 +499,13 @@ static void nk_gdip_stroke_triangle(short x0, short y0, short x1, short y1, short x2, short y2, unsigned short line_thickness, struct nk_color col) { - POINT points[] = { - { x0, y0 }, - { x1, y1 }, - { x2, y2 }, - { x0, y0 }, - }; + POINT points[4]; + + SetPoint(&points[0], x0, y0); + SetPoint(&points[1], x1, y1); + SetPoint(&points[2], x2, y2); + SetPoint(&points[3], x0, y0); + GdipSetPenWidth(gdip.pen, (REAL)line_thickness); GdipSetPenColor(gdip.pen, convert_color(col)); GdipDrawPolygonI(gdip.memory, gdip.pen, points, 4); @@ -575,7 +586,12 @@ nk_gdip_draw_text(short x, short y, unsigned short w, unsigned short h, { int wsize; WCHAR* wstr; - RectF layout = { (FLOAT)x, (FLOAT)y, (FLOAT)w, (FLOAT)h }; + RectF layout; + + layout.X = x; + layout.Y = y; + layout.Width = w; + layout.Height = h; if(!text || !font || !len) return; diff --git a/demo/glfw_opengl2/Makefile b/demo/glfw_opengl2/Makefile index c08d65f..ec8bcf3 100644 --- a/demo/glfw_opengl2/Makefile +++ b/demo/glfw_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl3/Makefile b/demo/glfw_opengl3/Makefile index da95261..57e0936 100644 --- a/demo/glfw_opengl3/Makefile +++ b/demo/glfw_opengl3/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl3/nuklear_glfw_gl3.h b/demo/glfw_opengl3/nuklear_glfw_gl3.h index aa678fb..de06b17 100644 --- a/demo/glfw_opengl3/nuklear_glfw_gl3.h +++ b/demo/glfw_opengl3/nuklear_glfw_gl3.h @@ -328,9 +328,9 @@ nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff) NK_API void nk_glfw3_mouse_button_callback(GLFWwindow* win, int button, int action, int mods) { + struct nk_glfw* glfw = glfwGetWindowUserPointer(win); double x, y; if (button != GLFW_MOUSE_BUTTON_LEFT) return; - struct nk_glfw* glfw = glfwGetWindowUserPointer(win); glfwGetCursorPos(win, &x, &y); if (action == GLFW_PRESS) { double dt = glfwGetTime() - glfw->last_button_click; @@ -354,13 +354,13 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) NK_INTERN void nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len) { + struct nk_glfw* glfw = usr.ptr; char *str = 0; if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; memcpy(str, text, (size_t)len); str[len] = '\0'; - struct nk_glfw* glfw = usr.ptr; glfwSetClipboardString(glfw->win, str); free(str); } diff --git a/demo/glfw_opengl4/Makefile b/demo/glfw_opengl4/Makefile index da95261..57e0936 100644 --- a/demo/glfw_opengl4/Makefile +++ b/demo/glfw_opengl4/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl4/nuklear_glfw_gl4.h b/demo/glfw_opengl4/nuklear_glfw_gl4.h index 4b644a4..973bfad 100644 --- a/demo/glfw_opengl4/nuklear_glfw_gl4.h +++ b/demo/glfw_opengl4/nuklear_glfw_gl4.h @@ -116,6 +116,7 @@ NK_API void nk_glfw3_device_create() { GLint status; + GLint len = 0; static const GLchar *vertex_shader = NK_SHADER_VERSION NK_SHADER_BINDLESS @@ -156,7 +157,6 @@ nk_glfw3_device_create() glCompileShader(dev->frag_shdr); glGetShaderiv(dev->vert_shdr, GL_COMPILE_STATUS, &status); - GLint len = 0; glGetShaderiv(dev->vert_shdr, GL_INFO_LOG_LENGTH, &len); if (len > 1) { char *log = (char*)calloc((size_t)len, sizeof(char)); diff --git a/demo/overview.c b/demo/overview.c index afd182d..53c5cb6 100644 --- a/demo/overview.c +++ b/demo/overview.c @@ -199,7 +199,7 @@ overview(struct nk_context *ctx) /* Basic widgets */ static int int_slider = 5; static float float_slider = 2.5f; - static size_t prog_value = 40; + static nk_size prog_value = 40; static float property_float = 2; static int property_int = 10; static int property_neg = 10; @@ -226,7 +226,7 @@ overview(struct nk_context *ctx) nk_label(ctx, "Slider float", NK_TEXT_LEFT); nk_slider_float(ctx, 0, &float_slider, 5.0, 0.5f); - nk_labelf(ctx, NK_TEXT_LEFT, "Progressbar: %zu" , prog_value); + nk_labelf(ctx, NK_TEXT_LEFT, "Progressbar: %u" , (int)prog_value); nk_progress(ctx, &prog_value, 100, NK_MODIFIABLE); nk_layout_row(ctx, NK_STATIC, 25, 2, ratio); diff --git a/demo/sdl2surface_rawfb/Makefile b/demo/sdl2surface_rawfb/Makefile index ce71e79..b1e5830 100644 --- a/demo/sdl2surface_rawfb/Makefile +++ b/demo/sdl2surface_rawfb/Makefile @@ -1,4 +1,4 @@ -CFLAGS=`sdl2-config --cflags --libs` -std=c11 -Wall -O0 -g -fvisibility=hidden -Wno-unused `pkg-config SDL2_ttf --cflags --libs` +CFLAGS=`sdl2-config --cflags --libs` -std=c89 -Wall -O0 -g -fvisibility=hidden -Wno-unused `pkg-config SDL2_ttf --cflags --libs` .PHONY: clean diff --git a/demo/sdl2surface_rawfb/main.c b/demo/sdl2surface_rawfb/main.c index 2d3fa78..9c25c1e 100644 --- a/demo/sdl2surface_rawfb/main.c +++ b/demo/sdl2surface_rawfb/main.c @@ -36,7 +36,7 @@ static int sdl_button_to_nk(int button) switch(button) { default: - //ft + /* ft */ case SDL_BUTTON_LEFT: return NK_BUTTON_LEFT; break; @@ -177,7 +177,7 @@ int main(int argc, char **argv) } nk_end(&(context->ctx)); -// grid_demo(&(context->ctx)); + /* grid_demo(&(context->ctx)); */ nk_sdlsurface_render(context, clear, 1); diff --git a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h index 94496ff..e36ea31 100644 --- a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h +++ b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h @@ -845,7 +845,8 @@ nk_sdlsurface_init(SDL_Surface *fb, float fontSize) { SDL_assert(sdlsurface->font_tex->pitch == sdlsurface->font_tex->w * 4); uint32_t *fontPixels = (uint32_t *)sdlsurface->font_tex->pixels; - for (int i = 0; i < sdlsurface->font_tex->w * sdlsurface->font_tex->h; i++) + int i; + for (i = 0; i < sdlsurface->font_tex->w * sdlsurface->font_tex->h; i++) { uint32_t col = fontPixels[i]; fontPixels[i] &= 0xFFFF00; @@ -961,8 +962,8 @@ nk_sdlsurface_draw_text(const struct sdlsurface_context *sdlsurface, dst_rect.x = x + g.offset.x + rect.x; dst_rect.y = g.offset.y + rect.y; - dst_rect.w = ceilf(g.width); - dst_rect.h = ceilf(g.height); + dst_rect.w = ceil(g.width); + dst_rect.h = ceil(g.height); /* Use software rescaling to blit glyph from font_text to framebuffer */ nk_sdlsurface_stretch_image(sdlsurface->fb, sdlsurface->font_tex, &dst_rect, &src_rect, &sdlsurface->scissors, &fg); diff --git a/demo/sdl_opengl2/Makefile b/demo/sdl_opengl2/Makefile index b73174a..967e3f6 100644 --- a/demo/sdl_opengl2/Makefile +++ b/demo/sdl_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengl3/Makefile b/demo/sdl_opengl3/Makefile index c6fcb45..1c91995 100644 --- a/demo/sdl_opengl3/Makefile +++ b/demo/sdl_opengl3/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengles2/Makefile b/demo/sdl_opengles2/Makefile index e1820d7..9c85d89 100644 --- a/demo/sdl_opengles2/Makefile +++ b/demo/sdl_opengles2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengles2/main.c b/demo/sdl_opengles2/main.c index c38f2d0..bfb8d9c 100644 --- a/demo/sdl_opengles2/main.c +++ b/demo/sdl_opengles2/main.c @@ -95,17 +95,19 @@ MainLoop(void* loopArg){ nk_layout_row_end(ctx); nk_menubar_end(ctx); - enum {EASY, HARD}; - static int op = EASY; - static int property = 20; - nk_layout_row_static(ctx, 30, 80, 1); - if (nk_button_label(ctx, "button")) - fprintf(stdout, "button pressed\n"); - nk_layout_row_dynamic(ctx, 30, 2); - if (nk_option_label(ctx, "easy", op == EASY)) op = EASY; - if (nk_option_label(ctx, "hard", op == HARD)) op = HARD; - nk_layout_row_dynamic(ctx, 25, 1); - nk_property_int(ctx, "Compression:", 0, &property, 100, 10, 1); + { + enum {EASY, HARD}; + static int op = EASY; + static int property = 20; + nk_layout_row_static(ctx, 30, 80, 1); + if (nk_button_label(ctx, "button")) + fprintf(stdout, "button pressed\n"); + nk_layout_row_dynamic(ctx, 30, 2); + if (nk_option_label(ctx, "easy", op == EASY)) op = EASY; + if (nk_option_label(ctx, "hard", op == HARD)) op = HARD; + nk_layout_row_dynamic(ctx, 25, 1); + nk_property_int(ctx, "Compression:", 0, &property, 100, 10, 1); + } } nk_end(ctx); diff --git a/demo/x11_opengl2/Makefile b/demo/x11_opengl2/Makefile index a3d6d32..824bc97 100644 --- a/demo/x11_opengl2/Makefile +++ b/demo/x11_opengl2/Makefile @@ -6,7 +6,7 @@ CC = clang DCC = gcc # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_opengl3/Makefile b/demo/x11_opengl3/Makefile index a3d6d32..824bc97 100644 --- a/demo/x11_opengl3/Makefile +++ b/demo/x11_opengl3/Makefile @@ -6,7 +6,7 @@ CC = clang DCC = gcc # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c89 -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_rawfb/nuklear_rawfb.h b/demo/x11_rawfb/nuklear_rawfb.h index 710065e..a953993 100644 --- a/demo/x11_rawfb/nuklear_rawfb.h +++ b/demo/x11_rawfb/nuklear_rawfb.h @@ -35,7 +35,7 @@ struct rawfb_context; typedef enum rawfb_pixel_layout { PIXEL_LAYOUT_XRGB_8888, - PIXEL_LAYOUT_RGBX_8888, + PIXEL_LAYOUT_RGBX_8888 } rawfb_pl; diff --git a/demo/x11_rawfb/nuklear_xlib.h b/demo/x11_rawfb/nuklear_xlib.h index 3a13931..2f9aa6f 100644 --- a/demo/x11_rawfb/nuklear_xlib.h +++ b/demo/x11_rawfb/nuklear_xlib.h @@ -254,10 +254,10 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt, struct r } else if (evt->type == Expose || evt->type == ConfigureNotify) { /* Window resize handler */ void *fb; + rawfb_pl pl; unsigned int width, height; XWindowAttributes attr; XGetWindowAttributes(dpy, win, &attr); - rawfb_pl pl; width = (unsigned int)attr.width; height = (unsigned int)attr.height; diff --git a/demo/x11_xft/nuklear_xlib.h b/demo/x11_xft/nuklear_xlib.h index cb14e68..436307f 100644 --- a/demo/x11_xft/nuklear_xlib.h +++ b/demo/x11_xft/nuklear_xlib.h @@ -420,6 +420,10 @@ NK_INTERN void nk_xsurf_draw_text(XSurface *surf, short x, short y, unsigned short w, unsigned short h, const char *text, int len, XFont *font, struct nk_color cbg, struct nk_color cfg) { +#ifdef NK_XLIB_USE_XFT + XRenderColor xrc; + XftColor color; +#endif int tx, ty; unsigned long bg = nk_color_from_byte(&cbg.r); unsigned long fg = nk_color_from_byte(&cfg.r); @@ -431,8 +435,6 @@ nk_xsurf_draw_text(XSurface *surf, short x, short y, unsigned short w, unsigned tx = (int)x; ty = (int)y + font->ascent; #ifdef NK_XLIB_USE_XFT - XRenderColor xrc; - XftColor color; xrc.red = cfg.r * 257; xrc.green = cfg.g * 257; xrc.blue = cfg.b * 257; @@ -640,17 +642,20 @@ nk_xfont_get_text_width(nk_handle handle, float height, const char *text, int le { XFont *font = (XFont*)handle.ptr; - if(!font || !text) - return 0; - #ifdef NK_XLIB_USE_XFT XGlyphInfo g; + if(!font || !text) + return 0; + XftTextExtentsUtf8(xlib.dpy, font->ft, (FcChar8*)text, len, &g); return g.xOff; #else XRectangle r; + if(!font || !text) + return 0; + if(font->set) { XmbTextExtents(font->set, (const char*)text, len, NULL, &r); return (float)r.width; From e129ca6e67f6664ef297bca66ece4ed79e2ad666 Mon Sep 17 00:00:00 2001 From: Aloz1 Date: Wed, 15 Dec 2021 10:36:03 +1100 Subject: [PATCH 28/89] Rename package.json to clib.json (#365) The clib package manager has deprecated package.json in favor of clib.json (probably to reduce confusion between clib and other package managers). As far as I can tell, there's no difference in file format, just file name. * Remove version bump * Fix spelling of contributor Co-authored-by: Rob Loach --- Readme.md | 2 +- package.json => clib.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename package.json => clib.json (100%) diff --git a/Readme.md b/Readme.md index 446b853..401ea3e 100644 --- a/Readme.md +++ b/Readme.md @@ -186,7 +186,7 @@ Reviewing changes to `src/*` and `nuklear.h`: * Indentation. * Curly bracket (`{}`) placement. * Ensure that the contributor has bumped the appropriate version in - [package.json](https://github.com/Immediate-Mode-UI/Nuklear/blob/master/package.json) + [clib.json](https://github.com/Immediate-Mode-UI/Nuklear/blob/master/clib.json) and added their changes to the [CHANGELOG](https://github.com/Immediate-Mode-UI/Nuklear/blob/master/src/CHANGELOG). * Have at least one other person review the changes before merging. diff --git a/package.json b/clib.json similarity index 100% rename from package.json rename to clib.json From eadb4179afe84a10344a2f90e159e9fce07de8ab Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 14 Dec 2021 21:10:30 -0500 Subject: [PATCH 29/89] sdlrenderer: C89 support --- demo/sdl_sdlrenderer/Makefile | 2 +- demo/sdl_sdlrenderer/main.c | 2 +- .../sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h | 30 ++++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/demo/sdl_sdlrenderer/Makefile b/demo/sdl_sdlrenderer/Makefile index 362eed4..bb3feeb 100644 --- a/demo/sdl_sdlrenderer/Makefile +++ b/demo/sdl_sdlrenderer/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c99 -pedantic -O0 +CFLAGS += -std=c89 -pedantic -O0 CFLAGS += `sdl2-config --cflags` SRC = main.c diff --git a/demo/sdl_sdlrenderer/main.c b/demo/sdl_sdlrenderer/main.c index 0acd0ca..74dab49 100644 --- a/demo/sdl_sdlrenderer/main.c +++ b/demo/sdl_sdlrenderer/main.c @@ -71,6 +71,7 @@ main(int argc, char *argv[]) SDL_Window *win; SDL_Renderer *renderer; int running = 1; + int flags = 0; /* GUI */ struct nk_context *ctx; @@ -89,7 +90,6 @@ main(int argc, char *argv[]) exit(-1); } - int flags = 0; flags |= SDL_RENDERER_ACCELERATED; flags |= SDL_RENDERER_PRESENTVSYNC; diff --git a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h index 4dabb3e..dc969b3 100644 --- a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h +++ b/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h @@ -73,6 +73,8 @@ nk_sdl_render(enum nk_anti_aliasing AA) struct nk_sdl_device *dev = &sdl.ogl; { + SDL_Rect saved_clip; + SDL_bool clipping_enabled; int vs = sizeof(struct nk_sdl_vertex); size_t vp = offsetof(struct nk_sdl_vertex, position); size_t vt = offsetof(struct nk_sdl_vertex, uv); @@ -110,9 +112,8 @@ nk_sdl_render(enum nk_anti_aliasing AA) /* iterate over and execute each draw command */ offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf); - - SDL_Rect saved_clip; - SDL_bool clipping_enabled = SDL_RenderIsClipEnabled(sdl.renderer); + + clipping_enabled = SDL_RenderIsClipEnabled(sdl.renderer); SDL_RenderGetClipRect(sdl.renderer, &saved_clip); nk_draw_foreach(cmd, &sdl.ctx, &dev->cmds) @@ -128,18 +129,19 @@ nk_sdl_render(enum nk_anti_aliasing AA) SDL_RenderSetClipRect(sdl.renderer, &r); } - const void *vertices = nk_buffer_memory_const(&vbuf); + { + const void *vertices = nk_buffer_memory_const(&vbuf); - int ret = SDL_RenderGeometryRaw(sdl.renderer, - (SDL_Texture *)cmd->texture.ptr, - (const void*)((const nk_byte*)vertices + vp), vs, - (const void*)((const nk_byte*)vertices + vc), vs, - (const void*)((const nk_byte*)vertices + vt), vs, - (vbuf.needed / vs), - (void *) offset, cmd->elem_count, 2); - - offset += cmd->elem_count; + SDL_RenderGeometryRaw(sdl.renderer, + (SDL_Texture *)cmd->texture.ptr, + (const void*)((const nk_byte*)vertices + vp), vs, + (const void*)((const nk_byte*)vertices + vc), vs, + (const void*)((const nk_byte*)vertices + vt), vs, + (vbuf.needed / vs), + (void *) offset, cmd->elem_count, 2); + offset += cmd->elem_count; + } } SDL_RenderSetClipRect(sdl.renderer, &saved_clip); @@ -317,7 +319,7 @@ void nk_sdl_shutdown(void) nk_font_atlas_clear(&sdl.atlas); nk_free(&sdl.ctx); SDL_DestroyTexture(dev->font_tex); - //glDeleteTextures(1, &dev->font_tex); + /* glDeleteTextures(1, &dev->font_tex); */ nk_buffer_free(&dev->cmds); memset(&sdl, 0, sizeof(sdl)); } From aeb518558e7d6e9db028a3827fe09fb65f5bbaf9 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 14 Dec 2021 22:03:47 -0500 Subject: [PATCH 30/89] clib: Add MIT license --- clib.json | 1 + 1 file changed, 1 insertion(+) diff --git a/clib.json b/clib.json index 65aa3eb..43215ed 100644 --- a/clib.json +++ b/clib.json @@ -4,5 +4,6 @@ "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], + "license": "MIT", "src": ["nuklear.h"] } From f27ac6ef02c8aecd8a78a8af0620dad3d2ca3530 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 14 Dec 2021 22:49:12 -0500 Subject: [PATCH 31/89] Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 --- clib.json | 2 +- nuklear.h | 626 ++++++++++++++++++++++++-------------------- src/CHANGELOG | 1 + src/stb_rect_pack.h | 37 ++- src/stb_truetype.h | 588 +++++++++++++++++++++++------------------ 5 files changed, 689 insertions(+), 565 deletions(-) diff --git a/clib.json b/clib.json index 65aa3eb..4b4b3c9 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.09.0", + "version": "4.09.1", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/nuklear.h b/nuklear.h index ecc3beb..2251475 100644 --- a/nuklear.h +++ b/nuklear.h @@ -10714,12 +10714,18 @@ nk__draw_next(const struct nk_draw_command *cmd, #endif -/* stb_rect_pack.h - v1.00 - public domain - rectangle packing */ +/* stb_rect_pack.h - v1.01 - public domain - rectangle packing */ /* Sean Barrett 2014 */ /* */ /* Useful for e.g. packing rectangular textures into an atlas. */ /* Does not do rotation. */ /* */ +/* Before #including, */ +/* */ +/* #define STB_RECT_PACK_IMPLEMENTATION */ +/* */ +/* in the file that you want to have the implementation. */ +/* */ /* Not necessarily the awesomest packing method, but better than */ /* the totally naive one in stb_truetype (which is primarily what */ /* this is meant to replace). */ @@ -10751,6 +10757,7 @@ nk__draw_next(const struct nk_draw_command *cmd, /* */ /* Version history: */ /* */ +/* 1.01 (2021-07-11) always use large rect mode, expose STBRP__MAXVAL in public section */ /* 1.00 (2019-02-25) avoid small space waste; gracefully fail too-wide rectangles */ /* 0.99 (2019-02-07) warning fixes */ /* 0.11 (2017-03-03) return packing success/fail result */ @@ -10791,11 +10798,10 @@ typedef struct stbrp_context stbrp_context; typedef struct stbrp_node stbrp_node; typedef struct stbrp_rect stbrp_rect; -#ifdef STBRP_LARGE_RECTS typedef int stbrp_coord; -#else -typedef unsigned short stbrp_coord; -#endif + +#define STBRP__MAXVAL 0x7fffffff +/* Mostly for internal use, but this is the maximum supported coordinate value. */ STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects); /* Assign packed locations to rectangles. The rectangles are of type */ @@ -10925,8 +10931,10 @@ struct stbrp_context #ifdef _MSC_VER #define STBRP__NOTUSED(v) (void)(v) +#define STBRP__CDECL __cdecl #else #define STBRP__NOTUSED(v) (void)sizeof(v) +#define STBRP__CDECL #endif enum @@ -10969,9 +10977,6 @@ STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_ou STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes) { int i; -#ifndef STBRP_LARGE_RECTS - STBRP_ASSERT(width <= 0xffff && height <= 0xffff); -#endif for (i=0; i < num_nodes-1; ++i) nodes[i].next = &nodes[i+1]; @@ -10990,11 +10995,7 @@ STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, context->extra[0].y = 0; context->extra[0].next = &context->extra[1]; context->extra[1].x = (stbrp_coord) width; -#ifdef STBRP_LARGE_RECTS context->extra[1].y = (1<<30); -#else - context->extra[1].y = 65535; -#endif context->extra[1].next = NULL; } @@ -11026,7 +11027,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0 if (node->y > min_y) { /* raise min_y higher. */ /* we've accounted for all waste up to min_y, */ - /* but we'll now add more waste for everything we've visited */ + /* but we'll now add more waste for everything we've visted */ waste_area += visited_width * (node->y - min_y); min_y = node->y; /* the first time through, visited_width might be reduced */ @@ -11236,7 +11237,7 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, i return res; } -static int rect_height_compare(const void *a, const void *b) +static int STBRP__CDECL rect_height_compare(const void *a, const void *b) { const stbrp_rect *p = (const stbrp_rect *) a; const stbrp_rect *q = (const stbrp_rect *) b; @@ -11247,19 +11248,13 @@ static int rect_height_compare(const void *a, const void *b) return (p->w > q->w) ? -1 : (p->w < q->w); } -static int rect_original_order(const void *a, const void *b) +static int STBRP__CDECL rect_original_order(const void *a, const void *b) { const stbrp_rect *p = (const stbrp_rect *) a; const stbrp_rect *q = (const stbrp_rect *) b; return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed); } -#ifdef STBRP_LARGE_RECTS -#define STBRP__MAXVAL 0xffffffff -#else -#define STBRP__MAXVAL 0xffff -#endif - STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects) { int i, all_rects_packed = 1; @@ -11343,8 +11338,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------------ */ -/* stb_truetype.h - v1.24 - public domain */ -/* authored from 2009-2020 by Sean Barrett / RAD Game Tools */ +/* stb_truetype.h - v1.26 - public domain */ +/* authored from 2009-2021 by Sean Barrett / RAD Game Tools */ /* */ /* ======================================================================= */ /* */ @@ -11398,11 +11393,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* Johan Duparc Thomas Fields */ /* Hou Qiming Derek Vinyard */ /* Rob Loach Cort Stratton */ -/* Kenney Phillis Jr. Brian Costabile */ -/* Ken Voskuil (kaesve) */ +/* Kenney Phillis Jr. Brian Costabile */ +/* Ken Voskuil (kaesve) */ /* */ /* VERSION HISTORY */ /* */ +/* 1.26 (2021-08-28) fix broken rasterizer */ +/* 1.25 (2021-07-11) many fixes */ /* 1.24 (2020-02-05) fix warning */ /* 1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS) */ /* 1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined */ @@ -11615,8 +11612,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* // SAMPLE PROGRAMS */ /* // */ /* */ -/* Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless */ -/* */ +/* Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless. */ +/* See "tests/truetype_demo_win32.c" for a complete version. */ #if 0 #define STB_TRUETYPE_IMPLEMENTATION /* force following include to generate implementation */ #include "stb_truetype.h" @@ -11642,6 +11639,8 @@ void my_stbtt_initfont(void) void my_stbtt_print(float x, float y, char *text) { /* assume orthographic projection with units = screen pixels, origin at top left */ + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, ftex); glBegin(GL_QUADS); @@ -11649,10 +11648,10 @@ void my_stbtt_print(float x, float y, char *text) if (*text >= 32 && *text < 128) { stbtt_aligned_quad q; stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);/* 1=opengl & d3d10+,0=d3d9 */ - glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0); - glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0); - glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1); - glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1); + glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y0); + glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y0); + glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y1); + glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y1); } ++text; } @@ -11992,7 +11991,7 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip); /* If skip != 0, this tells stb_truetype to skip any codepoints for which */ /* there is no corresponding glyph. If skip=0, which is the default, then */ -/* codepoints without a glyph received the font's "missing character" glyph, */ +/* codepoints without a glyph recived the font's "missing character" glyph, */ /* typically an empty box by convention. */ STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, /* same data as above */ @@ -12198,6 +12197,7 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices); /* frees the data allocated above */ +STBTT_DEF unsigned char *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl); STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg); STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg); /* fills svg with the character's SVG data. */ @@ -12884,12 +12884,12 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep search += 2; { - stbtt_uint16 offset, start; + stbtt_uint16 offset, start, last; stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1); - STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item)); start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item); - if (unicode_codepoint < start) + last = ttUSHORT(data + endCount + 2*item); + if (unicode_codepoint < start || unicode_codepoint > last) return 0; offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item); @@ -13216,7 +13216,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s if (comp_verts) STBTT_free(comp_verts, info->userdata); return 0; } - if (num_vertices > 0) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); + if (num_vertices > 0 && vertices) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex)); if (vertices) STBTT_free(vertices, info->userdata); vertices = tmp; @@ -13479,7 +13479,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st subrs = stbtt__cid_get_glyph_subrs(info, glyph_index); has_subrs = 1; } - /* fallthrough */ + /* FALLTHROUGH */ case 0x1D: /* callgsubr */ if (sp < 1) return STBTT__CSERR("call(g|)subr stack"); v = (int) s[--sp]; @@ -13584,7 +13584,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st } break; default: - if (b0 != 255 && b0 != 28 && (b0 < 32 || b0 > 254)) + if (b0 != 255 && b0 != 28 && b0 < 32) return STBTT__CSERR("reserved operator"); /* push immediate */ @@ -13696,7 +13696,7 @@ STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningent return length; } -static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) { stbtt_uint8 *data = info->data + info->kern; stbtt_uint32 needle, straw; @@ -13726,243 +13726,225 @@ static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph return 0; } -static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph) +static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph) { - stbtt_uint16 coverageFormat = ttUSHORT(coverageTable); - switch(coverageFormat) { - case 1: { - stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2); + stbtt_uint16 coverageFormat = ttUSHORT(coverageTable); + switch (coverageFormat) { + case 1: { + stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2); - /* Binary search. */ - stbtt_int32 l=0, r=glyphCount-1, m; - int straw, needle=glyph; - while (l <= r) { - stbtt_uint8 *glyphArray = coverageTable + 4; - stbtt_uint16 glyphID; - m = (l + r) >> 1; - glyphID = ttUSHORT(glyphArray + 2 * m); - straw = glyphID; - if (needle < straw) - r = m - 1; - else if (needle > straw) - l = m + 1; - else { - return m; - } + /* Binary search. */ + stbtt_int32 l=0, r=glyphCount-1, m; + int straw, needle=glyph; + while (l <= r) { + stbtt_uint8 *glyphArray = coverageTable + 4; + stbtt_uint16 glyphID; + m = (l + r) >> 1; + glyphID = ttUSHORT(glyphArray + 2 * m); + straw = glyphID; + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else { + return m; } - } break; + } + break; + } - case 2: { - stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2); - stbtt_uint8 *rangeArray = coverageTable + 4; + case 2: { + stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2); + stbtt_uint8 *rangeArray = coverageTable + 4; - /* Binary search. */ - stbtt_int32 l=0, r=rangeCount-1, m; - int strawStart, strawEnd, needle=glyph; - while (l <= r) { - stbtt_uint8 *rangeRecord; - m = (l + r) >> 1; - rangeRecord = rangeArray + 6 * m; - strawStart = ttUSHORT(rangeRecord); - strawEnd = ttUSHORT(rangeRecord + 2); - if (needle < strawStart) - r = m - 1; - else if (needle > strawEnd) - l = m + 1; - else { - stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4); - return startCoverageIndex + glyph - strawStart; - } + /* Binary search. */ + stbtt_int32 l=0, r=rangeCount-1, m; + int strawStart, strawEnd, needle=glyph; + while (l <= r) { + stbtt_uint8 *rangeRecord; + m = (l + r) >> 1; + rangeRecord = rangeArray + 6 * m; + strawStart = ttUSHORT(rangeRecord); + strawEnd = ttUSHORT(rangeRecord + 2); + if (needle < strawStart) + r = m - 1; + else if (needle > strawEnd) + l = m + 1; + else { + stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4); + return startCoverageIndex + glyph - strawStart; } - } break; + } + break; + } - default: { - /* There are no other cases. */ - STBTT_assert(0); - } break; - } + default: return -1; /* unsupported */ + } - return -1; + return -1; } static stbtt_int32 stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph) { - stbtt_uint16 classDefFormat = ttUSHORT(classDefTable); - switch(classDefFormat) - { - case 1: { - stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2); - stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4); - stbtt_uint8 *classDef1ValueArray = classDefTable + 6; + stbtt_uint16 classDefFormat = ttUSHORT(classDefTable); + switch (classDefFormat) + { + case 1: { + stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2); + stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4); + stbtt_uint8 *classDef1ValueArray = classDefTable + 6; - if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount) - return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID)); + if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount) + return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID)); + break; + } - classDefTable = classDef1ValueArray + 2 * glyphCount; - } break; + case 2: { + stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2); + stbtt_uint8 *classRangeRecords = classDefTable + 4; - case 2: { - stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2); - stbtt_uint8 *classRangeRecords = classDefTable + 4; + /* Binary search. */ + stbtt_int32 l=0, r=classRangeCount-1, m; + int strawStart, strawEnd, needle=glyph; + while (l <= r) { + stbtt_uint8 *classRangeRecord; + m = (l + r) >> 1; + classRangeRecord = classRangeRecords + 6 * m; + strawStart = ttUSHORT(classRangeRecord); + strawEnd = ttUSHORT(classRangeRecord + 2); + if (needle < strawStart) + r = m - 1; + else if (needle > strawEnd) + l = m + 1; + else + return (stbtt_int32)ttUSHORT(classRangeRecord + 4); + } + break; + } - /* Binary search. */ - stbtt_int32 l=0, r=classRangeCount-1, m; - int strawStart, strawEnd, needle=glyph; - while (l <= r) { - stbtt_uint8 *classRangeRecord; - m = (l + r) >> 1; - classRangeRecord = classRangeRecords + 6 * m; - strawStart = ttUSHORT(classRangeRecord); - strawEnd = ttUSHORT(classRangeRecord + 2); - if (needle < strawStart) - r = m - 1; - else if (needle > strawEnd) - l = m + 1; - else - return (stbtt_int32)ttUSHORT(classRangeRecord + 4); - } + default: + return -1; /* Unsupported definition type, return an error. */ + } - classDefTable = classRangeRecords + 6 * classRangeCount; - } break; - - default: { - /* There are no other cases. */ - STBTT_assert(0); - } break; - } - - return -1; + /* "All glyphs not assigned to a class fall into class 0". (OpenType spec) */ + return 0; } /* Define to STBTT_assert(x) if you want to break on unimplemented formats. */ #define STBTT_GPOS_TODO_assert(x) -static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) { - stbtt_uint16 lookupListOffset; - stbtt_uint8 *lookupList; - stbtt_uint16 lookupCount; - stbtt_uint8 *data; - stbtt_int32 i; + stbtt_uint16 lookupListOffset; + stbtt_uint8 *lookupList; + stbtt_uint16 lookupCount; + stbtt_uint8 *data; + stbtt_int32 i, sti; - if (!info->gpos) return 0; + if (!info->gpos) return 0; - data = info->data + info->gpos; + data = info->data + info->gpos; - if (ttUSHORT(data+0) != 1) return 0; /* Major version 1 */ - if (ttUSHORT(data+2) != 0) return 0; /* Minor version 0 */ + if (ttUSHORT(data+0) != 1) return 0; /* Major version 1 */ + if (ttUSHORT(data+2) != 0) return 0; /* Minor version 0 */ - lookupListOffset = ttUSHORT(data+8); - lookupList = data + lookupListOffset; - lookupCount = ttUSHORT(lookupList); + lookupListOffset = ttUSHORT(data+8); + lookupList = data + lookupListOffset; + lookupCount = ttUSHORT(lookupList); - for (i=0; i= pairSetCount) return 0; - /* Binary search. */ - while (l <= r) { - stbtt_uint16 secondGlyph; - stbtt_uint8 *pairValue; - m = (l + r) >> 1; - pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m; - secondGlyph = ttUSHORT(pairValue); - straw = secondGlyph; - if (needle < straw) - r = m - 1; - else if (needle > straw) - l = m + 1; - else { - stbtt_int16 xAdvance = ttSHORT(pairValue + 2); - return xAdvance; - } - } - } break; + needle=glyph2; + r=pairValueCount-1; + l=0; - case 2: { - stbtt_uint16 valueFormat1 = ttUSHORT(table + 4); - stbtt_uint16 valueFormat2 = ttUSHORT(table + 6); + /* Binary search. */ + while (l <= r) { + stbtt_uint16 secondGlyph; + stbtt_uint8 *pairValue; + m = (l + r) >> 1; + pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m; + secondGlyph = ttUSHORT(pairValue); + straw = secondGlyph; + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else { + stbtt_int16 xAdvance = ttSHORT(pairValue + 2); + return xAdvance; + } + } + } else + return 0; + break; + } - stbtt_uint16 classDef1Offset = ttUSHORT(table + 8); - stbtt_uint16 classDef2Offset = ttUSHORT(table + 10); - int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1); - int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2); + case 2: { + stbtt_uint16 valueFormat1 = ttUSHORT(table + 4); + stbtt_uint16 valueFormat2 = ttUSHORT(table + 6); + if (valueFormat1 == 4 && valueFormat2 == 0) { /* Support more formats? */ + stbtt_uint16 classDef1Offset = ttUSHORT(table + 8); + stbtt_uint16 classDef2Offset = ttUSHORT(table + 10); + int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1); + int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2); - stbtt_uint16 class1Count = ttUSHORT(table + 12); - stbtt_uint16 class2Count = ttUSHORT(table + 14); - STBTT_assert(glyph1class < class1Count); - STBTT_assert(glyph2class < class2Count); + stbtt_uint16 class1Count = ttUSHORT(table + 12); + stbtt_uint16 class2Count = ttUSHORT(table + 14); + stbtt_uint8 *class1Records, *class2Records; + stbtt_int16 xAdvance; - /* TODO: Support more formats. */ - STBTT_GPOS_TODO_assert(valueFormat1 == 4); - if (valueFormat1 != 4) return 0; - STBTT_GPOS_TODO_assert(valueFormat2 == 0); - if (valueFormat2 != 0) return 0; + if (glyph1class < 0 || glyph1class >= class1Count) return 0; /* malformed */ + if (glyph2class < 0 || glyph2class >= class2Count) return 0; /* malformed */ - if (glyph1class >= 0 && glyph1class < class1Count && glyph2class >= 0 && glyph2class < class2Count) { - stbtt_uint8 *class1Records = table + 16; - stbtt_uint8 *class2Records = class1Records + 2 * (glyph1class * class2Count); - stbtt_int16 xAdvance = ttSHORT(class2Records + 2 * glyph2class); - return xAdvance; - } - } break; - - default: { - /* There are no other cases. */ - STBTT_assert(0); - break; - }; - } - } - break; - }; + class1Records = table + 16; + class2Records = class1Records + 2 * (glyph1class * class2Count); + xAdvance = ttSHORT(class2Records + 2 * glyph2class); + return xAdvance; + } else + return 0; + break; + } default: - /* TODO: Implement other stuff. */ - break; - } - } + return 0; /* Unsupported position format */ + } + } + } - return 0; + return 0; } STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2) @@ -14420,6 +14402,23 @@ static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edg } } +static float stbtt__sized_trapezoid_area(float height, float top_width, float bottom_width) +{ + STBTT_assert(top_width >= 0); + STBTT_assert(bottom_width >= 0); + return (top_width + bottom_width) / 2.0f * height; +} + +static float stbtt__position_trapezoid_area(float height, float tx0, float tx1, float bx0, float bx1) +{ + return stbtt__sized_trapezoid_area(height, tx1 - tx0, bx1 - bx0); +} + +static float stbtt__sized_triangle_area(float height, float width) +{ + return height * width / 2; +} + static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top) { float y_bottom = y_top+1; @@ -14474,13 +14473,13 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, float height; /* simple case, only spans one pixel */ int x = (int) x_top; - height = sy1 - sy0; + height = (sy1 - sy0) * e->direction; STBTT_assert(x >= 0 && x < len); - scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2) * height; - scanline_fill[x] += e->direction * height; /* everything right of this pixel is filled */ + scanline[x] += stbtt__position_trapezoid_area(height, x_top, x+1.0f, x_bottom, x+1.0f); + scanline_fill[x] += height; /* everything right of this pixel is filled */ } else { int x,x1,x2; - float y_crossing, step, sign, area; + float y_crossing, y_final, step, sign, area; /* covers 2+ pixels */ if (x_top > x_bottom) { /* flip scanline vertically; signed area is the same */ @@ -14493,29 +14492,79 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, dy = -dy; t = x0, x0 = xb, xb = t; } + STBTT_assert(dy >= 0); + STBTT_assert(dx >= 0); x1 = (int) x_top; x2 = (int) x_bottom; /* compute intersection with y axis at x1+1 */ - y_crossing = (x1+1 - x0) * dy + y_top; + y_crossing = y_top + dy * (x1+1 - x0); + + /* compute intersection with y axis at x2 */ + y_final = y_top + dy * (x2 - x0); + + /* x1 x_top x2 x_bottom */ + /* y_top +------|-----+------------+------------+--------|---+------------+ */ + /* | | | | | | */ + /* | | | | | | */ + /* sy0 | Txxxxx|............|............|............|............| */ + /* y_crossing | *xxxxx.......|............|............|............| */ + /* | | xxxxx..|............|............|............| */ + /* | | /- xx*xxxx........|............|............| */ + /* | | dy < | xxxxxx..|............|............| */ + /* y_final | | \- | xx*xxx.........|............| */ + /* sy1 | | | | xxxxxB...|............| */ + /* | | | | | | */ + /* | | | | | | */ + /* y_bottom +------------+------------+------------+------------+------------+ */ + /* */ + /* goal is to measure the area covered by '.' in each pixel */ + + /* if x2 is right at the right edge of x1, y_crossing can blow up, github #1057 */ + /* @TODO: maybe test against sy1 rather than y_bottom? */ + if (y_crossing > y_bottom) + y_crossing = y_bottom; sign = e->direction; - /* area of the rectangle covered from y0..y_crossing */ - area = sign * (y_crossing-sy0); - /* area of the triangle (x_top,y0), (x+1,y0), (x+1,y_crossing) */ - scanline[x1] += area * (1-((x_top - x1)+(x1+1-x1))/2); - step = sign * dy; + /* area of the rectangle covered from sy0..y_crossing */ + area = sign * (y_crossing-sy0); + + /* area of the triangle (x_top,sy0), (x1+1,sy0), (x1+1,y_crossing) */ + scanline[x1] += stbtt__sized_triangle_area(area, x1+1 - x_top); + + /* check if final y_crossing is blown up; no test case for this */ + if (y_final > y_bottom) { + y_final = y_bottom; + dy = (y_final - y_crossing ) / (x2 - (x1+1)); /* if denom=0, y_final = y_crossing, so y_final <= y_bottom */ + } + + /* in second pixel, area covered by line segment found in first pixel */ + /* is always a rectangle 1 wide * the height of that line segment; this */ + /* is exactly what the variable 'area' stores. it also gets a contribution */ + /* from the line segment within it. the THIRD pixel will get the first */ + /* pixel's rectangle contribution, the second pixel's rectangle contribution, */ + /* and its own contribution. the 'own contribution' is the same in every pixel except */ + /* the leftmost and rightmost, a trapezoid that slides down in each pixel. */ + /* the second pixel's contribution to the third pixel will be the */ + /* rectangle 1 wide times the height change in the second pixel, which is dy. */ + + step = sign * dy * 1; /* dy is dy/dx, change in y for every 1 change in x, */ + /* which multiplied by 1-pixel-width is how much pixel area changes for each step in x */ + /* so the area advances by 'step' every time */ + for (x = x1+1; x < x2; ++x) { - scanline[x] += area + step/2; + scanline[x] += area + step/2; /* area of trapezoid is 1*step/2 */ area += step; } - y_crossing += dy * (x2 - (x1+1)); + STBTT_assert(STBTT_fabs(area) <= 1.01f); /* accumulated error from area += step unless we round step down */ + STBTT_assert(sy1 > y_final-0.01f); - STBTT_assert(STBTT_fabs(area) <= 1.01f); - - scanline[x2] += area + sign * (1-((x2-x2)+(x_bottom-x2))/2) * (sy1-y_crossing); + /* area covered in the last pixel is the rectangle from all the pixels to the left, */ + /* plus the trapezoid filled by the line segment in this pixel all the way to the right edge */ + scanline[x2] += area + sign * stbtt__position_trapezoid_area(sy1-y_final, (float) x2, x2+1.0f, x_bottom, x2+1.0f); + /* the rest of the line is filled based on the total height of the line segment in this pixel */ scanline_fill[x2] += sign * (sy1-sy0); } } else { @@ -14523,6 +14572,9 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, /* clipping logic. since this does not match the intended use */ /* of this library, we use a different, very slow brute */ /* force implementation */ + /* note though that this does happen some of the time because */ + /* x_top and x_bottom can be extrapolated at the top & bottom of */ + /* the shape and actually lie outside the bounding box */ int x; for (x=0; x < len; ++x) { /* cases: */ @@ -15759,15 +15811,14 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex float y_frac; int winding = 0; - orig[0] = x; - orig[1] = y; - /* make sure y never passes through a vertex of the shape */ y_frac = (float) STBTT_fmod(y, 1.0f); if (y_frac < 0.01f) y += 0.01f; else if (y_frac > 0.99f) y -= 0.01f; + + orig[0] = x; orig[1] = y; /* test a ray from (-infinity,y) to (x,y) */ @@ -15829,35 +15880,35 @@ static float stbtt__cuberoot( float x ) return (float) STBTT_pow( x,1.0f/3.0f); } -/* x^3 + c*x^2 + b*x + a = 0 */ +/* x^3 + a*x^2 + b*x + c = 0 */ static int stbtt__solve_cubic(float a, float b, float c, float* r) { - float s = -a / 3; - float p = b - a*a / 3; - float q = a * (2*a*a - 9*b) / 27 + c; + float s = -a / 3; + float p = b - a*a / 3; + float q = a * (2*a*a - 9*b) / 27 + c; float p3 = p*p*p; - float d = q*q + 4*p3 / 27; - if (d >= 0) { - float z = (float) STBTT_sqrt(d); - float u = (-q + z) / 2; - float v = (-q - z) / 2; - u = stbtt__cuberoot(u); - v = stbtt__cuberoot(v); - r[0] = s + u + v; - return 1; - } else { - float u = (float) STBTT_sqrt(-p/3); - float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; /* p3 must be negative, since d is negative */ - float m = (float) STBTT_cos(v); + float d = q*q + 4*p3 / 27; + if (d >= 0) { + float z = (float) STBTT_sqrt(d); + float u = (-q + z) / 2; + float v = (-q - z) / 2; + u = stbtt__cuberoot(u); + v = stbtt__cuberoot(v); + r[0] = s + u + v; + return 1; + } else { + float u = (float) STBTT_sqrt(-p/3); + float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; /* p3 must be negative, since d is negative */ + float m = (float) STBTT_cos(v); float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f; - r[0] = s + u * 2 * m; - r[1] = s - u * (m + n); - r[2] = s - u * (m - n); + r[0] = s + u * 2 * m; + r[1] = s - u * (m + n); + r[2] = s - u * (m - n); /* STBTT_assert( STBTT_fabs(((r[0]+a)*r[0]+b)*r[0]+c) < 0.05f); // these asserts may not be safe at all scales, though they're in bezier t parameter units so maybe? */ /* STBTT_assert( STBTT_fabs(((r[1]+a)*r[1]+b)*r[1]+c) < 0.05f); */ /* STBTT_assert( STBTT_fabs(((r[2]+a)*r[2]+b)*r[2]+c) < 0.05f); */ - return 3; + return 3; } } @@ -15934,18 +15985,17 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc for (i=0; i < num_verts; ++i) { float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y; - /* check against every point here rather than inside line/curve primitives -- @TODO: wrong if multiple 'moves' in a row produce a garbage point, and given culling, probably more efficient to do within line/curve */ - float dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); - if (dist2 < min_dist*min_dist) - min_dist = (float) STBTT_sqrt(dist2); - - if (verts[i].type == STBTT_vline) { + if (verts[i].type == STBTT_vline && precompute[i] != 0.0f) { float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y; + float dist,dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); + if (dist2 < min_dist*min_dist) + min_dist = (float) STBTT_sqrt(dist2); + /* coarse culling against bbox */ /* if (sx > STBTT_min(x0,x1)-min_dist && sx < STBTT_max(x0,x1)+min_dist && */ /* sy > STBTT_min(y0,y1)-min_dist && sy < STBTT_max(y0,y1)+min_dist) */ - float dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i]; + dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i]; STBTT_assert(i != 0); if (dist < min_dist) { /* check position along line */ @@ -15972,7 +16022,8 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc float ax = x1-x0, ay = y1-y0; float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2; float mx = x0 - sx, my = y0 - sy; - float res[3],px,py,t,it; + float res[3] = {0.f,0.f,0.f}; + float px,py,t,it,dist2; float a_inv = precompute[i]; if (a_inv == 0.0) { /* if a_inv is 0, it's 2nd degree so use quadratic formula */ float a = 3*(ax*bx + ay*by); @@ -15999,6 +16050,10 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc float d = (mx*ax+my*ay) * a_inv; num = stbtt__solve_cubic(b, c, d, res); } + dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); + if (dist2 < min_dist*min_dist) + min_dist = (float) STBTT_sqrt(dist2); + if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) { t = res[0], it = 1.0f - t; px = it*it*x0 + 2*t*it*x1 + t*t*x2; @@ -16258,6 +16313,12 @@ STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const /* FULL VERSION HISTORY */ /* */ +/* 1.25 (2021-07-11) many fixes */ +/* 1.24 (2020-02-05) fix warning */ +/* 1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS) */ +/* 1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined */ +/* 1.21 (2019-02-25) fix warning */ +/* 1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics() */ /* 1.19 (2018-02-11) OpenType GPOS kerning (horizontal only), STBTT_fmod */ /* 1.18 (2018-01-29) add missing function */ /* 1.17 (2017-07-23) make more arguments const; doc fix */ @@ -29560,6 +29621,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/12/14 (4.09.1) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget /// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later diff --git a/src/CHANGELOG b/src/CHANGELOG index 4e40836..92f1820 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/12/14 (4.09.1) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget /// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later diff --git a/src/stb_rect_pack.h b/src/stb_rect_pack.h index 6a57eee..6a633ce 100644 --- a/src/stb_rect_pack.h +++ b/src/stb_rect_pack.h @@ -1,9 +1,15 @@ -// stb_rect_pack.h - v1.00 - public domain - rectangle packing +// stb_rect_pack.h - v1.01 - public domain - rectangle packing // Sean Barrett 2014 // // Useful for e.g. packing rectangular textures into an atlas. // Does not do rotation. // +// Before #including, +// +// #define STB_RECT_PACK_IMPLEMENTATION +// +// in the file that you want to have the implementation. +// // Not necessarily the awesomest packing method, but better than // the totally naive one in stb_truetype (which is primarily what // this is meant to replace). @@ -35,6 +41,7 @@ // // Version history: // +// 1.01 (2021-07-11) always use large rect mode, expose STBRP__MAXVAL in public section // 1.00 (2019-02-25) avoid small space waste; gracefully fail too-wide rectangles // 0.99 (2019-02-07) warning fixes // 0.11 (2017-03-03) return packing success/fail result @@ -75,11 +82,10 @@ typedef struct stbrp_context stbrp_context; typedef struct stbrp_node stbrp_node; typedef struct stbrp_rect stbrp_rect; -#ifdef STBRP_LARGE_RECTS typedef int stbrp_coord; -#else -typedef unsigned short stbrp_coord; -#endif + +#define STBRP__MAXVAL 0x7fffffff +// Mostly for internal use, but this is the maximum supported coordinate value. STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects); // Assign packed locations to rectangles. The rectangles are of type @@ -209,8 +215,10 @@ struct stbrp_context #ifdef _MSC_VER #define STBRP__NOTUSED(v) (void)(v) +#define STBRP__CDECL __cdecl #else #define STBRP__NOTUSED(v) (void)sizeof(v) +#define STBRP__CDECL #endif enum @@ -253,9 +261,6 @@ STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_ou STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes) { int i; -#ifndef STBRP_LARGE_RECTS - STBRP_ASSERT(width <= 0xffff && height <= 0xffff); -#endif for (i=0; i < num_nodes-1; ++i) nodes[i].next = &nodes[i+1]; @@ -274,11 +279,7 @@ STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, context->extra[0].y = 0; context->extra[0].next = &context->extra[1]; context->extra[1].x = (stbrp_coord) width; -#ifdef STBRP_LARGE_RECTS context->extra[1].y = (1<<30); -#else - context->extra[1].y = 65535; -#endif context->extra[1].next = NULL; } @@ -310,7 +311,7 @@ static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0 if (node->y > min_y) { // raise min_y higher. // we've accounted for all waste up to min_y, - // but we'll now add more waste for everything we've visited + // but we'll now add more waste for everything we've visted waste_area += visited_width * (node->y - min_y); min_y = node->y; // the first time through, visited_width might be reduced @@ -520,7 +521,7 @@ static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, i return res; } -static int rect_height_compare(const void *a, const void *b) +static int STBRP__CDECL rect_height_compare(const void *a, const void *b) { const stbrp_rect *p = (const stbrp_rect *) a; const stbrp_rect *q = (const stbrp_rect *) b; @@ -531,19 +532,13 @@ static int rect_height_compare(const void *a, const void *b) return (p->w > q->w) ? -1 : (p->w < q->w); } -static int rect_original_order(const void *a, const void *b) +static int STBRP__CDECL rect_original_order(const void *a, const void *b) { const stbrp_rect *p = (const stbrp_rect *) a; const stbrp_rect *q = (const stbrp_rect *) b; return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed); } -#ifdef STBRP_LARGE_RECTS -#define STBRP__MAXVAL 0xffffffff -#else -#define STBRP__MAXVAL 0xffff -#endif - STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects) { int i, all_rects_packed = 1; diff --git a/src/stb_truetype.h b/src/stb_truetype.h index 7549275..bbf2284 100644 --- a/src/stb_truetype.h +++ b/src/stb_truetype.h @@ -1,5 +1,5 @@ -// stb_truetype.h - v1.24 - public domain -// authored from 2009-2020 by Sean Barrett / RAD Game Tools +// stb_truetype.h - v1.26 - public domain +// authored from 2009-2021 by Sean Barrett / RAD Game Tools // // ======================================================================= // @@ -53,11 +53,13 @@ // Johan Duparc Thomas Fields // Hou Qiming Derek Vinyard // Rob Loach Cort Stratton -// Kenney Phillis Jr. Brian Costabile -// Ken Voskuil (kaesve) +// Kenney Phillis Jr. Brian Costabile +// Ken Voskuil (kaesve) // // VERSION HISTORY // +// 1.26 (2021-08-28) fix broken rasterizer +// 1.25 (2021-07-11) many fixes // 1.24 (2020-02-05) fix warning // 1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS) // 1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined @@ -270,8 +272,8 @@ //// SAMPLE PROGRAMS //// // -// Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless -// +// Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless. +// See "tests/truetype_demo_win32.c" for a complete version. #if 0 #define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation #include "stb_truetype.h" @@ -297,6 +299,8 @@ void my_stbtt_initfont(void) void my_stbtt_print(float x, float y, char *text) { // assume orthographic projection with units = screen pixels, origin at top left + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, ftex); glBegin(GL_QUADS); @@ -304,10 +308,10 @@ void my_stbtt_print(float x, float y, char *text) if (*text >= 32 && *text < 128) { stbtt_aligned_quad q; stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl & d3d10+,0=d3d9 - glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0); - glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0); - glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1); - glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1); + glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y0); + glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y0); + glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y1); + glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y1); } ++text; } @@ -647,7 +651,7 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip); // If skip != 0, this tells stb_truetype to skip any codepoints for which // there is no corresponding glyph. If skip=0, which is the default, then -// codepoints without a glyph received the font's "missing character" glyph, +// codepoints without a glyph recived the font's "missing character" glyph, // typically an empty box by convention. STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, // same data as above @@ -853,6 +857,7 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices); // frees the data allocated above +STBTT_DEF unsigned char *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl); STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg); STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg); // fills svg with the character's SVG data. @@ -1539,12 +1544,12 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep search += 2; { - stbtt_uint16 offset, start; + stbtt_uint16 offset, start, last; stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1); - STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item)); start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item); - if (unicode_codepoint < start) + last = ttUSHORT(data + endCount + 2*item); + if (unicode_codepoint < start || unicode_codepoint > last) return 0; offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item); @@ -1871,7 +1876,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s if (comp_verts) STBTT_free(comp_verts, info->userdata); return 0; } - if (num_vertices > 0) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); + if (num_vertices > 0 && vertices) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex)); STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex)); if (vertices) STBTT_free(vertices, info->userdata); vertices = tmp; @@ -2134,7 +2139,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st subrs = stbtt__cid_get_glyph_subrs(info, glyph_index); has_subrs = 1; } - // fallthrough + // FALLTHROUGH case 0x1D: // callgsubr if (sp < 1) return STBTT__CSERR("call(g|)subr stack"); v = (int) s[--sp]; @@ -2239,7 +2244,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st } break; default: - if (b0 != 255 && b0 != 28 && (b0 < 32 || b0 > 254)) + if (b0 != 255 && b0 != 28 && b0 < 32) return STBTT__CSERR("reserved operator"); // push immediate @@ -2351,7 +2356,7 @@ STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningent return length; } -static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) { stbtt_uint8 *data = info->data + info->kern; stbtt_uint32 needle, straw; @@ -2381,243 +2386,225 @@ static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph return 0; } -static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph) +static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph) { - stbtt_uint16 coverageFormat = ttUSHORT(coverageTable); - switch(coverageFormat) { - case 1: { - stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2); + stbtt_uint16 coverageFormat = ttUSHORT(coverageTable); + switch (coverageFormat) { + case 1: { + stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2); - // Binary search. - stbtt_int32 l=0, r=glyphCount-1, m; - int straw, needle=glyph; - while (l <= r) { - stbtt_uint8 *glyphArray = coverageTable + 4; - stbtt_uint16 glyphID; - m = (l + r) >> 1; - glyphID = ttUSHORT(glyphArray + 2 * m); - straw = glyphID; - if (needle < straw) - r = m - 1; - else if (needle > straw) - l = m + 1; - else { - return m; - } + // Binary search. + stbtt_int32 l=0, r=glyphCount-1, m; + int straw, needle=glyph; + while (l <= r) { + stbtt_uint8 *glyphArray = coverageTable + 4; + stbtt_uint16 glyphID; + m = (l + r) >> 1; + glyphID = ttUSHORT(glyphArray + 2 * m); + straw = glyphID; + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else { + return m; } - } break; + } + break; + } - case 2: { - stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2); - stbtt_uint8 *rangeArray = coverageTable + 4; + case 2: { + stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2); + stbtt_uint8 *rangeArray = coverageTable + 4; - // Binary search. - stbtt_int32 l=0, r=rangeCount-1, m; - int strawStart, strawEnd, needle=glyph; - while (l <= r) { - stbtt_uint8 *rangeRecord; - m = (l + r) >> 1; - rangeRecord = rangeArray + 6 * m; - strawStart = ttUSHORT(rangeRecord); - strawEnd = ttUSHORT(rangeRecord + 2); - if (needle < strawStart) - r = m - 1; - else if (needle > strawEnd) - l = m + 1; - else { - stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4); - return startCoverageIndex + glyph - strawStart; - } + // Binary search. + stbtt_int32 l=0, r=rangeCount-1, m; + int strawStart, strawEnd, needle=glyph; + while (l <= r) { + stbtt_uint8 *rangeRecord; + m = (l + r) >> 1; + rangeRecord = rangeArray + 6 * m; + strawStart = ttUSHORT(rangeRecord); + strawEnd = ttUSHORT(rangeRecord + 2); + if (needle < strawStart) + r = m - 1; + else if (needle > strawEnd) + l = m + 1; + else { + stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4); + return startCoverageIndex + glyph - strawStart; } - } break; + } + break; + } - default: { - // There are no other cases. - STBTT_assert(0); - } break; - } + default: return -1; // unsupported + } - return -1; + return -1; } static stbtt_int32 stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph) { - stbtt_uint16 classDefFormat = ttUSHORT(classDefTable); - switch(classDefFormat) - { - case 1: { - stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2); - stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4); - stbtt_uint8 *classDef1ValueArray = classDefTable + 6; + stbtt_uint16 classDefFormat = ttUSHORT(classDefTable); + switch (classDefFormat) + { + case 1: { + stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2); + stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4); + stbtt_uint8 *classDef1ValueArray = classDefTable + 6; - if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount) - return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID)); + if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount) + return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID)); + break; + } - classDefTable = classDef1ValueArray + 2 * glyphCount; - } break; + case 2: { + stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2); + stbtt_uint8 *classRangeRecords = classDefTable + 4; - case 2: { - stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2); - stbtt_uint8 *classRangeRecords = classDefTable + 4; + // Binary search. + stbtt_int32 l=0, r=classRangeCount-1, m; + int strawStart, strawEnd, needle=glyph; + while (l <= r) { + stbtt_uint8 *classRangeRecord; + m = (l + r) >> 1; + classRangeRecord = classRangeRecords + 6 * m; + strawStart = ttUSHORT(classRangeRecord); + strawEnd = ttUSHORT(classRangeRecord + 2); + if (needle < strawStart) + r = m - 1; + else if (needle > strawEnd) + l = m + 1; + else + return (stbtt_int32)ttUSHORT(classRangeRecord + 4); + } + break; + } - // Binary search. - stbtt_int32 l=0, r=classRangeCount-1, m; - int strawStart, strawEnd, needle=glyph; - while (l <= r) { - stbtt_uint8 *classRangeRecord; - m = (l + r) >> 1; - classRangeRecord = classRangeRecords + 6 * m; - strawStart = ttUSHORT(classRangeRecord); - strawEnd = ttUSHORT(classRangeRecord + 2); - if (needle < strawStart) - r = m - 1; - else if (needle > strawEnd) - l = m + 1; - else - return (stbtt_int32)ttUSHORT(classRangeRecord + 4); - } + default: + return -1; // Unsupported definition type, return an error. + } - classDefTable = classRangeRecords + 6 * classRangeCount; - } break; - - default: { - // There are no other cases. - STBTT_assert(0); - } break; - } - - return -1; + // "All glyphs not assigned to a class fall into class 0". (OpenType spec) + return 0; } // Define to STBTT_assert(x) if you want to break on unimplemented formats. #define STBTT_GPOS_TODO_assert(x) -static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) +static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2) { - stbtt_uint16 lookupListOffset; - stbtt_uint8 *lookupList; - stbtt_uint16 lookupCount; - stbtt_uint8 *data; - stbtt_int32 i; + stbtt_uint16 lookupListOffset; + stbtt_uint8 *lookupList; + stbtt_uint16 lookupCount; + stbtt_uint8 *data; + stbtt_int32 i, sti; - if (!info->gpos) return 0; + if (!info->gpos) return 0; - data = info->data + info->gpos; + data = info->data + info->gpos; - if (ttUSHORT(data+0) != 1) return 0; // Major version 1 - if (ttUSHORT(data+2) != 0) return 0; // Minor version 0 + if (ttUSHORT(data+0) != 1) return 0; // Major version 1 + if (ttUSHORT(data+2) != 0) return 0; // Minor version 0 - lookupListOffset = ttUSHORT(data+8); - lookupList = data + lookupListOffset; - lookupCount = ttUSHORT(lookupList); + lookupListOffset = ttUSHORT(data+8); + lookupList = data + lookupListOffset; + lookupCount = ttUSHORT(lookupList); - for (i=0; i= pairSetCount) return 0; - // Binary search. - while (l <= r) { - stbtt_uint16 secondGlyph; - stbtt_uint8 *pairValue; - m = (l + r) >> 1; - pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m; - secondGlyph = ttUSHORT(pairValue); - straw = secondGlyph; - if (needle < straw) - r = m - 1; - else if (needle > straw) - l = m + 1; - else { - stbtt_int16 xAdvance = ttSHORT(pairValue + 2); - return xAdvance; - } - } - } break; + needle=glyph2; + r=pairValueCount-1; + l=0; - case 2: { - stbtt_uint16 valueFormat1 = ttUSHORT(table + 4); - stbtt_uint16 valueFormat2 = ttUSHORT(table + 6); + // Binary search. + while (l <= r) { + stbtt_uint16 secondGlyph; + stbtt_uint8 *pairValue; + m = (l + r) >> 1; + pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m; + secondGlyph = ttUSHORT(pairValue); + straw = secondGlyph; + if (needle < straw) + r = m - 1; + else if (needle > straw) + l = m + 1; + else { + stbtt_int16 xAdvance = ttSHORT(pairValue + 2); + return xAdvance; + } + } + } else + return 0; + break; + } - stbtt_uint16 classDef1Offset = ttUSHORT(table + 8); - stbtt_uint16 classDef2Offset = ttUSHORT(table + 10); - int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1); - int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2); + case 2: { + stbtt_uint16 valueFormat1 = ttUSHORT(table + 4); + stbtt_uint16 valueFormat2 = ttUSHORT(table + 6); + if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats? + stbtt_uint16 classDef1Offset = ttUSHORT(table + 8); + stbtt_uint16 classDef2Offset = ttUSHORT(table + 10); + int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1); + int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2); - stbtt_uint16 class1Count = ttUSHORT(table + 12); - stbtt_uint16 class2Count = ttUSHORT(table + 14); - STBTT_assert(glyph1class < class1Count); - STBTT_assert(glyph2class < class2Count); + stbtt_uint16 class1Count = ttUSHORT(table + 12); + stbtt_uint16 class2Count = ttUSHORT(table + 14); + stbtt_uint8 *class1Records, *class2Records; + stbtt_int16 xAdvance; - // TODO: Support more formats. - STBTT_GPOS_TODO_assert(valueFormat1 == 4); - if (valueFormat1 != 4) return 0; - STBTT_GPOS_TODO_assert(valueFormat2 == 0); - if (valueFormat2 != 0) return 0; + if (glyph1class < 0 || glyph1class >= class1Count) return 0; // malformed + if (glyph2class < 0 || glyph2class >= class2Count) return 0; // malformed - if (glyph1class >= 0 && glyph1class < class1Count && glyph2class >= 0 && glyph2class < class2Count) { - stbtt_uint8 *class1Records = table + 16; - stbtt_uint8 *class2Records = class1Records + 2 * (glyph1class * class2Count); - stbtt_int16 xAdvance = ttSHORT(class2Records + 2 * glyph2class); - return xAdvance; - } - } break; - - default: { - // There are no other cases. - STBTT_assert(0); - break; - }; - } - } - break; - }; + class1Records = table + 16; + class2Records = class1Records + 2 * (glyph1class * class2Count); + xAdvance = ttSHORT(class2Records + 2 * glyph2class); + return xAdvance; + } else + return 0; + break; + } default: - // TODO: Implement other stuff. - break; - } - } + return 0; // Unsupported position format + } + } + } - return 0; + return 0; } STBTT_DEF int stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2) @@ -3075,6 +3062,23 @@ static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edg } } +static float stbtt__sized_trapezoid_area(float height, float top_width, float bottom_width) +{ + STBTT_assert(top_width >= 0); + STBTT_assert(bottom_width >= 0); + return (top_width + bottom_width) / 2.0f * height; +} + +static float stbtt__position_trapezoid_area(float height, float tx0, float tx1, float bx0, float bx1) +{ + return stbtt__sized_trapezoid_area(height, tx1 - tx0, bx1 - bx0); +} + +static float stbtt__sized_triangle_area(float height, float width) +{ + return height * width / 2; +} + static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top) { float y_bottom = y_top+1; @@ -3129,13 +3133,13 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, float height; // simple case, only spans one pixel int x = (int) x_top; - height = sy1 - sy0; + height = (sy1 - sy0) * e->direction; STBTT_assert(x >= 0 && x < len); - scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2) * height; - scanline_fill[x] += e->direction * height; // everything right of this pixel is filled + scanline[x] += stbtt__position_trapezoid_area(height, x_top, x+1.0f, x_bottom, x+1.0f); + scanline_fill[x] += height; // everything right of this pixel is filled } else { int x,x1,x2; - float y_crossing, step, sign, area; + float y_crossing, y_final, step, sign, area; // covers 2+ pixels if (x_top > x_bottom) { // flip scanline vertically; signed area is the same @@ -3148,29 +3152,79 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, dy = -dy; t = x0, x0 = xb, xb = t; } + STBTT_assert(dy >= 0); + STBTT_assert(dx >= 0); x1 = (int) x_top; x2 = (int) x_bottom; // compute intersection with y axis at x1+1 - y_crossing = (x1+1 - x0) * dy + y_top; + y_crossing = y_top + dy * (x1+1 - x0); + + // compute intersection with y axis at x2 + y_final = y_top + dy * (x2 - x0); + + // x1 x_top x2 x_bottom + // y_top +------|-----+------------+------------+--------|---+------------+ + // | | | | | | + // | | | | | | + // sy0 | Txxxxx|............|............|............|............| + // y_crossing | *xxxxx.......|............|............|............| + // | | xxxxx..|............|............|............| + // | | /- xx*xxxx........|............|............| + // | | dy < | xxxxxx..|............|............| + // y_final | | \- | xx*xxx.........|............| + // sy1 | | | | xxxxxB...|............| + // | | | | | | + // | | | | | | + // y_bottom +------------+------------+------------+------------+------------+ + // + // goal is to measure the area covered by '.' in each pixel + + // if x2 is right at the right edge of x1, y_crossing can blow up, github #1057 + // @TODO: maybe test against sy1 rather than y_bottom? + if (y_crossing > y_bottom) + y_crossing = y_bottom; sign = e->direction; - // area of the rectangle covered from y0..y_crossing - area = sign * (y_crossing-sy0); - // area of the triangle (x_top,y0), (x+1,y0), (x+1,y_crossing) - scanline[x1] += area * (1-((x_top - x1)+(x1+1-x1))/2); - step = sign * dy; + // area of the rectangle covered from sy0..y_crossing + area = sign * (y_crossing-sy0); + + // area of the triangle (x_top,sy0), (x1+1,sy0), (x1+1,y_crossing) + scanline[x1] += stbtt__sized_triangle_area(area, x1+1 - x_top); + + // check if final y_crossing is blown up; no test case for this + if (y_final > y_bottom) { + y_final = y_bottom; + dy = (y_final - y_crossing ) / (x2 - (x1+1)); // if denom=0, y_final = y_crossing, so y_final <= y_bottom + } + + // in second pixel, area covered by line segment found in first pixel + // is always a rectangle 1 wide * the height of that line segment; this + // is exactly what the variable 'area' stores. it also gets a contribution + // from the line segment within it. the THIRD pixel will get the first + // pixel's rectangle contribution, the second pixel's rectangle contribution, + // and its own contribution. the 'own contribution' is the same in every pixel except + // the leftmost and rightmost, a trapezoid that slides down in each pixel. + // the second pixel's contribution to the third pixel will be the + // rectangle 1 wide times the height change in the second pixel, which is dy. + + step = sign * dy * 1; // dy is dy/dx, change in y for every 1 change in x, + // which multiplied by 1-pixel-width is how much pixel area changes for each step in x + // so the area advances by 'step' every time + for (x = x1+1; x < x2; ++x) { - scanline[x] += area + step/2; + scanline[x] += area + step/2; // area of trapezoid is 1*step/2 area += step; } - y_crossing += dy * (x2 - (x1+1)); + STBTT_assert(STBTT_fabs(area) <= 1.01f); // accumulated error from area += step unless we round step down + STBTT_assert(sy1 > y_final-0.01f); - STBTT_assert(STBTT_fabs(area) <= 1.01f); - - scanline[x2] += area + sign * (1-((x2-x2)+(x_bottom-x2))/2) * (sy1-y_crossing); + // area covered in the last pixel is the rectangle from all the pixels to the left, + // plus the trapezoid filled by the line segment in this pixel all the way to the right edge + scanline[x2] += area + sign * stbtt__position_trapezoid_area(sy1-y_final, (float) x2, x2+1.0f, x_bottom, x2+1.0f); + // the rest of the line is filled based on the total height of the line segment in this pixel scanline_fill[x2] += sign * (sy1-sy0); } } else { @@ -3178,6 +3232,9 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, // clipping logic. since this does not match the intended use // of this library, we use a different, very slow brute // force implementation + // note though that this does happen some of the time because + // x_top and x_bottom can be extrapolated at the top & bottom of + // the shape and actually lie outside the bounding box int x; for (x=0; x < len; ++x) { // cases: @@ -4414,15 +4471,14 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex float y_frac; int winding = 0; - orig[0] = x; - orig[1] = y; - // make sure y never passes through a vertex of the shape y_frac = (float) STBTT_fmod(y, 1.0f); if (y_frac < 0.01f) y += 0.01f; else if (y_frac > 0.99f) y -= 0.01f; + + orig[0] = x; orig[1] = y; // test a ray from (-infinity,y) to (x,y) @@ -4484,35 +4540,35 @@ static float stbtt__cuberoot( float x ) return (float) STBTT_pow( x,1.0f/3.0f); } -// x^3 + c*x^2 + b*x + a = 0 +// x^3 + a*x^2 + b*x + c = 0 static int stbtt__solve_cubic(float a, float b, float c, float* r) { - float s = -a / 3; - float p = b - a*a / 3; - float q = a * (2*a*a - 9*b) / 27 + c; + float s = -a / 3; + float p = b - a*a / 3; + float q = a * (2*a*a - 9*b) / 27 + c; float p3 = p*p*p; - float d = q*q + 4*p3 / 27; - if (d >= 0) { - float z = (float) STBTT_sqrt(d); - float u = (-q + z) / 2; - float v = (-q - z) / 2; - u = stbtt__cuberoot(u); - v = stbtt__cuberoot(v); - r[0] = s + u + v; - return 1; - } else { - float u = (float) STBTT_sqrt(-p/3); - float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative - float m = (float) STBTT_cos(v); + float d = q*q + 4*p3 / 27; + if (d >= 0) { + float z = (float) STBTT_sqrt(d); + float u = (-q + z) / 2; + float v = (-q - z) / 2; + u = stbtt__cuberoot(u); + v = stbtt__cuberoot(v); + r[0] = s + u + v; + return 1; + } else { + float u = (float) STBTT_sqrt(-p/3); + float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative + float m = (float) STBTT_cos(v); float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f; - r[0] = s + u * 2 * m; - r[1] = s - u * (m + n); - r[2] = s - u * (m - n); + r[0] = s + u * 2 * m; + r[1] = s - u * (m + n); + r[2] = s - u * (m - n); //STBTT_assert( STBTT_fabs(((r[0]+a)*r[0]+b)*r[0]+c) < 0.05f); // these asserts may not be safe at all scales, though they're in bezier t parameter units so maybe? //STBTT_assert( STBTT_fabs(((r[1]+a)*r[1]+b)*r[1]+c) < 0.05f); //STBTT_assert( STBTT_fabs(((r[2]+a)*r[2]+b)*r[2]+c) < 0.05f); - return 3; + return 3; } } @@ -4589,18 +4645,17 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc for (i=0; i < num_verts; ++i) { float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y; - // check against every point here rather than inside line/curve primitives -- @TODO: wrong if multiple 'moves' in a row produce a garbage point, and given culling, probably more efficient to do within line/curve - float dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); - if (dist2 < min_dist*min_dist) - min_dist = (float) STBTT_sqrt(dist2); - - if (verts[i].type == STBTT_vline) { + if (verts[i].type == STBTT_vline && precompute[i] != 0.0f) { float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y; + float dist,dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); + if (dist2 < min_dist*min_dist) + min_dist = (float) STBTT_sqrt(dist2); + // coarse culling against bbox //if (sx > STBTT_min(x0,x1)-min_dist && sx < STBTT_max(x0,x1)+min_dist && // sy > STBTT_min(y0,y1)-min_dist && sy < STBTT_max(y0,y1)+min_dist) - float dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i]; + dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i]; STBTT_assert(i != 0); if (dist < min_dist) { // check position along line @@ -4627,7 +4682,8 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc float ax = x1-x0, ay = y1-y0; float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2; float mx = x0 - sx, my = y0 - sy; - float res[3],px,py,t,it; + float res[3] = {0.f,0.f,0.f}; + float px,py,t,it,dist2; float a_inv = precompute[i]; if (a_inv == 0.0) { // if a_inv is 0, it's 2nd degree so use quadratic formula float a = 3*(ax*bx + ay*by); @@ -4654,6 +4710,10 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc float d = (mx*ax+my*ay) * a_inv; num = stbtt__solve_cubic(b, c, d, res); } + dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy); + if (dist2 < min_dist*min_dist) + min_dist = (float) STBTT_sqrt(dist2); + if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) { t = res[0], it = 1.0f - t; px = it*it*x0 + 2*t*it*x1 + t*t*x2; @@ -4913,6 +4973,12 @@ STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const // FULL VERSION HISTORY // +// 1.25 (2021-07-11) many fixes +// 1.24 (2020-02-05) fix warning +// 1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS) +// 1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined +// 1.21 (2019-02-25) fix warning +// 1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics() // 1.19 (2018-02-11) OpenType GPOS kerning (horizontal only), STBTT_fmod // 1.18 (2018-01-29) add missing function // 1.17 (2017-07-23) make more arguments const; doc fix From 146676d376ecec484eafe65f41d078bf3bef3a17 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 15 Dec 2021 17:39:18 -0500 Subject: [PATCH 32/89] utils: Add EditorConfig to manage editor whitespace (#376) [EditorConfig](https://editorconfig.org) is a utility for various code editors which will automatically configure the editor to manage whitespace as desired. --- .editorconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..4ce28c3 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +# EditorConfig: https://EditorConfig.org + +root = true + +[*] +indent_style = space +charset = utf-8 +end_of_line = lf +indent_size = 4 +insert_final_newline = true +trim_trailing_whitespace = true + +[clib.json] +indent_size = 2 From 368e184ebcdee66c3c57318bf12bd3ec0676111a Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 16 Dec 2021 00:59:09 -0500 Subject: [PATCH 33/89] clib: Add Unlicense --- clib.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clib.json b/clib.json index 43215ed..49b122d 100644 --- a/clib.json +++ b/clib.json @@ -4,6 +4,6 @@ "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], - "license": "MIT", + "license": "MIT, Unlicense", "src": ["nuklear.h"] } From 291ce9b609485979990f06b3eba8d203586d3768 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 16 Dec 2021 18:56:07 +0000 Subject: [PATCH 34/89] Fix rendering polygons and polylines with Allegro --- demo/allegro5/nuklear_allegro5.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h index c2f483c..06acc45 100644 --- a/demo/allegro5/nuklear_allegro5.h +++ b/demo/allegro5/nuklear_allegro5.h @@ -247,22 +247,22 @@ nk_allegro5_render() vertices[i*2] = p->points[i].x; vertices[(i*2) + 1] = p->points[i].y; } - al_draw_polyline((const float*)&vertices, (2 * sizeof(float)), + al_draw_polyline(vertices, (2 * sizeof(float)), (int)p->point_count, ALLEGRO_LINE_JOIN_ROUND, ALLEGRO_LINE_CAP_CLOSED, color, (float)p->line_thickness, 0.0); free(vertices); } break; case NK_COMMAND_POLYGON_FILLED: { - int i; + int i, j = 0; float *vertices; const struct nk_command_polygon_filled *p = (const struct nk_command_polygon_filled *)cmd; vertices = calloc(p->point_count * 2, sizeof(float)); color = nk_color_to_allegro_color(p->color); - for (i = 0; i < p->point_count; i++) { - vertices[i*2] = p->points[i].x; - vertices[(i*2) + 1] = p->points[i].y; + for (i = p->point_count - 1; i >= 0; i--) { + vertices[j++] = p->points[i].x; + vertices[j++] = p->points[i].y; } - al_draw_filled_polygon((const float*)&vertices, (int)p->point_count, color); + al_draw_filled_polygon(vertices, (int)p->point_count, color); free(vertices); } break; case NK_COMMAND_POLYLINE: { @@ -275,7 +275,7 @@ nk_allegro5_render() vertices[i*2] = p->points[i].x; vertices[(i*2) + 1] = p->points[i].y; } - al_draw_polyline((const float*)&vertices, (2 * sizeof(float)), + al_draw_polyline(vertices, (2 * sizeof(float)), (int)p->point_count, ALLEGRO_LINE_JOIN_ROUND, ALLEGRO_LINE_CAP_ROUND, color, (float)p->line_thickness, 0.0); free(vertices); From c5d18493a4ef7099f0dd11974c82baf9b5d46d97 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 16 Dec 2021 18:57:08 +0000 Subject: [PATCH 35/89] Correctly implement arcs with Allegro --- demo/allegro5/nuklear_allegro5.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h index 06acc45..8e10c9b 100644 --- a/demo/allegro5/nuklear_allegro5.h +++ b/demo/allegro5/nuklear_allegro5.h @@ -306,15 +306,20 @@ nk_allegro5_render() case NK_COMMAND_ARC: { const struct nk_command_arc *a = (const struct nk_command_arc *)cmd; color = nk_color_to_allegro_color(a->color); - al_draw_arc((float)a->cx, (float)a->cy, (float)a->r, a->a[0], + al_draw_pieslice((float)a->cx, (float)a->cy, (float)a->r, a->a[0], a->a[1], color, (float)a->line_thickness); } break; + case NK_COMMAND_ARC_FILLED: { + const struct nk_command_arc_filled *a = (const struct nk_command_arc_filled *)cmd; + color = nk_color_to_allegro_color(a->color); + al_draw_filled_pieslice((float)a->cx, (float)a->cy, (float)a->r, a->a[0], + a->a[1], color); + } break; case NK_COMMAND_IMAGE: { const struct nk_command_image *i = (const struct nk_command_image *)cmd; al_draw_bitmap_region(i->img.handle.ptr, 0, 0, i->w, i->h, i->x, i->y, 0); } break; case NK_COMMAND_RECT_MULTI_COLOR: - case NK_COMMAND_ARC_FILLED: default: break; } } From 60c52adfafceb478e9fee571a23e453c0c3df062 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 16 Dec 2021 19:44:00 +0000 Subject: [PATCH 36/89] Enable and fix most GCC warnings (#377) Co-authored-by: Rob Loach --- clib.json | 2 +- demo/allegro5/Makefile | 2 +- demo/allegro5/main.c | 3 - demo/glfw_opengl2/Makefile | 2 +- demo/glfw_opengl2/nuklear_glfw_gl2.h | 1 + demo/glfw_opengl3/Makefile | 2 +- demo/glfw_opengl3/nuklear_glfw_gl3.h | 1 + demo/glfw_opengl4/Makefile | 2 +- demo/glfw_opengl4/nuklear_glfw_gl4.h | 1 + demo/overview.c | 9 -- demo/sdl2surface_rawfb/Makefile | 2 +- demo/sdl2surface_rawfb/main.c | 30 ++++-- demo/sdl2surface_rawfb/sdl2surface_rawfb.h | 18 ++-- demo/sdl_opengl2/Makefile | 2 +- demo/sdl_opengl2/main.c | 3 + demo/sdl_opengl3/Makefile | 2 +- demo/sdl_opengl3/main.c | 3 + demo/sdl_opengles2/Makefile | 2 +- demo/sdl_opengles2/main.c | 4 + demo/sfml_opengl2/Makefile | 2 +- demo/sfml_opengl2/nuklear_sfml_gl2.h | 7 ++ demo/sfml_opengl3/Makefile | 2 +- demo/sfml_opengl3/nuklear_sfml_gl3.h | 7 ++ demo/wayland_rawfb/Makefile | 4 +- demo/wayland_rawfb/main.c | 112 ++++++++++++++++++--- demo/wayland_rawfb/nuklear_raw_wayland.h | 13 ++- demo/x11/Makefile | 2 +- demo/x11/nuklear_xlib.h | 8 ++ demo/x11_opengl2/Makefile | 2 +- demo/x11_opengl2/nuklear_xlib_gl2.h | 5 +- demo/x11_opengl3/Makefile | 2 +- demo/x11_rawfb/Makefile | 2 +- demo/x11_rawfb/nuklear_rawfb.h | 10 +- demo/x11_rawfb/nuklear_xlib.h | 2 +- demo/x11_xft/Makefile | 2 +- demo/x11_xft/nuklear_xlib.h | 16 ++- example/Makefile | 2 +- example/canvas.c | 7 +- example/extended.c | 3 + example/file_browser.c | 5 + example/skinning.c | 3 +- nuklear.h | 3 +- src/CHANGELOG | 1 + src/nuklear_layout.c | 2 +- 44 files changed, 236 insertions(+), 79 deletions(-) diff --git a/clib.json b/clib.json index 49b122d..20e4b9e 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.09.0", + "version": "4.09.1", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/demo/allegro5/Makefile b/demo/allegro5/Makefile index 48e0b7a..d792fa2 100644 --- a/demo/allegro5/Makefile +++ b/demo/allegro5/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -Wno-unused-function -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/allegro5/main.c b/demo/allegro5/main.c index ea9391b..2755f0d 100644 --- a/demo/allegro5/main.c +++ b/demo/allegro5/main.c @@ -47,9 +47,6 @@ * DEMO * * ===============================================================*/ -static void error_callback(int e, const char *d) -{printf("Error %d: %s\n", e, d);} - int main(void) { /* Platform */ diff --git a/demo/glfw_opengl2/Makefile b/demo/glfw_opengl2/Makefile index ec8bcf3..5b6af64 100644 --- a/demo/glfw_opengl2/Makefile +++ b/demo/glfw_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl2/nuklear_glfw_gl2.h b/demo/glfw_opengl2/nuklear_glfw_gl2.h index a197e90..6eb43cb 100644 --- a/demo/glfw_opengl2/nuklear_glfw_gl2.h +++ b/demo/glfw_opengl2/nuklear_glfw_gl2.h @@ -218,6 +218,7 @@ NK_API void nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int mods) { double x, y; + NK_UNUSED(mods); if (button != GLFW_MOUSE_BUTTON_LEFT) return; glfwGetCursorPos(window, &x, &y); if (action == GLFW_PRESS) { diff --git a/demo/glfw_opengl3/Makefile b/demo/glfw_opengl3/Makefile index 57e0936..7c94f3d 100644 --- a/demo/glfw_opengl3/Makefile +++ b/demo/glfw_opengl3/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl3/nuklear_glfw_gl3.h b/demo/glfw_opengl3/nuklear_glfw_gl3.h index de06b17..ca9a04c 100644 --- a/demo/glfw_opengl3/nuklear_glfw_gl3.h +++ b/demo/glfw_opengl3/nuklear_glfw_gl3.h @@ -330,6 +330,7 @@ nk_glfw3_mouse_button_callback(GLFWwindow* win, int button, int action, int mods { struct nk_glfw* glfw = glfwGetWindowUserPointer(win); double x, y; + NK_UNUSED(mods); if (button != GLFW_MOUSE_BUTTON_LEFT) return; glfwGetCursorPos(win, &x, &y); if (action == GLFW_PRESS) { diff --git a/demo/glfw_opengl4/Makefile b/demo/glfw_opengl4/Makefile index 57e0936..7c94f3d 100644 --- a/demo/glfw_opengl4/Makefile +++ b/demo/glfw_opengl4/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl4/nuklear_glfw_gl4.h b/demo/glfw_opengl4/nuklear_glfw_gl4.h index 973bfad..6e77627 100644 --- a/demo/glfw_opengl4/nuklear_glfw_gl4.h +++ b/demo/glfw_opengl4/nuklear_glfw_gl4.h @@ -477,6 +477,7 @@ NK_API void nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int mods) { double x, y; + NK_UNUSED(mods); if (button != GLFW_MOUSE_BUTTON_LEFT) return; glfwGetCursorPos(window, &x, &y); if (action == GLFW_PRESS) { diff --git a/demo/overview.c b/demo/overview.c index 53c5cb6..b696011 100644 --- a/demo/overview.c +++ b/demo/overview.c @@ -623,13 +623,11 @@ overview(struct nk_context *ctx) int i; int index = -1; - struct nk_rect bounds; /* line chart */ id = 0; index = -1; nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin(ctx, NK_CHART_LINES, 32, -1.0f, 1.0f)) { for (i = 0; i < 32; ++i) { nk_flags res = nk_chart_push(ctx, (float)cos(id)); @@ -651,7 +649,6 @@ overview(struct nk_context *ctx) /* column chart */ nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin(ctx, NK_CHART_COLUMN, 32, 0.0f, 1.0f)) { for (i = 0; i < 32; ++i) { nk_flags res = nk_chart_push(ctx, (float)fabs(sin(id))); @@ -672,7 +669,6 @@ overview(struct nk_context *ctx) /* mixed chart */ nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin(ctx, NK_CHART_COLUMN, 32, 0.0f, 1.0f)) { nk_chart_add_slot(ctx, NK_CHART_LINES, 32, -1.0f, 1.0f); nk_chart_add_slot(ctx, NK_CHART_LINES, 32, -1.0f, 1.0f); @@ -687,7 +683,6 @@ overview(struct nk_context *ctx) /* mixed colored chart */ nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin_colored(ctx, NK_CHART_LINES, nk_rgb(255,0,0), nk_rgb(150,0,0), 32, 0.0f, 1.0f)) { nk_chart_add_slot_colored(ctx, NK_CHART_LINES, nk_rgb(0,0,255), nk_rgb(0,0,150),32, -1.0f, 1.0f); nk_chart_add_slot_colored(ctx, NK_CHART_LINES, nk_rgb(0,255,0), nk_rgb(0,150,0), 32, -1.0f, 1.0f); @@ -946,7 +941,6 @@ overview(struct nk_context *ctx) if (nk_tree_push(ctx, NK_TREE_NODE, "Notebook", NK_MINIMIZED)) { static int current_tab = 0; - struct nk_rect bounds; float step = (2*3.141592654f) / 32; enum chart_type {CHART_LINE, CHART_HISTO, CHART_MIXED}; const char *names[] = {"Lines", "Columns", "Mixed"}; @@ -982,7 +976,6 @@ overview(struct nk_context *ctx) default: break; case CHART_LINE: nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin_colored(ctx, NK_CHART_LINES, nk_rgb(255,0,0), nk_rgb(150,0,0), 32, 0.0f, 1.0f)) { nk_chart_add_slot_colored(ctx, NK_CHART_LINES, nk_rgb(0,0,255), nk_rgb(0,0,150),32, -1.0f, 1.0f); for (i = 0, id = 0; i < 32; ++i) { @@ -995,7 +988,6 @@ overview(struct nk_context *ctx) break; case CHART_HISTO: nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin_colored(ctx, NK_CHART_COLUMN, nk_rgb(255,0,0), nk_rgb(150,0,0), 32, 0.0f, 1.0f)) { for (i = 0, id = 0; i < 32; ++i) { nk_chart_push_slot(ctx, (float)fabs(sin(id)), 0); @@ -1006,7 +998,6 @@ overview(struct nk_context *ctx) break; case CHART_MIXED: nk_layout_row_dynamic(ctx, 100, 1); - bounds = nk_widget_bounds(ctx); if (nk_chart_begin_colored(ctx, NK_CHART_LINES, nk_rgb(255,0,0), nk_rgb(150,0,0), 32, 0.0f, 1.0f)) { nk_chart_add_slot_colored(ctx, NK_CHART_LINES, nk_rgb(0,0,255), nk_rgb(0,0,150),32, -1.0f, 1.0f); nk_chart_add_slot_colored(ctx, NK_CHART_COLUMN, nk_rgb(0,255,0), nk_rgb(0,150,0), 32, 0.0f, 1.0f); diff --git a/demo/sdl2surface_rawfb/Makefile b/demo/sdl2surface_rawfb/Makefile index b1e5830..4fabb13 100644 --- a/demo/sdl2surface_rawfb/Makefile +++ b/demo/sdl2surface_rawfb/Makefile @@ -1,4 +1,4 @@ -CFLAGS=`sdl2-config --cflags --libs` -std=c89 -Wall -O0 -g -fvisibility=hidden -Wno-unused `pkg-config SDL2_ttf --cflags --libs` +CFLAGS=`sdl2-config --cflags --libs` -std=c89 -Wall -Wextra -pedantic -Wno-unused-function -O0 -g -fvisibility=hidden `pkg-config SDL2_ttf --cflags --libs` .PHONY: clean diff --git a/demo/sdl2surface_rawfb/main.c b/demo/sdl2surface_rawfb/main.c index 9c25c1e..f383cbc 100644 --- a/demo/sdl2surface_rawfb/main.c +++ b/demo/sdl2surface_rawfb/main.c @@ -2,7 +2,6 @@ #include #include - #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif @@ -26,6 +25,7 @@ static int translate_sdl_key(struct SDL_Keysym const *k) { /*keyboard handling left as an exercise for the reader */ + NK_UNUSED(k); return NK_KEY_NONE; } @@ -50,7 +50,7 @@ static int sdl_button_to_nk(int button) } } - +#if 0 static void grid_demo(struct nk_context *ctx) { @@ -85,7 +85,7 @@ grid_demo(struct nk_context *ctx) } nk_end(ctx); } - +#endif int main(int argc, char **argv) @@ -93,20 +93,28 @@ int main(int argc, char **argv) struct nk_color clear = {0,100,0,255}; struct nk_vec2 vec; struct nk_rect bounds = {40,40,0,0}; + struct sdlsurface_context *context; + + SDL_DisplayMode dm; + SDL_Window *window; + SDL_Renderer *renderer; + SDL_Texture *tex; + SDL_Surface *surface; + + NK_UNUSED(argc); + NK_UNUSED(argv); SDL_Init(SDL_INIT_VIDEO); printf("sdl init called...\n"); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); - SDL_DisplayMode dm; - SDL_GetDesktopDisplayMode(0, &dm); printf("desktop display mode %d %d\n", dm.w, dm.h); - SDL_Window *window = SDL_CreateWindow("Puzzle", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, dm.w-200,dm.h-200, SDL_WINDOW_OPENGL); + window = SDL_CreateWindow("Puzzle", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, dm.w-200,dm.h-200, SDL_WINDOW_OPENGL); if (!window) { printf("can't open window!\n"); @@ -114,18 +122,18 @@ int main(int argc, char **argv) } - SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, 0); + renderer = SDL_CreateRenderer(window, -1, 0); - SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormat(0, dm.w-200, dm.h-200, 32, SDL_PIXELFORMAT_ARGB8888); + surface = SDL_CreateRGBSurfaceWithFormat(0, dm.w-200, dm.h-200, 32, SDL_PIXELFORMAT_ARGB8888); - struct sdlsurface_context *context = nk_sdlsurface_init(surface, 13.0f); + context = nk_sdlsurface_init(surface, 13.0f); while(1) { - nk_input_begin(&(context->ctx)); SDL_Event event; + nk_input_begin(&(context->ctx)); while (SDL_PollEvent(&event)) { switch(event.type) @@ -184,7 +192,7 @@ int main(int argc, char **argv) - SDL_Texture *tex = SDL_CreateTextureFromSurface(renderer, surface); + tex = SDL_CreateTextureFromSurface(renderer, surface); SDL_RenderCopy(renderer, tex, NULL, NULL); SDL_RenderPresent(renderer); SDL_DestroyTexture(tex); diff --git a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h index e36ea31..ce90fba 100644 --- a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h +++ b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h @@ -167,7 +167,7 @@ nk_sdlsurface_img_setpixel(const struct SDL_Surface *img, unsigned int *pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { - ptr = img->pixels + (img->pitch * y0); + ptr = (unsigned char *)img->pixels + (img->pitch * y0); pixel = (unsigned int *)ptr; if (img->format == NK_FONT_ATLAS_ALPHA8) { @@ -186,7 +186,7 @@ nk_sdlsurface_img_getpixel(const struct SDL_Surface *img, const int x0, const in unsigned int pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { - ptr = img->pixels + (img->pitch * y0); + ptr = (unsigned char *)img->pixels + (img->pitch * y0); if (img->format == NK_FONT_ATLAS_ALPHA8) { col.a = ptr[x0]; @@ -235,6 +235,8 @@ nk_sdlsurface_stroke_line(const struct sdlsurface_context *sdlsurface, short tmp; int dy, dx, stepx, stepy; + NK_UNUSED(line_thickness); + dy = y1 - y0; dx = x1 - x0; @@ -369,6 +371,8 @@ nk_sdlsurface_stroke_arc(const struct sdlsurface_context *sdlsurface, const int fa2 = 4 * a2, fb2 = 4 * b2; int x, y, sigma; + NK_UNUSED(line_thickness); + if (s != 0 && s != 90 && s != 180 && s != 270) return; if (w < 1 || h < 1) return; @@ -735,6 +739,8 @@ nk_sdlsurface_stroke_circle(const struct sdlsurface_context *sdlsurface, const int fa2 = 4 * a2, fb2 = 4 * b2; int x, y, sigma; + NK_UNUSED(line_thickness); + /* Convert upper left to center */ h = (h + 1) / 2; w = (w + 1) / 2; @@ -802,13 +808,13 @@ nk_sdlsurface_clear(const struct sdlsurface_context *sdlsurface, const struct nk struct sdlsurface_context* nk_sdlsurface_init(SDL_Surface *fb, float fontSize) { - SDL_assert((fb->format->format == SDL_PIXELFORMAT_ARGB8888) - || (fb->format->format == SDL_PIXELFORMAT_RGBA8888)); - const void *tex; int texh, texw; struct sdlsurface_context *sdlsurface; + assert((fb->format->format == SDL_PIXELFORMAT_ARGB8888) + || (fb->format->format == SDL_PIXELFORMAT_RGBA8888)); + sdlsurface = malloc(sizeof(struct sdlsurface_context)); if (!sdlsurface) return NULL; @@ -843,9 +849,9 @@ nk_sdlsurface_init(SDL_Surface *fb, float fontSize) if (fb->format->format == SDL_PIXELFORMAT_RGBA8888) { - SDL_assert(sdlsurface->font_tex->pitch == sdlsurface->font_tex->w * 4); uint32_t *fontPixels = (uint32_t *)sdlsurface->font_tex->pixels; int i; + assert(sdlsurface->font_tex->pitch == sdlsurface->font_tex->w * 4); for (i = 0; i < sdlsurface->font_tex->w * sdlsurface->font_tex->h; i++) { uint32_t col = fontPixels[i]; diff --git a/demo/sdl_opengl2/Makefile b/demo/sdl_opengl2/Makefile index 967e3f6..64f1af3 100644 --- a/demo/sdl_opengl2/Makefile +++ b/demo/sdl_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengl2/main.c b/demo/sdl_opengl2/main.c index e649780..309351c 100644 --- a/demo/sdl_opengl2/main.c +++ b/demo/sdl_opengl2/main.c @@ -78,6 +78,9 @@ main(int argc, char *argv[]) struct nk_context *ctx; struct nk_colorf bg; + NK_UNUSED(argc); + NK_UNUSED(argv); + /* SDL setup */ SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "0"); SDL_Init(SDL_INIT_VIDEO); diff --git a/demo/sdl_opengl3/Makefile b/demo/sdl_opengl3/Makefile index 1c91995..fb3acd2 100644 --- a/demo/sdl_opengl3/Makefile +++ b/demo/sdl_opengl3/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengl3/main.c b/demo/sdl_opengl3/main.c index c5b95c1..09eb89e 100644 --- a/demo/sdl_opengl3/main.c +++ b/demo/sdl_opengl3/main.c @@ -81,6 +81,9 @@ int main(int argc, char *argv[]) struct nk_context *ctx; struct nk_colorf bg; + NK_UNUSED(argc); + NK_UNUSED(argv); + /* SDL setup */ SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "0"); SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_EVENTS); diff --git a/demo/sdl_opengles2/Makefile b/demo/sdl_opengles2/Makefile index 9c85d89..41d080e 100644 --- a/demo/sdl_opengles2/Makefile +++ b/demo/sdl_opengles2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/sdl_opengles2/main.c b/demo/sdl_opengles2/main.c index bfb8d9c..e137aee 100644 --- a/demo/sdl_opengles2/main.c +++ b/demo/sdl_opengles2/main.c @@ -139,6 +139,10 @@ int main(int argc, char* argv[]) /* GUI */ struct nk_context *ctx; SDL_GLContext glContext; + + NK_UNUSED(argc); + NK_UNUSED(argv); + /* SDL setup */ SDL_SetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED, "0"); /*SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_EVENTS); // - do NOT init SDL on GL ES 2 */ diff --git a/demo/sfml_opengl2/Makefile b/demo/sfml_opengl2/Makefile index 28848a4..e648706 100644 --- a/demo/sfml_opengl2/Makefile +++ b/demo/sfml_opengl2/Makefile @@ -3,7 +3,7 @@ CC = g++ BIN = demo # Flags -CFLAGS += -s -O2 +CFLAGS += -s -Wall -Wextra -pedantic -O2 SRC = main.cpp OBJ = $(SRC:.cpp=.o) diff --git a/demo/sfml_opengl2/nuklear_sfml_gl2.h b/demo/sfml_opengl2/nuklear_sfml_gl2.h index cff7278..728d899 100644 --- a/demo/sfml_opengl2/nuklear_sfml_gl2.h +++ b/demo/sfml_opengl2/nuklear_sfml_gl2.h @@ -189,6 +189,9 @@ nk_sfml_clipboard_paste(nk_handle usr, struct nk_text_edit* edit) if(text) nk_textedit_paste(edit, text, nk_strlen(text)); (void)usr; +#else + NK_UNUSED(usr); + NK_UNUSED(edit); #endif } @@ -208,6 +211,10 @@ nk_sfml_clipboard_copy(nk_handle usr, const char* text, int len) sf::Clipboard clipboard(sfml.window); clipboard.setText(str); free(str); +#else + NK_UNUSED(usr); + NK_UNUSED(text); + NK_UNUSED(len); #endif } diff --git a/demo/sfml_opengl3/Makefile b/demo/sfml_opengl3/Makefile index b30bf28..7bb9712 100644 --- a/demo/sfml_opengl3/Makefile +++ b/demo/sfml_opengl3/Makefile @@ -3,7 +3,7 @@ CC = g++ BIN = demo # Flags -CFLAGS += -s -O2 +CFLAGS += -s -Wall -Wextra -pedantic -O2 SRC = main.cpp OBJ = $(SRC:.cpp=.o) diff --git a/demo/sfml_opengl3/nuklear_sfml_gl3.h b/demo/sfml_opengl3/nuklear_sfml_gl3.h index a074ef0..27d7511 100644 --- a/demo/sfml_opengl3/nuklear_sfml_gl3.h +++ b/demo/sfml_opengl3/nuklear_sfml_gl3.h @@ -298,6 +298,9 @@ nk_sfml_clipboard_paste(nk_handle usr, struct nk_text_edit* edit) sf::Clipboard clipboard(sfml.window); const char* text = clipboard.getText(); if(text) nk_textedit_paste(edit, text, nk_strlen(text)); +#else + NK_UNUSED(usr); + NK_UNUSED(edit); #endif } static void @@ -316,6 +319,10 @@ nk_sfml_clipboard_copy(nk_handle usr, const char* text, int len) sf::Clipboard clipboard(sfml.window); clipboard.setText(str); free(str); +#else + NK_UNUSED(usr); + NK_UNUSED(text); + NK_UNUSED(len); #endif } diff --git a/demo/wayland_rawfb/Makefile b/demo/wayland_rawfb/Makefile index 7359784..7832d68 100644 --- a/demo/wayland_rawfb/Makefile +++ b/demo/wayland_rawfb/Makefile @@ -2,12 +2,12 @@ WAYLAND=`pkg-config wayland-client --cflags --libs` WAYLAND_SCANNER=wayland-scanner WAYLAND_PROTOCOLS_DIR=/usr/share/wayland-protocols -CFLAGS?=-std=c11 -Wall -Werror -O3 -fvisibility=hidden +CFLAGS?=-std=c99 -Wall -Wextra -pedantic -Wno-unused-function -O3 -fvisibility=hidden .PHONY: clean demo: main.c xdg-shell.c xdg-shell.h - $(CC) -o demo *.c $(WAYLAND) -lrt -lm + $(CC) $(CFLAGS) -o demo *.c $(WAYLAND) -lrt -lm xdg-shell.c: $(WAYLAND_SCANNER) code $(WAYLAND_PROTOCOLS_DIR)/stable/xdg-shell/xdg-shell.xml xdg-shell.c diff --git a/demo/wayland_rawfb/main.c b/demo/wayland_rawfb/main.c index fee2945..0db432c 100644 --- a/demo/wayland_rawfb/main.c +++ b/demo/wayland_rawfb/main.c @@ -32,21 +32,37 @@ //WAYLAND OUTPUT INTERFACE static void nk_wayland_output_cb_geometry(void *data, struct wl_output *wl_output, int x, int y, int w, int h, int subpixel, const char *make, const char *model, int transform) { + NK_UNUSED(data); + NK_UNUSED(wl_output); + NK_UNUSED(subpixel); + NK_UNUSED(make); + NK_UNUSED(model); + NK_UNUSED(transform); + printf("wl_output geometry x=%d, y=%d, w=%d, h=%d make=%s, model=%s \n", x,y,w,h, make, model); } static void nk_wayland_output_cb_mode(void *data, struct wl_output *wl_output, unsigned int flags, int w, int h, int refresh) { + NK_UNUSED(data); + NK_UNUSED(wl_output); + NK_UNUSED(flags); + NK_UNUSED(w); + NK_UNUSED(h); + NK_UNUSED(refresh); } static void nk_wayland_output_cb_done(void *data, struct wl_output *output) { - + NK_UNUSED(data); + NK_UNUSED(output); } static void nk_wayland_output_cb_scale(void *data, struct wl_output *output, int scale) { - + NK_UNUSED(data); + NK_UNUSED(output); + NK_UNUSED(scale); } static const struct wl_output_listener nk_wayland_output_listener = @@ -61,15 +77,29 @@ static const struct wl_output_listener nk_wayland_output_listener = //WAYLAND POINTER INTERFACE (mouse/touchpad) static void nk_wayland_pointer_enter (void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y) { + NK_UNUSED(data); + NK_UNUSED(pointer); + NK_UNUSED(serial); + NK_UNUSED(surface); + NK_UNUSED(surface_x); + NK_UNUSED(surface_y); } static void nk_wayland_pointer_leave (void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface) { + NK_UNUSED(data); + NK_UNUSED(pointer); + NK_UNUSED(serial); + NK_UNUSED(surface); } static void nk_wayland_pointer_motion (void *data, struct wl_pointer *pointer, uint32_t time, wl_fixed_t x, wl_fixed_t y) { struct nk_wayland* win = (struct nk_wayland*)data; + + NK_UNUSED(pointer); + NK_UNUSED(time); + win->mouse_pointer_x = wl_fixed_to_int(x); win->mouse_pointer_y = wl_fixed_to_int(y); @@ -79,7 +109,11 @@ static void nk_wayland_pointer_motion (void *data, struct wl_pointer *pointer, u static void nk_wayland_pointer_button (void *data, struct wl_pointer *pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { struct nk_wayland* win = (struct nk_wayland*)data; - + + NK_UNUSED(pointer); + NK_UNUSED(serial); + NK_UNUSED(time); + if (button == 272){ //left mouse button if (state == WL_POINTER_BUTTON_STATE_PRESSED) { // printf("nk_input_button x=%d, y=%d press: 1 \n", win->mouse_pointer_x, win->mouse_pointer_y); @@ -93,6 +127,11 @@ static void nk_wayland_pointer_button (void *data, struct wl_pointer *pointer, u static void nk_wayland_pointer_axis (void *data, struct wl_pointer *pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { + NK_UNUSED(data); + NK_UNUSED(pointer); + NK_UNUSED(time); + NK_UNUSED(axis); + NK_UNUSED(value); } static struct wl_pointer_listener nk_wayland_pointer_listener = @@ -101,30 +140,60 @@ static struct wl_pointer_listener nk_wayland_pointer_listener = &nk_wayland_pointer_leave, &nk_wayland_pointer_motion, &nk_wayland_pointer_button, - &nk_wayland_pointer_axis + &nk_wayland_pointer_axis, + NULL, + NULL, + NULL, + NULL }; //-------------------------------------------------------------------- endof WAYLAND POINTER INTERFACE //WAYLAND KEYBOARD INTERFACE static void nk_wayland_keyboard_keymap (void *data, struct wl_keyboard *keyboard, uint32_t format, int32_t fd, uint32_t size) { + NK_UNUSED(data); + NK_UNUSED(keyboard); + NK_UNUSED(format); + NK_UNUSED(fd); + NK_UNUSED(size); } static void nk_wayland_keyboard_enter (void *data, struct wl_keyboard *keyboard, uint32_t serial, struct wl_surface *surface, struct wl_array *keys) -{ +{ + NK_UNUSED(data); + NK_UNUSED(keyboard); + NK_UNUSED(serial); + NK_UNUSED(surface); + NK_UNUSED(keys); } static void nk_wayland_keyboard_leave (void *data, struct wl_keyboard *keyboard, uint32_t serial, struct wl_surface *surface) { + NK_UNUSED(data); + NK_UNUSED(keyboard); + NK_UNUSED(serial); + NK_UNUSED(surface); } static void nk_wayland_keyboard_key (void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { + NK_UNUSED(data); + NK_UNUSED(keyboard); + NK_UNUSED(serial); + NK_UNUSED(time); + NK_UNUSED(state); printf("key: %d \n", key); } -static void nk_wayland_keyboard_modifiers (void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group) +static void nk_wayland_keyboard_modifiers (void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group) { + NK_UNUSED(data); + NK_UNUSED(keyboard); + NK_UNUSED(serial); + NK_UNUSED(mods_depressed); + NK_UNUSED(mods_latched); + NK_UNUSED(mods_locked); + NK_UNUSED(group); } static struct wl_keyboard_listener nk_wayland_keyboard_listener = @@ -133,7 +202,8 @@ static struct wl_keyboard_listener nk_wayland_keyboard_listener = &nk_wayland_keyboard_enter, &nk_wayland_keyboard_leave, &nk_wayland_keyboard_key, - &nk_wayland_keyboard_modifiers + &nk_wayland_keyboard_modifiers, + NULL }; //-------------------------------------------------------------------- endof WAYLAND KEYBOARD INTERFACE @@ -154,14 +224,16 @@ static void seat_capabilities (void *data, struct wl_seat *seat, uint32_t capabi static struct wl_seat_listener seat_listener = { - &seat_capabilities + &seat_capabilities, + NULL }; //-------------------------------------------------------------------- endof WAYLAND SEAT INTERFACE // WAYLAND SHELL INTERFACE static void nk_wayland_xdg_wm_base_ping (void *data, struct xdg_wm_base *xdg_wm_base, uint32_t serial) { - xdg_wm_base_pong (xdg_wm_base, serial); + NK_UNUSED(data); + xdg_wm_base_pong (xdg_wm_base, serial); } static struct xdg_wm_base_listener nk_wayland_xdg_wm_base_listener = @@ -171,6 +243,7 @@ static struct xdg_wm_base_listener nk_wayland_xdg_wm_base_listener = static void nk_wayland_xdg_surface_configure (void *data, struct xdg_surface *xdg_surface, uint32_t serial) { + NK_UNUSED(data); xdg_surface_ack_configure(xdg_surface, serial); } @@ -181,10 +254,17 @@ static struct xdg_surface_listener nk_wayland_xdg_surface_listener = static void nk_wayland_xdg_toplevel_configure (void *data, struct xdg_toplevel *xdg_toplevel, int32_t width, int32_t height, struct wl_array *states) { + NK_UNUSED(data); + NK_UNUSED(xdg_toplevel); + NK_UNUSED(width); + NK_UNUSED(height); + NK_UNUSED(states); } static void nk_wayland_xdg_toplevel_close (void *data, struct xdg_toplevel *xdg_toplevel) { + NK_UNUSED(data); + NK_UNUSED(xdg_toplevel); } static struct xdg_toplevel_listener nk_wayland_xdg_toplevel_listener = @@ -199,7 +279,9 @@ static struct xdg_toplevel_listener nk_wayland_xdg_toplevel_listener = static void nk_wayland_registry_add_object (void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) { struct nk_wayland* win = (struct nk_wayland*)data; - + + NK_UNUSED(version); + //printf("looking for %s interface \n", interface); if (!strcmp(interface,"wl_compositor")) { win->compositor = wl_registry_bind (registry, name, &wl_compositor_interface, 1); @@ -222,6 +304,9 @@ static void nk_wayland_registry_add_object (void *data, struct wl_registry *regi static void nk_wayland_registry_remove_object (void *data, struct wl_registry *registry, uint32_t name) { + NK_UNUSED(data); + NK_UNUSED(registry); + NK_UNUSED(name); } static struct wl_registry_listener nk_wayland_registry_listener = @@ -314,8 +399,10 @@ static void redraw(void *data, struct wl_callback *callback, uint32_t time) { // printf("redrawing.. 1\n"); struct nk_wayland* win = (struct nk_wayland*)data; - struct nk_color col_red = {0xFF,0x00,0x00,0xA0}; //r,g,b,a - struct nk_color col_green = {0x00,0xFF,0x00,0xA0}; //r,g,b,a + + NK_UNUSED(callback); + NK_UNUSED(time); + wl_callback_destroy(win->frame_callback); wl_surface_damage(win->surface, 0, 0, WIDTH, HEIGHT); @@ -338,7 +425,6 @@ int main () long dt; long started; struct nk_wayland nk_wayland_ctx; - struct wl_backend *backend; struct wl_registry *registry; int running = 1; diff --git a/demo/wayland_rawfb/nuklear_raw_wayland.h b/demo/wayland_rawfb/nuklear_raw_wayland.h index 6e18a78..49082c5 100644 --- a/demo/wayland_rawfb/nuklear_raw_wayland.h +++ b/demo/wayland_rawfb/nuklear_raw_wayland.h @@ -110,7 +110,7 @@ static void nk_wayland_ctx_setpixel(const struct nk_wayland* win, const short x0, const short y0, const struct nk_color col) { uint32_t c = nk_color_to_xrgb8888(col); - uint32_t *pixels = win->data; + uint32_t *pixels = (uint32_t *)win->data; unsigned int *ptr; pixels += (y0 * win->width); @@ -252,7 +252,7 @@ static void nk_wayland_img_setpixel(const struct wayland_img *img, const int x0, unsigned int *pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { - ptr = img->pixels + (img->pitch * y0); + ptr = (unsigned char *)img->pixels + (img->pitch * y0); pixel = (unsigned int *)ptr; if (img->format == NK_FONT_ATLAS_ALPHA8) { @@ -267,10 +267,9 @@ static struct nk_color nk_wayland_getpixel(const struct nk_wayland* win, const i { struct nk_color col = {0, 0, 0, 0}; uint32_t *ptr; - unsigned int pixel; if (y0 < win->height && y0 >= 0 && x0 >= 0 && x0 < win->width) { - ptr = win->data + (y0 * win->width); + ptr = (uint32_t *)win->data + (y0 * win->width); col = nk_wayland_int2color(*ptr, PIXEL_LAYOUT_XRGB_8888); } @@ -285,7 +284,7 @@ static struct nk_color nk_wayland_img_getpixel(const struct wayland_img *img, co unsigned int pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { - ptr = img->pixels + (img->pitch * y0); + ptr = (unsigned char *)img->pixels + (img->pitch * y0); if (img->format == NK_FONT_ATLAS_ALPHA8) { col.a = ptr[x0]; @@ -365,6 +364,8 @@ static void nk_wayland_stroke_line(const struct nk_wayland* win, short x0, short short tmp; int dy, dx, stepx, stepy; + NK_UNUSED(line_thickness); + dy = y1 - y0; dx = x1 - x0; @@ -494,6 +495,8 @@ static void nk_wayland_stroke_arc(const struct nk_wayland* win, const int fa2 = 4 * a2, fb2 = 4 * b2; int x, y, sigma; + NK_UNUSED(line_thickness); + if (s != 0 && s != 90 && s != 180 && s != 270) return; if (w < 1 || h < 1) return; diff --git a/demo/x11/Makefile b/demo/x11/Makefile index 9057c7b..1234eaf 100644 --- a/demo/x11/Makefile +++ b/demo/x11/Makefile @@ -2,7 +2,7 @@ BIN = zahnrad # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -Wno-unused-function -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11/nuklear_xlib.h b/demo/x11/nuklear_xlib.h index 6701ad9..772ac56 100644 --- a/demo/x11/nuklear_xlib.h +++ b/demo/x11/nuklear_xlib.h @@ -497,6 +497,9 @@ nk_xsurf_draw_image(XSurface *surf, short x, short y, unsigned short w, unsigned struct nk_image img, struct nk_color col) { XImageWithAlpha *aimage = img.handle.ptr; + + NK_UNUSED(col); + if (aimage){ if (aimage->clipMask){ XSetClipMask(surf->dpy, surf->gc, aimage->clipMask); @@ -581,6 +584,9 @@ nk_xfont_get_text_width(nk_handle handle, float height, const char *text, int le { XFont *font = (XFont*)handle.ptr; XRectangle r; + + NK_UNUSED(height); + if(!font || !text) return 0; @@ -687,6 +693,8 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt) { struct nk_context *ctx = &xlib.ctx; + NK_UNUSED(screen); + /* optional grabbing behavior */ if (ctx->input.mouse.grab) { XDefineCursor(xlib.dpy, xlib.root, xlib.cursor); diff --git a/demo/x11_opengl2/Makefile b/demo/x11_opengl2/Makefile index 824bc97..e92437f 100644 --- a/demo/x11_opengl2/Makefile +++ b/demo/x11_opengl2/Makefile @@ -6,7 +6,7 @@ CC = clang DCC = gcc # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_opengl2/nuklear_xlib_gl2.h b/demo/x11_opengl2/nuklear_xlib_gl2.h index c8483fe..de720f4 100644 --- a/demo/x11_opengl2/nuklear_xlib_gl2.h +++ b/demo/x11_opengl2/nuklear_xlib_gl2.h @@ -100,8 +100,11 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b /* setup global state */ struct nk_x11_device *dev = &x11.ogl; int width, height; - XWindowAttributes attr; + + NK_UNUSED(max_vertex_buffer); + NK_UNUSED(max_element_buffer); + XGetWindowAttributes(x11.dpy, x11.win, &attr); width = attr.width; height = attr.height; diff --git a/demo/x11_opengl3/Makefile b/demo/x11_opengl3/Makefile index 824bc97..e92437f 100644 --- a/demo/x11_opengl3/Makefile +++ b/demo/x11_opengl3/Makefile @@ -6,7 +6,7 @@ CC = clang DCC = gcc # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_rawfb/Makefile b/demo/x11_rawfb/Makefile index 0cae0b7..10bb4a7 100644 --- a/demo/x11_rawfb/Makefile +++ b/demo/x11_rawfb/Makefile @@ -2,7 +2,7 @@ BIN = zahnrad # Flags -CFLAGS += -std=c89 -pedantic -O2 -Wunused +CFLAGS += -std=c89 -Wall -Wextra -pedantic -Wno-unused-function -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_rawfb/nuklear_rawfb.h b/demo/x11_rawfb/nuklear_rawfb.h index a953993..ce84222 100644 --- a/demo/x11_rawfb/nuklear_rawfb.h +++ b/demo/x11_rawfb/nuklear_rawfb.h @@ -179,7 +179,7 @@ nk_rawfb_img_setpixel(const struct rawfb_image *img, unsigned int *pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { - ptr = img->pixels + (img->pitch * y0); + ptr = (unsigned char *)img->pixels + (img->pitch * y0); pixel = (unsigned int *)ptr; if (img->format == NK_FONT_ATLAS_ALPHA8) { @@ -198,7 +198,7 @@ nk_rawfb_img_getpixel(const struct rawfb_image *img, const int x0, const int y0) unsigned int pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { - ptr = img->pixels + (img->pitch * y0); + ptr = (unsigned char *)img->pixels + (img->pitch * y0); if (img->format == NK_FONT_ATLAS_ALPHA8) { col.a = ptr[x0]; @@ -247,6 +247,8 @@ nk_rawfb_stroke_line(const struct rawfb_context *rawfb, short tmp; int dy, dx, stepx, stepy; + NK_UNUSED(line_thickness); + dy = y1 - y0; dx = x1 - x0; @@ -381,6 +383,8 @@ nk_rawfb_stroke_arc(const struct rawfb_context *rawfb, const int fa2 = 4 * a2, fb2 = 4 * b2; int x, y, sigma; + NK_UNUSED(line_thickness); + if (s != 0 && s != 90 && s != 180 && s != 270) return; if (w < 1 || h < 1) return; @@ -747,6 +751,8 @@ nk_rawfb_stroke_circle(const struct rawfb_context *rawfb, const int fa2 = 4 * a2, fb2 = 4 * b2; int x, y, sigma; + NK_UNUSED(line_thickness); + /* Convert upper left to center */ h = (h + 1) / 2; w = (w + 1) / 2; diff --git a/demo/x11_rawfb/nuklear_xlib.h b/demo/x11_rawfb/nuklear_xlib.h index 2f9aa6f..0d23135 100644 --- a/demo/x11_rawfb/nuklear_xlib.h +++ b/demo/x11_rawfb/nuklear_xlib.h @@ -109,7 +109,7 @@ nk_xlib_init(Display *dpy, Visual *vis, int screen, Window root, break; } xlib.xsi.shmaddr = xlib.ximg->data = shmat(xlib.xsi.shmid, NULL, 0); - if ((size_t)xlib.xsi.shmaddr < 0) { + if ((intptr_t)xlib.xsi.shmaddr < 0) { XDestroyImage(xlib.ximg); xlib.fallback = True; break; diff --git a/demo/x11_xft/Makefile b/demo/x11_xft/Makefile index 12d3cba..1ea53e6 100644 --- a/demo/x11_xft/Makefile +++ b/demo/x11_xft/Makefile @@ -2,7 +2,7 @@ BIN = zahnrad # Flags -CFLAGS += -std=c89 -pedantic -O2 +CFLAGS += -std=c89 -Wall -Wextra -pedantic -Wno-unused-function -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/x11_xft/nuklear_xlib.h b/demo/x11_xft/nuklear_xlib.h index 436307f..7fbcd47 100644 --- a/demo/x11_xft/nuklear_xlib.h +++ b/demo/x11_xft/nuklear_xlib.h @@ -423,10 +423,11 @@ nk_xsurf_draw_text(XSurface *surf, short x, short y, unsigned short w, unsigned #ifdef NK_XLIB_USE_XFT XRenderColor xrc; XftColor color; -#endif - int tx, ty; - unsigned long bg = nk_color_from_byte(&cbg.r); +#else unsigned long fg = nk_color_from_byte(&cfg.r); +#endif + unsigned long bg = nk_color_from_byte(&cbg.r); + int tx, ty; XSetForeground(surf->dpy, surf->gc, bg); XFillRectangle(surf->dpy, surf->drawable, surf->gc, (int)x, (int)y, (unsigned)w, (unsigned)h); @@ -543,6 +544,9 @@ nk_xsurf_draw_image(XSurface *surf, short x, short y, unsigned short w, unsigned struct nk_image img, struct nk_color col) { XImageWithAlpha *aimage = img.handle.ptr; + + NK_UNUSED(col); + if (aimage){ if (aimage->clipMask){ XSetClipMask(surf->dpy, surf->gc, aimage->clipMask); @@ -645,6 +649,8 @@ nk_xfont_get_text_width(nk_handle handle, float height, const char *text, int le #ifdef NK_XLIB_USE_XFT XGlyphInfo g; + NK_UNUSED(height); + if(!font || !text) return 0; @@ -653,6 +659,8 @@ nk_xfont_get_text_width(nk_handle handle, float height, const char *text, int le #else XRectangle r; + NK_UNUSED(height); + if(!font || !text) return 0; @@ -770,6 +778,8 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt) { struct nk_context *ctx = &xlib.ctx; + NK_UNUSED(screen); + /* optional grabbing behavior */ if (ctx->input.mouse.grab) { XDefineCursor(xlib.dpy, xlib.root, xlib.cursor); diff --git a/example/Makefile b/example/Makefile index 7d99d77..1f24aea 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,5 +1,5 @@ # Flags -CFLAGS += -std=c99 -pedantic -O2 +CFLAGS += -std=c99 -Wall -Wextra -pedantic -Wno-misleading-indentation -Wno-shift-negative-value -O2 LIBS := ifeq ($(OS),Windows_NT) diff --git a/example/canvas.c b/example/canvas.c index ed7d833..5f651cc 100644 --- a/example/canvas.c +++ b/example/canvas.c @@ -65,6 +65,8 @@ struct device { GLuint font_tex; }; +/* function icon_load () is not used to build this file but might still be useful :) */ +/* static void die(const char *fmt, ...) { @@ -76,8 +78,6 @@ die(const char *fmt, ...) exit(EXIT_FAILURE); } -/* function icon_load () is not used to build this file but might still be useful :) */ -/* static struct nk_image icon_load(const char *filename) { @@ -404,6 +404,9 @@ int main(int argc, char *argv[]) struct nk_font_atlas atlas; struct nk_context ctx; + NK_UNUSED(argc); + NK_UNUSED(argv); + /* GLFW */ glfwSetErrorCallback(error_callback); if (!glfwInit()) { diff --git a/example/extended.c b/example/extended.c index 38be5f6..f1ae3c1 100644 --- a/example/extended.c +++ b/example/extended.c @@ -748,6 +748,9 @@ int main(int argc, char *argv[]) struct media media; struct nk_context ctx; + NK_UNUSED(argc); + NK_UNUSED(argv); + /* GLFW */ glfwSetErrorCallback(error_callback); if (!glfwInit()) { diff --git a/example/file_browser.c b/example/file_browser.c index d77615d..7286d5f 100644 --- a/example/file_browser.c +++ b/example/file_browser.c @@ -149,6 +149,7 @@ die(const char *fmt, ...) exit(EXIT_FAILURE); } +#if 0 static char* file_load(const char* path, size_t* siz) { @@ -163,6 +164,7 @@ file_load(const char* path, size_t* siz) fclose(fd); return buf; } +#endif static char* str_duplicate(const char *src) @@ -200,6 +202,7 @@ dir_list(const char *dir, int return_subdirs, size_t *count) assert(dir); assert(count); strncpy(buffer, dir, MAX_PATH_LEN); + buffer[MAX_PATH_LEN - 1] = 0; n = strlen(buffer); if (n > 0 && (buffer[n-1] != '/')) @@ -343,6 +346,7 @@ static void file_browser_reload_directory_content(struct file_browser *browser, const char *path) { strncpy(browser->directory, path, MAX_PATH_LEN); + browser->directory[MAX_PATH_LEN - 1] = 0; dir_free_list(browser->files, browser->file_count); dir_free_list(browser->directories, browser->dir_count); browser->files = dir_list(path, 0, &browser->file_count); @@ -364,6 +368,7 @@ file_browser_init(struct file_browser *browser, struct media *media) { size_t l; strncpy(browser->home, home, MAX_PATH_LEN); + browser->home[MAX_PATH_LEN - 1] = 0; l = strlen(browser->home); strcpy(browser->home + l, "/"); strcpy(browser->directory, browser->home); diff --git a/example/skinning.c b/example/skinning.c index 84c4bf6..54f71e4 100644 --- a/example/skinning.c +++ b/example/skinning.c @@ -733,7 +733,6 @@ int main(int argc, char *argv[]) nk_input_end(&ctx);} /* GUI */ - {struct nk_panel layout, tab; if (nk_begin(&ctx, "Demo", nk_rect(50, 50, 300, 400), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_TITLE)) { @@ -805,7 +804,7 @@ int main(int argc, char *argv[]) nk_group_end(&ctx); } } - nk_end(&ctx);} + nk_end(&ctx); /* Draw */ glViewport(0, 0, display_width, display_height); diff --git a/nuklear.h b/nuklear.h index ecc3beb..2f7a465 100644 --- a/nuklear.h +++ b/nuklear.h @@ -22166,7 +22166,7 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) NK_API void nk_spacer(struct nk_context *ctx ) { - struct nk_rect dummy_rect = {0}; + struct nk_rect dummy_rect = { 0, 0, 0, 0 }; nk_panel_alloc_space( &dummy_rect, ctx ); } @@ -29560,6 +29560,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget /// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later diff --git a/src/CHANGELOG b/src/CHANGELOG index 4e40836..00e3945 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget /// - 2021/09/22 (4.08.6) - Fix "may be used uninitialized" warnings in nk_widget /// - 2021/09/22 (4.08.5) - GCC __builtin_offsetof only exists in version 4 and later diff --git a/src/nuklear_layout.c b/src/nuklear_layout.c index b737aca..269cfd4 100644 --- a/src/nuklear_layout.c +++ b/src/nuklear_layout.c @@ -763,7 +763,7 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) NK_API void nk_spacer(struct nk_context *ctx ) { - struct nk_rect dummy_rect = {0}; + struct nk_rect dummy_rect = { 0, 0, 0, 0 }; nk_panel_alloc_space( &dummy_rect, ctx ); } From 459ba9c48cb5db19642efffd45d1d7d8626c90fc Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 16 Dec 2021 15:16:33 +0000 Subject: [PATCH 37/89] Integrate the canvas example with the demos --- demo/allegro5/main.c | 53 ++++++++++++++++++---- demo/canvas.c | 84 +++++++++++++++++++++++++++++++++++ demo/d3d11/main.c | 8 ++++ demo/d3d9/main.c | 8 ++++ demo/gdi/main.c | 8 ++++ demo/gdip/main.c | 8 ++++ demo/glfw_opengl2/main.c | 8 ++++ demo/glfw_opengl3/main.c | 8 ++++ demo/glfw_opengl4/main.c | 8 ++++ demo/sdl2surface_rawfb/main.c | 53 ++++++++++++++++++++++ demo/sdl_opengl2/main.c | 8 ++++ demo/sdl_opengl3/main.c | 8 ++++ demo/sdl_opengles2/main.c | 52 ++++++++++++++++++---- demo/sfml_opengl2/main.cpp | 8 ++++ demo/sfml_opengl3/main.cpp | 8 ++++ demo/wayland_rawfb/main.c | 63 +++++++++++++++++++++----- demo/x11/main.c | 8 ++++ demo/x11_opengl2/main.c | 8 ++++ demo/x11_opengl3/main.c | 8 ++++ demo/x11_rawfb/main.c | 8 ++++ demo/x11_xft/main.c | 8 ++++ 21 files changed, 404 insertions(+), 29 deletions(-) create mode 100644 demo/canvas.c diff --git a/demo/allegro5/main.c b/demo/allegro5/main.c index 2755f0d..0d748bf 100644 --- a/demo/allegro5/main.c +++ b/demo/allegro5/main.c @@ -29,18 +29,44 @@ #define MAX(a,b) ((a) < (b) ? (b) : (a)) #define LEN(a) (sizeof(a)/sizeof(a)[0]) + /* =============================================================== * * EXAMPLE * * ===============================================================*/ /* This are some code examples to provide a small overview of what can be - * done with this library. To try out an example uncomment the include - * and the corresponding function. */ -/*#include "../style.c"*/ -/*#include "../calculator.c"*/ -#include "../overview.c" -/*#include "../node_editor.c"*/ + * done with this library. To try out an example uncomment the defines */ +/*#define INCLUDE_ALL */ +/*#define INCLUDE_STYLE */ +/*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ +#define INCLUDE_OVERVIEW +/*#define INCLUDE_NODE_EDITOR */ + +#ifdef INCLUDE_ALL + #define INCLUDE_STYLE + #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS + #define INCLUDE_OVERVIEW + #define INCLUDE_NODE_EDITOR +#endif + +#ifdef INCLUDE_STYLE + #include "../style.c" +#endif +#ifdef INCLUDE_CALCULATOR + #include "../calculator.c" +#endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif +#ifdef INCLUDE_OVERVIEW + #include "../overview.c" +#endif +#ifdef INCLUDE_NODE_EDITOR + #include "../node_editor.c" +#endif /* =============================================================== * @@ -139,9 +165,18 @@ int main(void) nk_end(ctx); /* -------------- EXAMPLES ---------------- */ - /*calculator(ctx);*/ - overview(ctx); - /*node_editor(ctx);*/ + #ifdef INCLUDE_CALCULATOR + calculator(ctx); + #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif + #ifdef INCLUDE_OVERVIEW + overview(ctx); + #endif + #ifdef INCLUDE_NODE_EDITOR + node_editor(ctx); + #endif /* ----------------------------------------- */ /* Draw */ diff --git a/demo/canvas.c b/demo/canvas.c new file mode 100644 index 0000000..30b76da --- /dev/null +++ b/demo/canvas.c @@ -0,0 +1,84 @@ +/* nuklear - v1.05 - public domain */ +struct nk_canvas { + struct nk_command_buffer *painter; + struct nk_vec2 item_spacing; + struct nk_vec2 panel_padding; + struct nk_style_item window_background; +}; + +static nk_bool +canvas_begin(struct nk_context *ctx, struct nk_canvas *canvas, nk_flags flags, + int x, int y, int width, int height, struct nk_color background_color) +{ + /* save style properties which will be overwritten */ + canvas->panel_padding = ctx->style.window.padding; + canvas->item_spacing = ctx->style.window.spacing; + canvas->window_background = ctx->style.window.fixed_background; + + /* use the complete window space and set background */ + ctx->style.window.spacing = nk_vec2(0,0); + ctx->style.window.padding = nk_vec2(0,0); + ctx->style.window.fixed_background = nk_style_item_color(background_color); + + /* create/update window and set position + size */ + if (!nk_begin(ctx, "Canvas", nk_rect(x, y, width, height), NK_WINDOW_NO_SCROLLBAR|flags)) + return nk_false; + + /* allocate the complete window space for drawing */ + { + struct nk_rect total_space; + total_space = nk_window_get_content_region(ctx); + nk_layout_row_dynamic(ctx, total_space.h, 1); + nk_widget(&total_space, ctx); + canvas->painter = nk_window_get_canvas(ctx); + } + + return nk_true; +} + +static void +canvas_end(struct nk_context *ctx, struct nk_canvas *canvas) +{ + nk_end(ctx); + ctx->style.window.spacing = canvas->panel_padding; + ctx->style.window.padding = canvas->item_spacing; + ctx->style.window.fixed_background = canvas->window_background; +} + +static void +canvas(struct nk_context *ctx) +{ + struct nk_canvas canvas; + if (canvas_begin(ctx, &canvas, NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE| + NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE, 10, 10, 500, 550, nk_rgb(250,250,250))) + { + float x = canvas.painter->clip.x, y = canvas.painter->clip.y; + + nk_fill_rect(canvas.painter, nk_rect(x + 15, y + 15, 210, 210), 5, nk_rgb(247, 230, 154)); + nk_fill_rect(canvas.painter, nk_rect(x + 20, y + 20, 200, 200), 5, nk_rgb(188, 174, 118)); + /* nk_draw_text(canvas.painter, nk_rect(x + 30, y + 30, 150, 20), "Text to draw", 12, &font->handle, nk_rgb(188,174,118), nk_rgb(0,0,0)); */ + nk_fill_rect(canvas.painter, nk_rect(x + 250, y + 20, 100, 100), 0, nk_rgb(0,0,255)); + nk_fill_circle(canvas.painter, nk_rect(x + 20, y + 250, 100, 100), nk_rgb(255,0,0)); + nk_fill_triangle(canvas.painter, x + 250, y + 250, x + 350, y + 250, x + 300, y + 350, nk_rgb(0,255,0)); + nk_fill_arc(canvas.painter, x + 300, y + 180, 50, 0, 3.141592654f * 3.0f / 4.0f, nk_rgb(255,255,0)); + + { + float points[12]; + points[0] = x + 200; points[1] = y + 250; + points[2] = x + 250; points[3] = y + 350; + points[4] = x + 225; points[5] = y + 350; + points[6] = x + 200; points[7] = y + 300; + points[8] = x + 175; points[9] = y + 350; + points[10] = x + 150; points[11] = y + 350; + nk_fill_polygon(canvas.painter, points, 6, nk_rgb(0,0,0)); + } + + nk_stroke_line(canvas.painter, x + 15, y + 10, x + 200, y + 10, 2.0f, nk_rgb(189,45,75)); + nk_stroke_rect(canvas.painter, nk_rect(x + 370, y + 20, 100, 100), 10, 3, nk_rgb(0,0,255)); + nk_stroke_curve(canvas.painter, x + 380, y + 200, x + 405, y + 270, x + 455, y + 120, x + 480, y + 200, 2, nk_rgb(0,150,220)); + nk_stroke_circle(canvas.painter, nk_rect(x + 20, y + 370, 100, 100), 5, nk_rgb(0,255,120)); + nk_stroke_triangle(canvas.painter, x + 370, y + 250, x + 470, y + 250, x + 420, y + 350, 6, nk_rgb(255,0,143)); + } + canvas_end(ctx, &canvas); +} + diff --git a/demo/d3d11/main.c b/demo/d3d11/main.c index 14d0d1c..c10d36a 100644 --- a/demo/d3d11/main.c +++ b/demo/d3d11/main.c @@ -36,12 +36,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -52,6 +54,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -264,6 +269,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/d3d9/main.c b/demo/d3d9/main.c index 76c8f81..d43bcc0 100644 --- a/demo/d3d9/main.c +++ b/demo/d3d9/main.c @@ -33,12 +33,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -49,6 +51,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -269,6 +274,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/gdi/main.c b/demo/gdi/main.c index 1755b9c..01dd5ce 100644 --- a/demo/gdi/main.c +++ b/demo/gdi/main.c @@ -28,12 +28,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -44,6 +46,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -164,6 +169,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/gdip/main.c b/demo/gdip/main.c index a90a0cf..1fdabe4 100644 --- a/demo/gdip/main.c +++ b/demo/gdip/main.c @@ -28,12 +28,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -44,6 +46,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -159,6 +164,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/glfw_opengl2/main.c b/demo/glfw_opengl2/main.c index f3d3d9d..0301eee 100644 --- a/demo/glfw_opengl2/main.c +++ b/demo/glfw_opengl2/main.c @@ -37,12 +37,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ #define INCLUDE_OVERVIEW /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -53,6 +55,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -155,6 +160,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/glfw_opengl3/main.c b/demo/glfw_opengl3/main.c index b9b09d7..af02f68 100644 --- a/demo/glfw_opengl3/main.c +++ b/demo/glfw_opengl3/main.c @@ -41,12 +41,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ #define INCLUDE_OVERVIEW /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -57,6 +59,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -173,6 +178,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/glfw_opengl4/main.c b/demo/glfw_opengl4/main.c index 5385fb3..dd78a40 100644 --- a/demo/glfw_opengl4/main.c +++ b/demo/glfw_opengl4/main.c @@ -41,12 +41,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ #define INCLUDE_OVERVIEW /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -57,6 +59,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -194,6 +199,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/sdl2surface_rawfb/main.c b/demo/sdl2surface_rawfb/main.c index f383cbc..a52e71b 100644 --- a/demo/sdl2surface_rawfb/main.c +++ b/demo/sdl2surface_rawfb/main.c @@ -22,6 +22,44 @@ #define NK_SDLSURFACE_IMPLEMENTATION #include "sdl2surface_rawfb.h" +/* =============================================================== + * + * EXAMPLE + * + * ===============================================================*/ +/* This are some code examples to provide a small overview of what can be + * done with this library. To try out an example uncomment the defines */ +/*#define INCLUDE_ALL */ +/*#define INCLUDE_STYLE */ +/*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ +/*#define INCLUDE_OVERVIEW */ +/*#define INCLUDE_NODE_EDITOR */ + +#ifdef INCLUDE_ALL + #define INCLUDE_STYLE + #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS + #define INCLUDE_OVERVIEW + #define INCLUDE_NODE_EDITOR +#endif + +#ifdef INCLUDE_STYLE + #include "../style.c" +#endif +#ifdef INCLUDE_CALCULATOR + #include "../calculator.c" +#endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif +#ifdef INCLUDE_OVERVIEW + #include "../overview.c" +#endif +#ifdef INCLUDE_NODE_EDITOR + #include "../node_editor.c" +#endif + static int translate_sdl_key(struct SDL_Keysym const *k) { /*keyboard handling left as an exercise for the reader */ @@ -187,6 +225,21 @@ int main(int argc, char **argv) /* grid_demo(&(context->ctx)); */ + /* -------------- EXAMPLES ---------------- */ + #ifdef INCLUDE_CALCULATOR + calculator(&(context->ctx)); + #endif + #ifdef INCLUDE_CANVAS + canvas(&(context->ctx)); + #endif + #ifdef INCLUDE_OVERVIEW + overview(&(context->ctx)); + #endif + #ifdef INCLUDE_NODE_EDITOR + node_editor(&(context->ctx)); + #endif + /* ----------------------------------------- */ + nk_sdlsurface_render(context, clear, 1); diff --git a/demo/sdl_opengl2/main.c b/demo/sdl_opengl2/main.c index 309351c..157cfab 100644 --- a/demo/sdl_opengl2/main.c +++ b/demo/sdl_opengl2/main.c @@ -37,12 +37,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -53,6 +55,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -168,6 +173,9 @@ main(int argc, char *argv[]) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/sdl_opengl3/main.c b/demo/sdl_opengl3/main.c index 09eb89e..2aa1588 100644 --- a/demo/sdl_opengl3/main.c +++ b/demo/sdl_opengl3/main.c @@ -41,12 +41,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -57,6 +59,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -178,6 +183,9 @@ int main(int argc, char *argv[]) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/sdl_opengles2/main.c b/demo/sdl_opengles2/main.c index e137aee..02a0964 100644 --- a/demo/sdl_opengles2/main.c +++ b/demo/sdl_opengles2/main.c @@ -38,12 +38,37 @@ * * ===============================================================*/ /* This are some code examples to provide a small overview of what can be - * done with this library. To try out an example uncomment the include - * and the corresponding function. */ -/*#include "../style.c"*/ -/*#include "../calculator.c"*/ -/*#include "../overview.c"*/ -/*#include "../node_editor.c"*/ + * done with this library. To try out an example uncomment the defines */ +/*#define INCLUDE_ALL */ +/*#define INCLUDE_STYLE */ +/*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ +/*#define INCLUDE_OVERVIEW */ +/*#define INCLUDE_NODE_EDITOR */ + +#ifdef INCLUDE_ALL + #define INCLUDE_STYLE + #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS + #define INCLUDE_OVERVIEW + #define INCLUDE_NODE_EDITOR +#endif + +#ifdef INCLUDE_STYLE + #include "../style.c" +#endif +#ifdef INCLUDE_CALCULATOR + #include "../calculator.c" +#endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif +#ifdef INCLUDE_OVERVIEW + #include "../overview.c" +#endif +#ifdef INCLUDE_NODE_EDITOR + #include "../node_editor.c" +#endif /* =============================================================== * @@ -112,9 +137,18 @@ MainLoop(void* loopArg){ nk_end(ctx); /* -------------- EXAMPLES ---------------- */ - /*calculator(ctx);*/ - /*overview(ctx);*/ - /*node_editor(ctx);*/ + #ifdef INCLUDE_CALCULATOR + calculator(ctx); + #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif + #ifdef INCLUDE_OVERVIEW + overview(ctx); + #endif + #ifdef INCLUDE_NODE_EDITOR + node_editor(ctx); + #endif /* ----------------------------------------- */ /* Draw */ diff --git a/demo/sfml_opengl2/main.cpp b/demo/sfml_opengl2/main.cpp index db0bb29..a815d09 100644 --- a/demo/sfml_opengl2/main.cpp +++ b/demo/sfml_opengl2/main.cpp @@ -37,12 +37,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -53,6 +55,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -154,6 +159,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/sfml_opengl3/main.cpp b/demo/sfml_opengl3/main.cpp index 8bd669a..45afb6c 100644 --- a/demo/sfml_opengl3/main.cpp +++ b/demo/sfml_opengl3/main.cpp @@ -39,12 +39,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -55,6 +57,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -161,6 +166,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/wayland_rawfb/main.c b/demo/wayland_rawfb/main.c index 0db432c..98f2c10 100644 --- a/demo/wayland_rawfb/main.c +++ b/demo/wayland_rawfb/main.c @@ -28,6 +28,44 @@ #define DTIME 20 +/* =============================================================== + * + * EXAMPLE + * + * ===============================================================*/ +/* This are some code examples to provide a small overview of what can be + * done with this library. To try out an example uncomment the defines */ +/*#define INCLUDE_ALL */ +/*#define INCLUDE_STYLE */ +/*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ +/*#define INCLUDE_OVERVIEW */ +/*#define INCLUDE_NODE_EDITOR */ + +#ifdef INCLUDE_ALL + #define INCLUDE_STYLE + #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS + #define INCLUDE_OVERVIEW + #define INCLUDE_NODE_EDITOR +#endif + +#ifdef INCLUDE_STYLE + #include "../style.c" +#endif +#ifdef INCLUDE_CALCULATOR + #include "../calculator.c" +#endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif +#ifdef INCLUDE_OVERVIEW + #include "../overview.c" +#endif +#ifdef INCLUDE_NODE_EDITOR + #include "../node_editor.c" +#endif + //WAYLAND OUTPUT INTERFACE static void nk_wayland_output_cb_geometry(void *data, struct wl_output *wl_output, int x, int y, int w, int h, int subpixel, const char *make, const char *model, int transform) @@ -504,17 +542,20 @@ int main () if (nk_window_is_closed(&(nk_wayland_ctx.ctx), "Demo")) break; - // -------------- EXAMPLES ---------------- - //#ifdef INCLUDE_CALCULATOR - // calculator(&rawfb->ctx); - //#endif - // #ifdef INCLUDE_OVERVIEW - // overview(&rawfb->ctx); - // #endif - // #ifdef INCLUDE_NODE_EDITOR - // node_editor(&rawfb->ctx); - //#endif - // ----------------------------------------- + /* -------------- EXAMPLES ---------------- */ + #ifdef INCLUDE_CALCULATOR + calculator(&(nk_wayland_ctx.ctx)); + #endif + #ifdef INCLUDE_CANVAS + canvas(&(nk_wayland_ctx.ctx)); + #endif + #ifdef INCLUDE_OVERVIEW + overview(&(nk_wayland_ctx.ctx)); + #endif + #ifdef INCLUDE_NODE_EDITOR + node_editor(&(nk_wayland_ctx.ctx)); + #endif + /* ----------------------------------------- */ // Draw framebuffer nk_wayland_render(&nk_wayland_ctx, nk_rgb(30,30,30), 1); diff --git a/demo/x11/main.c b/demo/x11/main.c index 791653d..6ae35e5 100644 --- a/demo/x11/main.c +++ b/demo/x11/main.c @@ -79,12 +79,14 @@ sleep_for(long t) /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -95,6 +97,9 @@ sleep_for(long t) #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -193,6 +198,9 @@ main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/x11_opengl2/main.c b/demo/x11_opengl2/main.c index d906929..ec91a6f 100644 --- a/demo/x11_opengl2/main.c +++ b/demo/x11_opengl2/main.c @@ -40,12 +40,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -56,6 +58,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -309,6 +314,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/x11_opengl3/main.c b/demo/x11_opengl3/main.c index 5eab66f..8dafad3 100644 --- a/demo/x11_opengl3/main.c +++ b/demo/x11_opengl3/main.c @@ -38,12 +38,14 @@ /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -54,6 +56,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -306,6 +311,9 @@ int main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif diff --git a/demo/x11_rawfb/main.c b/demo/x11_rawfb/main.c index d722864..4ff4669 100644 --- a/demo/x11_rawfb/main.c +++ b/demo/x11_rawfb/main.c @@ -113,12 +113,14 @@ sleep_for(long t) /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -129,6 +131,9 @@ sleep_for(long t) #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -230,6 +235,9 @@ main(void) #ifdef INCLUDE_CALCULATOR calculator(&rawfb->ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(&rawfb->ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(&rawfb->ctx); #endif diff --git a/demo/x11_xft/main.c b/demo/x11_xft/main.c index 3a7917e..20957c1 100644 --- a/demo/x11_xft/main.c +++ b/demo/x11_xft/main.c @@ -79,12 +79,14 @@ sleep_for(long t) /*#define INCLUDE_ALL */ /*#define INCLUDE_STYLE */ /*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ /*#define INCLUDE_OVERVIEW */ /*#define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -95,6 +97,9 @@ sleep_for(long t) #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -197,6 +202,9 @@ main(void) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif From a12c158ad4676473c52c08a9e871af4b96743c65 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 16 Dec 2021 18:51:09 +0000 Subject: [PATCH 38/89] Add more shapes to the canvas demo --- demo/canvas.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/demo/canvas.c b/demo/canvas.c index 30b76da..6c50bcb 100644 --- a/demo/canvas.c +++ b/demo/canvas.c @@ -60,7 +60,7 @@ canvas(struct nk_context *ctx) nk_fill_rect(canvas.painter, nk_rect(x + 250, y + 20, 100, 100), 0, nk_rgb(0,0,255)); nk_fill_circle(canvas.painter, nk_rect(x + 20, y + 250, 100, 100), nk_rgb(255,0,0)); nk_fill_triangle(canvas.painter, x + 250, y + 250, x + 350, y + 250, x + 300, y + 350, nk_rgb(0,255,0)); - nk_fill_arc(canvas.painter, x + 300, y + 180, 50, 0, 3.141592654f * 3.0f / 4.0f, nk_rgb(255,255,0)); + nk_fill_arc(canvas.painter, x + 300, y + 420, 50, 0, 3.141592654f * 3.0f / 4.0f, nk_rgb(255,255,0)); { float points[12]; @@ -73,11 +73,32 @@ canvas(struct nk_context *ctx) nk_fill_polygon(canvas.painter, points, 6, nk_rgb(0,0,0)); } + { + float points[12]; + points[0] = x + 200; points[1] = y + 370; + points[2] = x + 250; points[3] = y + 470; + points[4] = x + 225; points[5] = y + 470; + points[6] = x + 200; points[7] = y + 420; + points[8] = x + 175; points[9] = y + 470; + points[10] = x + 150; points[11] = y + 470; + nk_stroke_polygon(canvas.painter, points, 6, 4, nk_rgb(0,0,0)); + } + + { + float points[8]; + points[0] = x + 250; points[1] = y + 200; + points[2] = x + 275; points[3] = y + 220; + points[4] = x + 325; points[5] = y + 170; + points[6] = x + 350; points[7] = y + 200; + nk_stroke_polyline(canvas.painter, points, 4, 2, nk_rgb(255,128,0)); + } + nk_stroke_line(canvas.painter, x + 15, y + 10, x + 200, y + 10, 2.0f, nk_rgb(189,45,75)); nk_stroke_rect(canvas.painter, nk_rect(x + 370, y + 20, 100, 100), 10, 3, nk_rgb(0,0,255)); nk_stroke_curve(canvas.painter, x + 380, y + 200, x + 405, y + 270, x + 455, y + 120, x + 480, y + 200, 2, nk_rgb(0,150,220)); nk_stroke_circle(canvas.painter, nk_rect(x + 20, y + 370, 100, 100), 5, nk_rgb(0,255,120)); nk_stroke_triangle(canvas.painter, x + 370, y + 250, x + 470, y + 250, x + 420, y + 350, 6, nk_rgb(255,0,143)); + nk_stroke_arc(canvas.painter, x + 420, y + 420, 50, 0, 3.141592654f * 3.0f / 4.0f, 5, nk_rgb(0,255,255)); } canvas_end(ctx, &canvas); } From 48334b8ba6b05e0b0c0ba6b9215b34025311b9cb Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 16 Dec 2021 20:40:46 +0000 Subject: [PATCH 39/89] Implement arcs with GDI+ --- demo/gdip/nuklear_gdip.h | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/demo/gdip/nuklear_gdip.h b/demo/gdip/nuklear_gdip.h index 5681876..f83964d 100644 --- a/demo/gdip/nuklear_gdip.h +++ b/demo/gdip/nuklear_gdip.h @@ -47,6 +47,8 @@ NK_API void nk_gdip_image_free(struct nk_image image); #include #include +#define _USE_MATH_DEFINES +#include /* manually declare everything GDI+ needs, because GDI+ headers are not usable from C */ @@ -319,6 +321,10 @@ GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle); +GpStatus WINGDIPAPI +GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, INT y, + INT width, INT height, REAL startAngle, REAL sweepAngle); + GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle); @@ -580,6 +586,21 @@ nk_gdip_stroke_curve(struct nk_vec2i p1, GdipDrawBezierI(gdip.memory, gdip.pen, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y); } +static void +nk_gdip_fill_arc(short cx, short cy, unsigned short r, float amin, float adelta, struct nk_color col) +{ + GdipSetSolidFillColor(gdip.brush, convert_color(col)); + GdipFillPieI(gdip.memory, gdip.brush, cx - r, cy - r, r * 2, r * 2, amin * (180/M_PI), adelta * (180/M_PI)); +} + +static void +nk_gdip_stroke_arc(short cx, short cy, unsigned short r, float amin, float adelta, unsigned short line_thickness, struct nk_color col) +{ + GdipSetPenWidth(gdip.pen, (REAL)line_thickness); + GdipSetPenColor(gdip.pen, convert_color(col)); + GdipDrawPieI(gdip.memory, gdip.pen, cx - r, cy - r, r * 2, r * 2, amin * (180/M_PI), adelta * (180/M_PI)); +} + static void nk_gdip_draw_text(short x, short y, unsigned short w, unsigned short h, const char *text, int len, GdipFont *font, struct nk_color cbg, struct nk_color cfg) @@ -1165,9 +1186,15 @@ nk_gdip_prerender_gui(enum nk_anti_aliasing AA) const struct nk_command_image *i = (const struct nk_command_image *)cmd; nk_gdip_draw_image(i->x, i->y, i->w, i->h, i->img, i->col); } break; + case NK_COMMAND_ARC: { + const struct nk_command_arc *i = (const struct nk_command_arc *)cmd; + nk_gdip_stroke_arc(i->cx, i->cy, i->r, i->a[0], i->a[1], i->line_thickness, i->color); + } break; + case NK_COMMAND_ARC_FILLED: { + const struct nk_command_arc_filled *i = (const struct nk_command_arc_filled *)cmd; + nk_gdip_fill_arc(i->cx, i->cy, i->r, i->a[0], i->a[1], i->color); + } break; case NK_COMMAND_RECT_MULTI_COLOR: - case NK_COMMAND_ARC: - case NK_COMMAND_ARC_FILLED: default: break; } } From a4b1d5e4fd59545a056d22908342d5331a3e47e7 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 19 Dec 2021 03:17:43 -0500 Subject: [PATCH 40/89] ci: Have autotagger reference clib.json --- .github/workflows/create-tag.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create-tag.yml b/.github/workflows/create-tag.yml index 6d5acd3..f5f30b0 100644 --- a/.github/workflows/create-tag.yml +++ b/.github/workflows/create-tag.yml @@ -13,3 +13,4 @@ jobs: - uses: butlerlogic/action-autotag@stable with: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + root: clib.json From 8125fb6413ad26a6fcfcd98feb8a778dff993a63 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 19 Dec 2021 18:08:20 -0500 Subject: [PATCH 41/89] docs: Rename nuklear.html to index.html --- doc/build.sh | 2 +- doc/index.html | 2626 +++++++++++++++++++++++++++++++++++++++++++++ doc/nuklear.html | 2637 +--------------------------------------------- 3 files changed, 2638 insertions(+), 2627 deletions(-) create mode 100644 doc/index.html diff --git a/doc/build.sh b/doc/build.sh index 98fe196..0ac149a 100755 --- a/doc/build.sh +++ b/doc/build.sh @@ -1,2 +1,2 @@ #!/bin/sh -cat ../nuklear.h|./doc > nuklear.html +cat ../nuklear.h|./doc > index.html diff --git a/doc/index.html b/doc/index.html new file mode 100644 index 0000000..bed7855 --- /dev/null +++ b/doc/index.html @@ -0,0 +1,2626 @@ + + +Nuklear +# Nuklear +![](https://cloud.githubusercontent.com/assets/8057201/11761525/ae06f0ca-a0c6-11e5-819d-5610b25f6ef4.gif) +## Contents +1. About section +2. Highlights section +3. Features section +4. Usage section + 1. Flags section + 2. Constants section + 3. Dependencies section +5. Example section +6. API section + 1. Context section + 2. Input section + 3. Drawing section + 4. Window section + 5. Layouting section + 6. Groups section + 7. Tree section + 8. Properties section +7. License section +8. Changelog section +9. Gallery section +10. Credits section +## About +This is a minimal state immediate mode graphical user interface toolkit +written in ANSI C and licensed under public domain. It was designed as a simple +embeddable user interface for application and does not have any dependencies, +a default renderbackend or OS window and input handling but instead provides a very modular +library approach by using simple input state for input and draw +commands describing primitive shapes as output. So instead of providing a +layered library that tries to abstract over a number of platform and +render backends it only focuses on the actual UI. +## Highlights +- Graphical user interface toolkit +- Single header library +- Written in C89 (a.k.a. ANSI C or ISO C90) +- Small codebase (~18kLOC) +- Focus on portability, efficiency and simplicity +- No dependencies (not even the standard library if not wanted) +- Fully skinnable and customizable +- Low memory footprint with total memory control if needed or wanted +- UTF-8 support +- No global or hidden state +- Customizable library modules (you can compile and use only what you need) +- Optional font baker and vertex buffer output +## Features +- Absolutely no platform dependent code +- Memory management control ranging from/to + - Ease of use by allocating everything from standard library + - Control every byte of memory inside the library +- Font handling control ranging from/to + - Use your own font implementation for everything + - Use this libraries internal font baking and handling API +- Drawing output control ranging from/to + - Simple shapes for more high level APIs which already have drawing capabilities + - Hardware accessible anti-aliased vertex buffer output +- Customizable colors and properties ranging from/to + - Simple changes to color by filling a simple color table + - Complete control with ability to use skinning to decorate widgets +- Bendable UI library with widget ranging from/to + - Basic widgets like buttons, checkboxes, slider, ... + - Advanced widget like abstract comboboxes, contextual menus,... +- Compile time configuration to only compile what you need + - Subset which can be used if you do not want to link or use the standard library +- Can be easily modified to only update on user input instead of frame updates +## Usage +This library is self contained in one single header file and can be used either +in header only mode or in implementation mode. The header only mode is used +by default when included and allows including this header in other headers +and does not contain the actual implementation.

+The implementation mode requires to define the preprocessor macro +NK_IMPLEMENTATION in *one* .c/.cpp file before #including this file, e.g.: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~C + #define NK_IMPLEMENTATION + #include "nuklear.h" +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Also optionally define the symbols listed in the section "OPTIONAL DEFINES" +below in header and implementation mode if you want to use additional functionality +or need more control over the library. +!!! WARNING + Every time nuklear is included define the same compiler flags. This very important not doing so could lead to compiler errors or even worse stack corruptions. +### Flags +Flag | Description +--------------------------------|------------------------------------------ +NK_PRIVATE | If defined declares all functions as static, so they can only be accessed inside the file that contains the implementation +NK_INCLUDE_FIXED_TYPES | If defined it will include header `` for fixed sized types otherwise nuklear tries to select the correct type. If that fails it will throw a compiler error and you have to select the correct types yourself. +NK_INCLUDE_DEFAULT_ALLOCATOR | If defined it will include header `` and provide additional functions to use this library without caring for memory allocation control and therefore ease memory management. +NK_INCLUDE_STANDARD_IO | If defined it will include header `` and provide additional functions depending on file loading. +NK_INCLUDE_STANDARD_VARARGS | If defined it will include header and provide additional functions depending on file loading. +NK_INCLUDE_VERTEX_BUFFER_OUTPUT | Defining this adds a vertex draw command list backend to this library, which allows you to convert queue commands into vertex draw commands. This is mainly if you need a hardware accessible format for OpenGL, DirectX, Vulkan, Metal,... +NK_INCLUDE_FONT_BAKING | Defining this adds `stb_truetype` and `stb_rect_pack` implementation to this library and provides font baking and rendering. If you already have font handling or do not want to use this font handler you don't have to define it. +NK_INCLUDE_DEFAULT_FONT | Defining this adds the default font: ProggyClean.ttf into this library which can be loaded into a font atlas and allows using this library without having a truetype font +NK_INCLUDE_COMMAND_USERDATA | Defining this adds a userdata pointer into each command. Can be useful for example if you want to provide custom shaders depending on the used widget. Can be combined with the style structures. +NK_BUTTON_TRIGGER_ON_RELEASE | Different platforms require button clicks occurring either on buttons being pressed (up to down) or released (down to up). By default this library will react on buttons being pressed, but if you define this it will only trigger if a button is released. +NK_ZERO_COMMAND_MEMORY | Defining this will zero out memory for each drawing command added to a drawing queue (inside nk_command_buffer_push). Zeroing command memory is very useful for fast checking (using memcmp) if command buffers are equal and avoid drawing frames when nothing on screen has changed since previous frame. +NK_UINT_DRAW_INDEX | Defining this will set the size of vertex index elements when using NK_VERTEX_BUFFER_OUTPUT to 32bit instead of the default of 16bit +NK_KEYSTATE_BASED_INPUT | Define this if your backend uses key state for each frame rather than key press/release events +!!! WARNING + The following flags will pull in the standard C library: + - NK_INCLUDE_DEFAULT_ALLOCATOR + - NK_INCLUDE_STANDARD_IO + - NK_INCLUDE_STANDARD_VARARGS +!!! WARNING + The following flags if defined need to be defined for both header and implementation: + - NK_INCLUDE_FIXED_TYPES + - NK_INCLUDE_DEFAULT_ALLOCATOR + - NK_INCLUDE_STANDARD_VARARGS + - NK_INCLUDE_VERTEX_BUFFER_OUTPUT + - NK_INCLUDE_FONT_BAKING + - NK_INCLUDE_DEFAULT_FONT + - NK_INCLUDE_STANDARD_VARARGS + - NK_INCLUDE_COMMAND_USERDATA + - NK_UINT_DRAW_INDEX +### Constants +Define | Description +--------------------------------|--------------------------------------- +NK_BUFFER_DEFAULT_INITIAL_SIZE | Initial buffer size allocated by all buffers while using the default allocator functions included by defining NK_INCLUDE_DEFAULT_ALLOCATOR. If you don't want to allocate the default 4k memory then redefine it. +NK_MAX_NUMBER_BUFFER | Maximum buffer size for the conversion buffer between float and string Under normal circumstances this should be more than sufficient. +NK_INPUT_MAX | Defines the max number of bytes which can be added as text input in one frame. Under normal circumstances this should be more than sufficient. +!!! WARNING + The following constants if defined need to be defined for both header and implementation: + - NK_MAX_NUMBER_BUFFER + - NK_BUFFER_DEFAULT_INITIAL_SIZE + - NK_INPUT_MAX +### Dependencies +Function | Description +------------|--------------------------------------------------------------- +NK_ASSERT | If you don't define this, nuklear will use with assert(). +NK_MEMSET | You can define this to 'memset' or your own memset implementation replacement. If not nuklear will use its own version. +NK_MEMCPY | You can define this to 'memcpy' or your own memcpy implementation replacement. If not nuklear will use its own version. +NK_SQRT | You can define this to 'sqrt' or your own sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version. +NK_SIN | You can define this to 'sinf' or your own sine implementation replacement. If not nuklear will use its own approximation implementation. +NK_COS | You can define this to 'cosf' or your own cosine implementation replacement. If not nuklear will use its own approximation implementation. +NK_STRTOD | You can define this to `strtod` or your own string to double conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!). +NK_DTOA | You can define this to `dtoa` or your own double to string conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!). +NK_VSNPRINTF| If you define `NK_INCLUDE_STANDARD_VARARGS` as well as `NK_INCLUDE_STANDARD_IO` and want to be safe define this to `vsnprintf` on compilers supporting later versions of C or C++. By default nuklear will check for your stdlib version in C as well as compiler version in C++. if `vsnprintf` is available it will define it to `vsnprintf` directly. If not defined and if you have older versions of C or C++ it will be defined to `vsprintf` which is unsafe. +!!! WARNING + The following dependencies will pull in the standard C library if not redefined: + - NK_ASSERT +!!! WARNING + The following dependencies if defined need to be defined for both header and implementation: + - NK_ASSERT +!!! WARNING + The following dependencies if defined need to be defined only for the implementation part: + - NK_MEMSET + - NK_MEMCPY + - NK_SQRT + - NK_SIN + - NK_COS + - NK_STRTOD + - NK_DTOA + - NK_VSNPRINTF +## Example +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +// init gui state +enum {EASY, HARD}; +static int op = EASY; +static float value = 0.6f; +static int i = 20; +struct nk_context ctx; +nk_init_fixed(&ctx, calloc(1, MAX_MEMORY), MAX_MEMORY, &font); +if (nk_begin(&ctx, "Show", nk_rect(50, 50, 220, 220), + NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_CLOSABLE)) { + // fixed widget pixel width + nk_layout_row_static(&ctx, 30, 80, 1); + if (nk_button_label(&ctx, "button")) { + // event handling + } + // fixed widget window ratio width + nk_layout_row_dynamic(&ctx, 30, 2); + if (nk_option_label(&ctx, "easy", op == EASY)) op = EASY; + if (nk_option_label(&ctx, "hard", op == HARD)) op = HARD; + // custom widget pixel width + nk_layout_row_begin(&ctx, NK_STATIC, 30, 2); + { + nk_layout_row_push(&ctx, 50); + nk_label(&ctx, "Volume:", NK_TEXT_LEFT); + nk_layout_row_push(&ctx, 110); + nk_slider_float(&ctx, 0, &value, 1.0f, 0.1f); + } + nk_layout_row_end(&ctx); +} +nk_end(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +![](https://cloud.githubusercontent.com/assets/8057201/10187981/584ecd68-675c-11e5-897c-822ef534a876.png) +## API +### Context +Contexts are the main entry point and the majestro of nuklear and contain all required state. +They are used for window, memory, input, style, stack, commands and time management and need +to be passed into all nuklear GUI specific functions. +#### Usage +To use a context it first has to be initialized which can be achieved by calling +one of either `nk_init_default`, `nk_init_fixed`, `nk_init`, `nk_init_custom`. +Each takes in a font handle and a specific way of handling memory. Memory control +hereby ranges from standard library to just specifying a fixed sized block of memory +which nuklear has to manage itself from. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + // [...] + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +--------------------|------------------------------------------------------- +__nk_init_default__ | Initializes context with standard library memory allocation (malloc,free) +__nk_init_fixed__ | Initializes context from single fixed size memory block +__nk_init__ | Initializes context with memory allocator callbacks for alloc and free +__nk_init_custom__ | Initializes context from two buffers. One for draw commands the other for window/panel/table allocations +__nk_clear__ | Called at the end of the frame to reset and prepare the context for the next frame +__nk_free__ | Shutdown and free all memory allocated inside the context +__nk_set_user_data__| Utility function to pass user data to draw command +#### nk_init_default +Initializes a `nk_context` struct with a default standard library allocator. +Should be used if you don't want to be bothered with memory management in nuklear. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_init_default(struct nk_context *ctx, const struct nk_user_font *font); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|--------------------------------------------------------------- +__ctx__ | Must point to an either stack or heap allocated `nk_context` struct +__font__ | Must point to a previously initialized font handle for more info look at font documentation +Returns either `false(0)` on failure or `true(1)` on success. +#### nk_init_fixed +Initializes a `nk_context` struct from single fixed size memory block +Should be used if you want complete control over nuklear's memory management. +Especially recommended for system with little memory or systems with virtual memory. +For the later case you can just allocate for example 16MB of virtual memory +and only the required amount of memory will actually be committed. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_init_fixed(struct nk_context *ctx, void *memory, nk_size size, const struct nk_user_font *font); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Warning + make sure the passed memory block is aligned correctly for `nk_draw_commands`. +Parameter | Description +------------|-------------------------------------------------------------- +__ctx__ | Must point to an either stack or heap allocated `nk_context` struct +__memory__ | Must point to a previously allocated memory block +__size__ | Must contain the total size of __memory__ +__font__ | Must point to a previously initialized font handle for more info look at font documentation +Returns either `false(0)` on failure or `true(1)` on success. +#### nk_init +Initializes a `nk_context` struct with memory allocation callbacks for nuklear to allocate +memory from. Used internally for `nk_init_default` and provides a kitchen sink allocation +interface to nuklear. Can be useful for cases like monitoring memory consumption. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_init(struct nk_context *ctx, struct nk_allocator *alloc, const struct nk_user_font *font); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|--------------------------------------------------------------- +__ctx__ | Must point to an either stack or heap allocated `nk_context` struct +__alloc__ | Must point to a previously allocated memory allocator +__font__ | Must point to a previously initialized font handle for more info look at font documentation +Returns either `false(0)` on failure or `true(1)` on success. +#### nk_init_custom +Initializes a `nk_context` struct from two different either fixed or growing +buffers. The first buffer is for allocating draw commands while the second buffer is +used for allocating windows, panels and state tables. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_init_custom(struct nk_context *ctx, struct nk_buffer *cmds, struct nk_buffer *pool, const struct nk_user_font *font); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|--------------------------------------------------------------- +__ctx__ | Must point to an either stack or heap allocated `nk_context` struct +__cmds__ | Must point to a previously initialized memory buffer either fixed or dynamic to store draw commands into +__pool__ | Must point to a previously initialized memory buffer either fixed or dynamic to store windows, panels and tables +__font__ | Must point to a previously initialized font handle for more info look at font documentation +Returns either `false(0)` on failure or `true(1)` on success. +#### nk_clear +Resets the context state at the end of the frame. This includes mostly +garbage collector tasks like removing windows or table not called and therefore +used anymore. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_clear(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +#### nk_free +Frees all memory allocated by nuklear. Not needed if context was +initialized with `nk_init_fixed`. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_free(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +#### nk_set_user_data +Sets the currently passed userdata passed down into each draw command. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_set_user_data(struct nk_context *ctx, nk_handle data); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|-------------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__data__ | Handle with either pointer or index to be passed into every draw commands +### Input +The input API is responsible for holding the current input state composed of +mouse, key and text input states. +It is worth noting that no direct OS or window handling is done in nuklear. +Instead all input state has to be provided by platform specific code. This on one hand +expects more work from the user and complicates usage but on the other hand +provides simple abstraction over a big number of platforms, libraries and other +already provided functionality. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +nk_input_begin(&ctx); +while (GetEvent(&evt)) { + if (evt.type == MOUSE_MOVE) + nk_input_motion(&ctx, evt.motion.x, evt.motion.y); + else if (evt.type == [...]) { + // [...] + } +} nk_input_end(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Usage +Input state needs to be provided to nuklear by first calling `nk_input_begin` +which resets internal state like delta mouse position and button transitions. +After `nk_input_begin` all current input state needs to be provided. This includes +mouse motion, button and key pressed and released, text input and scrolling. +Both event- or state-based input handling are supported by this API +and should work without problems. Finally after all input state has been +mirrored `nk_input_end` needs to be called to finish input process. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + Event evt; + nk_input_begin(&ctx); + while (GetEvent(&evt)) { + if (evt.type == MOUSE_MOVE) + nk_input_motion(&ctx, evt.motion.x, evt.motion.y); + else if (evt.type == [...]) { + // [...] + } + } + nk_input_end(&ctx); + // [...] + nk_clear(&ctx); +} nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +--------------------|------------------------------------------------------- +__nk_input_begin__ | Begins the input mirroring process. Needs to be called before all other `nk_input_xxx` calls +__nk_input_motion__ | Mirrors mouse cursor position +__nk_input_key__ | Mirrors key state with either pressed or released +__nk_input_button__ | Mirrors mouse button state with either pressed or released +__nk_input_scroll__ | Mirrors mouse scroll values +__nk_input_char__ | Adds a single ASCII text character into an internal text buffer +__nk_input_glyph__ | Adds a single multi-byte UTF-8 character into an internal text buffer +__nk_input_unicode__| Adds a single unicode rune into an internal text buffer +__nk_input_end__ | Ends the input mirroring process by calculating state changes. Don't call any `nk_input_xxx` function referenced above after this call +#### nk_input_begin +Begins the input mirroring process by resetting text, scroll +mouse, previous mouse position and movement as well as key state transitions, +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_begin(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +#### nk_input_motion +Mirrors current mouse position to nuklear +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_motion(struct nk_context *ctx, int x, int y); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__x__ | Must hold an integer describing the current mouse cursor x-position +__y__ | Must hold an integer describing the current mouse cursor y-position +#### nk_input_key +Mirrors the state of a specific key to nuklear +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_key(struct nk_context*, enum nk_keys key, int down); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__key__ | Must be any value specified in enum `nk_keys` that needs to be mirrored +__down__ | Must be 0 for key is up and 1 for key is down +#### nk_input_button +Mirrors the state of a specific mouse button to nuklear +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_button(struct nk_context *ctx, enum nk_buttons btn, int x, int y, int down); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__btn__ | Must be any value specified in enum `nk_buttons` that needs to be mirrored +__x__ | Must contain an integer describing mouse cursor x-position on click up/down +__y__ | Must contain an integer describing mouse cursor y-position on click up/down +__down__ | Must be 0 for key is up and 1 for key is down +#### nk_input_scroll +Copies the last mouse scroll value to nuklear. Is generally +a scroll value. So does not have to come from mouse and could also originate +TODO finish this sentence +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_scroll(struct nk_context *ctx, struct nk_vec2 val); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__val__ | vector with both X- as well as Y-scroll value +#### nk_input_char +Copies a single ASCII character into an internal text buffer +This is basically a helper function to quickly push ASCII characters into +nuklear. +!!! Note + Stores up to NK_INPUT_MAX bytes between `nk_input_begin` and `nk_input_end`. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_char(struct nk_context *ctx, char c); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__c__ | Must be a single ASCII character preferable one that can be printed +#### nk_input_glyph +Converts an encoded unicode rune into UTF-8 and copies the result into an +internal text buffer. +!!! Note + Stores up to NK_INPUT_MAX bytes between `nk_input_begin` and `nk_input_end`. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_glyph(struct nk_context *ctx, const nk_glyph g); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__g__ | UTF-32 unicode codepoint +#### nk_input_unicode +Converts a unicode rune into UTF-8 and copies the result +into an internal text buffer. +!!! Note + Stores up to NK_INPUT_MAX bytes between `nk_input_begin` and `nk_input_end`. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_unicode(struct nk_context*, nk_rune rune); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +__rune__ | UTF-32 unicode codepoint +#### nk_input_end +End the input mirroring process by resetting mouse grabbing +state to ensure the mouse cursor is not grabbed indefinitely. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_input_end(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to a previously initialized `nk_context` struct +### Drawing +This library was designed to be render backend agnostic so it does +not draw anything to screen directly. Instead all drawn shapes, widgets +are made of, are buffered into memory and make up a command queue. +Each frame therefore fills the command buffer with draw commands +that then need to be executed by the user and his own render backend. +After that the command buffer needs to be cleared and a new frame can be +started. It is probably important to note that the command buffer is the main +drawing API and the optional vertex buffer API only takes this format and +converts it into a hardware accessible format. +#### Usage +To draw all draw commands accumulated over a frame you need your own render +backend able to draw a number of 2D primitives. This includes at least +filled and stroked rectangles, circles, text, lines, triangles and scissors. +As soon as this criterion is met you can iterate over each draw command +and execute each draw command in a interpreter like fashion: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +const struct nk_command *cmd = 0; +nk_foreach(cmd, &ctx) { + switch (cmd->type) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case //...: + //[...] + } +} +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In program flow context draw commands need to be executed after input has been +gathered and the complete UI with windows and their contained widgets have +been executed and before calling `nk_clear` which frees all previously +allocated draw commands. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + Event evt; + nk_input_begin(&ctx); + while (GetEvent(&evt)) { + if (evt.type == MOUSE_MOVE) + nk_input_motion(&ctx, evt.motion.x, evt.motion.y); + else if (evt.type == [...]) { + [...] + } + } + nk_input_end(&ctx); + // + // [...] + // + const struct nk_command *cmd = 0; + nk_foreach(cmd, &ctx) { + switch (cmd->type) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case ...: + // [...] + } + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +You probably noticed that you have to draw all of the UI each frame which is +quite wasteful. While the actual UI updating loop is quite fast rendering +without actually needing it is not. So there are multiple things you could do. +First is only update on input. This of course is only an option if your +application only depends on the UI and does not require any outside calculations. +If you actually only update on input make sure to update the UI two times each +frame and call `nk_clear` directly after the first pass and only draw in +the second pass. In addition it is recommended to also add additional timers +to make sure the UI is not drawn more than a fixed number of frames per second. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + // [...wait for input ] + // [...do two UI passes ...] + do_ui(...) + nk_clear(&ctx); + do_ui(...) + // + // draw + const struct nk_command *cmd = 0; + nk_foreach(cmd, &ctx) { + switch (cmd->type) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case ...: + //[...] + } + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The second probably more applicable trick is to only draw if anything changed. +It is not really useful for applications with continuous draw loop but +quite useful for desktop applications. To actually get nuklear to only +draw on changes you first have to define `NK_ZERO_COMMAND_MEMORY` and +allocate a memory buffer that will store each unique drawing output. +After each frame you compare the draw command memory inside the library +with your allocated buffer by memcmp. If memcmp detects differences +you have to copy the command buffer into the allocated buffer +and then draw like usual (this example uses fixed memory but you could +use dynamically allocated memory). +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +//[... other defines ...] +#define NK_ZERO_COMMAND_MEMORY +#include "nuklear.h" +// +// setup context +struct nk_context ctx; +void *last = calloc(1,64*1024); +void *buf = calloc(1,64*1024); +nk_init_fixed(&ctx, buf, 64*1024); +// +// loop +while (1) { + // [...input...] + // [...ui...] + void *cmds = nk_buffer_memory(&ctx.memory); + if (memcmp(cmds, last, ctx.memory.allocated)) { + memcpy(last,cmds,ctx.memory.allocated); + const struct nk_command *cmd = 0; + nk_foreach(cmd, &ctx) { + switch (cmd->type) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case ...: + // [...] + } + } + } + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Finally while using draw commands makes sense for higher abstracted platforms like +X11 and Win32 or drawing libraries it is often desirable to use graphics +hardware directly. Therefore it is possible to just define +`NK_INCLUDE_VERTEX_BUFFER_OUTPUT` which includes optional vertex output. +To access the vertex output you first have to convert all draw commands into +vertexes by calling `nk_convert` which takes in your preferred vertex format. +After successfully converting all draw commands just iterate over and execute all +vertex draw commands: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +// fill configuration +struct your_vertex +{ + float pos[2]; // important to keep it to 2 floats + float uv[2]; + unsigned char col[4]; +}; +struct nk_convert_config cfg = {}; +static const struct nk_draw_vertex_layout_element vertex_layout[] = { + {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct your_vertex, pos)}, + {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct your_vertex, uv)}, + {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct your_vertex, col)}, + {NK_VERTEX_LAYOUT_END} +}; +cfg.shape_AA = NK_ANTI_ALIASING_ON; +cfg.line_AA = NK_ANTI_ALIASING_ON; +cfg.vertex_layout = vertex_layout; +cfg.vertex_size = sizeof(struct your_vertex); +cfg.vertex_alignment = NK_ALIGNOF(struct your_vertex); +cfg.circle_segment_count = 22; +cfg.curve_segment_count = 22; +cfg.arc_segment_count = 22; +cfg.global_alpha = 1.0f; +cfg.null = dev->null; +// +// setup buffers and convert +struct nk_buffer cmds, verts, idx; +nk_buffer_init_default(&cmds); +nk_buffer_init_default(&verts); +nk_buffer_init_default(&idx); +nk_convert(&ctx, &cmds, &verts, &idx, &cfg); +// +// draw +nk_draw_foreach(cmd, &ctx, &cmds) { +if (!cmd->elem_count) continue; + //[...] +} +nk_buffer_free(&cms); +nk_buffer_free(&verts); +nk_buffer_free(&idx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +--------------------|------------------------------------------------------- +__nk__begin__ | Returns the first draw command in the context draw command list to be drawn +__nk__next__ | Increments the draw command iterator to the next command inside the context draw command list +__nk_foreach__ | Iterates over each draw command inside the context draw command list +__nk_convert__ | Converts from the abstract draw commands list into a hardware accessible vertex format +__nk_draw_begin__ | Returns the first vertex command in the context vertex draw list to be executed +__nk__draw_next__ | Increments the vertex command iterator to the next command inside the context vertex command list +__nk__draw_end__ | Returns the end of the vertex draw list +__nk_draw_foreach__ | Iterates over each vertex draw command inside the vertex draw list +#### nk__begin +Returns a draw command list iterator to iterate all draw +commands accumulated over one frame. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +const struct nk_command* nk__begin(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | must point to an previously initialized `nk_context` struct at the end of a frame +Returns draw command pointer pointing to the first command inside the draw command list +#### nk__next +Returns draw command pointer pointing to the next command inside the draw command list +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +const struct nk_command* nk__next(struct nk_context*, const struct nk_command*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +__cmd__ | Must point to an previously a draw command either returned by `nk__begin` or `nk__next` +Returns draw command pointer pointing to the next command inside the draw command list +#### nk_foreach +Iterates over each draw command inside the context draw command list +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +#define nk_foreach(c, ctx) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +__cmd__ | Command pointer initialized to NULL +Iterates over each draw command inside the context draw command list +#### nk_convert +Converts all internal draw commands into vertex draw commands and fills +three buffers with vertexes, vertex draw commands and vertex indices. The vertex format +as well as some other configuration values have to be configured by filling out a +`nk_convert_config` struct. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +nk_flags nk_convert(struct nk_context *ctx, struct nk_buffer *cmds, + struct nk_buffer *vertices, struct nk_buffer *elements, const struct nk_convert_config*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +__cmds__ | Must point to a previously initialized buffer to hold converted vertex draw commands +__vertices__| Must point to a previously initialized buffer to hold all produced vertices +__elements__| Must point to a previously initialized buffer to hold all produced vertex indices +__config__ | Must point to a filled out `nk_config` struct to configure the conversion process +Returns one of enum nk_convert_result error codes +Parameter | Description +--------------------------------|----------------------------------------------------------- +NK_CONVERT_SUCCESS | Signals a successful draw command to vertex buffer conversion +NK_CONVERT_INVALID_PARAM | An invalid argument was passed in the function call +NK_CONVERT_COMMAND_BUFFER_FULL | The provided buffer for storing draw commands is full or failed to allocate more memory +NK_CONVERT_VERTEX_BUFFER_FULL | The provided buffer for storing vertices is full or failed to allocate more memory +NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indices is full or failed to allocate more memory +#### nk__draw_begin +Returns a draw vertex command buffer iterator to iterate over the vertex draw command buffer +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +const struct nk_draw_command* nk__draw_begin(const struct nk_context*, const struct nk_buffer*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer +Returns vertex draw command pointer pointing to the first command inside the vertex draw command buffer +#### nk__draw_end +Returns the vertex draw command at the end of the vertex draw command buffer +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +const struct nk_draw_command* nk__draw_end(const struct nk_context *ctx, const struct nk_buffer *buf); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer +Returns vertex draw command pointer pointing to the end of the last vertex draw command inside the vertex draw command buffer +#### nk__draw_next +Increments the vertex draw command buffer iterator +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*, const struct nk_buffer*, const struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__cmd__ | Must point to an previously either by `nk__draw_begin` or `nk__draw_next` returned vertex draw command +__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +Returns vertex draw command pointer pointing to the end of the last vertex draw command inside the vertex draw command buffer +#### nk_draw_foreach +Iterates over each vertex draw command inside a vertex draw command buffer +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +#define nk_draw_foreach(cmd,ctx, b) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__cmd__ | `nk_draw_command`iterator set to NULL +__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer +__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame +### Window +Windows are the main persistent state used inside nuklear and are life time +controlled by simply "retouching" (i.e. calling) each window each frame. +All widgets inside nuklear can only be added inside the function pair `nk_begin_xxx` +and `nk_end`. Calling any widgets outside these two functions will result in an +assert in debug or no state change in release mode.

+Each window holds frame persistent state like position, size, flags, state tables, +and some garbage collected internal persistent widget state. Each window +is linked into a window stack list which determines the drawing and overlapping +order. The topmost window thereby is the currently active window.

+To change window position inside the stack occurs either automatically by +user input by being clicked on or programmatically by calling `nk_window_focus`. +Windows by default are visible unless explicitly being defined with flag +`NK_WINDOW_HIDDEN`, the user clicked the close button on windows with flag +`NK_WINDOW_CLOSABLE` or if a window was explicitly hidden by calling +`nk_window_show`. To explicitly close and destroy a window call `nk_window_close`.

+#### Usage +To create and keep a window you have to call one of the two `nk_begin_xxx` +functions to start window declarations and `nk_end` at the end. Furthermore it +is recommended to check the return value of `nk_begin_xxx` and only process +widgets inside the window if the value is not 0. Either way you have to call +`nk_end` at the end of window declarations. Furthermore, do not attempt to +nest `nk_begin_xxx` calls which will hopefully result in an assert or if not +in a segmentation fault. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +if (nk_begin_xxx(...) { + // [... widgets ...] +} +nk_end(ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In the grand concept window and widget declarations need to occur after input +handling and before drawing to screen. Not doing so can result in higher +latency or at worst invalid behavior. Furthermore make sure that `nk_clear` +is called at the end of the frame. While nuklear's default platform backends +already call `nk_clear` for you if you write your own backend not calling +`nk_clear` can cause asserts or even worse undefined behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + Event evt; + nk_input_begin(&ctx); + while (GetEvent(&evt)) { + if (evt.type == MOUSE_MOVE) + nk_input_motion(&ctx, evt.motion.x, evt.motion.y); + else if (evt.type == [...]) { + nk_input_xxx(...); + } + } + nk_input_end(&ctx); + if (nk_begin_xxx(...) { + //[...] + } + nk_end(ctx); + const struct nk_command *cmd = 0; + nk_foreach(cmd, &ctx) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case //...: + //[...] + } + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +------------------------------------|---------------------------------------- +nk_begin | Starts a new window; needs to be called every frame for every window (unless hidden) or otherwise the window gets removed +nk_begin_titled | Extended window start with separated title and identifier to allow multiple windows with same name but not title +nk_end | Needs to be called at the end of the window building process to process scaling, scrollbars and general cleanup +nk_window_find | Finds and returns the window with give name +nk_window_get_bounds | Returns a rectangle with screen position and size of the currently processed window. +nk_window_get_position | Returns the position of the currently processed window +nk_window_get_size | Returns the size with width and height of the currently processed window +nk_window_get_width | Returns the width of the currently processed window +nk_window_get_height | Returns the height of the currently processed window +nk_window_get_panel | Returns the underlying panel which contains all processing state of the current window +nk_window_get_content_region | Returns the position and size of the currently visible and non-clipped space inside the currently processed window +nk_window_get_content_region_min | Returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window +nk_window_get_content_region_max | Returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window +nk_window_get_content_region_size | Returns the size of the currently visible and non-clipped space inside the currently processed window +nk_window_get_canvas | Returns the draw command buffer. Can be used to draw custom widgets +nk_window_get_scroll | Gets the scroll offset of the current window +nk_window_has_focus | Returns if the currently processed window is currently active +nk_window_is_collapsed | Returns if the window with given name is currently minimized/collapsed +nk_window_is_closed | Returns if the currently processed window was closed +nk_window_is_hidden | Returns if the currently processed window was hidden +nk_window_is_active | Same as nk_window_has_focus for some reason +nk_window_is_hovered | Returns if the currently processed window is currently being hovered by mouse +nk_window_is_any_hovered | Return if any window currently hovered +nk_item_is_any_active | Returns if any window or widgets is currently hovered or active +nk_window_set_bounds | Updates position and size of the currently processed window +nk_window_set_position | Updates position of the currently process window +nk_window_set_size | Updates the size of the currently processed window +nk_window_set_focus | Set the currently processed window as active window +nk_window_set_scroll | Sets the scroll offset of the current window +nk_window_close | Closes the window with given window name which deletes the window at the end of the frame +nk_window_collapse | Collapses the window with given window name +nk_window_collapse_if | Collapses the window with given window name if the given condition was met +nk_window_show | Hides a visible or reshows a hidden window +nk_window_show_if | Hides/shows a window depending on condition +#### nk_panel_flags +Flag | Description +----------------------------|---------------------------------------- +NK_WINDOW_BORDER | Draws a border around the window to visually separate window from the background +NK_WINDOW_MOVABLE | The movable flag indicates that a window can be moved by user input or by dragging the window header +NK_WINDOW_SCALABLE | The scalable flag indicates that a window can be scaled by user input by dragging a scaler icon at the button of the window +NK_WINDOW_CLOSABLE | Adds a closable icon into the header +NK_WINDOW_MINIMIZABLE | Adds a minimize icon into the header +NK_WINDOW_NO_SCROLLBAR | Removes the scrollbar from the window +NK_WINDOW_TITLE | Forces a header at the top at the window showing the title +NK_WINDOW_SCROLL_AUTO_HIDE | Automatically hides the window scrollbar if no user interaction: also requires delta time in `nk_context` to be set each frame +NK_WINDOW_BACKGROUND | Always keep window in the background +NK_WINDOW_SCALE_LEFT | Puts window scaler in the left-bottom corner instead right-bottom +NK_WINDOW_NO_INPUT | Prevents window of scaling, moving or getting focus +#### nk_collapse_states +State | Description +----------------|----------------------------------------------------------- +__NK_MINIMIZED__| UI section is collased and not visible until maximized +__NK_MAXIMIZED__| UI section is extended and visible until minimized +

+#### nk_begin +Starts a new window; needs to be called every frame for every +window (unless hidden) or otherwise the window gets removed +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_begin(struct nk_context *ctx, const char *title, struct nk_rect bounds, nk_flags flags); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__title__ | Window title and identifier. Needs to be persistent over frames to identify the window +__bounds__ | Initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame +__flags__ | Window flags defined in the nk_panel_flags section with a number of different window behaviors +Returns `true(1)` if the window can be filled up with widgets from this point +until `nk_end` or `false(0)` otherwise for example if minimized +#### nk_begin_titled +Extended window start with separated title and identifier to allow multiple +windows with same title but not name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, struct nk_rect bounds, nk_flags flags); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Window identifier. Needs to be persistent over frames to identify the window +__title__ | Window title displayed inside header if flag `NK_WINDOW_TITLE` or either `NK_WINDOW_CLOSABLE` or `NK_WINDOW_MINIMIZED` was set +__bounds__ | Initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame +__flags__ | Window flags defined in the nk_panel_flags section with a number of different window behaviors +Returns `true(1)` if the window can be filled up with widgets from this point +until `nk_end` or `false(0)` otherwise for example if minimized +#### nk_end +Needs to be called at the end of the window building process to process scaling, scrollbars and general cleanup. +All widget calls after this functions will result in asserts or no state changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_end(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +#### nk_window_find +Finds and returns a window from passed name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_window *nk_window_find(struct nk_context *ctx, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Window identifier +Returns a `nk_window` struct pointing to the identified window or NULL if +no window with the given name was found +#### nk_window_get_bounds +Returns a rectangle with screen position and size of the currently processed window +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_rect nk_window_get_bounds(const struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns a `nk_rect` struct with window upper left window position and size +#### nk_window_get_position +Returns the position of the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_window_get_position(const struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns a `nk_vec2` struct with window upper left position +#### nk_window_get_size +Returns the size with width and height of the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_window_get_size(const struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns a `nk_vec2` struct with window width and height +#### nk_window_get_width +Returns the width of the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +float nk_window_get_width(const struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns the current window width +#### nk_window_get_height +Returns the height of the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +float nk_window_get_height(const struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns the current window height +#### nk_window_get_panel +Returns the underlying panel which contains all processing state of the current window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +!!! WARNING + Do not keep the returned panel pointer around, it is only valid until `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_panel* nk_window_get_panel(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns a pointer to window internal `nk_panel` state. +#### nk_window_get_content_region +Returns the position and size of the currently visible and non-clipped space +inside the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_rect nk_window_get_content_region(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `nk_rect` struct with screen position and size (no scrollbar offset) +of the visible space inside the current window +#### nk_window_get_content_region_min +Returns the upper left position of the currently visible and non-clipped +space inside the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_window_get_content_region_min(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +returns `nk_vec2` struct with upper left screen position (no scrollbar offset) +of the visible space inside the current window +#### nk_window_get_content_region_max +Returns the lower right screen position of the currently visible and +non-clipped space inside the currently processed window. +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_window_get_content_region_max(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `nk_vec2` struct with lower right screen position (no scrollbar offset) +of the visible space inside the current window +#### nk_window_get_content_region_size +Returns the size of the currently visible and non-clipped space inside the +currently processed window +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_window_get_content_region_size(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `nk_vec2` struct with size the visible space inside the current window +#### nk_window_get_canvas +Returns the draw command buffer. Can be used to draw custom widgets +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +!!! WARNING + Do not keep the returned command buffer pointer around it is only valid until `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_command_buffer* nk_window_get_canvas(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns a pointer to window internal `nk_command_buffer` struct used as +drawing canvas. Can be used to do custom drawing. +#### nk_window_get_scroll +Gets the scroll offset for the current window +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_get_scroll(struct nk_context *ctx, nk_uint *offset_x, nk_uint *offset_y); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +-------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__offset_x__ | A pointer to the x offset output (or NULL to ignore) +__offset_y__ | A pointer to the y offset output (or NULL to ignore) +#### nk_window_has_focus +Returns if the currently processed window is currently active +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_has_focus(const struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `false(0)` if current window is not active or `true(1)` if it is +#### nk_window_is_hovered +Return if the current window is being hovered +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_is_hovered(struct nk_context *ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `true(1)` if current window is hovered or `false(0)` otherwise +#### nk_window_is_collapsed +Returns if the window with given name is currently minimized/collapsed +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_is_collapsed(struct nk_context *ctx, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of window you want to check if it is collapsed +Returns `true(1)` if current window is minimized and `false(0)` if window not +found or is not minimized +#### nk_window_is_closed +Returns if the window with given name was closed by calling `nk_close` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_is_closed(struct nk_context *ctx, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of window you want to check if it is closed +Returns `true(1)` if current window was closed or `false(0)` window not found or not closed +#### nk_window_is_hidden +Returns if the window with given name is hidden +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_is_hidden(struct nk_context *ctx, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of window you want to check if it is hidden +Returns `true(1)` if current window is hidden or `false(0)` window not found or visible +#### nk_window_is_active +Same as nk_window_has_focus for some reason +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_is_active(struct nk_context *ctx, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of window you want to check if it is active +Returns `true(1)` if current window is active or `false(0)` window not found or not active +#### nk_window_is_any_hovered +Returns if the any window is being hovered +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_window_is_any_hovered(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `true(1)` if any window is hovered or `false(0)` otherwise +#### nk_item_is_any_active +Returns if the any window is being hovered or any widget is currently active. +Can be used to decide if input should be processed by UI or your specific input handling. +Example could be UI and 3D camera to move inside a 3D space. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_item_is_any_active(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +Returns `true(1)` if any window is hovered or any item is active or `false(0)` otherwise +#### nk_window_set_bounds +Updates position and size of window with passed in name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_set_bounds(struct nk_context*, const char *name, struct nk_rect bounds); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to modify both position and size +__bounds__ | Must point to a `nk_rect` struct with the new position and size +#### nk_window_set_position +Updates position of window with passed name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_set_position(struct nk_context*, const char *name, struct nk_vec2 pos); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to modify both position +__pos__ | Must point to a `nk_vec2` struct with the new position +#### nk_window_set_size +Updates size of window with passed in name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_set_size(struct nk_context*, const char *name, struct nk_vec2); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to modify both window size +__size__ | Must point to a `nk_vec2` struct with new window size +#### nk_window_set_focus +Sets the window with given name as active +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_set_focus(struct nk_context*, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to set focus on +#### nk_window_set_scroll +Sets the scroll offset for the current window +!!! WARNING + Only call this function between calls `nk_begin_xxx` and `nk_end` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_set_scroll(struct nk_context *ctx, nk_uint offset_x, nk_uint offset_y); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +-------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__offset_x__ | The x offset to scroll to +__offset_y__ | The y offset to scroll to +#### nk_window_close +Closes a window and marks it for being freed at the end of the frame +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_close(struct nk_context *ctx, const char *name); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to close +#### nk_window_collapse +Updates collapse state of a window with given name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_collapse(struct nk_context*, const char *name, enum nk_collapse_states state); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to close +__state__ | value out of nk_collapse_states section +#### nk_window_collapse_if +Updates collapse state of a window with given name if given condition is met +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_collapse_if(struct nk_context*, const char *name, enum nk_collapse_states, int cond); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to either collapse or maximize +__state__ | value out of nk_collapse_states section the window should be put into +__cond__ | condition that has to be met to actually commit the collapse state change +#### nk_window_show +updates visibility state of a window with given name +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_show(struct nk_context*, const char *name, enum nk_show_states); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to either collapse or maximize +__state__ | state with either visible or hidden to modify the window with +#### nk_window_show_if +Updates visibility state of a window with given name if a given condition is met +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_window_show_if(struct nk_context*, const char *name, enum nk_show_states, int cond); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__name__ | Identifier of the window to either hide or show +__state__ | state with either visible or hidden to modify the window with +__cond__ | condition that has to be met to actually commit the visbility state change +### Layouting +Layouting in general describes placing widget inside a window with position and size. +While in this particular implementation there are five different APIs for layouting +each with different trade offs between control and ease of use.

+All layouting methods in this library are based around the concept of a row. +A row has a height the window content grows by and a number of columns and each +layouting method specifies how each widget is placed inside the row. +After a row has been allocated by calling a layouting functions and then +filled with widgets will advance an internal pointer over the allocated row.

+To actually define a layout you just call the appropriate layouting function +and each subsequent widget call will place the widget as specified. Important +here is that if you define more widgets then columns defined inside the layout +functions it will allocate the next row without you having to make another layouting

+call. +Biggest limitation with using all these APIs outside the `nk_layout_space_xxx` API +is that you have to define the row height for each. However the row height +often depends on the height of the font.

+To fix that internally nuklear uses a minimum row height that is set to the +height plus padding of currently active font and overwrites the row height +value if zero.

+If you manually want to change the minimum row height then +use nk_layout_set_min_row_height, and use nk_layout_reset_min_row_height to +reset it back to be derived from font height.

+Also if you change the font in nuklear it will automatically change the minimum +row height for you and. This means if you change the font but still want +a minimum row height smaller than the font you have to repush your value.

+For actually more advanced UI I would even recommend using the `nk_layout_space_xxx` +layouting method in combination with a cassowary constraint solver (there are +some versions on github with permissive license model) to take over all control over widget +layouting yourself. However for quick and dirty layouting using all the other layouting +functions should be fine. +#### Usage +1. __nk_layout_row_dynamic__

+ The easiest layouting function is `nk_layout_row_dynamic`. It provides each + widgets with same horizontal space inside the row and dynamically grows + if the owning window grows in width. So the number of columns dictates + the size of each widget dynamically by formula: + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + widget_width = (window_width - padding - spacing) * (1/colum_count) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Just like all other layouting APIs if you define more widget than columns this + library will allocate a new row and keep all layouting parameters previously + defined. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + if (nk_begin_xxx(...) { + // first row with height: 30 composed of two widgets + nk_layout_row_dynamic(&ctx, 30, 2); + nk_widget(...); + nk_widget(...); + // + // second row with same parameter as defined above + nk_widget(...); + nk_widget(...); + // + // third row uses 0 for height which will use auto layouting + nk_layout_row_dynamic(&ctx, 0, 2); + nk_widget(...); + nk_widget(...); + } + nk_end(...); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2. __nk_layout_row_static__

+ Another easy layouting function is `nk_layout_row_static`. It provides each + widget with same horizontal pixel width inside the row and does not grow + if the owning window scales smaller or bigger. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + if (nk_begin_xxx(...) { + // first row with height: 30 composed of two widgets with width: 80 + nk_layout_row_static(&ctx, 30, 80, 2); + nk_widget(...); + nk_widget(...); + // + // second row with same parameter as defined above + nk_widget(...); + nk_widget(...); + // + // third row uses 0 for height which will use auto layouting + nk_layout_row_static(&ctx, 0, 80, 2); + nk_widget(...); + nk_widget(...); + } + nk_end(...); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +3. __nk_layout_row_xxx__

+ A little bit more advanced layouting API are functions `nk_layout_row_begin`, + `nk_layout_row_push` and `nk_layout_row_end`. They allow to directly + specify each column pixel or window ratio in a row. It supports either + directly setting per column pixel width or widget window ratio but not + both. Furthermore it is a immediate mode API so each value is directly + pushed before calling a widget. Therefore the layout is not automatically + repeating like the last two layouting functions. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + if (nk_begin_xxx(...) { + // first row with height: 25 composed of two widgets with width 60 and 40 + nk_layout_row_begin(ctx, NK_STATIC, 25, 2); + nk_layout_row_push(ctx, 60); + nk_widget(...); + nk_layout_row_push(ctx, 40); + nk_widget(...); + nk_layout_row_end(ctx); + // + // second row with height: 25 composed of two widgets with window ratio 0.25 and 0.75 + nk_layout_row_begin(ctx, NK_DYNAMIC, 25, 2); + nk_layout_row_push(ctx, 0.25f); + nk_widget(...); + nk_layout_row_push(ctx, 0.75f); + nk_widget(...); + nk_layout_row_end(ctx); + // + // third row with auto generated height: composed of two widgets with window ratio 0.25 and 0.75 + nk_layout_row_begin(ctx, NK_DYNAMIC, 0, 2); + nk_layout_row_push(ctx, 0.25f); + nk_widget(...); + nk_layout_row_push(ctx, 0.75f); + nk_widget(...); + nk_layout_row_end(ctx); + } + nk_end(...); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +4. __nk_layout_row__

+ The array counterpart to API nk_layout_row_xxx is the single nk_layout_row + functions. Instead of pushing either pixel or window ratio for every widget + it allows to define it by array. The trade of for less control is that + `nk_layout_row` is automatically repeating. Otherwise the behavior is the + same. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + if (nk_begin_xxx(...) { + // two rows with height: 30 composed of two widgets with width 60 and 40 + const float size[] = {60,40}; + nk_layout_row(ctx, NK_STATIC, 30, 2, ratio); + nk_widget(...); + nk_widget(...); + nk_widget(...); + nk_widget(...); + // + // two rows with height: 30 composed of two widgets with window ratio 0.25 and 0.75 + const float ratio[] = {0.25, 0.75}; + nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio); + nk_widget(...); + nk_widget(...); + nk_widget(...); + nk_widget(...); + // + // two rows with auto generated height composed of two widgets with window ratio 0.25 and 0.75 + const float ratio[] = {0.25, 0.75}; + nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio); + nk_widget(...); + nk_widget(...); + nk_widget(...); + nk_widget(...); + } + nk_end(...); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +5. __nk_layout_row_template_xxx__

+ The most complex and second most flexible API is a simplified flexbox version without + line wrapping and weights for dynamic widgets. It is an immediate mode API but + unlike `nk_layout_row_xxx` it has auto repeat behavior and needs to be called + before calling the templated widgets. + The row template layout has three different per widget size specifier. The first + one is the `nk_layout_row_template_push_static` with fixed widget pixel width. + They do not grow if the row grows and will always stay the same. + The second size specifier is `nk_layout_row_template_push_variable` + which defines a minimum widget size but it also can grow if more space is available + not taken by other widgets. + Finally there are dynamic widgets with `nk_layout_row_template_push_dynamic` + which are completely flexible and unlike variable widgets can even shrink + to zero if not enough space is provided. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + if (nk_begin_xxx(...) { + // two rows with height: 30 composed of three widgets + nk_layout_row_template_begin(ctx, 30); + nk_layout_row_template_push_dynamic(ctx); + nk_layout_row_template_push_variable(ctx, 80); + nk_layout_row_template_push_static(ctx, 80); + nk_layout_row_template_end(ctx); + // + // first row + nk_widget(...); // dynamic widget can go to zero if not enough space + nk_widget(...); // variable widget with min 80 pixel but can grow bigger if enough space + nk_widget(...); // static widget with fixed 80 pixel width + // + // second row same layout + nk_widget(...); + nk_widget(...); + nk_widget(...); + } + nk_end(...); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +6. __nk_layout_space_xxx__

+ Finally the most flexible API directly allows you to place widgets inside the + window. The space layout API is an immediate mode API which does not support + row auto repeat and directly sets position and size of a widget. Position + and size hereby can be either specified as ratio of allocated space or + allocated space local position and pixel size. Since this API is quite + powerful there are a number of utility functions to get the available space + and convert between local allocated space and screen space. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c + if (nk_begin_xxx(...) { + // static row with height: 500 (you can set column count to INT_MAX if you don't want to be bothered) + nk_layout_space_begin(ctx, NK_STATIC, 500, INT_MAX); + nk_layout_space_push(ctx, nk_rect(0,0,150,200)); + nk_widget(...); + nk_layout_space_push(ctx, nk_rect(200,200,100,200)); + nk_widget(...); + nk_layout_space_end(ctx); + // + // dynamic row with height: 500 (you can set column count to INT_MAX if you don't want to be bothered) + nk_layout_space_begin(ctx, NK_DYNAMIC, 500, INT_MAX); + nk_layout_space_push(ctx, nk_rect(0.5,0.5,0.1,0.1)); + nk_widget(...); + nk_layout_space_push(ctx, nk_rect(0.7,0.6,0.1,0.1)); + nk_widget(...); + } + nk_end(...); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +----------------------------------------|------------------------------------ +nk_layout_set_min_row_height | Set the currently used minimum row height to a specified value +nk_layout_reset_min_row_height | Resets the currently used minimum row height to font height +nk_layout_widget_bounds | Calculates current width a static layout row can fit inside a window +nk_layout_ratio_from_pixel | Utility functions to calculate window ratio from pixel size +nk_layout_row_dynamic | Current layout is divided into n same sized growing columns +nk_layout_row_static | Current layout is divided into n same fixed sized columns +nk_layout_row_begin | Starts a new row with given height and number of columns +nk_layout_row_push | Pushes another column with given size or window ratio +nk_layout_row_end | Finished previously started row +nk_layout_row | Specifies row columns in array as either window ratio or size +nk_layout_row_template_begin | Begins the row template declaration +nk_layout_row_template_push_dynamic | Adds a dynamic column that dynamically grows and can go to zero if not enough space +nk_layout_row_template_push_variable | Adds a variable column that dynamically grows but does not shrink below specified pixel width +nk_layout_row_template_push_static | Adds a static column that does not grow and will always have the same size +nk_layout_row_template_end | Marks the end of the row template +nk_layout_space_begin | Begins a new layouting space that allows to specify each widgets position and size +nk_layout_space_push | Pushes position and size of the next widget in own coordinate space either as pixel or ratio +nk_layout_space_end | Marks the end of the layouting space +nk_layout_space_bounds | Callable after nk_layout_space_begin and returns total space allocated +nk_layout_space_to_screen | Converts vector from nk_layout_space coordinate space into screen space +nk_layout_space_to_local | Converts vector from screen space into nk_layout_space coordinates +nk_layout_space_rect_to_screen | Converts rectangle from nk_layout_space coordinate space into screen space +nk_layout_space_rect_to_local | Converts rectangle from screen space into nk_layout_space coordinates +#### nk_layout_set_min_row_height +Sets the currently used minimum row height. +!!! WARNING + The passed height needs to include both your preferred row height + as well as padding. No internal padding is added. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_set_min_row_height(struct nk_context*, float height); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__height__ | New minimum row height to be used for auto generating the row height +#### nk_layout_reset_min_row_height +Reset the currently used minimum row height back to `font_height + text_padding + padding` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_reset_min_row_height(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +#### nk_layout_widget_bounds +Returns the width of the next row allocate by one of the layouting functions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_rect nk_layout_widget_bounds(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +Return `nk_rect` with both position and size of the next row +#### nk_layout_ratio_from_pixel +Utility functions to calculate window ratio from pixel size +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +float nk_layout_ratio_from_pixel(struct nk_context*, float pixel_width); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__pixel__ | Pixel_width to convert to window ratio +Returns `nk_rect` with both position and size of the next row +#### nk_layout_row_dynamic +Sets current row layout to share horizontal space +between @cols number of widgets evenly. Once called all subsequent widget +calls greater than @cols will allocate a new row with same layout. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_dynamic(struct nk_context *ctx, float height, int cols); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__height__ | Holds height of each widget in row or zero for auto layouting +__columns__ | Number of widget inside row +#### nk_layout_row_static +Sets current row layout to fill @cols number of widgets +in row with same @item_width horizontal size. Once called all subsequent widget +calls greater than @cols will allocate a new row with same layout. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_static(struct nk_context *ctx, float height, int item_width, int cols); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__height__ | Holds height of each widget in row or zero for auto layouting +__width__ | Holds pixel width of each widget in the row +__columns__ | Number of widget inside row +#### nk_layout_row_begin +Starts a new dynamic or fixed row with given height and columns. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_begin(struct nk_context *ctx, enum nk_layout_format fmt, float row_height, int cols); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__fmt__ | either `NK_DYNAMIC` for window ratio or `NK_STATIC` for fixed size columns +__height__ | holds height of each widget in row or zero for auto layouting +__columns__ | Number of widget inside row +#### nk_layout_row_push +Specifies either window ratio or width of a single column +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_push(struct nk_context*, float value); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__value__ | either a window ratio or fixed width depending on @fmt in previous `nk_layout_row_begin` call +#### nk_layout_row_end +Finished previously started row +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_end(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +#### nk_layout_row +Specifies row columns in array as either window ratio or size +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row(struct nk_context*, enum nk_layout_format, float height, int cols, const float *ratio); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__fmt__ | Either `NK_DYNAMIC` for window ratio or `NK_STATIC` for fixed size columns +__height__ | Holds height of each widget in row or zero for auto layouting +__columns__ | Number of widget inside row +#### nk_layout_row_template_begin +Begins the row template declaration +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_template_begin(struct nk_context*, float row_height); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__height__ | Holds height of each widget in row or zero for auto layouting +#### nk_layout_row_template_push_dynamic +Adds a dynamic column that dynamically grows and can go to zero if not enough space +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_template_push_dynamic(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__height__ | Holds height of each widget in row or zero for auto layouting +#### nk_layout_row_template_push_variable +Adds a variable column that dynamically grows but does not shrink below specified pixel width +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_template_push_variable(struct nk_context*, float min_width); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__width__ | Holds the minimum pixel width the next column must always be +#### nk_layout_row_template_push_static +Adds a static column that does not grow and will always have the same size +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_template_push_static(struct nk_context*, float width); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__width__ | Holds the absolute pixel width value the next column must be +#### nk_layout_row_template_end +Marks the end of the row template +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_row_template_end(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +#### nk_layout_space_begin +Begins a new layouting space that allows to specify each widgets position and size. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_space_begin(struct nk_context*, enum nk_layout_format, float height, int widget_count); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` +__fmt__ | Either `NK_DYNAMIC` for window ratio or `NK_STATIC` for fixed size columns +__height__ | Holds height of each widget in row or zero for auto layouting +__columns__ | Number of widgets inside row +#### nk_layout_space_push +Pushes position and size of the next widget in own coordinate space either as pixel or ratio +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_space_push(struct nk_context *ctx, struct nk_rect bounds); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +__bounds__ | Position and size in laoyut space local coordinates +#### nk_layout_space_end +Marks the end of the layout space +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_layout_space_end(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +#### nk_layout_space_bounds +Utility function to calculate total space allocated for `nk_layout_space` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_rect nk_layout_space_bounds(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +Returns `nk_rect` holding the total space allocated +#### nk_layout_space_to_screen +Converts vector from nk_layout_space coordinate space into screen space +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_layout_space_to_screen(struct nk_context*, struct nk_vec2); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +__vec__ | Position to convert from layout space into screen coordinate space +Returns transformed `nk_vec2` in screen space coordinates +#### nk_layout_space_to_local +Converts vector from layout space into screen space +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_vec2 nk_layout_space_to_local(struct nk_context*, struct nk_vec2); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +__vec__ | Position to convert from screen space into layout coordinate space +Returns transformed `nk_vec2` in layout space coordinates +#### nk_layout_space_rect_to_screen +Converts rectangle from screen space into layout space +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_rect nk_layout_space_rect_to_screen(struct nk_context*, struct nk_rect); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +__bounds__ | Rectangle to convert from layout space into screen space +Returns transformed `nk_rect` in screen space coordinates +#### nk_layout_space_rect_to_local +Converts rectangle from layout space into screen space +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_rect nk_layout_space_rect_to_local(struct nk_context*, struct nk_rect); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` +__bounds__ | Rectangle to convert from layout space into screen space +Returns transformed `nk_rect` in layout space coordinates +### Groups +Groups are basically windows inside windows. They allow to subdivide space +in a window to layout widgets as a group. Almost all more complex widget +layouting requirements can be solved using groups and basic layouting +fuctionality. Groups just like windows are identified by an unique name and +internally keep track of scrollbar offsets by default. However additional +versions are provided to directly manage the scrollbar. +#### Usage +To create a group you have to call one of the three `nk_group_begin_xxx` +functions to start group declarations and `nk_group_end` at the end. Furthermore it +is required to check the return value of `nk_group_begin_xxx` and only process +widgets inside the window if the value is not 0. +Nesting groups is possible and even encouraged since many layouting schemes +can only be achieved by nesting. Groups, unlike windows, need `nk_group_end` +to be only called if the corresponding `nk_group_begin_xxx` call does not return 0: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +if (nk_group_begin_xxx(ctx, ...) { + // [... widgets ...] + nk_group_end(ctx); +} +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In the grand concept groups can be called after starting a window +with `nk_begin_xxx` and before calling `nk_end`: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + // Input + Event evt; + nk_input_begin(&ctx); + while (GetEvent(&evt)) { + if (evt.type == MOUSE_MOVE) + nk_input_motion(&ctx, evt.motion.x, evt.motion.y); + else if (evt.type == [...]) { + nk_input_xxx(...); + } + } + nk_input_end(&ctx); + // + // Window + if (nk_begin_xxx(...) { + // [...widgets...] + nk_layout_row_dynamic(...); + if (nk_group_begin_xxx(ctx, ...) { + //[... widgets ...] + nk_group_end(ctx); + } + } + nk_end(ctx); + // + // Draw + const struct nk_command *cmd = 0; + nk_foreach(cmd, &ctx) { + switch (cmd->type) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case ...: + // [...] + } + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +--------------------------------|------------------------------------------- +nk_group_begin | Start a new group with internal scrollbar handling +nk_group_begin_titled | Start a new group with separated name and title and internal scrollbar handling +nk_group_end | Ends a group. Should only be called if nk_group_begin returned non-zero +nk_group_scrolled_offset_begin | Start a new group with manual separated handling of scrollbar x- and y-offset +nk_group_scrolled_begin | Start a new group with manual scrollbar handling +nk_group_scrolled_end | Ends a group with manual scrollbar handling. Should only be called if nk_group_begin returned non-zero +nk_group_get_scroll | Gets the scroll offset for the given group +nk_group_set_scroll | Sets the scroll offset for the given group +#### nk_group_begin +Starts a new widget group. Requires a previous layouting function to specify a pos/size. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_group_begin(struct nk_context*, const char *title, nk_flags); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__title__ | Must be an unique identifier for this group that is also used for the group header +__flags__ | Window flags defined in the nk_panel_flags section with a number of different group behaviors +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_group_begin_titled +Starts a new widget group. Requires a previous layouting function to specify a pos/size. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_group_begin_titled(struct nk_context*, const char *name, const char *title, nk_flags); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__id__ | Must be an unique identifier for this group +__title__ | Group header title +__flags__ | Window flags defined in the nk_panel_flags section with a number of different group behaviors +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_group_end +Ends a widget group +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_group_end(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +#### nk_group_scrolled_offset_begin +starts a new widget group. requires a previous layouting function to specify +a size. Does not keep track of scrollbar. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_group_scrolled_offset_begin(struct nk_context*, nk_uint *x_offset, nk_uint *y_offset, const char *title, nk_flags flags); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__x_offset__| Scrollbar x-offset to offset all widgets inside the group horizontally. +__y_offset__| Scrollbar y-offset to offset all widgets inside the group vertically +__title__ | Window unique group title used to both identify and display in the group header +__flags__ | Window flags from the nk_panel_flags section +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_group_scrolled_begin +Starts a new widget group. requires a previous +layouting function to specify a size. Does not keep track of scrollbar. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_group_scrolled_begin(struct nk_context*, struct nk_scroll *off, const char *title, nk_flags); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__off__ | Both x- and y- scroll offset. Allows for manual scrollbar control +__title__ | Window unique group title used to both identify and display in the group header +__flags__ | Window flags from nk_panel_flags section +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_group_scrolled_end +Ends a widget group after calling nk_group_scrolled_offset_begin or nk_group_scrolled_begin. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_group_scrolled_end(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +#### nk_group_get_scroll +Gets the scroll position of the given group. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_group_get_scroll(struct nk_context*, const char *id, nk_uint *x_offset, nk_uint *y_offset); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +-------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__id__ | The id of the group to get the scroll position of +__x_offset__ | A pointer to the x offset output (or NULL to ignore) +__y_offset__ | A pointer to the y offset output (or NULL to ignore) +#### nk_group_set_scroll +Sets the scroll position of the given group. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_offset, nk_uint y_offset); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +-------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__id__ | The id of the group to scroll +__x_offset__ | The x offset to scroll to +__y_offset__ | The y offset to scroll to +### Tree +Trees represent two different concept. First the concept of a collapsible +UI section that can be either in a hidden or visible state. They allow the UI +user to selectively minimize the current set of visible UI to comprehend. +The second concept are tree widgets for visual UI representation of trees.

+Trees thereby can be nested for tree representations and multiple nested +collapsible UI sections. All trees are started by calling of the +`nk_tree_xxx_push_tree` functions and ended by calling one of the +`nk_tree_xxx_pop_xxx()` functions. Each starting functions takes a title label +and optionally an image to be displayed and the initial collapse state from +the nk_collapse_states section.

+The runtime state of the tree is either stored outside the library by the caller +or inside which requires a unique ID. The unique ID can either be generated +automatically from `__FILE__` and `__LINE__` with function `nk_tree_push`, +by `__FILE__` and a user provided ID generated for example by loop index with +function `nk_tree_push_id` or completely provided from outside by user with +function `nk_tree_push_hashed`. +#### Usage +To create a tree you have to call one of the seven `nk_tree_xxx_push_xxx` +functions to start a collapsible UI section and `nk_tree_xxx_pop` to mark the +end. +Each starting function will either return `false(0)` if the tree is collapsed +or hidden and therefore does not need to be filled with content or `true(1)` +if visible and required to be filled. +!!! Note + The tree header does not require and layouting function and instead + calculates a auto height based on the currently used font size +The tree ending functions only need to be called if the tree content is +actually visible. So make sure the tree push function is guarded by `if` +and the pop call is only taken if the tree is visible. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +if (nk_tree_push(ctx, NK_TREE_TAB, "Tree", NK_MINIMIZED)) { + nk_layout_row_dynamic(...); + nk_widget(...); + nk_tree_pop(ctx); +} +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +----------------------------|------------------------------------------- +nk_tree_push | Start a collapsible UI section with internal state management +nk_tree_push_id | Start a collapsible UI section with internal state management callable in a look +nk_tree_push_hashed | Start a collapsible UI section with internal state management with full control over internal unique ID use to store state +nk_tree_image_push | Start a collapsible UI section with image and label header +nk_tree_image_push_id | Start a collapsible UI section with image and label header and internal state management callable in a look +nk_tree_image_push_hashed | Start a collapsible UI section with image and label header and internal state management with full control over internal unique ID use to store state +nk_tree_pop | Ends a collapsible UI section +nk_tree_state_push | Start a collapsible UI section with external state management +nk_tree_state_image_push | Start a collapsible UI section with image and label header and external state management +nk_tree_state_pop | Ends a collapsabale UI section +#### nk_tree_type +Flag | Description +----------------|---------------------------------------- +NK_TREE_NODE | Highlighted tree header to mark a collapsible UI section +NK_TREE_TAB | Non-highlighted tree header closer to tree representations +#### nk_tree_push +Starts a collapsible UI section with internal state management +!!! WARNING + To keep track of the runtime tree collapsible state this function uses + defines `__FILE__` and `__LINE__` to generate a unique ID. If you want + to call this function in a loop please use `nk_tree_push_id` or + `nk_tree_push_hashed` instead. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +#define nk_tree_push(ctx, type, title, state) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__title__ | Label printed in the tree header +__state__ | Initial tree state value out of nk_collapse_states +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_push_id +Starts a collapsible UI section with internal state management callable in a look +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +#define nk_tree_push_id(ctx, type, title, state, id) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__title__ | Label printed in the tree header +__state__ | Initial tree state value out of nk_collapse_states +__id__ | Loop counter index if this function is called in a loop +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_push_hashed +Start a collapsible UI section with internal state management with full +control over internal unique ID used to store state +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__title__ | Label printed in the tree header +__state__ | Initial tree state value out of nk_collapse_states +__hash__ | Memory block or string to generate the ID from +__len__ | Size of passed memory block or string in __hash__ +__seed__ | Seeding value if this function is called in a loop or default to `0` +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_image_push +Start a collapsible UI section with image and label header +!!! WARNING + To keep track of the runtime tree collapsible state this function uses + defines `__FILE__` and `__LINE__` to generate a unique ID. If you want + to call this function in a loop please use `nk_tree_image_push_id` or + `nk_tree_image_push_hashed` instead. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +#define nk_tree_image_push(ctx, type, img, title, state) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__img__ | Image to display inside the header on the left of the label +__title__ | Label printed in the tree header +__state__ | Initial tree state value out of nk_collapse_states +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_image_push_id +Start a collapsible UI section with image and label header and internal state +management callable in a look +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +#define nk_tree_image_push_id(ctx, type, img, title, state, id) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__img__ | Image to display inside the header on the left of the label +__title__ | Label printed in the tree header +__state__ | Initial tree state value out of nk_collapse_states +__id__ | Loop counter index if this function is called in a loop +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_image_push_hashed +Start a collapsible UI section with internal state management with full +control over internal unique ID used to store state +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__img__ | Image to display inside the header on the left of the label +__title__ | Label printed in the tree header +__state__ | Initial tree state value out of nk_collapse_states +__hash__ | Memory block or string to generate the ID from +__len__ | Size of passed memory block or string in __hash__ +__seed__ | Seeding value if this function is called in a loop or default to `0` +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_pop +Ends a collapsabale UI section +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_tree_pop(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` +#### nk_tree_state_push +Start a collapsible UI section with external state management +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__title__ | Label printed in the tree header +__state__ | Persistent state to update +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_state_image_push +Start a collapsible UI section with image and label header and external state management +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` +__img__ | Image to display inside the header on the left of the label +__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node +__title__ | Label printed in the tree header +__state__ | Persistent state to update +Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise +#### nk_tree_state_pop +Ends a collapsabale UI section +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_tree_state_pop(struct nk_context*); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` +### Properties +Properties are the main value modification widgets in Nuklear. Changing a value +can be achieved by dragging, adding/removing incremental steps on button click +or by directly typing a number. +#### Usage +Each property requires a unique name for identification that is also used for +displaying a label. If you want to use the same name multiple times make sure +add a '#' before your name. The '#' will not be shown but will generate a +unique ID. Each property also takes in a minimum and maximum value. If you want +to make use of the complete number range of a type just use the provided +type limits from `limits.h`. For example `INT_MIN` and `INT_MAX` for +`nk_property_int` and `nk_propertyi`. In additional each property takes in +a increment value that will be added or subtracted if either the increment +decrement button is clicked. Finally there is a value for increment per pixel +dragged that is added or subtracted from the value. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int value = 0; +struct nk_context ctx; +nk_init_xxx(&ctx, ...); +while (1) { + // Input + Event evt; + nk_input_begin(&ctx); + while (GetEvent(&evt)) { + if (evt.type == MOUSE_MOVE) + nk_input_motion(&ctx, evt.motion.x, evt.motion.y); + else if (evt.type == [...]) { + nk_input_xxx(...); + } + } + nk_input_end(&ctx); + // + // Window + if (nk_begin_xxx(...) { + // Property + nk_layout_row_dynamic(...); + nk_property_int(ctx, "ID", INT_MIN, &value, INT_MAX, 1, 1); + } + nk_end(ctx); + // + // Draw + const struct nk_command *cmd = 0; + nk_foreach(cmd, &ctx) { + switch (cmd->type) { + case NK_COMMAND_LINE: + your_draw_line_function(...) + break; + case NK_COMMAND_RECT + your_draw_rect_function(...) + break; + case ...: + // [...] + } + nk_clear(&ctx); +} +nk_free(&ctx); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#### Reference +Function | Description +--------------------|------------------------------------------- +nk_property_int | Integer property directly modifying a passed in value +nk_property_float | Float property directly modifying a passed in value +nk_property_double | Double property directly modifying a passed in value +nk_propertyi | Integer property returning the modified int value +nk_propertyf | Float property returning the modified float value +nk_propertyd | Double property returning the modified double value +#### nk_property_int +Integer property directly modifying a passed in value +!!! WARNING + To generate a unique property ID using the same label make sure to insert + a `#` at the beginning. It will not be shown but guarantees correct behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_property_int(struct nk_context *ctx, const char *name, int min, int *val, int max, int step, float inc_per_pixel); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +--------------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function +__name__ | String used both as a label as well as a unique identifier +__min__ | Minimum value not allowed to be underflown +__val__ | Integer pointer to be modified +__max__ | Maximum value not allowed to be overflown +__step__ | Increment added and subtracted on increment and decrement button +__inc_per_pixel__ | Value per pixel added or subtracted on dragging +#### nk_property_float +Float property directly modifying a passed in value +!!! WARNING + To generate a unique property ID using the same label make sure to insert + a `#` at the beginning. It will not be shown but guarantees correct behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_property_float(struct nk_context *ctx, const char *name, float min, float *val, float max, float step, float inc_per_pixel); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +--------------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function +__name__ | String used both as a label as well as a unique identifier +__min__ | Minimum value not allowed to be underflown +__val__ | Float pointer to be modified +__max__ | Maximum value not allowed to be overflown +__step__ | Increment added and subtracted on increment and decrement button +__inc_per_pixel__ | Value per pixel added or subtracted on dragging +#### nk_property_double +Double property directly modifying a passed in value +!!! WARNING + To generate a unique property ID using the same label make sure to insert + a `#` at the beginning. It will not be shown but guarantees correct behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +void nk_property_double(struct nk_context *ctx, const char *name, double min, double *val, double max, double step, double inc_per_pixel); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +--------------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function +__name__ | String used both as a label as well as a unique identifier +__min__ | Minimum value not allowed to be underflown +__val__ | Double pointer to be modified +__max__ | Maximum value not allowed to be overflown +__step__ | Increment added and subtracted on increment and decrement button +__inc_per_pixel__ | Value per pixel added or subtracted on dragging +#### nk_propertyi +Integer property modifying a passed in value and returning the new value +!!! WARNING + To generate a unique property ID using the same label make sure to insert + a `#` at the beginning. It will not be shown but guarantees correct behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +int nk_propertyi(struct nk_context *ctx, const char *name, int min, int val, int max, int step, float inc_per_pixel); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +--------------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function +__name__ | String used both as a label as well as a unique identifier +__min__ | Minimum value not allowed to be underflown +__val__ | Current integer value to be modified and returned +__max__ | Maximum value not allowed to be overflown +__step__ | Increment added and subtracted on increment and decrement button +__inc_per_pixel__ | Value per pixel added or subtracted on dragging +Returns the new modified integer value +#### nk_propertyf +Float property modifying a passed in value and returning the new value +!!! WARNING + To generate a unique property ID using the same label make sure to insert + a `#` at the beginning. It will not be shown but guarantees correct behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +float nk_propertyf(struct nk_context *ctx, const char *name, float min, float val, float max, float step, float inc_per_pixel); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +--------------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function +__name__ | String used both as a label as well as a unique identifier +__min__ | Minimum value not allowed to be underflown +__val__ | Current float value to be modified and returned +__max__ | Maximum value not allowed to be overflown +__step__ | Increment added and subtracted on increment and decrement button +__inc_per_pixel__ | Value per pixel added or subtracted on dragging +Returns the new modified float value +#### nk_propertyd +Float property modifying a passed in value and returning the new value +!!! WARNING + To generate a unique property ID using the same label make sure to insert + a `#` at the beginning. It will not be shown but guarantees correct behavior. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c +float nk_propertyd(struct nk_context *ctx, const char *name, double min, double val, double max, double step, double inc_per_pixel); +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Parameter | Description +--------------------|----------------------------------------------------------- +__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function +__name__ | String used both as a label as well as a unique identifier +__min__ | Minimum value not allowed to be underflown +__val__ | Current double value to be modified and returned +__max__ | Maximum value not allowed to be overflown +__step__ | Increment added and subtracted on increment and decrement button +__inc_per_pixel__ | Value per pixel added or subtracted on dragging +Returns the new modified double value + -XXX.XXX- X...X - X...X -X....X - X....X" +X...XXXXXXXXXXXXX...X - " +## License +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none + ------------------------------------------------------------------------------ + This software is available under 2 licenses -- choose whichever you prefer. + ------------------------------------------------------------------------------ + ALTERNATIVE A - MIT License + Copyright (c) 2016-2018 Micha Mettke + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + ------------------------------------------------------------------------------ + ALTERNATIVE B - Public Domain (www.unlicense.org) + This is free and unencumbered software released into the public domain. + Anyone is free to copy, modify, publish, use, compile, sell, or distribute this + software, either in source code form or as a compiled binary, for any purpose, + commercial or non-commercial, and by any means. + In jurisdictions that recognize copyright laws, the author or authors of this + software dedicate any and all copyright interest in the software to the public + domain. We make this dedication for the benefit of the public at large and to + the detriment of our heirs and successors. We intend this dedication to be an + overt act of relinquishment in perpetuity of all present and future rights to + this software under copyright law. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + ------------------------------------------------------------------------------ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## Changelog +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none +[date][x.yy.zz]-[description] +-[date]: date on which the change has been pushed +-[x.yy.zz]: Numerical version string representation. Each version number on the right + resets back to zero if version on the left is incremented. + - [x]: Major version with API and library breaking changes + - [yy]: Minor version with non-breaking API and library changes + - [zz]: Bug fix version with no direct changes to API +- 2020/04/09 (4.02.1) - Removed unused nk_sqrt function to fix compiler warnings + - Fixed compiler warnings if you bring your own methods for + nk_cos/nk_sin/nk_strtod/nk_memset/nk_memcopy/nk_dtoa +- 2020/04/06 (4.01.10) - Fix bug: Do not use pool before checking for NULL +- 2020/03/22 (4.01.9) - Fix bug where layout state wasn't restored correctly after + popping a tree. +- 2020/03/11 (4.01.8) - Fix bug where padding is subtracted from widget +- 2020/03/06 (4.01.7) - Fix bug where width padding was applied twice +- 2020/02/06 (4.01.6) - Update stb_truetype.h and stb_rect_pack.h and separate them +- 2019/12/10 (4.01.5) - Fix off-by-one error in NK_INTERSECT +- 2019/10/09 (4.01.4) - Fix bug for autoscrolling in nk_do_edit +- 2019/09/20 (4.01.3) - Fixed a bug wherein combobox cannot be closed by clicking the header + when NK_BUTTON_TRIGGER_ON_RELEASE is defined. +- 2019/09/10 (4.01.2) - Fixed the nk_cos function, which deviated significantly. +- 2019/09/08 (4.01.1) - Fixed a bug wherein re-baking of fonts caused a segmentation + fault due to dst_font->glyph_count not being zeroed on subsequent + bakes of the same set of fonts. +- 2019/06/23 (4.01.0) - Added nk_***_get_scroll and nk_***_set_scroll for groups, windows, and popups. +- 2019/06/12 (4.00.3) - Fix panel background drawing bug. +- 2018/10/31 (4.00.2) - Added NK_KEYSTATE_BASED_INPUT to "fix" state based backends + like GLFW without breaking key repeat behavior on event based. +- 2018/04/01 (4.00.1) - Fixed calling `nk_convert` multiple time per single frame. +- 2018/04/01 (4.00.0) - BREAKING CHANGE: nk_draw_list_clear no longer tries to + clear provided buffers. So make sure to either free + or clear each passed buffer after calling nk_convert. +- 2018/02/23 (3.00.6) - Fixed slider dragging behavior. +- 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process. +- 2018/01/31 (3.00.4) - Removed name collision with stb_truetype. +- 2018/01/28 (3.00.3) - Fixed panel window border drawing bug. +- 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separated group identifier and title. +- 2018/01/07 (3.00.1) - Started to change documentation style. +- 2018/01/05 (3.00.0) - BREAKING CHANGE: The previous color picker API was broken + because of conversions between float and byte color representation. + Color pickers now use floating point values to represent + HSV values. To get back the old behavior I added some additional + color conversion functions to cast between nk_color and + nk_colorf. +- 2017/12/23 (2.00.7) - Fixed small warning. +- 2017/12/23 (2.00.7) - Fixed `nk_edit_buffer` behavior if activated to allow input. +- 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior. +- 2017/12/04 (2.00.6) - Added formatted string tooltip widget. +- 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag `NK_WINDOW_NO_INPUT`. +- 2017/11/15 (2.00.4) - Fixed font merging. +- 2017/11/07 (2.00.3) - Fixed window size and position modifier functions. +- 2017/09/14 (2.00.2) - Fixed `nk_edit_buffer` and `nk_edit_focus` behavior. +- 2017/09/14 (2.00.1) - Fixed window closing behavior. +- 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifying window position and size functions now + require the name of the window and must happen outside the window + building process (between function call nk_begin and nk_end). +- 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last. +- 2017/08/27 (1.40.8) - Fixed `nk_item_is_any_active` for hidden windows. +- 2017/08/27 (1.40.7) - Fixed window background flag. +- 2017/07/07 (1.40.6) - Fixed missing clipping rect check for hovering/clicked + query for widgets. +- 2017/07/07 (1.40.5) - Fixed drawing bug for vertex output for lines and stroked + and filled rectangles. +- 2017/07/07 (1.40.4) - Fixed bug in nk_convert trying to add windows that are in + process of being destroyed. +- 2017/07/07 (1.40.3) - Fixed table internal bug caused by storing table size in + window instead of directly in table. +- 2017/06/30 (1.40.2) - Removed unneeded semicolon in C++ NK_ALIGNOF macro. +- 2017/06/30 (1.40.1) - Fixed drawing lines smaller or equal zero. +- 2017/06/08 (1.40.0) - Removed the breaking part of last commit. Auto layout now only + comes in effect if you pass in zero was row height argument. +- 2017/06/08 (1.40.0) - BREAKING CHANGE: while not directly API breaking it will change + how layouting works. From now there will be an internal minimum + row height derived from font height. If you need a row smaller than + that you can directly set it by `nk_layout_set_min_row_height` and + reset the value back by calling `nk_layout_reset_min_row_height. +- 2017/06/08 (1.39.1) - Fixed property text edit handling bug caused by past `nk_widget` fix. +- 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a `nk_layout_xxx` function. +- 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer. +- 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped. +- 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundaries. +- 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space. +- 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size. +- 2017/05/06 (1.38.0) - Added platform double-click support. +- 2017/04/20 (1.37.1) - Fixed key repeat found inside glfw demo backends. +- 2017/04/20 (1.37.0) - Extended properties with selection and clipboard support. +- 2017/04/20 (1.36.2) - Fixed #405 overlapping rows with zero padding and spacing. +- 2017/04/09 (1.36.1) - Fixed #403 with another widget float error. +- 2017/04/09 (1.36.0) - Added window `NK_WINDOW_NO_INPUT` and `NK_WINDOW_NOT_INTERACTIVE` flags. +- 2017/04/09 (1.35.3) - Fixed buffer heap corruption. +- 2017/03/25 (1.35.2) - Fixed popup overlapping for `NK_WINDOW_BACKGROUND` windows. +- 2017/03/25 (1.35.1) - Fixed windows closing behavior. +- 2017/03/18 (1.35.0) - Added horizontal scroll requested in #377. +- 2017/03/18 (1.34.3) - Fixed long window header titles. +- 2017/03/04 (1.34.2) - Fixed text edit filtering. +- 2017/03/04 (1.34.1) - Fixed group closable flag. +- 2017/02/25 (1.34.0) - Added custom draw command for better language binding support. +- 2017/01/24 (1.33.0) - Added programmatic way to remove edit focus. +- 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows. +- 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows. +- 2017/01/21 (1.32.1) - Fixed slider behavior and drawing. +- 2017/01/13 (1.32.0) - Added flag to put scaler into the bottom left corner. +- 2017/01/13 (1.31.0) - Added additional row layouting method to combine both + dynamic and static widgets. +- 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit. +- 2016/12/31 (1.29.2) - Fixed closing window bug of minimized windows. +- 2016/12/03 (1.29.1) - Fixed wrapped text with no seperator and C89 error. +- 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters. +- 2016/11/22 (1.28.6) - Fixed window minimized closing bug. +- 2016/11/19 (1.28.5) - Fixed abstract combo box closing behavior. +- 2016/11/19 (1.28.4) - Fixed tooltip flickering. +- 2016/11/19 (1.28.3) - Fixed memory leak caused by popup repeated closing. +- 2016/11/18 (1.28.2) - Fixed memory leak caused by popup panel allocation. +- 2016/11/10 (1.28.1) - Fixed some warnings and C++ error. +- 2016/11/10 (1.28.0) - Added additional `nk_button` versions which allows to directly + pass in a style struct to change buttons visual. +- 2016/11/10 (1.27.0) - Added additional `nk_tree` versions to support external state + storage. Just like last the `nk_group` commit the main + advantage is that you optionally can minimize nuklears runtime + memory consumption or handle hash collisions. +- 2016/11/09 (1.26.0) - Added additional `nk_group` version to support external scrollbar + offset storage. Main advantage is that you can externalize + the memory management for the offset. It could also be helpful + if you have a hash collision in `nk_group_begin` but really + want the name. In addition I added `nk_list_view` which allows + to draw big lists inside a group without actually having to + commit the whole list to nuklear (issue #269). +- 2016/10/30 (1.25.1) - Fixed clipping rectangle bug inside `nk_draw_list`. +- 2016/10/29 (1.25.0) - Pulled `nk_panel` memory management into nuklear and out of + the hands of the user. From now on users don't have to care + about panels unless they care about some information. If you + still need the panel just call `nk_window_get_panel`. +- 2016/10/21 (1.24.0) - Changed widget border drawing to stroked rectangle from filled + rectangle for less overdraw and widget background transparency. +- 2016/10/18 (1.23.0) - Added `nk_edit_focus` for manually edit widget focus control. +- 2016/09/29 (1.22.7) - Fixed deduction of basic type in non `` compilation. +- 2016/09/29 (1.22.6) - Fixed edit widget UTF-8 text cursor drawing bug. +- 2016/09/28 (1.22.5) - Fixed edit widget UTF-8 text appending/inserting/removing. +- 2016/09/28 (1.22.4) - Fixed drawing bug inside edit widgets which offset all text + text in every edit widget if one of them is scrolled. +- 2016/09/28 (1.22.3) - Fixed small bug in edit widgets if not active. The wrong + text length is passed. It should have been in bytes but + was passed as glyphs. +- 2016/09/20 (1.22.2) - Fixed color button size calculation. +- 2016/09/20 (1.22.1) - Fixed some `nk_vsnprintf` behavior bugs and removed `` + again from `NK_INCLUDE_STANDARD_VARARGS`. +- 2016/09/18 (1.22.0) - C89 does not support vsnprintf only C99 and newer as well + as C++11 and newer. In addition to use vsnprintf you have + to include . So just defining `NK_INCLUDE_STD_VAR_ARGS` + is not enough. That behavior is now fixed. By default if + both varargs as well as stdio is selected I try to use + vsnprintf if not possible I will revert to vsprintf. If + varargs but not stdio was defined I will use my own function. +- 2016/09/15 (1.21.2) - Fixed panel `close` behavior for deeper panel levels. +- 2016/09/15 (1.21.1) - Fixed C++ errors and wrong argument to `nk_panel_get_xxxx`. +- 2016/09/13 (1.21.0) - !BREAKING! Fixed nonblocking popup behavior in menu, combo, + and contextual which prevented closing in y-direction if + popup did not reach max height. + In addition the height parameter was changed into vec2 + for width and height to have more control over the popup size. +- 2016/09/13 (1.20.3) - Cleaned up and extended type selection. +- 2016/09/13 (1.20.2) - Fixed slider behavior hopefully for the last time. This time + all calculation are correct so no more hackery. +- 2016/09/13 (1.20.1) - Internal change to divide window/panel flags into panel flags and types. + Suprisinly spend years in C and still happened to confuse types + with flags. Probably something to take note. +- 2016/09/08 (1.20.0) - Added additional helper function to make it easier to just + take the produced buffers from `nk_convert` and unplug the + iteration process from `nk_context`. So now you can + just use the vertex,element and command buffer + two pointer + inside the command buffer retrieved by calls `nk__draw_begin` + and `nk__draw_end` and macro `nk_draw_foreach_bounded`. +- 2016/09/08 (1.19.0) - Added additional asserts to make sure every `nk_xxx_begin` call + for windows, popups, combobox, menu and contextual is guarded by + `if` condition and does not produce false drawing output. +- 2016/09/08 (1.18.0) - Changed confusing name for `NK_SYMBOL_RECT_FILLED`, `NK_SYMBOL_RECT` + to hopefully easier to understand `NK_SYMBOL_RECT_FILLED` and + `NK_SYMBOL_RECT_OUTLINE`. +- 2016/09/08 (1.17.0) - Changed confusing name for `NK_SYMBOL_CIRLCE_FILLED`, `NK_SYMBOL_CIRCLE` + to hopefully easier to understand `NK_SYMBOL_CIRCLE_FILLED` and + `NK_SYMBOL_CIRCLE_OUTLINE`. +- 2016/09/08 (1.16.0) - Added additional checks to select correct types if `NK_INCLUDE_FIXED_TYPES` + is not defined by supporting the biggest compiler GCC, clang and MSVC. +- 2016/09/07 (1.15.3) - Fixed `NK_INCLUDE_COMMAND_USERDATA` define to not cause an error. +- 2016/09/04 (1.15.2) - Fixed wrong combobox height calculation. +- 2016/09/03 (1.15.1) - Fixed gaps inside combo boxes in OpenGL. +- 2016/09/02 (1.15.0) - Changed nuklear to not have any default vertex layout and + instead made it user provided. The range of types to convert + to is quite limited at the moment, but I would be more than + happy to accept PRs to add additional. +- 2016/08/30 (1.14.2) - Removed unused variables. +- 2016/08/30 (1.14.1) - Fixed C++ build errors. +- 2016/08/30 (1.14.0) - Removed mouse dragging from SDL demo since it does not work correctly. +- 2016/08/30 (1.13.4) - Tweaked some default styling variables. +- 2016/08/30 (1.13.3) - Hopefully fixed drawing bug in slider, in general I would + refrain from using slider with a big number of steps. +- 2016/08/30 (1.13.2) - Fixed close and minimize button which would fire even if the + window was in Read Only Mode. +- 2016/08/30 (1.13.1) - Fixed popup panel padding handling which was previously just + a hack for combo box and menu. +- 2016/08/30 (1.13.0) - Removed `NK_WINDOW_DYNAMIC` flag from public API since + it is bugged and causes issues in window selection. +- 2016/08/30 (1.12.0) - Removed scaler size. The size of the scaler is now + determined by the scrollbar size. +- 2016/08/30 (1.11.2) - Fixed some drawing bugs caused by changes from 1.11.0. +- 2016/08/30 (1.11.1) - Fixed overlapping minimized window selection. +- 2016/08/30 (1.11.0) - Removed some internal complexity and overly complex code + handling panel padding and panel border. +- 2016/08/29 (1.10.0) - Added additional height parameter to `nk_combobox_xxx`. +- 2016/08/29 (1.10.0) - Fixed drawing bug in dynamic popups. +- 2016/08/29 (1.10.0) - Added experimental mouse scrolling to popups, menus and comboboxes. +- 2016/08/26 (1.10.0) - Added window name string prepresentation to account for + hash collisions. Currently limited to `NK_WINDOW_MAX_NAME` + which in term can be redefined if not big enough. +- 2016/08/26 (1.10.0) - Added stacks for temporary style/UI changes in code. +- 2016/08/25 (1.10.0) - Changed `nk_input_is_key_pressed` and 'nk_input_is_key_released' + to account for key press and release happening in one frame. +- 2016/08/25 (1.10.0) - Added additional nk_edit flag to directly jump to the end on activate. +- 2016/08/17 (1.09.6) - Removed invalid check for value zero in `nk_propertyx`. +- 2016/08/16 (1.09.5) - Fixed ROM mode for deeper levels of popup windows parents. +- 2016/08/15 (1.09.4) - Editbox are now still active if enter was pressed with flag + `NK_EDIT_SIG_ENTER`. Main reasoning is to be able to keep + typing after committing. +- 2016/08/15 (1.09.4) - Removed redundant code. +- 2016/08/15 (1.09.4) - Fixed negative numbers in `nk_strtoi` and remove unused variable. +- 2016/08/15 (1.09.3) - Fixed `NK_WINDOW_BACKGROUND` flag behavior to select a background + window only as selected by hovering and not by clicking. +- 2016/08/14 (1.09.2) - Fixed a bug in font atlas which caused wrong loading + of glyphs for font with multiple ranges. +- 2016/08/12 (1.09.1) - Added additional function to check if window is currently + hidden and therefore not visible. +- 2016/08/12 (1.09.1) - nk_window_is_closed now queries the correct flag `NK_WINDOW_CLOSED` + instead of the old flag `NK_WINDOW_HIDDEN`. +- 2016/08/09 (1.09.0) - Added additional double version to nk_property and changed + the underlying implementation to not cast to float and instead + work directly on the given values. +- 2016/08/09 (1.08.0) - Added additional define to overwrite library internal + floating pointer number to string conversion for additional + precision. +- 2016/08/09 (1.08.0) - Added additional define to overwrite library internal + string to floating point number conversion for additional + precision. +- 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`. +- 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading + to wrong wiget width calculation which results in widgets falsely + becoming tagged as not inside window and cannot be accessed. +- 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and + closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown + by using `nk_window_show` and closed by either clicking the close + icon in a window or by calling `nk_window_close`. Only closed + windows get removed at the end of the frame while hidden windows + remain. +- 2016/08/08 (1.06.0) - Added `nk_edit_string_zero_terminated` as a second option to + `nk_edit_string` which takes, edits and outputs a '\0' terminated string. +- 2016/08/08 (1.05.4) - Fixed scrollbar auto hiding behavior. +- 2016/08/08 (1.05.3) - Fixed wrong panel padding selection in `nk_layout_widget_space`. +- 2016/08/07 (1.05.2) - Fixed old bug in dynamic immediate mode layout API, calculating + wrong item spacing and panel width. +- 2016/08/07 (1.05.1) - Hopefully finally fixed combobox popup drawing bug. +- 2016/08/07 (1.05.0) - Split varargs away from `NK_INCLUDE_STANDARD_IO` into own + define `NK_INCLUDE_STANDARD_VARARGS` to allow more fine + grained controlled over library includes. +- 2016/08/06 (1.04.5) - Changed memset calls to `NK_MEMSET`. +- 2016/08/04 (1.04.4) - Fixed fast window scaling behavior. +- 2016/08/04 (1.04.3) - Fixed window scaling, movement bug which appears if you + move/scale a window and another window is behind it. + If you are fast enough then the window behind gets activated + and the operation is blocked. I now require activating + by hovering only if mouse is not pressed. +- 2016/08/04 (1.04.2) - Fixed changing fonts. +- 2016/08/03 (1.04.1) - Fixed `NK_WINDOW_BACKGROUND` behavior. +- 2016/08/03 (1.04.0) - Added color parameter to `nk_draw_image`. +- 2016/08/03 (1.04.0) - Added additional window padding style attributes for + sub windows (combo, menu, ...). +- 2016/08/03 (1.04.0) - Added functions to show/hide software cursor. +- 2016/08/03 (1.04.0) - Added `NK_WINDOW_BACKGROUND` flag to force a window + to be always in the background of the screen. +- 2016/08/03 (1.03.2) - Removed invalid assert macro for NK_RGB color picker. +- 2016/08/01 (1.03.1) - Added helper macros into header include guard. +- 2016/07/29 (1.03.0) - Moved the window/table pool into the header part to + simplify memory management by removing the need to + allocate the pool. +- 2016/07/29 (1.02.0) - Added auto scrollbar hiding window flag which if enabled + will hide the window scrollbar after NK_SCROLLBAR_HIDING_TIMEOUT + seconds without window interaction. To make it work + you have to also set a delta time inside the `nk_context`. +- 2016/07/25 (1.01.1) - Fixed small panel and panel border drawing bugs. +- 2016/07/15 (1.01.0) - Added software cursor to `nk_style` and `nk_context`. +- 2016/07/15 (1.01.0) - Added const correctness to `nk_buffer_push' data argument. +- 2016/07/15 (1.01.0) - Removed internal font baking API and simplified + font atlas memory management by converting pointer + arrays for fonts and font configurations to lists. +- 2016/07/15 (1.00.0) - Changed button API to use context dependent button + behavior instead of passing it for every function call. +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +## Gallery +![Figure [blue]: Feature overview with blue color styling](https://cloud.githubusercontent.com/assets/8057201/13538240/acd96876-e249-11e5-9547-5ac0b19667a0.png) +![Figure [red]: Feature overview with red color styling](https://cloud.githubusercontent.com/assets/8057201/13538243/b04acd4c-e249-11e5-8fd2-ad7744a5b446.png) +![Figure [widgets]: Widget overview](https://cloud.githubusercontent.com/assets/8057201/11282359/3325e3c6-8eff-11e5-86cb-cf02b0596087.png) +![Figure [blackwhite]: Black and white](https://cloud.githubusercontent.com/assets/8057201/11033668/59ab5d04-86e5-11e5-8091-c56f16411565.png) +![Figure [filexp]: File explorer](https://cloud.githubusercontent.com/assets/8057201/10718115/02a9ba08-7b6b-11e5-950f-adacdd637739.png) +![Figure [opengl]: OpenGL Editor](https://cloud.githubusercontent.com/assets/8057201/12779619/2a20d72c-ca69-11e5-95fe-4edecf820d5c.png) +![Figure [nodedit]: Node Editor](https://cloud.githubusercontent.com/assets/8057201/9976995/e81ac04a-5ef7-11e5-872b-acd54fbeee03.gif) +![Figure [skinning]: Using skinning in Nuklear](https://cloud.githubusercontent.com/assets/8057201/15991632/76494854-30b8-11e6-9555-a69840d0d50b.png) +![Figure [bf]: Heavy modified version](https://cloud.githubusercontent.com/assets/8057201/14902576/339926a8-0d9c-11e6-9fee-a8b73af04473.png) +## Credits +Developed by Micha Mettke and every direct or indirect github contributor.

+Embeds [stb_texedit](https://github.com/nothings/stb/blob/master/stb_textedit.h), [stb_truetype](https://github.com/nothings/stb/blob/master/stb_truetype.h) and [stb_rectpack](https://github.com/nothings/stb/blob/master/stb_rect_pack.h) by Sean Barret (public domain)
+Uses [stddoc.c](https://github.com/r-lyeh/stddoc.c) from r-lyeh@github.com for documentation generation

+Embeds ProggyClean.ttf font by Tristan Grimmer (MIT license).
+Big thank you to Omar Cornut (ocornut@github) for his [imgui library](https://github.com/ocornut/imgui) and +giving me the inspiration for this library, Casey Muratori for handmade hero +and his original immediate mode graphical user interface idea and Sean +Barret for his amazing single header libraries which restored my faith +in libraries and brought me to create some of my own. Finally Apoorva Joshi +for his single header file packer. + + diff --git a/doc/nuklear.html b/doc/nuklear.html index bed7855..c3acf91 100644 --- a/doc/nuklear.html +++ b/doc/nuklear.html @@ -1,2626 +1,11 @@ - - -Nuklear -# Nuklear -![](https://cloud.githubusercontent.com/assets/8057201/11761525/ae06f0ca-a0c6-11e5-819d-5610b25f6ef4.gif) -## Contents -1. About section -2. Highlights section -3. Features section -4. Usage section - 1. Flags section - 2. Constants section - 3. Dependencies section -5. Example section -6. API section - 1. Context section - 2. Input section - 3. Drawing section - 4. Window section - 5. Layouting section - 6. Groups section - 7. Tree section - 8. Properties section -7. License section -8. Changelog section -9. Gallery section -10. Credits section -## About -This is a minimal state immediate mode graphical user interface toolkit -written in ANSI C and licensed under public domain. It was designed as a simple -embeddable user interface for application and does not have any dependencies, -a default renderbackend or OS window and input handling but instead provides a very modular -library approach by using simple input state for input and draw -commands describing primitive shapes as output. So instead of providing a -layered library that tries to abstract over a number of platform and -render backends it only focuses on the actual UI. -## Highlights -- Graphical user interface toolkit -- Single header library -- Written in C89 (a.k.a. ANSI C or ISO C90) -- Small codebase (~18kLOC) -- Focus on portability, efficiency and simplicity -- No dependencies (not even the standard library if not wanted) -- Fully skinnable and customizable -- Low memory footprint with total memory control if needed or wanted -- UTF-8 support -- No global or hidden state -- Customizable library modules (you can compile and use only what you need) -- Optional font baker and vertex buffer output -## Features -- Absolutely no platform dependent code -- Memory management control ranging from/to - - Ease of use by allocating everything from standard library - - Control every byte of memory inside the library -- Font handling control ranging from/to - - Use your own font implementation for everything - - Use this libraries internal font baking and handling API -- Drawing output control ranging from/to - - Simple shapes for more high level APIs which already have drawing capabilities - - Hardware accessible anti-aliased vertex buffer output -- Customizable colors and properties ranging from/to - - Simple changes to color by filling a simple color table - - Complete control with ability to use skinning to decorate widgets -- Bendable UI library with widget ranging from/to - - Basic widgets like buttons, checkboxes, slider, ... - - Advanced widget like abstract comboboxes, contextual menus,... -- Compile time configuration to only compile what you need - - Subset which can be used if you do not want to link or use the standard library -- Can be easily modified to only update on user input instead of frame updates -## Usage -This library is self contained in one single header file and can be used either -in header only mode or in implementation mode. The header only mode is used -by default when included and allows including this header in other headers -and does not contain the actual implementation.

-The implementation mode requires to define the preprocessor macro -NK_IMPLEMENTATION in *one* .c/.cpp file before #including this file, e.g.: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~C - #define NK_IMPLEMENTATION - #include "nuklear.h" -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Also optionally define the symbols listed in the section "OPTIONAL DEFINES" -below in header and implementation mode if you want to use additional functionality -or need more control over the library. -!!! WARNING - Every time nuklear is included define the same compiler flags. This very important not doing so could lead to compiler errors or even worse stack corruptions. -### Flags -Flag | Description ---------------------------------|------------------------------------------ -NK_PRIVATE | If defined declares all functions as static, so they can only be accessed inside the file that contains the implementation -NK_INCLUDE_FIXED_TYPES | If defined it will include header `` for fixed sized types otherwise nuklear tries to select the correct type. If that fails it will throw a compiler error and you have to select the correct types yourself. -NK_INCLUDE_DEFAULT_ALLOCATOR | If defined it will include header `` and provide additional functions to use this library without caring for memory allocation control and therefore ease memory management. -NK_INCLUDE_STANDARD_IO | If defined it will include header `` and provide additional functions depending on file loading. -NK_INCLUDE_STANDARD_VARARGS | If defined it will include header and provide additional functions depending on file loading. -NK_INCLUDE_VERTEX_BUFFER_OUTPUT | Defining this adds a vertex draw command list backend to this library, which allows you to convert queue commands into vertex draw commands. This is mainly if you need a hardware accessible format for OpenGL, DirectX, Vulkan, Metal,... -NK_INCLUDE_FONT_BAKING | Defining this adds `stb_truetype` and `stb_rect_pack` implementation to this library and provides font baking and rendering. If you already have font handling or do not want to use this font handler you don't have to define it. -NK_INCLUDE_DEFAULT_FONT | Defining this adds the default font: ProggyClean.ttf into this library which can be loaded into a font atlas and allows using this library without having a truetype font -NK_INCLUDE_COMMAND_USERDATA | Defining this adds a userdata pointer into each command. Can be useful for example if you want to provide custom shaders depending on the used widget. Can be combined with the style structures. -NK_BUTTON_TRIGGER_ON_RELEASE | Different platforms require button clicks occurring either on buttons being pressed (up to down) or released (down to up). By default this library will react on buttons being pressed, but if you define this it will only trigger if a button is released. -NK_ZERO_COMMAND_MEMORY | Defining this will zero out memory for each drawing command added to a drawing queue (inside nk_command_buffer_push). Zeroing command memory is very useful for fast checking (using memcmp) if command buffers are equal and avoid drawing frames when nothing on screen has changed since previous frame. -NK_UINT_DRAW_INDEX | Defining this will set the size of vertex index elements when using NK_VERTEX_BUFFER_OUTPUT to 32bit instead of the default of 16bit -NK_KEYSTATE_BASED_INPUT | Define this if your backend uses key state for each frame rather than key press/release events -!!! WARNING - The following flags will pull in the standard C library: - - NK_INCLUDE_DEFAULT_ALLOCATOR - - NK_INCLUDE_STANDARD_IO - - NK_INCLUDE_STANDARD_VARARGS -!!! WARNING - The following flags if defined need to be defined for both header and implementation: - - NK_INCLUDE_FIXED_TYPES - - NK_INCLUDE_DEFAULT_ALLOCATOR - - NK_INCLUDE_STANDARD_VARARGS - - NK_INCLUDE_VERTEX_BUFFER_OUTPUT - - NK_INCLUDE_FONT_BAKING - - NK_INCLUDE_DEFAULT_FONT - - NK_INCLUDE_STANDARD_VARARGS - - NK_INCLUDE_COMMAND_USERDATA - - NK_UINT_DRAW_INDEX -### Constants -Define | Description ---------------------------------|--------------------------------------- -NK_BUFFER_DEFAULT_INITIAL_SIZE | Initial buffer size allocated by all buffers while using the default allocator functions included by defining NK_INCLUDE_DEFAULT_ALLOCATOR. If you don't want to allocate the default 4k memory then redefine it. -NK_MAX_NUMBER_BUFFER | Maximum buffer size for the conversion buffer between float and string Under normal circumstances this should be more than sufficient. -NK_INPUT_MAX | Defines the max number of bytes which can be added as text input in one frame. Under normal circumstances this should be more than sufficient. -!!! WARNING - The following constants if defined need to be defined for both header and implementation: - - NK_MAX_NUMBER_BUFFER - - NK_BUFFER_DEFAULT_INITIAL_SIZE - - NK_INPUT_MAX -### Dependencies -Function | Description -------------|--------------------------------------------------------------- -NK_ASSERT | If you don't define this, nuklear will use with assert(). -NK_MEMSET | You can define this to 'memset' or your own memset implementation replacement. If not nuklear will use its own version. -NK_MEMCPY | You can define this to 'memcpy' or your own memcpy implementation replacement. If not nuklear will use its own version. -NK_SQRT | You can define this to 'sqrt' or your own sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version. -NK_SIN | You can define this to 'sinf' or your own sine implementation replacement. If not nuklear will use its own approximation implementation. -NK_COS | You can define this to 'cosf' or your own cosine implementation replacement. If not nuklear will use its own approximation implementation. -NK_STRTOD | You can define this to `strtod` or your own string to double conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!). -NK_DTOA | You can define this to `dtoa` or your own double to string conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!). -NK_VSNPRINTF| If you define `NK_INCLUDE_STANDARD_VARARGS` as well as `NK_INCLUDE_STANDARD_IO` and want to be safe define this to `vsnprintf` on compilers supporting later versions of C or C++. By default nuklear will check for your stdlib version in C as well as compiler version in C++. if `vsnprintf` is available it will define it to `vsnprintf` directly. If not defined and if you have older versions of C or C++ it will be defined to `vsprintf` which is unsafe. -!!! WARNING - The following dependencies will pull in the standard C library if not redefined: - - NK_ASSERT -!!! WARNING - The following dependencies if defined need to be defined for both header and implementation: - - NK_ASSERT -!!! WARNING - The following dependencies if defined need to be defined only for the implementation part: - - NK_MEMSET - - NK_MEMCPY - - NK_SQRT - - NK_SIN - - NK_COS - - NK_STRTOD - - NK_DTOA - - NK_VSNPRINTF -## Example -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -// init gui state -enum {EASY, HARD}; -static int op = EASY; -static float value = 0.6f; -static int i = 20; -struct nk_context ctx; -nk_init_fixed(&ctx, calloc(1, MAX_MEMORY), MAX_MEMORY, &font); -if (nk_begin(&ctx, "Show", nk_rect(50, 50, 220, 220), - NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_CLOSABLE)) { - // fixed widget pixel width - nk_layout_row_static(&ctx, 30, 80, 1); - if (nk_button_label(&ctx, "button")) { - // event handling - } - // fixed widget window ratio width - nk_layout_row_dynamic(&ctx, 30, 2); - if (nk_option_label(&ctx, "easy", op == EASY)) op = EASY; - if (nk_option_label(&ctx, "hard", op == HARD)) op = HARD; - // custom widget pixel width - nk_layout_row_begin(&ctx, NK_STATIC, 30, 2); - { - nk_layout_row_push(&ctx, 50); - nk_label(&ctx, "Volume:", NK_TEXT_LEFT); - nk_layout_row_push(&ctx, 110); - nk_slider_float(&ctx, 0, &value, 1.0f, 0.1f); - } - nk_layout_row_end(&ctx); -} -nk_end(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -![](https://cloud.githubusercontent.com/assets/8057201/10187981/584ecd68-675c-11e5-897c-822ef534a876.png) -## API -### Context -Contexts are the main entry point and the majestro of nuklear and contain all required state. -They are used for window, memory, input, style, stack, commands and time management and need -to be passed into all nuklear GUI specific functions. -#### Usage -To use a context it first has to be initialized which can be achieved by calling -one of either `nk_init_default`, `nk_init_fixed`, `nk_init`, `nk_init_custom`. -Each takes in a font handle and a specific way of handling memory. Memory control -hereby ranges from standard library to just specifying a fixed sized block of memory -which nuklear has to manage itself from. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - // [...] - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description ---------------------|------------------------------------------------------- -__nk_init_default__ | Initializes context with standard library memory allocation (malloc,free) -__nk_init_fixed__ | Initializes context from single fixed size memory block -__nk_init__ | Initializes context with memory allocator callbacks for alloc and free -__nk_init_custom__ | Initializes context from two buffers. One for draw commands the other for window/panel/table allocations -__nk_clear__ | Called at the end of the frame to reset and prepare the context for the next frame -__nk_free__ | Shutdown and free all memory allocated inside the context -__nk_set_user_data__| Utility function to pass user data to draw command -#### nk_init_default -Initializes a `nk_context` struct with a default standard library allocator. -Should be used if you don't want to be bothered with memory management in nuklear. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_init_default(struct nk_context *ctx, const struct nk_user_font *font); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|--------------------------------------------------------------- -__ctx__ | Must point to an either stack or heap allocated `nk_context` struct -__font__ | Must point to a previously initialized font handle for more info look at font documentation -Returns either `false(0)` on failure or `true(1)` on success. -#### nk_init_fixed -Initializes a `nk_context` struct from single fixed size memory block -Should be used if you want complete control over nuklear's memory management. -Especially recommended for system with little memory or systems with virtual memory. -For the later case you can just allocate for example 16MB of virtual memory -and only the required amount of memory will actually be committed. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_init_fixed(struct nk_context *ctx, void *memory, nk_size size, const struct nk_user_font *font); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Warning - make sure the passed memory block is aligned correctly for `nk_draw_commands`. -Parameter | Description -------------|-------------------------------------------------------------- -__ctx__ | Must point to an either stack or heap allocated `nk_context` struct -__memory__ | Must point to a previously allocated memory block -__size__ | Must contain the total size of __memory__ -__font__ | Must point to a previously initialized font handle for more info look at font documentation -Returns either `false(0)` on failure or `true(1)` on success. -#### nk_init -Initializes a `nk_context` struct with memory allocation callbacks for nuklear to allocate -memory from. Used internally for `nk_init_default` and provides a kitchen sink allocation -interface to nuklear. Can be useful for cases like monitoring memory consumption. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_init(struct nk_context *ctx, struct nk_allocator *alloc, const struct nk_user_font *font); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|--------------------------------------------------------------- -__ctx__ | Must point to an either stack or heap allocated `nk_context` struct -__alloc__ | Must point to a previously allocated memory allocator -__font__ | Must point to a previously initialized font handle for more info look at font documentation -Returns either `false(0)` on failure or `true(1)` on success. -#### nk_init_custom -Initializes a `nk_context` struct from two different either fixed or growing -buffers. The first buffer is for allocating draw commands while the second buffer is -used for allocating windows, panels and state tables. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_init_custom(struct nk_context *ctx, struct nk_buffer *cmds, struct nk_buffer *pool, const struct nk_user_font *font); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|--------------------------------------------------------------- -__ctx__ | Must point to an either stack or heap allocated `nk_context` struct -__cmds__ | Must point to a previously initialized memory buffer either fixed or dynamic to store draw commands into -__pool__ | Must point to a previously initialized memory buffer either fixed or dynamic to store windows, panels and tables -__font__ | Must point to a previously initialized font handle for more info look at font documentation -Returns either `false(0)` on failure or `true(1)` on success. -#### nk_clear -Resets the context state at the end of the frame. This includes mostly -garbage collector tasks like removing windows or table not called and therefore -used anymore. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_clear(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -#### nk_free -Frees all memory allocated by nuklear. Not needed if context was -initialized with `nk_init_fixed`. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_free(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -#### nk_set_user_data -Sets the currently passed userdata passed down into each draw command. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_set_user_data(struct nk_context *ctx, nk_handle data); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|-------------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__data__ | Handle with either pointer or index to be passed into every draw commands -### Input -The input API is responsible for holding the current input state composed of -mouse, key and text input states. -It is worth noting that no direct OS or window handling is done in nuklear. -Instead all input state has to be provided by platform specific code. This on one hand -expects more work from the user and complicates usage but on the other hand -provides simple abstraction over a big number of platforms, libraries and other -already provided functionality. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -nk_input_begin(&ctx); -while (GetEvent(&evt)) { - if (evt.type == MOUSE_MOVE) - nk_input_motion(&ctx, evt.motion.x, evt.motion.y); - else if (evt.type == [...]) { - // [...] - } -} nk_input_end(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Usage -Input state needs to be provided to nuklear by first calling `nk_input_begin` -which resets internal state like delta mouse position and button transitions. -After `nk_input_begin` all current input state needs to be provided. This includes -mouse motion, button and key pressed and released, text input and scrolling. -Both event- or state-based input handling are supported by this API -and should work without problems. Finally after all input state has been -mirrored `nk_input_end` needs to be called to finish input process. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - Event evt; - nk_input_begin(&ctx); - while (GetEvent(&evt)) { - if (evt.type == MOUSE_MOVE) - nk_input_motion(&ctx, evt.motion.x, evt.motion.y); - else if (evt.type == [...]) { - // [...] - } - } - nk_input_end(&ctx); - // [...] - nk_clear(&ctx); -} nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description ---------------------|------------------------------------------------------- -__nk_input_begin__ | Begins the input mirroring process. Needs to be called before all other `nk_input_xxx` calls -__nk_input_motion__ | Mirrors mouse cursor position -__nk_input_key__ | Mirrors key state with either pressed or released -__nk_input_button__ | Mirrors mouse button state with either pressed or released -__nk_input_scroll__ | Mirrors mouse scroll values -__nk_input_char__ | Adds a single ASCII text character into an internal text buffer -__nk_input_glyph__ | Adds a single multi-byte UTF-8 character into an internal text buffer -__nk_input_unicode__| Adds a single unicode rune into an internal text buffer -__nk_input_end__ | Ends the input mirroring process by calculating state changes. Don't call any `nk_input_xxx` function referenced above after this call -#### nk_input_begin -Begins the input mirroring process by resetting text, scroll -mouse, previous mouse position and movement as well as key state transitions, -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_begin(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -#### nk_input_motion -Mirrors current mouse position to nuklear -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_motion(struct nk_context *ctx, int x, int y); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__x__ | Must hold an integer describing the current mouse cursor x-position -__y__ | Must hold an integer describing the current mouse cursor y-position -#### nk_input_key -Mirrors the state of a specific key to nuklear -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_key(struct nk_context*, enum nk_keys key, int down); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__key__ | Must be any value specified in enum `nk_keys` that needs to be mirrored -__down__ | Must be 0 for key is up and 1 for key is down -#### nk_input_button -Mirrors the state of a specific mouse button to nuklear -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_button(struct nk_context *ctx, enum nk_buttons btn, int x, int y, int down); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__btn__ | Must be any value specified in enum `nk_buttons` that needs to be mirrored -__x__ | Must contain an integer describing mouse cursor x-position on click up/down -__y__ | Must contain an integer describing mouse cursor y-position on click up/down -__down__ | Must be 0 for key is up and 1 for key is down -#### nk_input_scroll -Copies the last mouse scroll value to nuklear. Is generally -a scroll value. So does not have to come from mouse and could also originate -TODO finish this sentence -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_scroll(struct nk_context *ctx, struct nk_vec2 val); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__val__ | vector with both X- as well as Y-scroll value -#### nk_input_char -Copies a single ASCII character into an internal text buffer -This is basically a helper function to quickly push ASCII characters into -nuklear. -!!! Note - Stores up to NK_INPUT_MAX bytes between `nk_input_begin` and `nk_input_end`. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_char(struct nk_context *ctx, char c); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__c__ | Must be a single ASCII character preferable one that can be printed -#### nk_input_glyph -Converts an encoded unicode rune into UTF-8 and copies the result into an -internal text buffer. -!!! Note - Stores up to NK_INPUT_MAX bytes between `nk_input_begin` and `nk_input_end`. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_glyph(struct nk_context *ctx, const nk_glyph g); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__g__ | UTF-32 unicode codepoint -#### nk_input_unicode -Converts a unicode rune into UTF-8 and copies the result -into an internal text buffer. -!!! Note - Stores up to NK_INPUT_MAX bytes between `nk_input_begin` and `nk_input_end`. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_unicode(struct nk_context*, nk_rune rune); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -__rune__ | UTF-32 unicode codepoint -#### nk_input_end -End the input mirroring process by resetting mouse grabbing -state to ensure the mouse cursor is not grabbed indefinitely. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_input_end(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to a previously initialized `nk_context` struct -### Drawing -This library was designed to be render backend agnostic so it does -not draw anything to screen directly. Instead all drawn shapes, widgets -are made of, are buffered into memory and make up a command queue. -Each frame therefore fills the command buffer with draw commands -that then need to be executed by the user and his own render backend. -After that the command buffer needs to be cleared and a new frame can be -started. It is probably important to note that the command buffer is the main -drawing API and the optional vertex buffer API only takes this format and -converts it into a hardware accessible format. -#### Usage -To draw all draw commands accumulated over a frame you need your own render -backend able to draw a number of 2D primitives. This includes at least -filled and stroked rectangles, circles, text, lines, triangles and scissors. -As soon as this criterion is met you can iterate over each draw command -and execute each draw command in a interpreter like fashion: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -const struct nk_command *cmd = 0; -nk_foreach(cmd, &ctx) { - switch (cmd->type) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case //...: - //[...] - } -} -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In program flow context draw commands need to be executed after input has been -gathered and the complete UI with windows and their contained widgets have -been executed and before calling `nk_clear` which frees all previously -allocated draw commands. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - Event evt; - nk_input_begin(&ctx); - while (GetEvent(&evt)) { - if (evt.type == MOUSE_MOVE) - nk_input_motion(&ctx, evt.motion.x, evt.motion.y); - else if (evt.type == [...]) { - [...] - } - } - nk_input_end(&ctx); - // - // [...] - // - const struct nk_command *cmd = 0; - nk_foreach(cmd, &ctx) { - switch (cmd->type) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case ...: - // [...] - } - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -You probably noticed that you have to draw all of the UI each frame which is -quite wasteful. While the actual UI updating loop is quite fast rendering -without actually needing it is not. So there are multiple things you could do. -First is only update on input. This of course is only an option if your -application only depends on the UI and does not require any outside calculations. -If you actually only update on input make sure to update the UI two times each -frame and call `nk_clear` directly after the first pass and only draw in -the second pass. In addition it is recommended to also add additional timers -to make sure the UI is not drawn more than a fixed number of frames per second. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - // [...wait for input ] - // [...do two UI passes ...] - do_ui(...) - nk_clear(&ctx); - do_ui(...) - // - // draw - const struct nk_command *cmd = 0; - nk_foreach(cmd, &ctx) { - switch (cmd->type) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case ...: - //[...] - } - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The second probably more applicable trick is to only draw if anything changed. -It is not really useful for applications with continuous draw loop but -quite useful for desktop applications. To actually get nuklear to only -draw on changes you first have to define `NK_ZERO_COMMAND_MEMORY` and -allocate a memory buffer that will store each unique drawing output. -After each frame you compare the draw command memory inside the library -with your allocated buffer by memcmp. If memcmp detects differences -you have to copy the command buffer into the allocated buffer -and then draw like usual (this example uses fixed memory but you could -use dynamically allocated memory). -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -//[... other defines ...] -#define NK_ZERO_COMMAND_MEMORY -#include "nuklear.h" -// -// setup context -struct nk_context ctx; -void *last = calloc(1,64*1024); -void *buf = calloc(1,64*1024); -nk_init_fixed(&ctx, buf, 64*1024); -// -// loop -while (1) { - // [...input...] - // [...ui...] - void *cmds = nk_buffer_memory(&ctx.memory); - if (memcmp(cmds, last, ctx.memory.allocated)) { - memcpy(last,cmds,ctx.memory.allocated); - const struct nk_command *cmd = 0; - nk_foreach(cmd, &ctx) { - switch (cmd->type) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case ...: - // [...] - } - } - } - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Finally while using draw commands makes sense for higher abstracted platforms like -X11 and Win32 or drawing libraries it is often desirable to use graphics -hardware directly. Therefore it is possible to just define -`NK_INCLUDE_VERTEX_BUFFER_OUTPUT` which includes optional vertex output. -To access the vertex output you first have to convert all draw commands into -vertexes by calling `nk_convert` which takes in your preferred vertex format. -After successfully converting all draw commands just iterate over and execute all -vertex draw commands: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -// fill configuration -struct your_vertex -{ - float pos[2]; // important to keep it to 2 floats - float uv[2]; - unsigned char col[4]; -}; -struct nk_convert_config cfg = {}; -static const struct nk_draw_vertex_layout_element vertex_layout[] = { - {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct your_vertex, pos)}, - {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct your_vertex, uv)}, - {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct your_vertex, col)}, - {NK_VERTEX_LAYOUT_END} -}; -cfg.shape_AA = NK_ANTI_ALIASING_ON; -cfg.line_AA = NK_ANTI_ALIASING_ON; -cfg.vertex_layout = vertex_layout; -cfg.vertex_size = sizeof(struct your_vertex); -cfg.vertex_alignment = NK_ALIGNOF(struct your_vertex); -cfg.circle_segment_count = 22; -cfg.curve_segment_count = 22; -cfg.arc_segment_count = 22; -cfg.global_alpha = 1.0f; -cfg.null = dev->null; -// -// setup buffers and convert -struct nk_buffer cmds, verts, idx; -nk_buffer_init_default(&cmds); -nk_buffer_init_default(&verts); -nk_buffer_init_default(&idx); -nk_convert(&ctx, &cmds, &verts, &idx, &cfg); -// -// draw -nk_draw_foreach(cmd, &ctx, &cmds) { -if (!cmd->elem_count) continue; - //[...] -} -nk_buffer_free(&cms); -nk_buffer_free(&verts); -nk_buffer_free(&idx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description ---------------------|------------------------------------------------------- -__nk__begin__ | Returns the first draw command in the context draw command list to be drawn -__nk__next__ | Increments the draw command iterator to the next command inside the context draw command list -__nk_foreach__ | Iterates over each draw command inside the context draw command list -__nk_convert__ | Converts from the abstract draw commands list into a hardware accessible vertex format -__nk_draw_begin__ | Returns the first vertex command in the context vertex draw list to be executed -__nk__draw_next__ | Increments the vertex command iterator to the next command inside the context vertex command list -__nk__draw_end__ | Returns the end of the vertex draw list -__nk_draw_foreach__ | Iterates over each vertex draw command inside the vertex draw list -#### nk__begin -Returns a draw command list iterator to iterate all draw -commands accumulated over one frame. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -const struct nk_command* nk__begin(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | must point to an previously initialized `nk_context` struct at the end of a frame -Returns draw command pointer pointing to the first command inside the draw command list -#### nk__next -Returns draw command pointer pointing to the next command inside the draw command list -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -const struct nk_command* nk__next(struct nk_context*, const struct nk_command*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -__cmd__ | Must point to an previously a draw command either returned by `nk__begin` or `nk__next` -Returns draw command pointer pointing to the next command inside the draw command list -#### nk_foreach -Iterates over each draw command inside the context draw command list -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -#define nk_foreach(c, ctx) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -__cmd__ | Command pointer initialized to NULL -Iterates over each draw command inside the context draw command list -#### nk_convert -Converts all internal draw commands into vertex draw commands and fills -three buffers with vertexes, vertex draw commands and vertex indices. The vertex format -as well as some other configuration values have to be configured by filling out a -`nk_convert_config` struct. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -nk_flags nk_convert(struct nk_context *ctx, struct nk_buffer *cmds, - struct nk_buffer *vertices, struct nk_buffer *elements, const struct nk_convert_config*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -__cmds__ | Must point to a previously initialized buffer to hold converted vertex draw commands -__vertices__| Must point to a previously initialized buffer to hold all produced vertices -__elements__| Must point to a previously initialized buffer to hold all produced vertex indices -__config__ | Must point to a filled out `nk_config` struct to configure the conversion process -Returns one of enum nk_convert_result error codes -Parameter | Description ---------------------------------|----------------------------------------------------------- -NK_CONVERT_SUCCESS | Signals a successful draw command to vertex buffer conversion -NK_CONVERT_INVALID_PARAM | An invalid argument was passed in the function call -NK_CONVERT_COMMAND_BUFFER_FULL | The provided buffer for storing draw commands is full or failed to allocate more memory -NK_CONVERT_VERTEX_BUFFER_FULL | The provided buffer for storing vertices is full or failed to allocate more memory -NK_CONVERT_ELEMENT_BUFFER_FULL | The provided buffer for storing indices is full or failed to allocate more memory -#### nk__draw_begin -Returns a draw vertex command buffer iterator to iterate over the vertex draw command buffer -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -const struct nk_draw_command* nk__draw_begin(const struct nk_context*, const struct nk_buffer*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer -Returns vertex draw command pointer pointing to the first command inside the vertex draw command buffer -#### nk__draw_end -Returns the vertex draw command at the end of the vertex draw command buffer -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -const struct nk_draw_command* nk__draw_end(const struct nk_context *ctx, const struct nk_buffer *buf); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer -Returns vertex draw command pointer pointing to the end of the last vertex draw command inside the vertex draw command buffer -#### nk__draw_next -Increments the vertex draw command buffer iterator -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -const struct nk_draw_command* nk__draw_next(const struct nk_draw_command*, const struct nk_buffer*, const struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__cmd__ | Must point to an previously either by `nk__draw_begin` or `nk__draw_next` returned vertex draw command -__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -Returns vertex draw command pointer pointing to the end of the last vertex draw command inside the vertex draw command buffer -#### nk_draw_foreach -Iterates over each vertex draw command inside a vertex draw command buffer -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -#define nk_draw_foreach(cmd,ctx, b) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__cmd__ | `nk_draw_command`iterator set to NULL -__buf__ | Must point to an previously by `nk_convert` filled out vertex draw command buffer -__ctx__ | Must point to an previously initialized `nk_context` struct at the end of a frame -### Window -Windows are the main persistent state used inside nuklear and are life time -controlled by simply "retouching" (i.e. calling) each window each frame. -All widgets inside nuklear can only be added inside the function pair `nk_begin_xxx` -and `nk_end`. Calling any widgets outside these two functions will result in an -assert in debug or no state change in release mode.

-Each window holds frame persistent state like position, size, flags, state tables, -and some garbage collected internal persistent widget state. Each window -is linked into a window stack list which determines the drawing and overlapping -order. The topmost window thereby is the currently active window.

-To change window position inside the stack occurs either automatically by -user input by being clicked on or programmatically by calling `nk_window_focus`. -Windows by default are visible unless explicitly being defined with flag -`NK_WINDOW_HIDDEN`, the user clicked the close button on windows with flag -`NK_WINDOW_CLOSABLE` or if a window was explicitly hidden by calling -`nk_window_show`. To explicitly close and destroy a window call `nk_window_close`.

-#### Usage -To create and keep a window you have to call one of the two `nk_begin_xxx` -functions to start window declarations and `nk_end` at the end. Furthermore it -is recommended to check the return value of `nk_begin_xxx` and only process -widgets inside the window if the value is not 0. Either way you have to call -`nk_end` at the end of window declarations. Furthermore, do not attempt to -nest `nk_begin_xxx` calls which will hopefully result in an assert or if not -in a segmentation fault. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -if (nk_begin_xxx(...) { - // [... widgets ...] -} -nk_end(ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In the grand concept window and widget declarations need to occur after input -handling and before drawing to screen. Not doing so can result in higher -latency or at worst invalid behavior. Furthermore make sure that `nk_clear` -is called at the end of the frame. While nuklear's default platform backends -already call `nk_clear` for you if you write your own backend not calling -`nk_clear` can cause asserts or even worse undefined behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - Event evt; - nk_input_begin(&ctx); - while (GetEvent(&evt)) { - if (evt.type == MOUSE_MOVE) - nk_input_motion(&ctx, evt.motion.x, evt.motion.y); - else if (evt.type == [...]) { - nk_input_xxx(...); - } - } - nk_input_end(&ctx); - if (nk_begin_xxx(...) { - //[...] - } - nk_end(ctx); - const struct nk_command *cmd = 0; - nk_foreach(cmd, &ctx) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case //...: - //[...] - } - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description -------------------------------------|---------------------------------------- -nk_begin | Starts a new window; needs to be called every frame for every window (unless hidden) or otherwise the window gets removed -nk_begin_titled | Extended window start with separated title and identifier to allow multiple windows with same name but not title -nk_end | Needs to be called at the end of the window building process to process scaling, scrollbars and general cleanup -nk_window_find | Finds and returns the window with give name -nk_window_get_bounds | Returns a rectangle with screen position and size of the currently processed window. -nk_window_get_position | Returns the position of the currently processed window -nk_window_get_size | Returns the size with width and height of the currently processed window -nk_window_get_width | Returns the width of the currently processed window -nk_window_get_height | Returns the height of the currently processed window -nk_window_get_panel | Returns the underlying panel which contains all processing state of the current window -nk_window_get_content_region | Returns the position and size of the currently visible and non-clipped space inside the currently processed window -nk_window_get_content_region_min | Returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window -nk_window_get_content_region_max | Returns the upper rectangle position of the currently visible and non-clipped space inside the currently processed window -nk_window_get_content_region_size | Returns the size of the currently visible and non-clipped space inside the currently processed window -nk_window_get_canvas | Returns the draw command buffer. Can be used to draw custom widgets -nk_window_get_scroll | Gets the scroll offset of the current window -nk_window_has_focus | Returns if the currently processed window is currently active -nk_window_is_collapsed | Returns if the window with given name is currently minimized/collapsed -nk_window_is_closed | Returns if the currently processed window was closed -nk_window_is_hidden | Returns if the currently processed window was hidden -nk_window_is_active | Same as nk_window_has_focus for some reason -nk_window_is_hovered | Returns if the currently processed window is currently being hovered by mouse -nk_window_is_any_hovered | Return if any window currently hovered -nk_item_is_any_active | Returns if any window or widgets is currently hovered or active -nk_window_set_bounds | Updates position and size of the currently processed window -nk_window_set_position | Updates position of the currently process window -nk_window_set_size | Updates the size of the currently processed window -nk_window_set_focus | Set the currently processed window as active window -nk_window_set_scroll | Sets the scroll offset of the current window -nk_window_close | Closes the window with given window name which deletes the window at the end of the frame -nk_window_collapse | Collapses the window with given window name -nk_window_collapse_if | Collapses the window with given window name if the given condition was met -nk_window_show | Hides a visible or reshows a hidden window -nk_window_show_if | Hides/shows a window depending on condition -#### nk_panel_flags -Flag | Description -----------------------------|---------------------------------------- -NK_WINDOW_BORDER | Draws a border around the window to visually separate window from the background -NK_WINDOW_MOVABLE | The movable flag indicates that a window can be moved by user input or by dragging the window header -NK_WINDOW_SCALABLE | The scalable flag indicates that a window can be scaled by user input by dragging a scaler icon at the button of the window -NK_WINDOW_CLOSABLE | Adds a closable icon into the header -NK_WINDOW_MINIMIZABLE | Adds a minimize icon into the header -NK_WINDOW_NO_SCROLLBAR | Removes the scrollbar from the window -NK_WINDOW_TITLE | Forces a header at the top at the window showing the title -NK_WINDOW_SCROLL_AUTO_HIDE | Automatically hides the window scrollbar if no user interaction: also requires delta time in `nk_context` to be set each frame -NK_WINDOW_BACKGROUND | Always keep window in the background -NK_WINDOW_SCALE_LEFT | Puts window scaler in the left-bottom corner instead right-bottom -NK_WINDOW_NO_INPUT | Prevents window of scaling, moving or getting focus -#### nk_collapse_states -State | Description -----------------|----------------------------------------------------------- -__NK_MINIMIZED__| UI section is collased and not visible until maximized -__NK_MAXIMIZED__| UI section is extended and visible until minimized -

-#### nk_begin -Starts a new window; needs to be called every frame for every -window (unless hidden) or otherwise the window gets removed -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_begin(struct nk_context *ctx, const char *title, struct nk_rect bounds, nk_flags flags); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__title__ | Window title and identifier. Needs to be persistent over frames to identify the window -__bounds__ | Initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame -__flags__ | Window flags defined in the nk_panel_flags section with a number of different window behaviors -Returns `true(1)` if the window can be filled up with widgets from this point -until `nk_end` or `false(0)` otherwise for example if minimized -#### nk_begin_titled -Extended window start with separated title and identifier to allow multiple -windows with same title but not name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_begin_titled(struct nk_context *ctx, const char *name, const char *title, struct nk_rect bounds, nk_flags flags); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Window identifier. Needs to be persistent over frames to identify the window -__title__ | Window title displayed inside header if flag `NK_WINDOW_TITLE` or either `NK_WINDOW_CLOSABLE` or `NK_WINDOW_MINIMIZED` was set -__bounds__ | Initial position and window size. However if you do not define `NK_WINDOW_SCALABLE` or `NK_WINDOW_MOVABLE` you can set window position and size every frame -__flags__ | Window flags defined in the nk_panel_flags section with a number of different window behaviors -Returns `true(1)` if the window can be filled up with widgets from this point -until `nk_end` or `false(0)` otherwise for example if minimized -#### nk_end -Needs to be called at the end of the window building process to process scaling, scrollbars and general cleanup. -All widget calls after this functions will result in asserts or no state changes -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_end(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -#### nk_window_find -Finds and returns a window from passed name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_window *nk_window_find(struct nk_context *ctx, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Window identifier -Returns a `nk_window` struct pointing to the identified window or NULL if -no window with the given name was found -#### nk_window_get_bounds -Returns a rectangle with screen position and size of the currently processed window -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_rect nk_window_get_bounds(const struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns a `nk_rect` struct with window upper left window position and size -#### nk_window_get_position -Returns the position of the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_window_get_position(const struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns a `nk_vec2` struct with window upper left position -#### nk_window_get_size -Returns the size with width and height of the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_window_get_size(const struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns a `nk_vec2` struct with window width and height -#### nk_window_get_width -Returns the width of the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -float nk_window_get_width(const struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns the current window width -#### nk_window_get_height -Returns the height of the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -float nk_window_get_height(const struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns the current window height -#### nk_window_get_panel -Returns the underlying panel which contains all processing state of the current window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -!!! WARNING - Do not keep the returned panel pointer around, it is only valid until `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_panel* nk_window_get_panel(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns a pointer to window internal `nk_panel` state. -#### nk_window_get_content_region -Returns the position and size of the currently visible and non-clipped space -inside the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_rect nk_window_get_content_region(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `nk_rect` struct with screen position and size (no scrollbar offset) -of the visible space inside the current window -#### nk_window_get_content_region_min -Returns the upper left position of the currently visible and non-clipped -space inside the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_window_get_content_region_min(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -returns `nk_vec2` struct with upper left screen position (no scrollbar offset) -of the visible space inside the current window -#### nk_window_get_content_region_max -Returns the lower right screen position of the currently visible and -non-clipped space inside the currently processed window. -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_window_get_content_region_max(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `nk_vec2` struct with lower right screen position (no scrollbar offset) -of the visible space inside the current window -#### nk_window_get_content_region_size -Returns the size of the currently visible and non-clipped space inside the -currently processed window -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_window_get_content_region_size(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `nk_vec2` struct with size the visible space inside the current window -#### nk_window_get_canvas -Returns the draw command buffer. Can be used to draw custom widgets -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -!!! WARNING - Do not keep the returned command buffer pointer around it is only valid until `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_command_buffer* nk_window_get_canvas(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns a pointer to window internal `nk_command_buffer` struct used as -drawing canvas. Can be used to do custom drawing. -#### nk_window_get_scroll -Gets the scroll offset for the current window -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_get_scroll(struct nk_context *ctx, nk_uint *offset_x, nk_uint *offset_y); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description --------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__offset_x__ | A pointer to the x offset output (or NULL to ignore) -__offset_y__ | A pointer to the y offset output (or NULL to ignore) -#### nk_window_has_focus -Returns if the currently processed window is currently active -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_has_focus(const struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `false(0)` if current window is not active or `true(1)` if it is -#### nk_window_is_hovered -Return if the current window is being hovered -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_is_hovered(struct nk_context *ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `true(1)` if current window is hovered or `false(0)` otherwise -#### nk_window_is_collapsed -Returns if the window with given name is currently minimized/collapsed -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_is_collapsed(struct nk_context *ctx, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of window you want to check if it is collapsed -Returns `true(1)` if current window is minimized and `false(0)` if window not -found or is not minimized -#### nk_window_is_closed -Returns if the window with given name was closed by calling `nk_close` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_is_closed(struct nk_context *ctx, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of window you want to check if it is closed -Returns `true(1)` if current window was closed or `false(0)` window not found or not closed -#### nk_window_is_hidden -Returns if the window with given name is hidden -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_is_hidden(struct nk_context *ctx, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of window you want to check if it is hidden -Returns `true(1)` if current window is hidden or `false(0)` window not found or visible -#### nk_window_is_active -Same as nk_window_has_focus for some reason -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_is_active(struct nk_context *ctx, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of window you want to check if it is active -Returns `true(1)` if current window is active or `false(0)` window not found or not active -#### nk_window_is_any_hovered -Returns if the any window is being hovered -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_window_is_any_hovered(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `true(1)` if any window is hovered or `false(0)` otherwise -#### nk_item_is_any_active -Returns if the any window is being hovered or any widget is currently active. -Can be used to decide if input should be processed by UI or your specific input handling. -Example could be UI and 3D camera to move inside a 3D space. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_item_is_any_active(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -Returns `true(1)` if any window is hovered or any item is active or `false(0)` otherwise -#### nk_window_set_bounds -Updates position and size of window with passed in name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_set_bounds(struct nk_context*, const char *name, struct nk_rect bounds); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to modify both position and size -__bounds__ | Must point to a `nk_rect` struct with the new position and size -#### nk_window_set_position -Updates position of window with passed name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_set_position(struct nk_context*, const char *name, struct nk_vec2 pos); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to modify both position -__pos__ | Must point to a `nk_vec2` struct with the new position -#### nk_window_set_size -Updates size of window with passed in name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_set_size(struct nk_context*, const char *name, struct nk_vec2); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to modify both window size -__size__ | Must point to a `nk_vec2` struct with new window size -#### nk_window_set_focus -Sets the window with given name as active -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_set_focus(struct nk_context*, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to set focus on -#### nk_window_set_scroll -Sets the scroll offset for the current window -!!! WARNING - Only call this function between calls `nk_begin_xxx` and `nk_end` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_set_scroll(struct nk_context *ctx, nk_uint offset_x, nk_uint offset_y); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description --------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__offset_x__ | The x offset to scroll to -__offset_y__ | The y offset to scroll to -#### nk_window_close -Closes a window and marks it for being freed at the end of the frame -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_close(struct nk_context *ctx, const char *name); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to close -#### nk_window_collapse -Updates collapse state of a window with given name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_collapse(struct nk_context*, const char *name, enum nk_collapse_states state); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to close -__state__ | value out of nk_collapse_states section -#### nk_window_collapse_if -Updates collapse state of a window with given name if given condition is met -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_collapse_if(struct nk_context*, const char *name, enum nk_collapse_states, int cond); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to either collapse or maximize -__state__ | value out of nk_collapse_states section the window should be put into -__cond__ | condition that has to be met to actually commit the collapse state change -#### nk_window_show -updates visibility state of a window with given name -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_show(struct nk_context*, const char *name, enum nk_show_states); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to either collapse or maximize -__state__ | state with either visible or hidden to modify the window with -#### nk_window_show_if -Updates visibility state of a window with given name if a given condition is met -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_window_show_if(struct nk_context*, const char *name, enum nk_show_states, int cond); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__name__ | Identifier of the window to either hide or show -__state__ | state with either visible or hidden to modify the window with -__cond__ | condition that has to be met to actually commit the visbility state change -### Layouting -Layouting in general describes placing widget inside a window with position and size. -While in this particular implementation there are five different APIs for layouting -each with different trade offs between control and ease of use.

-All layouting methods in this library are based around the concept of a row. -A row has a height the window content grows by and a number of columns and each -layouting method specifies how each widget is placed inside the row. -After a row has been allocated by calling a layouting functions and then -filled with widgets will advance an internal pointer over the allocated row.

-To actually define a layout you just call the appropriate layouting function -and each subsequent widget call will place the widget as specified. Important -here is that if you define more widgets then columns defined inside the layout -functions it will allocate the next row without you having to make another layouting

-call. -Biggest limitation with using all these APIs outside the `nk_layout_space_xxx` API -is that you have to define the row height for each. However the row height -often depends on the height of the font.

-To fix that internally nuklear uses a minimum row height that is set to the -height plus padding of currently active font and overwrites the row height -value if zero.

-If you manually want to change the minimum row height then -use nk_layout_set_min_row_height, and use nk_layout_reset_min_row_height to -reset it back to be derived from font height.

-Also if you change the font in nuklear it will automatically change the minimum -row height for you and. This means if you change the font but still want -a minimum row height smaller than the font you have to repush your value.

-For actually more advanced UI I would even recommend using the `nk_layout_space_xxx` -layouting method in combination with a cassowary constraint solver (there are -some versions on github with permissive license model) to take over all control over widget -layouting yourself. However for quick and dirty layouting using all the other layouting -functions should be fine. -#### Usage -1. __nk_layout_row_dynamic__

- The easiest layouting function is `nk_layout_row_dynamic`. It provides each - widgets with same horizontal space inside the row and dynamically grows - if the owning window grows in width. So the number of columns dictates - the size of each widget dynamically by formula: - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - widget_width = (window_width - padding - spacing) * (1/colum_count) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Just like all other layouting APIs if you define more widget than columns this - library will allocate a new row and keep all layouting parameters previously - defined. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - if (nk_begin_xxx(...) { - // first row with height: 30 composed of two widgets - nk_layout_row_dynamic(&ctx, 30, 2); - nk_widget(...); - nk_widget(...); - // - // second row with same parameter as defined above - nk_widget(...); - nk_widget(...); - // - // third row uses 0 for height which will use auto layouting - nk_layout_row_dynamic(&ctx, 0, 2); - nk_widget(...); - nk_widget(...); - } - nk_end(...); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -2. __nk_layout_row_static__

- Another easy layouting function is `nk_layout_row_static`. It provides each - widget with same horizontal pixel width inside the row and does not grow - if the owning window scales smaller or bigger. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - if (nk_begin_xxx(...) { - // first row with height: 30 composed of two widgets with width: 80 - nk_layout_row_static(&ctx, 30, 80, 2); - nk_widget(...); - nk_widget(...); - // - // second row with same parameter as defined above - nk_widget(...); - nk_widget(...); - // - // third row uses 0 for height which will use auto layouting - nk_layout_row_static(&ctx, 0, 80, 2); - nk_widget(...); - nk_widget(...); - } - nk_end(...); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -3. __nk_layout_row_xxx__

- A little bit more advanced layouting API are functions `nk_layout_row_begin`, - `nk_layout_row_push` and `nk_layout_row_end`. They allow to directly - specify each column pixel or window ratio in a row. It supports either - directly setting per column pixel width or widget window ratio but not - both. Furthermore it is a immediate mode API so each value is directly - pushed before calling a widget. Therefore the layout is not automatically - repeating like the last two layouting functions. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - if (nk_begin_xxx(...) { - // first row with height: 25 composed of two widgets with width 60 and 40 - nk_layout_row_begin(ctx, NK_STATIC, 25, 2); - nk_layout_row_push(ctx, 60); - nk_widget(...); - nk_layout_row_push(ctx, 40); - nk_widget(...); - nk_layout_row_end(ctx); - // - // second row with height: 25 composed of two widgets with window ratio 0.25 and 0.75 - nk_layout_row_begin(ctx, NK_DYNAMIC, 25, 2); - nk_layout_row_push(ctx, 0.25f); - nk_widget(...); - nk_layout_row_push(ctx, 0.75f); - nk_widget(...); - nk_layout_row_end(ctx); - // - // third row with auto generated height: composed of two widgets with window ratio 0.25 and 0.75 - nk_layout_row_begin(ctx, NK_DYNAMIC, 0, 2); - nk_layout_row_push(ctx, 0.25f); - nk_widget(...); - nk_layout_row_push(ctx, 0.75f); - nk_widget(...); - nk_layout_row_end(ctx); - } - nk_end(...); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -4. __nk_layout_row__

- The array counterpart to API nk_layout_row_xxx is the single nk_layout_row - functions. Instead of pushing either pixel or window ratio for every widget - it allows to define it by array. The trade of for less control is that - `nk_layout_row` is automatically repeating. Otherwise the behavior is the - same. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - if (nk_begin_xxx(...) { - // two rows with height: 30 composed of two widgets with width 60 and 40 - const float size[] = {60,40}; - nk_layout_row(ctx, NK_STATIC, 30, 2, ratio); - nk_widget(...); - nk_widget(...); - nk_widget(...); - nk_widget(...); - // - // two rows with height: 30 composed of two widgets with window ratio 0.25 and 0.75 - const float ratio[] = {0.25, 0.75}; - nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio); - nk_widget(...); - nk_widget(...); - nk_widget(...); - nk_widget(...); - // - // two rows with auto generated height composed of two widgets with window ratio 0.25 and 0.75 - const float ratio[] = {0.25, 0.75}; - nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio); - nk_widget(...); - nk_widget(...); - nk_widget(...); - nk_widget(...); - } - nk_end(...); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -5. __nk_layout_row_template_xxx__

- The most complex and second most flexible API is a simplified flexbox version without - line wrapping and weights for dynamic widgets. It is an immediate mode API but - unlike `nk_layout_row_xxx` it has auto repeat behavior and needs to be called - before calling the templated widgets. - The row template layout has three different per widget size specifier. The first - one is the `nk_layout_row_template_push_static` with fixed widget pixel width. - They do not grow if the row grows and will always stay the same. - The second size specifier is `nk_layout_row_template_push_variable` - which defines a minimum widget size but it also can grow if more space is available - not taken by other widgets. - Finally there are dynamic widgets with `nk_layout_row_template_push_dynamic` - which are completely flexible and unlike variable widgets can even shrink - to zero if not enough space is provided. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - if (nk_begin_xxx(...) { - // two rows with height: 30 composed of three widgets - nk_layout_row_template_begin(ctx, 30); - nk_layout_row_template_push_dynamic(ctx); - nk_layout_row_template_push_variable(ctx, 80); - nk_layout_row_template_push_static(ctx, 80); - nk_layout_row_template_end(ctx); - // - // first row - nk_widget(...); // dynamic widget can go to zero if not enough space - nk_widget(...); // variable widget with min 80 pixel but can grow bigger if enough space - nk_widget(...); // static widget with fixed 80 pixel width - // - // second row same layout - nk_widget(...); - nk_widget(...); - nk_widget(...); - } - nk_end(...); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -6. __nk_layout_space_xxx__

- Finally the most flexible API directly allows you to place widgets inside the - window. The space layout API is an immediate mode API which does not support - row auto repeat and directly sets position and size of a widget. Position - and size hereby can be either specified as ratio of allocated space or - allocated space local position and pixel size. Since this API is quite - powerful there are a number of utility functions to get the available space - and convert between local allocated space and screen space. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c - if (nk_begin_xxx(...) { - // static row with height: 500 (you can set column count to INT_MAX if you don't want to be bothered) - nk_layout_space_begin(ctx, NK_STATIC, 500, INT_MAX); - nk_layout_space_push(ctx, nk_rect(0,0,150,200)); - nk_widget(...); - nk_layout_space_push(ctx, nk_rect(200,200,100,200)); - nk_widget(...); - nk_layout_space_end(ctx); - // - // dynamic row with height: 500 (you can set column count to INT_MAX if you don't want to be bothered) - nk_layout_space_begin(ctx, NK_DYNAMIC, 500, INT_MAX); - nk_layout_space_push(ctx, nk_rect(0.5,0.5,0.1,0.1)); - nk_widget(...); - nk_layout_space_push(ctx, nk_rect(0.7,0.6,0.1,0.1)); - nk_widget(...); - } - nk_end(...); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description -----------------------------------------|------------------------------------ -nk_layout_set_min_row_height | Set the currently used minimum row height to a specified value -nk_layout_reset_min_row_height | Resets the currently used minimum row height to font height -nk_layout_widget_bounds | Calculates current width a static layout row can fit inside a window -nk_layout_ratio_from_pixel | Utility functions to calculate window ratio from pixel size -nk_layout_row_dynamic | Current layout is divided into n same sized growing columns -nk_layout_row_static | Current layout is divided into n same fixed sized columns -nk_layout_row_begin | Starts a new row with given height and number of columns -nk_layout_row_push | Pushes another column with given size or window ratio -nk_layout_row_end | Finished previously started row -nk_layout_row | Specifies row columns in array as either window ratio or size -nk_layout_row_template_begin | Begins the row template declaration -nk_layout_row_template_push_dynamic | Adds a dynamic column that dynamically grows and can go to zero if not enough space -nk_layout_row_template_push_variable | Adds a variable column that dynamically grows but does not shrink below specified pixel width -nk_layout_row_template_push_static | Adds a static column that does not grow and will always have the same size -nk_layout_row_template_end | Marks the end of the row template -nk_layout_space_begin | Begins a new layouting space that allows to specify each widgets position and size -nk_layout_space_push | Pushes position and size of the next widget in own coordinate space either as pixel or ratio -nk_layout_space_end | Marks the end of the layouting space -nk_layout_space_bounds | Callable after nk_layout_space_begin and returns total space allocated -nk_layout_space_to_screen | Converts vector from nk_layout_space coordinate space into screen space -nk_layout_space_to_local | Converts vector from screen space into nk_layout_space coordinates -nk_layout_space_rect_to_screen | Converts rectangle from nk_layout_space coordinate space into screen space -nk_layout_space_rect_to_local | Converts rectangle from screen space into nk_layout_space coordinates -#### nk_layout_set_min_row_height -Sets the currently used minimum row height. -!!! WARNING - The passed height needs to include both your preferred row height - as well as padding. No internal padding is added. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_set_min_row_height(struct nk_context*, float height); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__height__ | New minimum row height to be used for auto generating the row height -#### nk_layout_reset_min_row_height -Reset the currently used minimum row height back to `font_height + text_padding + padding` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_reset_min_row_height(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -#### nk_layout_widget_bounds -Returns the width of the next row allocate by one of the layouting functions -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_rect nk_layout_widget_bounds(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -Return `nk_rect` with both position and size of the next row -#### nk_layout_ratio_from_pixel -Utility functions to calculate window ratio from pixel size -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -float nk_layout_ratio_from_pixel(struct nk_context*, float pixel_width); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__pixel__ | Pixel_width to convert to window ratio -Returns `nk_rect` with both position and size of the next row -#### nk_layout_row_dynamic -Sets current row layout to share horizontal space -between @cols number of widgets evenly. Once called all subsequent widget -calls greater than @cols will allocate a new row with same layout. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_dynamic(struct nk_context *ctx, float height, int cols); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__height__ | Holds height of each widget in row or zero for auto layouting -__columns__ | Number of widget inside row -#### nk_layout_row_static -Sets current row layout to fill @cols number of widgets -in row with same @item_width horizontal size. Once called all subsequent widget -calls greater than @cols will allocate a new row with same layout. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_static(struct nk_context *ctx, float height, int item_width, int cols); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__height__ | Holds height of each widget in row or zero for auto layouting -__width__ | Holds pixel width of each widget in the row -__columns__ | Number of widget inside row -#### nk_layout_row_begin -Starts a new dynamic or fixed row with given height and columns. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_begin(struct nk_context *ctx, enum nk_layout_format fmt, float row_height, int cols); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__fmt__ | either `NK_DYNAMIC` for window ratio or `NK_STATIC` for fixed size columns -__height__ | holds height of each widget in row or zero for auto layouting -__columns__ | Number of widget inside row -#### nk_layout_row_push -Specifies either window ratio or width of a single column -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_push(struct nk_context*, float value); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__value__ | either a window ratio or fixed width depending on @fmt in previous `nk_layout_row_begin` call -#### nk_layout_row_end -Finished previously started row -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_end(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -#### nk_layout_row -Specifies row columns in array as either window ratio or size -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row(struct nk_context*, enum nk_layout_format, float height, int cols, const float *ratio); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__fmt__ | Either `NK_DYNAMIC` for window ratio or `NK_STATIC` for fixed size columns -__height__ | Holds height of each widget in row or zero for auto layouting -__columns__ | Number of widget inside row -#### nk_layout_row_template_begin -Begins the row template declaration -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_template_begin(struct nk_context*, float row_height); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__height__ | Holds height of each widget in row or zero for auto layouting -#### nk_layout_row_template_push_dynamic -Adds a dynamic column that dynamically grows and can go to zero if not enough space -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_template_push_dynamic(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__height__ | Holds height of each widget in row or zero for auto layouting -#### nk_layout_row_template_push_variable -Adds a variable column that dynamically grows but does not shrink below specified pixel width -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_template_push_variable(struct nk_context*, float min_width); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__width__ | Holds the minimum pixel width the next column must always be -#### nk_layout_row_template_push_static -Adds a static column that does not grow and will always have the same size -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_template_push_static(struct nk_context*, float width); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__width__ | Holds the absolute pixel width value the next column must be -#### nk_layout_row_template_end -Marks the end of the row template -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_row_template_end(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -#### nk_layout_space_begin -Begins a new layouting space that allows to specify each widgets position and size. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_space_begin(struct nk_context*, enum nk_layout_format, float height, int widget_count); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_begin_xxx` -__fmt__ | Either `NK_DYNAMIC` for window ratio or `NK_STATIC` for fixed size columns -__height__ | Holds height of each widget in row or zero for auto layouting -__columns__ | Number of widgets inside row -#### nk_layout_space_push -Pushes position and size of the next widget in own coordinate space either as pixel or ratio -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_space_push(struct nk_context *ctx, struct nk_rect bounds); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -__bounds__ | Position and size in laoyut space local coordinates -#### nk_layout_space_end -Marks the end of the layout space -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_layout_space_end(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -#### nk_layout_space_bounds -Utility function to calculate total space allocated for `nk_layout_space` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_rect nk_layout_space_bounds(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -Returns `nk_rect` holding the total space allocated -#### nk_layout_space_to_screen -Converts vector from nk_layout_space coordinate space into screen space -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_layout_space_to_screen(struct nk_context*, struct nk_vec2); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -__vec__ | Position to convert from layout space into screen coordinate space -Returns transformed `nk_vec2` in screen space coordinates -#### nk_layout_space_to_local -Converts vector from layout space into screen space -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_vec2 nk_layout_space_to_local(struct nk_context*, struct nk_vec2); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -__vec__ | Position to convert from screen space into layout coordinate space -Returns transformed `nk_vec2` in layout space coordinates -#### nk_layout_space_rect_to_screen -Converts rectangle from screen space into layout space -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_rect nk_layout_space_rect_to_screen(struct nk_context*, struct nk_rect); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -__bounds__ | Rectangle to convert from layout space into screen space -Returns transformed `nk_rect` in screen space coordinates -#### nk_layout_space_rect_to_local -Converts rectangle from layout space into screen space -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_rect nk_layout_space_rect_to_local(struct nk_context*, struct nk_rect); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after call `nk_layout_space_begin` -__bounds__ | Rectangle to convert from layout space into screen space -Returns transformed `nk_rect` in layout space coordinates -### Groups -Groups are basically windows inside windows. They allow to subdivide space -in a window to layout widgets as a group. Almost all more complex widget -layouting requirements can be solved using groups and basic layouting -fuctionality. Groups just like windows are identified by an unique name and -internally keep track of scrollbar offsets by default. However additional -versions are provided to directly manage the scrollbar. -#### Usage -To create a group you have to call one of the three `nk_group_begin_xxx` -functions to start group declarations and `nk_group_end` at the end. Furthermore it -is required to check the return value of `nk_group_begin_xxx` and only process -widgets inside the window if the value is not 0. -Nesting groups is possible and even encouraged since many layouting schemes -can only be achieved by nesting. Groups, unlike windows, need `nk_group_end` -to be only called if the corresponding `nk_group_begin_xxx` call does not return 0: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -if (nk_group_begin_xxx(ctx, ...) { - // [... widgets ...] - nk_group_end(ctx); -} -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In the grand concept groups can be called after starting a window -with `nk_begin_xxx` and before calling `nk_end`: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - // Input - Event evt; - nk_input_begin(&ctx); - while (GetEvent(&evt)) { - if (evt.type == MOUSE_MOVE) - nk_input_motion(&ctx, evt.motion.x, evt.motion.y); - else if (evt.type == [...]) { - nk_input_xxx(...); - } - } - nk_input_end(&ctx); - // - // Window - if (nk_begin_xxx(...) { - // [...widgets...] - nk_layout_row_dynamic(...); - if (nk_group_begin_xxx(ctx, ...) { - //[... widgets ...] - nk_group_end(ctx); - } - } - nk_end(ctx); - // - // Draw - const struct nk_command *cmd = 0; - nk_foreach(cmd, &ctx) { - switch (cmd->type) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case ...: - // [...] - } - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description ---------------------------------|------------------------------------------- -nk_group_begin | Start a new group with internal scrollbar handling -nk_group_begin_titled | Start a new group with separated name and title and internal scrollbar handling -nk_group_end | Ends a group. Should only be called if nk_group_begin returned non-zero -nk_group_scrolled_offset_begin | Start a new group with manual separated handling of scrollbar x- and y-offset -nk_group_scrolled_begin | Start a new group with manual scrollbar handling -nk_group_scrolled_end | Ends a group with manual scrollbar handling. Should only be called if nk_group_begin returned non-zero -nk_group_get_scroll | Gets the scroll offset for the given group -nk_group_set_scroll | Sets the scroll offset for the given group -#### nk_group_begin -Starts a new widget group. Requires a previous layouting function to specify a pos/size. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_group_begin(struct nk_context*, const char *title, nk_flags); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__title__ | Must be an unique identifier for this group that is also used for the group header -__flags__ | Window flags defined in the nk_panel_flags section with a number of different group behaviors -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_group_begin_titled -Starts a new widget group. Requires a previous layouting function to specify a pos/size. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_group_begin_titled(struct nk_context*, const char *name, const char *title, nk_flags); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__id__ | Must be an unique identifier for this group -__title__ | Group header title -__flags__ | Window flags defined in the nk_panel_flags section with a number of different group behaviors -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_group_end -Ends a widget group -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_group_end(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -#### nk_group_scrolled_offset_begin -starts a new widget group. requires a previous layouting function to specify -a size. Does not keep track of scrollbar. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_group_scrolled_offset_begin(struct nk_context*, nk_uint *x_offset, nk_uint *y_offset, const char *title, nk_flags flags); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__x_offset__| Scrollbar x-offset to offset all widgets inside the group horizontally. -__y_offset__| Scrollbar y-offset to offset all widgets inside the group vertically -__title__ | Window unique group title used to both identify and display in the group header -__flags__ | Window flags from the nk_panel_flags section -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_group_scrolled_begin -Starts a new widget group. requires a previous -layouting function to specify a size. Does not keep track of scrollbar. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_group_scrolled_begin(struct nk_context*, struct nk_scroll *off, const char *title, nk_flags); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__off__ | Both x- and y- scroll offset. Allows for manual scrollbar control -__title__ | Window unique group title used to both identify and display in the group header -__flags__ | Window flags from nk_panel_flags section -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_group_scrolled_end -Ends a widget group after calling nk_group_scrolled_offset_begin or nk_group_scrolled_begin. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_group_scrolled_end(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -#### nk_group_get_scroll -Gets the scroll position of the given group. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_group_get_scroll(struct nk_context*, const char *id, nk_uint *x_offset, nk_uint *y_offset); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description --------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__id__ | The id of the group to get the scroll position of -__x_offset__ | A pointer to the x offset output (or NULL to ignore) -__y_offset__ | A pointer to the y offset output (or NULL to ignore) -#### nk_group_set_scroll -Sets the scroll position of the given group. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_group_set_scroll(struct nk_context*, const char *id, nk_uint x_offset, nk_uint y_offset); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description --------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__id__ | The id of the group to scroll -__x_offset__ | The x offset to scroll to -__y_offset__ | The y offset to scroll to -### Tree -Trees represent two different concept. First the concept of a collapsible -UI section that can be either in a hidden or visible state. They allow the UI -user to selectively minimize the current set of visible UI to comprehend. -The second concept are tree widgets for visual UI representation of trees.

-Trees thereby can be nested for tree representations and multiple nested -collapsible UI sections. All trees are started by calling of the -`nk_tree_xxx_push_tree` functions and ended by calling one of the -`nk_tree_xxx_pop_xxx()` functions. Each starting functions takes a title label -and optionally an image to be displayed and the initial collapse state from -the nk_collapse_states section.

-The runtime state of the tree is either stored outside the library by the caller -or inside which requires a unique ID. The unique ID can either be generated -automatically from `__FILE__` and `__LINE__` with function `nk_tree_push`, -by `__FILE__` and a user provided ID generated for example by loop index with -function `nk_tree_push_id` or completely provided from outside by user with -function `nk_tree_push_hashed`. -#### Usage -To create a tree you have to call one of the seven `nk_tree_xxx_push_xxx` -functions to start a collapsible UI section and `nk_tree_xxx_pop` to mark the -end. -Each starting function will either return `false(0)` if the tree is collapsed -or hidden and therefore does not need to be filled with content or `true(1)` -if visible and required to be filled. -!!! Note - The tree header does not require and layouting function and instead - calculates a auto height based on the currently used font size -The tree ending functions only need to be called if the tree content is -actually visible. So make sure the tree push function is guarded by `if` -and the pop call is only taken if the tree is visible. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -if (nk_tree_push(ctx, NK_TREE_TAB, "Tree", NK_MINIMIZED)) { - nk_layout_row_dynamic(...); - nk_widget(...); - nk_tree_pop(ctx); -} -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description -----------------------------|------------------------------------------- -nk_tree_push | Start a collapsible UI section with internal state management -nk_tree_push_id | Start a collapsible UI section with internal state management callable in a look -nk_tree_push_hashed | Start a collapsible UI section with internal state management with full control over internal unique ID use to store state -nk_tree_image_push | Start a collapsible UI section with image and label header -nk_tree_image_push_id | Start a collapsible UI section with image and label header and internal state management callable in a look -nk_tree_image_push_hashed | Start a collapsible UI section with image and label header and internal state management with full control over internal unique ID use to store state -nk_tree_pop | Ends a collapsible UI section -nk_tree_state_push | Start a collapsible UI section with external state management -nk_tree_state_image_push | Start a collapsible UI section with image and label header and external state management -nk_tree_state_pop | Ends a collapsabale UI section -#### nk_tree_type -Flag | Description -----------------|---------------------------------------- -NK_TREE_NODE | Highlighted tree header to mark a collapsible UI section -NK_TREE_TAB | Non-highlighted tree header closer to tree representations -#### nk_tree_push -Starts a collapsible UI section with internal state management -!!! WARNING - To keep track of the runtime tree collapsible state this function uses - defines `__FILE__` and `__LINE__` to generate a unique ID. If you want - to call this function in a loop please use `nk_tree_push_id` or - `nk_tree_push_hashed` instead. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -#define nk_tree_push(ctx, type, title, state) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__title__ | Label printed in the tree header -__state__ | Initial tree state value out of nk_collapse_states -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_push_id -Starts a collapsible UI section with internal state management callable in a look -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -#define nk_tree_push_id(ctx, type, title, state, id) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__title__ | Label printed in the tree header -__state__ | Initial tree state value out of nk_collapse_states -__id__ | Loop counter index if this function is called in a loop -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_push_hashed -Start a collapsible UI section with internal state management with full -control over internal unique ID used to store state -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_tree_push_hashed(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__title__ | Label printed in the tree header -__state__ | Initial tree state value out of nk_collapse_states -__hash__ | Memory block or string to generate the ID from -__len__ | Size of passed memory block or string in __hash__ -__seed__ | Seeding value if this function is called in a loop or default to `0` -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_image_push -Start a collapsible UI section with image and label header -!!! WARNING - To keep track of the runtime tree collapsible state this function uses - defines `__FILE__` and `__LINE__` to generate a unique ID. If you want - to call this function in a loop please use `nk_tree_image_push_id` or - `nk_tree_image_push_hashed` instead. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -#define nk_tree_image_push(ctx, type, img, title, state) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__img__ | Image to display inside the header on the left of the label -__title__ | Label printed in the tree header -__state__ | Initial tree state value out of nk_collapse_states -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_image_push_id -Start a collapsible UI section with image and label header and internal state -management callable in a look -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -#define nk_tree_image_push_id(ctx, type, img, title, state, id) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__img__ | Image to display inside the header on the left of the label -__title__ | Label printed in the tree header -__state__ | Initial tree state value out of nk_collapse_states -__id__ | Loop counter index if this function is called in a loop -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_image_push_hashed -Start a collapsible UI section with internal state management with full -control over internal unique ID used to store state -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_tree_image_push_hashed(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states initial_state, const char *hash, int len,int seed); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__img__ | Image to display inside the header on the left of the label -__title__ | Label printed in the tree header -__state__ | Initial tree state value out of nk_collapse_states -__hash__ | Memory block or string to generate the ID from -__len__ | Size of passed memory block or string in __hash__ -__seed__ | Seeding value if this function is called in a loop or default to `0` -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_pop -Ends a collapsabale UI section -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_tree_pop(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` -#### nk_tree_state_push -Start a collapsible UI section with external state management -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_tree_state_push(struct nk_context*, enum nk_tree_type, const char *title, enum nk_collapse_states *state); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__title__ | Label printed in the tree header -__state__ | Persistent state to update -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_state_image_push -Start a collapsible UI section with image and label header and external state management -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_tree_state_image_push(struct nk_context*, enum nk_tree_type, struct nk_image, const char *title, enum nk_collapse_states *state); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` -__img__ | Image to display inside the header on the left of the label -__type__ | Value from the nk_tree_type section to visually mark a tree node header as either a collapseable UI section or tree node -__title__ | Label printed in the tree header -__state__ | Persistent state to update -Returns `true(1)` if visible and fillable with widgets or `false(0)` otherwise -#### nk_tree_state_pop -Ends a collapsabale UI section -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_tree_state_pop(struct nk_context*); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description -------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling `nk_tree_xxx_push_xxx` -### Properties -Properties are the main value modification widgets in Nuklear. Changing a value -can be achieved by dragging, adding/removing incremental steps on button click -or by directly typing a number. -#### Usage -Each property requires a unique name for identification that is also used for -displaying a label. If you want to use the same name multiple times make sure -add a '#' before your name. The '#' will not be shown but will generate a -unique ID. Each property also takes in a minimum and maximum value. If you want -to make use of the complete number range of a type just use the provided -type limits from `limits.h`. For example `INT_MIN` and `INT_MAX` for -`nk_property_int` and `nk_propertyi`. In additional each property takes in -a increment value that will be added or subtracted if either the increment -decrement button is clicked. Finally there is a value for increment per pixel -dragged that is added or subtracted from the value. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int value = 0; -struct nk_context ctx; -nk_init_xxx(&ctx, ...); -while (1) { - // Input - Event evt; - nk_input_begin(&ctx); - while (GetEvent(&evt)) { - if (evt.type == MOUSE_MOVE) - nk_input_motion(&ctx, evt.motion.x, evt.motion.y); - else if (evt.type == [...]) { - nk_input_xxx(...); - } - } - nk_input_end(&ctx); - // - // Window - if (nk_begin_xxx(...) { - // Property - nk_layout_row_dynamic(...); - nk_property_int(ctx, "ID", INT_MIN, &value, INT_MAX, 1, 1); - } - nk_end(ctx); - // - // Draw - const struct nk_command *cmd = 0; - nk_foreach(cmd, &ctx) { - switch (cmd->type) { - case NK_COMMAND_LINE: - your_draw_line_function(...) - break; - case NK_COMMAND_RECT - your_draw_rect_function(...) - break; - case ...: - // [...] - } - nk_clear(&ctx); -} -nk_free(&ctx); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#### Reference -Function | Description ---------------------|------------------------------------------- -nk_property_int | Integer property directly modifying a passed in value -nk_property_float | Float property directly modifying a passed in value -nk_property_double | Double property directly modifying a passed in value -nk_propertyi | Integer property returning the modified int value -nk_propertyf | Float property returning the modified float value -nk_propertyd | Double property returning the modified double value -#### nk_property_int -Integer property directly modifying a passed in value -!!! WARNING - To generate a unique property ID using the same label make sure to insert - a `#` at the beginning. It will not be shown but guarantees correct behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_property_int(struct nk_context *ctx, const char *name, int min, int *val, int max, int step, float inc_per_pixel); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description ---------------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function -__name__ | String used both as a label as well as a unique identifier -__min__ | Minimum value not allowed to be underflown -__val__ | Integer pointer to be modified -__max__ | Maximum value not allowed to be overflown -__step__ | Increment added and subtracted on increment and decrement button -__inc_per_pixel__ | Value per pixel added or subtracted on dragging -#### nk_property_float -Float property directly modifying a passed in value -!!! WARNING - To generate a unique property ID using the same label make sure to insert - a `#` at the beginning. It will not be shown but guarantees correct behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_property_float(struct nk_context *ctx, const char *name, float min, float *val, float max, float step, float inc_per_pixel); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description ---------------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function -__name__ | String used both as a label as well as a unique identifier -__min__ | Minimum value not allowed to be underflown -__val__ | Float pointer to be modified -__max__ | Maximum value not allowed to be overflown -__step__ | Increment added and subtracted on increment and decrement button -__inc_per_pixel__ | Value per pixel added or subtracted on dragging -#### nk_property_double -Double property directly modifying a passed in value -!!! WARNING - To generate a unique property ID using the same label make sure to insert - a `#` at the beginning. It will not be shown but guarantees correct behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -void nk_property_double(struct nk_context *ctx, const char *name, double min, double *val, double max, double step, double inc_per_pixel); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description ---------------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function -__name__ | String used both as a label as well as a unique identifier -__min__ | Minimum value not allowed to be underflown -__val__ | Double pointer to be modified -__max__ | Maximum value not allowed to be overflown -__step__ | Increment added and subtracted on increment and decrement button -__inc_per_pixel__ | Value per pixel added or subtracted on dragging -#### nk_propertyi -Integer property modifying a passed in value and returning the new value -!!! WARNING - To generate a unique property ID using the same label make sure to insert - a `#` at the beginning. It will not be shown but guarantees correct behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -int nk_propertyi(struct nk_context *ctx, const char *name, int min, int val, int max, int step, float inc_per_pixel); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description ---------------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function -__name__ | String used both as a label as well as a unique identifier -__min__ | Minimum value not allowed to be underflown -__val__ | Current integer value to be modified and returned -__max__ | Maximum value not allowed to be overflown -__step__ | Increment added and subtracted on increment and decrement button -__inc_per_pixel__ | Value per pixel added or subtracted on dragging -Returns the new modified integer value -#### nk_propertyf -Float property modifying a passed in value and returning the new value -!!! WARNING - To generate a unique property ID using the same label make sure to insert - a `#` at the beginning. It will not be shown but guarantees correct behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -float nk_propertyf(struct nk_context *ctx, const char *name, float min, float val, float max, float step, float inc_per_pixel); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description ---------------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function -__name__ | String used both as a label as well as a unique identifier -__min__ | Minimum value not allowed to be underflown -__val__ | Current float value to be modified and returned -__max__ | Maximum value not allowed to be overflown -__step__ | Increment added and subtracted on increment and decrement button -__inc_per_pixel__ | Value per pixel added or subtracted on dragging -Returns the new modified float value -#### nk_propertyd -Float property modifying a passed in value and returning the new value -!!! WARNING - To generate a unique property ID using the same label make sure to insert - a `#` at the beginning. It will not be shown but guarantees correct behavior. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -float nk_propertyd(struct nk_context *ctx, const char *name, double min, double val, double max, double step, double inc_per_pixel); -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Parameter | Description ---------------------|----------------------------------------------------------- -__ctx__ | Must point to an previously initialized `nk_context` struct after calling a layouting function -__name__ | String used both as a label as well as a unique identifier -__min__ | Minimum value not allowed to be underflown -__val__ | Current double value to be modified and returned -__max__ | Maximum value not allowed to be overflown -__step__ | Increment added and subtracted on increment and decrement button -__inc_per_pixel__ | Value per pixel added or subtracted on dragging -Returns the new modified double value - -XXX.XXX- X...X - X...X -X....X - X....X" -X...XXXXXXXXXXXXX...X - " -## License -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none - ------------------------------------------------------------------------------ - This software is available under 2 licenses -- choose whichever you prefer. - ------------------------------------------------------------------------------ - ALTERNATIVE A - MIT License - Copyright (c) 2016-2018 Micha Mettke - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - ------------------------------------------------------------------------------ - ALTERNATIVE B - Public Domain (www.unlicense.org) - This is free and unencumbered software released into the public domain. - Anyone is free to copy, modify, publish, use, compile, sell, or distribute this - software, either in source code form or as a compiled binary, for any purpose, - commercial or non-commercial, and by any means. - In jurisdictions that recognize copyright laws, the author or authors of this - software dedicate any and all copyright interest in the software to the public - domain. We make this dedication for the benefit of the public at large and to - the detriment of our heirs and successors. We intend this dedication to be an - overt act of relinquishment in perpetuity of all present and future rights to - this software under copyright law. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ------------------------------------------------------------------------------ -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## Changelog -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none -[date][x.yy.zz]-[description] --[date]: date on which the change has been pushed --[x.yy.zz]: Numerical version string representation. Each version number on the right - resets back to zero if version on the left is incremented. - - [x]: Major version with API and library breaking changes - - [yy]: Minor version with non-breaking API and library changes - - [zz]: Bug fix version with no direct changes to API -- 2020/04/09 (4.02.1) - Removed unused nk_sqrt function to fix compiler warnings - - Fixed compiler warnings if you bring your own methods for - nk_cos/nk_sin/nk_strtod/nk_memset/nk_memcopy/nk_dtoa -- 2020/04/06 (4.01.10) - Fix bug: Do not use pool before checking for NULL -- 2020/03/22 (4.01.9) - Fix bug where layout state wasn't restored correctly after - popping a tree. -- 2020/03/11 (4.01.8) - Fix bug where padding is subtracted from widget -- 2020/03/06 (4.01.7) - Fix bug where width padding was applied twice -- 2020/02/06 (4.01.6) - Update stb_truetype.h and stb_rect_pack.h and separate them -- 2019/12/10 (4.01.5) - Fix off-by-one error in NK_INTERSECT -- 2019/10/09 (4.01.4) - Fix bug for autoscrolling in nk_do_edit -- 2019/09/20 (4.01.3) - Fixed a bug wherein combobox cannot be closed by clicking the header - when NK_BUTTON_TRIGGER_ON_RELEASE is defined. -- 2019/09/10 (4.01.2) - Fixed the nk_cos function, which deviated significantly. -- 2019/09/08 (4.01.1) - Fixed a bug wherein re-baking of fonts caused a segmentation - fault due to dst_font->glyph_count not being zeroed on subsequent - bakes of the same set of fonts. -- 2019/06/23 (4.01.0) - Added nk_***_get_scroll and nk_***_set_scroll for groups, windows, and popups. -- 2019/06/12 (4.00.3) - Fix panel background drawing bug. -- 2018/10/31 (4.00.2) - Added NK_KEYSTATE_BASED_INPUT to "fix" state based backends - like GLFW without breaking key repeat behavior on event based. -- 2018/04/01 (4.00.1) - Fixed calling `nk_convert` multiple time per single frame. -- 2018/04/01 (4.00.0) - BREAKING CHANGE: nk_draw_list_clear no longer tries to - clear provided buffers. So make sure to either free - or clear each passed buffer after calling nk_convert. -- 2018/02/23 (3.00.6) - Fixed slider dragging behavior. -- 2018/01/31 (3.00.5) - Fixed overcalculation of cursor data in font baking process. -- 2018/01/31 (3.00.4) - Removed name collision with stb_truetype. -- 2018/01/28 (3.00.3) - Fixed panel window border drawing bug. -- 2018/01/12 (3.00.2) - Added `nk_group_begin_titled` for separated group identifier and title. -- 2018/01/07 (3.00.1) - Started to change documentation style. -- 2018/01/05 (3.00.0) - BREAKING CHANGE: The previous color picker API was broken - because of conversions between float and byte color representation. - Color pickers now use floating point values to represent - HSV values. To get back the old behavior I added some additional - color conversion functions to cast between nk_color and - nk_colorf. -- 2017/12/23 (2.00.7) - Fixed small warning. -- 2017/12/23 (2.00.7) - Fixed `nk_edit_buffer` behavior if activated to allow input. -- 2017/12/23 (2.00.7) - Fixed modifyable progressbar dragging visuals and input behavior. -- 2017/12/04 (2.00.6) - Added formatted string tooltip widget. -- 2017/11/18 (2.00.5) - Fixed window becoming hidden with flag `NK_WINDOW_NO_INPUT`. -- 2017/11/15 (2.00.4) - Fixed font merging. -- 2017/11/07 (2.00.3) - Fixed window size and position modifier functions. -- 2017/09/14 (2.00.2) - Fixed `nk_edit_buffer` and `nk_edit_focus` behavior. -- 2017/09/14 (2.00.1) - Fixed window closing behavior. -- 2017/09/14 (2.00.0) - BREAKING CHANGE: Modifying window position and size functions now - require the name of the window and must happen outside the window - building process (between function call nk_begin and nk_end). -- 2017/09/11 (1.40.9) - Fixed window background flag if background window is declared last. -- 2017/08/27 (1.40.8) - Fixed `nk_item_is_any_active` for hidden windows. -- 2017/08/27 (1.40.7) - Fixed window background flag. -- 2017/07/07 (1.40.6) - Fixed missing clipping rect check for hovering/clicked - query for widgets. -- 2017/07/07 (1.40.5) - Fixed drawing bug for vertex output for lines and stroked - and filled rectangles. -- 2017/07/07 (1.40.4) - Fixed bug in nk_convert trying to add windows that are in - process of being destroyed. -- 2017/07/07 (1.40.3) - Fixed table internal bug caused by storing table size in - window instead of directly in table. -- 2017/06/30 (1.40.2) - Removed unneeded semicolon in C++ NK_ALIGNOF macro. -- 2017/06/30 (1.40.1) - Fixed drawing lines smaller or equal zero. -- 2017/06/08 (1.40.0) - Removed the breaking part of last commit. Auto layout now only - comes in effect if you pass in zero was row height argument. -- 2017/06/08 (1.40.0) - BREAKING CHANGE: while not directly API breaking it will change - how layouting works. From now there will be an internal minimum - row height derived from font height. If you need a row smaller than - that you can directly set it by `nk_layout_set_min_row_height` and - reset the value back by calling `nk_layout_reset_min_row_height. -- 2017/06/08 (1.39.1) - Fixed property text edit handling bug caused by past `nk_widget` fix. -- 2017/06/08 (1.39.0) - Added function to retrieve window space without calling a `nk_layout_xxx` function. -- 2017/06/06 (1.38.5) - Fixed `nk_convert` return flag for command buffer. -- 2017/05/23 (1.38.4) - Fixed activation behavior for widgets partially clipped. -- 2017/05/10 (1.38.3) - Fixed wrong min window size mouse scaling over boundaries. -- 2017/05/09 (1.38.2) - Fixed vertical scrollbar drawing with not enough space. -- 2017/05/09 (1.38.1) - Fixed scaler dragging behavior if window size hits minimum size. -- 2017/05/06 (1.38.0) - Added platform double-click support. -- 2017/04/20 (1.37.1) - Fixed key repeat found inside glfw demo backends. -- 2017/04/20 (1.37.0) - Extended properties with selection and clipboard support. -- 2017/04/20 (1.36.2) - Fixed #405 overlapping rows with zero padding and spacing. -- 2017/04/09 (1.36.1) - Fixed #403 with another widget float error. -- 2017/04/09 (1.36.0) - Added window `NK_WINDOW_NO_INPUT` and `NK_WINDOW_NOT_INTERACTIVE` flags. -- 2017/04/09 (1.35.3) - Fixed buffer heap corruption. -- 2017/03/25 (1.35.2) - Fixed popup overlapping for `NK_WINDOW_BACKGROUND` windows. -- 2017/03/25 (1.35.1) - Fixed windows closing behavior. -- 2017/03/18 (1.35.0) - Added horizontal scroll requested in #377. -- 2017/03/18 (1.34.3) - Fixed long window header titles. -- 2017/03/04 (1.34.2) - Fixed text edit filtering. -- 2017/03/04 (1.34.1) - Fixed group closable flag. -- 2017/02/25 (1.34.0) - Added custom draw command for better language binding support. -- 2017/01/24 (1.33.0) - Added programmatic way to remove edit focus. -- 2017/01/24 (1.32.3) - Fixed wrong define for basic type definitions for windows. -- 2017/01/21 (1.32.2) - Fixed input capture from hidden or closed windows. -- 2017/01/21 (1.32.1) - Fixed slider behavior and drawing. -- 2017/01/13 (1.32.0) - Added flag to put scaler into the bottom left corner. -- 2017/01/13 (1.31.0) - Added additional row layouting method to combine both - dynamic and static widgets. -- 2016/12/31 (1.30.0) - Extended scrollbar offset from 16-bit to 32-bit. -- 2016/12/31 (1.29.2) - Fixed closing window bug of minimized windows. -- 2016/12/03 (1.29.1) - Fixed wrapped text with no seperator and C89 error. -- 2016/12/03 (1.29.0) - Changed text wrapping to process words not characters. -- 2016/11/22 (1.28.6) - Fixed window minimized closing bug. -- 2016/11/19 (1.28.5) - Fixed abstract combo box closing behavior. -- 2016/11/19 (1.28.4) - Fixed tooltip flickering. -- 2016/11/19 (1.28.3) - Fixed memory leak caused by popup repeated closing. -- 2016/11/18 (1.28.2) - Fixed memory leak caused by popup panel allocation. -- 2016/11/10 (1.28.1) - Fixed some warnings and C++ error. -- 2016/11/10 (1.28.0) - Added additional `nk_button` versions which allows to directly - pass in a style struct to change buttons visual. -- 2016/11/10 (1.27.0) - Added additional `nk_tree` versions to support external state - storage. Just like last the `nk_group` commit the main - advantage is that you optionally can minimize nuklears runtime - memory consumption or handle hash collisions. -- 2016/11/09 (1.26.0) - Added additional `nk_group` version to support external scrollbar - offset storage. Main advantage is that you can externalize - the memory management for the offset. It could also be helpful - if you have a hash collision in `nk_group_begin` but really - want the name. In addition I added `nk_list_view` which allows - to draw big lists inside a group without actually having to - commit the whole list to nuklear (issue #269). -- 2016/10/30 (1.25.1) - Fixed clipping rectangle bug inside `nk_draw_list`. -- 2016/10/29 (1.25.0) - Pulled `nk_panel` memory management into nuklear and out of - the hands of the user. From now on users don't have to care - about panels unless they care about some information. If you - still need the panel just call `nk_window_get_panel`. -- 2016/10/21 (1.24.0) - Changed widget border drawing to stroked rectangle from filled - rectangle for less overdraw and widget background transparency. -- 2016/10/18 (1.23.0) - Added `nk_edit_focus` for manually edit widget focus control. -- 2016/09/29 (1.22.7) - Fixed deduction of basic type in non `` compilation. -- 2016/09/29 (1.22.6) - Fixed edit widget UTF-8 text cursor drawing bug. -- 2016/09/28 (1.22.5) - Fixed edit widget UTF-8 text appending/inserting/removing. -- 2016/09/28 (1.22.4) - Fixed drawing bug inside edit widgets which offset all text - text in every edit widget if one of them is scrolled. -- 2016/09/28 (1.22.3) - Fixed small bug in edit widgets if not active. The wrong - text length is passed. It should have been in bytes but - was passed as glyphs. -- 2016/09/20 (1.22.2) - Fixed color button size calculation. -- 2016/09/20 (1.22.1) - Fixed some `nk_vsnprintf` behavior bugs and removed `` - again from `NK_INCLUDE_STANDARD_VARARGS`. -- 2016/09/18 (1.22.0) - C89 does not support vsnprintf only C99 and newer as well - as C++11 and newer. In addition to use vsnprintf you have - to include . So just defining `NK_INCLUDE_STD_VAR_ARGS` - is not enough. That behavior is now fixed. By default if - both varargs as well as stdio is selected I try to use - vsnprintf if not possible I will revert to vsprintf. If - varargs but not stdio was defined I will use my own function. -- 2016/09/15 (1.21.2) - Fixed panel `close` behavior for deeper panel levels. -- 2016/09/15 (1.21.1) - Fixed C++ errors and wrong argument to `nk_panel_get_xxxx`. -- 2016/09/13 (1.21.0) - !BREAKING! Fixed nonblocking popup behavior in menu, combo, - and contextual which prevented closing in y-direction if - popup did not reach max height. - In addition the height parameter was changed into vec2 - for width and height to have more control over the popup size. -- 2016/09/13 (1.20.3) - Cleaned up and extended type selection. -- 2016/09/13 (1.20.2) - Fixed slider behavior hopefully for the last time. This time - all calculation are correct so no more hackery. -- 2016/09/13 (1.20.1) - Internal change to divide window/panel flags into panel flags and types. - Suprisinly spend years in C and still happened to confuse types - with flags. Probably something to take note. -- 2016/09/08 (1.20.0) - Added additional helper function to make it easier to just - take the produced buffers from `nk_convert` and unplug the - iteration process from `nk_context`. So now you can - just use the vertex,element and command buffer + two pointer - inside the command buffer retrieved by calls `nk__draw_begin` - and `nk__draw_end` and macro `nk_draw_foreach_bounded`. -- 2016/09/08 (1.19.0) - Added additional asserts to make sure every `nk_xxx_begin` call - for windows, popups, combobox, menu and contextual is guarded by - `if` condition and does not produce false drawing output. -- 2016/09/08 (1.18.0) - Changed confusing name for `NK_SYMBOL_RECT_FILLED`, `NK_SYMBOL_RECT` - to hopefully easier to understand `NK_SYMBOL_RECT_FILLED` and - `NK_SYMBOL_RECT_OUTLINE`. -- 2016/09/08 (1.17.0) - Changed confusing name for `NK_SYMBOL_CIRLCE_FILLED`, `NK_SYMBOL_CIRCLE` - to hopefully easier to understand `NK_SYMBOL_CIRCLE_FILLED` and - `NK_SYMBOL_CIRCLE_OUTLINE`. -- 2016/09/08 (1.16.0) - Added additional checks to select correct types if `NK_INCLUDE_FIXED_TYPES` - is not defined by supporting the biggest compiler GCC, clang and MSVC. -- 2016/09/07 (1.15.3) - Fixed `NK_INCLUDE_COMMAND_USERDATA` define to not cause an error. -- 2016/09/04 (1.15.2) - Fixed wrong combobox height calculation. -- 2016/09/03 (1.15.1) - Fixed gaps inside combo boxes in OpenGL. -- 2016/09/02 (1.15.0) - Changed nuklear to not have any default vertex layout and - instead made it user provided. The range of types to convert - to is quite limited at the moment, but I would be more than - happy to accept PRs to add additional. -- 2016/08/30 (1.14.2) - Removed unused variables. -- 2016/08/30 (1.14.1) - Fixed C++ build errors. -- 2016/08/30 (1.14.0) - Removed mouse dragging from SDL demo since it does not work correctly. -- 2016/08/30 (1.13.4) - Tweaked some default styling variables. -- 2016/08/30 (1.13.3) - Hopefully fixed drawing bug in slider, in general I would - refrain from using slider with a big number of steps. -- 2016/08/30 (1.13.2) - Fixed close and minimize button which would fire even if the - window was in Read Only Mode. -- 2016/08/30 (1.13.1) - Fixed popup panel padding handling which was previously just - a hack for combo box and menu. -- 2016/08/30 (1.13.0) - Removed `NK_WINDOW_DYNAMIC` flag from public API since - it is bugged and causes issues in window selection. -- 2016/08/30 (1.12.0) - Removed scaler size. The size of the scaler is now - determined by the scrollbar size. -- 2016/08/30 (1.11.2) - Fixed some drawing bugs caused by changes from 1.11.0. -- 2016/08/30 (1.11.1) - Fixed overlapping minimized window selection. -- 2016/08/30 (1.11.0) - Removed some internal complexity and overly complex code - handling panel padding and panel border. -- 2016/08/29 (1.10.0) - Added additional height parameter to `nk_combobox_xxx`. -- 2016/08/29 (1.10.0) - Fixed drawing bug in dynamic popups. -- 2016/08/29 (1.10.0) - Added experimental mouse scrolling to popups, menus and comboboxes. -- 2016/08/26 (1.10.0) - Added window name string prepresentation to account for - hash collisions. Currently limited to `NK_WINDOW_MAX_NAME` - which in term can be redefined if not big enough. -- 2016/08/26 (1.10.0) - Added stacks for temporary style/UI changes in code. -- 2016/08/25 (1.10.0) - Changed `nk_input_is_key_pressed` and 'nk_input_is_key_released' - to account for key press and release happening in one frame. -- 2016/08/25 (1.10.0) - Added additional nk_edit flag to directly jump to the end on activate. -- 2016/08/17 (1.09.6) - Removed invalid check for value zero in `nk_propertyx`. -- 2016/08/16 (1.09.5) - Fixed ROM mode for deeper levels of popup windows parents. -- 2016/08/15 (1.09.4) - Editbox are now still active if enter was pressed with flag - `NK_EDIT_SIG_ENTER`. Main reasoning is to be able to keep - typing after committing. -- 2016/08/15 (1.09.4) - Removed redundant code. -- 2016/08/15 (1.09.4) - Fixed negative numbers in `nk_strtoi` and remove unused variable. -- 2016/08/15 (1.09.3) - Fixed `NK_WINDOW_BACKGROUND` flag behavior to select a background - window only as selected by hovering and not by clicking. -- 2016/08/14 (1.09.2) - Fixed a bug in font atlas which caused wrong loading - of glyphs for font with multiple ranges. -- 2016/08/12 (1.09.1) - Added additional function to check if window is currently - hidden and therefore not visible. -- 2016/08/12 (1.09.1) - nk_window_is_closed now queries the correct flag `NK_WINDOW_CLOSED` - instead of the old flag `NK_WINDOW_HIDDEN`. -- 2016/08/09 (1.09.0) - Added additional double version to nk_property and changed - the underlying implementation to not cast to float and instead - work directly on the given values. -- 2016/08/09 (1.08.0) - Added additional define to overwrite library internal - floating pointer number to string conversion for additional - precision. -- 2016/08/09 (1.08.0) - Added additional define to overwrite library internal - string to floating point number conversion for additional - precision. -- 2016/08/08 (1.07.2) - Fixed compiling error without define `NK_INCLUDE_FIXED_TYPE`. -- 2016/08/08 (1.07.1) - Fixed possible floating point error inside `nk_widget` leading - to wrong wiget width calculation which results in widgets falsely - becoming tagged as not inside window and cannot be accessed. -- 2016/08/08 (1.07.0) - Nuklear now differentiates between hiding a window (NK_WINDOW_HIDDEN) and - closing a window (NK_WINDOW_CLOSED). A window can be hidden/shown - by using `nk_window_show` and closed by either clicking the close - icon in a window or by calling `nk_window_close`. Only closed - windows get removed at the end of the frame while hidden windows - remain. -- 2016/08/08 (1.06.0) - Added `nk_edit_string_zero_terminated` as a second option to - `nk_edit_string` which takes, edits and outputs a '\0' terminated string. -- 2016/08/08 (1.05.4) - Fixed scrollbar auto hiding behavior. -- 2016/08/08 (1.05.3) - Fixed wrong panel padding selection in `nk_layout_widget_space`. -- 2016/08/07 (1.05.2) - Fixed old bug in dynamic immediate mode layout API, calculating - wrong item spacing and panel width. -- 2016/08/07 (1.05.1) - Hopefully finally fixed combobox popup drawing bug. -- 2016/08/07 (1.05.0) - Split varargs away from `NK_INCLUDE_STANDARD_IO` into own - define `NK_INCLUDE_STANDARD_VARARGS` to allow more fine - grained controlled over library includes. -- 2016/08/06 (1.04.5) - Changed memset calls to `NK_MEMSET`. -- 2016/08/04 (1.04.4) - Fixed fast window scaling behavior. -- 2016/08/04 (1.04.3) - Fixed window scaling, movement bug which appears if you - move/scale a window and another window is behind it. - If you are fast enough then the window behind gets activated - and the operation is blocked. I now require activating - by hovering only if mouse is not pressed. -- 2016/08/04 (1.04.2) - Fixed changing fonts. -- 2016/08/03 (1.04.1) - Fixed `NK_WINDOW_BACKGROUND` behavior. -- 2016/08/03 (1.04.0) - Added color parameter to `nk_draw_image`. -- 2016/08/03 (1.04.0) - Added additional window padding style attributes for - sub windows (combo, menu, ...). -- 2016/08/03 (1.04.0) - Added functions to show/hide software cursor. -- 2016/08/03 (1.04.0) - Added `NK_WINDOW_BACKGROUND` flag to force a window - to be always in the background of the screen. -- 2016/08/03 (1.03.2) - Removed invalid assert macro for NK_RGB color picker. -- 2016/08/01 (1.03.1) - Added helper macros into header include guard. -- 2016/07/29 (1.03.0) - Moved the window/table pool into the header part to - simplify memory management by removing the need to - allocate the pool. -- 2016/07/29 (1.02.0) - Added auto scrollbar hiding window flag which if enabled - will hide the window scrollbar after NK_SCROLLBAR_HIDING_TIMEOUT - seconds without window interaction. To make it work - you have to also set a delta time inside the `nk_context`. -- 2016/07/25 (1.01.1) - Fixed small panel and panel border drawing bugs. -- 2016/07/15 (1.01.0) - Added software cursor to `nk_style` and `nk_context`. -- 2016/07/15 (1.01.0) - Added const correctness to `nk_buffer_push' data argument. -- 2016/07/15 (1.01.0) - Removed internal font baking API and simplified - font atlas memory management by converting pointer - arrays for fonts and font configurations to lists. -- 2016/07/15 (1.00.0) - Changed button API to use context dependent button - behavior instead of passing it for every function call. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -## Gallery -![Figure [blue]: Feature overview with blue color styling](https://cloud.githubusercontent.com/assets/8057201/13538240/acd96876-e249-11e5-9547-5ac0b19667a0.png) -![Figure [red]: Feature overview with red color styling](https://cloud.githubusercontent.com/assets/8057201/13538243/b04acd4c-e249-11e5-8fd2-ad7744a5b446.png) -![Figure [widgets]: Widget overview](https://cloud.githubusercontent.com/assets/8057201/11282359/3325e3c6-8eff-11e5-86cb-cf02b0596087.png) -![Figure [blackwhite]: Black and white](https://cloud.githubusercontent.com/assets/8057201/11033668/59ab5d04-86e5-11e5-8091-c56f16411565.png) -![Figure [filexp]: File explorer](https://cloud.githubusercontent.com/assets/8057201/10718115/02a9ba08-7b6b-11e5-950f-adacdd637739.png) -![Figure [opengl]: OpenGL Editor](https://cloud.githubusercontent.com/assets/8057201/12779619/2a20d72c-ca69-11e5-95fe-4edecf820d5c.png) -![Figure [nodedit]: Node Editor](https://cloud.githubusercontent.com/assets/8057201/9976995/e81ac04a-5ef7-11e5-872b-acd54fbeee03.gif) -![Figure [skinning]: Using skinning in Nuklear](https://cloud.githubusercontent.com/assets/8057201/15991632/76494854-30b8-11e6-9555-a69840d0d50b.png) -![Figure [bf]: Heavy modified version](https://cloud.githubusercontent.com/assets/8057201/14902576/339926a8-0d9c-11e6-9fee-a8b73af04473.png) -## Credits -Developed by Micha Mettke and every direct or indirect github contributor.

-Embeds [stb_texedit](https://github.com/nothings/stb/blob/master/stb_textedit.h), [stb_truetype](https://github.com/nothings/stb/blob/master/stb_truetype.h) and [stb_rectpack](https://github.com/nothings/stb/blob/master/stb_rect_pack.h) by Sean Barret (public domain)
-Uses [stddoc.c](https://github.com/r-lyeh/stddoc.c) from r-lyeh@github.com for documentation generation

-Embeds ProggyClean.ttf font by Tristan Grimmer (MIT license).
-Big thank you to Omar Cornut (ocornut@github) for his [imgui library](https://github.com/ocornut/imgui) and -giving me the inspiration for this library, Casey Muratori for handmade hero -and his original immediate mode graphical user interface idea and Sean -Barret for his amazing single header libraries which restored my faith -in libraries and brought me to create some of my own. Finally Apoorva Joshi -for his single header file packer. - - + + + + + + +

If you are not redirected in five seconds, click here.

+ + From cd0d7bdecdf85d4bfb9658ba9136f11d4c374938 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 21 Dec 2021 18:11:29 -0500 Subject: [PATCH 42/89] changelog: Use x.y.z for versioning, rather than x.yy.zz --- nuklear.h | 13 ++++++------- src/CHANGELOG | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/nuklear.h b/nuklear.h index a4e772c..a423a43 100644 --- a/nuklear.h +++ b/nuklear.h @@ -29613,13 +29613,12 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// ## Changelog /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none -/// [date][x.yy.zz]-[description] -/// -[date]: date on which the change has been pushed -/// -[x.yy.zz]: Numerical version string representation. Each version number on the right -/// resets back to zero if version on the left is incremented. -/// - [x]: Major version with API and library breaking changes -/// - [yy]: Minor version with non-breaking API and library changes -/// - [zz]: Bug fix version with no direct changes to API +/// [date] ([x.y.z]) - [description] +/// - [date]: date on which the change has been pushed +/// - [x.y.z]: Numerical version string representation +/// - [x]: Major version with API and library breaking changes +/// - [y]: Minor version with non-breaking API and library changes +/// - [z]: Bug fix version with no direct changes to API /// /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings diff --git a/src/CHANGELOG b/src/CHANGELOG index 3595944..1891c0c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,12 +1,11 @@ /// ## Changelog /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none -/// [date][x.yy.zz]-[description] -/// -[date]: date on which the change has been pushed -/// -[x.yy.zz]: Numerical version string representation. Each version number on the right -/// resets back to zero if version on the left is incremented. -/// - [x]: Major version with API and library breaking changes -/// - [yy]: Minor version with non-breaking API and library changes -/// - [zz]: Bug fix version with no direct changes to API +/// [date] ([x.y.z]) - [description] +/// - [date]: date on which the change has been pushed +/// - [x.y.z]: Numerical version string representation +/// - [x]: Major version with API and library breaking changes +/// - [y]: Minor version with non-breaking API and library changes +/// - [z]: Bug fix version with no direct changes to API /// /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings From da15e0f9a01eab2d1b7fb0fa3efd25e7466ad2b7 Mon Sep 17 00:00:00 2001 From: Jimmi Holst Christensen Date: Wed, 1 Jul 2020 17:08:16 +0200 Subject: [PATCH 43/89] Fix layout bounds not accounting for padding --- clib.json | 2 +- nuklear.h | 5 ++++- src/CHANGELOG | 1 + src/nuklear_panel.c | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/clib.json b/clib.json index 20e4b9e..7baddd9 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.09.1", + "version": "4.09.3", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/nuklear.h b/nuklear.h index a4e772c..bf15b29 100644 --- a/nuklear.h +++ b/nuklear.h @@ -19547,6 +19547,8 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan layout->bounds = win->bounds; layout->bounds.x += panel_padding.x; layout->bounds.w -= 2*panel_padding.x; + layout->bounds.y += panel_padding.y; + layout->bounds.h -= 2*panel_padding.y; if (win->flags & NK_WINDOW_BORDER) { layout->border = nk_panel_get_border(style, win->flags, panel_type); layout->bounds = nk_shrink_rect(layout->bounds, layout->border); @@ -22224,7 +22226,7 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) layout->at_y = y; layout->row.index = index; } -NK_API void +NK_API void nk_spacer(struct nk_context *ctx ) { struct nk_rect dummy_rect = { 0, 0, 0, 0 }; @@ -29621,6 +29623,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget diff --git a/src/CHANGELOG b/src/CHANGELOG index 3595944..6a4e97e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,6 +8,7 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// +/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget diff --git a/src/nuklear_panel.c b/src/nuklear_panel.c index f170d7c..3e204d1 100644 --- a/src/nuklear_panel.c +++ b/src/nuklear_panel.c @@ -156,6 +156,8 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan layout->bounds = win->bounds; layout->bounds.x += panel_padding.x; layout->bounds.w -= 2*panel_padding.x; + layout->bounds.y += panel_padding.y; + layout->bounds.h -= 2*panel_padding.y; if (win->flags & NK_WINDOW_BORDER) { layout->border = nk_panel_get_border(style, win->flags, panel_type); layout->bounds = nk_shrink_rect(layout->bounds, layout->border); From 0aa9a15a6c3bdf725da71013daadd1b86a9dc775 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 22 Dec 2021 12:06:15 -0500 Subject: [PATCH 44/89] changelog: Reference Semantic Versioning directly --- nuklear.h | 4 ++-- src/CHANGELOG | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nuklear.h b/nuklear.h index a423a43..8f835f2 100644 --- a/nuklear.h +++ b/nuklear.h @@ -29615,10 +29615,10 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none /// [date] ([x.y.z]) - [description] /// - [date]: date on which the change has been pushed -/// - [x.y.z]: Numerical version string representation +/// - [x.y.z]: Version string, represented in Semantic Versioning format /// - [x]: Major version with API and library breaking changes /// - [y]: Minor version with non-breaking API and library changes -/// - [z]: Bug fix version with no direct changes to API +/// - [z]: Patch version with no direct changes to the API /// /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings diff --git a/src/CHANGELOG b/src/CHANGELOG index 1891c0c..603ab95 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -2,10 +2,10 @@ /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~none /// [date] ([x.y.z]) - [description] /// - [date]: date on which the change has been pushed -/// - [x.y.z]: Numerical version string representation +/// - [x.y.z]: Version string, represented in Semantic Versioning format /// - [x]: Major version with API and library breaking changes /// - [y]: Minor version with non-breaking API and library changes -/// - [z]: Bug fix version with no direct changes to API +/// - [z]: Patch version with no direct changes to the API /// /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings From f65388487952db4b0c199f23866a0bb8db126ed1 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 22 Dec 2021 14:14:50 -0500 Subject: [PATCH 45/89] Revert "Fix layout bounds not accounting for padding" --- clib.json | 2 +- nuklear.h | 5 +---- src/CHANGELOG | 1 - src/nuklear_panel.c | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/clib.json b/clib.json index 7baddd9..20e4b9e 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.09.3", + "version": "4.09.1", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/nuklear.h b/nuklear.h index bf15b29..a4e772c 100644 --- a/nuklear.h +++ b/nuklear.h @@ -19547,8 +19547,6 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan layout->bounds = win->bounds; layout->bounds.x += panel_padding.x; layout->bounds.w -= 2*panel_padding.x; - layout->bounds.y += panel_padding.y; - layout->bounds.h -= 2*panel_padding.y; if (win->flags & NK_WINDOW_BORDER) { layout->border = nk_panel_get_border(style, win->flags, panel_type); layout->bounds = nk_shrink_rect(layout->bounds, layout->border); @@ -22226,7 +22224,7 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) layout->at_y = y; layout->row.index = index; } -NK_API void +NK_API void nk_spacer(struct nk_context *ctx ) { struct nk_rect dummy_rect = { 0, 0, 0, 0 }; @@ -29623,7 +29621,6 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// -/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget diff --git a/src/CHANGELOG b/src/CHANGELOG index 6a4e97e..3595944 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -8,7 +8,6 @@ /// - [yy]: Minor version with non-breaking API and library changes /// - [zz]: Bug fix version with no direct changes to API /// -/// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings /// - 2021/10/16 (4.09.0) - Added nk_spacer() widget diff --git a/src/nuklear_panel.c b/src/nuklear_panel.c index 3e204d1..f170d7c 100644 --- a/src/nuklear_panel.c +++ b/src/nuklear_panel.c @@ -156,8 +156,6 @@ nk_panel_begin(struct nk_context *ctx, const char *title, enum nk_panel_type pan layout->bounds = win->bounds; layout->bounds.x += panel_padding.x; layout->bounds.w -= 2*panel_padding.x; - layout->bounds.y += panel_padding.y; - layout->bounds.h -= 2*panel_padding.y; if (win->flags & NK_WINDOW_BORDER) { layout->border = nk_panel_get_border(style, win->flags, panel_type); layout->bounds = nk_shrink_rect(layout->bounds, layout->border); From aa47577bae8098301a3ee604a6e6d1670ea0b73d Mon Sep 17 00:00:00 2001 From: YgorVasilenko <41551412+YgorVasilenko@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:43:42 +0300 Subject: [PATCH 46/89] window: Fix hover state when window is minimized (#284) * Fix hovering check when window is minimized * Align line * window: Fix checking hovering when window is minimized * changelog: Update version in clib.json Fixes #284 --- clib.json | 2 +- nuklear.h | 15 ++++++++++----- src/CHANGELOG | 1 + src/nuklear_layout.c | 3 +-- src/nuklear_window.c | 11 ++++++++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/clib.json b/clib.json index 7baddd9..f44cdd4 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.09.3", + "version": "4.9.4", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/nuklear.h b/nuklear.h index d3d3fa8..523600d 100644 --- a/nuklear.h +++ b/nuklear.h @@ -20446,10 +20446,15 @@ nk_window_is_hovered(struct nk_context *ctx) { NK_ASSERT(ctx); NK_ASSERT(ctx->current); - if (!ctx || !ctx->current) return 0; - if(ctx->current->flags & NK_WINDOW_HIDDEN) + if (!ctx || !ctx->current || (ctx->current->flags & NK_WINDOW_HIDDEN)) return 0; - return nk_input_is_mouse_hovering_rect(&ctx->input, ctx->current->bounds); + else { + struct nk_rect actual_bounds = ctx->current->bounds; + if (ctx->begin->flags & NK_WINDOW_MINIMIZED) { + actual_bounds.h = ctx->current->layout->header_height; + } + return nk_input_is_mouse_hovering_rect(&ctx->input, actual_bounds); + } } NK_API nk_bool nk_window_is_any_hovered(struct nk_context *ctx) @@ -22226,7 +22231,7 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) layout->at_y = y; layout->row.index = index; } -NK_API void +NK_API void nk_spacer(struct nk_context *ctx ) { struct nk_rect dummy_rect = { 0, 0, 0, 0 }; @@ -22236,7 +22241,6 @@ nk_spacer(struct nk_context *ctx ) - /* =============================================================== * * TREE @@ -29622,6 +29626,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized /// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings diff --git a/src/CHANGELOG b/src/CHANGELOG index 0dfcfcd..93ca031 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized /// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding. /// - 2021/12/19 (4.09.2) - Update to stb_rect_pack.h v1.01 and stb_truetype.h v1.26 /// - 2021/12/16 (4.09.1) - Fix the majority of GCC warnings diff --git a/src/nuklear_layout.c b/src/nuklear_layout.c index 269cfd4..0229bd0 100644 --- a/src/nuklear_layout.c +++ b/src/nuklear_layout.c @@ -760,10 +760,9 @@ nk_layout_peek(struct nk_rect *bounds, struct nk_context *ctx) layout->at_y = y; layout->row.index = index; } -NK_API void +NK_API void nk_spacer(struct nk_context *ctx ) { struct nk_rect dummy_rect = { 0, 0, 0, 0 }; nk_panel_alloc_space( &dummy_rect, ctx ); } - diff --git a/src/nuklear_window.c b/src/nuklear_window.c index 558ebce..486b912 100644 --- a/src/nuklear_window.c +++ b/src/nuklear_window.c @@ -431,10 +431,15 @@ nk_window_is_hovered(struct nk_context *ctx) { NK_ASSERT(ctx); NK_ASSERT(ctx->current); - if (!ctx || !ctx->current) return 0; - if(ctx->current->flags & NK_WINDOW_HIDDEN) + if (!ctx || !ctx->current || (ctx->current->flags & NK_WINDOW_HIDDEN)) return 0; - return nk_input_is_mouse_hovering_rect(&ctx->input, ctx->current->bounds); + else { + struct nk_rect actual_bounds = ctx->current->bounds; + if (ctx->begin->flags & NK_WINDOW_MINIMIZED) { + actual_bounds.h = ctx->current->layout->header_height; + } + return nk_input_is_mouse_hovering_rect(&ctx->input, actual_bounds); + } } NK_API nk_bool nk_window_is_any_hovered(struct nk_context *ctx) From 54b14dc10312fcaf4efe0f94a442001976079487 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Tue, 14 Dec 2021 21:45:49 +0000 Subject: [PATCH 47/89] Support any format with 1, 2, or 4 bytes per pixel in sdl2surface_rawfb --- demo/sdl2surface_rawfb/sdl2surface_rawfb.h | 125 ++++++++------------- 1 file changed, 48 insertions(+), 77 deletions(-) diff --git a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h index ce90fba..bcd46d3 100644 --- a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h +++ b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h @@ -65,54 +65,18 @@ struct sdlsurface_context { #endif static unsigned int -nk_sdlsurface_color2int(const struct nk_color c, SDL_PixelFormatEnum pl) +nk_sdlsurface_color2int(const struct nk_color c, const SDL_PixelFormat *format) { - unsigned int res = 0; - - switch (pl) { - case SDL_PIXELFORMAT_RGBA8888: - res |= c.r << 24; - res |= c.g << 16; - res |= c.b << 8; - res |= c.a; - break; - case SDL_PIXELFORMAT_ARGB8888: - res |= c.a << 24; - res |= c.r << 16; - res |= c.g << 8; - res |= c.b; - break; - - default: - perror("nk_sdlsurface_color2int(): Unsupported pixel layout.\n"); - break; - } - return (res); + return SDL_MapRGBA(format, c.r, c.g, c.b, c.a); } static struct nk_color -nk_sdlsurface_int2color(const unsigned int i, SDL_PixelFormatEnum pl) +nk_sdlsurface_int2color(const unsigned int i, const SDL_PixelFormat *format) { struct nk_color col = {0,0,0,0}; - switch (pl) { - case SDL_PIXELFORMAT_RGBA8888: - col.r = (i >> 24) & 0xff; - col.g = (i >> 16) & 0xff; - col.b = (i >> 8) & 0xff; - col.a = i & 0xff; - break; - case SDL_PIXELFORMAT_ARGB8888: - col.a = (i >> 24) & 0xff; - col.r = (i >> 16) & 0xff; - col.g = (i >> 8) & 0xff; - col.b = i & 0xff; - break; + SDL_GetRGBA(i, format, &col.r, &col.g, &col.b, &col.a); - default: - perror("nk_sdlsurface_int2color(): Unsupported pixel layout.\n"); - break; - } return col; } @@ -120,16 +84,22 @@ static void nk_sdlsurface_ctx_setpixel(const struct sdlsurface_context *sdlsurface, const short x0, const short y0, const struct nk_color col) { - unsigned int c = nk_sdlsurface_color2int(col, sdlsurface->fb->format->format); + unsigned int c = nk_sdlsurface_color2int(col, sdlsurface->fb->format); unsigned char *pixels = sdlsurface->fb->pixels; - unsigned int *ptr; pixels += y0 * sdlsurface->fb->pitch; - ptr = (unsigned int *)pixels + x0; if (y0 < sdlsurface->scissors.h && y0 >= sdlsurface->scissors.y && - x0 >= sdlsurface->scissors.x && x0 < sdlsurface->scissors.w) - *ptr = c; + x0 >= sdlsurface->scissors.x && x0 < sdlsurface->scissors.w) { + + if (sdlsurface->fb->format->BytesPerPixel == 4) { + *((Uint32 *)pixels + x0) = c; + } else if (sdlsurface->fb->format->BytesPerPixel == 2) { + *((Uint16 *)pixels + x0) = c; + } else { + *((Uint8 *)pixels + x0) = c; + } + } } static void @@ -140,40 +110,49 @@ nk_sdlsurface_line_horizontal(const struct sdlsurface_context *sdlsurface, * It does not check for scissors or image borders. * The caller has to make sure it does no exceed bounds. */ unsigned int i, n; - unsigned int c[16]; + unsigned char c[16 * 4]; unsigned char *pixels = sdlsurface->fb->pixels; - unsigned int *ptr; + unsigned int bpp = sdlsurface->fb->format->BytesPerPixel; - pixels += y * sdlsurface->fb->pitch; - ptr = (unsigned int *)pixels + x0; + pixels += (y * sdlsurface->fb->pitch) + (x0 * bpp); - n = x1 - x0; - for (i = 0; i < sizeof(c) / sizeof(c[0]); i++) - c[i] = nk_sdlsurface_color2int(col, sdlsurface->fb->format->format); + n = (x1 - x0) * bpp; + if (bpp == 4) { + for (i = 0; i < sizeof(c) / bpp; i++) + ((Uint32 *)c)[i] = nk_sdlsurface_color2int(col, sdlsurface->fb->format); + } else if (bpp == 2) { + for (i = 0; i < sizeof(c) / bpp; i++) + ((Uint16 *)c)[i] = nk_sdlsurface_color2int(col, sdlsurface->fb->format); + } else { + for (i = 0; i < sizeof(c) / bpp; i++) + ((Uint8 *)c)[i] = nk_sdlsurface_color2int(col, sdlsurface->fb->format); + } - while (n > 16) { - memcpy((void *)ptr, c, sizeof(c)); - n -= 16; ptr += 16; + while (n > sizeof(c)) { + memcpy(pixels, c, sizeof(c)); + n -= sizeof(c); pixels += sizeof(c); } for (i = 0; i < n; i++) - ptr[i] = c[i]; + pixels[i] = c[i]; } static void nk_sdlsurface_img_setpixel(const struct SDL_Surface *img, const int x0, const int y0, const struct nk_color col) { - unsigned int c = nk_sdlsurface_color2int(col, img->format->format); + unsigned int c = nk_sdlsurface_color2int(col, img->format); unsigned char *ptr; - unsigned int *pixel; NK_ASSERT(img); if (y0 < img->h && y0 >= 0 && x0 >= 0 && x0 < img->w) { ptr = (unsigned char *)img->pixels + (img->pitch * y0); - pixel = (unsigned int *)ptr; if (img->format == NK_FONT_ATLAS_ALPHA8) { ptr[x0] = col.a; + } else if (img->format->BytesPerPixel == 4) { + ((Uint32 *)ptr)[x0] = c; + } else if (img->format->BytesPerPixel == 2) { + ((Uint16 *)ptr)[x0] = c; } else { - pixel[x0] = c; + ((Uint8 *)ptr)[x0] = c; } } } @@ -191,9 +170,15 @@ nk_sdlsurface_img_getpixel(const struct SDL_Surface *img, const int x0, const in if (img->format == NK_FONT_ATLAS_ALPHA8) { col.a = ptr[x0]; col.b = col.g = col.r = 0xff; + } else if (img->format->BytesPerPixel == 4) { + pixel = ((Uint32 *)ptr)[x0]; + col = nk_sdlsurface_int2color(pixel, img->format); + } else if (img->format->BytesPerPixel == 2) { + pixel = ((Uint16 *)ptr)[x0]; + col = nk_sdlsurface_int2color(pixel, img->format); } else { - pixel = ((unsigned int *)ptr)[x0]; - col = nk_sdlsurface_int2color(pixel, img->format->format); + pixel = ((Uint8 *)ptr)[x0]; + col = nk_sdlsurface_int2color(pixel, img->format); } } return col; } @@ -837,7 +822,7 @@ nk_sdlsurface_init(SDL_Surface *fb, float fontSize) return NULL; } - sdlsurface->font_tex = SDL_CreateRGBSurfaceWithFormat(0, texw, texh, 32, fb->format->format); + sdlsurface->font_tex = SDL_CreateRGBSurface(0, texw, texh, 32, 0xff, 0xff00, 0xff0000, 0xff000000); memcpy(sdlsurface->font_tex->pixels, tex, texw * texh * 4); @@ -847,20 +832,6 @@ nk_sdlsurface_init(SDL_Surface *fb, float fontSize) nk_style_load_all_cursors(&sdlsurface->ctx, sdlsurface->atlas.cursors); nk_sdlsurface_scissor(sdlsurface, 0, 0, sdlsurface->fb->w, sdlsurface->fb->h); - if (fb->format->format == SDL_PIXELFORMAT_RGBA8888) - { - uint32_t *fontPixels = (uint32_t *)sdlsurface->font_tex->pixels; - int i; - assert(sdlsurface->font_tex->pitch == sdlsurface->font_tex->w * 4); - for (i = 0; i < sdlsurface->font_tex->w * sdlsurface->font_tex->h; i++) - { - uint32_t col = fontPixels[i]; - fontPixels[i] &= 0xFFFF00; - fontPixels[i] |= ((col & 0xFF000000) >> 24); - fontPixels[i] |= ((col & 0xFF) << 24); - } - } - return sdlsurface; } From 20a26c8fec265a7b49ae8f36c72a6ad22fa3b61d Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 15 Dec 2021 21:11:21 +0000 Subject: [PATCH 48/89] Restore a previously removed cast --- demo/sdl2surface_rawfb/sdl2surface_rawfb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h index bcd46d3..6e2eb59 100644 --- a/demo/sdl2surface_rawfb/sdl2surface_rawfb.h +++ b/demo/sdl2surface_rawfb/sdl2surface_rawfb.h @@ -129,7 +129,7 @@ nk_sdlsurface_line_horizontal(const struct sdlsurface_context *sdlsurface, } while (n > sizeof(c)) { - memcpy(pixels, c, sizeof(c)); + memcpy((void*)pixels, c, sizeof(c)); n -= sizeof(c); pixels += sizeof(c); } for (i = 0; i < n; i++) pixels[i] = c[i]; From cd4990834f97614178843a6589162a34c676a156 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 6 Jan 2022 21:55:20 -0500 Subject: [PATCH 49/89] sdl_renderer: Update code --- .../Makefile | 0 demo/{sdl_sdlrenderer => sdl_renderer}/main.c | 19 +++++++++++++------ .../nuklear_sdl_renderer.h} | 17 +++++++++-------- 3 files changed, 22 insertions(+), 14 deletions(-) rename demo/{sdl_sdlrenderer => sdl_renderer}/Makefile (100%) rename demo/{sdl_sdlrenderer => sdl_renderer}/main.c (96%) rename demo/{sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h => sdl_renderer/nuklear_sdl_renderer.h} (98%) diff --git a/demo/sdl_sdlrenderer/Makefile b/demo/sdl_renderer/Makefile similarity index 100% rename from demo/sdl_sdlrenderer/Makefile rename to demo/sdl_renderer/Makefile diff --git a/demo/sdl_sdlrenderer/main.c b/demo/sdl_renderer/main.c similarity index 96% rename from demo/sdl_sdlrenderer/main.c rename to demo/sdl_renderer/main.c index 74dab49..77be381 100644 --- a/demo/sdl_sdlrenderer/main.c +++ b/demo/sdl_renderer/main.c @@ -9,7 +9,7 @@ #include #include -#include +#include #define NK_INCLUDE_FIXED_TYPES #define NK_INCLUDE_STANDARD_IO @@ -19,9 +19,9 @@ #define NK_INCLUDE_FONT_BAKING #define NK_INCLUDE_DEFAULT_FONT #define NK_IMPLEMENTATION -#define NK_SDL_GL2_IMPLEMENTATION +#define NK_SDL_RENDERER_IMPLEMENTATION #include "../../nuklear.h" -#include "nuklear_sdl_sdlrenderer.h" +#include "nuklear_sdl_renderer.h" #define WINDOW_WIDTH 1200 #define WINDOW_HEIGHT 800 @@ -42,6 +42,7 @@ #ifdef INCLUDE_ALL #define INCLUDE_STYLE #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS #define INCLUDE_OVERVIEW #define INCLUDE_NODE_EDITOR #endif @@ -52,6 +53,9 @@ #ifdef INCLUDE_CALCULATOR #include "../calculator.c" #endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif #ifdef INCLUDE_OVERVIEW #include "../overview.c" #endif @@ -93,7 +97,7 @@ main(int argc, char *argv[]) flags |= SDL_RENDERER_ACCELERATED; flags |= SDL_RENDERER_PRESENTVSYNC; -#if 0 +#if 0 SDL_SetHint(SDL_HINT_RENDER_BATCHING, "1"); SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software"); SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl"); @@ -182,6 +186,9 @@ main(int argc, char *argv[]) #ifdef INCLUDE_CALCULATOR calculator(ctx); #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif @@ -192,9 +199,9 @@ main(int argc, char *argv[]) SDL_SetRenderDrawColor(renderer, bg.r * 255, bg.g * 255, bg.b * 255, bg.a * 255); SDL_RenderClear(renderer); - + nk_sdl_render(NK_ANTI_ALIASING_ON); - + SDL_RenderPresent(renderer); } diff --git a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h b/demo/sdl_renderer/nuklear_sdl_renderer.h similarity index 98% rename from demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h rename to demo/sdl_renderer/nuklear_sdl_renderer.h index dc969b3..03fd3e5 100644 --- a/demo/sdl_sdlrenderer/nuklear_sdl_sdlrenderer.h +++ b/demo/sdl_renderer/nuklear_sdl_renderer.h @@ -1,5 +1,5 @@ /* - * Nuklear - 1.32.0 - public domain + * Nuklear - 4.9.4 - public domain */ /* * ============================================================== @@ -8,10 +8,10 @@ * * =============================================================== */ -#ifndef NK_SDL_GL2_H_ -#define NK_SDL_GL2_H_ +#ifndef NK_SDL_RENDERER_H_ +#define NK_SDL_RENDERER_H_ -#include +#include NK_API struct nk_context* nk_sdl_init(SDL_Window *win, SDL_Renderer *renderer); NK_API void nk_sdl_font_stash_begin(struct nk_font_atlas **atlas); NK_API void nk_sdl_font_stash_end(void); @@ -19,7 +19,8 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt); NK_API void nk_sdl_render(enum nk_anti_aliasing); NK_API void nk_sdl_shutdown(void); -#endif +#endif /* NK_SDL_RENDERER_H_ */ + /* * ============================================================== * @@ -27,7 +28,7 @@ NK_API void nk_sdl_shutdown(void); * * =============================================================== */ -#ifdef NK_SDL_GL2_IMPLEMENTATION +#ifdef NK_SDL_RENDERER_IMPLEMENTATION struct nk_sdl_device { struct nk_buffer cmds; @@ -112,7 +113,7 @@ nk_sdl_render(enum nk_anti_aliasing AA) /* iterate over and execute each draw command */ offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf); - + clipping_enabled = SDL_RenderIsClipEnabled(sdl.renderer); SDL_RenderGetClipRect(sdl.renderer, &saved_clip); @@ -324,4 +325,4 @@ void nk_sdl_shutdown(void) memset(&sdl, 0, sizeof(sdl)); } -#endif +#endif /* NK_SDL_RENDERER_IMPLEMENTATION */ From 8f5ae210351f34dafe3ca31fa61194d0226d6d5f Mon Sep 17 00:00:00 2001 From: lib-omar Date: Sat, 29 Jan 2022 14:13:34 -0500 Subject: [PATCH 50/89] Favor switch over if-else chain in event handler. --- demo/sdl_renderer/nuklear_sdl_renderer.h | 164 +++++++++++------------ 1 file changed, 81 insertions(+), 83 deletions(-) diff --git a/demo/sdl_renderer/nuklear_sdl_renderer.h b/demo/sdl_renderer/nuklear_sdl_renderer.h index 03fd3e5..2107df1 100644 --- a/demo/sdl_renderer/nuklear_sdl_renderer.h +++ b/demo/sdl_renderer/nuklear_sdl_renderer.h @@ -226,89 +226,87 @@ nk_sdl_handle_event(SDL_Event *evt) SDL_WarpMouseInWindow(sdl.win, x, y); ctx->input.mouse.ungrab = 0; } - if (evt->type == SDL_KEYUP || evt->type == SDL_KEYDOWN) { - /* key events */ - int down = evt->type == SDL_KEYDOWN; - const Uint8* state = SDL_GetKeyboardState(0); - SDL_Keycode sym = evt->key.keysym.sym; - if (sym == SDLK_RSHIFT || sym == SDLK_LSHIFT) - nk_input_key(ctx, NK_KEY_SHIFT, down); - else if (sym == SDLK_DELETE) - nk_input_key(ctx, NK_KEY_DEL, down); - else if (sym == SDLK_RETURN) - nk_input_key(ctx, NK_KEY_ENTER, down); - else if (sym == SDLK_TAB) - nk_input_key(ctx, NK_KEY_TAB, down); - else if (sym == SDLK_BACKSPACE) - nk_input_key(ctx, NK_KEY_BACKSPACE, down); - else if (sym == SDLK_HOME) { - nk_input_key(ctx, NK_KEY_TEXT_START, down); - nk_input_key(ctx, NK_KEY_SCROLL_START, down); - } else if (sym == SDLK_END) { - nk_input_key(ctx, NK_KEY_TEXT_END, down); - nk_input_key(ctx, NK_KEY_SCROLL_END, down); - } else if (sym == SDLK_PAGEDOWN) { - nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); - } else if (sym == SDLK_PAGEUP) { - nk_input_key(ctx, NK_KEY_SCROLL_UP, down); - } else if (sym == SDLK_z) - nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_r) - nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_c) - nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_v) - nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_x) - nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_b) - nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_e) - nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_UP) - nk_input_key(ctx, NK_KEY_UP, down); - else if (sym == SDLK_DOWN) - nk_input_key(ctx, NK_KEY_DOWN, down); - else if (sym == SDLK_LEFT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); - else nk_input_key(ctx, NK_KEY_LEFT, down); - } else if (sym == SDLK_RIGHT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); - else nk_input_key(ctx, NK_KEY_RIGHT, down); - } else return 0; - return 1; - } else if (evt->type == SDL_MOUSEBUTTONDOWN || evt->type == SDL_MOUSEBUTTONUP) { - /* mouse button */ - int down = evt->type == SDL_MOUSEBUTTONDOWN; - const int x = evt->button.x, y = evt->button.y; - if (evt->button.button == SDL_BUTTON_LEFT) { - if (evt->button.clicks > 1) - nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); - nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); - } else if (evt->button.button == SDL_BUTTON_MIDDLE) - nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); - else if (evt->button.button == SDL_BUTTON_RIGHT) - nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); - return 1; - } else if (evt->type == SDL_MOUSEMOTION) { - /* mouse motion */ - if (ctx->input.mouse.grabbed) { - int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; - nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); - } else nk_input_motion(ctx, evt->motion.x, evt->motion.y); - return 1; - } else if (evt->type == SDL_TEXTINPUT) { - /* text input */ - nk_glyph glyph; - memcpy(glyph, evt->text.text, NK_UTF_SIZE); - nk_input_glyph(ctx, glyph); - return 1; - } else if (evt->type == SDL_MOUSEWHEEL) { - /* mouse wheel */ - nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); - return 1; + + switch(evt->type) + { + case SDL_KEYUP: /* KEYUP & KEYDOWN share same routine */ + case SDL_KEYDOWN: + { + int down = evt->type == SDL_KEYDOWN; + const Uint8* state = SDL_GetKeyboardState(0); + switch(evt->key.keysym.sym) + { + case SDLK_RSHIFT: /* RSHIFT & LSHIFT share same routine */ + case SDLK_LSHIFT: nk_input_key(ctx, NK_KEY_SHIFT, down); break; + case SDLK_DELETE: nk_input_key(ctx, NK_KEY_DEL, down); break; + case SDLK_RETURN: nk_input_key(ctx, NK_KEY_ENTER, down); break; + case SDLK_TAB: nk_input_key(ctx, NK_KEY_TAB, down); break; + case SDLK_BACKSPACE: nk_input_key(ctx, NK_KEY_BACKSPACE, down); break; + case SDLK_HOME: nk_input_key(ctx, NK_KEY_TEXT_START, down); + nk_input_key(ctx, NK_KEY_SCROLL_START, down); break; + case SDLK_END: nk_input_key(ctx, NK_KEY_TEXT_END, down); + nk_input_key(ctx, NK_KEY_SCROLL_END, down); break; + case SDLK_PAGEDOWN: nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); break; + case SDLK_PAGEUP: nk_input_key(ctx, NK_KEY_SCROLL_UP, down); break; + case SDLK_z: nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_r: nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_c: nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_v: nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_x: nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_b: nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_e: nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_UP: nk_input_key(ctx, NK_KEY_UP, down); break; + case SDLK_DOWN: nk_input_key(ctx, NK_KEY_DOWN, down); break; + case SDLK_LEFT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); + else nk_input_key(ctx, NK_KEY_LEFT, down); + break; + case SDLK_RIGHT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); + else nk_input_key(ctx, NK_KEY_RIGHT, down); + break; + } + } + return 1; + + case SDL_MOUSEBUTTONUP: /* MOUSEBUTTONUP & MOUSEBUTTONDOWN share same routine */ + case SDL_MOUSEBUTTONDOWN: + { + int down = evt->type == SDL_MOUSEBUTTONDOWN; + const int x = evt->button.x, y = evt->button.y; + switch(evt->button.button) + { + case SDL_BUTTON_LEFT: + if (evt->button.clicks > 1) + nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); + nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); break; + case SDL_BUTTON_MIDDLE: nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); break; + case SDL_BUTTON_RIGHT: nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); break; + } + } + return 1; + + case SDL_MOUSEMOTION: + if (ctx->input.mouse.grabbed) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); + } + else nk_input_motion(ctx, evt->motion.x, evt->motion.y); + return 1; + + case SDL_TEXTINPUT: + { + nk_glyph glyph; + memcpy(glyph, evt->text.text, NK_UTF_SIZE); + nk_input_glyph(ctx, glyph); + } + return 1; + + case SDL_MOUSEWHEEL: + nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); + return 1; } return 0; } From 43b5e8274808fb6949f4ffb7962af7c56384d264 Mon Sep 17 00:00:00 2001 From: lib-omar Date: Sat, 29 Jan 2022 14:15:02 -0500 Subject: [PATCH 51/89] Favor switch over if-else chain in event handler. --- demo/sdl_opengles2/nuklear_sdl_gles2.h | 175 +++++++++++++------------ 1 file changed, 92 insertions(+), 83 deletions(-) diff --git a/demo/sdl_opengles2/nuklear_sdl_gles2.h b/demo/sdl_opengles2/nuklear_sdl_gles2.h index 061550b..e2f297f 100644 --- a/demo/sdl_opengles2/nuklear_sdl_gles2.h +++ b/demo/sdl_opengles2/nuklear_sdl_gles2.h @@ -345,89 +345,98 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt) { struct nk_context *ctx = &sdl.ctx; - if (evt->type == SDL_KEYUP || evt->type == SDL_KEYDOWN) { - /* key events */ - int down = evt->type == SDL_KEYDOWN; - const Uint8* state = SDL_GetKeyboardState(0); - SDL_Keycode sym = evt->key.keysym.sym; - if (sym == SDLK_RSHIFT || sym == SDLK_LSHIFT) - nk_input_key(ctx, NK_KEY_SHIFT, down); - else if (sym == SDLK_DELETE) - nk_input_key(ctx, NK_KEY_DEL, down); - else if (sym == SDLK_RETURN) - nk_input_key(ctx, NK_KEY_ENTER, down); - else if (sym == SDLK_TAB) - nk_input_key(ctx, NK_KEY_TAB, down); - else if (sym == SDLK_BACKSPACE) - nk_input_key(ctx, NK_KEY_BACKSPACE, down); - else if (sym == SDLK_HOME) { - nk_input_key(ctx, NK_KEY_TEXT_START, down); - nk_input_key(ctx, NK_KEY_SCROLL_START, down); - } else if (sym == SDLK_END) { - nk_input_key(ctx, NK_KEY_TEXT_END, down); - nk_input_key(ctx, NK_KEY_SCROLL_END, down); - } else if (sym == SDLK_PAGEDOWN) { - nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); - } else if (sym == SDLK_PAGEUP) { - nk_input_key(ctx, NK_KEY_SCROLL_UP, down); - } else if (sym == SDLK_z) - nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_r) - nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_c) - nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_v) - nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_x) - nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_b) - nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_e) - nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_UP) - nk_input_key(ctx, NK_KEY_UP, down); - else if (sym == SDLK_DOWN) - nk_input_key(ctx, NK_KEY_DOWN, down); - else if (sym == SDLK_LEFT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); - else nk_input_key(ctx, NK_KEY_LEFT, down); - } else if (sym == SDLK_RIGHT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); - else nk_input_key(ctx, NK_KEY_RIGHT, down); - } else return 0; - return 1; - } else if (evt->type == SDL_MOUSEBUTTONDOWN || evt->type == SDL_MOUSEBUTTONUP) { - /* mouse button */ - int down = evt->type == SDL_MOUSEBUTTONDOWN; - const int x = evt->button.x, y = evt->button.y; - if (evt->button.button == SDL_BUTTON_LEFT) { - if (evt->button.clicks > 1) - nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); - nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); - } else if (evt->button.button == SDL_BUTTON_MIDDLE) - nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); - else if (evt->button.button == SDL_BUTTON_RIGHT) - nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); - return 1; - } else if (evt->type == SDL_MOUSEMOTION) { - /* mouse motion */ - if (ctx->input.mouse.grabbed) { - int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; - nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); - } else nk_input_motion(ctx, evt->motion.x, evt->motion.y); - return 1; - } else if (evt->type == SDL_TEXTINPUT) { - /* text input */ - nk_glyph glyph; - memcpy(glyph, evt->text.text, NK_UTF_SIZE); - nk_input_glyph(ctx, glyph); - return 1; - } else if (evt->type == SDL_MOUSEWHEEL) { - /* mouse wheel */ - nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); - return 1; + + /* optional grabbing behavior */ + if (ctx->input.mouse.grab) { + SDL_SetRelativeMouseMode(SDL_TRUE); + ctx->input.mouse.grab = 0; + } else if (ctx->input.mouse.ungrab) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + SDL_SetRelativeMouseMode(SDL_FALSE); + SDL_WarpMouseInWindow(sdl.win, x, y); + ctx->input.mouse.ungrab = 0; + } + + switch(evt->type) + { + case SDL_KEYUP: /* KEYUP & KEYDOWN share same routine */ + case SDL_KEYDOWN: + { + int down = evt->type == SDL_KEYDOWN; + const Uint8* state = SDL_GetKeyboardState(0); + switch(evt->key.keysym.sym) + { + case SDLK_RSHIFT: /* RSHIFT & LSHIFT share same routine */ + case SDLK_LSHIFT: nk_input_key(ctx, NK_KEY_SHIFT, down); break; + case SDLK_DELETE: nk_input_key(ctx, NK_KEY_DEL, down); break; + case SDLK_RETURN: nk_input_key(ctx, NK_KEY_ENTER, down); break; + case SDLK_TAB: nk_input_key(ctx, NK_KEY_TAB, down); break; + case SDLK_BACKSPACE: nk_input_key(ctx, NK_KEY_BACKSPACE, down); break; + case SDLK_HOME: nk_input_key(ctx, NK_KEY_TEXT_START, down); + nk_input_key(ctx, NK_KEY_SCROLL_START, down); break; + case SDLK_END: nk_input_key(ctx, NK_KEY_TEXT_END, down); + nk_input_key(ctx, NK_KEY_SCROLL_END, down); break; + case SDLK_PAGEDOWN: nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); break; + case SDLK_PAGEUP: nk_input_key(ctx, NK_KEY_SCROLL_UP, down); break; + case SDLK_z: nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_r: nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_c: nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_v: nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_x: nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_b: nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_e: nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_UP: nk_input_key(ctx, NK_KEY_UP, down); break; + case SDLK_DOWN: nk_input_key(ctx, NK_KEY_DOWN, down); break; + case SDLK_LEFT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); + else nk_input_key(ctx, NK_KEY_LEFT, down); + break; + case SDLK_RIGHT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); + else nk_input_key(ctx, NK_KEY_RIGHT, down); + break; + } + } + return 1; + + case SDL_MOUSEBUTTONUP: /* MOUSEBUTTONUP & MOUSEBUTTONDOWN share same routine */ + case SDL_MOUSEBUTTONDOWN: + { + int down = evt->type == SDL_MOUSEBUTTONDOWN; + const int x = evt->button.x, y = evt->button.y; + switch(evt->button.button) + { + case SDL_BUTTON_LEFT: + if (evt->button.clicks > 1) + nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); + nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); break; + case SDL_BUTTON_MIDDLE: nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); break; + case SDL_BUTTON_RIGHT: nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); break; + } + } + return 1; + + case SDL_MOUSEMOTION: + if (ctx->input.mouse.grabbed) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); + } + else nk_input_motion(ctx, evt->motion.x, evt->motion.y); + return 1; + + case SDL_TEXTINPUT: + { + nk_glyph glyph; + memcpy(glyph, evt->text.text, NK_UTF_SIZE); + nk_input_glyph(ctx, glyph); + } + return 1; + + case SDL_MOUSEWHEEL: + nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); + return 1; } return 0; } From 811dbacd12214f66756c2a6093b84e6534a7d0f5 Mon Sep 17 00:00:00 2001 From: lib-omar Date: Sat, 29 Jan 2022 14:18:07 -0500 Subject: [PATCH 52/89] Favor switch over if-else chain in event handler. --- demo/sdl_opengl3/nuklear_sdl_gl3.h | 175 +++++++++++++++-------------- 1 file changed, 92 insertions(+), 83 deletions(-) diff --git a/demo/sdl_opengl3/nuklear_sdl_gl3.h b/demo/sdl_opengl3/nuklear_sdl_gl3.h index e393628..5a89869 100644 --- a/demo/sdl_opengl3/nuklear_sdl_gl3.h +++ b/demo/sdl_opengl3/nuklear_sdl_gl3.h @@ -344,89 +344,98 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt) { struct nk_context *ctx = &sdl.ctx; - if (evt->type == SDL_KEYUP || evt->type == SDL_KEYDOWN) { - /* key events */ - int down = evt->type == SDL_KEYDOWN; - const Uint8* state = SDL_GetKeyboardState(0); - SDL_Keycode sym = evt->key.keysym.sym; - if (sym == SDLK_RSHIFT || sym == SDLK_LSHIFT) - nk_input_key(ctx, NK_KEY_SHIFT, down); - else if (sym == SDLK_DELETE) - nk_input_key(ctx, NK_KEY_DEL, down); - else if (sym == SDLK_RETURN) - nk_input_key(ctx, NK_KEY_ENTER, down); - else if (sym == SDLK_TAB) - nk_input_key(ctx, NK_KEY_TAB, down); - else if (sym == SDLK_BACKSPACE) - nk_input_key(ctx, NK_KEY_BACKSPACE, down); - else if (sym == SDLK_HOME) { - nk_input_key(ctx, NK_KEY_TEXT_START, down); - nk_input_key(ctx, NK_KEY_SCROLL_START, down); - } else if (sym == SDLK_END) { - nk_input_key(ctx, NK_KEY_TEXT_END, down); - nk_input_key(ctx, NK_KEY_SCROLL_END, down); - } else if (sym == SDLK_PAGEDOWN) { - nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); - } else if (sym == SDLK_PAGEUP) { - nk_input_key(ctx, NK_KEY_SCROLL_UP, down); - } else if (sym == SDLK_z) - nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_r) - nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_c) - nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_v) - nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_x) - nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_b) - nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_e) - nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_UP) - nk_input_key(ctx, NK_KEY_UP, down); - else if (sym == SDLK_DOWN) - nk_input_key(ctx, NK_KEY_DOWN, down); - else if (sym == SDLK_LEFT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); - else nk_input_key(ctx, NK_KEY_LEFT, down); - } else if (sym == SDLK_RIGHT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); - else nk_input_key(ctx, NK_KEY_RIGHT, down); - } else return 0; - return 1; - } else if (evt->type == SDL_MOUSEBUTTONDOWN || evt->type == SDL_MOUSEBUTTONUP) { - /* mouse button */ - int down = evt->type == SDL_MOUSEBUTTONDOWN; - const int x = evt->button.x, y = evt->button.y; - if (evt->button.button == SDL_BUTTON_LEFT) { - if (evt->button.clicks > 1) - nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); - nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); - } else if (evt->button.button == SDL_BUTTON_MIDDLE) - nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); - else if (evt->button.button == SDL_BUTTON_RIGHT) - nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); - return 1; - } else if (evt->type == SDL_MOUSEMOTION) { - /* mouse motion */ - if (ctx->input.mouse.grabbed) { - int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; - nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); - } else nk_input_motion(ctx, evt->motion.x, evt->motion.y); - return 1; - } else if (evt->type == SDL_TEXTINPUT) { - /* text input */ - nk_glyph glyph; - memcpy(glyph, evt->text.text, NK_UTF_SIZE); - nk_input_glyph(ctx, glyph); - return 1; - } else if (evt->type == SDL_MOUSEWHEEL) { - /* mouse wheel */ - nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); - return 1; + + /* optional grabbing behavior */ + if (ctx->input.mouse.grab) { + SDL_SetRelativeMouseMode(SDL_TRUE); + ctx->input.mouse.grab = 0; + } else if (ctx->input.mouse.ungrab) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + SDL_SetRelativeMouseMode(SDL_FALSE); + SDL_WarpMouseInWindow(sdl.win, x, y); + ctx->input.mouse.ungrab = 0; + } + + switch(evt->type) + { + case SDL_KEYUP: /* KEYUP & KEYDOWN share same routine */ + case SDL_KEYDOWN: + { + int down = evt->type == SDL_KEYDOWN; + const Uint8* state = SDL_GetKeyboardState(0); + switch(evt->key.keysym.sym) + { + case SDLK_RSHIFT: /* RSHIFT & LSHIFT share same routine */ + case SDLK_LSHIFT: nk_input_key(ctx, NK_KEY_SHIFT, down); break; + case SDLK_DELETE: nk_input_key(ctx, NK_KEY_DEL, down); break; + case SDLK_RETURN: nk_input_key(ctx, NK_KEY_ENTER, down); break; + case SDLK_TAB: nk_input_key(ctx, NK_KEY_TAB, down); break; + case SDLK_BACKSPACE: nk_input_key(ctx, NK_KEY_BACKSPACE, down); break; + case SDLK_HOME: nk_input_key(ctx, NK_KEY_TEXT_START, down); + nk_input_key(ctx, NK_KEY_SCROLL_START, down); break; + case SDLK_END: nk_input_key(ctx, NK_KEY_TEXT_END, down); + nk_input_key(ctx, NK_KEY_SCROLL_END, down); break; + case SDLK_PAGEDOWN: nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); break; + case SDLK_PAGEUP: nk_input_key(ctx, NK_KEY_SCROLL_UP, down); break; + case SDLK_z: nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_r: nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_c: nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_v: nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_x: nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_b: nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_e: nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_UP: nk_input_key(ctx, NK_KEY_UP, down); break; + case SDLK_DOWN: nk_input_key(ctx, NK_KEY_DOWN, down); break; + case SDLK_LEFT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); + else nk_input_key(ctx, NK_KEY_LEFT, down); + break; + case SDLK_RIGHT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); + else nk_input_key(ctx, NK_KEY_RIGHT, down); + break; + } + } + return 1; + + case SDL_MOUSEBUTTONUP: /* MOUSEBUTTONUP & MOUSEBUTTONDOWN share same routine */ + case SDL_MOUSEBUTTONDOWN: + { + int down = evt->type == SDL_MOUSEBUTTONDOWN; + const int x = evt->button.x, y = evt->button.y; + switch(evt->button.button) + { + case SDL_BUTTON_LEFT: + if (evt->button.clicks > 1) + nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); + nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); break; + case SDL_BUTTON_MIDDLE: nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); break; + case SDL_BUTTON_RIGHT: nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); break; + } + } + return 1; + + case SDL_MOUSEMOTION: + if (ctx->input.mouse.grabbed) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); + } + else nk_input_motion(ctx, evt->motion.x, evt->motion.y); + return 1; + + case SDL_TEXTINPUT: + { + nk_glyph glyph; + memcpy(glyph, evt->text.text, NK_UTF_SIZE); + nk_input_glyph(ctx, glyph); + } + return 1; + + case SDL_MOUSEWHEEL: + nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); + return 1; } return 0; } From f6851ea2ca4491c29206ba00dfeeddfb420d917d Mon Sep 17 00:00:00 2001 From: lib-omar Date: Sat, 29 Jan 2022 14:19:32 -0500 Subject: [PATCH 53/89] Favor switch over if-else chain in event handler. --- demo/sdl_opengl2/nuklear_sdl_gl2.h | 164 ++++++++++++++--------------- 1 file changed, 81 insertions(+), 83 deletions(-) diff --git a/demo/sdl_opengl2/nuklear_sdl_gl2.h b/demo/sdl_opengl2/nuklear_sdl_gl2.h index da2a080..93ca705 100644 --- a/demo/sdl_opengl2/nuklear_sdl_gl2.h +++ b/demo/sdl_opengl2/nuklear_sdl_gl2.h @@ -246,89 +246,87 @@ nk_sdl_handle_event(SDL_Event *evt) SDL_WarpMouseInWindow(sdl.win, x, y); ctx->input.mouse.ungrab = 0; } - if (evt->type == SDL_KEYUP || evt->type == SDL_KEYDOWN) { - /* key events */ - int down = evt->type == SDL_KEYDOWN; - const Uint8* state = SDL_GetKeyboardState(0); - SDL_Keycode sym = evt->key.keysym.sym; - if (sym == SDLK_RSHIFT || sym == SDLK_LSHIFT) - nk_input_key(ctx, NK_KEY_SHIFT, down); - else if (sym == SDLK_DELETE) - nk_input_key(ctx, NK_KEY_DEL, down); - else if (sym == SDLK_RETURN) - nk_input_key(ctx, NK_KEY_ENTER, down); - else if (sym == SDLK_TAB) - nk_input_key(ctx, NK_KEY_TAB, down); - else if (sym == SDLK_BACKSPACE) - nk_input_key(ctx, NK_KEY_BACKSPACE, down); - else if (sym == SDLK_HOME) { - nk_input_key(ctx, NK_KEY_TEXT_START, down); - nk_input_key(ctx, NK_KEY_SCROLL_START, down); - } else if (sym == SDLK_END) { - nk_input_key(ctx, NK_KEY_TEXT_END, down); - nk_input_key(ctx, NK_KEY_SCROLL_END, down); - } else if (sym == SDLK_PAGEDOWN) { - nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); - } else if (sym == SDLK_PAGEUP) { - nk_input_key(ctx, NK_KEY_SCROLL_UP, down); - } else if (sym == SDLK_z) - nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_r) - nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_c) - nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_v) - nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_x) - nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_b) - nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_e) - nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); - else if (sym == SDLK_UP) - nk_input_key(ctx, NK_KEY_UP, down); - else if (sym == SDLK_DOWN) - nk_input_key(ctx, NK_KEY_DOWN, down); - else if (sym == SDLK_LEFT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); - else nk_input_key(ctx, NK_KEY_LEFT, down); - } else if (sym == SDLK_RIGHT) { - if (state[SDL_SCANCODE_LCTRL]) - nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); - else nk_input_key(ctx, NK_KEY_RIGHT, down); - } else return 0; - return 1; - } else if (evt->type == SDL_MOUSEBUTTONDOWN || evt->type == SDL_MOUSEBUTTONUP) { - /* mouse button */ - int down = evt->type == SDL_MOUSEBUTTONDOWN; - const int x = evt->button.x, y = evt->button.y; - if (evt->button.button == SDL_BUTTON_LEFT) { - if (evt->button.clicks > 1) - nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); - nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); - } else if (evt->button.button == SDL_BUTTON_MIDDLE) - nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); - else if (evt->button.button == SDL_BUTTON_RIGHT) - nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); - return 1; - } else if (evt->type == SDL_MOUSEMOTION) { - /* mouse motion */ - if (ctx->input.mouse.grabbed) { - int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; - nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); - } else nk_input_motion(ctx, evt->motion.x, evt->motion.y); - return 1; - } else if (evt->type == SDL_TEXTINPUT) { - /* text input */ - nk_glyph glyph; - memcpy(glyph, evt->text.text, NK_UTF_SIZE); - nk_input_glyph(ctx, glyph); - return 1; - } else if (evt->type == SDL_MOUSEWHEEL) { - /* mouse wheel */ - nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); - return 1; + + switch(evt->type) + { + case SDL_KEYUP: /* KEYUP & KEYDOWN share same routine */ + case SDL_KEYDOWN: + { + int down = evt->type == SDL_KEYDOWN; + const Uint8* state = SDL_GetKeyboardState(0); + switch(evt->key.keysym.sym) + { + case SDLK_RSHIFT: /* RSHIFT & LSHIFT share same routine */ + case SDLK_LSHIFT: nk_input_key(ctx, NK_KEY_SHIFT, down); break; + case SDLK_DELETE: nk_input_key(ctx, NK_KEY_DEL, down); break; + case SDLK_RETURN: nk_input_key(ctx, NK_KEY_ENTER, down); break; + case SDLK_TAB: nk_input_key(ctx, NK_KEY_TAB, down); break; + case SDLK_BACKSPACE: nk_input_key(ctx, NK_KEY_BACKSPACE, down); break; + case SDLK_HOME: nk_input_key(ctx, NK_KEY_TEXT_START, down); + nk_input_key(ctx, NK_KEY_SCROLL_START, down); break; + case SDLK_END: nk_input_key(ctx, NK_KEY_TEXT_END, down); + nk_input_key(ctx, NK_KEY_SCROLL_END, down); break; + case SDLK_PAGEDOWN: nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down); break; + case SDLK_PAGEUP: nk_input_key(ctx, NK_KEY_SCROLL_UP, down); break; + case SDLK_z: nk_input_key(ctx, NK_KEY_TEXT_UNDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_r: nk_input_key(ctx, NK_KEY_TEXT_REDO, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_c: nk_input_key(ctx, NK_KEY_COPY, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_v: nk_input_key(ctx, NK_KEY_PASTE, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_x: nk_input_key(ctx, NK_KEY_CUT, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_b: nk_input_key(ctx, NK_KEY_TEXT_LINE_START, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_e: nk_input_key(ctx, NK_KEY_TEXT_LINE_END, down && state[SDL_SCANCODE_LCTRL]); break; + case SDLK_UP: nk_input_key(ctx, NK_KEY_UP, down); break; + case SDLK_DOWN: nk_input_key(ctx, NK_KEY_DOWN, down); break; + case SDLK_LEFT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down); + else nk_input_key(ctx, NK_KEY_LEFT, down); + break; + case SDLK_RIGHT: + if (state[SDL_SCANCODE_LCTRL]) + nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down); + else nk_input_key(ctx, NK_KEY_RIGHT, down); + break; + } + } + return 1; + + case SDL_MOUSEBUTTONUP: /* MOUSEBUTTONUP & MOUSEBUTTONDOWN share same routine */ + case SDL_MOUSEBUTTONDOWN: + { + int down = evt->type == SDL_MOUSEBUTTONDOWN; + const int x = evt->button.x, y = evt->button.y; + switch(evt->button.button) + { + case SDL_BUTTON_LEFT: + if (evt->button.clicks > 1) + nk_input_button(ctx, NK_BUTTON_DOUBLE, x, y, down); + nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); break; + case SDL_BUTTON_MIDDLE: nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down); break; + case SDL_BUTTON_RIGHT: nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down); break; + } + } + return 1; + + case SDL_MOUSEMOTION: + if (ctx->input.mouse.grabbed) { + int x = (int)ctx->input.mouse.prev.x, y = (int)ctx->input.mouse.prev.y; + nk_input_motion(ctx, x + evt->motion.xrel, y + evt->motion.yrel); + } + else nk_input_motion(ctx, evt->motion.x, evt->motion.y); + return 1; + + case SDL_TEXTINPUT: + { + nk_glyph glyph; + memcpy(glyph, evt->text.text, NK_UTF_SIZE); + nk_input_glyph(ctx, glyph); + } + return 1; + + case SDL_MOUSEWHEEL: + nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y)); + return 1; } return 0; } From f60e50232a7220b9da6fdd1fe10d3065758230f7 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 3 Feb 2022 15:30:35 -0500 Subject: [PATCH 54/89] Allow overriding the NK_INV_SQRT function --- nuklear.h | 14 ++++++++++---- src/CHANGELOG | 1 + src/HEADER | 2 +- src/nuklear_internal.h | 2 ++ src/nuklear_math.c | 3 +++ src/nuklear_vertex.c | 6 +++--- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/nuklear.h b/nuklear.h index 6699d61..9a33488 100644 --- a/nuklear.h +++ b/nuklear.h @@ -147,7 +147,7 @@ /// NK_ASSERT | If you don't define this, nuklear will use with assert(). /// NK_MEMSET | You can define this to 'memset' or your own memset implementation replacement. If not nuklear will use its own version. /// NK_MEMCPY | You can define this to 'memcpy' or your own memcpy implementation replacement. If not nuklear will use its own version. -/// NK_SQRT | You can define this to 'sqrt' or your own sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version. +/// NK_INV_SQRT | You can define this to your own inverse sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version. /// NK_SIN | You can define this to 'sinf' or your own sine implementation replacement. If not nuklear will use its own approximation implementation. /// NK_COS | You can define this to 'cosf' or your own cosine implementation replacement. If not nuklear will use its own approximation implementation. /// NK_STRTOD | You can define this to `strtod` or your own string to double conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!). @@ -5838,7 +5838,9 @@ NK_GLOBAL const struct nk_color nk_yellow = {255,255,0,255}; else (*(s)) = NK_WIDGET_STATE_INACTIVE; /* math */ +#ifndef NK_INV_SQRT NK_LIB float nk_inv_sqrt(float n); +#endif #ifndef NK_SIN NK_LIB float nk_sin(float x); #endif @@ -6132,6 +6134,8 @@ nk_stbtt_free(void *ptr, void *user_data) { (it can actually approximate a lot more functions) can be found here: www.lolengine.net/wiki/oss/lolremez */ +#ifndef NK_INV_SQRT +#define NK_INV_SQRT nk_inv_sqrt NK_LIB float nk_inv_sqrt(float n) { @@ -6144,6 +6148,7 @@ nk_inv_sqrt(float n) conv.f = conv.f * (threehalfs - (x2 * conv.f * conv.f)); return conv.f; } +#endif #ifndef NK_SIN #define NK_SIN nk_sin NK_LIB float @@ -9854,7 +9859,7 @@ nk_draw_list_stroke_poly_line(struct nk_draw_list *list, const struct nk_vec2 *p /* vec2 inverted length */ len = nk_vec2_len_sqr(diff); if (len != 0.0f) - len = nk_inv_sqrt(len); + len = NK_INV_SQRT(len); else len = 1.0f; diff = nk_vec2_muls(diff, len); @@ -10005,7 +10010,7 @@ nk_draw_list_stroke_poly_line(struct nk_draw_list *list, const struct nk_vec2 *p /* vec2 inverted length */ len = nk_vec2_len_sqr(diff); if (len != 0.0f) - len = nk_inv_sqrt(len); + len = NK_INV_SQRT(len); else len = 1.0f; diff = nk_vec2_muls(diff, len); @@ -10095,7 +10100,7 @@ nk_draw_list_fill_poly_convex(struct nk_draw_list *list, /* vec2 inverted length */ float len = nk_vec2_len_sqr(diff); if (len != 0.0f) - len = nk_inv_sqrt(len); + len = NK_INV_SQRT(len); else len = 1.0f; diff = nk_vec2_muls(diff, len); @@ -29624,6 +29629,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS /// - 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions /// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized /// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding diff --git a/src/CHANGELOG b/src/CHANGELOG index bbd956f..4be9f04 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS /// - 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions /// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized /// - 2021/12/22 (4.09.3) - Fix layout bounds not accounting for padding diff --git a/src/HEADER b/src/HEADER index a0c749f..3a5bffe 100644 --- a/src/HEADER +++ b/src/HEADER @@ -146,7 +146,7 @@ /// NK_ASSERT | If you don't define this, nuklear will use with assert(). /// NK_MEMSET | You can define this to 'memset' or your own memset implementation replacement. If not nuklear will use its own version. /// NK_MEMCPY | You can define this to 'memcpy' or your own memcpy implementation replacement. If not nuklear will use its own version. -/// NK_SQRT | You can define this to 'sqrt' or your own sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version. +/// NK_INV_SQRT | You can define this to your own inverse sqrt implementation replacement. If not nuklear will use its own slow and not highly accurate version. /// NK_SIN | You can define this to 'sinf' or your own sine implementation replacement. If not nuklear will use its own approximation implementation. /// NK_COS | You can define this to 'cosf' or your own cosine implementation replacement. If not nuklear will use its own approximation implementation. /// NK_STRTOD | You can define this to `strtod` or your own string to double conversion implementation replacement. If not defined nuklear will use its own imprecise and possibly unsafe version (does not handle nan or infinity!). diff --git a/src/nuklear_internal.h b/src/nuklear_internal.h index ec8081b..8d1b785 100644 --- a/src/nuklear_internal.h +++ b/src/nuklear_internal.h @@ -94,7 +94,9 @@ NK_GLOBAL const struct nk_color nk_yellow = {255,255,0,255}; else (*(s)) = NK_WIDGET_STATE_INACTIVE; /* math */ +#ifndef NK_INV_SQRT NK_LIB float nk_inv_sqrt(float n); +#endif #ifndef NK_SIN NK_LIB float nk_sin(float x); #endif diff --git a/src/nuklear_math.c b/src/nuklear_math.c index b70651b..c288a0b 100644 --- a/src/nuklear_math.c +++ b/src/nuklear_math.c @@ -33,6 +33,8 @@ (it can actually approximate a lot more functions) can be found here: www.lolengine.net/wiki/oss/lolremez */ +#ifndef NK_INV_SQRT +#define NK_INV_SQRT nk_inv_sqrt NK_LIB float nk_inv_sqrt(float n) { @@ -45,6 +47,7 @@ nk_inv_sqrt(float n) conv.f = conv.f * (threehalfs - (x2 * conv.f * conv.f)); return conv.f; } +#endif #ifndef NK_SIN #define NK_SIN nk_sin NK_LIB float diff --git a/src/nuklear_vertex.c b/src/nuklear_vertex.c index fe881c8..b98eb1e 100644 --- a/src/nuklear_vertex.c +++ b/src/nuklear_vertex.c @@ -477,7 +477,7 @@ nk_draw_list_stroke_poly_line(struct nk_draw_list *list, const struct nk_vec2 *p /* vec2 inverted length */ len = nk_vec2_len_sqr(diff); if (len != 0.0f) - len = nk_inv_sqrt(len); + len = NK_INV_SQRT(len); else len = 1.0f; diff = nk_vec2_muls(diff, len); @@ -628,7 +628,7 @@ nk_draw_list_stroke_poly_line(struct nk_draw_list *list, const struct nk_vec2 *p /* vec2 inverted length */ len = nk_vec2_len_sqr(diff); if (len != 0.0f) - len = nk_inv_sqrt(len); + len = NK_INV_SQRT(len); else len = 1.0f; diff = nk_vec2_muls(diff, len); @@ -718,7 +718,7 @@ nk_draw_list_fill_poly_convex(struct nk_draw_list *list, /* vec2 inverted length */ float len = nk_vec2_len_sqr(diff); if (len != 0.0f) - len = nk_inv_sqrt(len); + len = NK_INV_SQRT(len); else len = 1.0f; diff = nk_vec2_muls(diff, len); From e20240b84f448fbaaa05a43f41e555abc82875b6 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Thu, 3 Feb 2022 15:35:58 -0500 Subject: [PATCH 55/89] Update clib.json to 4.9.6 --- clib.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clib.json b/clib.json index 88e8d41..27c495f 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.9.5", + "version": "4.9.6", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], From 6686ab1dd514942bfd671eebcb78fe0427f79b02 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 6 Feb 2022 00:43:54 -0500 Subject: [PATCH 56/89] Fix incorrect cast on SDL_RenderGeometryRaw() Fixes #405 --- demo/sdl_renderer/nuklear_sdl_renderer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/sdl_renderer/nuklear_sdl_renderer.h b/demo/sdl_renderer/nuklear_sdl_renderer.h index 2107df1..cac4d79 100644 --- a/demo/sdl_renderer/nuklear_sdl_renderer.h +++ b/demo/sdl_renderer/nuklear_sdl_renderer.h @@ -135,9 +135,9 @@ nk_sdl_render(enum nk_anti_aliasing AA) SDL_RenderGeometryRaw(sdl.renderer, (SDL_Texture *)cmd->texture.ptr, - (const void*)((const nk_byte*)vertices + vp), vs, - (const void*)((const nk_byte*)vertices + vc), vs, - (const void*)((const nk_byte*)vertices + vt), vs, + (const float*)((const nk_byte*)vertices + vp), vs, + (const SDL_Color*)((const nk_byte*)vertices + vc), vs, + (const float*)((const nk_byte*)vertices + vt), vs, (vbuf.needed / vs), (void *) offset, cmd->elem_count, 2); From 703d73aebfa237c3106fa806b2eda274257e9a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludwig=20F=C3=BCchsl?= Date: Mon, 14 Feb 2022 20:51:28 +0100 Subject: [PATCH 57/89] Added D3D12 backend and demo --- demo/d3d12/build.bat | 9 + demo/d3d12/main.c | 439 +++++++++++ demo/d3d12/nuklear_d3d12.h | 882 +++++++++++++++++++++++ demo/d3d12/nuklear_d3d12.hlsl | 53 ++ demo/d3d12/nuklear_d3d12_pixel_shader.h | 135 ++++ demo/d3d12/nuklear_d3d12_vertex_shader.h | 168 +++++ 6 files changed, 1686 insertions(+) create mode 100644 demo/d3d12/build.bat create mode 100644 demo/d3d12/main.c create mode 100644 demo/d3d12/nuklear_d3d12.h create mode 100644 demo/d3d12/nuklear_d3d12.hlsl create mode 100644 demo/d3d12/nuklear_d3d12_pixel_shader.h create mode 100644 demo/d3d12/nuklear_d3d12_vertex_shader.h diff --git a/demo/d3d12/build.bat b/demo/d3d12/build.bat new file mode 100644 index 0000000..4230207 --- /dev/null +++ b/demo/d3d12/build.bat @@ -0,0 +1,9 @@ +@echo off + +rem This will use VS2015 for compiler... if you have vs 2015 and it is installed at this / the default path +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + +fxc.exe /nologo /T vs_5_1 /E vs /O3 /Zpc /Ges /Fh nuklear_d3d12_vertex_shader.h /Vn nk_d3d12_vertex_shader /Qstrip_reflect /Qstrip_debug /Qstrip_priv nuklear_d3d12.hlsl +fxc.exe /nologo /T ps_5_1 /E ps /O3 /Zpc /Ges /Fh nuklear_d3d12_pixel_shader.h /Vn nk_d3d12_pixel_shader /Qstrip_reflect /Qstrip_debug /Qstrip_priv /enable_unbounded_descriptor_tables nuklear_d3d12.hlsl + +cl /D_CRT_SECURE_NO_DEPRECATE /nologo /W3 /O2 /fp:fast /Gm- /Fedemo.exe main.c user32.lib dxguid.lib dxgi.lib d3d12.lib /link /incremental:no diff --git a/demo/d3d12/main.c b/demo/d3d12/main.c new file mode 100644 index 0000000..e635d0b --- /dev/null +++ b/demo/d3d12/main.c @@ -0,0 +1,439 @@ +/* nuklear - 1.32.0 - public domain */ +#define COBJMACROS +#define WIN32_LEAN_AND_MEAN +#include +#include +#include +#include +#include +#include +#include +#include + +#define WINDOW_WIDTH 800 +#define WINDOW_HEIGHT 600 +#define USER_TEXTURES 6 + +#define MAX_VERTEX_BUFFER 512 * 1024 +#define MAX_INDEX_BUFFER 128 * 1024 + +#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 +#define NK_INCLUDE_DEFAULT_FONT +#define NK_IMPLEMENTATION +#define NK_D3D12_IMPLEMENTATION +#include "../../nuklear.h" +#include "nuklear_d3d12.h" + +/* =============================================================== + * + * EXAMPLE + * + * ===============================================================*/ +/* This are some code examples to provide a small overview of what can be + * done with this library. To try out an example uncomment the defines */ +/*#define INCLUDE_ALL */ +/*#define INCLUDE_STYLE */ +/*#define INCLUDE_CALCULATOR */ +/*#define INCLUDE_CANVAS */ +/*#define INCLUDE_OVERVIEW */ +/*#define INCLUDE_NODE_EDITOR */ + +#ifdef INCLUDE_ALL + #define INCLUDE_STYLE + #define INCLUDE_CALCULATOR + #define INCLUDE_CANVAS + #define INCLUDE_OVERVIEW + #define INCLUDE_NODE_EDITOR +#endif + +#ifdef INCLUDE_STYLE + #include "../style.c" +#endif +#ifdef INCLUDE_CALCULATOR + #include "../calculator.c" +#endif +#ifdef INCLUDE_CANVAS + #include "../canvas.c" +#endif +#ifdef INCLUDE_OVERVIEW + #include "../overview.c" +#endif +#ifdef INCLUDE_NODE_EDITOR + #include "../node_editor.c" +#endif + +/* =============================================================== + * + * DEMO + * + * ===============================================================*/ +/* DXGI & Window related device objects */ +static IDXGIFactory2 *dxgi_factory; +static IDXGISwapChain1 *swap_chain; +static ID3D12DescriptorHeap *rtv_descriptor_heap; +static D3D12_CPU_DESCRIPTOR_HANDLE rtv_handles[2]; +static ID3D12Resource *rtv_buffers[2]; +static UINT rtv_desc_increment; +static UINT rtv_index; +/* DirectX common device objects */ +static ID3D12Device *device; +static ID3D12CommandQueue *command_queue; +static ID3D12Fence *queue_fence; +static UINT64 fence_value; +static ID3D12CommandAllocator *command_allocator; +static ID3D12GraphicsCommandList *command_list; + +static void signal_and_wait() +{ + HRESULT hr; + + /* Signal fence when execution finishes */ + hr = ID3D12CommandQueue_Signal(command_queue, queue_fence, ++fence_value); + assert(SUCCEEDED(hr)); + + /* Wait for queue to finish */ + while(ID3D12Fence_GetCompletedValue(queue_fence) != fence_value) + { + SwitchToThread(); /* Allow windows to do other work */ + } +} + +static void execute_commands() +{ + /* Prepare command list for execution */ + ID3D12GraphicsCommandList_Close(command_list); + + /* Execute on command queue */ + ID3D12CommandList* cmd_lists[] = { (ID3D12CommandList*)command_list}; + ID3D12CommandQueue_ExecuteCommandLists(command_queue, 1, cmd_lists); + + /* Wait for execution */ + signal_and_wait(); + + /* Reset command allocator and list */ + ID3D12CommandAllocator_Reset(command_allocator); + ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL); +} + +static void get_swap_chain_buffers() +{ + HRESULT hr; + D3D12_CPU_DESCRIPTOR_HANDLE descriptor_handle; + + /* Get resource objects from swap chain */ + hr = IDXGISwapChain1_GetBuffer(swap_chain, 0, &IID_ID3D12Resource, &rtv_buffers[0]); + assert(SUCCEEDED(hr)); + hr = IDXGISwapChain1_GetBuffer(swap_chain, 1, &IID_ID3D12Resource, &rtv_buffers[1]); + assert(SUCCEEDED(hr)); + + /* Recreate render target views */ + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_descriptor_heap, &descriptor_handle); + ID3D12Device_CreateRenderTargetView(device, rtv_buffers[0], NULL, descriptor_handle); + rtv_handles[0] = descriptor_handle; + descriptor_handle.ptr += rtv_desc_increment; + ID3D12Device_CreateRenderTargetView(device, rtv_buffers[1], NULL, descriptor_handle); + rtv_handles[1] = descriptor_handle; +} + +static void +set_swap_chain_size(int width, int height) +{ + HRESULT hr; + + /* Wait for pending work */ + signal_and_wait(); + signal_and_wait(); /* Two times because we have two buffers in flight */ + + /* Release all open refereces to the buffers */ + ID3D12Resource_Release(rtv_buffers[0]); + ID3D12Resource_Release(rtv_buffers[1]); + + /* DXGI can now perform resizing */ + hr = IDXGISwapChain1_ResizeBuffers(swap_chain, 2, width, height, DXGI_FORMAT_UNKNOWN, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); + assert(SUCCEEDED(hr)); + + /* Get references for the new resized buffers */ + get_swap_chain_buffers(); + + /* Reset RTV index */ + rtv_index = 0; +} + +static LRESULT CALLBACK +WindowProc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_DESTROY: + PostQuitMessage(0); + return 0; + + case WM_SIZE: + if (swap_chain) + { + int width = LOWORD(lparam); + int height = HIWORD(lparam); + set_swap_chain_size(width, height); + nk_d3d12_resize(width, height); + } + break; + } + + if (nk_d3d12_handle_event(wnd, msg, wparam, lparam)) + return 0; + + return DefWindowProcW(wnd, msg, wparam, lparam); +} + +int main(void) +{ + struct nk_context *ctx; + struct nk_colorf bg; + + WNDCLASSW wc; + RECT rect = { 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT }; + DWORD style = WS_OVERLAPPEDWINDOW; + DWORD exstyle = WS_EX_APPWINDOW; + HWND wnd; + int running = 1; + HRESULT hr; + + D3D12_COMMAND_QUEUE_DESC command_queue_desc; + DXGI_SWAP_CHAIN_DESC1 swap_chain_desc; + D3D12_DESCRIPTOR_HEAP_DESC rtv_desc_heap_desc; + + /* Win32 */ + memset(&wc, 0, sizeof(wc)); + wc.style = CS_DBLCLKS; + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleW(0); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.lpszClassName = L"NuklearWindowClass"; + RegisterClassW(&wc); + + AdjustWindowRectEx(&rect, style, FALSE, exstyle); + + wnd = CreateWindowExW(exstyle, wc.lpszClassName, L"Nuklear Demo", + style | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, + rect.right - rect.left, rect.bottom - rect.top, + NULL, NULL, wc.hInstance, NULL); + + /* D3D12 setup */ + /* Create default Device */ + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, &device); + assert(SUCCEEDED(hr)); + /* Create a command queue */ + command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + command_queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, &command_queue); + assert(SUCCEEDED(hr)); + /* Create a fence for command queue executions */ + fence_value = 0; + hr = ID3D12Device_CreateFence(device, fence_value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, &queue_fence); + assert(SUCCEEDED(hr)); + /* Create a command allocator */ + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, &command_allocator); + assert(SUCCEEDED(hr)); + /* Create a command list that will use our allocator */ + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, command_allocator, NULL, &IID_ID3D12GraphicsCommandList1, &command_list); + assert(SUCCEEDED(hr)); + + /* DXGI Setup (Swap chain & resources) */ + /* Create a descriptor heap for the back buffers */ + rtv_desc_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; + rtv_desc_heap_desc.NumDescriptors = 2; + rtv_desc_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; + rtv_desc_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateDescriptorHeap(device, &rtv_desc_heap_desc, &IID_ID3D12DescriptorHeap, &rtv_descriptor_heap); + assert(SUCCEEDED(hr)); + /* Get descriptor increment */ + rtv_desc_increment = ID3D12Device_GetDescriptorHandleIncrementSize(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV); + /* Get the DXGI factory */ + hr = CreateDXGIFactory1(&IID_IDXGIFactory2, &dxgi_factory); + assert(SUCCEEDED(hr)); + /* Create the swap chain */ + swap_chain_desc.Width = WINDOW_WIDTH; + swap_chain_desc.Height = WINDOW_HEIGHT; + swap_chain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swap_chain_desc.Stereo = 0; + swap_chain_desc.SampleDesc.Count = 1; + swap_chain_desc.SampleDesc.Quality = 0; + swap_chain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swap_chain_desc.BufferCount = 2; + swap_chain_desc.Scaling = DXGI_SCALING_STRETCH; + swap_chain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL ; + swap_chain_desc.AlphaMode = DXGI_ALPHA_MODE_IGNORE; + swap_chain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; + hr = IDXGIFactory2_CreateSwapChainForHwnd(dxgi_factory, (IUnknown*)command_queue, wnd, &swap_chain_desc, NULL, NULL, &swap_chain); + assert(SUCCEEDED(hr)); + get_swap_chain_buffers(); + + /* GUI */ + ctx = nk_d3d12_init(device, WINDOW_WIDTH, WINDOW_HEIGHT, MAX_VERTEX_BUFFER, MAX_INDEX_BUFFER, USER_TEXTURES); + + /* Load Fonts: if none of these are loaded a default font will be used */ + /* Load Cursor: if you uncomment cursor loading please hide the cursor */ + { + struct nk_font_atlas *atlas; + nk_d3d12_font_stash_begin(&atlas); + /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../extra_font/DroidSans.ttf", 14, 0);*/ + /*struct nk_font *robot = nk_font_atlas_add_from_file(atlas, "../../extra_font/Roboto-Regular.ttf", 14, 0);*/ + /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../extra_font/kenvector_future_thin.ttf", 13, 0);*/ + /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../extra_font/ProggyClean.ttf", 12, 0);*/ + /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../extra_font/ProggyTiny.ttf", 10, 0);*/ + /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../extra_font/Cousine-Regular.ttf", 13, 0);*/ + nk_d3d12_font_stash_end(command_list); + /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ + /*nk_style_set_font(ctx, &droid->handle)*/; + } + + /* Execute the command list to make sure all texture (font) data has been uploaded */ + execute_commands(); + /* Now we can cleanup all resources consumed by font stashing that are no longer used */ + nk_d3d12_font_stash_cleanup(); + + /* style.c */ + #ifdef INCLUDE_STYLE + /*set_style(ctx, THEME_WHITE);*/ + /*set_style(ctx, THEME_RED);*/ + /*set_style(ctx, THEME_BLUE);*/ + /*set_style(ctx, THEME_DARK);*/ + #endif + + bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f; + while (running) + { + /* Input */ + MSG msg; + nk_input_begin(ctx); + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_QUIT) + running = 0; + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + nk_input_end(ctx); + + /* GUI */ + if (nk_begin(ctx, "Demo", nk_rect(50, 50, 230, 250), + NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE| + NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) + { + enum {EASY, HARD}; + static int op = EASY; + static int property = 20; + + nk_layout_row_static(ctx, 30, 80, 1); + if (nk_button_label(ctx, "button")) + fprintf(stdout, "button pressed\n"); + nk_layout_row_dynamic(ctx, 30, 2); + if (nk_option_label(ctx, "easy", op == EASY)) op = EASY; + if (nk_option_label(ctx, "hard", op == HARD)) op = HARD; + nk_layout_row_dynamic(ctx, 22, 1); + nk_property_int(ctx, "Compression:", 0, &property, 100, 10, 1); + + nk_layout_row_dynamic(ctx, 20, 1); + nk_label(ctx, "background:", NK_TEXT_LEFT); + nk_layout_row_dynamic(ctx, 25, 1); + if (nk_combo_begin_color(ctx, nk_rgb_cf(bg), nk_vec2(nk_widget_width(ctx),400))) { + nk_layout_row_dynamic(ctx, 120, 1); + bg = nk_color_picker(ctx, bg, NK_RGBA); + nk_layout_row_dynamic(ctx, 25, 1); + bg.r = nk_propertyf(ctx, "#R:", 0, bg.r, 1.0f, 0.01f,0.005f); + bg.g = nk_propertyf(ctx, "#G:", 0, bg.g, 1.0f, 0.01f,0.005f); + bg.b = nk_propertyf(ctx, "#B:", 0, bg.b, 1.0f, 0.01f,0.005f); + bg.a = nk_propertyf(ctx, "#A:", 0, bg.a, 1.0f, 0.01f,0.005f); + nk_combo_end(ctx); + } + } + nk_end(ctx); + + /* -------------- EXAMPLES ---------------- */ + #ifdef INCLUDE_CALCULATOR + calculator(ctx); + #endif + #ifdef INCLUDE_CANVAS + canvas(ctx); + #endif + #ifdef INCLUDE_OVERVIEW + overview(ctx); + #endif + #ifdef INCLUDE_NODE_EDITOR + node_editor(ctx); + #endif + /* ----------------------------------------- */ + + /* Set rtv resource state */ + D3D12_RESOURCE_BARRIER resource_barrier; + resource_barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barrier.Transition.pResource = rtv_buffers[rtv_index]; + resource_barrier.Transition.Subresource = 0; + resource_barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_PRESENT; + resource_barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_RENDER_TARGET; + resource_barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &resource_barrier); + + /* Clear and set the rtv */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handles[rtv_index], &bg.r, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handles[rtv_index], FALSE, NULL); + + /* Draw */ + nk_d3d12_render(command_list, NK_ANTI_ALIASING_ON); + + /* Bring the rtv resource back to present state */ + resource_barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barrier.Transition.pResource = rtv_buffers[rtv_index]; + resource_barrier.Transition.Subresource = 0; + resource_barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_RENDER_TARGET; + resource_barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_PRESENT; + resource_barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &resource_barrier); + + /* Execute command list and wait */ + execute_commands(); + + /* Present frame */ + hr = IDXGISwapChain2_Present(swap_chain, 1, 0); + rtv_index = (rtv_index + 1) % 2; + if (hr == DXGI_ERROR_DEVICE_RESET || hr == DXGI_ERROR_DEVICE_REMOVED) { + /* to recover from this, you'll need to recreate device and all the resources */ + MessageBoxW(NULL, L"D3D12 device is lost or removed!", L"Error", 0); + break; + } else if (hr == DXGI_STATUS_OCCLUDED) { + /* window is not visible, so vsync won't work. Let's sleep a bit to reduce CPU usage */ + Sleep(10); + } + assert(SUCCEEDED(hr)); + } + + /* Nuklear shutdown */ + nk_d3d12_shutdown(); + + /* D3D12 and DXGI shutdown */ + signal_and_wait(); + signal_and_wait(); /* Two times because we have two buffers in flight */ + ID3D12Resource_Release(rtv_buffers[0]); + ID3D12Resource_Release(rtv_buffers[1]); + ID3D12DescriptorHeap_Release(rtv_descriptor_heap); + IDXGISwapChain1_Release(swap_chain); + IDXGIFactory2_Release(dxgi_factory); + ID3D12GraphicsCommandList_Release(command_list); + ID3D12CommandAllocator_Release(command_allocator); + ID3D12CommandQueue_Release(command_queue); + ID3D12Fence_Release(queue_fence); + ID3D12Device_Release(device); + + /* win32 shutdown */ + UnregisterClassW(wc.lpszClassName, wc.hInstance); + + return 0; +} diff --git a/demo/d3d12/nuklear_d3d12.h b/demo/d3d12/nuklear_d3d12.h new file mode 100644 index 0000000..16ba965 --- /dev/null +++ b/demo/d3d12/nuklear_d3d12.h @@ -0,0 +1,882 @@ +/* + * Nuklear - 1.32.0 - public domain + * no warrenty implied; use at your own risk. + * authored from 2015-2016 by Micha Mettke + * + * D3D12 backend created by Ludwig Fuechsl (2022) + */ +/* + * ============================================================== + * + * API + * + * =============================================================== + */ +#ifndef NK_D3D12_H_ +#define NK_D3D12_H_ + +#define WIN32_LEAN_AND_MEAN +#include + +NK_API struct nk_context *nk_d3d12_init(ID3D12Device *device, int width, int height, unsigned int max_vertex_buffer, unsigned int max_index_buffer, unsigned int max_user_textures); +NK_API void nk_d3d12_font_stash_begin(struct nk_font_atlas **atlas); +NK_API void nk_d3d12_font_stash_end(ID3D12GraphicsCommandList *command_list); +NK_API void nk_d3d12_font_stash_cleanup(); +NK_API nk_bool nk_d3d12_set_user_texture(unsigned int index, ID3D12Resource* texture, const D3D12_SHADER_RESOURCE_VIEW_DESC* description, nk_handle* handle_out); +NK_API int nk_d3d12_handle_event(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); +NK_API void nk_d3d12_render(ID3D12GraphicsCommandList *command_list, enum nk_anti_aliasing AA); +NK_API void nk_d3d12_resize(int width, int height); +NK_API void nk_d3d12_shutdown(void); + +#endif +/* + * ============================================================== + * + * IMPLEMENTATION + * + * =============================================================== + */ +#ifdef NK_D3D12_IMPLEMENTATION + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include + +#include +#include +#include +#include + +#include "nuklear_d3d12_vertex_shader.h" +#include "nuklear_d3d12_pixel_shader.h" + +struct nk_d3d12_vertex +{ + float position[2]; + float uv[2]; + nk_byte col[4]; +}; + +static struct +{ + struct nk_context ctx; + struct nk_font_atlas atlas; + struct nk_buffer cmds; + + struct nk_draw_null_texture null; + unsigned int max_vertex_buffer; + unsigned int max_index_buffer; + unsigned int max_user_textures; + + D3D12_HEAP_PROPERTIES heap_prop_default; + D3D12_HEAP_PROPERTIES heap_prop_upload; + + UINT cbv_srv_uav_desc_increment; + + D3D12_VIEWPORT viewport; + ID3D12Device *device; + ID3D12RootSignature *root_signature; + ID3D12PipelineState *pipeline_state; + ID3D12DescriptorHeap *desc_heap; + ID3D12Resource *font_texture; + ID3D12Resource *font_upload_buffer; + ID3D12Resource *upload_buffer; + ID3D12Resource *const_buffer; + ID3D12Resource *index_buffer; + ID3D12Resource *vertex_buffer; + + D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_descriptor_handle; + D3D12_GPU_VIRTUAL_ADDRESS gpu_vertex_buffer_address; + D3D12_GPU_VIRTUAL_ADDRESS gpu_index_buffer_address; +} d3d12; + +NK_API void +nk_d3d12_render(ID3D12GraphicsCommandList *command_list, enum nk_anti_aliasing AA) +{ + HRESULT hr; +#ifdef NK_UINT_DRAW_INDEX + DXGI_FORMAT index_buffer_format = DXGI_FORMAT_R32_UINT; +#else + DXGI_FORMAT index_buffer_format = DXGI_FORMAT_R16_UINT; +#endif + const UINT stride = sizeof(struct nk_d3d12_vertex); + const struct nk_draw_command *cmd; + UINT offset = 0; + D3D12_VERTEX_BUFFER_VIEW vertex_buffer_view; + D3D12_INDEX_BUFFER_VIEW index_buffer_view; + unsigned char* ptr_data; + D3D12_RANGE map_range; + D3D12_RESOURCE_BARRIER resource_barriers[3]; + + /* Activate D3D12 pipeline state and config root signature */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, d3d12.pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, d3d12.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &d3d12.desc_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, d3d12.gpu_descriptor_handle); + + /* Configure rendering pipeline */ + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + vertex_buffer_view.BufferLocation = d3d12.gpu_vertex_buffer_address; + vertex_buffer_view.SizeInBytes = d3d12.max_vertex_buffer; + vertex_buffer_view.StrideInBytes = stride; + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vertex_buffer_view); + index_buffer_view.BufferLocation = d3d12.gpu_index_buffer_address; + index_buffer_view.Format = index_buffer_format; + index_buffer_view.SizeInBytes = d3d12.max_index_buffer; + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &index_buffer_view); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &d3d12.viewport); + + /* Map upload buffer to cpu accessible pointer */ + map_range.Begin = sizeof(float) * 4 * 4; + map_range.End = map_range.Begin + d3d12.max_vertex_buffer + d3d12.max_index_buffer; + hr = ID3D12Resource_Map(d3d12.upload_buffer, 0, &map_range, &ptr_data); + NK_ASSERT(SUCCEEDED(hr)); + + /* Nuklear convert and copy to upload buffer */ + { + struct nk_convert_config config; + NK_STORAGE const struct nk_draw_vertex_layout_element vertex_layout[] = { + {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_d3d12_vertex, position)}, + {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_d3d12_vertex, uv)}, + {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_d3d12_vertex, col)}, + {NK_VERTEX_LAYOUT_END} + }; + memset(&config, 0, sizeof(config)); + config.vertex_layout = vertex_layout; + config.vertex_size = sizeof(struct nk_d3d12_vertex); + config.vertex_alignment = NK_ALIGNOF(struct nk_d3d12_vertex); + config.global_alpha = 1.0f; + config.shape_AA = AA; + config.line_AA = AA; + config.circle_segment_count = 22; + config.curve_segment_count = 22; + config.arc_segment_count = 22; + config.null = d3d12.null; + + struct nk_buffer vbuf, ibuf; + nk_buffer_init_fixed(&vbuf, &ptr_data[sizeof(float) * 4 * 4], (size_t)d3d12.max_vertex_buffer); + nk_buffer_init_fixed(&ibuf, &ptr_data[sizeof(float) * 4 * 4 + d3d12.max_vertex_buffer], (size_t)d3d12.max_index_buffer); + nk_convert(&d3d12.ctx, &d3d12.cmds, &vbuf, &ibuf, &config); + } + + /* Close mapping range */ + ID3D12Resource_Unmap(d3d12.upload_buffer, 0, &map_range); + + /* Issue GPU resource change for copying */ + resource_barriers[0].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barriers[0].Transition.pResource = d3d12.const_buffer; + resource_barriers[0].Transition.Subresource = 0; + resource_barriers[0].Transition.StateBefore = D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER; + resource_barriers[0].Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barriers[0].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + resource_barriers[1].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barriers[1].Transition.pResource = d3d12.vertex_buffer; + resource_barriers[1].Transition.Subresource = 0; + resource_barriers[1].Transition.StateBefore = D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER; + resource_barriers[1].Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barriers[1].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + resource_barriers[2].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barriers[2].Transition.pResource = d3d12.index_buffer; + resource_barriers[2].Transition.Subresource = 0; + resource_barriers[2].Transition.StateBefore = D3D12_RESOURCE_STATE_INDEX_BUFFER; + resource_barriers[2].Transition.StateAfter = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barriers[2].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + ID3D12GraphicsCommandList_ResourceBarrier(command_list, 3, resource_barriers); + + /* Copy from upload buffer to gpu buffers */ + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, d3d12.const_buffer, 0, d3d12.upload_buffer, 0, sizeof(float) * 4 * 4); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, d3d12.vertex_buffer, 0, d3d12.upload_buffer, sizeof(float) * 4 * 4, d3d12.max_vertex_buffer); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, d3d12.index_buffer, 0, d3d12.upload_buffer, sizeof(float) * 4 * 4 + d3d12.max_vertex_buffer, d3d12.max_index_buffer); + + /* Issue GPU resource change for rendering */ + resource_barriers[0].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barriers[0].Transition.pResource = d3d12.const_buffer; + resource_barriers[0].Transition.Subresource = 0; + resource_barriers[0].Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barriers[0].Transition.StateAfter = D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER; + resource_barriers[0].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + resource_barriers[1].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barriers[1].Transition.pResource = d3d12.vertex_buffer; + resource_barriers[1].Transition.Subresource = 0; + resource_barriers[1].Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barriers[1].Transition.StateAfter = D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER; + resource_barriers[1].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + resource_barriers[2].Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barriers[2].Transition.pResource = d3d12.index_buffer; + resource_barriers[2].Transition.Subresource = 0; + resource_barriers[2].Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barriers[2].Transition.StateAfter = D3D12_RESOURCE_STATE_INDEX_BUFFER; + resource_barriers[2].Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + ID3D12GraphicsCommandList_ResourceBarrier(command_list, 3, resource_barriers); + + /* Issue draw commands */ + nk_draw_foreach(cmd, &d3d12.ctx, &d3d12.cmds) + { + D3D12_RECT scissor; + UINT32 texture_id; + + /* Only place a drawcall in case the command contains drawable data */ + if(cmd->elem_count) + { + /* Setup scissor rect */ + scissor.left = (LONG)cmd->clip_rect.x; + scissor.right = (LONG)(cmd->clip_rect.x + cmd->clip_rect.w); + scissor.top = (LONG)cmd->clip_rect.y; + scissor.bottom = (LONG)(cmd->clip_rect.y + cmd->clip_rect.h); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &scissor); + + /* Setup texture (index to descriptor heap table) to use for draw call */ + texture_id = (UINT32)cmd->texture.id; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &texture_id, 0); + + /* Dispatch draw call */ + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, (UINT)cmd->elem_count, 1, offset, 0, 0); + offset += cmd->elem_count; + } + } + + /* Default nuklear context and command buffer clear */ + nk_clear(&d3d12.ctx); + nk_buffer_clear(&d3d12.cmds); +} + +static void +nk_d3d12_get_projection_matrix(int width, int height, float *result) +{ + const float L = 0.0f; + const float R = (float)width; + const float T = 0.0f; + const float B = (float)height; + float matrix[4][4] = + { + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 0.5f, 0.0f }, + { 0.0f, 0.0f, 0.5f, 1.0f }, + }; + matrix[0][0] = 2.0f / (R - L); + matrix[1][1] = 2.0f / (T - B); + matrix[3][0] = (R + L) / (L - R); + matrix[3][1] = (T + B) / (B - T); + memcpy(result, matrix, sizeof(matrix)); +} + +NK_API void +nk_d3d12_resize(int width, int height) +{ + D3D12_RANGE map_range; + void* ptr_data; + + /* Describe area to be mapped (the upload buffer region where the constant buffer / projection matrix) lives */ + map_range.Begin = 0; + map_range.End = sizeof(float) * 4 * 4; + + /* Map area to cpu accassible pointer (from upload buffer) */ + if (SUCCEEDED(ID3D12Resource_Map(d3d12.upload_buffer, 0, &map_range, &ptr_data))) + { + /* Compute projection matrix into upload buffer */ + nk_d3d12_get_projection_matrix(width, height, (float*)ptr_data); + ID3D12Resource_Unmap(d3d12.upload_buffer, 0, &map_range); + + /* Update internal viewport state to relect resize changes */ + d3d12.viewport.Width = (float)width; + d3d12.viewport.Height = (float)height; + } + + /* + NOTE: + When mapping and copying succeeds, the data will still be in CPU sided memory + copying to the GPU is done in the nk_d3d12_render function + */ +} + +NK_API int +nk_d3d12_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + { + int down = !((lparam >> 31) & 1); + int ctrl = GetKeyState(VK_CONTROL) & (1 << 15); + + switch (wparam) + { + case VK_SHIFT: + case VK_LSHIFT: + case VK_RSHIFT: + nk_input_key(&d3d12.ctx, NK_KEY_SHIFT, down); + return 1; + + case VK_DELETE: + nk_input_key(&d3d12.ctx, NK_KEY_DEL, down); + return 1; + + case VK_RETURN: + nk_input_key(&d3d12.ctx, NK_KEY_ENTER, down); + return 1; + + case VK_TAB: + nk_input_key(&d3d12.ctx, NK_KEY_TAB, down); + return 1; + + case VK_LEFT: + if (ctrl) + nk_input_key(&d3d12.ctx, NK_KEY_TEXT_WORD_LEFT, down); + else + nk_input_key(&d3d12.ctx, NK_KEY_LEFT, down); + return 1; + + case VK_RIGHT: + if (ctrl) + nk_input_key(&d3d12.ctx, NK_KEY_TEXT_WORD_RIGHT, down); + else + nk_input_key(&d3d12.ctx, NK_KEY_RIGHT, down); + return 1; + + case VK_BACK: + nk_input_key(&d3d12.ctx, NK_KEY_BACKSPACE, down); + return 1; + + case VK_HOME: + nk_input_key(&d3d12.ctx, NK_KEY_TEXT_START, down); + nk_input_key(&d3d12.ctx, NK_KEY_SCROLL_START, down); + return 1; + + case VK_END: + nk_input_key(&d3d12.ctx, NK_KEY_TEXT_END, down); + nk_input_key(&d3d12.ctx, NK_KEY_SCROLL_END, down); + return 1; + + case VK_NEXT: + nk_input_key(&d3d12.ctx, NK_KEY_SCROLL_DOWN, down); + return 1; + + case VK_PRIOR: + nk_input_key(&d3d12.ctx, NK_KEY_SCROLL_UP, down); + return 1; + + case 'C': + if (ctrl) { + nk_input_key(&d3d12.ctx, NK_KEY_COPY, down); + return 1; + } + break; + + case 'V': + if (ctrl) { + nk_input_key(&d3d12.ctx, NK_KEY_PASTE, down); + return 1; + } + break; + + case 'X': + if (ctrl) { + nk_input_key(&d3d12.ctx, NK_KEY_CUT, down); + return 1; + } + break; + + case 'Z': + if (ctrl) { + nk_input_key(&d3d12.ctx, NK_KEY_TEXT_UNDO, down); + return 1; + } + break; + + case 'R': + if (ctrl) { + nk_input_key(&d3d12.ctx, NK_KEY_TEXT_REDO, down); + return 1; + } + break; + } + return 0; + } + + case WM_CHAR: + if (wparam >= 32) + { + nk_input_unicode(&d3d12.ctx, (nk_rune)wparam); + return 1; + } + break; + + case WM_LBUTTONDOWN: + nk_input_button(&d3d12.ctx, NK_BUTTON_LEFT, (short)LOWORD(lparam), (short)HIWORD(lparam), 1); + SetCapture(wnd); + return 1; + + case WM_LBUTTONUP: + nk_input_button(&d3d12.ctx, NK_BUTTON_DOUBLE, (short)LOWORD(lparam), (short)HIWORD(lparam), 0); + nk_input_button(&d3d12.ctx, NK_BUTTON_LEFT, (short)LOWORD(lparam), (short)HIWORD(lparam), 0); + ReleaseCapture(); + return 1; + + case WM_RBUTTONDOWN: + nk_input_button(&d3d12.ctx, NK_BUTTON_RIGHT, (short)LOWORD(lparam), (short)HIWORD(lparam), 1); + SetCapture(wnd); + return 1; + + case WM_RBUTTONUP: + nk_input_button(&d3d12.ctx, NK_BUTTON_RIGHT, (short)LOWORD(lparam), (short)HIWORD(lparam), 0); + ReleaseCapture(); + return 1; + + case WM_MBUTTONDOWN: + nk_input_button(&d3d12.ctx, NK_BUTTON_MIDDLE, (short)LOWORD(lparam), (short)HIWORD(lparam), 1); + SetCapture(wnd); + return 1; + + case WM_MBUTTONUP: + nk_input_button(&d3d12.ctx, NK_BUTTON_MIDDLE, (short)LOWORD(lparam), (short)HIWORD(lparam), 0); + ReleaseCapture(); + return 1; + + case WM_MOUSEWHEEL: + nk_input_scroll(&d3d12.ctx, nk_vec2(0,(float)(short)HIWORD(wparam) / WHEEL_DELTA)); + return 1; + + case WM_MOUSEMOVE: + nk_input_motion(&d3d12.ctx, (short)LOWORD(lparam), (short)HIWORD(lparam)); + return 1; + + case WM_LBUTTONDBLCLK: + nk_input_button(&d3d12.ctx, NK_BUTTON_DOUBLE, (short)LOWORD(lparam), (short)HIWORD(lparam), 1); + return 1; + } + + return 0; +} + +static void +nk_d3d12_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) +{ + (void)usr; + if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) + { + HGLOBAL mem = GetClipboardData(CF_UNICODETEXT); + if (mem) + { + SIZE_T size = GlobalSize(mem) - 1; + if (size) + { + LPCWSTR wstr = (LPCWSTR)GlobalLock(mem); + if (wstr) + { + int utf8size = WideCharToMultiByte(CP_UTF8, 0, wstr, size / sizeof(wchar_t), NULL, 0, NULL, NULL); + if (utf8size) + { + char* utf8 = (char*)malloc(utf8size); + if (utf8) + { + WideCharToMultiByte(CP_UTF8, 0, wstr, size / sizeof(wchar_t), utf8, utf8size, NULL, NULL); + nk_textedit_paste(edit, utf8, utf8size); + free(utf8); + } + } + GlobalUnlock(mem); + } + } + } + CloseClipboard(); + } +} + +static void +nk_d3d12_clipboard_copy(nk_handle usr, const char *text, int len) +{ + (void)usr; + if (OpenClipboard(NULL)) + { + int wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0); + if (wsize) + { + HGLOBAL mem = GlobalAlloc(GMEM_MOVEABLE, (wsize + 1) * sizeof(wchar_t)); + if (mem) + { + wchar_t* wstr = (wchar_t*)GlobalLock(mem); + if (wstr) + { + MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize); + wstr[wsize] = 0; + GlobalUnlock(mem); + SetClipboardData(CF_UNICODETEXT, mem); + } + } + } + CloseClipboard(); + } +} + +NK_API struct nk_context* +nk_d3d12_init(ID3D12Device *device, int width, int height, unsigned int max_vertex_buffer, unsigned int max_index_buffer, unsigned int max_user_textures) +{ + HRESULT hr; + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv; + D3D12_CPU_DESCRIPTOR_HANDLE cbv_handle; + + /* Do plain object / ref copys */ + d3d12.max_vertex_buffer = max_vertex_buffer; + d3d12.max_index_buffer = max_index_buffer; + d3d12.max_user_textures = max_user_textures; + d3d12.device = device; + ID3D12Device_AddRef(device); + d3d12.font_texture = NULL; + d3d12.font_upload_buffer = NULL; + + /* Init nuklear context */ + nk_init_default(&d3d12.ctx, 0); + d3d12.ctx.clip.copy = nk_d3d12_clipboard_copy; + d3d12.ctx.clip.paste = nk_d3d12_clipboard_paste; + d3d12.ctx.clip.userdata = nk_handle_ptr(0); + + /* Init nuklear buffer */ + nk_buffer_init_default(&d3d12.cmds); + + /* Define Heap properties */ + d3d12.heap_prop_default.Type = D3D12_HEAP_TYPE_DEFAULT; + d3d12.heap_prop_default.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN; + d3d12.heap_prop_default.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN; + d3d12.heap_prop_default.CreationNodeMask = 0; + d3d12.heap_prop_default.VisibleNodeMask = 0; + d3d12.heap_prop_upload.Type = D3D12_HEAP_TYPE_UPLOAD; + d3d12.heap_prop_upload.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN; + d3d12.heap_prop_upload.MemoryPoolPreference = D3D12_MEMORY_POOL_UNKNOWN; + d3d12.heap_prop_upload.CreationNodeMask = 0; + d3d12.heap_prop_upload.VisibleNodeMask = 0; + + /* Create data objects */ + /* Create upload buffer */ + { + D3D12_RESOURCE_DESC desc; + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Width = (sizeof(float) * 4 * 4) + max_vertex_buffer + max_index_buffer; /* Needs to hold matrix + vertices + indicies */ + desc.Height = 1; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_UNKNOWN; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + desc.Flags = D3D12_RESOURCE_FLAG_NONE; + hr = ID3D12Device_CreateCommittedResource(device, &d3d12.heap_prop_upload, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, &IID_ID3D12Resource, &d3d12.upload_buffer); + NK_ASSERT(SUCCEEDED(hr)); + } + /* Create constant buffer */ + { + D3D12_RESOURCE_DESC desc; + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Width = 256; /* Should be sizeof(float) * 4 * 4 - but this does not match how d3d12 works (min CBV size of 256) */ + desc.Height = 1; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_UNKNOWN; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + desc.Flags = D3D12_RESOURCE_FLAG_NONE; + hr = ID3D12Device_CreateCommittedResource(device, &d3d12.heap_prop_default, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, &d3d12.const_buffer); + NK_ASSERT(SUCCEEDED(hr)); + } + /* Create vertex buffer */ + { + D3D12_RESOURCE_DESC desc; + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Width = max_vertex_buffer; + desc.Height = 1; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_UNKNOWN; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + desc.Flags = D3D12_RESOURCE_FLAG_NONE; + hr = ID3D12Device_CreateCommittedResource(device, &d3d12.heap_prop_default, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, &d3d12.vertex_buffer); + NK_ASSERT(SUCCEEDED(hr)); + } + /* Create index buffer */ + { + D3D12_RESOURCE_DESC desc; + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Width = max_index_buffer; + desc.Height = 1; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_UNKNOWN; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + desc.Flags = D3D12_RESOURCE_FLAG_NONE; + hr = ID3D12Device_CreateCommittedResource(device, &d3d12.heap_prop_default, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, &d3d12.index_buffer); + NK_ASSERT(SUCCEEDED(hr)); + } + + /* Create descriptor heap for shader root signature */ + { + D3D12_DESCRIPTOR_HEAP_DESC desc; + desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; + desc.NumDescriptors = 2 + max_user_textures; + desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + desc.NodeMask = 0; + ID3D12Device_CreateDescriptorHeap(device, &desc, &IID_ID3D12DescriptorHeap, &d3d12.desc_heap); + } + + /* Get address of first handle (CPU and GPU) */ + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(d3d12.desc_heap, &d3d12.cpu_descriptor_handle); + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(d3d12.desc_heap, &d3d12.gpu_descriptor_handle); + + /* Get addresses of vertex & index buffers */ + d3d12.gpu_vertex_buffer_address = ID3D12Resource_GetGPUVirtualAddress(d3d12.vertex_buffer); + d3d12.gpu_index_buffer_address = ID3D12Resource_GetGPUVirtualAddress(d3d12.index_buffer); + + /* Get handle increment */ + d3d12.cbv_srv_uav_desc_increment = ID3D12Device_GetDescriptorHandleIncrementSize(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); + + /* Create view to constant buffer */ + cbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(d3d12.const_buffer); + cbv.SizeInBytes = 256; + cbv_handle = d3d12.cpu_descriptor_handle; + ID3D12Device_CreateConstantBufferView(device, &cbv, cbv_handle); + + /* Create root signature */ + hr = ID3D12Device_CreateRootSignature(device, 0, nk_d3d12_vertex_shader, sizeof(nk_d3d12_vertex_shader), &IID_ID3D12RootSignature, &d3d12.root_signature); + NK_ASSERT(SUCCEEDED(hr)); + + /* Create pipeline state */ + { + /* Describe input layout */ + const D3D12_INPUT_ELEMENT_DESC layout[] = { + { "POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, NK_OFFSETOF(struct nk_d3d12_vertex, position), D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }, + { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, NK_OFFSETOF(struct nk_d3d12_vertex, uv), D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }, + { "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NK_OFFSETOF(struct nk_d3d12_vertex, col), D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }, + }; + + /* Describe pipeline state */ + D3D12_GRAPHICS_PIPELINE_STATE_DESC desc; + memset(&desc, 0, sizeof(desc)); + desc.pRootSignature = d3d12.root_signature; + desc.VS.pShaderBytecode = nk_d3d12_vertex_shader; + desc.VS.BytecodeLength = sizeof(nk_d3d12_vertex_shader); + desc.PS.pShaderBytecode = nk_d3d12_pixel_shader; + desc.PS.BytecodeLength = sizeof(nk_d3d12_pixel_shader); + desc.BlendState.RenderTarget[0].BlendEnable = TRUE; + desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_ALPHA; + desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_INV_SRC_ALPHA; + desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_INV_SRC_ALPHA; + desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_ZERO; + desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + desc.BlendState.RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL; + desc.SampleMask = UINT_MAX; + desc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID; + desc.RasterizerState.CullMode= D3D12_CULL_MODE_NONE; + desc.RasterizerState.DepthClipEnable = TRUE; + desc.InputLayout.NumElements = _countof(layout); + desc.InputLayout.pInputElementDescs = layout; + desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; + desc.NumRenderTargets = 1; + desc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM; /* NOTE: When using HDR rendering you might have a different framebuffer format */ + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.NodeMask = 0; + + /* Create PSO */ + hr = ID3D12Device_CreateGraphicsPipelineState(device, &desc, &IID_ID3D12PipelineState, &d3d12.pipeline_state); + NK_ASSERT(SUCCEEDED(hr)); + } + + /* First time const buffer init */ + nk_d3d12_resize(width, height); + + /* viewport */ + d3d12.viewport.TopLeftX = 0.0f; + d3d12.viewport.TopLeftY = 0.0f; + d3d12.viewport.Width = (float)width; + d3d12.viewport.Height = (float)height; + d3d12.viewport.MinDepth = 0.0f; + d3d12.viewport.MaxDepth = 1.0f; + + return &d3d12.ctx; +} + +NK_API void +nk_d3d12_font_stash_begin(struct nk_font_atlas **atlas) +{ + /* Default nuklear font stash */ + nk_font_atlas_init_default(&d3d12.atlas); + nk_font_atlas_begin(&d3d12.atlas); + *atlas = &d3d12.atlas; +} + +NK_API void +nk_d3d12_font_stash_end(ID3D12GraphicsCommandList *command_list) +{ + HRESULT hr; + D3D12_TEXTURE_COPY_LOCATION cpy_src, cpy_dest; + D3D12_BOX cpy_box; + D3D12_RESOURCE_BARRIER resource_barrier; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D12_CPU_DESCRIPTOR_HANDLE srv_handle; + const void *image; + void* ptr_data; + int w, h; + + /* Bake nuklear font atlas */ + image = nk_font_atlas_bake(&d3d12.atlas, &w, &h, NK_FONT_ATLAS_RGBA32); + NK_ASSERT(image); + + /* Create font texture */ + { + D3D12_RESOURCE_DESC desc; + desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Width = w; + desc.Height = h; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + desc.Flags = D3D12_RESOURCE_FLAG_NONE; + hr = ID3D12Device_CreateCommittedResource(d3d12.device, &d3d12.heap_prop_default, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, &d3d12.font_texture); + NK_ASSERT(SUCCEEDED(hr)); + } + + /* Create font upload buffer */ + { + D3D12_RESOURCE_DESC desc; + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + desc.Width = w * h * 4; + desc.Height = 1; + desc.DepthOrArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_UNKNOWN; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + desc.Flags = D3D12_RESOURCE_FLAG_NONE; + hr = ID3D12Device_CreateCommittedResource(d3d12.device, &d3d12.heap_prop_upload, D3D12_HEAP_FLAG_NONE, &desc, D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, &IID_ID3D12Resource, &d3d12.font_upload_buffer); + NK_ASSERT(SUCCEEDED(hr)); + } + + /* Copy image data to upload buffer */ + hr = ID3D12Resource_Map(d3d12.font_upload_buffer, 0, NULL, &ptr_data); + NK_ASSERT(SUCCEEDED(hr)); + memcpy(ptr_data, image, w * h * 4); + ID3D12Resource_Unmap(d3d12.font_upload_buffer, 0, NULL); + + /* Execute copy operation */ + cpy_src.pResource = d3d12.font_upload_buffer; + cpy_src.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + cpy_src.PlacedFootprint.Offset = 0; + cpy_src.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + cpy_src.PlacedFootprint.Footprint.Width = w; + cpy_src.PlacedFootprint.Footprint.Height = h; + cpy_src.PlacedFootprint.Footprint.Depth = 1; + cpy_src.PlacedFootprint.Footprint.RowPitch = w * 4; + cpy_dest.pResource = d3d12.font_texture; + cpy_dest.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + cpy_dest.SubresourceIndex = 0; + cpy_box.top = 0; + cpy_box.left = 0; + cpy_box.back = 1; + cpy_box.bottom = h; + cpy_box.right = w; + cpy_box.front = 0; + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &cpy_dest, 0, 0, 0, &cpy_src, &cpy_box); + + /* Bring texture in the right state for rendering */ + resource_barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + resource_barrier.Transition.pResource = d3d12.font_texture; + resource_barrier.Transition.Subresource = 0; + resource_barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COPY_DEST; + resource_barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE; + resource_barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + ID3D12GraphicsCommandList_ResourceBarrier(command_list, 1, &resource_barrier); + + /* Create the SRV for the font texture */ + srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Texture2D.MipLevels = 1; + srv_desc.Texture2D.MostDetailedMip = 0; + srv_desc.Texture2D.PlaneSlice = 0; + srv_desc.Texture2D.ResourceMinLODClamp = 0.0f; + srv_handle.ptr = d3d12.cpu_descriptor_handle.ptr + d3d12.cbv_srv_uav_desc_increment; + ID3D12Device_CreateShaderResourceView(d3d12.device, d3d12.font_texture, &srv_desc, srv_handle); + + /* Done with nk atlas data. Atlas will be served with texture id 0 */ + nk_font_atlas_end(&d3d12.atlas, nk_handle_id(0), &d3d12.null); + + /* Setup default font */ + if (d3d12.atlas.default_font) + nk_style_set_font(&d3d12.ctx, &d3d12.atlas.default_font->handle); +} + +NK_API +void nk_d3d12_font_stash_cleanup() +{ + if(d3d12.font_upload_buffer) + { + ID3D12Resource_Release(d3d12.font_upload_buffer); + d3d12.font_upload_buffer = NULL; + } +} + +NK_API +nk_bool nk_d3d12_set_user_texture(unsigned int index, ID3D12Resource* texture, const D3D12_SHADER_RESOURCE_VIEW_DESC* description, nk_handle* handle_out) +{ + nk_bool result = nk_false; + if(index < d3d12.max_user_textures) + { + D3D12_CPU_DESCRIPTOR_HANDLE srv_handle; + + /* Get handle to texture (0 - Const Buffer; 1 - Font Texture; 2 - First user texture) */ + srv_handle.ptr = d3d12.cpu_descriptor_handle.ptr + ((2 + index) * d3d12.cbv_srv_uav_desc_increment); + + /* Create SRV */ + ID3D12Device_CreateShaderResourceView(d3d12.device, texture, description, srv_handle); + + /* Set nk handle (0 - Font Texture; 1 - First user texture) */ + *handle_out = nk_handle_id(1 + index); + result = nk_true; + } + + return result; +} + +NK_API +void nk_d3d12_shutdown(void) +{ + /* Nuklear cleanup */ + nk_font_atlas_clear(&d3d12.atlas); + nk_buffer_free(&d3d12.cmds); + nk_free(&d3d12.ctx); + + /* DirectX 12 cleanup */ + ID3D12Device_Release(d3d12.device); + ID3D12PipelineState_Release(d3d12.pipeline_state); + ID3D12RootSignature_Release(d3d12.root_signature); + ID3D12DescriptorHeap_Release(d3d12.desc_heap); + ID3D12Resource_Release(d3d12.upload_buffer); + ID3D12Resource_Release(d3d12.const_buffer); + ID3D12Resource_Release(d3d12.index_buffer); + ID3D12Resource_Release(d3d12.vertex_buffer); + if(d3d12.font_texture) + ID3D12Resource_Release(d3d12.font_texture); + if(d3d12.font_upload_buffer) + ID3D12Resource_Release(d3d12.font_upload_buffer); +} + +#endif diff --git a/demo/d3d12/nuklear_d3d12.hlsl b/demo/d3d12/nuklear_d3d12.hlsl new file mode 100644 index 0000000..33b0d28 --- /dev/null +++ b/demo/d3d12/nuklear_d3d12.hlsl @@ -0,0 +1,53 @@ +#define NK_ROOTSIGNATURE ""\ +"RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT),"\ +"DescriptorTable("\ + "CBV(b0, numDescriptors = 1, flags = DATA_VOLATILE),"\ + "SRV(t0, numDescriptors = unbounded, flags = DESCRIPTORS_VOLATILE)"\ +"),"\ +"RootConstants(num32BitConstants = 1, b1),"\ +"StaticSampler(s0, "\ + "filter = FILTER_MIN_MAG_MIP_LINEAR,"\ + "addressU = TEXTURE_ADDRESS_CLAMP,"\ + "addressV = TEXTURE_ADDRESS_CLAMP,"\ + "addressW = TEXTURE_ADDRESS_CLAMP,"\ + "comparisonFunc = COMPARISON_ALWAYS"\ +")" + +cbuffer buffer0 : register(b0) +{ + float4x4 ProjectionMatrix; +}; +static uint texture_index : register(b1); + +sampler sampler0 : register(s0); +Texture2D textures[] : register(t0); + +struct VS_INPUT +{ + float2 pos : POSITION; + float4 col : COLOR0; + float2 uv : TEXCOORD0; +}; + +struct PS_INPUT +{ + float4 pos : SV_POSITION; + float4 col : COLOR0; + float2 uv : TEXCOORD0; +}; + +[RootSignature(NK_ROOTSIGNATURE)] +PS_INPUT vs(VS_INPUT input) +{ + PS_INPUT output; + output.pos = mul(ProjectionMatrix, float4(input.pos.xy, 0.f, 1.f)); + output.col = input.col; + output.uv = input.uv; + return output; +} + +[RootSignature(NK_ROOTSIGNATURE)] +float4 ps(PS_INPUT input) : SV_Target +{ + return input.col * textures[texture_index].Sample(sampler0, input.uv); +} diff --git a/demo/d3d12/nuklear_d3d12_pixel_shader.h b/demo/d3d12/nuklear_d3d12_pixel_shader.h new file mode 100644 index 0000000..804943e --- /dev/null +++ b/demo/d3d12/nuklear_d3d12_pixel_shader.h @@ -0,0 +1,135 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_POSITION 0 xyzw 0 POS float +// COLOR 0 xyzw 1 NONE float xyzw +// TEXCOORD 0 xy 2 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_Target 0 xyzw 0 TARGET float xyzw +// +ps_5_1 +dcl_globalFlags refactoringAllowed +dcl_sampler S0[0:0], mode_default, space=0 +dcl_resource_texture2d (float,float,float,float) T0[0:*], space=0 +dcl_input_ps linear v1.xyzw +dcl_input_ps linear v2.xy +dcl_output o0.xyzw +dcl_temps 1 +sample r0.xyzw, v2.xyxx, T0[0].xyzw, S0[0] +mul o0.xyzw, r0.xyzw, v1.xyzw +ret +// Approximately 0 instruction slots used +#endif + +const BYTE nk_d3d12_pixel_shader[] = +{ + 68, 88, 66, 67, 228, 128, + 250, 93, 94, 248, 174, 160, + 102, 133, 107, 228, 84, 49, + 109, 253, 1, 0, 0, 0, + 72, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 164, 0, 0, 0, 216, 0, + 0, 0, 152, 1, 0, 0, + 73, 83, 71, 78, 108, 0, + 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 80, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 92, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 15, 15, 0, 0, 98, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 2, 0, 0, 0, + 3, 3, 0, 0, 83, 86, + 95, 80, 79, 83, 73, 84, + 73, 79, 78, 0, 67, 79, + 76, 79, 82, 0, 84, 69, + 88, 67, 79, 79, 82, 68, + 0, 171, 79, 83, 71, 78, + 44, 0, 0, 0, 1, 0, + 0, 0, 8, 0, 0, 0, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 83, 86, 95, 84, 97, 114, + 103, 101, 116, 0, 171, 171, + 83, 72, 69, 88, 184, 0, + 0, 0, 81, 0, 0, 0, + 46, 0, 0, 0, 106, 8, + 0, 1, 90, 0, 0, 6, + 70, 110, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 88, 24, 0, 7, + 70, 126, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 255, 255, 255, 255, 85, 85, + 0, 0, 0, 0, 0, 0, + 98, 16, 0, 3, 242, 16, + 16, 0, 1, 0, 0, 0, + 98, 16, 0, 3, 50, 16, + 16, 0, 2, 0, 0, 0, + 101, 0, 0, 3, 242, 32, + 16, 0, 0, 0, 0, 0, + 104, 0, 0, 2, 1, 0, + 0, 0, 69, 0, 0, 11, + 242, 0, 16, 0, 0, 0, + 0, 0, 70, 16, 16, 0, + 2, 0, 0, 0, 70, 126, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 96, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 56, 0, + 0, 7, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 0, 0, 0, 0, + 70, 30, 16, 0, 1, 0, + 0, 0, 62, 0, 0, 1, + 82, 84, 83, 48, 168, 0, + 0, 0, 2, 0, 0, 0, + 2, 0, 0, 0, 24, 0, + 0, 0, 1, 0, 0, 0, + 116, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 48, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 104, 0, + 0, 0, 2, 0, 0, 0, + 56, 0, 0, 0, 2, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 255, 255, 255, 255, 0, 0, + 0, 0, 255, 255, 255, 255, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 255, 255, 255, 255, 1, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 21, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 8, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 255, 255, + 127, 127, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0 +}; diff --git a/demo/d3d12/nuklear_d3d12_vertex_shader.h b/demo/d3d12/nuklear_d3d12_vertex_shader.h new file mode 100644 index 0000000..fd0b1bc --- /dev/null +++ b/demo/d3d12/nuklear_d3d12_vertex_shader.h @@ -0,0 +1,168 @@ +#if 0 +// +// Generated by Microsoft (R) D3D Shader Disassembler +// +// +// Input signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// POSITION 0 xy 0 NONE float xy +// COLOR 0 xyzw 1 NONE float xyzw +// TEXCOORD 0 xy 2 NONE float xy +// +// +// Output signature: +// +// Name Index Mask Register SysValue Format Used +// -------------------- ----- ------ -------- -------- ------- ------ +// SV_POSITION 0 xyzw 0 POS float xyzw +// COLOR 0 xyzw 1 NONE float xyzw +// TEXCOORD 0 xy 2 NONE float xy +// +vs_5_1 +dcl_globalFlags refactoringAllowed +dcl_constantbuffer CB0[0:0][4], immediateIndexed, space=0 +dcl_input v0.xy +dcl_input v1.xyzw +dcl_input v2.xy +dcl_output_siv o0.xyzw, position +dcl_output o1.xyzw +dcl_output o2.xy +dcl_temps 1 +mul r0.xyzw, v0.yyyy, CB0[0][1].xyzw +mad r0.xyzw, CB0[0][0].xyzw, v0.xxxx, r0.xyzw +add o0.xyzw, r0.xyzw, CB0[0][3].xyzw +mov o1.xyzw, v1.xyzw +mov o2.xy, v2.xyxx +ret +// Approximately 0 instruction slots used +#endif + +const BYTE nk_d3d12_vertex_shader[] = +{ + 68, 88, 66, 67, 187, 129, + 163, 57, 169, 94, 219, 158, + 174, 23, 30, 91, 108, 150, + 135, 141, 1, 0, 0, 0, + 232, 2, 0, 0, 4, 0, + 0, 0, 48, 0, 0, 0, + 160, 0, 0, 0, 20, 1, + 0, 0, 56, 2, 0, 0, + 73, 83, 71, 78, 104, 0, + 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 80, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 3, 3, 0, 0, 89, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 15, 15, 0, 0, 95, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 2, 0, 0, 0, + 3, 3, 0, 0, 80, 79, + 83, 73, 84, 73, 79, 78, + 0, 67, 79, 76, 79, 82, + 0, 84, 69, 88, 67, 79, + 79, 82, 68, 0, 79, 83, + 71, 78, 108, 0, 0, 0, + 3, 0, 0, 0, 8, 0, + 0, 0, 80, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 0, + 0, 0, 92, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 15, 0, + 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 3, 12, + 0, 0, 83, 86, 95, 80, + 79, 83, 73, 84, 73, 79, + 78, 0, 67, 79, 76, 79, + 82, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 171, + 83, 72, 69, 88, 28, 1, + 0, 0, 81, 0, 1, 0, + 71, 0, 0, 0, 106, 8, + 0, 1, 89, 0, 0, 7, + 70, 142, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 95, 0, 0, 3, 50, 16, + 16, 0, 0, 0, 0, 0, + 95, 0, 0, 3, 242, 16, + 16, 0, 1, 0, 0, 0, + 95, 0, 0, 3, 50, 16, + 16, 0, 2, 0, 0, 0, + 103, 0, 0, 4, 242, 32, + 16, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 50, 32, 16, 0, + 2, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 56, 0, 0, 9, 242, 0, + 16, 0, 0, 0, 0, 0, + 86, 21, 16, 0, 0, 0, + 0, 0, 70, 142, 48, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 50, 0, 0, 11, 242, 0, + 16, 0, 0, 0, 0, 0, + 70, 142, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 6, 16, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 9, + 242, 32, 16, 0, 0, 0, + 0, 0, 70, 14, 16, 0, + 0, 0, 0, 0, 70, 142, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 54, 0, 0, 5, + 242, 32, 16, 0, 1, 0, + 0, 0, 70, 30, 16, 0, + 1, 0, 0, 0, 54, 0, + 0, 5, 50, 32, 16, 0, + 2, 0, 0, 0, 70, 16, + 16, 0, 2, 0, 0, 0, + 62, 0, 0, 1, 82, 84, + 83, 48, 168, 0, 0, 0, + 2, 0, 0, 0, 2, 0, + 0, 0, 24, 0, 0, 0, + 1, 0, 0, 0, 116, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 48, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 104, 0, 0, 0, + 2, 0, 0, 0, 56, 0, + 0, 0, 2, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 255, 255, + 255, 255, 0, 0, 0, 0, + 255, 255, 255, 255, 0, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 255, 255, + 255, 255, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 21, 0, 0, 0, + 3, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 16, 0, + 0, 0, 8, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 255, 255, 127, 127, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 +}; From cb59055c063f911280c3935efbaecb565d5da1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludwig=20F=C3=BCchsl?= Date: Mon, 14 Feb 2022 22:41:32 +0100 Subject: [PATCH 58/89] Added some API dokumentation --- demo/d3d12/nuklear_d3d12.h | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/demo/d3d12/nuklear_d3d12.h b/demo/d3d12/nuklear_d3d12.h index 16ba965..a235d69 100644 --- a/demo/d3d12/nuklear_d3d12.h +++ b/demo/d3d12/nuklear_d3d12.h @@ -18,14 +18,60 @@ #define WIN32_LEAN_AND_MEAN #include +/* + * USAGE: + * - This function will initialize a new nuklear rendering context. The context will be bound to a GLOBAL DirectX 12 rendering state. + */ NK_API struct nk_context *nk_d3d12_init(ID3D12Device *device, int width, int height, unsigned int max_vertex_buffer, unsigned int max_index_buffer, unsigned int max_user_textures); +/* + * USAGE: + * - A call to this function prepares the global nuklear d3d12 backend for receiving font information’s. Use the obtained atlas pointer to load all required fonts and do all required font setup. + */ NK_API void nk_d3d12_font_stash_begin(struct nk_font_atlas **atlas); +/* + * USAGE: + * - Call this function after a call to nk_d3d12_font_stash_begin(...) when all fonts have been loaded and configured. + * - This function will place commands on the supplied ID3D12GraphicsCommandList. + * - This function will allocate temporary data that is required until the command list has finish executing. The temporary data can be free by calling nk_d3d12_font_stash_cleanup(...) + */ NK_API void nk_d3d12_font_stash_end(ID3D12GraphicsCommandList *command_list); +/* + * USAGE: + * - This function will free temporary data that was allocated by nk_d3d12_font_stash_begin(...) + * - Only call this function after the command list used in the nk_d3d12_font_stash_begin(...) function call has finished executing. + * - It is NOT required to call this function but highly recommended. + */ NK_API void nk_d3d12_font_stash_cleanup(); +/* + * USAGE: + * - This function will setup the supplied texture (ID3D12Resource) for rendering custom images using the supplied D3D12_SHADER_RESOURCE_VIEW_DESC. + * - This function may override any previous calls to nk_d3d12_set_user_texture(...) while using the same index. + * - The returned handle can be used as texture handle to render custom images. + * - The caller must keep track of the state of the texture when it comes to rendering with nk_d3d12_render(...). + */ NK_API nk_bool nk_d3d12_set_user_texture(unsigned int index, ID3D12Resource* texture, const D3D12_SHADER_RESOURCE_VIEW_DESC* description, nk_handle* handle_out); +/* + * USAGE: + * - This function should be called within the user window proc to allow nuklear to listen to window events + */ NK_API int nk_d3d12_handle_event(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); +/* + * USAGE: + * - A call to this function renders any previous placed nuklear draw calls and will flush all nuklear buffers for the next frame + * - This function will place commands on the supplied ID3D12GraphicsCommandList. + * - When using custom images for rendering make sure they are in the correct resource state (D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE) when calling this function. + * - This function will upload data to the gpu (64 + max_vertex_buffer + max_index_buffer BYTES). + */ NK_API void nk_d3d12_render(ID3D12GraphicsCommandList *command_list, enum nk_anti_aliasing AA); +/* + * USAGE: + * - This function will notify nuklear that the framebuffer dimensions have changed. + */ NK_API void nk_d3d12_resize(int width, int height); +/* + * USAGE: + * - This function will free the global d3d12 rendering state. + */ NK_API void nk_d3d12_shutdown(void); #endif From f0dccaeeec44498b25d7bbeddd5490c3b3baf5dd Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Mon, 14 Mar 2022 19:46:44 +0000 Subject: [PATCH 59/89] Integrate file browser with glfw opengl2 demo (#400) and restructure demo/ directory accordingly --- demo/allegro5/main.c | 10 +- demo/{ => common}/calculator.c | 0 demo/{ => common}/canvas.c | 0 demo/common/file_browser.c | 486 ++ demo/common/filebrowser/icon/checked.png | Bin 0 -> 1813 bytes demo/common/filebrowser/icon/cloud.png | Bin 0 -> 7509 bytes demo/common/filebrowser/icon/computer.png | Bin 0 -> 620 bytes demo/common/filebrowser/icon/copy.png | Bin 0 -> 655 bytes demo/common/filebrowser/icon/default.png | Bin 0 -> 460 bytes demo/common/filebrowser/icon/delete.png | Bin 0 -> 11040 bytes demo/common/filebrowser/icon/desktop.png | Bin 0 -> 583 bytes demo/common/filebrowser/icon/directory.png | Bin 0 -> 533 bytes demo/common/filebrowser/icon/edit.png | Bin 0 -> 14998 bytes demo/common/filebrowser/icon/export.png | Bin 0 -> 13336 bytes demo/common/filebrowser/icon/font.png | Bin 0 -> 561 bytes demo/common/filebrowser/icon/home.png | Bin 0 -> 819 bytes demo/common/filebrowser/icon/img.png | Bin 0 -> 648 bytes demo/common/filebrowser/icon/movie.png | Bin 0 -> 626 bytes demo/common/filebrowser/icon/music.png | Bin 0 -> 610 bytes demo/common/filebrowser/icon/next.png | Bin 0 -> 703 bytes demo/common/filebrowser/icon/pause.png | Bin 0 -> 1338 bytes demo/common/filebrowser/icon/pen.png | Bin 0 -> 5949 bytes demo/common/filebrowser/icon/phone.png | Bin 0 -> 15778 bytes demo/common/filebrowser/icon/plane.png | Bin 0 -> 13546 bytes demo/common/filebrowser/icon/play.png | Bin 0 -> 566 bytes demo/common/filebrowser/icon/prev.png | Bin 0 -> 701 bytes demo/common/filebrowser/icon/rocket.png | Bin 0 -> 1121 bytes demo/common/filebrowser/icon/settings.png | Bin 0 -> 15671 bytes demo/common/filebrowser/icon/stop.png | Bin 0 -> 520 bytes demo/common/filebrowser/icon/text.png | Bin 0 -> 601 bytes demo/common/filebrowser/icon/tools.png | Bin 0 -> 24483 bytes demo/common/filebrowser/icon/unchecked.png | Bin 0 -> 1044 bytes demo/common/filebrowser/icon/volume.png | Bin 0 -> 25438 bytes demo/common/filebrowser/icon/wifi.png | Bin 0 -> 18857 bytes demo/common/filebrowser/stb_image.h | 6509 ++++++++++++++++++++ demo/{ => common}/node_editor.c | 0 demo/{ => common}/overview.c | 0 demo/{ => common}/style.c | 0 demo/d3d11/main.c | 10 +- demo/d3d12/main.c | 10 +- demo/d3d9/main.c | 10 +- demo/gdi/main.c | 10 +- demo/gdip/main.c | 10 +- demo/glfw_opengl2/Makefile | 2 +- demo/glfw_opengl2/main.c | 74 +- demo/glfw_opengl3/main.c | 10 +- demo/glfw_opengl4/main.c | 10 +- demo/sdl2surface_rawfb/main.c | 10 +- demo/sdl_opengl2/main.c | 10 +- demo/sdl_opengl3/main.c | 10 +- demo/sdl_opengles2/main.c | 10 +- demo/sdl_renderer/main.c | 10 +- demo/sfml_opengl2/main.cpp | 10 +- demo/sfml_opengl3/main.cpp | 10 +- demo/wayland_rawfb/main.c | 10 +- demo/x11/main.c | 10 +- demo/x11_opengl2/main.c | 10 +- demo/x11_opengl3/main.c | 10 +- demo/x11_rawfb/main.c | 10 +- demo/x11_xft/main.c | 10 +- stb_image.h | 6509 ++++++++++++++++++++ 61 files changed, 13672 insertions(+), 118 deletions(-) rename demo/{ => common}/calculator.c (100%) rename demo/{ => common}/canvas.c (100%) create mode 100644 demo/common/file_browser.c create mode 100644 demo/common/filebrowser/icon/checked.png create mode 100644 demo/common/filebrowser/icon/cloud.png create mode 100644 demo/common/filebrowser/icon/computer.png create mode 100644 demo/common/filebrowser/icon/copy.png create mode 100644 demo/common/filebrowser/icon/default.png create mode 100644 demo/common/filebrowser/icon/delete.png create mode 100644 demo/common/filebrowser/icon/desktop.png create mode 100644 demo/common/filebrowser/icon/directory.png create mode 100644 demo/common/filebrowser/icon/edit.png create mode 100644 demo/common/filebrowser/icon/export.png create mode 100644 demo/common/filebrowser/icon/font.png create mode 100644 demo/common/filebrowser/icon/home.png create mode 100644 demo/common/filebrowser/icon/img.png create mode 100644 demo/common/filebrowser/icon/movie.png create mode 100644 demo/common/filebrowser/icon/music.png create mode 100644 demo/common/filebrowser/icon/next.png create mode 100644 demo/common/filebrowser/icon/pause.png create mode 100644 demo/common/filebrowser/icon/pen.png create mode 100644 demo/common/filebrowser/icon/phone.png create mode 100644 demo/common/filebrowser/icon/plane.png create mode 100644 demo/common/filebrowser/icon/play.png create mode 100644 demo/common/filebrowser/icon/prev.png create mode 100644 demo/common/filebrowser/icon/rocket.png create mode 100644 demo/common/filebrowser/icon/settings.png create mode 100644 demo/common/filebrowser/icon/stop.png create mode 100644 demo/common/filebrowser/icon/text.png create mode 100644 demo/common/filebrowser/icon/tools.png create mode 100644 demo/common/filebrowser/icon/unchecked.png create mode 100644 demo/common/filebrowser/icon/volume.png create mode 100644 demo/common/filebrowser/icon/wifi.png create mode 100644 demo/common/filebrowser/stb_image.h rename demo/{ => common}/node_editor.c (100%) rename demo/{ => common}/overview.c (100%) rename demo/{ => common}/style.c (100%) create mode 100644 stb_image.h diff --git a/demo/allegro5/main.c b/demo/allegro5/main.c index 0d748bf..24a27ba 100644 --- a/demo/allegro5/main.c +++ b/demo/allegro5/main.c @@ -53,19 +53,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/calculator.c b/demo/common/calculator.c similarity index 100% rename from demo/calculator.c rename to demo/common/calculator.c diff --git a/demo/canvas.c b/demo/common/canvas.c similarity index 100% rename from demo/canvas.c rename to demo/common/canvas.c diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c new file mode 100644 index 0000000..2529549 --- /dev/null +++ b/demo/common/file_browser.c @@ -0,0 +1,486 @@ +struct icons { + struct nk_image desktop; + struct nk_image home; + struct nk_image computer; + struct nk_image directory; + + struct nk_image default_file; + struct nk_image text_file; + struct nk_image music_file; + struct nk_image font_file; + struct nk_image img_file; + struct nk_image movie_file; +}; + +enum file_groups { + FILE_GROUP_DEFAULT, + FILE_GROUP_TEXT, + FILE_GROUP_MUSIC, + FILE_GROUP_FONT, + FILE_GROUP_IMAGE, + FILE_GROUP_MOVIE, + FILE_GROUP_MAX +}; + +enum file_types { + FILE_DEFAULT, + FILE_TEXT, + FILE_C_SOURCE, + FILE_CPP_SOURCE, + FILE_HEADER, + FILE_CPP_HEADER, + FILE_MP3, + FILE_WAV, + FILE_OGG, + FILE_TTF, + FILE_BMP, + FILE_PNG, + FILE_JPEG, + FILE_PCX, + FILE_TGA, + FILE_GIF, + FILE_MAX +}; + +struct file_group { + enum file_groups group; + const char *name; + struct nk_image *icon; +}; + +struct file { + enum file_types type; + const char *suffix; + enum file_groups group; +}; + +struct media { + int font; + int icon_sheet; + struct icons icons; + struct file_group group[FILE_GROUP_MAX]; + struct file files[FILE_MAX]; +}; + +#define MAX_PATH_LEN 512 +struct file_browser { + /* path */ + char file[MAX_PATH_LEN]; + char home[MAX_PATH_LEN]; + char desktop[MAX_PATH_LEN]; + char directory[MAX_PATH_LEN]; + + /* directory content */ + char **files; + char **directories; + size_t file_count; + size_t dir_count; + struct media *media; +}; + +#ifdef __unix__ +#include +#include +#endif + +#ifndef _WIN32 +# include +#endif + +static void +die(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fputs("\n", stderr); + exit(EXIT_FAILURE); +} + +static struct nk_image +icon_load(const char *filename) +{ + int x,y,n; + GLuint tex; + unsigned char *data = stbi_load(filename, &x, &y, &n, 0); + if (!data) die("[SDL]: failed to load image: %s", filename); + + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_NEAREST); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); + glGenerateMipmap(GL_TEXTURE_2D); + stbi_image_free(data); + return nk_image_id((int)tex); +} + +#if 0 +static char* +file_load(const char* path, size_t* siz) +{ + char *buf; + FILE *fd = fopen(path, "rb"); + if (!fd) die("Failed to open file: %s\n", path); + fseek(fd, 0, SEEK_END); + *siz = (size_t)ftell(fd); + fseek(fd, 0, SEEK_SET); + buf = (char*)calloc(*siz, 1); + fread(buf, *siz, 1, fd); + fclose(fd); + return buf; +} +#endif + +static char* +str_duplicate(const char *src) +{ + char *ret; + size_t len = strlen(src); + if (!len) return 0; + ret = (char*)malloc(len+1); + if (!ret) return 0; + memcpy(ret, src, len); + ret[len] = '\0'; + return ret; +} + +static void +dir_free_list(char **list, size_t size) +{ + size_t i; + for (i = 0; i < size; ++i) + free(list[i]); + free(list); +} + +static char** +dir_list(const char *dir, int return_subdirs, size_t *count) +{ + size_t n = 0; + char buffer[MAX_PATH_LEN]; + char **results = NULL; + const DIR *none = NULL; + size_t capacity = 32; + size_t size; + DIR *z; + + assert(dir); + assert(count); + strncpy(buffer, dir, MAX_PATH_LEN); + buffer[MAX_PATH_LEN - 1] = 0; + n = strlen(buffer); + + if (n > 0 && (buffer[n-1] != '/')) + buffer[n++] = '/'; + + size = 0; + + z = opendir(dir); + if (z != none) { + int nonempty = 1; + struct dirent *data = readdir(z); + nonempty = (data != NULL); + if (!nonempty) return NULL; + + do { + DIR *y; + char *p; + int is_subdir; + if (data->d_name[0] == '.') + continue; + + strncpy(buffer + n, data->d_name, MAX_PATH_LEN-n); + y = opendir(buffer); + is_subdir = (y != NULL); + if (y != NULL) closedir(y); + + if ((return_subdirs && is_subdir) || (!is_subdir && !return_subdirs)){ + if (!size) { + results = (char**)calloc(sizeof(char*), capacity); + } else if (size >= capacity) { + void *old = results; + capacity = capacity * 2; + results = (char**)realloc(results, capacity * sizeof(char*)); + assert(results); + if (!results) free(old); + } + p = str_duplicate(data->d_name); + results[size++] = p; + } + } while ((data = readdir(z)) != NULL); + } + + if (z) closedir(z); + *count = size; + return results; +} + +static struct file_group +FILE_GROUP(enum file_groups group, const char *name, struct nk_image *icon) +{ + struct file_group fg; + fg.group = group; + fg.name = name; + fg.icon = icon; + return fg; +} + +static struct file +FILE_DEF(enum file_types type, const char *suffix, enum file_groups group) +{ + struct file fd; + fd.type = type; + fd.suffix = suffix; + fd.group = group; + return fd; +} + +static struct nk_image* +media_icon_for_file(struct media *media, const char *file) +{ + int i = 0; + const char *s = file; + char suffix[4]; + int found = 0; + memset(suffix, 0, sizeof(suffix)); + + /* extract suffix .xxx from file */ + while (*s++ != '\0') { + if (found && i < 3) + suffix[i++] = *s; + + if (*s == '.') { + if (found){ + found = 0; + break; + } + found = 1; + } + } + + /* check for all file definition of all groups for fitting suffix*/ + for (i = 0; i < FILE_MAX && found; ++i) { + struct file *d = &media->files[i]; + { + const char *f = d->suffix; + s = suffix; + while (f && *f && *s && *s == *f) { + s++; f++; + } + + /* found correct file definition so */ + if (f && *s == '\0' && *f == '\0') + return media->group[d->group].icon; + } + } + return &media->icons.default_file; +} + +static void +media_init(struct media *media) +{ + /* file groups */ + struct icons *icons = &media->icons; + media->group[FILE_GROUP_DEFAULT] = FILE_GROUP(FILE_GROUP_DEFAULT,"default",&icons->default_file); + media->group[FILE_GROUP_TEXT] = FILE_GROUP(FILE_GROUP_TEXT, "textual", &icons->text_file); + media->group[FILE_GROUP_MUSIC] = FILE_GROUP(FILE_GROUP_MUSIC, "music", &icons->music_file); + media->group[FILE_GROUP_FONT] = FILE_GROUP(FILE_GROUP_FONT, "font", &icons->font_file); + media->group[FILE_GROUP_IMAGE] = FILE_GROUP(FILE_GROUP_IMAGE, "image", &icons->img_file); + media->group[FILE_GROUP_MOVIE] = FILE_GROUP(FILE_GROUP_MOVIE, "movie", &icons->movie_file); + + /* files */ + media->files[FILE_DEFAULT] = FILE_DEF(FILE_DEFAULT, NULL, FILE_GROUP_DEFAULT); + media->files[FILE_TEXT] = FILE_DEF(FILE_TEXT, "txt", FILE_GROUP_TEXT); + media->files[FILE_C_SOURCE] = FILE_DEF(FILE_C_SOURCE, "c", FILE_GROUP_TEXT); + media->files[FILE_CPP_SOURCE] = FILE_DEF(FILE_CPP_SOURCE, "cpp", FILE_GROUP_TEXT); + media->files[FILE_HEADER] = FILE_DEF(FILE_HEADER, "h", FILE_GROUP_TEXT); + media->files[FILE_CPP_HEADER] = FILE_DEF(FILE_HEADER, "hpp", FILE_GROUP_TEXT); + media->files[FILE_MP3] = FILE_DEF(FILE_MP3, "mp3", FILE_GROUP_MUSIC); + media->files[FILE_WAV] = FILE_DEF(FILE_WAV, "wav", FILE_GROUP_MUSIC); + media->files[FILE_OGG] = FILE_DEF(FILE_OGG, "ogg", FILE_GROUP_MUSIC); + media->files[FILE_TTF] = FILE_DEF(FILE_TTF, "ttf", FILE_GROUP_FONT); + media->files[FILE_BMP] = FILE_DEF(FILE_BMP, "bmp", FILE_GROUP_IMAGE); + media->files[FILE_PNG] = FILE_DEF(FILE_PNG, "png", FILE_GROUP_IMAGE); + media->files[FILE_JPEG] = FILE_DEF(FILE_JPEG, "jpg", FILE_GROUP_IMAGE); + media->files[FILE_PCX] = FILE_DEF(FILE_PCX, "pcx", FILE_GROUP_IMAGE); + media->files[FILE_TGA] = FILE_DEF(FILE_TGA, "tga", FILE_GROUP_IMAGE); + media->files[FILE_GIF] = FILE_DEF(FILE_GIF, "gif", FILE_GROUP_IMAGE); +} + +static void +file_browser_reload_directory_content(struct file_browser *browser, const char *path) +{ + strncpy(browser->directory, path, MAX_PATH_LEN); + browser->directory[MAX_PATH_LEN - 1] = 0; + dir_free_list(browser->files, browser->file_count); + dir_free_list(browser->directories, browser->dir_count); + browser->files = dir_list(path, 0, &browser->file_count); + browser->directories = dir_list(path, 1, &browser->dir_count); +} + +static void +file_browser_init(struct file_browser *browser, struct media *media) +{ + memset(browser, 0, sizeof(*browser)); + browser->media = media; + { + /* load files and sub-directory list */ + const char *home = getenv("HOME"); +#ifdef _WIN32 + if (!home) home = getenv("USERPROFILE"); +#else + if (!home) home = getpwuid(getuid())->pw_dir; + { + size_t l; + strncpy(browser->home, home, MAX_PATH_LEN); + browser->home[MAX_PATH_LEN - 1] = 0; + l = strlen(browser->home); + strcpy(browser->home + l, "/"); + strcpy(browser->directory, browser->home); + } +#endif + { + size_t l; + strcpy(browser->desktop, browser->home); + l = strlen(browser->desktop); + strcpy(browser->desktop + l, "desktop/"); + } + browser->files = dir_list(browser->directory, 0, &browser->file_count); + browser->directories = dir_list(browser->directory, 1, &browser->dir_count); + } +} + +static void +file_browser_free(struct file_browser *browser) +{ + if (browser->files) + dir_free_list(browser->files, browser->file_count); + if (browser->directories) + dir_free_list(browser->directories, browser->dir_count); + browser->files = NULL; + browser->directories = NULL; + memset(browser, 0, sizeof(*browser)); +} + +static int +file_browser_run(struct file_browser *browser, struct nk_context *ctx) +{ + int ret = 0; + struct media *media = browser->media; + struct nk_rect total_space; + + if (nk_begin(ctx, "File Browser", nk_rect(50, 50, 800, 600), + NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE| + NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) + { + static float ratio[] = {0.25f, NK_UNDEFINED}; + float spacing_x = ctx->style.window.spacing.x; + + /* output path directory selector in the menubar */ + ctx->style.window.spacing.x = 0; + nk_menubar_begin(ctx); + { + char *d = browser->directory; + char *begin = d + 1; + nk_layout_row_dynamic(ctx, 25, 6); + while (*d++) { + if (*d == '/') { + *d = '\0'; + if (nk_button_label(ctx, begin)) { + *d++ = '/'; *d = '\0'; + file_browser_reload_directory_content(browser, browser->directory); + break; + } + *d = '/'; + begin = d + 1; + } + } + } + nk_menubar_end(ctx); + ctx->style.window.spacing.x = spacing_x; + + /* window layout */ + total_space = nk_window_get_content_region(ctx); + nk_layout_row(ctx, NK_DYNAMIC, total_space.h, 2, ratio); + nk_group_begin(ctx, "Special", NK_WINDOW_NO_SCROLLBAR); + { + struct nk_image home = media->icons.home; + struct nk_image desktop = media->icons.desktop; + struct nk_image computer = media->icons.computer; + + nk_layout_row_dynamic(ctx, 40, 1); + if (nk_button_image_label(ctx, home, "home", NK_TEXT_CENTERED)) + file_browser_reload_directory_content(browser, browser->home); + if (nk_button_image_label(ctx,desktop,"desktop",NK_TEXT_CENTERED)) + file_browser_reload_directory_content(browser, browser->desktop); + if (nk_button_image_label(ctx,computer,"computer",NK_TEXT_CENTERED)) + file_browser_reload_directory_content(browser, "/"); + nk_group_end(ctx); + } + + /* output directory content window */ + nk_group_begin(ctx, "Content", 0); + { + int index = -1; + size_t i = 0, j = 0, k = 0; + size_t rows = 0, cols = 0; + size_t count = browser->dir_count + browser->file_count; + + cols = 4; + rows = count / cols; + for (i = 0; i <= rows; i += 1) { + {size_t n = j + cols; + nk_layout_row_dynamic(ctx, 135, (int)cols); + for (; j < count && j < n; ++j) { + /* draw one row of icons */ + if (j < browser->dir_count) { + /* draw and execute directory buttons */ + if (nk_button_image(ctx,media->icons.directory)) + index = (int)j; + } else { + /* draw and execute files buttons */ + struct nk_image *icon; + size_t fileIndex = ((size_t)j - browser->dir_count); + icon = media_icon_for_file(media,browser->files[fileIndex]); + if (nk_button_image(ctx, *icon)) { + strncpy(browser->file, browser->directory, MAX_PATH_LEN); + n = strlen(browser->file); + strncpy(browser->file + n, browser->files[fileIndex], MAX_PATH_LEN - n); + ret = 1; + } + } + }} + {size_t n = k + cols; + nk_layout_row_dynamic(ctx, 20, (int)cols); + for (; k < count && k < n; k++) { + /* draw one row of labels */ + if (k < browser->dir_count) { + nk_label(ctx, browser->directories[k], NK_TEXT_CENTERED); + } else { + size_t t = k-browser->dir_count; + nk_label(ctx,browser->files[t],NK_TEXT_CENTERED); + } + }} + } + + if (index != -1) { + size_t n = strlen(browser->directory); + strncpy(browser->directory + n, browser->directories[index], MAX_PATH_LEN - n); + n = strlen(browser->directory); + if (n < MAX_PATH_LEN - 1) { + browser->directory[n] = '/'; + browser->directory[n+1] = '\0'; + } + file_browser_reload_directory_content(browser, browser->directory); + } + nk_group_end(ctx); + } + } + nk_end(ctx); + return ret; +} + diff --git a/demo/common/filebrowser/icon/checked.png b/demo/common/filebrowser/icon/checked.png new file mode 100644 index 0000000000000000000000000000000000000000..e4e05b29fb20e2e32363896950ca4cfea31f8542 GIT binary patch literal 1813 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 literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/default.png b/demo/common/filebrowser/icon/default.png new file mode 100644 index 0000000000000000000000000000000000000000..c11145a007eacd369dc85b41b4c9aa006d098fd6 GIT binary patch literal 460 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 literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/export.png b/demo/common/filebrowser/icon/export.png new file mode 100644 index 0000000000000000000000000000000000000000..ff6b5aa4acf440c4de50f709cd7bfc477344af9f GIT binary patch literal 13336 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 a2tchy{5>J5&Rg;Y9sGf#_7#8mUj9G(d|q+@ literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/font.png b/demo/common/filebrowser/icon/font.png new file mode 100644 index 0000000000000000000000000000000000000000..918e9bfe1ea44c569be31bf73f6af53b301c3edf GIT binary patch literal 561 zcmV-10?z%3P)FwDX-&%Eb7XN0nx!k!fNT3xAtIlwhQ0}6Yl6y9k2d>T0z@MA8M6_9RJIE|*dT*MP5-ipS%zF~*oM49#Y!P(Txl$RR?)7?& z`Fx)KY`5DvfQ8s^*LBm2!+k`*gcq8jVKDSr+^^U;_LS5&Hc;gTVl; zHE%zEsrd1bqp&92H>vCCu~W}8q1zCQbM_|vmDXG^oX zeex85TQ{$B|K6R0-*O7HnOS{3dj`P#^t{%gDmoOAN{3c;?kY1>O659wS(P$WN}-g( zbzL0Cxim1>|4yf4tgE`w$ZEISu~;mG|3<$7k0ygyH7*Qe00000NkvXXu0mjfN^t?l literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/home.png b/demo/common/filebrowser/icon/home.png new file mode 100644 index 0000000000000000000000000000000000000000..85606267225863537d186d63ebb2ed7014c9e4ae GIT binary patch literal 819 zcmV-31I+x1P)DW` zK~y-))s)Rk8+jPVKflb3^Frfhou&!xCQPQuB1mvSij7Ed!HanI5;P|d{ssOMUiRe4 z9`>?(2v)qgu$hZ^$jNQNlp^#cjOY>rotVTO>*TkGWkW%?EqmI1ZVx=qhv)SR|8)~z z5EC08ACE3CFHu#MSSy6(p zW?2@BqTE{H5a@XxJKNht-7epcKV)kD2^T@YZ;dxJn@tuM7ZF0BCk zcso1HJR&h5HZE^m{$NYW3;$dg!{2 zuIs3(O1s@=VqyYSRdHSSx#Ku^o+oYqGuZ-<9)AbG-Me?_cKiHs;j>?_p=lb2hliY; zoM78FD=RAi1VO<1`ufeYky3ImnLwqDN}F!r6NTrD*>})&o&EiN`u#rTa+xp;sn_dl zZf@fH{_U@qN~I*g=;$bhVQ_waPCA`N2*KRk9Hml;g@px7)1+7|GB!3wCX*rl)6e{9 z=!9V?Zu{lY+1c6P^z;@B7qhH423S&1MtN^T_3L)a&)Hf%jjkHo06b_u95?DwPV2MuWY* xJv2?@`1m*j`2SYsikVDCX0urdOz^+9KLMDz1_tX?-dO+u002ovPDHLkV1nUi5sZRGrF2`gX~#oqZIdO5p8Ue_nBnoA@63DeE9i&piJhJ} z5YlHafn$IL=)e}RIV!2}AvWT-PNUjbfT+pQ2*1=&Miy5#UoMlac9UlBX*x0Gyec;(9)h9S#u= zS^KKM(haWNxl5^3qTOx_zXDj3lan%+%TcLR4sJXPuy0T@zZ2Lgo6U{@KSb~RAL6(WSdwr%WCi1_$8N-3nSV;GXX z9T2->{|{krceuiXrhTxy%p>_9|hmOcMGwxu{|2$Z&!Kv=r;d~!}f*aILgma i2BFjG9I>zeAHM*|L6h|(d1^HP0000mI)V literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/movie.png b/demo/common/filebrowser/icon/movie.png new file mode 100644 index 0000000000000000000000000000000000000000..5227883e6c4d28773043acce6ededc1fe34ded22 GIT binary patch literal 626 zcmV-&0*(ENP)T{#D-;S&%1S2+M3;h&CNB|?Xn2J@MjBouU8Fn!Jt9)lf)J5N z?utl}k|tUMo6Xu+Tv+j+hrS}K(a z#u$plBA(}=l%m`1(r7feyu9S}^mGGIe)<@gODU<wdVf*o?frV$;k=h@i^_p z^*%gwQ&PauXoT-rtCIF5HdU;n550eUjt_y-pF9RL6T M07*qoM6N<$f_*?A&j0`b literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/music.png b/demo/common/filebrowser/icon/music.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1415c8756311c4852151f1a0f4055e08b26b97 GIT binary patch literal 610 zcmV-o0-gPdP)I`orN2EPQ-(&Md=rc&3|7-y16j#sR2} zVjD0z1Y|idTPZd6Jg*!C0T^RR0odwM6q(6nV&%aL04{URr@dZ}h=_dOr^RAHT5DRZ zR;0D2<#L%S&+{k?iR~nSlWw=`4u?YkK)>Hdr_+J!x+s-OP)b2c2`MFn5Rg*lTE)OZ zqtUoJ8jX^V<#IU%5JF)1=4pCnjO79W0Q31AzVBl&7{GO1)a!NFww*G2^!Q;4aEVoO zfd)Xx7(=VoLc86DloG{a5su@)w(SH60B0Y9#JX0i?KJ!y>&I7BN~H{i5CD*zv)9cU z{yi82$8nOOXBPorCoF4d7-Jx!1dv@w4BQ3VT1srFlu8UgoqWXc``0-AJjT~=X9s`1 zLf#XIZC<>6h99#jlvJ4h{EpKvV|Z7tT^txEwtIQ}9KV8daK$b^vLfjn~6dME_I22d}m^c_!)PC=b zm*Z={ym!9; zr=IE@nC9GR!1pKJ$18j7?|_%w^?mMtpRhC4|LwVztRZ;J_id(y;Jy1(wr|eL*Kpy; zW%zy2;(3AP=6$~(b_(2La8Y0oMLNQwB4Lv5pnWa8YRZ+rV(E0d5Yaz8zvv1Aq(%CZ-7u3@;TK7+V;ekbU36 z@F`#N>C`F~jyC^>f*-r@PQHHp^!Fxp2aAeuh96Q2k~WNo4hk#C?2%=t;hn%UkKy5i zSjGq04JjX3IM{(YK9n(hFm*7hU}|aZ7gvz2`NGFgm%+>+uf_0TArpiA9_9x5TMP%< zxfp6bh+>s7J7D7b^!CI44>i^8ix>}VXJ+tcc%U5Icl{GO7%dUxFNcuMknA8|N MUHx3vIVCg!0CE}m3jhEB literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/pause.png b/demo/common/filebrowser/icon/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..7d6367e1ab0943e76984dfa115111f2cdea3983e GIT binary patch literal 1338 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)0?&_*lPgGf;%Hz$3Dl zfq`2Xgc%uT&5-~KvX^-Jy0YKrVdoK2UtIszj)8&YxTlL_NX4zUGj97!yNk4+cX0HG zaq6hhU`k$)*{CLX0IIqv^lKqB>Ra5tvO>|=I-FbAvB9BG}w}1l@ahKGS zxi$%8{JPNeX+qe_z1F*L-2a}DnO0x??DLzMp$8KJ6zVk>uy8QIVC6CPIPN7|#gYv*Lmml@>iudtPES_nXVJPLC%##hH;W&u%x?Ui!+<_`F-X?Zlt4 z8s_#aZ3;(HGF-^vf27dMj{*@ zfq@h6-MxEtnbH2Zm@A!cU9Qa(?rb@i%~<#Eqx#*tx3hGMuU@-$>QDaXK5>(j$X{8} zv$t&7mSQ{o{PW2(UrNrM&J=NQfn42}3)d{I?Osoq{#jpE`^Dsf2!2+kZRaX~pUbT@ z{O;D*^npPYRiCpNVNmaT zR{!|*!^EG(_4cnTAAQ`h@eKd|N|lv+_udg*uyW0gn1BAcmtpqnS0T%iU%!4GdopIaYub6P51z%Fix$sFO-+^T z|NG)os%UhlzN(>A}ptTfraWyiPo=6Ves9oKGsV|AbJzI6Nc zaLbvNDaF(61UpYm|NegWuAl2T7EBQm4BX$>f7|H(r%RLWyxOyL&N&+qjvL>&qGKWo zzLijMzz}Nck-5h4d(4e3sn-BK9vwzu}vz*?fGSlbSol}42OAGL@9Zh~Q^=Yc-(r@SM zc9g92vRktLYxv0$`fECVp asvjJlZhq71=yzZ#$KdJe=d#Wzp$P!D%r+4K literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/pen.png b/demo/common/filebrowser/icon/pen.png new file mode 100644 index 0000000000000000000000000000000000000000..10c851c120a04bccb59284c56fb5f9ee63a64c8c GIT binary patch literal 5949 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 f@cMrjjL|;VS-kN)MtPUEC7M2r+ literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/phone.png b/demo/common/filebrowser/icon/phone.png new file mode 100644 index 0000000000000000000000000000000000000000..5e6f6133d76019c8814a310ae138a12e0e516b65 GIT binary patch literal 15778 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 RNWOApZ{uuTbu{45{{^G)Zw>$e literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/play.png b/demo/common/filebrowser/icon/play.png new file mode 100644 index 0000000000000000000000000000000000000000..9c9e8f0a4e853acd8a5e6f370bbc8ecfd994af8e GIT binary patch literal 566 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~w+J^s3-|UzTYy5cnIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V#EyQgnJie4%^0|VnMPZ!6Kid%2*UhHi)5Md1zUh1f|^vDHA7nLUp=VuDd zxcOV>Y4UNf5fI{mT;Jm#Ke)~({NDbh_P)8482^J)@p}ZscpqHfDSjv>?jF0?gN;sW z9c>sCS^OI|CoryQWN1-fP^@6CkdI)<2C^&|&o!}bU}F+!5`LhAM@VTK!!-v6rvj!q ztlSB_ED9`)90#Qj{64@G!3<<^7KrIIm^WVyG;}BS)*5C*(7pdc-Oq z{+@*Z>wYZ5qs5E@@^*|*+{GJyWH20Q_hF(L)?yQeHq3~sF2w-Nzp}-=*#KG9Y;KXq9 zMC$q3dE0OA{kHq{S1ZeFkAssp9ZmjqcJYJs1M^#XY8UK3v}jAy|LfmRRiEGX?N=7_ z9_e{zFPQ7P4?8nP-QB73f_>kyL{*2^x6}?wB$qr4=$m)*ThqpKuO7`XKDgeFRi-jf zH^6@S;`7HQ9|-tx`m5J^>mcr)LcX$wfDbGj?EVbO=Y=xvztlN!Q~aRZ?Y)8z`plUQ zTxU2S%uvC^kk8H#&&=S@@PLzHk1RtCFM|zZ16caygT<^2b|DN8n#&nJI7>792w-gB z7iIYIK$hXp1vapZGf+VVJA?fesEi;(T?R9QycWZUgUSql5*QEgivdkUgo7e1SWfI@ z{a{)o)xhG$!1;zDUP$1ekO#|rrXE(N3}z;QMg|v!hQAFAw;Dijs$y!1~ZAkhRyaVKlzn18VUqC z1nyO^aO5*HwR8tmg--r|Qrek?S74XC&UJ0ue+=dSEpity9&*)izd!Tczm4azW<9U` zdN?fpDciq)dnTVO=i_J1P-Og(-0@+ub7(`D_>?*&o20-fCYJg+e;0iFb(XE-s@;X- tSuMJ9yICfDK2pp8jeDq{Crqee(n$!Ju=$t7Bw#{g@O1TaS?83{1ON?E{p0`u literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/rocket.png b/demo/common/filebrowser/icon/rocket.png new file mode 100644 index 0000000000000000000000000000000000000000..ea8e187c9f0e50de6dcd87fe823cd2761a510c83 GIT binary patch literal 1121 zcmV-n1fKheP)WFU8GbZ8()Nlj2>E@cM*00YHIL_t(|+U=dolG-p3 zMJ2-zYT*qZ=#3Zp!NAO7pfW`PW6OH>J-tdQmBiz7`XN~u?+B%sVvN_vZ$bzs&pojb zF~+ZyzlQ(=#yrob%jNPf$G?RDhO-+10RAyT2>#6N)`I>V2p|X@0RWEx>fjMT82ay+ zK%@(w3Lp#~0mQ-60)X$FV<%7+dsQ|*6j{rOF zkyZE%fudPY1pqz*e2RIVPgZ}n-vb~5yop>VZm9s2egpu1-@!(Z5d7!G~$%H(#1HWuPR0 zubo{RETy!Co*86=_t^f>X4Al3wY?U;a%0KhjGTieqF{PgJcR;u0Pyp|A4&k= z=Z8Pi5Xfg3f8b|-&@~N`{WtJC=bXFAWfrBsOz9t@0s#MKN3rDLQx7D)tj{I@@W+OK zNC4oE4?lSZu>2Y|CHTn|fb6#cKS==K+kwAZ0N~q#ze@n%+k>Ax1QIsjZ>|7jzfJg? z1OR?^@Q2RuRTTjEHnV<{0Km5opCM2j{@V&b_G`d@DFEp2WP56fdc#e6VPfB06W&wUy0bcDf#2Bx@*IfnN0N;PG6DSP7 zXbZ49BwB(`1rUc{tO8ifev9x+4}pNE1pr^J1z0Kn3h=1_;_wlGKmY_t?DISg6cykv z@JjttPJn0lQ~@CY_Q0kJ7!%+f{7;~fz=!}T@R7iX06BVmiPxJFjhBHtGn*skBMQ*N zH(C*m1o-qCxKx-(FpvPHj&~!$00NZW+zBCg2E##zz>FDuqZ;%nK-H&%N9GACNdW;` ze3EC61P|~mG4n+ihe97vU(Fx1ib?|f^#<@7Ab{Pl1&sR1UZknG3Lp@GuqZ&wlRdqi zFTB6Xl~q73_|Ly?+0zy0iOE9N=K!ZVOrBe1d`}RRR}$ye&|5-a30XjZl+q6T0R$*D zsRO@l_?Ans+#oj07+rl^hx9VAb{3NLod`h57u^R~mgNk5(HWp7gdTPj5#XNj>$+aK n#bPr6nI|Ryzy$;VvfcOwuWa|S&Zx)400000NkvXXu0mjffwSmT literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/settings.png b/demo/common/filebrowser/icon/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..e6e13f8564624244f56dbd51b10f4655a9014c27 GIT binary patch literal 15671 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 literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/stop.png b/demo/common/filebrowser/icon/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..6742baf9aa961f5381beda98bf3fe79aa5ae9a70 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)0?&_*lPgGf;%Hz$3Dl zfq`2Xgc%uT&5-~KvX^-Jy0YKrVdoLy+VD&4ECU1MR8JSjkcwMxZ(J;7R^)MTOt{3N z8zk`7N|EH<*pXt)$d&^v*j2Wm>d{57#I~8SQ;1t`u@%P$5ec7y5Sz_ zms??@y3sINZ;eXvxsr-R-59_lkDaQ_hGaJ+DN z{}-+Xg?k^S|7UAZxc0$YbLqEx+iP}OK0n>@PWI2Y|4cc}66Z^Avu)r_l3Ah5;IN~- uTaK0CNbU7!iy6Mu#IZ7iLlo*M)tB-K*K*4nlP`NS0D-5gpUXO@geCwHd!8!* literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/text.png b/demo/common/filebrowser/icon/text.png new file mode 100644 index 0000000000000000000000000000000000000000..136e534a50c2fd4319d63324d09d83933e7f28f8 GIT binary patch literal 601 zcmV-f0;c_mP)|W zK~y-))s(%;;y@IJ-x-}5R{Vij7(}d0Bgk4g^9{M~N1e=Zga0synw49#W}hG8I|&qD|S&N(>eV2put{~5KOeT|;&qjq`D;A4z z90x)OWHK2DA>N`(5&{5%AV4mc!(cGLdcD3Q3(u8G1>^DfC7~vSKx+-oIr{zn-9*Fu zi0s*>AP52oA>cR;R;yKv?CS%6hcLR#7{hQlyrZL({_`$JhP_@7p6A8Lo>4tjsZ>(? z{a$Z28+|w&w3JdSrSvP6%Vm|^-}pjP8kP90Oxw0$+xGW_rfI71XW;w3en&~dSPy;Q nm$h2$$JYUUr`zo&@n7i!nhp9}Dig&U00000NkvXXu0mjfhOhtA literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/tools.png b/demo/common/filebrowser/icon/tools.png new file mode 100644 index 0000000000000000000000000000000000000000..412ff85367fb30e6a6cfa298cb08f6d1578ea379 GIT binary patch literal 24483 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 oPhZ3!@B4q_UQp{I*uNX4zUcP@q=HV|-i z^pxEtv1))1r#?*X9c4#8C67-R#c|7AJECcK;xjRXL1@KPWRjly10h;LKvf zWRc>c@WwDfqHY6YgRX)hL-|_GcmEQY8(!!peErU__);R18N&xX2T-J3<7{|d4^;M@ zfr){GL4l!xfg}cr%84@Hn~!}9wWEi#1G z{`>R)qC11&fxGn&8EO`V@yQ;R-^FNAGpTL=pBJ9!T@ zCVpT&a4_)$^SX!oUUliQh14t&Vc-b;xa_KSh$zp0+cr~~qPbE9vl-r0F8=cTfPmGX z<>n003~zpR*i5q1`EZ{1fEvT^y8{2eD!KsOu#2&Sq0Rn>paYA+A0`DRi5f-$CZ7Ea zK*4y17KUbh2Bn6F{`?IB2_IM;I1GL;DX@W*F!StX=wND#V-Rp_=3_ty7wQ;JwZv>Z SBD6mPB<1Pq=d#Wzp$PzHUm*(s literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/volume.png b/demo/common/filebrowser/icon/volume.png new file mode 100644 index 0000000000000000000000000000000000000000..8e86fa992953cdb490433a92d087b4a8907a343a GIT binary patch literal 25438 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 literal 0 HcmV?d00001 diff --git a/demo/common/filebrowser/icon/wifi.png b/demo/common/filebrowser/icon/wifi.png new file mode 100644 index 0000000000000000000000000000000000000000..270d55d767315891992c70b8d12d8b1f21f49667 GIT binary patch literal 18857 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 +#endif // STBI_NO_STDIO + +#define STBI_VERSION 1 + +enum +{ + STBI_default = 0, // only used for req_comp + + STBI_grey = 1, + STBI_grey_alpha = 2, + STBI_rgb = 3, + STBI_rgb_alpha = 4 +}; + +typedef unsigned char stbi_uc; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef STB_IMAGE_STATIC +#define STBIDEF static +#else +#define STBIDEF extern +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// PRIMARY API - works on images of any type +// + +// +// load image by filename, open file, or memory buffer +// + +typedef struct +{ + int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read + void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative + int (*eof) (void *user); // returns nonzero if we are at end of file/data +} stbi_io_callbacks; + +STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *comp, int req_comp); +STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *comp, int req_comp); +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *comp, int req_comp); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); +// for stbi_load_from_file, file pointer is left pointing immediately after image +#endif + +#ifndef STBI_NO_LINEAR + STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *comp, int req_comp); + STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp); + STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp); + + #ifndef STBI_NO_STDIO + STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); + #endif +#endif + +#ifndef STBI_NO_HDR + STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); + STBIDEF void stbi_hdr_to_ldr_scale(float scale); +#endif + +#ifndef STBI_NO_LINEAR + STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); + STBIDEF void stbi_ldr_to_hdr_scale(float scale); +#endif // STBI_NO_HDR + +// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename); +STBIDEF int stbi_is_hdr_from_file(FILE *f); +#endif // STBI_NO_STDIO + + +// get a VERY brief reason for failure +// NOT THREADSAFE +STBIDEF const char *stbi_failure_reason (void); + +// free the loaded image -- this is just free() +STBIDEF void stbi_image_free (void *retval_from_stbi_load); + +// get image dimensions & components without fully decoding +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); + +#endif + + + +// for image formats that explicitly notate that they have premultiplied alpha, +// we just return the colors as stored in the file. set this flag to force +// unpremultiplication. results are undefined if the unpremultiply overflow. +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); + +// indicate whether we should process iphone images back to canonical format, +// or just pass them through "as-is" +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); + +// flip the image vertically, so the first pixel in the output array is the bottom left +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); + +// ZLIB client - used by PNG, available for other purposes + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); +STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + +STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + + +#ifdef __cplusplus +} +#endif + +// +// +//// end header file ///////////////////////////////////////////////////// +#endif // STBI_INCLUDE_STB_IMAGE_H + +#ifdef STB_IMAGE_IMPLEMENTATION + +#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ + || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ + || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ + || defined(STBI_ONLY_ZLIB) + #ifndef STBI_ONLY_JPEG + #define STBI_NO_JPEG + #endif + #ifndef STBI_ONLY_PNG + #define STBI_NO_PNG + #endif + #ifndef STBI_ONLY_BMP + #define STBI_NO_BMP + #endif + #ifndef STBI_ONLY_PSD + #define STBI_NO_PSD + #endif + #ifndef STBI_ONLY_TGA + #define STBI_NO_TGA + #endif + #ifndef STBI_ONLY_GIF + #define STBI_NO_GIF + #endif + #ifndef STBI_ONLY_HDR + #define STBI_NO_HDR + #endif + #ifndef STBI_ONLY_PIC + #define STBI_NO_PIC + #endif + #ifndef STBI_ONLY_PNM + #define STBI_NO_PNM + #endif +#endif + +#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) +#define STBI_NO_ZLIB +#endif + + +#include +#include // ptrdiff_t on osx +#include +#include + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#include // ldexp +#endif + +#ifndef STBI_NO_STDIO +#include +#endif + +#ifndef STBI_ASSERT +#include +#define STBI_ASSERT(x) assert(x) +#endif + + +#ifndef _MSC_VER + #ifdef __cplusplus + #define stbi_inline inline + #else + #define stbi_inline + #endif +#else + #define stbi_inline __forceinline +#endif + + +#ifdef _MSC_VER +typedef unsigned short stbi__uint16; +typedef signed short stbi__int16; +typedef unsigned int stbi__uint32; +typedef signed int stbi__int32; +#else +#include +typedef uint16_t stbi__uint16; +typedef int16_t stbi__int16; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; +#endif + +// should produce compiler error if size is wrong +typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; + +#ifdef _MSC_VER +#define STBI_NOTUSED(v) (void)(v) +#else +#define STBI_NOTUSED(v) (void)sizeof(v) +#endif + +#ifdef _MSC_VER +#define STBI_HAS_LROTL +#endif + +#ifdef STBI_HAS_LROTL + #define stbi_lrot(x,y) _lrotl(x,y) +#else + #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) +#endif + +#if defined(STBI_MALLOC) && defined(STBI_FREE) && defined(STBI_REALLOC) +// ok +#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) +// ok +#else +#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC." +#endif + +#ifndef STBI_MALLOC +#define STBI_MALLOC(sz) malloc(sz) +#define STBI_REALLOC(p,sz) realloc(p,sz) +#define STBI_FREE(p) free(p) +#endif + +// x86/x64 detection +#if defined(__x86_64__) || defined(_M_X64) +#define STBI__X64_TARGET +#elif defined(__i386) || defined(_M_IX86) +#define STBI__X86_TARGET +#endif + +#if defined(__GNUC__) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +// NOTE: not clear do we actually need this for the 64-bit path? +// gcc doesn't support sse2 intrinsics unless you compile with -msse2, +// (but compiling with -msse2 allows the compiler to use SSE2 everywhere; +// this is just broken and gcc are jerks for not fixing it properly +// http://www.virtualdub.org/blog/pivot/entry.php?id=363 ) +#define STBI_NO_SIMD +#endif + +#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) +// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET +// +// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the +// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. +// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not +// simultaneously enabling "-mstackrealign". +// +// See https://github.com/nothings/stb/issues/81 for more information. +// +// So default to no SSE2 on 32-bit MinGW. If you've read this far and added +// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. +#define STBI_NO_SIMD +#endif + +#if !defined(STBI_NO_SIMD) && defined(STBI__X86_TARGET) +#define STBI_SSE2 +#include + +#ifdef _MSC_VER + +#if _MSC_VER >= 1400 // not VC6 +#include // __cpuid +static int stbi__cpuid3(void) +{ + int info[4]; + __cpuid(info,1); + return info[3]; +} +#else +static int stbi__cpuid3(void) +{ + int res; + __asm { + mov eax,1 + cpuid + mov res,edx + } + return res; +} +#endif + +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name + +static int stbi__sse2_available() +{ + int info3 = stbi__cpuid3(); + return ((info3 >> 26) & 1) != 0; +} +#else // assume GCC-style if not VC++ +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) + +static int stbi__sse2_available() +{ +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later + // GCC 4.8+ has a nice way to do this + return __builtin_cpu_supports("sse2"); +#else + // portable way to do this, preferably without using GCC inline ASM? + // just bail for now. + return 0; +#endif +} +#endif +#endif + +// ARM NEON +#if defined(STBI_NO_SIMD) && defined(STBI_NEON) +#undef STBI_NEON +#endif + +#ifdef STBI_NEON +#include +// assume GCC or Clang on ARM targets +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) +#endif + +#ifndef STBI_SIMD_ALIGN +#define STBI_SIMD_ALIGN(type, name) type name +#endif + +/////////////////////////////////////////////// +// +// stbi__context struct and start_xxx functions + +// stbi__context structure is our basic context used by all images, so it +// contains all the IO context, plus some basic image information +typedef struct +{ + stbi__uint32 img_x, img_y; + int img_n, img_out_n; + + stbi_io_callbacks io; + void *io_user_data; + + int read_from_callbacks; + int buflen; + stbi_uc buffer_start[128]; + + stbi_uc *img_buffer, *img_buffer_end; + stbi_uc *img_buffer_original, *img_buffer_original_end; +} stbi__context; + + +static void stbi__refill_buffer(stbi__context *s); + +// initialize a memory-decode context +static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) +{ + s->io.read = NULL; + s->read_from_callbacks = 0; + s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; + s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; +} + +// initialize a callback-based context +static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) +{ + s->io = *c; + s->io_user_data = user; + s->buflen = sizeof(s->buffer_start); + s->read_from_callbacks = 1; + s->img_buffer_original = s->buffer_start; + stbi__refill_buffer(s); + s->img_buffer_original_end = s->img_buffer_end; +} + +#ifndef STBI_NO_STDIO + +static int stbi__stdio_read(void *user, char *data, int size) +{ + return (int) fread(data,1,size,(FILE*) user); +} + +static void stbi__stdio_skip(void *user, int n) +{ + fseek((FILE*) user, n, SEEK_CUR); +} + +static int stbi__stdio_eof(void *user) +{ + return feof((FILE*) user); +} + +static stbi_io_callbacks stbi__stdio_callbacks = +{ + stbi__stdio_read, + stbi__stdio_skip, + stbi__stdio_eof, +}; + +static void stbi__start_file(stbi__context *s, FILE *f) +{ + stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); +} + +//static void stop_file(stbi__context *s) { } + +#endif // !STBI_NO_STDIO + +static void stbi__rewind(stbi__context *s) +{ + // conceptually rewind SHOULD rewind to the beginning of the stream, + // but we just rewind to the beginning of the initial buffer, because + // we only use it after doing 'test', which only ever looks at at most 92 bytes + s->img_buffer = s->img_buffer_original; + s->img_buffer_end = s->img_buffer_original_end; +} + +#ifndef STBI_NO_JPEG +static int stbi__jpeg_test(stbi__context *s); +static stbi_uc *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNG +static int stbi__png_test(stbi__context *s); +static stbi_uc *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_BMP +static int stbi__bmp_test(stbi__context *s); +static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_TGA +static int stbi__tga_test(stbi__context *s); +static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s); +static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_HDR +static int stbi__hdr_test(stbi__context *s); +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_test(stbi__context *s); +static stbi_uc *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_GIF +static int stbi__gif_test(stbi__context *s); +static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNM +static int stbi__pnm_test(stbi__context *s); +static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +// this is not threadsafe +static const char *stbi__g_failure_reason; + +STBIDEF const char *stbi_failure_reason(void) +{ + return stbi__g_failure_reason; +} + +static int stbi__err(const char *str) +{ + stbi__g_failure_reason = str; + return 0; +} + +static void *stbi__malloc(size_t size) +{ + return STBI_MALLOC(size); +} + +// stbi__err - error +// stbi__errpf - error returning pointer to float +// stbi__errpuc - error returning pointer to unsigned char + +#ifdef STBI_NO_FAILURE_STRINGS + #define stbi__err(x,y) 0 +#elif defined(STBI_FAILURE_USERMSG) + #define stbi__err(x,y) stbi__err(y) +#else + #define stbi__err(x,y) stbi__err(x) +#endif + +#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) +#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) + +STBIDEF void stbi_image_free(void *retval_from_stbi_load) +{ + STBI_FREE(retval_from_stbi_load); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); +#endif + +#ifndef STBI_NO_HDR +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); +#endif + +static int stbi__vertically_flip_on_load = 0; + +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load = flag_true_if_should_flip; +} + +static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PNG + if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_BMP + if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_GIF + if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PSD + if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PIC + if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PNM + if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp); + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr = stbi__hdr_load(s, x,y,comp,req_comp); + return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); + } + #endif + + #ifndef STBI_NO_TGA + // test tga last because it's a crappy test! + if (stbi__tga_test(s)) + return stbi__tga_load(s,x,y,comp,req_comp); + #endif + + return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); +} + +static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result = stbi__load_main(s, x, y, comp, req_comp); + + if (stbi__vertically_flip_on_load && result != NULL) { + int w = *x, h = *y; + int depth = req_comp ? req_comp : *comp; + int row,col,z; + stbi_uc temp; + + // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once + for (row = 0; row < (h>>1); row++) { + for (col = 0; col < w; col++) { + for (z = 0; z < depth; z++) { + temp = result[(row * w + col) * depth + z]; + result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; + result[((h - row - 1) * w + col) * depth + z] = temp; + } + } + } + } + + return result; +} + +#ifndef STBI_NO_HDR +static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) +{ + if (stbi__vertically_flip_on_load && result != NULL) { + int w = *x, h = *y; + int depth = req_comp ? req_comp : *comp; + int row,col,z; + float temp; + + // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once + for (row = 0; row < (h>>1); row++) { + for (col = 0; col < w; col++) { + for (z = 0; z < depth; z++) { + temp = result[(row * w + col) * depth + z]; + result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; + result[((h - row - 1) * w + col) * depth + z] = temp; + } + } + } + } +} +#endif + +#ifndef STBI_NO_STDIO + +static FILE *stbi__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + + +STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + unsigned char *result; + if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_flip(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} +#endif //!STBI_NO_STDIO + +STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_flip(&s,x,y,comp,req_comp); +} + +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__load_flip(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *data; + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp); + if (hdr_data) + stbi__float_postprocess(hdr_data,x,y,comp,req_comp); + return hdr_data; + } + #endif + data = stbi__load_flip(s, x, y, comp, req_comp); + if (data) + return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); + return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); +} + +STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_STDIO +STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + float *result; + FILE *f = stbi__fopen(filename, "rb"); + if (!f) return stbi__errpf("can't fopen", "Unable to open file"); + result = stbi_loadf_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_file(&s,f); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} +#endif // !STBI_NO_STDIO + +#endif // !STBI_NO_LINEAR + +// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is +// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always +// reports false! + +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(buffer); + STBI_NOTUSED(len); + return 0; + #endif +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result=0; + if (f) { + result = stbi_is_hdr_from_file(f); + fclose(f); + } + return result; +} + +STBIDEF int stbi_is_hdr_from_file(FILE *f) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_file(&s,f); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(f); + return 0; + #endif +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(clbk); + STBI_NOTUSED(user); + return 0; + #endif +} + +static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; +static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; + +#ifndef STBI_NO_LINEAR +STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } +STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } +#endif + +STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } +STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } + + +////////////////////////////////////////////////////////////////////////////// +// +// Common code used by all image loaders +// + +enum +{ + STBI__SCAN_load=0, + STBI__SCAN_type, + STBI__SCAN_header +}; + +static void stbi__refill_buffer(stbi__context *s) +{ + int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); + if (n == 0) { + // at end of file, treat same as if from memory, but need to handle case + // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file + s->read_from_callbacks = 0; + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start+1; + *s->img_buffer = 0; + } else { + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start + n; + } +} + +stbi_inline static stbi_uc stbi__get8(stbi__context *s) +{ + if (s->img_buffer < s->img_buffer_end) + return *s->img_buffer++; + if (s->read_from_callbacks) { + stbi__refill_buffer(s); + return *s->img_buffer++; + } + return 0; +} + +stbi_inline static int stbi__at_eof(stbi__context *s) +{ + if (s->io.read) { + if (!(s->io.eof)(s->io_user_data)) return 0; + // if feof() is true, check if buffer = end + // special case: we've only got the special 0 character at the end + if (s->read_from_callbacks == 0) return 1; + } + + return s->img_buffer >= s->img_buffer_end; +} + +static void stbi__skip(stbi__context *s, int n) +{ + if (n < 0) { + s->img_buffer = s->img_buffer_end; + return; + } + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + s->img_buffer = s->img_buffer_end; + (s->io.skip)(s->io_user_data, n - blen); + return; + } + } + s->img_buffer += n; +} + +static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) +{ + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + int res, count; + + memcpy(buffer, s->img_buffer, blen); + + count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); + res = (count == (n-blen)); + s->img_buffer = s->img_buffer_end; + return res; + } + } + + if (s->img_buffer+n <= s->img_buffer_end) { + memcpy(buffer, s->img_buffer, n); + s->img_buffer += n; + return 1; + } else + return 0; +} + +static int stbi__get16be(stbi__context *s) +{ + int z = stbi__get8(s); + return (z << 8) + stbi__get8(s); +} + +static stbi__uint32 stbi__get32be(stbi__context *s) +{ + stbi__uint32 z = stbi__get16be(s); + return (z << 16) + stbi__get16be(s); +} + +#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) +// nothing +#else +static int stbi__get16le(stbi__context *s) +{ + int z = stbi__get8(s); + return z + (stbi__get8(s) << 8); +} +#endif + +#ifndef STBI_NO_BMP +static stbi__uint32 stbi__get32le(stbi__context *s) +{ + stbi__uint32 z = stbi__get16le(s); + return z + (stbi__get16le(s) << 16); +} +#endif + +#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings + + +////////////////////////////////////////////////////////////////////////////// +// +// generic converter from built-in img_n to req_comp +// individual types do this automatically as much as possible (e.g. jpeg +// does all cases internally since it needs to colorspace convert anyway, +// and it never has alpha, so very few cases ). png can automatically +// interleave an alpha=255 channel, but falls back to this for other cases +// +// assume data buffer is malloced, so malloc a new one and free that one +// only failure mode is malloc failing + +static stbi_uc stbi__compute_y(int r, int g, int b) +{ + return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); +} + +static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + unsigned char *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (unsigned char *) stbi__malloc(req_comp * x * y); + if (good == NULL) { + STBI_FREE(data); + return stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + unsigned char *src = data + j * x * img_n ; + unsigned char *dest = good + j * x * req_comp; + + #define COMBO(a,b) ((a)*8+(b)) + #define CASE(a,b) case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (COMBO(img_n, req_comp)) { + CASE(1,2) dest[0]=src[0], dest[1]=255; break; + CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break; + CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break; + CASE(2,1) dest[0]=src[0]; break; + CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break; + CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break; + CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break; + CASE(3,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; + CASE(3,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255; break; + CASE(4,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; + CASE(4,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break; + CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break; + default: STBI_ASSERT(0); + } + #undef CASE + } + + STBI_FREE(data); + return good; +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) +{ + int i,k,n; + float *output = (float *) stbi__malloc(x * y * comp * sizeof(float)); + if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); + } + if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f; + } + STBI_FREE(data); + return output; +} +#endif + +#ifndef STBI_NO_HDR +#define stbi__float2int(x) ((int) (x)) +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) +{ + int i,k,n; + stbi_uc *output = (stbi_uc *) stbi__malloc(x * y * comp); + if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + if (k < comp) { + float z = data[i*comp+k] * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + } + STBI_FREE(data); + return output; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// "baseline" JPEG/JFIF decoder +// +// simple implementation +// - doesn't support delayed output of y-dimension +// - simple interface (only one output format: 8-bit interleaved RGB) +// - doesn't try to recover corrupt jpegs +// - doesn't allow partial loading, loading multiple at once +// - still fast on x86 (copying globals into locals doesn't help x86) +// - allocates lots of intermediate memory (full size of all components) +// - non-interleaved case requires this anyway +// - allows good upsampling (see next) +// high-quality +// - upsampled channels are bilinearly interpolated, even across blocks +// - quality integer IDCT derived from IJG's 'slow' +// performance +// - fast huffman; reasonable integer IDCT +// - some SIMD kernels for common paths on targets with SSE2/NEON +// - uses a lot of intermediate memory, could cache poorly + +#ifndef STBI_NO_JPEG + +// huffman decoding acceleration +#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache + +typedef struct +{ + stbi_uc fast[1 << FAST_BITS]; + // weirdly, repacking this into AoS is a 10% speed loss, instead of a win + stbi__uint16 code[256]; + stbi_uc values[256]; + stbi_uc size[257]; + unsigned int maxcode[18]; + int delta[17]; // old 'firstsymbol' - old 'firstcode' +} stbi__huffman; + +typedef struct +{ + stbi__context *s; + stbi__huffman huff_dc[4]; + stbi__huffman huff_ac[4]; + stbi_uc dequant[4][64]; + stbi__int16 fast_ac[4][1 << FAST_BITS]; + +// sizes for components, interleaved MCUs + int img_h_max, img_v_max; + int img_mcu_x, img_mcu_y; + int img_mcu_w, img_mcu_h; + +// definition of jpeg image component + struct + { + int id; + int h,v; + int tq; + int hd,ha; + int dc_pred; + + int x,y,w2,h2; + stbi_uc *data; + void *raw_data, *raw_coeff; + stbi_uc *linebuf; + short *coeff; // progressive only + int coeff_w, coeff_h; // number of 8x8 coefficient blocks + } img_comp[4]; + + stbi__uint32 code_buffer; // jpeg entropy-coded buffer + int code_bits; // number of valid bits + unsigned char marker; // marker seen while filling entropy buffer + int nomore; // flag if we saw a marker so must stop + + int progressive; + int spec_start; + int spec_end; + int succ_high; + int succ_low; + int eob_run; + + int scan_n, order[4]; + int restart_interval, todo; + +// kernels + void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); + void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); + stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); +} stbi__jpeg; + +static int stbi__build_huffman(stbi__huffman *h, int *count) +{ + int i,j,k=0,code; + // build size list for each symbol (from JPEG spec) + for (i=0; i < 16; ++i) + for (j=0; j < count[i]; ++j) + h->size[k++] = (stbi_uc) (i+1); + h->size[k] = 0; + + // compute actual symbols (from jpeg spec) + code = 0; + k = 0; + for(j=1; j <= 16; ++j) { + // compute delta to add to code to compute symbol id + h->delta[j] = k - code; + if (h->size[k] == j) { + while (h->size[k] == j) + h->code[k++] = (stbi__uint16) (code++); + if (code-1 >= (1 << j)) return stbi__err("bad code lengths","Corrupt JPEG"); + } + // compute largest code + 1 for this size, preshifted as needed later + h->maxcode[j] = code << (16-j); + code <<= 1; + } + h->maxcode[j] = 0xffffffff; + + // build non-spec acceleration table; 255 is flag for not-accelerated + memset(h->fast, 255, 1 << FAST_BITS); + for (i=0; i < k; ++i) { + int s = h->size[i]; + if (s <= FAST_BITS) { + int c = h->code[i] << (FAST_BITS-s); + int m = 1 << (FAST_BITS-s); + for (j=0; j < m; ++j) { + h->fast[c+j] = (stbi_uc) i; + } + } + } + return 1; +} + +// build a table that decodes both magnitude and value of small ACs in +// one go. +static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) +{ + int i; + for (i=0; i < (1 << FAST_BITS); ++i) { + stbi_uc fast = h->fast[i]; + fast_ac[i] = 0; + if (fast < 255) { + int rs = h->values[fast]; + int run = (rs >> 4) & 15; + int magbits = rs & 15; + int len = h->size[fast]; + + if (magbits && len + magbits <= FAST_BITS) { + // magnitude code followed by receive_extend code + int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); + int m = 1 << (magbits - 1); + if (k < m) k += (-1 << magbits) + 1; + // if the result is small enough, we can fit it in fast_ac table + if (k >= -128 && k <= 127) + fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits)); + } + } + } +} + +static void stbi__grow_buffer_unsafe(stbi__jpeg *j) +{ + do { + int b = j->nomore ? 0 : stbi__get8(j->s); + if (b == 0xff) { + int c = stbi__get8(j->s); + if (c != 0) { + j->marker = (unsigned char) c; + j->nomore = 1; + return; + } + } + j->code_buffer |= b << (24 - j->code_bits); + j->code_bits += 8; + } while (j->code_bits <= 24); +} + +// (1 << n) - 1 +static stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; + +// decode a jpeg huffman value from the bitstream +stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) +{ + unsigned int temp; + int c,k; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + // look at the top FAST_BITS and determine what symbol ID it is, + // if the code is <= FAST_BITS + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + k = h->fast[c]; + if (k < 255) { + int s = h->size[k]; + if (s > j->code_bits) + return -1; + j->code_buffer <<= s; + j->code_bits -= s; + return h->values[k]; + } + + // naive test is to shift the code_buffer down so k bits are + // valid, then test against maxcode. To speed this up, we've + // preshifted maxcode left so that it has (16-k) 0s at the + // end; in other words, regardless of the number of bits, it + // wants to be compared against something shifted to have 16; + // that way we don't need to shift inside the loop. + temp = j->code_buffer >> 16; + for (k=FAST_BITS+1 ; ; ++k) + if (temp < h->maxcode[k]) + break; + if (k == 17) { + // error! code not found + j->code_bits -= 16; + return -1; + } + + if (k > j->code_bits) + return -1; + + // convert the huffman code to the symbol id + c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); + + // convert the id to a symbol + j->code_bits -= k; + j->code_buffer <<= k; + return h->values[c]; +} + +// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); + + sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB + k = stbi_lrot(j->code_buffer, n); + STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask))); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k + (stbi__jbias[n] & ~sgn); +} + +// get some unsigned bits +stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) +{ + unsigned int k; + if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k; +} + +stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) +{ + unsigned int k; + if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + k = j->code_buffer; + j->code_buffer <<= 1; + --j->code_bits; + return k & 0x80000000; +} + +// given a value that's at position X in the zigzag stream, +// where does it appear in the 8x8 matrix coded as row-major? +static stbi_uc stbi__jpeg_dezigzag[64+15] = +{ + 0, 1, 8, 16, 9, 2, 3, 10, + 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, + 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, + 53, 60, 61, 54, 47, 55, 62, 63, + // let corrupt input sample past end + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63 +}; + +// decode one 64-entry block-- +static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi_uc *dequant) +{ + int diff,dc,k; + int t; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + + // 0 all the ac values now so we can do it 32-bits at a time + memset(data,0,64*sizeof(data[0])); + + diff = t ? stbi__extend_receive(j, t) : 0; + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc * dequant[0]); + + // decode AC components, see JPEG spec + k = 1; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * dequant[zig]); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (rs != 0xf0) break; // end block + k += 16; + } else { + k += r; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); + } + } + } while (k < 64); + return 1; +} + +static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) +{ + int diff,dc; + int t; + if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + if (j->succ_high == 0) { + // first scan for DC coefficient, must be first + memset(data,0,64*sizeof(data[0])); // 0 all the ac values now + t = stbi__jpeg_huff_decode(j, hdc); + diff = t ? stbi__extend_receive(j, t) : 0; + + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc << j->succ_low); + } else { + // refinement scan for DC coefficient + if (stbi__jpeg_get_bit(j)) + data[0] += (short) (1 << j->succ_low); + } + return 1; +} + +// @OPTIMIZE: store non-zigzagged during the decode passes, +// and only de-zigzag when dequantizing +static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) +{ + int k; + if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->succ_high == 0) { + int shift = j->succ_low; + + if (j->eob_run) { + --j->eob_run; + return 1; + } + + k = j->spec_start; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) << shift); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r); + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + --j->eob_run; + break; + } + k += 16; + } else { + k += r; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) << shift); + } + } + } while (k <= j->spec_end); + } else { + // refinement scan for these AC coefficients + + short bit = (short) (1 << j->succ_low); + + if (j->eob_run) { + --j->eob_run; + for (k = j->spec_start; k <= j->spec_end; ++k) { + short *p = &data[stbi__jpeg_dezigzag[k]]; + if (*p != 0) + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } + } else { + k = j->spec_start; + do { + int r,s; + int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r) - 1; + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + r = 64; // force end of block + } else { + // r=15 s=0 should write 16 0s, so we just do + // a run of 15 0s and then write s (which is 0), + // so we don't have to do anything special here + } + } else { + if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); + // sign bit + if (stbi__jpeg_get_bit(j)) + s = bit; + else + s = -bit; + } + + // advance by r + while (k <= j->spec_end) { + short *p = &data[stbi__jpeg_dezigzag[k++]]; + if (*p != 0) { + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } else { + if (r == 0) { + *p = (short) s; + break; + } + --r; + } + } + } while (k <= j->spec_end); + } + } + return 1; +} + +// take a -128..127 value and stbi__clamp it and convert to 0..255 +stbi_inline static stbi_uc stbi__clamp(int x) +{ + // trick to use a single test to catch both cases + if ((unsigned int) x > 255) { + if (x < 0) return 0; + if (x > 255) return 255; + } + return (stbi_uc) x; +} + +#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) +#define stbi__fsh(x) ((x) << 12) + +// derived from jidctint -- DCT_ISLOW +#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ + int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ + p2 = s2; \ + p3 = s6; \ + p1 = (p2+p3) * stbi__f2f(0.5411961f); \ + t2 = p1 + p3*stbi__f2f(-1.847759065f); \ + t3 = p1 + p2*stbi__f2f( 0.765366865f); \ + p2 = s0; \ + p3 = s4; \ + t0 = stbi__fsh(p2+p3); \ + t1 = stbi__fsh(p2-p3); \ + x0 = t0+t3; \ + x3 = t0-t3; \ + x1 = t1+t2; \ + x2 = t1-t2; \ + t0 = s7; \ + t1 = s5; \ + t2 = s3; \ + t3 = s1; \ + p3 = t0+t2; \ + p4 = t1+t3; \ + p1 = t0+t3; \ + p2 = t1+t2; \ + p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ + t0 = t0*stbi__f2f( 0.298631336f); \ + t1 = t1*stbi__f2f( 2.053119869f); \ + t2 = t2*stbi__f2f( 3.072711026f); \ + t3 = t3*stbi__f2f( 1.501321110f); \ + p1 = p5 + p1*stbi__f2f(-0.899976223f); \ + p2 = p5 + p2*stbi__f2f(-2.562915447f); \ + p3 = p3*stbi__f2f(-1.961570560f); \ + p4 = p4*stbi__f2f(-0.390180644f); \ + t3 += p1+p4; \ + t2 += p2+p3; \ + t1 += p2+p4; \ + t0 += p1+p3; + +static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) +{ + int i,val[64],*v=val; + stbi_uc *o; + short *d = data; + + // columns + for (i=0; i < 8; ++i,++d, ++v) { + // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing + if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 + && d[40]==0 && d[48]==0 && d[56]==0) { + // no shortcut 0 seconds + // (1|2|3|4|5|6|7)==0 0 seconds + // all separate -0.047 seconds + // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds + int dcterm = d[0] << 2; + v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; + } else { + STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) + // constants scaled things up by 1<<12; let's bring them back + // down, but keep 2 extra bits of precision + x0 += 512; x1 += 512; x2 += 512; x3 += 512; + v[ 0] = (x0+t3) >> 10; + v[56] = (x0-t3) >> 10; + v[ 8] = (x1+t2) >> 10; + v[48] = (x1-t2) >> 10; + v[16] = (x2+t1) >> 10; + v[40] = (x2-t1) >> 10; + v[24] = (x3+t0) >> 10; + v[32] = (x3-t0) >> 10; + } + } + + for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { + // no fast case since the first 1D IDCT spread components out + STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) + // constants scaled things up by 1<<12, plus we had 1<<2 from first + // loop, plus horizontal and vertical each scale by sqrt(8) so together + // we've got an extra 1<<3, so 1<<17 total we need to remove. + // so we want to round that, which means adding 0.5 * 1<<17, + // aka 65536. Also, we'll end up with -128 to 127 that we want + // to encode as 0..255 by adding 128, so we'll add that before the shift + x0 += 65536 + (128<<17); + x1 += 65536 + (128<<17); + x2 += 65536 + (128<<17); + x3 += 65536 + (128<<17); + // tried computing the shifts into temps, or'ing the temps to see + // if any were out of range, but that was slower + o[0] = stbi__clamp((x0+t3) >> 17); + o[7] = stbi__clamp((x0-t3) >> 17); + o[1] = stbi__clamp((x1+t2) >> 17); + o[6] = stbi__clamp((x1-t2) >> 17); + o[2] = stbi__clamp((x2+t1) >> 17); + o[5] = stbi__clamp((x2-t1) >> 17); + o[3] = stbi__clamp((x3+t0) >> 17); + o[4] = stbi__clamp((x3-t0) >> 17); + } +} + +#ifdef STBI_SSE2 +// sse2 integer IDCT. not the fastest possible implementation but it +// produces bit-identical results to the generic C version so it's +// fully "transparent". +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + // This is constructed to match our regular (generic) integer IDCT exactly. + __m128i row0, row1, row2, row3, row4, row5, row6, row7; + __m128i tmp; + + // dot product constant: even elems=x, odd elems=y + #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) + + // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) + // out(1) = c1[even]*x + c1[odd]*y + #define dct_rot(out0,out1, x,y,c0,c1) \ + __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ + __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ + __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ + __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ + __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ + __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) + + // out = in << 12 (in 16-bit, out 32-bit) + #define dct_widen(out, in) \ + __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ + __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) + + // wide add + #define dct_wadd(out, a, b) \ + __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_add_epi32(a##_h, b##_h) + + // wide sub + #define dct_wsub(out, a, b) \ + __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) + + // butterfly a/b, add bias, then shift by "s" and pack + #define dct_bfly32o(out0, out1, a,b,bias,s) \ + { \ + __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ + __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ + dct_wadd(sum, abiased, b); \ + dct_wsub(dif, abiased, b); \ + out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ + out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ + } + + // 8-bit interleave step (for transposes) + #define dct_interleave8(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi8(a, b); \ + b = _mm_unpackhi_epi8(tmp, b) + + // 16-bit interleave step (for transposes) + #define dct_interleave16(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi16(a, b); \ + b = _mm_unpackhi_epi16(tmp, b) + + #define dct_pass(bias,shift) \ + { \ + /* even part */ \ + dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ + __m128i sum04 = _mm_add_epi16(row0, row4); \ + __m128i dif04 = _mm_sub_epi16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ + dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ + __m128i sum17 = _mm_add_epi16(row1, row7); \ + __m128i sum35 = _mm_add_epi16(row3, row5); \ + dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ + dct_wadd(x4, y0o, y4o); \ + dct_wadd(x5, y1o, y5o); \ + dct_wadd(x6, y2o, y5o); \ + dct_wadd(x7, y3o, y4o); \ + dct_bfly32o(row0,row7, x0,x7,bias,shift); \ + dct_bfly32o(row1,row6, x1,x6,bias,shift); \ + dct_bfly32o(row2,row5, x2,x5,bias,shift); \ + dct_bfly32o(row3,row4, x3,x4,bias,shift); \ + } + + __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); + __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); + __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); + __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); + __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); + __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); + __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); + __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); + + // rounding biases in column/row passes, see stbi__idct_block for explanation. + __m128i bias_0 = _mm_set1_epi32(512); + __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); + + // load + row0 = _mm_load_si128((const __m128i *) (data + 0*8)); + row1 = _mm_load_si128((const __m128i *) (data + 1*8)); + row2 = _mm_load_si128((const __m128i *) (data + 2*8)); + row3 = _mm_load_si128((const __m128i *) (data + 3*8)); + row4 = _mm_load_si128((const __m128i *) (data + 4*8)); + row5 = _mm_load_si128((const __m128i *) (data + 5*8)); + row6 = _mm_load_si128((const __m128i *) (data + 6*8)); + row7 = _mm_load_si128((const __m128i *) (data + 7*8)); + + // column pass + dct_pass(bias_0, 10); + + { + // 16bit 8x8 transpose pass 1 + dct_interleave16(row0, row4); + dct_interleave16(row1, row5); + dct_interleave16(row2, row6); + dct_interleave16(row3, row7); + + // transpose pass 2 + dct_interleave16(row0, row2); + dct_interleave16(row1, row3); + dct_interleave16(row4, row6); + dct_interleave16(row5, row7); + + // transpose pass 3 + dct_interleave16(row0, row1); + dct_interleave16(row2, row3); + dct_interleave16(row4, row5); + dct_interleave16(row6, row7); + } + + // row pass + dct_pass(bias_1, 17); + + { + // pack + __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 + __m128i p1 = _mm_packus_epi16(row2, row3); + __m128i p2 = _mm_packus_epi16(row4, row5); + __m128i p3 = _mm_packus_epi16(row6, row7); + + // 8bit 8x8 transpose pass 1 + dct_interleave8(p0, p2); // a0e0a1e1... + dct_interleave8(p1, p3); // c0g0c1g1... + + // transpose pass 2 + dct_interleave8(p0, p1); // a0c0e0g0... + dct_interleave8(p2, p3); // b0d0f0h0... + + // transpose pass 3 + dct_interleave8(p0, p2); // a0b0c0d0... + dct_interleave8(p1, p3); // a4b4c4d4... + + // store + _mm_storel_epi64((__m128i *) out, p0); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p2); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p1); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p3); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); + } + +#undef dct_const +#undef dct_rot +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_interleave8 +#undef dct_interleave16 +#undef dct_pass +} + +#endif // STBI_SSE2 + +#ifdef STBI_NEON + +// NEON integer IDCT. should produce bit-identical +// results to the generic C version. +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; + + int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); + int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); + int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); + int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); + int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); + int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); + int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); + int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); + int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); + int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); + int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); + int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); + +#define dct_long_mul(out, inq, coeff) \ + int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) + +#define dct_long_mac(out, acc, inq, coeff) \ + int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) + +#define dct_widen(out, inq) \ + int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ + int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) + +// wide add +#define dct_wadd(out, a, b) \ + int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vaddq_s32(a##_h, b##_h) + +// wide sub +#define dct_wsub(out, a, b) \ + int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vsubq_s32(a##_h, b##_h) + +// butterfly a/b, then shift using "shiftop" by "s" and pack +#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ + { \ + dct_wadd(sum, a, b); \ + dct_wsub(dif, a, b); \ + out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ + out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ + } + +#define dct_pass(shiftop, shift) \ + { \ + /* even part */ \ + int16x8_t sum26 = vaddq_s16(row2, row6); \ + dct_long_mul(p1e, sum26, rot0_0); \ + dct_long_mac(t2e, p1e, row6, rot0_1); \ + dct_long_mac(t3e, p1e, row2, rot0_2); \ + int16x8_t sum04 = vaddq_s16(row0, row4); \ + int16x8_t dif04 = vsubq_s16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + int16x8_t sum15 = vaddq_s16(row1, row5); \ + int16x8_t sum17 = vaddq_s16(row1, row7); \ + int16x8_t sum35 = vaddq_s16(row3, row5); \ + int16x8_t sum37 = vaddq_s16(row3, row7); \ + int16x8_t sumodd = vaddq_s16(sum17, sum35); \ + dct_long_mul(p5o, sumodd, rot1_0); \ + dct_long_mac(p1o, p5o, sum17, rot1_1); \ + dct_long_mac(p2o, p5o, sum35, rot1_2); \ + dct_long_mul(p3o, sum37, rot2_0); \ + dct_long_mul(p4o, sum15, rot2_1); \ + dct_wadd(sump13o, p1o, p3o); \ + dct_wadd(sump24o, p2o, p4o); \ + dct_wadd(sump23o, p2o, p3o); \ + dct_wadd(sump14o, p1o, p4o); \ + dct_long_mac(x4, sump13o, row7, rot3_0); \ + dct_long_mac(x5, sump24o, row5, rot3_1); \ + dct_long_mac(x6, sump23o, row3, rot3_2); \ + dct_long_mac(x7, sump14o, row1, rot3_3); \ + dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ + dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ + dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ + dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ + } + + // load + row0 = vld1q_s16(data + 0*8); + row1 = vld1q_s16(data + 1*8); + row2 = vld1q_s16(data + 2*8); + row3 = vld1q_s16(data + 3*8); + row4 = vld1q_s16(data + 4*8); + row5 = vld1q_s16(data + 5*8); + row6 = vld1q_s16(data + 6*8); + row7 = vld1q_s16(data + 7*8); + + // add DC bias + row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); + + // column pass + dct_pass(vrshrn_n_s32, 10); + + // 16bit 8x8 transpose + { +// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. +// whether compilers actually get this is another story, sadly. +#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } +#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } + + // pass 1 + dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 + dct_trn16(row2, row3); + dct_trn16(row4, row5); + dct_trn16(row6, row7); + + // pass 2 + dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 + dct_trn32(row1, row3); + dct_trn32(row4, row6); + dct_trn32(row5, row7); + + // pass 3 + dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 + dct_trn64(row1, row5); + dct_trn64(row2, row6); + dct_trn64(row3, row7); + +#undef dct_trn16 +#undef dct_trn32 +#undef dct_trn64 + } + + // row pass + // vrshrn_n_s32 only supports shifts up to 16, we need + // 17. so do a non-rounding shift of 16 first then follow + // up with a rounding shift by 1. + dct_pass(vshrn_n_s32, 16); + + { + // pack and round + uint8x8_t p0 = vqrshrun_n_s16(row0, 1); + uint8x8_t p1 = vqrshrun_n_s16(row1, 1); + uint8x8_t p2 = vqrshrun_n_s16(row2, 1); + uint8x8_t p3 = vqrshrun_n_s16(row3, 1); + uint8x8_t p4 = vqrshrun_n_s16(row4, 1); + uint8x8_t p5 = vqrshrun_n_s16(row5, 1); + uint8x8_t p6 = vqrshrun_n_s16(row6, 1); + uint8x8_t p7 = vqrshrun_n_s16(row7, 1); + + // again, these can translate into one instruction, but often don't. +#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } +#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } + + // sadly can't use interleaved stores here since we only write + // 8 bytes to each scan line! + + // 8x8 8-bit transpose pass 1 + dct_trn8_8(p0, p1); + dct_trn8_8(p2, p3); + dct_trn8_8(p4, p5); + dct_trn8_8(p6, p7); + + // pass 2 + dct_trn8_16(p0, p2); + dct_trn8_16(p1, p3); + dct_trn8_16(p4, p6); + dct_trn8_16(p5, p7); + + // pass 3 + dct_trn8_32(p0, p4); + dct_trn8_32(p1, p5); + dct_trn8_32(p2, p6); + dct_trn8_32(p3, p7); + + // store + vst1_u8(out, p0); out += out_stride; + vst1_u8(out, p1); out += out_stride; + vst1_u8(out, p2); out += out_stride; + vst1_u8(out, p3); out += out_stride; + vst1_u8(out, p4); out += out_stride; + vst1_u8(out, p5); out += out_stride; + vst1_u8(out, p6); out += out_stride; + vst1_u8(out, p7); + +#undef dct_trn8_8 +#undef dct_trn8_16 +#undef dct_trn8_32 + } + +#undef dct_long_mul +#undef dct_long_mac +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_pass +} + +#endif // STBI_NEON + +#define STBI__MARKER_none 0xff +// if there's a pending marker from the entropy stream, return that +// otherwise, fetch from the stream and get a marker. if there's no +// marker, return 0xff, which is never a valid marker value +static stbi_uc stbi__get_marker(stbi__jpeg *j) +{ + stbi_uc x; + if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } + x = stbi__get8(j->s); + if (x != 0xff) return STBI__MARKER_none; + while (x == 0xff) + x = stbi__get8(j->s); + return x; +} + +// in each scan, we'll have scan_n components, and the order +// of the components is specified by order[] +#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) + +// after a restart interval, stbi__jpeg_reset the entropy decoder and +// the dc prediction +static void stbi__jpeg_reset(stbi__jpeg *j) +{ + j->code_bits = 0; + j->code_buffer = 0; + j->nomore = 0; + j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0; + j->marker = STBI__MARKER_none; + j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; + j->eob_run = 0; + // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, + // since we don't even allow 1<<30 pixels +} + +static int stbi__parse_entropy_coded_data(stbi__jpeg *z) +{ + stbi__jpeg_reset(z); + if (!z->progressive) { + if (z->scan_n == 1) { + int i,j; + STBI_SIMD_ALIGN(short, data[64]); + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + // if it's NOT a restart, then just bail, so we get corrupt data + // rather than no data + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + STBI_SIMD_ALIGN(short, data[64]); + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x)*8; + int y2 = (j*z->img_comp[n].v + y)*8; + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } else { + if (z->scan_n == 1) { + int i,j; + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + if (z->spec_start == 0) { + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } else { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) + return 0; + } + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x); + int y2 = (j*z->img_comp[n].v + y); + short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } +} + +static void stbi__jpeg_dequantize(short *data, stbi_uc *dequant) +{ + int i; + for (i=0; i < 64; ++i) + data[i] *= dequant[i]; +} + +static void stbi__jpeg_finish(stbi__jpeg *z) +{ + if (z->progressive) { + // dequantize and idct the data + int i,j,n; + for (n=0; n < z->s->img_n; ++n) { + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + } + } + } + } +} + +static int stbi__process_marker(stbi__jpeg *z, int m) +{ + int L; + switch (m) { + case STBI__MARKER_none: // no marker found + return stbi__err("expected marker","Corrupt JPEG"); + + case 0xDD: // DRI - specify restart interval + if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); + z->restart_interval = stbi__get16be(z->s); + return 1; + + case 0xDB: // DQT - define quantization table + L = stbi__get16be(z->s)-2; + while (L > 0) { + int q = stbi__get8(z->s); + int p = q >> 4; + int t = q & 15,i; + if (p != 0) return stbi__err("bad DQT type","Corrupt JPEG"); + if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); + for (i=0; i < 64; ++i) + z->dequant[t][stbi__jpeg_dezigzag[i]] = stbi__get8(z->s); + L -= 65; + } + return L==0; + + case 0xC4: // DHT - define huffman table + L = stbi__get16be(z->s)-2; + while (L > 0) { + stbi_uc *v; + int sizes[16],i,n=0; + int q = stbi__get8(z->s); + int tc = q >> 4; + int th = q & 15; + if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); + for (i=0; i < 16; ++i) { + sizes[i] = stbi__get8(z->s); + n += sizes[i]; + } + L -= 17; + if (tc == 0) { + if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; + v = z->huff_dc[th].values; + } else { + if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; + v = z->huff_ac[th].values; + } + for (i=0; i < n; ++i) + v[i] = stbi__get8(z->s); + if (tc != 0) + stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); + L -= n; + } + return L==0; + } + // check for comment block or APP blocks + if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { + stbi__skip(z->s, stbi__get16be(z->s)-2); + return 1; + } + return 0; +} + +// after we see SOS +static int stbi__process_scan_header(stbi__jpeg *z) +{ + int i; + int Ls = stbi__get16be(z->s); + z->scan_n = stbi__get8(z->s); + if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); + if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); + for (i=0; i < z->scan_n; ++i) { + int id = stbi__get8(z->s), which; + int q = stbi__get8(z->s); + for (which = 0; which < z->s->img_n; ++which) + if (z->img_comp[which].id == id) + break; + if (which == z->s->img_n) return 0; // no match + z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); + z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); + z->order[i] = which; + } + + { + int aa; + z->spec_start = stbi__get8(z->s); + z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 + aa = stbi__get8(z->s); + z->succ_high = (aa >> 4); + z->succ_low = (aa & 15); + if (z->progressive) { + if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) + return stbi__err("bad SOS", "Corrupt JPEG"); + } else { + if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); + if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); + z->spec_end = 63; + } + } + + return 1; +} + +static int stbi__process_frame_header(stbi__jpeg *z, int scan) +{ + stbi__context *s = z->s; + int Lf,p,i,q, h_max=1,v_max=1,c; + Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG + p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline + s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG + s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires + c = stbi__get8(s); + if (c != 3 && c != 1) return stbi__err("bad component count","Corrupt JPEG"); // JFIF requires + s->img_n = c; + for (i=0; i < c; ++i) { + z->img_comp[i].data = NULL; + z->img_comp[i].linebuf = NULL; + } + + if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); + + for (i=0; i < s->img_n; ++i) { + z->img_comp[i].id = stbi__get8(s); + if (z->img_comp[i].id != i+1) // JFIF requires + if (z->img_comp[i].id != i) // some version of jpegtran outputs non-JFIF-compliant files! + return stbi__err("bad component ID","Corrupt JPEG"); + q = stbi__get8(s); + z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); + z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); + z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); + } + + if (scan != STBI__SCAN_load) return 1; + + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + + for (i=0; i < s->img_n; ++i) { + if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; + if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; + } + + // compute interleaved mcu info + z->img_h_max = h_max; + z->img_v_max = v_max; + z->img_mcu_w = h_max * 8; + z->img_mcu_h = v_max * 8; + z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; + z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; + + for (i=0; i < s->img_n; ++i) { + // number of effective pixels (e.g. for non-interleaved MCU) + z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; + z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; + // to simplify generation, we'll allocate enough memory to decode + // the bogus oversized data from using interleaved MCUs and their + // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't + // discard the extra data until colorspace conversion + z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; + z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; + z->img_comp[i].raw_data = stbi__malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15); + + if (z->img_comp[i].raw_data == NULL) { + for(--i; i >= 0; --i) { + STBI_FREE(z->img_comp[i].raw_data); + z->img_comp[i].raw_data = NULL; + } + return stbi__err("outofmem", "Out of memory"); + } + // align blocks for idct using mmx/sse + z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); + z->img_comp[i].linebuf = NULL; + if (z->progressive) { + z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3; + z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3; + z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15); + z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); + } else { + z->img_comp[i].coeff = 0; + z->img_comp[i].raw_coeff = 0; + } + } + + return 1; +} + +// use comparisons since in some cases we handle more than one case (e.g. SOF) +#define stbi__DNL(x) ((x) == 0xdc) +#define stbi__SOI(x) ((x) == 0xd8) +#define stbi__EOI(x) ((x) == 0xd9) +#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) +#define stbi__SOS(x) ((x) == 0xda) + +#define stbi__SOF_progressive(x) ((x) == 0xc2) + +static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) +{ + int m; + z->marker = STBI__MARKER_none; // initialize cached marker to empty + m = stbi__get_marker(z); + if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); + if (scan == STBI__SCAN_type) return 1; + m = stbi__get_marker(z); + while (!stbi__SOF(m)) { + if (!stbi__process_marker(z,m)) return 0; + m = stbi__get_marker(z); + while (m == STBI__MARKER_none) { + // some files have extra padding after their blocks, so ok, we'll scan + if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); + m = stbi__get_marker(z); + } + } + z->progressive = stbi__SOF_progressive(m); + if (!stbi__process_frame_header(z, scan)) return 0; + return 1; +} + +// decode image to YCbCr format +static int stbi__decode_jpeg_image(stbi__jpeg *j) +{ + int m; + for (m = 0; m < 4; m++) { + j->img_comp[m].raw_data = NULL; + j->img_comp[m].raw_coeff = NULL; + } + j->restart_interval = 0; + if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; + m = stbi__get_marker(j); + while (!stbi__EOI(m)) { + if (stbi__SOS(m)) { + if (!stbi__process_scan_header(j)) return 0; + if (!stbi__parse_entropy_coded_data(j)) return 0; + if (j->marker == STBI__MARKER_none ) { + // handle 0s at the end of image data from IP Kamera 9060 + while (!stbi__at_eof(j->s)) { + int x = stbi__get8(j->s); + if (x == 255) { + j->marker = stbi__get8(j->s); + break; + } else if (x != 0) { + return stbi__err("junk before marker", "Corrupt JPEG"); + } + } + // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 + } + } else { + if (!stbi__process_marker(j, m)) return 0; + } + m = stbi__get_marker(j); + } + if (j->progressive) + stbi__jpeg_finish(j); + return 1; +} + +// static jfif-centered resampling (across block boundaries) + +typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, + int w, int hs); + +#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) + +static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + STBI_NOTUSED(out); + STBI_NOTUSED(in_far); + STBI_NOTUSED(w); + STBI_NOTUSED(hs); + return in_near; +} + +static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples vertically for every one in input + int i; + STBI_NOTUSED(hs); + for (i=0; i < w; ++i) + out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); + return out; +} + +static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples horizontally for every one in input + int i; + stbi_uc *input = in_near; + + if (w == 1) { + // if only one sample, can't do any interpolation + out[0] = out[1] = input[0]; + return out; + } + + out[0] = input[0]; + out[1] = stbi__div4(input[0]*3 + input[1] + 2); + for (i=1; i < w-1; ++i) { + int n = 3*input[i]+2; + out[i*2+0] = stbi__div4(n+input[i-1]); + out[i*2+1] = stbi__div4(n+input[i+1]); + } + out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); + out[i*2+1] = input[w-1]; + + STBI_NOTUSED(in_far); + STBI_NOTUSED(hs); + + return out; +} + +#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) + +static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i,t0,t1; + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + out[0] = stbi__div4(t1+2); + for (i=1; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i=0,t0,t1; + + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + // process groups of 8 pixels for as long as we can. + // note we can't handle the last pixel in a row in this loop + // because we need to handle the filter boundary conditions. + for (; i < ((w-1) & ~7); i += 8) { +#if defined(STBI_SSE2) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + __m128i zero = _mm_setzero_si128(); + __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); + __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); + __m128i farw = _mm_unpacklo_epi8(farb, zero); + __m128i nearw = _mm_unpacklo_epi8(nearb, zero); + __m128i diff = _mm_sub_epi16(farw, nearw); + __m128i nears = _mm_slli_epi16(nearw, 2); + __m128i curr = _mm_add_epi16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + __m128i prv0 = _mm_slli_si128(curr, 2); + __m128i nxt0 = _mm_srli_si128(curr, 2); + __m128i prev = _mm_insert_epi16(prv0, t1, 0); + __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + __m128i bias = _mm_set1_epi16(8); + __m128i curs = _mm_slli_epi16(curr, 2); + __m128i prvd = _mm_sub_epi16(prev, curr); + __m128i nxtd = _mm_sub_epi16(next, curr); + __m128i curb = _mm_add_epi16(curs, bias); + __m128i even = _mm_add_epi16(prvd, curb); + __m128i odd = _mm_add_epi16(nxtd, curb); + + // interleave even and odd pixels, then undo scaling. + __m128i int0 = _mm_unpacklo_epi16(even, odd); + __m128i int1 = _mm_unpackhi_epi16(even, odd); + __m128i de0 = _mm_srli_epi16(int0, 4); + __m128i de1 = _mm_srli_epi16(int1, 4); + + // pack and write output + __m128i outv = _mm_packus_epi16(de0, de1); + _mm_storeu_si128((__m128i *) (out + i*2), outv); +#elif defined(STBI_NEON) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + uint8x8_t farb = vld1_u8(in_far + i); + uint8x8_t nearb = vld1_u8(in_near + i); + int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); + int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); + int16x8_t curr = vaddq_s16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + int16x8_t prv0 = vextq_s16(curr, curr, 7); + int16x8_t nxt0 = vextq_s16(curr, curr, 1); + int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); + int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + int16x8_t curs = vshlq_n_s16(curr, 2); + int16x8_t prvd = vsubq_s16(prev, curr); + int16x8_t nxtd = vsubq_s16(next, curr); + int16x8_t even = vaddq_s16(curs, prvd); + int16x8_t odd = vaddq_s16(curs, nxtd); + + // undo scaling and round, then store with even/odd phases interleaved + uint8x8x2_t o; + o.val[0] = vqrshrun_n_s16(even, 4); + o.val[1] = vqrshrun_n_s16(odd, 4); + vst2_u8(out + i*2, o); +#endif + + // "previous" value for next iter + t1 = 3*in_near[i+7] + in_far[i+7]; + } + + t0 = t1; + t1 = 3*in_near[i] + in_far[i]; + out[i*2] = stbi__div16(3*t1 + t0 + 8); + + for (++i; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} +#endif + +static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // resample with nearest-neighbor + int i,j; + STBI_NOTUSED(in_far); + for (i=0; i < w; ++i) + for (j=0; j < hs; ++j) + out[i*hs+j] = in_near[i]; + return out; +} + +#ifdef STBI_JPEG_OLD +// this is the same YCbCr-to-RGB calculation that stb_image has used +// historically before the algorithm changes in 1.49 +#define float2fixed(x) ((int) ((x) * 65536 + 0.5)) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 16) + 32768; // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr*float2fixed(1.40200f); + g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f); + b = y_fixed + cb*float2fixed(1.77200f); + r >>= 16; + g >>= 16; + b >>= 16; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#else +// this is a reduced-precision calculation of YCbCr-to-RGB introduced +// to make sure the code produces the same results in both SIMD and scalar +#define float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* float2fixed(1.40200f); + g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) +{ + int i = 0; + +#ifdef STBI_SSE2 + // step == 3 is pretty ugly on the final interleave, and i'm not convinced + // it's useful in practice (you wouldn't use it for textures, for example). + // so just accelerate step == 4 case. + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + __m128i signflip = _mm_set1_epi8(-0x80); + __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); + __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); + __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); + __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); + __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); + __m128i xw = _mm_set1_epi16(255); // alpha channel + + for (; i+7 < count; i += 8) { + // load + __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); + __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); + __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); + __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 + __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 + + // unpack to short (and left-shift cr, cb by 8) + __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); + __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); + __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); + + // color transform + __m128i yws = _mm_srli_epi16(yw, 4); + __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); + __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); + __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); + __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); + __m128i rws = _mm_add_epi16(cr0, yws); + __m128i gwt = _mm_add_epi16(cb0, yws); + __m128i bws = _mm_add_epi16(yws, cb1); + __m128i gws = _mm_add_epi16(gwt, cr1); + + // descale + __m128i rw = _mm_srai_epi16(rws, 4); + __m128i bw = _mm_srai_epi16(bws, 4); + __m128i gw = _mm_srai_epi16(gws, 4); + + // back to byte, set up for transpose + __m128i brb = _mm_packus_epi16(rw, bw); + __m128i gxb = _mm_packus_epi16(gw, xw); + + // transpose to interleave channels + __m128i t0 = _mm_unpacklo_epi8(brb, gxb); + __m128i t1 = _mm_unpackhi_epi8(brb, gxb); + __m128i o0 = _mm_unpacklo_epi16(t0, t1); + __m128i o1 = _mm_unpackhi_epi16(t0, t1); + + // store + _mm_storeu_si128((__m128i *) (out + 0), o0); + _mm_storeu_si128((__m128i *) (out + 16), o1); + out += 32; + } + } +#endif + +#ifdef STBI_NEON + // in this version, step=3 support would be easy to add. but is there demand? + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + uint8x8_t signflip = vdup_n_u8(0x80); + int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); + int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); + int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); + int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); + + for (; i+7 < count; i += 8) { + // load + uint8x8_t y_bytes = vld1_u8(y + i); + uint8x8_t cr_bytes = vld1_u8(pcr + i); + uint8x8_t cb_bytes = vld1_u8(pcb + i); + int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); + int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); + + // expand to s16 + int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); + int16x8_t crw = vshll_n_s8(cr_biased, 7); + int16x8_t cbw = vshll_n_s8(cb_biased, 7); + + // color transform + int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); + int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); + int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); + int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); + int16x8_t rws = vaddq_s16(yws, cr0); + int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); + int16x8_t bws = vaddq_s16(yws, cb1); + + // undo scaling, round, convert to byte + uint8x8x4_t o; + o.val[0] = vqrshrun_n_s16(rws, 4); + o.val[1] = vqrshrun_n_s16(gws, 4); + o.val[2] = vqrshrun_n_s16(bws, 4); + o.val[3] = vdup_n_u8(255); + + // store, interleaving r/g/b/a + vst4_u8(out, o); + out += 8*4; + } + } +#endif + + for (; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* float2fixed(1.40200f); + g = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +// set up the kernels +static void stbi__setup_jpeg(stbi__jpeg *j) +{ + j->idct_block_kernel = stbi__idct_block; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; + +#ifdef STBI_SSE2 + if (stbi__sse2_available()) { + j->idct_block_kernel = stbi__idct_simd; + #ifndef STBI_JPEG_OLD + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + #endif + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; + } +#endif + +#ifdef STBI_NEON + j->idct_block_kernel = stbi__idct_simd; + #ifndef STBI_JPEG_OLD + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + #endif + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; +#endif +} + +// clean up the temporary component buffers +static void stbi__cleanup_jpeg(stbi__jpeg *j) +{ + int i; + for (i=0; i < j->s->img_n; ++i) { + if (j->img_comp[i].raw_data) { + STBI_FREE(j->img_comp[i].raw_data); + j->img_comp[i].raw_data = NULL; + j->img_comp[i].data = NULL; + } + if (j->img_comp[i].raw_coeff) { + STBI_FREE(j->img_comp[i].raw_coeff); + j->img_comp[i].raw_coeff = 0; + j->img_comp[i].coeff = 0; + } + if (j->img_comp[i].linebuf) { + STBI_FREE(j->img_comp[i].linebuf); + j->img_comp[i].linebuf = NULL; + } + } +} + +typedef struct +{ + resample_row_func resample; + stbi_uc *line0,*line1; + int hs,vs; // expansion factor in each axis + int w_lores; // horizontal pixels pre-expansion + int ystep; // how far through vertical expansion we are + int ypos; // which pre-expansion row we're on +} stbi__resample; + +static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) +{ + int n, decode_n; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + + // validate req_comp + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + + // load a jpeg image from whichever source, but leave in YCbCr format + if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } + + // determine actual number of components to generate + n = req_comp ? req_comp : z->s->img_n; + + if (z->s->img_n == 3 && n < 3) + decode_n = 1; + else + decode_n = z->s->img_n; + + // resample and color-convert + { + int k; + unsigned int i,j; + stbi_uc *output; + stbi_uc *coutput[4]; + + stbi__resample res_comp[4]; + + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + + // allocate line buffer big enough for upsampling off the edges + // with upsample factor of 4 + z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); + if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + r->hs = z->img_h_max / z->img_comp[k].h; + r->vs = z->img_v_max / z->img_comp[k].v; + r->ystep = r->vs >> 1; + r->w_lores = (z->s->img_x + r->hs-1) / r->hs; + r->ypos = 0; + r->line0 = r->line1 = z->img_comp[k].data; + + if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; + else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; + else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; + else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; + else r->resample = stbi__resample_row_generic; + } + + // can't error after this so, this is safe + output = (stbi_uc *) stbi__malloc(n * z->s->img_x * z->s->img_y + 1); + if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + // now go ahead and resample + for (j=0; j < z->s->img_y; ++j) { + stbi_uc *out = output + n * z->s->img_x * j; + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + int y_bot = r->ystep >= (r->vs >> 1); + coutput[k] = r->resample(z->img_comp[k].linebuf, + y_bot ? r->line1 : r->line0, + y_bot ? r->line0 : r->line1, + r->w_lores, r->hs); + if (++r->ystep >= r->vs) { + r->ystep = 0; + r->line0 = r->line1; + if (++r->ypos < z->img_comp[k].y) + r->line1 += z->img_comp[k].w2; + } + } + if (n >= 3) { + stbi_uc *y = coutput[0]; + if (z->s->img_n == 3) { + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } else + for (i=0; i < z->s->img_x; ++i) { + out[0] = out[1] = out[2] = y[i]; + out[3] = 255; // not used if n==3 + out += n; + } + } else { + stbi_uc *y = coutput[0]; + if (n == 1) + for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; + else + for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255; + } + } + stbi__cleanup_jpeg(z); + *out_x = z->s->img_x; + *out_y = z->s->img_y; + if (comp) *comp = z->s->img_n; // report original components, not output + return output; + } +} + +static unsigned char *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__jpeg j; + j.s = s; + stbi__setup_jpeg(&j); + return load_jpeg_image(&j, x,y,comp,req_comp); +} + +static int stbi__jpeg_test(stbi__context *s) +{ + int r; + stbi__jpeg j; + j.s = s; + stbi__setup_jpeg(&j); + r = stbi__decode_jpeg_header(&j, STBI__SCAN_type); + stbi__rewind(s); + return r; +} + +static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) +{ + if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { + stbi__rewind( j->s ); + return 0; + } + if (x) *x = j->s->img_x; + if (y) *y = j->s->img_y; + if (comp) *comp = j->s->img_n; + return 1; +} + +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__jpeg j; + j.s = s; + return stbi__jpeg_info_raw(&j, x, y, comp); +} +#endif + +// public domain zlib decode v0.2 Sean Barrett 2006-11-18 +// simple implementation +// - all input must be provided in an upfront buffer +// - all output is written to a single output buffer (can malloc/realloc) +// performance +// - fast huffman + +#ifndef STBI_NO_ZLIB + +// fast-way is faster to check than jpeg huffman, but slow way is slower +#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables +#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) + +// zlib-style huffman encoding +// (jpegs packs from left, zlib from right, so can't share code) +typedef struct +{ + stbi__uint16 fast[1 << STBI__ZFAST_BITS]; + stbi__uint16 firstcode[16]; + int maxcode[17]; + stbi__uint16 firstsymbol[16]; + stbi_uc size[288]; + stbi__uint16 value[288]; +} stbi__zhuffman; + +stbi_inline static int stbi__bitreverse16(int n) +{ + n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); + n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); + n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); + n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); + return n; +} + +stbi_inline static int stbi__bit_reverse(int v, int bits) +{ + STBI_ASSERT(bits <= 16); + // to bit reverse n bits, reverse 16 and shift + // e.g. 11 bits, bit reverse and shift away 5 + return stbi__bitreverse16(v) >> (16-bits); +} + +static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num) +{ + int i,k=0; + int code, next_code[16], sizes[17]; + + // DEFLATE spec for generating codes + memset(sizes, 0, sizeof(sizes)); + memset(z->fast, 0, sizeof(z->fast)); + for (i=0; i < num; ++i) + ++sizes[sizelist[i]]; + sizes[0] = 0; + for (i=1; i < 16; ++i) + if (sizes[i] > (1 << i)) + return stbi__err("bad sizes", "Corrupt PNG"); + code = 0; + for (i=1; i < 16; ++i) { + next_code[i] = code; + z->firstcode[i] = (stbi__uint16) code; + z->firstsymbol[i] = (stbi__uint16) k; + code = (code + sizes[i]); + if (sizes[i]) + if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); + z->maxcode[i] = code << (16-i); // preshift for inner loop + code <<= 1; + k += sizes[i]; + } + z->maxcode[16] = 0x10000; // sentinel + for (i=0; i < num; ++i) { + int s = sizelist[i]; + if (s) { + int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; + stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); + z->size [c] = (stbi_uc ) s; + z->value[c] = (stbi__uint16) i; + if (s <= STBI__ZFAST_BITS) { + int j = stbi__bit_reverse(next_code[s],s); + while (j < (1 << STBI__ZFAST_BITS)) { + z->fast[j] = fastv; + j += (1 << s); + } + } + ++next_code[s]; + } + } + return 1; +} + +// zlib-from-memory implementation for PNG reading +// because PNG allows splitting the zlib stream arbitrarily, +// and it's annoying structurally to have PNG call ZLIB call PNG, +// we require PNG read all the IDATs and combine them into a single +// memory buffer + +typedef struct +{ + stbi_uc *zbuffer, *zbuffer_end; + int num_bits; + stbi__uint32 code_buffer; + + char *zout; + char *zout_start; + char *zout_end; + int z_expandable; + + stbi__zhuffman z_length, z_distance; +} stbi__zbuf; + +stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) +{ + if (z->zbuffer >= z->zbuffer_end) return 0; + return *z->zbuffer++; +} + +static void stbi__fill_bits(stbi__zbuf *z) +{ + do { + STBI_ASSERT(z->code_buffer < (1U << z->num_bits)); + z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; + z->num_bits += 8; + } while (z->num_bits <= 24); +} + +stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) +{ + unsigned int k; + if (z->num_bits < n) stbi__fill_bits(z); + k = z->code_buffer & ((1 << n) - 1); + z->code_buffer >>= n; + z->num_bits -= n; + return k; +} + +static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s,k; + // not resolved by fast table, so compute it the slow way + // use jpeg approach, which requires MSbits at top + k = stbi__bit_reverse(a->code_buffer, 16); + for (s=STBI__ZFAST_BITS+1; ; ++s) + if (k < z->maxcode[s]) + break; + if (s == 16) return -1; // invalid code! + // code size is s, so: + b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; + STBI_ASSERT(z->size[b] == s); + a->code_buffer >>= s; + a->num_bits -= s; + return z->value[b]; +} + +stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s; + if (a->num_bits < 16) stbi__fill_bits(a); + b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; + if (b) { + s = b >> 9; + a->code_buffer >>= s; + a->num_bits -= s; + return b & 511; + } + return stbi__zhuffman_decode_slowpath(a, z); +} + +static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes +{ + char *q; + int cur, limit; + z->zout = zout; + if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); + cur = (int) (z->zout - z->zout_start); + limit = (int) (z->zout_end - z->zout_start); + while (cur + n > limit) + limit *= 2; + q = (char *) STBI_REALLOC(z->zout_start, limit); + if (q == NULL) return stbi__err("outofmem", "Out of memory"); + z->zout_start = q; + z->zout = q + cur; + z->zout_end = q + limit; + return 1; +} + +static int stbi__zlength_base[31] = { + 3,4,5,6,7,8,9,10,11,13, + 15,17,19,23,27,31,35,43,51,59, + 67,83,99,115,131,163,195,227,258,0,0 }; + +static int stbi__zlength_extra[31]= +{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; + +static int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, +257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; + +static int stbi__zdist_extra[32] = +{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +static int stbi__parse_huffman_block(stbi__zbuf *a) +{ + char *zout = a->zout; + for(;;) { + int z = stbi__zhuffman_decode(a, &a->z_length); + if (z < 256) { + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes + if (zout >= a->zout_end) { + if (!stbi__zexpand(a, zout, 1)) return 0; + zout = a->zout; + } + *zout++ = (char) z; + } else { + stbi_uc *p; + int len,dist; + if (z == 256) { + a->zout = zout; + return 1; + } + z -= 257; + len = stbi__zlength_base[z]; + if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); + z = stbi__zhuffman_decode(a, &a->z_distance); + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); + dist = stbi__zdist_base[z]; + if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); + if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); + if (zout + len > a->zout_end) { + if (!stbi__zexpand(a, zout, len)) return 0; + zout = a->zout; + } + p = (stbi_uc *) (zout - dist); + if (dist == 1) { // run of one byte; common in images. + stbi_uc v = *p; + if (len) { do *zout++ = v; while (--len); } + } else { + if (len) { do *zout++ = *p++; while (--len); } + } + } + } +} + +static int stbi__compute_huffman_codes(stbi__zbuf *a) +{ + static stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + stbi__zhuffman z_codelength; + stbi_uc lencodes[286+32+137];//padding for maximum single op + stbi_uc codelength_sizes[19]; + int i,n; + + int hlit = stbi__zreceive(a,5) + 257; + int hdist = stbi__zreceive(a,5) + 1; + int hclen = stbi__zreceive(a,4) + 4; + + memset(codelength_sizes, 0, sizeof(codelength_sizes)); + for (i=0; i < hclen; ++i) { + int s = stbi__zreceive(a,3); + codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; + } + if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; + + n = 0; + while (n < hlit + hdist) { + int c = stbi__zhuffman_decode(a, &z_codelength); + if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); + if (c < 16) + lencodes[n++] = (stbi_uc) c; + else if (c == 16) { + c = stbi__zreceive(a,2)+3; + memset(lencodes+n, lencodes[n-1], c); + n += c; + } else if (c == 17) { + c = stbi__zreceive(a,3)+3; + memset(lencodes+n, 0, c); + n += c; + } else { + STBI_ASSERT(c == 18); + c = stbi__zreceive(a,7)+11; + memset(lencodes+n, 0, c); + n += c; + } + } + if (n != hlit+hdist) return stbi__err("bad codelengths","Corrupt PNG"); + if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; + return 1; +} + +static int stbi__parse_uncomperssed_block(stbi__zbuf *a) +{ + stbi_uc header[4]; + int len,nlen,k; + if (a->num_bits & 7) + stbi__zreceive(a, a->num_bits & 7); // discard + // drain the bit-packed data into header + k = 0; + while (a->num_bits > 0) { + header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check + a->code_buffer >>= 8; + a->num_bits -= 8; + } + STBI_ASSERT(a->num_bits == 0); + // now fill header the normal way + while (k < 4) + header[k++] = stbi__zget8(a); + len = header[1] * 256 + header[0]; + nlen = header[3] * 256 + header[2]; + if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); + if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); + if (a->zout + len > a->zout_end) + if (!stbi__zexpand(a, a->zout, len)) return 0; + memcpy(a->zout, a->zbuffer, len); + a->zbuffer += len; + a->zout += len; + return 1; +} + +static int stbi__parse_zlib_header(stbi__zbuf *a) +{ + int cmf = stbi__zget8(a); + int cm = cmf & 15; + /* int cinfo = cmf >> 4; */ + int flg = stbi__zget8(a); + if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png + if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png + // window = 1 << (8 + cinfo)... but who cares, we fully buffer output + return 1; +} + +// @TODO: should statically initialize these for optimal thread safety +static stbi_uc stbi__zdefault_length[288], stbi__zdefault_distance[32]; +static void stbi__init_zdefaults(void) +{ + int i; // use <= to match clearly with spec + for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; + for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; + for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; + for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; + + for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; +} + +static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) +{ + int final, type; + if (parse_header) + if (!stbi__parse_zlib_header(a)) return 0; + a->num_bits = 0; + a->code_buffer = 0; + do { + final = stbi__zreceive(a,1); + type = stbi__zreceive(a,2); + if (type == 0) { + if (!stbi__parse_uncomperssed_block(a)) return 0; + } else if (type == 3) { + return 0; + } else { + if (type == 1) { + // use fixed code lengths + if (!stbi__zdefault_distance[31]) stbi__init_zdefaults(); + if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , 288)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; + } else { + if (!stbi__compute_huffman_codes(a)) return 0; + } + if (!stbi__parse_huffman_block(a)) return 0; + } + } while (!final); + return 1; +} + +static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) +{ + a->zout_start = obuf; + a->zout = obuf; + a->zout_end = obuf + olen; + a->z_expandable = exp; + + return stbi__parse_zlib(a, parse_header); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) +{ + return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) + return (int) (a.zout - a.zout_start); + else + return -1; +} + +STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(16384); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer+len; + if (stbi__do_zlib(&a, p, 16384, 1, 0)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) + return (int) (a.zout - a.zout_start); + else + return -1; +} +#endif + +// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 +// simple implementation +// - only 8-bit samples +// - no CRC checking +// - allocates lots of intermediate memory +// - avoids problem of streaming data between subsystems +// - avoids explicit window management +// performance +// - uses stb_zlib, a PD zlib implementation with fast huffman decoding + +#ifndef STBI_NO_PNG +typedef struct +{ + stbi__uint32 length; + stbi__uint32 type; +} stbi__pngchunk; + +static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) +{ + stbi__pngchunk c; + c.length = stbi__get32be(s); + c.type = stbi__get32be(s); + return c; +} + +static int stbi__check_png_header(stbi__context *s) +{ + static stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; + int i; + for (i=0; i < 8; ++i) + if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); + return 1; +} + +typedef struct +{ + stbi__context *s; + stbi_uc *idata, *expanded, *out; +} stbi__png; + + +enum { + STBI__F_none=0, + STBI__F_sub=1, + STBI__F_up=2, + STBI__F_avg=3, + STBI__F_paeth=4, + // synthetic filters used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static stbi_uc first_row_filter[5] = +{ + STBI__F_none, + STBI__F_sub, + STBI__F_none, + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static int stbi__paeth(int a, int b, int c) +{ + int p = a + b - c; + int pa = abs(p-a); + int pb = abs(p-b); + int pc = abs(p-c); + if (pa <= pb && pa <= pc) return a; + if (pb <= pc) return b; + return c; +} + +static stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; + +// create the png data from post-deflated data +static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) +{ + stbi__context *s = a->s; + stbi__uint32 i,j,stride = x*out_n; + stbi__uint32 img_len, img_width_bytes; + int k; + int img_n = s->img_n; // copy it into a local for later + + STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); + a->out = (stbi_uc *) stbi__malloc(x * y * out_n); // extra bytes to write off the end into + if (!a->out) return stbi__err("outofmem", "Out of memory"); + + img_width_bytes = (((img_n * x * depth) + 7) >> 3); + img_len = (img_width_bytes + 1) * y; + if (s->img_x == x && s->img_y == y) { + if (raw_len != img_len) return stbi__err("not enough pixels","Corrupt PNG"); + } else { // interlaced: + if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + } + + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *prior = cur - stride; + int filter = *raw++; + int filter_bytes = img_n; + int width = x; + if (filter > 4) + return stbi__err("invalid filter","Corrupt PNG"); + + if (depth < 8) { + STBI_ASSERT(img_width_bytes <= x); + cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place + filter_bytes = 1; + width = img_width_bytes; + } + + // if first row, use special filter that doesn't sample previous row + if (j == 0) filter = first_row_filter[filter]; + + // handle first byte explicitly + for (k=0; k < filter_bytes; ++k) { + switch (filter) { + case STBI__F_none : cur[k] = raw[k]; break; + case STBI__F_sub : cur[k] = raw[k]; break; + case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; + case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; + case STBI__F_avg_first : cur[k] = raw[k]; break; + case STBI__F_paeth_first: cur[k] = raw[k]; break; + } + } + + if (depth == 8) { + if (img_n != out_n) + cur[img_n] = 255; // first pixel + raw += img_n; + cur += out_n; + prior += out_n; + } else { + raw += 1; + cur += 1; + prior += 1; + } + + // this is a little gross, so that we don't switch per-pixel or per-component + if (depth < 8 || img_n == out_n) { + int nk = (width - 1)*img_n; + #define CASE(f) \ + case f: \ + for (k=0; k < nk; ++k) + switch (filter) { + // "none" filter turns into a memcpy here; make that explicit. + case STBI__F_none: memcpy(cur, raw, nk); break; + CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); break; + CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); break; + CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); break; + CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); break; + CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); break; + } + #undef CASE + raw += nk; + } else { + STBI_ASSERT(img_n+1 == out_n); + #define CASE(f) \ + case f: \ + for (i=x-1; i >= 1; --i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \ + for (k=0; k < img_n; ++k) + switch (filter) { + CASE(STBI__F_none) cur[k] = raw[k]; break; + CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-out_n]); break; + CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-out_n])>>1)); break; + CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],prior[k],prior[k-out_n])); break; + CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-out_n] >> 1)); break; + CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],0,0)); break; + } + #undef CASE + } + } + + // we make a separate pass to expand bits to pixels; for performance, + // this could run two scanlines behind the above code, so it won't + // interfere with filtering but will still be in the cache. + if (depth < 8) { + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; + // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit + // png guarantee byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop + stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + + // note that the final byte might overshoot and write more data than desired. + // we can allocate enough data that this never writes out of memory, but it + // could also overwrite the next scanline. can it overwrite non-empty data + // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. + // so we need to explicitly clamp the final ones + + if (depth == 4) { + for (k=x*img_n; k >= 2; k-=2, ++in) { + *cur++ = scale * ((*in >> 4) ); + *cur++ = scale * ((*in ) & 0x0f); + } + if (k > 0) *cur++ = scale * ((*in >> 4) ); + } else if (depth == 2) { + for (k=x*img_n; k >= 4; k-=4, ++in) { + *cur++ = scale * ((*in >> 6) ); + *cur++ = scale * ((*in >> 4) & 0x03); + *cur++ = scale * ((*in >> 2) & 0x03); + *cur++ = scale * ((*in ) & 0x03); + } + if (k > 0) *cur++ = scale * ((*in >> 6) ); + if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); + if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); + } else if (depth == 1) { + for (k=x*img_n; k >= 8; k-=8, ++in) { + *cur++ = scale * ((*in >> 7) ); + *cur++ = scale * ((*in >> 6) & 0x01); + *cur++ = scale * ((*in >> 5) & 0x01); + *cur++ = scale * ((*in >> 4) & 0x01); + *cur++ = scale * ((*in >> 3) & 0x01); + *cur++ = scale * ((*in >> 2) & 0x01); + *cur++ = scale * ((*in >> 1) & 0x01); + *cur++ = scale * ((*in ) & 0x01); + } + if (k > 0) *cur++ = scale * ((*in >> 7) ); + if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); + if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); + if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); + if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); + if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); + if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); + } + if (img_n != out_n) { + int q; + // insert alpha = 255 + cur = a->out + stride*j; + if (img_n == 1) { + for (q=x-1; q >= 0; --q) { + cur[q*2+1] = 255; + cur[q*2+0] = cur[q]; + } + } else { + STBI_ASSERT(img_n == 3); + for (q=x-1; q >= 0; --q) { + cur[q*4+3] = 255; + cur[q*4+2] = cur[q*3+2]; + cur[q*4+1] = cur[q*3+1]; + cur[q*4+0] = cur[q*3+0]; + } + } + } + } + } + + return 1; +} + +static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) +{ + stbi_uc *final; + int p; + if (!interlaced) + return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); + + // de-interlacing + final = (stbi_uc *) stbi__malloc(a->s->img_x * a->s->img_y * out_n); + for (p=0; p < 7; ++p) { + int xorig[] = { 0,4,0,2,0,1,0 }; + int yorig[] = { 0,0,4,0,2,0,1 }; + int xspc[] = { 8,8,4,4,2,2,1 }; + int yspc[] = { 8,8,8,4,4,2,2 }; + int i,j,x,y; + // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 + x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; + y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; + if (x && y) { + stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; + if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { + STBI_FREE(final); + return 0; + } + for (j=0; j < y; ++j) { + for (i=0; i < x; ++i) { + int out_y = j*yspc[p]+yorig[p]; + int out_x = i*xspc[p]+xorig[p]; + memcpy(final + out_y*a->s->img_x*out_n + out_x*out_n, + a->out + (j*x+i)*out_n, out_n); + } + } + STBI_FREE(a->out); + image_data += img_len; + image_data_len -= img_len; + } + } + a->out = final; + + return 1; +} + +static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + // compute color-based transparency, assuming we've + // already got 255 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i=0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 255); + p += 2; + } + } else { + for (i=0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) +{ + stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; + stbi_uc *p, *temp_out, *orig = a->out; + + p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + // between here and free(out) below, exiting would leak + temp_out = p; + + if (pal_img_n == 3) { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p += 3; + } + } else { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p[3] = palette[n+3]; + p += 4; + } + } + STBI_FREE(a->out); + a->out = temp_out; + + STBI_NOTUSED(len); + + return 1; +} + +static int stbi__unpremultiply_on_load = 0; +static int stbi__de_iphone_flag = 0; + +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag = flag_true_if_should_convert; +} + +static void stbi__de_iphone(stbi__png *z) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + if (s->img_out_n == 3) { // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 3; + } + } else { + STBI_ASSERT(s->img_out_n == 4); + if (stbi__unpremultiply_on_load) { + // convert bgr to rgb and unpremultiply + for (i=0; i < pixel_count; ++i) { + stbi_uc a = p[3]; + stbi_uc t = p[0]; + if (a) { + p[0] = p[2] * 255 / a; + p[1] = p[1] * 255 / a; + p[2] = t * 255 / a; + } else { + p[0] = p[2]; + p[2] = t; + } + p += 4; + } + } else { + // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 4; + } + } + } +} + +#define STBI__PNG_TYPE(a,b,c,d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d)) + +static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) +{ + stbi_uc palette[1024], pal_img_n=0; + stbi_uc has_trans=0, tc[3]; + stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; + int first=1,k,interlace=0, color=0, depth=0, is_iphone=0; + stbi__context *s = z->s; + + z->expanded = NULL; + z->idata = NULL; + z->out = NULL; + + if (!stbi__check_png_header(s)) return 0; + + if (scan == STBI__SCAN_type) return 1; + + for (;;) { + stbi__pngchunk c = stbi__get_chunk_header(s); + switch (c.type) { + case STBI__PNG_TYPE('C','g','B','I'): + is_iphone = 1; + stbi__skip(s, c.length); + break; + case STBI__PNG_TYPE('I','H','D','R'): { + int comp,filter; + if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); + first = 0; + if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); + s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); + s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); + depth = stbi__get8(s); if (depth != 1 && depth != 2 && depth != 4 && depth != 8) return stbi__err("1/2/4/8-bit only","PNG not supported: 1/2/4/8-bit only"); + color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); + comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); + filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); + interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); + if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); + if (!pal_img_n) { + s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + if (scan == STBI__SCAN_header) return 1; + } else { + // if paletted, then pal_n is our final components, and + // img_n is # components to decompress/filter. + s->img_n = 1; + if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); + // if SCAN_header, have to scan to see if we have a tRNS + } + break; + } + + case STBI__PNG_TYPE('P','L','T','E'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); + pal_len = c.length / 3; + if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); + for (i=0; i < pal_len; ++i) { + palette[i*4+0] = stbi__get8(s); + palette[i*4+1] = stbi__get8(s); + palette[i*4+2] = stbi__get8(s); + palette[i*4+3] = 255; + } + break; + } + + case STBI__PNG_TYPE('t','R','N','S'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); + if (pal_img_n) { + if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } + if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); + if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); + pal_img_n = 4; + for (i=0; i < c.length; ++i) + palette[i*4+3] = stbi__get8(s); + } else { + if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); + if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); + has_trans = 1; + for (k=0; k < s->img_n; ++k) + tc[k] = (stbi_uc) (stbi__get16be(s) & 255) * stbi__depth_scale_table[depth]; // non 8-bit images will be larger + } + break; + } + + case STBI__PNG_TYPE('I','D','A','T'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); + if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } + if ((int)(ioff + c.length) < (int)ioff) return 0; + if (ioff + c.length > idata_limit) { + stbi_uc *p; + if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; + while (ioff + c.length > idata_limit) + idata_limit *= 2; + p = (stbi_uc *) STBI_REALLOC(z->idata, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); + z->idata = p; + } + if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); + ioff += c.length; + break; + } + + case STBI__PNG_TYPE('I','E','N','D'): { + stbi__uint32 raw_len, bpl; + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (scan != STBI__SCAN_load) return 1; + if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); + // initial guess for decoded data size to avoid unnecessary reallocs + bpl = (s->img_x * depth + 7) / 8; // bytes per line, per component + raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; + z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); + if (z->expanded == NULL) return 0; // zlib should set error + STBI_FREE(z->idata); z->idata = NULL; + if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) + s->img_out_n = s->img_n+1; + else + s->img_out_n = s->img_n; + if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, depth, color, interlace)) return 0; + if (has_trans) + if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; + if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) + stbi__de_iphone(z); + if (pal_img_n) { + // pal_img_n == 3 or 4 + s->img_n = pal_img_n; // record the actual colors we had + s->img_out_n = pal_img_n; + if (req_comp >= 3) s->img_out_n = req_comp; + if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) + return 0; + } + STBI_FREE(z->expanded); z->expanded = NULL; + return 1; + } + + default: + // if critical, fail + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if ((c.type & (1 << 29)) == 0) { + #ifndef STBI_NO_FAILURE_STRINGS + // not threadsafe + static char invalid_chunk[] = "XXXX PNG chunk not known"; + invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); + invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); + invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); + invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); + #endif + return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); + } + stbi__skip(s, c.length); + break; + } + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + } +} + +static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp) +{ + unsigned char *result=NULL; + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { + result = p->out; + p->out = NULL; + if (req_comp && req_comp != p->s->img_out_n) { + result = stbi__convert_format(result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + p->s->img_out_n = req_comp; + if (result == NULL) return result; + } + *x = p->s->img_x; + *y = p->s->img_y; + if (n) *n = p->s->img_out_n; + } + STBI_FREE(p->out); p->out = NULL; + STBI_FREE(p->expanded); p->expanded = NULL; + STBI_FREE(p->idata); p->idata = NULL; + + return result; +} + +static unsigned char *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__png p; + p.s = s; + return stbi__do_png(&p, x,y,comp,req_comp); +} + +static int stbi__png_test(stbi__context *s) +{ + int r; + r = stbi__check_png_header(s); + stbi__rewind(s); + return r; +} + +static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) +{ + if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { + stbi__rewind( p->s ); + return 0; + } + if (x) *x = p->s->img_x; + if (y) *y = p->s->img_y; + if (comp) *comp = p->s->img_n; + return 1; +} + +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__png p; + p.s = s; + return stbi__png_info_raw(&p, x, y, comp); +} +#endif + +// Microsoft/Windows BMP image + +#ifndef STBI_NO_BMP +static int stbi__bmp_test_raw(stbi__context *s) +{ + int r; + int sz; + if (stbi__get8(s) != 'B') return 0; + if (stbi__get8(s) != 'M') return 0; + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + stbi__get32le(s); // discard data offset + sz = stbi__get32le(s); + r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); + stbi__rewind(s); + return r; +} + + +// returns 0..31 for the highest set bit +static int stbi__high_bit(unsigned int z) +{ + int n=0; + if (z == 0) return -1; + if (z >= 0x10000) n += 16, z >>= 16; + if (z >= 0x00100) n += 8, z >>= 8; + if (z >= 0x00010) n += 4, z >>= 4; + if (z >= 0x00004) n += 2, z >>= 2; + if (z >= 0x00002) n += 1, z >>= 1; + return n; +} + +static int stbi__bitcount(unsigned int a) +{ + a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 + a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 + a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits + a = (a + (a >> 8)); // max 16 per 8 bits + a = (a + (a >> 16)); // max 32 per 8 bits + return a & 0xff; +} + +static int stbi__shiftsigned(int v, int shift, int bits) +{ + int result; + int z=0; + + if (shift < 0) v <<= -shift; + else v >>= shift; + result = v; + + z = bits; + while (z < 8) { + result += v >> z; + z += bits; + } + return result; +} + +static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *out; + unsigned int mr=0,mg=0,mb=0,ma=0, all_a=255; + stbi_uc pal[256][4]; + int psize=0,i,j,compress=0,width; + int bpp, flip_vertically, pad, target, offset, hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + offset = stbi__get32le(s); + hsz = stbi__get32le(s); + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); + if (hsz == 12) { + s->img_x = stbi__get16le(s); + s->img_y = stbi__get16le(s); + } else { + s->img_x = stbi__get32le(s); + s->img_y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); + bpp = stbi__get16le(s); + if (bpp == 1) return stbi__errpuc("monochrome", "BMP type not supported: 1-bit"); + flip_vertically = ((int) s->img_y) > 0; + s->img_y = abs((int) s->img_y); + if (hsz == 12) { + if (bpp < 24) + psize = (offset - 14 - 24) / 3; + } else { + compress = stbi__get32le(s); + if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); + stbi__get32le(s); // discard sizeof + stbi__get32le(s); // discard hres + stbi__get32le(s); // discard vres + stbi__get32le(s); // discard colorsused + stbi__get32le(s); // discard max important + if (hsz == 40 || hsz == 56) { + if (hsz == 56) { + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + } + if (bpp == 16 || bpp == 32) { + mr = mg = mb = 0; + if (compress == 0) { + if (bpp == 32) { + mr = 0xffu << 16; + mg = 0xffu << 8; + mb = 0xffu << 0; + ma = 0xffu << 24; + all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 + } else { + mr = 31u << 10; + mg = 31u << 5; + mb = 31u << 0; + } + } else if (compress == 3) { + mr = stbi__get32le(s); + mg = stbi__get32le(s); + mb = stbi__get32le(s); + // not documented, but generated by photoshop and handled by mspaint + if (mr == mg && mg == mb) { + // ?!?!? + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else { + STBI_ASSERT(hsz == 108 || hsz == 124); + mr = stbi__get32le(s); + mg = stbi__get32le(s); + mb = stbi__get32le(s); + ma = stbi__get32le(s); + stbi__get32le(s); // discard color space + for (i=0; i < 12; ++i) + stbi__get32le(s); // discard color space parameters + if (hsz == 124) { + stbi__get32le(s); // discard rendering intent + stbi__get32le(s); // discard offset of profile data + stbi__get32le(s); // discard size of profile data + stbi__get32le(s); // discard reserved + } + } + if (bpp < 16) + psize = (offset - 14 - hsz) >> 2; + } + s->img_n = ma ? 4 : 3; + if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 + target = req_comp; + else + target = s->img_n; // if they want monochrome, we'll post-convert + out = (stbi_uc *) stbi__malloc(target * s->img_x * s->img_y); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (bpp < 16) { + int z=0; + if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } + for (i=0; i < psize; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + if (hsz != 12) stbi__get8(s); + pal[i][3] = 255; + } + stbi__skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4)); + if (bpp == 4) width = (s->img_x + 1) >> 1; + else if (bpp == 8) width = s->img_x; + else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } + pad = (-width)&3; + for (j=0; j < (int) s->img_y; ++j) { + for (i=0; i < (int) s->img_x; i += 2) { + int v=stbi__get8(s),v2=0; + if (bpp == 4) { + v2 = v & 15; + v >>= 4; + } + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + v = (bpp == 8) ? stbi__get8(s) : v2; + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + } + stbi__skip(s, pad); + } + } else { + int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; + int z = 0; + int easy=0; + stbi__skip(s, offset - 14 - hsz); + if (bpp == 24) width = 3 * s->img_x; + else if (bpp == 16) width = 2*s->img_x; + else /* bpp = 32 and pad = 0 */ width=0; + pad = (-width) & 3; + if (bpp == 24) { + easy = 1; + } else if (bpp == 32) { + if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) + easy = 2; + } + if (!easy) { + if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + // right shift amt to put high bit in position #7 + rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); + gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); + bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); + ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); + } + for (j=0; j < (int) s->img_y; ++j) { + if (easy) { + for (i=0; i < (int) s->img_x; ++i) { + unsigned char a; + out[z+2] = stbi__get8(s); + out[z+1] = stbi__get8(s); + out[z+0] = stbi__get8(s); + z += 3; + a = (easy == 2 ? stbi__get8(s) : 255); + all_a |= a; + if (target == 4) out[z++] = a; + } + } else { + for (i=0; i < (int) s->img_x; ++i) { + stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); + int a; + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); + a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); + all_a |= a; + if (target == 4) out[z++] = STBI__BYTECAST(a); + } + } + stbi__skip(s, pad); + } + } + + // if alpha channel is all 0s, replace with all 255s + if (target == 4 && all_a == 0) + for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) + out[i] = 255; + + if (flip_vertically) { + stbi_uc t; + for (j=0; j < (int) s->img_y>>1; ++j) { + stbi_uc *p1 = out + j *s->img_x*target; + stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; + for (i=0; i < (int) s->img_x*target; ++i) { + t = p1[i], p1[i] = p2[i], p2[i] = t; + } + } + } + + if (req_comp && req_comp != target) { + out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + return out; +} +#endif + +// Targa Truevision - TGA +// by Jonathan Dummer +#ifndef STBI_NO_TGA +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) +{ + int tga_w, tga_h, tga_comp; + int sz; + stbi__get8(s); // discard Offset + sz = stbi__get8(s); // color type + if( sz > 1 ) { + stbi__rewind(s); + return 0; // only RGB or indexed allowed + } + sz = stbi__get8(s); // image type + // only RGB or grey allowed, +/- RLE + if ((sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11)) return 0; + stbi__skip(s,9); + tga_w = stbi__get16le(s); + if( tga_w < 1 ) { + stbi__rewind(s); + return 0; // test width + } + tga_h = stbi__get16le(s); + if( tga_h < 1 ) { + stbi__rewind(s); + return 0; // test height + } + sz = stbi__get8(s); // bits per pixel + // only RGB or RGBA or grey allowed + if ((sz != 8) && (sz != 16) && (sz != 24) && (sz != 32)) { + stbi__rewind(s); + return 0; + } + tga_comp = sz; + if (x) *x = tga_w; + if (y) *y = tga_h; + if (comp) *comp = tga_comp / 8; + return 1; // seems to have passed everything +} + +static int stbi__tga_test(stbi__context *s) +{ + int res; + int sz; + stbi__get8(s); // discard Offset + sz = stbi__get8(s); // color type + if ( sz > 1 ) return 0; // only RGB or indexed allowed + sz = stbi__get8(s); // image type + if ( (sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11) ) return 0; // only RGB or grey allowed, +/- RLE + stbi__get16be(s); // discard palette start + stbi__get16be(s); // discard palette length + stbi__get8(s); // discard bits per palette color entry + stbi__get16be(s); // discard x origin + stbi__get16be(s); // discard y origin + if ( stbi__get16be(s) < 1 ) return 0; // test width + if ( stbi__get16be(s) < 1 ) return 0; // test height + sz = stbi__get8(s); // bits per pixel + if ( (sz != 8) && (sz != 16) && (sz != 24) && (sz != 32) ) + res = 0; + else + res = 1; + stbi__rewind(s); + return res; +} + +static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + // read in the TGA header stuff + int tga_offset = stbi__get8(s); + int tga_indexed = stbi__get8(s); + int tga_image_type = stbi__get8(s); + int tga_is_RLE = 0; + int tga_palette_start = stbi__get16le(s); + int tga_palette_len = stbi__get16le(s); + int tga_palette_bits = stbi__get8(s); + int tga_x_origin = stbi__get16le(s); + int tga_y_origin = stbi__get16le(s); + int tga_width = stbi__get16le(s); + int tga_height = stbi__get16le(s); + int tga_bits_per_pixel = stbi__get8(s); + int tga_comp = tga_bits_per_pixel / 8; + int tga_inverted = stbi__get8(s); + // image data + unsigned char *tga_data; + unsigned char *tga_palette = NULL; + int i, j; + unsigned char raw_data[4]; + int RLE_count = 0; + int RLE_repeating = 0; + int read_next_pixel = 1; + + // do a tiny bit of processing + if ( tga_image_type >= 8 ) + { + tga_image_type -= 8; + tga_is_RLE = 1; + } + /* int tga_alpha_bits = tga_inverted & 15; */ + tga_inverted = 1 - ((tga_inverted >> 5) & 1); + + // error check + if ( //(tga_indexed) || + (tga_width < 1) || (tga_height < 1) || + (tga_image_type < 1) || (tga_image_type > 3) || + ((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16) && + (tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32)) + ) + { + return NULL; // we don't report this as a bad TGA because we don't even know if it's TGA + } + + // If I'm paletted, then I'll use the number of bits from the palette + if ( tga_indexed ) + { + tga_comp = tga_palette_bits / 8; + } + + // tga info + *x = tga_width; + *y = tga_height; + if (comp) *comp = tga_comp; + + tga_data = (unsigned char*)stbi__malloc( (size_t)tga_width * tga_height * tga_comp ); + if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); + + // skip to the data's starting position (offset usually = 0) + stbi__skip(s, tga_offset ); + + if ( !tga_indexed && !tga_is_RLE) { + for (i=0; i < tga_height; ++i) { + int row = tga_inverted ? tga_height -i - 1 : i; + stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; + stbi__getn(s, tga_row, tga_width * tga_comp); + } + } else { + // do I need to load a palette? + if ( tga_indexed) + { + // any data to skip? (offset usually = 0) + stbi__skip(s, tga_palette_start ); + // load the palette + tga_palette = (unsigned char*)stbi__malloc( tga_palette_len * tga_palette_bits / 8 ); + if (!tga_palette) { + STBI_FREE(tga_data); + return stbi__errpuc("outofmem", "Out of memory"); + } + if (!stbi__getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 )) { + STBI_FREE(tga_data); + STBI_FREE(tga_palette); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + } + // load the data + for (i=0; i < tga_width * tga_height; ++i) + { + // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? + if ( tga_is_RLE ) + { + if ( RLE_count == 0 ) + { + // yep, get the next byte as a RLE command + int RLE_cmd = stbi__get8(s); + RLE_count = 1 + (RLE_cmd & 127); + RLE_repeating = RLE_cmd >> 7; + read_next_pixel = 1; + } else if ( !RLE_repeating ) + { + read_next_pixel = 1; + } + } else + { + read_next_pixel = 1; + } + // OK, if I need to read a pixel, do it now + if ( read_next_pixel ) + { + // load however much data we did have + if ( tga_indexed ) + { + // read in 1 byte, then perform the lookup + int pal_idx = stbi__get8(s); + if ( pal_idx >= tga_palette_len ) + { + // invalid index + pal_idx = 0; + } + pal_idx *= tga_bits_per_pixel / 8; + for (j = 0; j*8 < tga_bits_per_pixel; ++j) + { + raw_data[j] = tga_palette[pal_idx+j]; + } + } else + { + // read in the data raw + for (j = 0; j*8 < tga_bits_per_pixel; ++j) + { + raw_data[j] = stbi__get8(s); + } + } + // clear the reading flag for the next pixel + read_next_pixel = 0; + } // end of reading a pixel + + // copy data + for (j = 0; j < tga_comp; ++j) + tga_data[i*tga_comp+j] = raw_data[j]; + + // in case we're in RLE mode, keep counting down + --RLE_count; + } + // do I need to invert the image? + if ( tga_inverted ) + { + for (j = 0; j*2 < tga_height; ++j) + { + int index1 = j * tga_width * tga_comp; + int index2 = (tga_height - 1 - j) * tga_width * tga_comp; + for (i = tga_width * tga_comp; i > 0; --i) + { + unsigned char temp = tga_data[index1]; + tga_data[index1] = tga_data[index2]; + tga_data[index2] = temp; + ++index1; + ++index2; + } + } + } + // clear my palette, if I had one + if ( tga_palette != NULL ) + { + STBI_FREE( tga_palette ); + } + } + + // swap RGB + if (tga_comp >= 3) + { + unsigned char* tga_pixel = tga_data; + for (i=0; i < tga_width * tga_height; ++i) + { + unsigned char temp = tga_pixel[0]; + tga_pixel[0] = tga_pixel[2]; + tga_pixel[2] = temp; + tga_pixel += tga_comp; + } + } + + // convert to target component count + if (req_comp && req_comp != tga_comp) + tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); + + // the things I do to get rid of an error message, and yet keep + // Microsoft's C compilers happy... [8^( + tga_palette_start = tga_palette_len = tga_palette_bits = + tga_x_origin = tga_y_origin = 0; + // OK, done + return tga_data; +} +#endif + +// ************************************************************************************************* +// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s) +{ + int r = (stbi__get32be(s) == 0x38425053); + stbi__rewind(s); + return r; +} + +static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + int pixelCount; + int channelCount, compression; + int channel, i, count, len; + int bitdepth; + int w,h; + stbi_uc *out; + + // Check identifier + if (stbi__get32be(s) != 0x38425053) // "8BPS" + return stbi__errpuc("not PSD", "Corrupt PSD image"); + + // Check file type version. + if (stbi__get16be(s) != 1) + return stbi__errpuc("wrong version", "Unsupported version of PSD image"); + + // Skip 6 reserved bytes. + stbi__skip(s, 6 ); + + // Read the number of channels (R, G, B, A, etc). + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) + return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); + + // Read the rows and columns of the image. + h = stbi__get32be(s); + w = stbi__get32be(s); + + // Make sure the depth is 8 bits. + bitdepth = stbi__get16be(s); + if (bitdepth != 8 && bitdepth != 16) + return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); + + // Make sure the color mode is RGB. + // Valid options are: + // 0: Bitmap + // 1: Grayscale + // 2: Indexed color + // 3: RGB color + // 4: CMYK color + // 7: Multichannel + // 8: Duotone + // 9: Lab color + if (stbi__get16be(s) != 3) + return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); + + // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) + stbi__skip(s,stbi__get32be(s) ); + + // Skip the image resources. (resolution, pen tool paths, etc) + stbi__skip(s, stbi__get32be(s) ); + + // Skip the reserved data. + stbi__skip(s, stbi__get32be(s) ); + + // Find out if the data is compressed. + // Known values: + // 0: no compression + // 1: RLE compressed + compression = stbi__get16be(s); + if (compression > 1) + return stbi__errpuc("bad compression", "PSD has an unknown compression format"); + + // Create the destination image. + out = (stbi_uc *) stbi__malloc(4 * w*h); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + pixelCount = w*h; + + // Initialize the data to zero. + //memset( out, 0, pixelCount * 4 ); + + // Finally, the image data. + if (compression) { + // RLE as used by .PSD and .TIFF + // Loop until you get the number of unpacked bytes you are expecting: + // Read the next source byte into n. + // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. + // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. + // Else if n is 128, noop. + // Endloop + + // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, + // which we're going to just skip. + stbi__skip(s, h * channelCount * 2 ); + + // Read the RLE data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out+channel; + if (channel >= channelCount) { + // Fill this channel with default data. + for (i = 0; i < pixelCount; i++, p += 4) + *p = (channel == 3 ? 255 : 0); + } else { + // Read the RLE data. + count = 0; + while (count < pixelCount) { + len = stbi__get8(s); + if (len == 128) { + // No-op. + } else if (len < 128) { + // Copy next len+1 bytes literally. + len++; + count += len; + while (len) { + *p = stbi__get8(s); + p += 4; + len--; + } + } else if (len > 128) { + stbi_uc val; + // Next -len+1 bytes in the dest are replicated from next source byte. + // (Interpret len as a negative 8-bit int.) + len ^= 0x0FF; + len += 2; + val = stbi__get8(s); + count += len; + while (len) { + *p = val; + p += 4; + len--; + } + } + } + } + } + + } else { + // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) + // where each channel consists of an 8-bit value for each pixel in the image. + + // Read the data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out + channel; + if (channel >= channelCount) { + // Fill this channel with default data. + stbi_uc val = channel == 3 ? 255 : 0; + for (i = 0; i < pixelCount; i++, p += 4) + *p = val; + } else { + // Read the data. + if (bitdepth == 16) { + for (i = 0; i < pixelCount; i++, p += 4) + *p = (stbi_uc) (stbi__get16be(s) >> 8); + } else { + for (i = 0; i < pixelCount; i++, p += 4) + *p = stbi__get8(s); + } + } + } + } + + if (req_comp && req_comp != 4) { + out = stbi__convert_format(out, 4, req_comp, w, h); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + if (comp) *comp = 4; + *y = h; + *x = w; + + return out; +} +#endif + +// ************************************************************************************************* +// Softimage PIC loader +// by Tom Seddon +// +// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format +// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ + +#ifndef STBI_NO_PIC +static int stbi__pic_is4(stbi__context *s,const char *str) +{ + int i; + for (i=0; i<4; ++i) + if (stbi__get8(s) != (stbi_uc)str[i]) + return 0; + + return 1; +} + +static int stbi__pic_test_core(stbi__context *s) +{ + int i; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) + return 0; + + for(i=0;i<84;++i) + stbi__get8(s); + + if (!stbi__pic_is4(s,"PICT")) + return 0; + + return 1; +} + +typedef struct +{ + stbi_uc size,type,channel; +} stbi__pic_packet; + +static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) +{ + int mask=0x80, i; + + for (i=0; i<4; ++i, mask>>=1) { + if (channel & mask) { + if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); + dest[i]=stbi__get8(s); + } + } + + return dest; +} + +static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) +{ + int mask=0x80,i; + + for (i=0;i<4; ++i, mask>>=1) + if (channel&mask) + dest[i]=src[i]; +} + +static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) +{ + int act_comp=0,num_packets=0,y,chained; + stbi__pic_packet packets[10]; + + // this will (should...) cater for even some bizarre stuff like having data + // for the same channel in multiple packets. + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return stbi__errpuc("bad format","too many packets"); + + packet = &packets[num_packets++]; + + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + + act_comp |= packet->channel; + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); + if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? + + for(y=0; ytype) { + default: + return stbi__errpuc("bad format","packet has bad compression type"); + + case 0: {//uncompressed + int x; + + for(x=0;xchannel,dest)) + return 0; + break; + } + + case 1://Pure RLE + { + int left=width, i; + + while (left>0) { + stbi_uc count,value[4]; + + count=stbi__get8(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); + + if (count > left) + count = (stbi_uc) left; + + if (!stbi__readval(s,packet->channel,value)) return 0; + + for(i=0; ichannel,dest,value); + left -= count; + } + } + break; + + case 2: {//Mixed RLE + int left=width; + while (left>0) { + int count = stbi__get8(s), i; + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); + + if (count >= 128) { // Repeated + stbi_uc value[4]; + + if (count==128) + count = stbi__get16be(s); + else + count -= 127; + if (count > left) + return stbi__errpuc("bad file","scanline overrun"); + + if (!stbi__readval(s,packet->channel,value)) + return 0; + + for(i=0;ichannel,dest,value); + } else { // Raw + ++count; + if (count>left) return stbi__errpuc("bad file","scanline overrun"); + + for(i=0;ichannel,dest)) + return 0; + } + left-=count; + } + break; + } + } + } + } + + return result; +} + +static stbi_uc *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp) +{ + stbi_uc *result; + int i, x,y; + + for (i=0; i<92; ++i) + stbi__get8(s); + + x = stbi__get16be(s); + y = stbi__get16be(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); + if ((1 << 28) / x < y) return stbi__errpuc("too large", "Image too large to decode"); + + stbi__get32be(s); //skip `ratio' + stbi__get16be(s); //skip `fields' + stbi__get16be(s); //skip `pad' + + // intermediate buffer is RGBA + result = (stbi_uc *) stbi__malloc(x*y*4); + memset(result, 0xff, x*y*4); + + if (!stbi__pic_load_core(s,x,y,comp, result)) { + STBI_FREE(result); + result=0; + } + *px = x; + *py = y; + if (req_comp == 0) req_comp = *comp; + result=stbi__convert_format(result,4,req_comp,x,y); + + return result; +} + +static int stbi__pic_test(stbi__context *s) +{ + int r = stbi__pic_test_core(s); + stbi__rewind(s); + return r; +} +#endif + +// ************************************************************************************************* +// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb + +#ifndef STBI_NO_GIF +typedef struct +{ + stbi__int16 prefix; + stbi_uc first; + stbi_uc suffix; +} stbi__gif_lzw; + +typedef struct +{ + int w,h; + stbi_uc *out, *old_out; // output buffer (always 4 components) + int flags, bgindex, ratio, transparent, eflags, delay; + stbi_uc pal[256][4]; + stbi_uc lpal[256][4]; + stbi__gif_lzw codes[4096]; + stbi_uc *color_table; + int parse, step; + int lflags; + int start_x, start_y; + int max_x, max_y; + int cur_x, cur_y; + int line_size; +} stbi__gif; + +static int stbi__gif_test_raw(stbi__context *s) +{ + int sz; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; + sz = stbi__get8(s); + if (sz != '9' && sz != '7') return 0; + if (stbi__get8(s) != 'a') return 0; + return 1; +} + +static int stbi__gif_test(stbi__context *s) +{ + int r = stbi__gif_test_raw(s); + stbi__rewind(s); + return r; +} + +static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) +{ + int i; + for (i=0; i < num_entries; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + pal[i][3] = transp == i ? 0 : 255; + } +} + +static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) +{ + stbi_uc version; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') + return stbi__err("not GIF", "Corrupt GIF"); + + version = stbi__get8(s); + if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); + if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); + + stbi__g_failure_reason = ""; + g->w = stbi__get16le(s); + g->h = stbi__get16le(s); + g->flags = stbi__get8(s); + g->bgindex = stbi__get8(s); + g->ratio = stbi__get8(s); + g->transparent = -1; + + if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments + + if (is_info) return 1; + + if (g->flags & 0x80) + stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); + + return 1; +} + +static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__gif g; + if (!stbi__gif_header(s, &g, comp, 1)) { + stbi__rewind( s ); + return 0; + } + if (x) *x = g.w; + if (y) *y = g.h; + return 1; +} + +static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) +{ + stbi_uc *p, *c; + + // recurse to decode the prefixes, since the linked-list is backwards, + // and working backwards through an interleaved image would be nasty + if (g->codes[code].prefix >= 0) + stbi__out_gif_code(g, g->codes[code].prefix); + + if (g->cur_y >= g->max_y) return; + + p = &g->out[g->cur_x + g->cur_y]; + c = &g->color_table[g->codes[code].suffix * 4]; + + if (c[3] >= 128) { + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = c[3]; + } + g->cur_x += 4; + + if (g->cur_x >= g->max_x) { + g->cur_x = g->start_x; + g->cur_y += g->step; + + while (g->cur_y >= g->max_y && g->parse > 0) { + g->step = (1 << g->parse) * g->line_size; + g->cur_y = g->start_y + (g->step >> 1); + --g->parse; + } + } +} + +static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) +{ + stbi_uc lzw_cs; + stbi__int32 len, init_code; + stbi__uint32 first; + stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; + stbi__gif_lzw *p; + + lzw_cs = stbi__get8(s); + if (lzw_cs > 12) return NULL; + clear = 1 << lzw_cs; + first = 1; + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + bits = 0; + valid_bits = 0; + for (init_code = 0; init_code < clear; init_code++) { + g->codes[init_code].prefix = -1; + g->codes[init_code].first = (stbi_uc) init_code; + g->codes[init_code].suffix = (stbi_uc) init_code; + } + + // support no starting clear code + avail = clear+2; + oldcode = -1; + + len = 0; + for(;;) { + if (valid_bits < codesize) { + if (len == 0) { + len = stbi__get8(s); // start new block + if (len == 0) + return g->out; + } + --len; + bits |= (stbi__int32) stbi__get8(s) << valid_bits; + valid_bits += 8; + } else { + stbi__int32 code = bits & codemask; + bits >>= codesize; + valid_bits -= codesize; + // @OPTIMIZE: is there some way we can accelerate the non-clear path? + if (code == clear) { // clear code + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + avail = clear + 2; + oldcode = -1; + first = 0; + } else if (code == clear + 1) { // end of stream code + stbi__skip(s, len); + while ((len = stbi__get8(s)) > 0) + stbi__skip(s,len); + return g->out; + } else if (code <= avail) { + if (first) return stbi__errpuc("no clear code", "Corrupt GIF"); + + if (oldcode >= 0) { + p = &g->codes[avail++]; + if (avail > 4096) return stbi__errpuc("too many codes", "Corrupt GIF"); + p->prefix = (stbi__int16) oldcode; + p->first = g->codes[oldcode].first; + p->suffix = (code == avail) ? p->first : g->codes[code].first; + } else if (code == avail) + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + + stbi__out_gif_code(g, (stbi__uint16) code); + + if ((avail & codemask) == 0 && avail <= 0x0FFF) { + codesize++; + codemask = (1 << codesize) - 1; + } + + oldcode = code; + } else { + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + } + } + } +} + +static void stbi__fill_gif_background(stbi__gif *g, int x0, int y0, int x1, int y1) +{ + int x, y; + stbi_uc *c = g->pal[g->bgindex]; + for (y = y0; y < y1; y += 4 * g->w) { + for (x = x0; x < x1; x += 4) { + stbi_uc *p = &g->out[y + x]; + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = 0; + } + } +} + +// this function is designed to support animated gifs, although stb_image doesn't support it +static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp) +{ + int i; + stbi_uc *prev_out = 0; + + if (g->out == 0 && !stbi__gif_header(s, g, comp,0)) + return 0; // stbi__g_failure_reason set by stbi__gif_header + + prev_out = g->out; + g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h); + if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory"); + + switch ((g->eflags & 0x1C) >> 2) { + case 0: // unspecified (also always used on 1st frame) + stbi__fill_gif_background(g, 0, 0, 4 * g->w, 4 * g->w * g->h); + break; + case 1: // do not dispose + if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); + g->old_out = prev_out; + break; + case 2: // dispose to background + if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); + stbi__fill_gif_background(g, g->start_x, g->start_y, g->max_x, g->max_y); + break; + case 3: // dispose to previous + if (g->old_out) { + for (i = g->start_y; i < g->max_y; i += 4 * g->w) + memcpy(&g->out[i + g->start_x], &g->old_out[i + g->start_x], g->max_x - g->start_x); + } + break; + } + + for (;;) { + switch (stbi__get8(s)) { + case 0x2C: /* Image Descriptor */ + { + int prev_trans = -1; + stbi__int32 x, y, w, h; + stbi_uc *o; + + x = stbi__get16le(s); + y = stbi__get16le(s); + w = stbi__get16le(s); + h = stbi__get16le(s); + if (((x + w) > (g->w)) || ((y + h) > (g->h))) + return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); + + g->line_size = g->w * 4; + g->start_x = x * 4; + g->start_y = y * g->line_size; + g->max_x = g->start_x + w * 4; + g->max_y = g->start_y + h * g->line_size; + g->cur_x = g->start_x; + g->cur_y = g->start_y; + + g->lflags = stbi__get8(s); + + if (g->lflags & 0x40) { + g->step = 8 * g->line_size; // first interlaced spacing + g->parse = 3; + } else { + g->step = g->line_size; + g->parse = 0; + } + + if (g->lflags & 0x80) { + stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); + g->color_table = (stbi_uc *) g->lpal; + } else if (g->flags & 0x80) { + if (g->transparent >= 0 && (g->eflags & 0x01)) { + prev_trans = g->pal[g->transparent][3]; + g->pal[g->transparent][3] = 0; + } + g->color_table = (stbi_uc *) g->pal; + } else + return stbi__errpuc("missing color table", "Corrupt GIF"); + + o = stbi__process_gif_raster(s, g); + if (o == NULL) return NULL; + + if (prev_trans != -1) + g->pal[g->transparent][3] = (stbi_uc) prev_trans; + + return o; + } + + case 0x21: // Comment Extension. + { + int len; + if (stbi__get8(s) == 0xF9) { // Graphic Control Extension. + len = stbi__get8(s); + if (len == 4) { + g->eflags = stbi__get8(s); + g->delay = stbi__get16le(s); + g->transparent = stbi__get8(s); + } else { + stbi__skip(s, len); + break; + } + } + while ((len = stbi__get8(s)) != 0) + stbi__skip(s, len); + break; + } + + case 0x3B: // gif stream termination code + return (stbi_uc *) s; // using '1' causes warning on some compilers + + default: + return stbi__errpuc("unknown code", "Corrupt GIF"); + } + } + + STBI_NOTUSED(req_comp); +} + +static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *u = 0; + stbi__gif g; + memset(&g, 0, sizeof(g)); + + u = stbi__gif_load_next(s, &g, comp, req_comp); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + if (u) { + *x = g.w; + *y = g.h; + if (req_comp && req_comp != 4) + u = stbi__convert_format(u, 4, req_comp, g.w, g.h); + } + else if (g.out) + STBI_FREE(g.out); + + return u; +} + +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) +{ + return stbi__gif_info_raw(s,x,y,comp); +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR loader +// originally by Nicolas Schulz +#ifndef STBI_NO_HDR +static int stbi__hdr_test_core(stbi__context *s) +{ + const char *signature = "#?RADIANCE\n"; + int i; + for (i=0; signature[i]; ++i) + if (stbi__get8(s) != signature[i]) + return 0; + return 1; +} + +static int stbi__hdr_test(stbi__context* s) +{ + int r = stbi__hdr_test_core(s); + stbi__rewind(s); + return r; +} + +#define STBI__HDR_BUFLEN 1024 +static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) +{ + int len=0; + char c = '\0'; + + c = (char) stbi__get8(z); + + while (!stbi__at_eof(z) && c != '\n') { + buffer[len++] = c; + if (len == STBI__HDR_BUFLEN-1) { + // flush to end of line + while (!stbi__at_eof(z) && stbi__get8(z) != '\n') + ; + break; + } + c = (char) stbi__get8(z); + } + + buffer[len] = 0; + return buffer; +} + +static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) +{ + if ( input[3] != 0 ) { + float f1; + // Exponent + f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); + if (req_comp <= 2) + output[0] = (input[0] + input[1] + input[2]) * f1 / 3; + else { + output[0] = input[0] * f1; + output[1] = input[1] * f1; + output[2] = input[2] * f1; + } + if (req_comp == 2) output[1] = 1; + if (req_comp == 4) output[3] = 1; + } else { + switch (req_comp) { + case 4: output[3] = 1; /* fallthrough */ + case 3: output[0] = output[1] = output[2] = 0; + break; + case 2: output[1] = 1; /* fallthrough */ + case 1: output[0] = 0; + break; + } + } +} + +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int width, height; + stbi_uc *scanline; + float *hdr_data; + int len; + unsigned char count, value; + int i, j, k, c1,c2, z; + + + // Check identifier + if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) + return stbi__errpf("not HDR", "Corrupt HDR image"); + + // Parse header + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); + + // Parse width and height + // can't use sscanf() if we're not using stdio! + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + height = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + width = (int) strtol(token, NULL, 10); + + *x = width; + *y = height; + + if (comp) *comp = 3; + if (req_comp == 0) req_comp = 3; + + // Read data + hdr_data = (float *) stbi__malloc(height * width * req_comp * sizeof(float)); + + // Load image data + // image data is stored as some number of sca + if ( width < 8 || width >= 32768) { + // Read flat data + for (j=0; j < height; ++j) { + for (i=0; i < width; ++i) { + stbi_uc rgbe[4]; + main_decode_loop: + stbi__getn(s, rgbe, 4); + stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); + } + } + } else { + // Read RLE-encoded data + scanline = NULL; + + for (j = 0; j < height; ++j) { + c1 = stbi__get8(s); + c2 = stbi__get8(s); + len = stbi__get8(s); + if (c1 != 2 || c2 != 2 || (len & 0x80)) { + // not run-length encoded, so we have to actually use THIS data as a decoded + // pixel (note this can't be a valid pixel--one of RGB must be >= 128) + stbi_uc rgbe[4]; + rgbe[0] = (stbi_uc) c1; + rgbe[1] = (stbi_uc) c2; + rgbe[2] = (stbi_uc) len; + rgbe[3] = (stbi_uc) stbi__get8(s); + stbi__hdr_convert(hdr_data, rgbe, req_comp); + i = 1; + j = 0; + STBI_FREE(scanline); + goto main_decode_loop; // yes, this makes no sense + } + len <<= 8; + len |= stbi__get8(s); + if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } + if (scanline == NULL) scanline = (stbi_uc *) stbi__malloc(width * 4); + + for (k = 0; k < 4; ++k) { + i = 0; + while (i < width) { + count = stbi__get8(s); + if (count > 128) { + // Run + value = stbi__get8(s); + count -= 128; + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = value; + } else { + // Dump + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = stbi__get8(s); + } + } + } + for (i=0; i < width; ++i) + stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); + } + STBI_FREE(scanline); + } + + return hdr_data; +} + +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + + if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) { + stbi__rewind( s ); + return 0; + } + + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) { + stbi__rewind( s ); + return 0; + } + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *y = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *x = (int) strtol(token, NULL, 10); + *comp = 3; + return 1; +} +#endif // STBI_NO_HDR + +#ifndef STBI_NO_BMP +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) +{ + int hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') { + stbi__rewind( s ); + return 0; + } + stbi__skip(s,12); + hsz = stbi__get32le(s); + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) { + stbi__rewind( s ); + return 0; + } + if (hsz == 12) { + *x = stbi__get16le(s); + *y = stbi__get16le(s); + } else { + *x = stbi__get32le(s); + *y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) { + stbi__rewind( s ); + return 0; + } + *comp = stbi__get16le(s) / 8; + return 1; +} +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) +{ + int channelCount; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + *y = stbi__get32be(s); + *x = stbi__get32be(s); + if (stbi__get16be(s) != 8) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 3) { + stbi__rewind( s ); + return 0; + } + *comp = 4; + return 1; +} +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) +{ + int act_comp=0,num_packets=0,chained; + stbi__pic_packet packets[10]; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { + stbi__rewind(s); + return 0; + } + + stbi__skip(s, 88); + + *x = stbi__get16be(s); + *y = stbi__get16be(s); + if (stbi__at_eof(s)) { + stbi__rewind( s); + return 0; + } + if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { + stbi__rewind( s ); + return 0; + } + + stbi__skip(s, 8); + + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return 0; + + packet = &packets[num_packets++]; + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + act_comp |= packet->channel; + + if (stbi__at_eof(s)) { + stbi__rewind( s ); + return 0; + } + if (packet->size != 8) { + stbi__rewind( s ); + return 0; + } + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); + + return 1; +} +#endif + +// ************************************************************************************************* +// Portable Gray Map and Portable Pixel Map loader +// by Ken Miller +// +// PGM: http://netpbm.sourceforge.net/doc/pgm.html +// PPM: http://netpbm.sourceforge.net/doc/ppm.html +// +// Known limitations: +// Does not support comments in the header section +// Does not support ASCII image data (formats P2 and P3) +// Does not support 16-bit-per-channel + +#ifndef STBI_NO_PNM + +static int stbi__pnm_test(stbi__context *s) +{ + char p, t; + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + return 1; +} + +static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *out; + if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n)) + return 0; + *x = s->img_x; + *y = s->img_y; + *comp = s->img_n; + + out = (stbi_uc *) stbi__malloc(s->img_n * s->img_x * s->img_y); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + stbi__getn(s, out, s->img_n * s->img_x * s->img_y); + + if (req_comp && req_comp != s->img_n) { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + return out; +} + +static int stbi__pnm_isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; +} + +static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) +{ + while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) + *c = (char) stbi__get8(s); +} + +static int stbi__pnm_isdigit(char c) +{ + return c >= '0' && c <= '9'; +} + +static int stbi__pnm_getinteger(stbi__context *s, char *c) +{ + int value = 0; + + while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { + value = value*10 + (*c - '0'); + *c = (char) stbi__get8(s); + } + + return value; +} + +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) +{ + int maxv; + char c, p, t; + + stbi__rewind( s ); + + // Get identifier + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + + *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm + + c = (char) stbi__get8(s); + stbi__pnm_skip_whitespace(s, &c); + + *x = stbi__pnm_getinteger(s, &c); // read width + stbi__pnm_skip_whitespace(s, &c); + + *y = stbi__pnm_getinteger(s, &c); // read height + stbi__pnm_skip_whitespace(s, &c); + + maxv = stbi__pnm_getinteger(s, &c); // read max value + + if (maxv > 255) + return stbi__err("max value > 255", "PPM image not 8-bit"); + else + return 1; +} +#endif + +static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNG + if (stbi__png_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_GIF + if (stbi__gif_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_BMP + if (stbi__bmp_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PIC + if (stbi__pic_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_info(s, x, y, comp)) return 1; + #endif + + // test tga last because it's a crappy test! + #ifndef STBI_NO_TGA + if (stbi__tga_info(s, x, y, comp)) + return 1; + #endif + return stbi__err("unknown image type", "Image not of any known type, or corrupt"); +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_info_from_file(f, x, y, comp); + fclose(f); + return result; +} + +STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__info_main(&s,x,y,comp); + fseek(f,pos,SEEK_SET); + return r; +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__info_main(&s,x,y,comp); +} + +#endif // STB_IMAGE_IMPLEMENTATION + +/* + revision history: + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) fix compiler warnings + partial animated GIF support + limited 16-bit PSD support + #ifdef unused functions + bug with < 92 byte PIC,PNM,HDR,TGA + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) extra corruption checking (mmozeiko) + stbi_set_flip_vertically_on_load (nguillemot) + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) + progressive JPEG (stb) + PGM/PPM support (Ken Miller) + STBI_MALLOC,STBI_REALLOC,STBI_FREE + GIF bugfix -- seemingly never worked + STBI_NO_*, STBI_ONLY_* + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) + optimize PNG (ryg) + fix bug in interlaced PNG with user-specified channel count (stb) + 1.46 (2014-08-26) + fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG + 1.45 (2014-08-16) + fix MSVC-ARM internal compiler error by wrapping malloc + 1.44 (2014-08-07) + various warning fixes from Ronny Chevalier + 1.43 (2014-07-15) + fix MSVC-only compiler problem in code changed in 1.42 + 1.42 (2014-07-09) + don't define _CRT_SECURE_NO_WARNINGS (affects user code) + fixes to stbi__cleanup_jpeg path + added STBI_ASSERT to avoid requiring assert.h + 1.41 (2014-06-25) + fix search&replace from 1.36 that messed up comments/error messages + 1.40 (2014-06-22) + fix gcc struct-initialization warning + 1.39 (2014-06-15) + fix to TGA optimization when req_comp != number of components in TGA; + fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) + add support for BMP version 5 (more ignored fields) + 1.38 (2014-06-06) + suppress MSVC warnings on integer casts truncating values + fix accidental rename of 'skip' field of I/O + 1.37 (2014-06-04) + remove duplicate typedef + 1.36 (2014-06-03) + convert to header file single-file library + if de-iphone isn't set, load iphone images color-swapped instead of returning NULL + 1.35 (2014-05-27) + various warnings + fix broken STBI_SIMD path + fix bug where stbi_load_from_file no longer left file pointer in correct place + fix broken non-easy path for 32-bit BMP (possibly never used) + TGA optimization by Arseny Kapoulkine + 1.34 (unknown) + use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case + 1.33 (2011-07-14) + make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements + 1.32 (2011-07-13) + support for "info" function for all supported filetypes (SpartanJ) + 1.31 (2011-06-20) + a few more leak fixes, bug in PNG handling (SpartanJ) + 1.30 (2011-06-11) + added ability to load files via callbacks to accommodate custom input streams (Ben Wenger) + removed deprecated format-specific test/load functions + removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway + error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) + fix inefficiency in decoding 32-bit BMP (David Woo) + 1.29 (2010-08-16) + various warning fixes from Aurelien Pocheville + 1.28 (2010-08-01) + fix bug in GIF palette transparency (SpartanJ) + 1.27 (2010-08-01) + cast-to-stbi_uc to fix warnings + 1.26 (2010-07-24) + fix bug in file buffering for PNG reported by SpartanJ + 1.25 (2010-07-17) + refix trans_data warning (Won Chun) + 1.24 (2010-07-12) + perf improvements reading from files on platforms with lock-heavy fgetc() + minor perf improvements for jpeg + deprecated type-specific functions so we'll get feedback if they're needed + attempt to fix trans_data warning (Won Chun) + 1.23 fixed bug in iPhone support + 1.22 (2010-07-10) + removed image *writing* support + stbi_info support from Jetro Lauha + GIF support from Jean-Marc Lienher + iPhone PNG-extensions from James Brown + warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) + 1.21 fix use of 'stbi_uc' in header (reported by jon blow) + 1.20 added support for Softimage PIC, by Tom Seddon + 1.19 bug in interlaced PNG corruption check (found by ryg) + 1.18 (2008-08-02) + fix a threading bug (local mutable static) + 1.17 support interlaced PNG + 1.16 major bugfix - stbi__convert_format converted one too many pixels + 1.15 initialize some fields for thread safety + 1.14 fix threadsafe conversion bug + header-file-only version (#define STBI_HEADER_FILE_ONLY before including) + 1.13 threadsafe + 1.12 const qualifiers in the API + 1.11 Support installable IDCT, colorspace conversion routines + 1.10 Fixes for 64-bit (don't use "unsigned long") + optimized upsampling by Fabian "ryg" Giesen + 1.09 Fix format-conversion for PSD code (bad global variables!) + 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz + 1.07 attempt to fix C++ warning/errors again + 1.06 attempt to fix C++ warning/errors again + 1.05 fix TGA loading to return correct *comp and use good luminance calc + 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free + 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR + 1.02 support for (subset of) HDR files, float interface for preferred access to them + 1.01 fix bug: possible bug in handling right-side up bmps... not sure + fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all + 1.00 interface to zlib that skips zlib header + 0.99 correct handling of alpha in palette + 0.98 TGA loader by lonesock; dynamically add loaders (untested) + 0.97 jpeg errors on too large a file; also catch another malloc failure + 0.96 fix detection of invalid v value - particleman@mollyrocket forum + 0.95 during header scan, seek to markers in case of padding + 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same + 0.93 handle jpegtran output; verbose errors + 0.92 read 4,8,16,24,32-bit BMP files of several formats + 0.91 output 24-bit Windows 3.0 BMP files + 0.90 fix a few more warnings; bump version number to approach 1.0 + 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd + 0.60 fix compiling as c++ + 0.59 fix warnings: merge Dave Moore's -Wall fixes + 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian + 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available + 0.56 fix bug: zlib uncompressed mode len vs. nlen + 0.55 fix bug: restart_interval not initialized to 0 + 0.54 allow NULL for 'int *comp' + 0.53 fix bug in png 3->4; speedup png decoding + 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments + 0.51 obey req_comp requests, 1-component jpegs return as 1-component, + on 'test' only check type, not whether we support this variant + 0.50 (2006-11-19) + first released version +*/ diff --git a/demo/node_editor.c b/demo/common/node_editor.c similarity index 100% rename from demo/node_editor.c rename to demo/common/node_editor.c diff --git a/demo/overview.c b/demo/common/overview.c similarity index 100% rename from demo/overview.c rename to demo/common/overview.c diff --git a/demo/style.c b/demo/common/style.c similarity index 100% rename from demo/style.c rename to demo/common/style.c diff --git a/demo/d3d11/main.c b/demo/d3d11/main.c index c10d36a..e890150 100644 --- a/demo/d3d11/main.c +++ b/demo/d3d11/main.c @@ -49,19 +49,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/d3d12/main.c b/demo/d3d12/main.c index e635d0b..d8bb406 100644 --- a/demo/d3d12/main.c +++ b/demo/d3d12/main.c @@ -52,19 +52,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/d3d9/main.c b/demo/d3d9/main.c index d43bcc0..de85e92 100644 --- a/demo/d3d9/main.c +++ b/demo/d3d9/main.c @@ -46,19 +46,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/gdi/main.c b/demo/gdi/main.c index 01dd5ce..1451323 100644 --- a/demo/gdi/main.c +++ b/demo/gdi/main.c @@ -41,19 +41,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/gdip/main.c b/demo/gdip/main.c index 1fdabe4..69bd83a 100644 --- a/demo/gdip/main.c +++ b/demo/gdip/main.c @@ -41,19 +41,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/glfw_opengl2/Makefile b/demo/glfw_opengl2/Makefile index 5b6af64..9ac6b10 100644 --- a/demo/glfw_opengl2/Makefile +++ b/demo/glfw_opengl2/Makefile @@ -2,7 +2,7 @@ BIN = demo # Flags -CFLAGS += -std=c89 -Wall -Wextra -pedantic -O2 +CFLAGS += -std=c99 -Wall -Wextra -pedantic -O2 SRC = main.c OBJ = $(SRC:.c=.o) diff --git a/demo/glfw_opengl2/main.c b/demo/glfw_opengl2/main.c index 0301eee..6a89e4b 100644 --- a/demo/glfw_opengl2/main.c +++ b/demo/glfw_opengl2/main.c @@ -24,6 +24,9 @@ #include "../../nuklear.h" #include "nuklear_glfw_gl2.h" +#define STB_IMAGE_IMPLEMENTATION +#include "../../demo/common/filebrowser/stb_image.h" + #define WINDOW_WIDTH 1200 #define WINDOW_HEIGHT 800 @@ -34,12 +37,13 @@ * ===============================================================*/ /* This are some code examples to provide a small overview of what can be * done with this library. To try out an example uncomment the defines */ -/*#define INCLUDE_ALL */ -/*#define INCLUDE_STYLE */ -/*#define INCLUDE_CALCULATOR */ -/*#define INCLUDE_CANVAS */ -#define INCLUDE_OVERVIEW -/*#define INCLUDE_NODE_EDITOR */ +/* #define INCLUDE_ALL */ +/* #define INCLUDE_STYLE */ +/* #define INCLUDE_CALCULATOR */ +#define INCLUDE_CANVAS +/* #define INCLUDE_FILE_BROWSER */ +/* #define INCLUDE_OVERVIEW */ +/* #define INCLUDE_NODE_EDITOR */ #ifdef INCLUDE_ALL #define INCLUDE_STYLE @@ -50,19 +54,22 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" +#endif +#ifdef INCLUDE_FILE_BROWSER + #include "../../demo/common/file_browser.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== @@ -78,8 +85,14 @@ int main(void) /* Platform */ static GLFWwindow *win; int width = 0, height = 0; + + /* GUI */ struct nk_context *ctx; struct nk_colorf bg; +#ifdef INCLUDE_FILE_BROWSER + struct file_browser browser; + struct media media; +#endif /* GLFW */ glfwSetErrorCallback(error_callback); @@ -115,6 +128,25 @@ int main(void) #endif bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f; + + #ifdef INCLUDE_FILE_BROWSER + /* icons */ + glEnable(GL_TEXTURE_2D); + media.icons.home = icon_load("../../demo/common/filebrowser/icon/home.png"); + media.icons.directory = icon_load("../../demo/common/filebrowser/icon/directory.png"); + media.icons.computer = icon_load("../../demo/common/filebrowser/icon/computer.png"); + media.icons.desktop = icon_load("../../demo/common/filebrowser/icon/desktop.png"); + media.icons.default_file = icon_load("../../demo/common/filebrowser/icon/default.png"); + media.icons.text_file = icon_load("../../demo/common/filebrowser/icon/text.png"); + media.icons.music_file = icon_load("../../demo/common/filebrowser/icon/music.png"); + media.icons.font_file = icon_load("../../demo/common/filebrowser/icon/font.png"); + media.icons.img_file = icon_load("../../demo/common/filebrowser/icon/img.png"); + media.icons.movie_file = icon_load("../../demo/common/filebrowser/icon/movie.png"); + media_init(&media); + + file_browser_init(&browser, &media); + #endif + while (!glfwWindowShouldClose(win)) { /* Input */ @@ -163,6 +195,9 @@ int main(void) #ifdef INCLUDE_CANVAS canvas(ctx); #endif + #ifdef INCLUDE_FILE_BROWSER + file_browser_run(&browser, ctx); + #endif #ifdef INCLUDE_OVERVIEW overview(ctx); #endif @@ -183,8 +218,23 @@ int main(void) nk_glfw3_render(NK_ANTI_ALIASING_ON); glfwSwapBuffers(win); } + + #ifdef INCLUDE_FILE_BROWSER + glDeleteTextures(1,(const GLuint*)&media.icons.home.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.directory.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.computer.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.desktop.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.default_file.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.text_file.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.music_file.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.font_file.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.img_file.handle.id); + glDeleteTextures(1,(const GLuint*)&media.icons.movie_file.handle.id); + + file_browser_free(&browser); + #endif + nk_glfw3_shutdown(); glfwTerminate(); return 0; } - diff --git a/demo/glfw_opengl3/main.c b/demo/glfw_opengl3/main.c index af02f68..d8eda87 100644 --- a/demo/glfw_opengl3/main.c +++ b/demo/glfw_opengl3/main.c @@ -54,19 +54,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/glfw_opengl4/main.c b/demo/glfw_opengl4/main.c index dd78a40..75783bd 100644 --- a/demo/glfw_opengl4/main.c +++ b/demo/glfw_opengl4/main.c @@ -54,19 +54,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/sdl2surface_rawfb/main.c b/demo/sdl2surface_rawfb/main.c index a52e71b..a8b661a 100644 --- a/demo/sdl2surface_rawfb/main.c +++ b/demo/sdl2surface_rawfb/main.c @@ -45,19 +45,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif static int translate_sdl_key(struct SDL_Keysym const *k) diff --git a/demo/sdl_opengl2/main.c b/demo/sdl_opengl2/main.c index 157cfab..cd1071e 100644 --- a/demo/sdl_opengl2/main.c +++ b/demo/sdl_opengl2/main.c @@ -50,19 +50,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/sdl_opengl3/main.c b/demo/sdl_opengl3/main.c index 2aa1588..97351f5 100644 --- a/demo/sdl_opengl3/main.c +++ b/demo/sdl_opengl3/main.c @@ -54,19 +54,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/sdl_opengles2/main.c b/demo/sdl_opengles2/main.c index 02a0964..80a4285 100644 --- a/demo/sdl_opengles2/main.c +++ b/demo/sdl_opengles2/main.c @@ -55,19 +55,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/sdl_renderer/main.c b/demo/sdl_renderer/main.c index 77be381..0208d33 100644 --- a/demo/sdl_renderer/main.c +++ b/demo/sdl_renderer/main.c @@ -48,19 +48,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/sfml_opengl2/main.cpp b/demo/sfml_opengl2/main.cpp index a815d09..e8ebaba 100644 --- a/demo/sfml_opengl2/main.cpp +++ b/demo/sfml_opengl2/main.cpp @@ -50,19 +50,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/sfml_opengl3/main.cpp b/demo/sfml_opengl3/main.cpp index 45afb6c..b2568e7 100644 --- a/demo/sfml_opengl3/main.cpp +++ b/demo/sfml_opengl3/main.cpp @@ -52,19 +52,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/wayland_rawfb/main.c b/demo/wayland_rawfb/main.c index 98f2c10..cf60eed 100644 --- a/demo/wayland_rawfb/main.c +++ b/demo/wayland_rawfb/main.c @@ -51,19 +51,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif diff --git a/demo/x11/main.c b/demo/x11/main.c index 6ae35e5..16bf043 100644 --- a/demo/x11/main.c +++ b/demo/x11/main.c @@ -92,19 +92,19 @@ sleep_for(long t) #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/x11_opengl2/main.c b/demo/x11_opengl2/main.c index ec91a6f..e751eef 100644 --- a/demo/x11_opengl2/main.c +++ b/demo/x11_opengl2/main.c @@ -53,19 +53,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/x11_opengl3/main.c b/demo/x11_opengl3/main.c index 8dafad3..7e415b5 100644 --- a/demo/x11_opengl3/main.c +++ b/demo/x11_opengl3/main.c @@ -51,19 +51,19 @@ #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/x11_rawfb/main.c b/demo/x11_rawfb/main.c index 4ff4669..ea51c1e 100644 --- a/demo/x11_rawfb/main.c +++ b/demo/x11_rawfb/main.c @@ -126,19 +126,19 @@ sleep_for(long t) #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/demo/x11_xft/main.c b/demo/x11_xft/main.c index 20957c1..8b2a146 100644 --- a/demo/x11_xft/main.c +++ b/demo/x11_xft/main.c @@ -92,19 +92,19 @@ sleep_for(long t) #endif #ifdef INCLUDE_STYLE - #include "../style.c" + #include "../../demo/common/style.c" #endif #ifdef INCLUDE_CALCULATOR - #include "../calculator.c" + #include "../../demo/common/calculator.c" #endif #ifdef INCLUDE_CANVAS - #include "../canvas.c" + #include "../../demo/common/canvas.c" #endif #ifdef INCLUDE_OVERVIEW - #include "../overview.c" + #include "../../demo/common/overview.c" #endif #ifdef INCLUDE_NODE_EDITOR - #include "../node_editor.c" + #include "../../demo/common/node_editor.c" #endif /* =============================================================== diff --git a/stb_image.h b/stb_image.h new file mode 100644 index 0000000..1f4d468 --- /dev/null +++ b/stb_image.h @@ -0,0 +1,6509 @@ +/* stb_image - v2.08 - public domain image loader - http://nothings.org/stb_image.h + no warranty implied; use at your own risk + + Do this: + #define STB_IMAGE_IMPLEMENTATION + before you include this file in *one* C or C++ file to create the implementation. + + // i.e. it should look like this: + #include ... + #include ... + #include ... + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + + You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. + And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free + + + QUICK NOTES: + Primarily of interest to game developers and other people who can + avoid problematic images and only need the trivial interface + + JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) + PNG 1/2/4/8-bit-per-channel (16 bpc not supported) + + TGA (not sure what subset, if a subset) + BMP non-1bpp, non-RLE + PSD (composited view only, no extra channels, 8/16 bit-per-channel) + + GIF (*comp always reports as 4-channel) + HDR (radiance rgbE format) + PIC (Softimage PIC) + PNM (PPM and PGM binary only) + + Animated GIF still needs a proper API, but here's one way to do it: + http://gist.github.com/urraka/685d9a6340b26b830d49 + + - decode from memory or through FILE (define STBI_NO_STDIO to remove code) + - decode from arbitrary I/O callbacks + - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) + + Full documentation under "DOCUMENTATION" below. + + + Revision 2.00 release notes: + + - Progressive JPEG is now supported. + + - PPM and PGM binary formats are now supported, thanks to Ken Miller. + + - x86 platforms now make use of SSE2 SIMD instructions for + JPEG decoding, and ARM platforms can use NEON SIMD if requested. + This work was done by Fabian "ryg" Giesen. SSE2 is used by + default, but NEON must be enabled explicitly; see docs. + + With other JPEG optimizations included in this version, we see + 2x speedup on a JPEG on an x86 machine, and a 1.5x speedup + on a JPEG on an ARM machine, relative to previous versions of this + library. The same results will not obtain for all JPGs and for all + x86/ARM machines. (Note that progressive JPEGs are significantly + slower to decode than regular JPEGs.) This doesn't mean that this + is the fastest JPEG decoder in the land; rather, it brings it + closer to parity with standard libraries. If you want the fastest + decode, look elsewhere. (See "Philosophy" section of docs below.) + + See final bullet items below for more info on SIMD. + + - Added STBI_MALLOC, STBI_REALLOC, and STBI_FREE macros for replacing + the memory allocator. Unlike other STBI libraries, these macros don't + support a context parameter, so if you need to pass a context in to + the allocator, you'll have to store it in a global or a thread-local + variable. + + - Split existing STBI_NO_HDR flag into two flags, STBI_NO_HDR and + STBI_NO_LINEAR. + STBI_NO_HDR: suppress implementation of .hdr reader format + STBI_NO_LINEAR: suppress high-dynamic-range light-linear float API + + - You can suppress implementation of any of the decoders to reduce + your code footprint by #defining one or more of the following + symbols before creating the implementation. + + STBI_NO_JPEG + STBI_NO_PNG + STBI_NO_BMP + STBI_NO_PSD + STBI_NO_TGA + STBI_NO_GIF + STBI_NO_HDR + STBI_NO_PIC + STBI_NO_PNM (.ppm and .pgm) + + - You can request *only* certain decoders and suppress all other ones + (this will be more forward-compatible, as addition of new decoders + doesn't require you to disable them explicitly): + + STBI_ONLY_JPEG + STBI_ONLY_PNG + STBI_ONLY_BMP + STBI_ONLY_PSD + STBI_ONLY_TGA + STBI_ONLY_GIF + STBI_ONLY_HDR + STBI_ONLY_PIC + STBI_ONLY_PNM (.ppm and .pgm) + + Note that you can define multiples of these, and you will get all + of them ("only x" and "only y" is interpreted to mean "only x&y"). + + - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still + want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB + + - Compilation of all SIMD code can be suppressed with + #define STBI_NO_SIMD + It should not be necessary to disable SIMD unless you have issues + compiling (e.g. using an x86 compiler which doesn't support SSE + intrinsics or that doesn't support the method used to detect + SSE2 support at run-time), and even those can be reported as + bugs so I can refine the built-in compile-time checking to be + smarter. + + - The old STBI_SIMD system which allowed installing a user-defined + IDCT etc. has been removed. If you need this, don't upgrade. My + assumption is that almost nobody was doing this, and those who + were will find the built-in SIMD more satisfactory anyway. + + - RGB values computed for JPEG images are slightly different from + previous versions of stb_image. (This is due to using less + integer precision in SIMD.) The C code has been adjusted so + that the same RGB values will be computed regardless of whether + SIMD support is available, so your app should always produce + consistent results. But these results are slightly different from + previous versions. (Specifically, about 3% of available YCbCr values + will compute different RGB results from pre-1.49 versions by +-1; + most of the deviating values are one smaller in the G channel.) + + - If you must produce consistent results with previous versions of + stb_image, #define STBI_JPEG_OLD and you will get the same results + you used to; however, you will not get the SIMD speedups for + the YCbCr-to-RGB conversion step (although you should still see + significant JPEG speedup from the other changes). + + Please note that STBI_JPEG_OLD is a temporary feature; it will be + removed in future versions of the library. It is only intended for + near-term back-compatibility use. + + + Latest revision history: + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) partial animated GIF support + limited 16-bit PSD support + minor bugs, code cleanup, and compiler warnings + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) additional corruption checking + stbi_set_flip_vertically_on_load + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD + progressive JPEG + PGM/PPM support + STBI_MALLOC,STBI_REALLOC,STBI_FREE + STBI_NO_*, STBI_ONLY_* + GIF bugfix + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support (both grayscale and paletted) + optimize PNG + fix bug in interlaced PNG with user-specified channel count + + See end of file for full revision history. + + + ============================ Contributors ========================= + + Image formats Bug fixes & warning fixes + Sean Barrett (jpeg, png, bmp) Marc LeBlanc + Nicolas Schulz (hdr, psd) Christpher Lloyd + Jonathan Dummer (tga) Dave Moore + Jean-Marc Lienher (gif) Won Chun + Tom Seddon (pic) the Horde3D community + Thatcher Ulrich (psd) Janez Zemva + Ken Miller (pgm, ppm) Jonathan Blow + urraka@github (animated gif) Laurent Gomila + Aruelien Pocheville + Ryamond Barbiero + David Woo + Extensions, features Martin Golini + Jetro Lauha (stbi_info) Roy Eltham + Martin "SpartanJ" Golini (stbi_info) Luke Graham + James "moose2000" Brown (iPhone PNG) Thomas Ruf + Ben "Disch" Wenger (io callbacks) John Bartholomew + Omar Cornut (1/2/4-bit PNG) Ken Hamada + Nicolas Guillemot (vertical flip) Cort Stratton + Richard Mitton (16-bit PSD) Blazej Dariusz Roszkowski + Thibault Reuille + Paul Du Bois + Guillaume George + Jerry Jansson + Hayaki Saito + Johan Duparc + Ronny Chevalier + Optimizations & bugfixes Michal Cichon + Fabian "ryg" Giesen Tero Hanninen + Arseny Kapoulkine Sergio Gonzalez + Cass Everitt + Engin Manap + If your name should be here but Martins Mozeiko + isn't, let Sean know. Joseph Thomson + Phil Jordan + Nathan Reed + Michaelangel007@github + Nick Verigakis + +LICENSE + +This software is in the public domain. Where that dedication is not +recognized, you are granted a perpetual, irrevocable license to copy, +distribute, and modify this file as you see fit. + +*/ + +#ifndef STBI_INCLUDE_STB_IMAGE_H +#define STBI_INCLUDE_STB_IMAGE_H + +// DOCUMENTATION +// +// Limitations: +// - no 16-bit-per-channel PNG +// - no 12-bit-per-channel JPEG +// - no JPEGs with arithmetic coding +// - no 1-bit BMP +// - GIF always returns *comp=4 +// +// Basic usage (see HDR discussion below for HDR usage): +// int x,y,n; +// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); +// // ... process data if not NULL ... +// // ... x = width, y = height, n = # 8-bit components per pixel ... +// // ... replace '0' with '1'..'4' to force that many components per pixel +// // ... but 'n' will always be the number that it would have been if you said 0 +// stbi_image_free(data) +// +// Standard parameters: +// int *x -- outputs image width in pixels +// int *y -- outputs image height in pixels +// int *comp -- outputs # of image components in image file +// int req_comp -- if non-zero, # of image components requested in result +// +// The return value from an image loader is an 'unsigned char *' which points +// to the pixel data, or NULL on an allocation failure or if the image is +// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, +// with each pixel consisting of N interleaved 8-bit components; the first +// pixel pointed to is top-left-most in the image. There is no padding between +// image scanlines or between pixels, regardless of format. The number of +// components N is 'req_comp' if req_comp is non-zero, or *comp otherwise. +// If req_comp is non-zero, *comp has the number of components that _would_ +// have been output otherwise. E.g. if you set req_comp to 4, you will always +// get RGBA output, but you can check *comp to see if it's trivially opaque +// because e.g. there were only 3 channels in the source image. +// +// An output image with N components has the following components interleaved +// in this order in each pixel: +// +// N=#comp components +// 1 grey +// 2 grey, alpha +// 3 red, green, blue +// 4 red, green, blue, alpha +// +// If image loading fails for any reason, the return value will be NULL, +// and *x, *y, *comp will be unchanged. The function stbi_failure_reason() +// can be queried for an extremely brief, end-user unfriendly explanation +// of why the load failed. Define STBI_NO_FAILURE_STRINGS to avoid +// compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly +// more user-friendly ones. +// +// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. +// +// =========================================================================== +// +// Philosophy +// +// stb libraries are designed with the following priorities: +// +// 1. easy to use +// 2. easy to maintain +// 3. good performance +// +// Sometimes I let "good performance" creep up in priority over "easy to maintain", +// and for best performance I may provide less-easy-to-use APIs that give higher +// performance, in addition to the easy to use ones. Nevertheless, it's important +// to keep in mind that from the standpoint of you, a client of this library, +// all you care about is #1 and #3, and stb libraries do not emphasize #3 above all. +// +// Some secondary priorities arise directly from the first two, some of which +// make more explicit reasons why performance can't be emphasized. +// +// - Portable ("ease of use") +// - Small footprint ("easy to maintain") +// - No dependencies ("ease of use") +// +// =========================================================================== +// +// I/O callbacks +// +// I/O callbacks allow you to read from arbitrary sources, like packaged +// files or some other source. Data read from callbacks are processed +// through a small internal buffer (currently 128 bytes) to try to reduce +// overhead. +// +// The three functions you must define are "read" (reads some bytes of data), +// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). +// +// =========================================================================== +// +// SIMD support +// +// The JPEG decoder will try to automatically use SIMD kernels on x86 when +// supported by the compiler. For ARM Neon support, you must explicitly +// request it. +// +// (The old do-it-yourself SIMD API is no longer supported in the current +// code.) +// +// On x86, SSE2 will automatically be used when available based on a run-time +// test; if not, the generic C versions are used as a fall-back. On ARM targets, +// the typical path is to have separate builds for NEON and non-NEON devices +// (at least this is true for iOS and Android). Therefore, the NEON support is +// toggled by a build flag: define STBI_NEON to get NEON loops. +// +// The output of the JPEG decoder is slightly different from versions where +// SIMD support was introduced (that is, for versions before 1.49). The +// difference is only +-1 in the 8-bit RGB channels, and only on a small +// fraction of pixels. You can force the pre-1.49 behavior by defining +// STBI_JPEG_OLD, but this will disable some of the SIMD decoding path +// and hence cost some performance. +// +// If for some reason you do not want to use any of SIMD code, or if +// you have issues compiling it, you can disable it entirely by +// defining STBI_NO_SIMD. +// +// =========================================================================== +// +// HDR image support (disable by defining STBI_NO_HDR) +// +// stb_image now supports loading HDR images in general, and currently +// the Radiance .HDR file format, although the support is provided +// generically. You can still load any file through the existing interface; +// if you attempt to load an HDR file, it will be automatically remapped to +// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; +// both of these constants can be reconfigured through this interface: +// +// stbi_hdr_to_ldr_gamma(2.2f); +// stbi_hdr_to_ldr_scale(1.0f); +// +// (note, do not use _inverse_ constants; stbi_image will invert them +// appropriately). +// +// Additionally, there is a new, parallel interface for loading files as +// (linear) floats to preserve the full dynamic range: +// +// float *data = stbi_loadf(filename, &x, &y, &n, 0); +// +// If you load LDR images through this interface, those images will +// be promoted to floating point values, run through the inverse of +// constants corresponding to the above: +// +// stbi_ldr_to_hdr_scale(1.0f); +// stbi_ldr_to_hdr_gamma(2.2f); +// +// Finally, given a filename (or an open file or memory block--see header +// file for details) containing image data, you can query for the "most +// appropriate" interface to use (that is, whether the image is HDR or +// not), using: +// +// stbi_is_hdr(char *filename); +// +// =========================================================================== +// +// iPhone PNG support: +// +// By default we convert iphone-formatted PNGs back to RGB, even though +// they are internally encoded differently. You can disable this conversion +// by by calling stbi_convert_iphone_png_to_rgb(0), in which case +// you will always just get the native iphone "format" through (which +// is BGR stored in RGB). +// +// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per +// pixel to remove any premultiplied alpha *only* if the image file explicitly +// says there's premultiplied data (currently only happens in iPhone images, +// and only if iPhone convert-to-rgb processing is on). +// + + +#ifndef STBI_NO_STDIO +#include +#endif // STBI_NO_STDIO + +#define STBI_VERSION 1 + +enum +{ + STBI_default = 0, // only used for req_comp + + STBI_grey = 1, + STBI_grey_alpha = 2, + STBI_rgb = 3, + STBI_rgb_alpha = 4 +}; + +typedef unsigned char stbi_uc; + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef STB_IMAGE_STATIC +#define STBIDEF static +#else +#define STBIDEF extern +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// PRIMARY API - works on images of any type +// + +// +// load image by filename, open file, or memory buffer +// + +typedef struct +{ + int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read + void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative + int (*eof) (void *user); // returns nonzero if we are at end of file/data +} stbi_io_callbacks; + +STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *comp, int req_comp); +STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *comp, int req_comp); +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *comp, int req_comp); + +#ifndef STBI_NO_STDIO +STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); +// for stbi_load_from_file, file pointer is left pointing immediately after image +#endif + +#ifndef STBI_NO_LINEAR + STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *comp, int req_comp); + STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp); + STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp); + + #ifndef STBI_NO_STDIO + STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); + #endif +#endif + +#ifndef STBI_NO_HDR + STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); + STBIDEF void stbi_hdr_to_ldr_scale(float scale); +#endif + +#ifndef STBI_NO_LINEAR + STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); + STBIDEF void stbi_ldr_to_hdr_scale(float scale); +#endif // STBI_NO_HDR + +// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename); +STBIDEF int stbi_is_hdr_from_file(FILE *f); +#endif // STBI_NO_STDIO + + +// get a VERY brief reason for failure +// NOT THREADSAFE +STBIDEF const char *stbi_failure_reason (void); + +// free the loaded image -- this is just free() +STBIDEF void stbi_image_free (void *retval_from_stbi_load); + +// get image dimensions & components without fully decoding +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); +STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); + +#endif + + + +// for image formats that explicitly notate that they have premultiplied alpha, +// we just return the colors as stored in the file. set this flag to force +// unpremultiplication. results are undefined if the unpremultiply overflow. +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); + +// indicate whether we should process iphone images back to canonical format, +// or just pass them through "as-is" +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); + +// flip the image vertically, so the first pixel in the output array is the bottom left +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); + +// ZLIB client - used by PNG, available for other purposes + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); +STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + +STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); + + +#ifdef __cplusplus +} +#endif + +// +// +//// end header file ///////////////////////////////////////////////////// +#endif // STBI_INCLUDE_STB_IMAGE_H + +#ifdef STB_IMAGE_IMPLEMENTATION + +#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ + || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ + || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ + || defined(STBI_ONLY_ZLIB) + #ifndef STBI_ONLY_JPEG + #define STBI_NO_JPEG + #endif + #ifndef STBI_ONLY_PNG + #define STBI_NO_PNG + #endif + #ifndef STBI_ONLY_BMP + #define STBI_NO_BMP + #endif + #ifndef STBI_ONLY_PSD + #define STBI_NO_PSD + #endif + #ifndef STBI_ONLY_TGA + #define STBI_NO_TGA + #endif + #ifndef STBI_ONLY_GIF + #define STBI_NO_GIF + #endif + #ifndef STBI_ONLY_HDR + #define STBI_NO_HDR + #endif + #ifndef STBI_ONLY_PIC + #define STBI_NO_PIC + #endif + #ifndef STBI_ONLY_PNM + #define STBI_NO_PNM + #endif +#endif + +#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) +#define STBI_NO_ZLIB +#endif + + +#include +#include // ptrdiff_t on osx +#include +#include + +#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) +#include // ldexp +#endif + +#ifndef STBI_NO_STDIO +#include +#endif + +#ifndef STBI_ASSERT +#include +#define STBI_ASSERT(x) assert(x) +#endif + + +#ifndef _MSC_VER + #ifdef __cplusplus + #define stbi_inline inline + #else + #define stbi_inline + #endif +#else + #define stbi_inline __forceinline +#endif + + +#ifdef _MSC_VER +typedef unsigned short stbi__uint16; +typedef signed short stbi__int16; +typedef unsigned int stbi__uint32; +typedef signed int stbi__int32; +#else +#include +typedef uint16_t stbi__uint16; +typedef int16_t stbi__int16; +typedef uint32_t stbi__uint32; +typedef int32_t stbi__int32; +#endif + +// should produce compiler error if size is wrong +typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; + +#ifdef _MSC_VER +#define STBI_NOTUSED(v) (void)(v) +#else +#define STBI_NOTUSED(v) (void)sizeof(v) +#endif + +#ifdef _MSC_VER +#define STBI_HAS_LROTL +#endif + +#ifdef STBI_HAS_LROTL + #define stbi_lrot(x,y) _lrotl(x,y) +#else + #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) +#endif + +#if defined(STBI_MALLOC) && defined(STBI_FREE) && defined(STBI_REALLOC) +// ok +#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) +// ok +#else +#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC." +#endif + +#ifndef STBI_MALLOC +#define STBI_MALLOC(sz) malloc(sz) +#define STBI_REALLOC(p,sz) realloc(p,sz) +#define STBI_FREE(p) free(p) +#endif + +// x86/x64 detection +#if defined(__x86_64__) || defined(_M_X64) +#define STBI__X64_TARGET +#elif defined(__i386) || defined(_M_IX86) +#define STBI__X86_TARGET +#endif + +#if defined(__GNUC__) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) +// NOTE: not clear do we actually need this for the 64-bit path? +// gcc doesn't support sse2 intrinsics unless you compile with -msse2, +// (but compiling with -msse2 allows the compiler to use SSE2 everywhere; +// this is just broken and gcc are jerks for not fixing it properly +// http://www.virtualdub.org/blog/pivot/entry.php?id=363 ) +#define STBI_NO_SIMD +#endif + +#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) +// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET +// +// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the +// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. +// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not +// simultaneously enabling "-mstackrealign". +// +// See https://github.com/nothings/stb/issues/81 for more information. +// +// So default to no SSE2 on 32-bit MinGW. If you've read this far and added +// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. +#define STBI_NO_SIMD +#endif + +#if !defined(STBI_NO_SIMD) && defined(STBI__X86_TARGET) +#define STBI_SSE2 +#include + +#ifdef _MSC_VER + +#if _MSC_VER >= 1400 // not VC6 +#include // __cpuid +static int stbi__cpuid3(void) +{ + int info[4]; + __cpuid(info,1); + return info[3]; +} +#else +static int stbi__cpuid3(void) +{ + int res; + __asm { + mov eax,1 + cpuid + mov res,edx + } + return res; +} +#endif + +#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name + +static int stbi__sse2_available() +{ + int info3 = stbi__cpuid3(); + return ((info3 >> 26) & 1) != 0; +} +#else // assume GCC-style if not VC++ +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) + +static int stbi__sse2_available() +{ +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later + // GCC 4.8+ has a nice way to do this + return __builtin_cpu_supports("sse2"); +#else + // portable way to do this, preferably without using GCC inline ASM? + // just bail for now. + return 0; +#endif +} +#endif +#endif + +// ARM NEON +#if defined(STBI_NO_SIMD) && defined(STBI_NEON) +#undef STBI_NEON +#endif + +#ifdef STBI_NEON +#include +// assume GCC or Clang on ARM targets +#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) +#endif + +#ifndef STBI_SIMD_ALIGN +#define STBI_SIMD_ALIGN(type, name) type name +#endif + +/////////////////////////////////////////////// +// +// stbi__context struct and start_xxx functions + +// stbi__context structure is our basic context used by all images, so it +// contains all the IO context, plus some basic image information +typedef struct +{ + stbi__uint32 img_x, img_y; + int img_n, img_out_n; + + stbi_io_callbacks io; + void *io_user_data; + + int read_from_callbacks; + int buflen; + stbi_uc buffer_start[128]; + + stbi_uc *img_buffer, *img_buffer_end; + stbi_uc *img_buffer_original, *img_buffer_original_end; +} stbi__context; + + +static void stbi__refill_buffer(stbi__context *s); + +// initialize a memory-decode context +static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) +{ + s->io.read = NULL; + s->read_from_callbacks = 0; + s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; + s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; +} + +// initialize a callback-based context +static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) +{ + s->io = *c; + s->io_user_data = user; + s->buflen = sizeof(s->buffer_start); + s->read_from_callbacks = 1; + s->img_buffer_original = s->buffer_start; + stbi__refill_buffer(s); + s->img_buffer_original_end = s->img_buffer_end; +} + +#ifndef STBI_NO_STDIO + +static int stbi__stdio_read(void *user, char *data, int size) +{ + return (int) fread(data,1,size,(FILE*) user); +} + +static void stbi__stdio_skip(void *user, int n) +{ + fseek((FILE*) user, n, SEEK_CUR); +} + +static int stbi__stdio_eof(void *user) +{ + return feof((FILE*) user); +} + +static stbi_io_callbacks stbi__stdio_callbacks = +{ + stbi__stdio_read, + stbi__stdio_skip, + stbi__stdio_eof, +}; + +static void stbi__start_file(stbi__context *s, FILE *f) +{ + stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); +} + +//static void stop_file(stbi__context *s) { } + +#endif // !STBI_NO_STDIO + +static void stbi__rewind(stbi__context *s) +{ + // conceptually rewind SHOULD rewind to the beginning of the stream, + // but we just rewind to the beginning of the initial buffer, because + // we only use it after doing 'test', which only ever looks at at most 92 bytes + s->img_buffer = s->img_buffer_original; + s->img_buffer_end = s->img_buffer_original_end; +} + +#ifndef STBI_NO_JPEG +static int stbi__jpeg_test(stbi__context *s); +static stbi_uc *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNG +static int stbi__png_test(stbi__context *s); +static stbi_uc *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_BMP +static int stbi__bmp_test(stbi__context *s); +static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_TGA +static int stbi__tga_test(stbi__context *s); +static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s); +static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_HDR +static int stbi__hdr_test(stbi__context *s); +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_test(stbi__context *s); +static stbi_uc *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_GIF +static int stbi__gif_test(stbi__context *s); +static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +#ifndef STBI_NO_PNM +static int stbi__pnm_test(stbi__context *s); +static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); +#endif + +// this is not threadsafe +static const char *stbi__g_failure_reason; + +STBIDEF const char *stbi_failure_reason(void) +{ + return stbi__g_failure_reason; +} + +static int stbi__err(const char *str) +{ + stbi__g_failure_reason = str; + return 0; +} + +static void *stbi__malloc(size_t size) +{ + return STBI_MALLOC(size); +} + +// stbi__err - error +// stbi__errpf - error returning pointer to float +// stbi__errpuc - error returning pointer to unsigned char + +#ifdef STBI_NO_FAILURE_STRINGS + #define stbi__err(x,y) 0 +#elif defined(STBI_FAILURE_USERMSG) + #define stbi__err(x,y) stbi__err(y) +#else + #define stbi__err(x,y) stbi__err(x) +#endif + +#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) +#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) + +STBIDEF void stbi_image_free(void *retval_from_stbi_load) +{ + STBI_FREE(retval_from_stbi_load); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); +#endif + +#ifndef STBI_NO_HDR +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); +#endif + +static int stbi__vertically_flip_on_load = 0; + +STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) +{ + stbi__vertically_flip_on_load = flag_true_if_should_flip; +} + +static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PNG + if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_BMP + if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_GIF + if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PSD + if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PIC + if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp); + #endif + #ifndef STBI_NO_PNM + if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp); + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr = stbi__hdr_load(s, x,y,comp,req_comp); + return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); + } + #endif + + #ifndef STBI_NO_TGA + // test tga last because it's a crappy test! + if (stbi__tga_test(s)) + return stbi__tga_load(s,x,y,comp,req_comp); + #endif + + return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); +} + +static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result = stbi__load_main(s, x, y, comp, req_comp); + + if (stbi__vertically_flip_on_load && result != NULL) { + int w = *x, h = *y; + int depth = req_comp ? req_comp : *comp; + int row,col,z; + stbi_uc temp; + + // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once + for (row = 0; row < (h>>1); row++) { + for (col = 0; col < w; col++) { + for (z = 0; z < depth; z++) { + temp = result[(row * w + col) * depth + z]; + result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; + result[((h - row - 1) * w + col) * depth + z] = temp; + } + } + } + } + + return result; +} + +#ifndef STBI_NO_HDR +static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) +{ + if (stbi__vertically_flip_on_load && result != NULL) { + int w = *x, h = *y; + int depth = req_comp ? req_comp : *comp; + int row,col,z; + float temp; + + // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once + for (row = 0; row < (h>>1); row++) { + for (col = 0; col < w; col++) { + for (z = 0; z < depth; z++) { + temp = result[(row * w + col) * depth + z]; + result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; + result[((h - row - 1) * w + col) * depth + z] = temp; + } + } + } + } +} +#endif + +#ifndef STBI_NO_STDIO + +static FILE *stbi__fopen(char const *filename, char const *mode) +{ + FILE *f; +#if defined(_MSC_VER) && _MSC_VER >= 1400 + if (0 != fopen_s(&f, filename, mode)) + f=0; +#else + f = fopen(filename, mode); +#endif + return f; +} + + +STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + unsigned char *result; + if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); + result = stbi_load_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *result; + stbi__context s; + stbi__start_file(&s,f); + result = stbi__load_flip(&s,x,y,comp,req_comp); + if (result) { + // need to 'unget' all the characters in the IO buffer + fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); + } + return result; +} +#endif //!STBI_NO_STDIO + +STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__load_flip(&s,x,y,comp,req_comp); +} + +STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__load_flip(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_LINEAR +static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + unsigned char *data; + #ifndef STBI_NO_HDR + if (stbi__hdr_test(s)) { + float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp); + if (hdr_data) + stbi__float_postprocess(hdr_data,x,y,comp,req_comp); + return hdr_data; + } + #endif + data = stbi__load_flip(s, x, y, comp, req_comp); + if (data) + return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); + return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); +} + +STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} + +#ifndef STBI_NO_STDIO +STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) +{ + float *result; + FILE *f = stbi__fopen(filename, "rb"); + if (!f) return stbi__errpf("can't fopen", "Unable to open file"); + result = stbi_loadf_from_file(f,x,y,comp,req_comp); + fclose(f); + return result; +} + +STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) +{ + stbi__context s; + stbi__start_file(&s,f); + return stbi__loadf_main(&s,x,y,comp,req_comp); +} +#endif // !STBI_NO_STDIO + +#endif // !STBI_NO_LINEAR + +// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is +// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always +// reports false! + +STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(buffer); + STBI_NOTUSED(len); + return 0; + #endif +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_is_hdr (char const *filename) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result=0; + if (f) { + result = stbi_is_hdr_from_file(f); + fclose(f); + } + return result; +} + +STBIDEF int stbi_is_hdr_from_file(FILE *f) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_file(&s,f); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(f); + return 0; + #endif +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) +{ + #ifndef STBI_NO_HDR + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); + return stbi__hdr_test(&s); + #else + STBI_NOTUSED(clbk); + STBI_NOTUSED(user); + return 0; + #endif +} + +static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; +static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; + +#ifndef STBI_NO_LINEAR +STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } +STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } +#endif + +STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } +STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } + + +////////////////////////////////////////////////////////////////////////////// +// +// Common code used by all image loaders +// + +enum +{ + STBI__SCAN_load=0, + STBI__SCAN_type, + STBI__SCAN_header +}; + +static void stbi__refill_buffer(stbi__context *s) +{ + int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); + if (n == 0) { + // at end of file, treat same as if from memory, but need to handle case + // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file + s->read_from_callbacks = 0; + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start+1; + *s->img_buffer = 0; + } else { + s->img_buffer = s->buffer_start; + s->img_buffer_end = s->buffer_start + n; + } +} + +stbi_inline static stbi_uc stbi__get8(stbi__context *s) +{ + if (s->img_buffer < s->img_buffer_end) + return *s->img_buffer++; + if (s->read_from_callbacks) { + stbi__refill_buffer(s); + return *s->img_buffer++; + } + return 0; +} + +stbi_inline static int stbi__at_eof(stbi__context *s) +{ + if (s->io.read) { + if (!(s->io.eof)(s->io_user_data)) return 0; + // if feof() is true, check if buffer = end + // special case: we've only got the special 0 character at the end + if (s->read_from_callbacks == 0) return 1; + } + + return s->img_buffer >= s->img_buffer_end; +} + +static void stbi__skip(stbi__context *s, int n) +{ + if (n < 0) { + s->img_buffer = s->img_buffer_end; + return; + } + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + s->img_buffer = s->img_buffer_end; + (s->io.skip)(s->io_user_data, n - blen); + return; + } + } + s->img_buffer += n; +} + +static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) +{ + if (s->io.read) { + int blen = (int) (s->img_buffer_end - s->img_buffer); + if (blen < n) { + int res, count; + + memcpy(buffer, s->img_buffer, blen); + + count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); + res = (count == (n-blen)); + s->img_buffer = s->img_buffer_end; + return res; + } + } + + if (s->img_buffer+n <= s->img_buffer_end) { + memcpy(buffer, s->img_buffer, n); + s->img_buffer += n; + return 1; + } else + return 0; +} + +static int stbi__get16be(stbi__context *s) +{ + int z = stbi__get8(s); + return (z << 8) + stbi__get8(s); +} + +static stbi__uint32 stbi__get32be(stbi__context *s) +{ + stbi__uint32 z = stbi__get16be(s); + return (z << 16) + stbi__get16be(s); +} + +#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) +// nothing +#else +static int stbi__get16le(stbi__context *s) +{ + int z = stbi__get8(s); + return z + (stbi__get8(s) << 8); +} +#endif + +#ifndef STBI_NO_BMP +static stbi__uint32 stbi__get32le(stbi__context *s) +{ + stbi__uint32 z = stbi__get16le(s); + return z + (stbi__get16le(s) << 16); +} +#endif + +#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings + + +////////////////////////////////////////////////////////////////////////////// +// +// generic converter from built-in img_n to req_comp +// individual types do this automatically as much as possible (e.g. jpeg +// does all cases internally since it needs to colorspace convert anyway, +// and it never has alpha, so very few cases ). png can automatically +// interleave an alpha=255 channel, but falls back to this for other cases +// +// assume data buffer is malloced, so malloc a new one and free that one +// only failure mode is malloc failing + +static stbi_uc stbi__compute_y(int r, int g, int b) +{ + return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); +} + +static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) +{ + int i,j; + unsigned char *good; + + if (req_comp == img_n) return data; + STBI_ASSERT(req_comp >= 1 && req_comp <= 4); + + good = (unsigned char *) stbi__malloc(req_comp * x * y); + if (good == NULL) { + STBI_FREE(data); + return stbi__errpuc("outofmem", "Out of memory"); + } + + for (j=0; j < (int) y; ++j) { + unsigned char *src = data + j * x * img_n ; + unsigned char *dest = good + j * x * req_comp; + + #define COMBO(a,b) ((a)*8+(b)) + #define CASE(a,b) case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) + // convert source image with img_n components to one with req_comp components; + // avoid switch per pixel, so use switch per scanline and massive macros + switch (COMBO(img_n, req_comp)) { + CASE(1,2) dest[0]=src[0], dest[1]=255; break; + CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break; + CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break; + CASE(2,1) dest[0]=src[0]; break; + CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break; + CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break; + CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break; + CASE(3,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; + CASE(3,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255; break; + CASE(4,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; + CASE(4,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break; + CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break; + default: STBI_ASSERT(0); + } + #undef CASE + } + + STBI_FREE(data); + return good; +} + +#ifndef STBI_NO_LINEAR +static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) +{ + int i,k,n; + float *output = (float *) stbi__malloc(x * y * comp * sizeof(float)); + if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); + } + if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f; + } + STBI_FREE(data); + return output; +} +#endif + +#ifndef STBI_NO_HDR +#define stbi__float2int(x) ((int) (x)) +static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) +{ + int i,k,n; + stbi_uc *output = (stbi_uc *) stbi__malloc(x * y * comp); + if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } + // compute number of non-alpha components + if (comp & 1) n = comp; else n = comp-1; + for (i=0; i < x*y; ++i) { + for (k=0; k < n; ++k) { + float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + if (k < comp) { + float z = data[i*comp+k] * 255 + 0.5f; + if (z < 0) z = 0; + if (z > 255) z = 255; + output[i*comp + k] = (stbi_uc) stbi__float2int(z); + } + } + STBI_FREE(data); + return output; +} +#endif + +////////////////////////////////////////////////////////////////////////////// +// +// "baseline" JPEG/JFIF decoder +// +// simple implementation +// - doesn't support delayed output of y-dimension +// - simple interface (only one output format: 8-bit interleaved RGB) +// - doesn't try to recover corrupt jpegs +// - doesn't allow partial loading, loading multiple at once +// - still fast on x86 (copying globals into locals doesn't help x86) +// - allocates lots of intermediate memory (full size of all components) +// - non-interleaved case requires this anyway +// - allows good upsampling (see next) +// high-quality +// - upsampled channels are bilinearly interpolated, even across blocks +// - quality integer IDCT derived from IJG's 'slow' +// performance +// - fast huffman; reasonable integer IDCT +// - some SIMD kernels for common paths on targets with SSE2/NEON +// - uses a lot of intermediate memory, could cache poorly + +#ifndef STBI_NO_JPEG + +// huffman decoding acceleration +#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache + +typedef struct +{ + stbi_uc fast[1 << FAST_BITS]; + // weirdly, repacking this into AoS is a 10% speed loss, instead of a win + stbi__uint16 code[256]; + stbi_uc values[256]; + stbi_uc size[257]; + unsigned int maxcode[18]; + int delta[17]; // old 'firstsymbol' - old 'firstcode' +} stbi__huffman; + +typedef struct +{ + stbi__context *s; + stbi__huffman huff_dc[4]; + stbi__huffman huff_ac[4]; + stbi_uc dequant[4][64]; + stbi__int16 fast_ac[4][1 << FAST_BITS]; + +// sizes for components, interleaved MCUs + int img_h_max, img_v_max; + int img_mcu_x, img_mcu_y; + int img_mcu_w, img_mcu_h; + +// definition of jpeg image component + struct + { + int id; + int h,v; + int tq; + int hd,ha; + int dc_pred; + + int x,y,w2,h2; + stbi_uc *data; + void *raw_data, *raw_coeff; + stbi_uc *linebuf; + short *coeff; // progressive only + int coeff_w, coeff_h; // number of 8x8 coefficient blocks + } img_comp[4]; + + stbi__uint32 code_buffer; // jpeg entropy-coded buffer + int code_bits; // number of valid bits + unsigned char marker; // marker seen while filling entropy buffer + int nomore; // flag if we saw a marker so must stop + + int progressive; + int spec_start; + int spec_end; + int succ_high; + int succ_low; + int eob_run; + + int scan_n, order[4]; + int restart_interval, todo; + +// kernels + void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); + void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); + stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); +} stbi__jpeg; + +static int stbi__build_huffman(stbi__huffman *h, int *count) +{ + int i,j,k=0,code; + // build size list for each symbol (from JPEG spec) + for (i=0; i < 16; ++i) + for (j=0; j < count[i]; ++j) + h->size[k++] = (stbi_uc) (i+1); + h->size[k] = 0; + + // compute actual symbols (from jpeg spec) + code = 0; + k = 0; + for(j=1; j <= 16; ++j) { + // compute delta to add to code to compute symbol id + h->delta[j] = k - code; + if (h->size[k] == j) { + while (h->size[k] == j) + h->code[k++] = (stbi__uint16) (code++); + if (code-1 >= (1 << j)) return stbi__err("bad code lengths","Corrupt JPEG"); + } + // compute largest code + 1 for this size, preshifted as needed later + h->maxcode[j] = code << (16-j); + code <<= 1; + } + h->maxcode[j] = 0xffffffff; + + // build non-spec acceleration table; 255 is flag for not-accelerated + memset(h->fast, 255, 1 << FAST_BITS); + for (i=0; i < k; ++i) { + int s = h->size[i]; + if (s <= FAST_BITS) { + int c = h->code[i] << (FAST_BITS-s); + int m = 1 << (FAST_BITS-s); + for (j=0; j < m; ++j) { + h->fast[c+j] = (stbi_uc) i; + } + } + } + return 1; +} + +// build a table that decodes both magnitude and value of small ACs in +// one go. +static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) +{ + int i; + for (i=0; i < (1 << FAST_BITS); ++i) { + stbi_uc fast = h->fast[i]; + fast_ac[i] = 0; + if (fast < 255) { + int rs = h->values[fast]; + int run = (rs >> 4) & 15; + int magbits = rs & 15; + int len = h->size[fast]; + + if (magbits && len + magbits <= FAST_BITS) { + // magnitude code followed by receive_extend code + int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); + int m = 1 << (magbits - 1); + if (k < m) k += (-1 << magbits) + 1; + // if the result is small enough, we can fit it in fast_ac table + if (k >= -128 && k <= 127) + fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits)); + } + } + } +} + +static void stbi__grow_buffer_unsafe(stbi__jpeg *j) +{ + do { + int b = j->nomore ? 0 : stbi__get8(j->s); + if (b == 0xff) { + int c = stbi__get8(j->s); + if (c != 0) { + j->marker = (unsigned char) c; + j->nomore = 1; + return; + } + } + j->code_buffer |= b << (24 - j->code_bits); + j->code_bits += 8; + } while (j->code_bits <= 24); +} + +// (1 << n) - 1 +static stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; + +// decode a jpeg huffman value from the bitstream +stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) +{ + unsigned int temp; + int c,k; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + // look at the top FAST_BITS and determine what symbol ID it is, + // if the code is <= FAST_BITS + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + k = h->fast[c]; + if (k < 255) { + int s = h->size[k]; + if (s > j->code_bits) + return -1; + j->code_buffer <<= s; + j->code_bits -= s; + return h->values[k]; + } + + // naive test is to shift the code_buffer down so k bits are + // valid, then test against maxcode. To speed this up, we've + // preshifted maxcode left so that it has (16-k) 0s at the + // end; in other words, regardless of the number of bits, it + // wants to be compared against something shifted to have 16; + // that way we don't need to shift inside the loop. + temp = j->code_buffer >> 16; + for (k=FAST_BITS+1 ; ; ++k) + if (temp < h->maxcode[k]) + break; + if (k == 17) { + // error! code not found + j->code_bits -= 16; + return -1; + } + + if (k > j->code_bits) + return -1; + + // convert the huffman code to the symbol id + c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; + STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); + + // convert the id to a symbol + j->code_bits -= k; + j->code_buffer <<= k; + return h->values[c]; +} + +// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); + + sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB + k = stbi_lrot(j->code_buffer, n); + STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask))); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k + (stbi__jbias[n] & ~sgn); +} + +// get some unsigned bits +stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) +{ + unsigned int k; + if (j->code_bits < n) stbi__grow_buffer_unsafe(j); + k = stbi_lrot(j->code_buffer, n); + j->code_buffer = k & ~stbi__bmask[n]; + k &= stbi__bmask[n]; + j->code_bits -= n; + return k; +} + +stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) +{ + unsigned int k; + if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); + k = j->code_buffer; + j->code_buffer <<= 1; + --j->code_bits; + return k & 0x80000000; +} + +// given a value that's at position X in the zigzag stream, +// where does it appear in the 8x8 matrix coded as row-major? +static stbi_uc stbi__jpeg_dezigzag[64+15] = +{ + 0, 1, 8, 16, 9, 2, 3, 10, + 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, + 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, + 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, + 53, 60, 61, 54, 47, 55, 62, 63, + // let corrupt input sample past end + 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63 +}; + +// decode one 64-entry block-- +static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi_uc *dequant) +{ + int diff,dc,k; + int t; + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + t = stbi__jpeg_huff_decode(j, hdc); + if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + + // 0 all the ac values now so we can do it 32-bits at a time + memset(data,0,64*sizeof(data[0])); + + diff = t ? stbi__extend_receive(j, t) : 0; + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc * dequant[0]); + + // decode AC components, see JPEG spec + k = 1; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) * dequant[zig]); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (rs != 0xf0) break; // end block + k += 16; + } else { + k += r; + // decode into unzigzag'd location + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); + } + } + } while (k < 64); + return 1; +} + +static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) +{ + int diff,dc; + int t; + if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + + if (j->succ_high == 0) { + // first scan for DC coefficient, must be first + memset(data,0,64*sizeof(data[0])); // 0 all the ac values now + t = stbi__jpeg_huff_decode(j, hdc); + diff = t ? stbi__extend_receive(j, t) : 0; + + dc = j->img_comp[b].dc_pred + diff; + j->img_comp[b].dc_pred = dc; + data[0] = (short) (dc << j->succ_low); + } else { + // refinement scan for DC coefficient + if (stbi__jpeg_get_bit(j)) + data[0] += (short) (1 << j->succ_low); + } + return 1; +} + +// @OPTIMIZE: store non-zigzagged during the decode passes, +// and only de-zigzag when dequantizing +static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) +{ + int k; + if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); + + if (j->succ_high == 0) { + int shift = j->succ_low; + + if (j->eob_run) { + --j->eob_run; + return 1; + } + + k = j->spec_start; + do { + unsigned int zig; + int c,r,s; + if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); + c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); + r = fac[c]; + if (r) { // fast-AC path + k += (r >> 4) & 15; // run + s = r & 15; // combined length + j->code_buffer <<= s; + j->code_bits -= s; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) ((r >> 8) << shift); + } else { + int rs = stbi__jpeg_huff_decode(j, hac); + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r); + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + --j->eob_run; + break; + } + k += 16; + } else { + k += r; + zig = stbi__jpeg_dezigzag[k++]; + data[zig] = (short) (stbi__extend_receive(j,s) << shift); + } + } + } while (k <= j->spec_end); + } else { + // refinement scan for these AC coefficients + + short bit = (short) (1 << j->succ_low); + + if (j->eob_run) { + --j->eob_run; + for (k = j->spec_start; k <= j->spec_end; ++k) { + short *p = &data[stbi__jpeg_dezigzag[k]]; + if (*p != 0) + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } + } else { + k = j->spec_start; + do { + int r,s; + int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh + if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); + s = rs & 15; + r = rs >> 4; + if (s == 0) { + if (r < 15) { + j->eob_run = (1 << r) - 1; + if (r) + j->eob_run += stbi__jpeg_get_bits(j, r); + r = 64; // force end of block + } else { + // r=15 s=0 should write 16 0s, so we just do + // a run of 15 0s and then write s (which is 0), + // so we don't have to do anything special here + } + } else { + if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); + // sign bit + if (stbi__jpeg_get_bit(j)) + s = bit; + else + s = -bit; + } + + // advance by r + while (k <= j->spec_end) { + short *p = &data[stbi__jpeg_dezigzag[k++]]; + if (*p != 0) { + if (stbi__jpeg_get_bit(j)) + if ((*p & bit)==0) { + if (*p > 0) + *p += bit; + else + *p -= bit; + } + } else { + if (r == 0) { + *p = (short) s; + break; + } + --r; + } + } + } while (k <= j->spec_end); + } + } + return 1; +} + +// take a -128..127 value and stbi__clamp it and convert to 0..255 +stbi_inline static stbi_uc stbi__clamp(int x) +{ + // trick to use a single test to catch both cases + if ((unsigned int) x > 255) { + if (x < 0) return 0; + if (x > 255) return 255; + } + return (stbi_uc) x; +} + +#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) +#define stbi__fsh(x) ((x) << 12) + +// derived from jidctint -- DCT_ISLOW +#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ + int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ + p2 = s2; \ + p3 = s6; \ + p1 = (p2+p3) * stbi__f2f(0.5411961f); \ + t2 = p1 + p3*stbi__f2f(-1.847759065f); \ + t3 = p1 + p2*stbi__f2f( 0.765366865f); \ + p2 = s0; \ + p3 = s4; \ + t0 = stbi__fsh(p2+p3); \ + t1 = stbi__fsh(p2-p3); \ + x0 = t0+t3; \ + x3 = t0-t3; \ + x1 = t1+t2; \ + x2 = t1-t2; \ + t0 = s7; \ + t1 = s5; \ + t2 = s3; \ + t3 = s1; \ + p3 = t0+t2; \ + p4 = t1+t3; \ + p1 = t0+t3; \ + p2 = t1+t2; \ + p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ + t0 = t0*stbi__f2f( 0.298631336f); \ + t1 = t1*stbi__f2f( 2.053119869f); \ + t2 = t2*stbi__f2f( 3.072711026f); \ + t3 = t3*stbi__f2f( 1.501321110f); \ + p1 = p5 + p1*stbi__f2f(-0.899976223f); \ + p2 = p5 + p2*stbi__f2f(-2.562915447f); \ + p3 = p3*stbi__f2f(-1.961570560f); \ + p4 = p4*stbi__f2f(-0.390180644f); \ + t3 += p1+p4; \ + t2 += p2+p3; \ + t1 += p2+p4; \ + t0 += p1+p3; + +static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) +{ + int i,val[64],*v=val; + stbi_uc *o; + short *d = data; + + // columns + for (i=0; i < 8; ++i,++d, ++v) { + // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing + if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 + && d[40]==0 && d[48]==0 && d[56]==0) { + // no shortcut 0 seconds + // (1|2|3|4|5|6|7)==0 0 seconds + // all separate -0.047 seconds + // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds + int dcterm = d[0] << 2; + v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; + } else { + STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) + // constants scaled things up by 1<<12; let's bring them back + // down, but keep 2 extra bits of precision + x0 += 512; x1 += 512; x2 += 512; x3 += 512; + v[ 0] = (x0+t3) >> 10; + v[56] = (x0-t3) >> 10; + v[ 8] = (x1+t2) >> 10; + v[48] = (x1-t2) >> 10; + v[16] = (x2+t1) >> 10; + v[40] = (x2-t1) >> 10; + v[24] = (x3+t0) >> 10; + v[32] = (x3-t0) >> 10; + } + } + + for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { + // no fast case since the first 1D IDCT spread components out + STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) + // constants scaled things up by 1<<12, plus we had 1<<2 from first + // loop, plus horizontal and vertical each scale by sqrt(8) so together + // we've got an extra 1<<3, so 1<<17 total we need to remove. + // so we want to round that, which means adding 0.5 * 1<<17, + // aka 65536. Also, we'll end up with -128 to 127 that we want + // to encode as 0..255 by adding 128, so we'll add that before the shift + x0 += 65536 + (128<<17); + x1 += 65536 + (128<<17); + x2 += 65536 + (128<<17); + x3 += 65536 + (128<<17); + // tried computing the shifts into temps, or'ing the temps to see + // if any were out of range, but that was slower + o[0] = stbi__clamp((x0+t3) >> 17); + o[7] = stbi__clamp((x0-t3) >> 17); + o[1] = stbi__clamp((x1+t2) >> 17); + o[6] = stbi__clamp((x1-t2) >> 17); + o[2] = stbi__clamp((x2+t1) >> 17); + o[5] = stbi__clamp((x2-t1) >> 17); + o[3] = stbi__clamp((x3+t0) >> 17); + o[4] = stbi__clamp((x3-t0) >> 17); + } +} + +#ifdef STBI_SSE2 +// sse2 integer IDCT. not the fastest possible implementation but it +// produces bit-identical results to the generic C version so it's +// fully "transparent". +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + // This is constructed to match our regular (generic) integer IDCT exactly. + __m128i row0, row1, row2, row3, row4, row5, row6, row7; + __m128i tmp; + + // dot product constant: even elems=x, odd elems=y + #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) + + // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) + // out(1) = c1[even]*x + c1[odd]*y + #define dct_rot(out0,out1, x,y,c0,c1) \ + __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ + __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ + __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ + __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ + __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ + __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) + + // out = in << 12 (in 16-bit, out 32-bit) + #define dct_widen(out, in) \ + __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ + __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) + + // wide add + #define dct_wadd(out, a, b) \ + __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_add_epi32(a##_h, b##_h) + + // wide sub + #define dct_wsub(out, a, b) \ + __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ + __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) + + // butterfly a/b, add bias, then shift by "s" and pack + #define dct_bfly32o(out0, out1, a,b,bias,s) \ + { \ + __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ + __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ + dct_wadd(sum, abiased, b); \ + dct_wsub(dif, abiased, b); \ + out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ + out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ + } + + // 8-bit interleave step (for transposes) + #define dct_interleave8(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi8(a, b); \ + b = _mm_unpackhi_epi8(tmp, b) + + // 16-bit interleave step (for transposes) + #define dct_interleave16(a, b) \ + tmp = a; \ + a = _mm_unpacklo_epi16(a, b); \ + b = _mm_unpackhi_epi16(tmp, b) + + #define dct_pass(bias,shift) \ + { \ + /* even part */ \ + dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ + __m128i sum04 = _mm_add_epi16(row0, row4); \ + __m128i dif04 = _mm_sub_epi16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ + dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ + __m128i sum17 = _mm_add_epi16(row1, row7); \ + __m128i sum35 = _mm_add_epi16(row3, row5); \ + dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ + dct_wadd(x4, y0o, y4o); \ + dct_wadd(x5, y1o, y5o); \ + dct_wadd(x6, y2o, y5o); \ + dct_wadd(x7, y3o, y4o); \ + dct_bfly32o(row0,row7, x0,x7,bias,shift); \ + dct_bfly32o(row1,row6, x1,x6,bias,shift); \ + dct_bfly32o(row2,row5, x2,x5,bias,shift); \ + dct_bfly32o(row3,row4, x3,x4,bias,shift); \ + } + + __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); + __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); + __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); + __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); + __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); + __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); + __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); + __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); + + // rounding biases in column/row passes, see stbi__idct_block for explanation. + __m128i bias_0 = _mm_set1_epi32(512); + __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); + + // load + row0 = _mm_load_si128((const __m128i *) (data + 0*8)); + row1 = _mm_load_si128((const __m128i *) (data + 1*8)); + row2 = _mm_load_si128((const __m128i *) (data + 2*8)); + row3 = _mm_load_si128((const __m128i *) (data + 3*8)); + row4 = _mm_load_si128((const __m128i *) (data + 4*8)); + row5 = _mm_load_si128((const __m128i *) (data + 5*8)); + row6 = _mm_load_si128((const __m128i *) (data + 6*8)); + row7 = _mm_load_si128((const __m128i *) (data + 7*8)); + + // column pass + dct_pass(bias_0, 10); + + { + // 16bit 8x8 transpose pass 1 + dct_interleave16(row0, row4); + dct_interleave16(row1, row5); + dct_interleave16(row2, row6); + dct_interleave16(row3, row7); + + // transpose pass 2 + dct_interleave16(row0, row2); + dct_interleave16(row1, row3); + dct_interleave16(row4, row6); + dct_interleave16(row5, row7); + + // transpose pass 3 + dct_interleave16(row0, row1); + dct_interleave16(row2, row3); + dct_interleave16(row4, row5); + dct_interleave16(row6, row7); + } + + // row pass + dct_pass(bias_1, 17); + + { + // pack + __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 + __m128i p1 = _mm_packus_epi16(row2, row3); + __m128i p2 = _mm_packus_epi16(row4, row5); + __m128i p3 = _mm_packus_epi16(row6, row7); + + // 8bit 8x8 transpose pass 1 + dct_interleave8(p0, p2); // a0e0a1e1... + dct_interleave8(p1, p3); // c0g0c1g1... + + // transpose pass 2 + dct_interleave8(p0, p1); // a0c0e0g0... + dct_interleave8(p2, p3); // b0d0f0h0... + + // transpose pass 3 + dct_interleave8(p0, p2); // a0b0c0d0... + dct_interleave8(p1, p3); // a4b4c4d4... + + // store + _mm_storel_epi64((__m128i *) out, p0); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p2); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p1); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; + _mm_storel_epi64((__m128i *) out, p3); out += out_stride; + _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); + } + +#undef dct_const +#undef dct_rot +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_interleave8 +#undef dct_interleave16 +#undef dct_pass +} + +#endif // STBI_SSE2 + +#ifdef STBI_NEON + +// NEON integer IDCT. should produce bit-identical +// results to the generic C version. +static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) +{ + int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; + + int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); + int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); + int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); + int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); + int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); + int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); + int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); + int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); + int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); + int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); + int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); + int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); + +#define dct_long_mul(out, inq, coeff) \ + int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) + +#define dct_long_mac(out, acc, inq, coeff) \ + int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ + int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) + +#define dct_widen(out, inq) \ + int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ + int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) + +// wide add +#define dct_wadd(out, a, b) \ + int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vaddq_s32(a##_h, b##_h) + +// wide sub +#define dct_wsub(out, a, b) \ + int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ + int32x4_t out##_h = vsubq_s32(a##_h, b##_h) + +// butterfly a/b, then shift using "shiftop" by "s" and pack +#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ + { \ + dct_wadd(sum, a, b); \ + dct_wsub(dif, a, b); \ + out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ + out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ + } + +#define dct_pass(shiftop, shift) \ + { \ + /* even part */ \ + int16x8_t sum26 = vaddq_s16(row2, row6); \ + dct_long_mul(p1e, sum26, rot0_0); \ + dct_long_mac(t2e, p1e, row6, rot0_1); \ + dct_long_mac(t3e, p1e, row2, rot0_2); \ + int16x8_t sum04 = vaddq_s16(row0, row4); \ + int16x8_t dif04 = vsubq_s16(row0, row4); \ + dct_widen(t0e, sum04); \ + dct_widen(t1e, dif04); \ + dct_wadd(x0, t0e, t3e); \ + dct_wsub(x3, t0e, t3e); \ + dct_wadd(x1, t1e, t2e); \ + dct_wsub(x2, t1e, t2e); \ + /* odd part */ \ + int16x8_t sum15 = vaddq_s16(row1, row5); \ + int16x8_t sum17 = vaddq_s16(row1, row7); \ + int16x8_t sum35 = vaddq_s16(row3, row5); \ + int16x8_t sum37 = vaddq_s16(row3, row7); \ + int16x8_t sumodd = vaddq_s16(sum17, sum35); \ + dct_long_mul(p5o, sumodd, rot1_0); \ + dct_long_mac(p1o, p5o, sum17, rot1_1); \ + dct_long_mac(p2o, p5o, sum35, rot1_2); \ + dct_long_mul(p3o, sum37, rot2_0); \ + dct_long_mul(p4o, sum15, rot2_1); \ + dct_wadd(sump13o, p1o, p3o); \ + dct_wadd(sump24o, p2o, p4o); \ + dct_wadd(sump23o, p2o, p3o); \ + dct_wadd(sump14o, p1o, p4o); \ + dct_long_mac(x4, sump13o, row7, rot3_0); \ + dct_long_mac(x5, sump24o, row5, rot3_1); \ + dct_long_mac(x6, sump23o, row3, rot3_2); \ + dct_long_mac(x7, sump14o, row1, rot3_3); \ + dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ + dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ + dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ + dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ + } + + // load + row0 = vld1q_s16(data + 0*8); + row1 = vld1q_s16(data + 1*8); + row2 = vld1q_s16(data + 2*8); + row3 = vld1q_s16(data + 3*8); + row4 = vld1q_s16(data + 4*8); + row5 = vld1q_s16(data + 5*8); + row6 = vld1q_s16(data + 6*8); + row7 = vld1q_s16(data + 7*8); + + // add DC bias + row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); + + // column pass + dct_pass(vrshrn_n_s32, 10); + + // 16bit 8x8 transpose + { +// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. +// whether compilers actually get this is another story, sadly. +#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } +#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } + + // pass 1 + dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 + dct_trn16(row2, row3); + dct_trn16(row4, row5); + dct_trn16(row6, row7); + + // pass 2 + dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 + dct_trn32(row1, row3); + dct_trn32(row4, row6); + dct_trn32(row5, row7); + + // pass 3 + dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 + dct_trn64(row1, row5); + dct_trn64(row2, row6); + dct_trn64(row3, row7); + +#undef dct_trn16 +#undef dct_trn32 +#undef dct_trn64 + } + + // row pass + // vrshrn_n_s32 only supports shifts up to 16, we need + // 17. so do a non-rounding shift of 16 first then follow + // up with a rounding shift by 1. + dct_pass(vshrn_n_s32, 16); + + { + // pack and round + uint8x8_t p0 = vqrshrun_n_s16(row0, 1); + uint8x8_t p1 = vqrshrun_n_s16(row1, 1); + uint8x8_t p2 = vqrshrun_n_s16(row2, 1); + uint8x8_t p3 = vqrshrun_n_s16(row3, 1); + uint8x8_t p4 = vqrshrun_n_s16(row4, 1); + uint8x8_t p5 = vqrshrun_n_s16(row5, 1); + uint8x8_t p6 = vqrshrun_n_s16(row6, 1); + uint8x8_t p7 = vqrshrun_n_s16(row7, 1); + + // again, these can translate into one instruction, but often don't. +#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } +#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } +#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } + + // sadly can't use interleaved stores here since we only write + // 8 bytes to each scan line! + + // 8x8 8-bit transpose pass 1 + dct_trn8_8(p0, p1); + dct_trn8_8(p2, p3); + dct_trn8_8(p4, p5); + dct_trn8_8(p6, p7); + + // pass 2 + dct_trn8_16(p0, p2); + dct_trn8_16(p1, p3); + dct_trn8_16(p4, p6); + dct_trn8_16(p5, p7); + + // pass 3 + dct_trn8_32(p0, p4); + dct_trn8_32(p1, p5); + dct_trn8_32(p2, p6); + dct_trn8_32(p3, p7); + + // store + vst1_u8(out, p0); out += out_stride; + vst1_u8(out, p1); out += out_stride; + vst1_u8(out, p2); out += out_stride; + vst1_u8(out, p3); out += out_stride; + vst1_u8(out, p4); out += out_stride; + vst1_u8(out, p5); out += out_stride; + vst1_u8(out, p6); out += out_stride; + vst1_u8(out, p7); + +#undef dct_trn8_8 +#undef dct_trn8_16 +#undef dct_trn8_32 + } + +#undef dct_long_mul +#undef dct_long_mac +#undef dct_widen +#undef dct_wadd +#undef dct_wsub +#undef dct_bfly32o +#undef dct_pass +} + +#endif // STBI_NEON + +#define STBI__MARKER_none 0xff +// if there's a pending marker from the entropy stream, return that +// otherwise, fetch from the stream and get a marker. if there's no +// marker, return 0xff, which is never a valid marker value +static stbi_uc stbi__get_marker(stbi__jpeg *j) +{ + stbi_uc x; + if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } + x = stbi__get8(j->s); + if (x != 0xff) return STBI__MARKER_none; + while (x == 0xff) + x = stbi__get8(j->s); + return x; +} + +// in each scan, we'll have scan_n components, and the order +// of the components is specified by order[] +#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) + +// after a restart interval, stbi__jpeg_reset the entropy decoder and +// the dc prediction +static void stbi__jpeg_reset(stbi__jpeg *j) +{ + j->code_bits = 0; + j->code_buffer = 0; + j->nomore = 0; + j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0; + j->marker = STBI__MARKER_none; + j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; + j->eob_run = 0; + // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, + // since we don't even allow 1<<30 pixels +} + +static int stbi__parse_entropy_coded_data(stbi__jpeg *z) +{ + stbi__jpeg_reset(z); + if (!z->progressive) { + if (z->scan_n == 1) { + int i,j; + STBI_SIMD_ALIGN(short, data[64]); + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + // if it's NOT a restart, then just bail, so we get corrupt data + // rather than no data + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + STBI_SIMD_ALIGN(short, data[64]); + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x)*8; + int y2 = (j*z->img_comp[n].v + y)*8; + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } else { + if (z->scan_n == 1) { + int i,j; + int n = z->order[0]; + // non-interleaved data, we just need to process one block at a time, + // in trivial scanline order + // number of blocks to do just depends on how many actual "pixels" this + // component has, independent of interleaved MCU blocking and such + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + if (z->spec_start == 0) { + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } else { + int ha = z->img_comp[n].ha; + if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) + return 0; + } + // every data block is an MCU, so countdown the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } else { // interleaved + int i,j,k,x,y; + for (j=0; j < z->img_mcu_y; ++j) { + for (i=0; i < z->img_mcu_x; ++i) { + // scan an interleaved mcu... process scan_n components in order + for (k=0; k < z->scan_n; ++k) { + int n = z->order[k]; + // scan out an mcu's worth of this component; that's just determined + // by the basic H and V specified for the component + for (y=0; y < z->img_comp[n].v; ++y) { + for (x=0; x < z->img_comp[n].h; ++x) { + int x2 = (i*z->img_comp[n].h + x); + int y2 = (j*z->img_comp[n].v + y); + short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); + if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) + return 0; + } + } + } + // after all interleaved components, that's an interleaved MCU, + // so now count down the restart interval + if (--z->todo <= 0) { + if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); + if (!STBI__RESTART(z->marker)) return 1; + stbi__jpeg_reset(z); + } + } + } + return 1; + } + } +} + +static void stbi__jpeg_dequantize(short *data, stbi_uc *dequant) +{ + int i; + for (i=0; i < 64; ++i) + data[i] *= dequant[i]; +} + +static void stbi__jpeg_finish(stbi__jpeg *z) +{ + if (z->progressive) { + // dequantize and idct the data + int i,j,n; + for (n=0; n < z->s->img_n; ++n) { + int w = (z->img_comp[n].x+7) >> 3; + int h = (z->img_comp[n].y+7) >> 3; + for (j=0; j < h; ++j) { + for (i=0; i < w; ++i) { + short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); + stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); + z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); + } + } + } + } +} + +static int stbi__process_marker(stbi__jpeg *z, int m) +{ + int L; + switch (m) { + case STBI__MARKER_none: // no marker found + return stbi__err("expected marker","Corrupt JPEG"); + + case 0xDD: // DRI - specify restart interval + if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); + z->restart_interval = stbi__get16be(z->s); + return 1; + + case 0xDB: // DQT - define quantization table + L = stbi__get16be(z->s)-2; + while (L > 0) { + int q = stbi__get8(z->s); + int p = q >> 4; + int t = q & 15,i; + if (p != 0) return stbi__err("bad DQT type","Corrupt JPEG"); + if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); + for (i=0; i < 64; ++i) + z->dequant[t][stbi__jpeg_dezigzag[i]] = stbi__get8(z->s); + L -= 65; + } + return L==0; + + case 0xC4: // DHT - define huffman table + L = stbi__get16be(z->s)-2; + while (L > 0) { + stbi_uc *v; + int sizes[16],i,n=0; + int q = stbi__get8(z->s); + int tc = q >> 4; + int th = q & 15; + if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); + for (i=0; i < 16; ++i) { + sizes[i] = stbi__get8(z->s); + n += sizes[i]; + } + L -= 17; + if (tc == 0) { + if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; + v = z->huff_dc[th].values; + } else { + if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; + v = z->huff_ac[th].values; + } + for (i=0; i < n; ++i) + v[i] = stbi__get8(z->s); + if (tc != 0) + stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); + L -= n; + } + return L==0; + } + // check for comment block or APP blocks + if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { + stbi__skip(z->s, stbi__get16be(z->s)-2); + return 1; + } + return 0; +} + +// after we see SOS +static int stbi__process_scan_header(stbi__jpeg *z) +{ + int i; + int Ls = stbi__get16be(z->s); + z->scan_n = stbi__get8(z->s); + if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); + if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); + for (i=0; i < z->scan_n; ++i) { + int id = stbi__get8(z->s), which; + int q = stbi__get8(z->s); + for (which = 0; which < z->s->img_n; ++which) + if (z->img_comp[which].id == id) + break; + if (which == z->s->img_n) return 0; // no match + z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); + z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); + z->order[i] = which; + } + + { + int aa; + z->spec_start = stbi__get8(z->s); + z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 + aa = stbi__get8(z->s); + z->succ_high = (aa >> 4); + z->succ_low = (aa & 15); + if (z->progressive) { + if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) + return stbi__err("bad SOS", "Corrupt JPEG"); + } else { + if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); + if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); + z->spec_end = 63; + } + } + + return 1; +} + +static int stbi__process_frame_header(stbi__jpeg *z, int scan) +{ + stbi__context *s = z->s; + int Lf,p,i,q, h_max=1,v_max=1,c; + Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG + p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline + s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG + s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires + c = stbi__get8(s); + if (c != 3 && c != 1) return stbi__err("bad component count","Corrupt JPEG"); // JFIF requires + s->img_n = c; + for (i=0; i < c; ++i) { + z->img_comp[i].data = NULL; + z->img_comp[i].linebuf = NULL; + } + + if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); + + for (i=0; i < s->img_n; ++i) { + z->img_comp[i].id = stbi__get8(s); + if (z->img_comp[i].id != i+1) // JFIF requires + if (z->img_comp[i].id != i) // some version of jpegtran outputs non-JFIF-compliant files! + return stbi__err("bad component ID","Corrupt JPEG"); + q = stbi__get8(s); + z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); + z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); + z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); + } + + if (scan != STBI__SCAN_load) return 1; + + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + + for (i=0; i < s->img_n; ++i) { + if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; + if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; + } + + // compute interleaved mcu info + z->img_h_max = h_max; + z->img_v_max = v_max; + z->img_mcu_w = h_max * 8; + z->img_mcu_h = v_max * 8; + z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; + z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; + + for (i=0; i < s->img_n; ++i) { + // number of effective pixels (e.g. for non-interleaved MCU) + z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; + z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; + // to simplify generation, we'll allocate enough memory to decode + // the bogus oversized data from using interleaved MCUs and their + // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't + // discard the extra data until colorspace conversion + z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; + z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; + z->img_comp[i].raw_data = stbi__malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15); + + if (z->img_comp[i].raw_data == NULL) { + for(--i; i >= 0; --i) { + STBI_FREE(z->img_comp[i].raw_data); + z->img_comp[i].raw_data = NULL; + } + return stbi__err("outofmem", "Out of memory"); + } + // align blocks for idct using mmx/sse + z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); + z->img_comp[i].linebuf = NULL; + if (z->progressive) { + z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3; + z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3; + z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15); + z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); + } else { + z->img_comp[i].coeff = 0; + z->img_comp[i].raw_coeff = 0; + } + } + + return 1; +} + +// use comparisons since in some cases we handle more than one case (e.g. SOF) +#define stbi__DNL(x) ((x) == 0xdc) +#define stbi__SOI(x) ((x) == 0xd8) +#define stbi__EOI(x) ((x) == 0xd9) +#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) +#define stbi__SOS(x) ((x) == 0xda) + +#define stbi__SOF_progressive(x) ((x) == 0xc2) + +static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) +{ + int m; + z->marker = STBI__MARKER_none; // initialize cached marker to empty + m = stbi__get_marker(z); + if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); + if (scan == STBI__SCAN_type) return 1; + m = stbi__get_marker(z); + while (!stbi__SOF(m)) { + if (!stbi__process_marker(z,m)) return 0; + m = stbi__get_marker(z); + while (m == STBI__MARKER_none) { + // some files have extra padding after their blocks, so ok, we'll scan + if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); + m = stbi__get_marker(z); + } + } + z->progressive = stbi__SOF_progressive(m); + if (!stbi__process_frame_header(z, scan)) return 0; + return 1; +} + +// decode image to YCbCr format +static int stbi__decode_jpeg_image(stbi__jpeg *j) +{ + int m; + for (m = 0; m < 4; m++) { + j->img_comp[m].raw_data = NULL; + j->img_comp[m].raw_coeff = NULL; + } + j->restart_interval = 0; + if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; + m = stbi__get_marker(j); + while (!stbi__EOI(m)) { + if (stbi__SOS(m)) { + if (!stbi__process_scan_header(j)) return 0; + if (!stbi__parse_entropy_coded_data(j)) return 0; + if (j->marker == STBI__MARKER_none ) { + // handle 0s at the end of image data from IP Kamera 9060 + while (!stbi__at_eof(j->s)) { + int x = stbi__get8(j->s); + if (x == 255) { + j->marker = stbi__get8(j->s); + break; + } else if (x != 0) { + return stbi__err("junk before marker", "Corrupt JPEG"); + } + } + // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 + } + } else { + if (!stbi__process_marker(j, m)) return 0; + } + m = stbi__get_marker(j); + } + if (j->progressive) + stbi__jpeg_finish(j); + return 1; +} + +// static jfif-centered resampling (across block boundaries) + +typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, + int w, int hs); + +#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) + +static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + STBI_NOTUSED(out); + STBI_NOTUSED(in_far); + STBI_NOTUSED(w); + STBI_NOTUSED(hs); + return in_near; +} + +static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples vertically for every one in input + int i; + STBI_NOTUSED(hs); + for (i=0; i < w; ++i) + out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); + return out; +} + +static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate two samples horizontally for every one in input + int i; + stbi_uc *input = in_near; + + if (w == 1) { + // if only one sample, can't do any interpolation + out[0] = out[1] = input[0]; + return out; + } + + out[0] = input[0]; + out[1] = stbi__div4(input[0]*3 + input[1] + 2); + for (i=1; i < w-1; ++i) { + int n = 3*input[i]+2; + out[i*2+0] = stbi__div4(n+input[i-1]); + out[i*2+1] = stbi__div4(n+input[i+1]); + } + out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); + out[i*2+1] = input[w-1]; + + STBI_NOTUSED(in_far); + STBI_NOTUSED(hs); + + return out; +} + +#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) + +static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i,t0,t1; + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + out[0] = stbi__div4(t1+2); + for (i=1; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // need to generate 2x2 samples for every one in input + int i=0,t0,t1; + + if (w == 1) { + out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); + return out; + } + + t1 = 3*in_near[0] + in_far[0]; + // process groups of 8 pixels for as long as we can. + // note we can't handle the last pixel in a row in this loop + // because we need to handle the filter boundary conditions. + for (; i < ((w-1) & ~7); i += 8) { +#if defined(STBI_SSE2) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + __m128i zero = _mm_setzero_si128(); + __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); + __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); + __m128i farw = _mm_unpacklo_epi8(farb, zero); + __m128i nearw = _mm_unpacklo_epi8(nearb, zero); + __m128i diff = _mm_sub_epi16(farw, nearw); + __m128i nears = _mm_slli_epi16(nearw, 2); + __m128i curr = _mm_add_epi16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + __m128i prv0 = _mm_slli_si128(curr, 2); + __m128i nxt0 = _mm_srli_si128(curr, 2); + __m128i prev = _mm_insert_epi16(prv0, t1, 0); + __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + __m128i bias = _mm_set1_epi16(8); + __m128i curs = _mm_slli_epi16(curr, 2); + __m128i prvd = _mm_sub_epi16(prev, curr); + __m128i nxtd = _mm_sub_epi16(next, curr); + __m128i curb = _mm_add_epi16(curs, bias); + __m128i even = _mm_add_epi16(prvd, curb); + __m128i odd = _mm_add_epi16(nxtd, curb); + + // interleave even and odd pixels, then undo scaling. + __m128i int0 = _mm_unpacklo_epi16(even, odd); + __m128i int1 = _mm_unpackhi_epi16(even, odd); + __m128i de0 = _mm_srli_epi16(int0, 4); + __m128i de1 = _mm_srli_epi16(int1, 4); + + // pack and write output + __m128i outv = _mm_packus_epi16(de0, de1); + _mm_storeu_si128((__m128i *) (out + i*2), outv); +#elif defined(STBI_NEON) + // load and perform the vertical filtering pass + // this uses 3*x + y = 4*x + (y - x) + uint8x8_t farb = vld1_u8(in_far + i); + uint8x8_t nearb = vld1_u8(in_near + i); + int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); + int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); + int16x8_t curr = vaddq_s16(nears, diff); // current row + + // horizontal filter works the same based on shifted vers of current + // row. "prev" is current row shifted right by 1 pixel; we need to + // insert the previous pixel value (from t1). + // "next" is current row shifted left by 1 pixel, with first pixel + // of next block of 8 pixels added in. + int16x8_t prv0 = vextq_s16(curr, curr, 7); + int16x8_t nxt0 = vextq_s16(curr, curr, 1); + int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); + int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); + + // horizontal filter, polyphase implementation since it's convenient: + // even pixels = 3*cur + prev = cur*4 + (prev - cur) + // odd pixels = 3*cur + next = cur*4 + (next - cur) + // note the shared term. + int16x8_t curs = vshlq_n_s16(curr, 2); + int16x8_t prvd = vsubq_s16(prev, curr); + int16x8_t nxtd = vsubq_s16(next, curr); + int16x8_t even = vaddq_s16(curs, prvd); + int16x8_t odd = vaddq_s16(curs, nxtd); + + // undo scaling and round, then store with even/odd phases interleaved + uint8x8x2_t o; + o.val[0] = vqrshrun_n_s16(even, 4); + o.val[1] = vqrshrun_n_s16(odd, 4); + vst2_u8(out + i*2, o); +#endif + + // "previous" value for next iter + t1 = 3*in_near[i+7] + in_far[i+7]; + } + + t0 = t1; + t1 = 3*in_near[i] + in_far[i]; + out[i*2] = stbi__div16(3*t1 + t0 + 8); + + for (++i; i < w; ++i) { + t0 = t1; + t1 = 3*in_near[i]+in_far[i]; + out[i*2-1] = stbi__div16(3*t0 + t1 + 8); + out[i*2 ] = stbi__div16(3*t1 + t0 + 8); + } + out[w*2-1] = stbi__div4(t1+2); + + STBI_NOTUSED(hs); + + return out; +} +#endif + +static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) +{ + // resample with nearest-neighbor + int i,j; + STBI_NOTUSED(in_far); + for (i=0; i < w; ++i) + for (j=0; j < hs; ++j) + out[i*hs+j] = in_near[i]; + return out; +} + +#ifdef STBI_JPEG_OLD +// this is the same YCbCr-to-RGB calculation that stb_image has used +// historically before the algorithm changes in 1.49 +#define float2fixed(x) ((int) ((x) * 65536 + 0.5)) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 16) + 32768; // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr*float2fixed(1.40200f); + g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f); + b = y_fixed + cb*float2fixed(1.77200f); + r >>= 16; + g >>= 16; + b >>= 16; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#else +// this is a reduced-precision calculation of YCbCr-to-RGB introduced +// to make sure the code produces the same results in both SIMD and scalar +#define float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) +static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) +{ + int i; + for (i=0; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* float2fixed(1.40200f); + g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +#if defined(STBI_SSE2) || defined(STBI_NEON) +static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) +{ + int i = 0; + +#ifdef STBI_SSE2 + // step == 3 is pretty ugly on the final interleave, and i'm not convinced + // it's useful in practice (you wouldn't use it for textures, for example). + // so just accelerate step == 4 case. + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + __m128i signflip = _mm_set1_epi8(-0x80); + __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); + __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); + __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); + __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); + __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); + __m128i xw = _mm_set1_epi16(255); // alpha channel + + for (; i+7 < count; i += 8) { + // load + __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); + __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); + __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); + __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 + __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 + + // unpack to short (and left-shift cr, cb by 8) + __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); + __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); + __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); + + // color transform + __m128i yws = _mm_srli_epi16(yw, 4); + __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); + __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); + __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); + __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); + __m128i rws = _mm_add_epi16(cr0, yws); + __m128i gwt = _mm_add_epi16(cb0, yws); + __m128i bws = _mm_add_epi16(yws, cb1); + __m128i gws = _mm_add_epi16(gwt, cr1); + + // descale + __m128i rw = _mm_srai_epi16(rws, 4); + __m128i bw = _mm_srai_epi16(bws, 4); + __m128i gw = _mm_srai_epi16(gws, 4); + + // back to byte, set up for transpose + __m128i brb = _mm_packus_epi16(rw, bw); + __m128i gxb = _mm_packus_epi16(gw, xw); + + // transpose to interleave channels + __m128i t0 = _mm_unpacklo_epi8(brb, gxb); + __m128i t1 = _mm_unpackhi_epi8(brb, gxb); + __m128i o0 = _mm_unpacklo_epi16(t0, t1); + __m128i o1 = _mm_unpackhi_epi16(t0, t1); + + // store + _mm_storeu_si128((__m128i *) (out + 0), o0); + _mm_storeu_si128((__m128i *) (out + 16), o1); + out += 32; + } + } +#endif + +#ifdef STBI_NEON + // in this version, step=3 support would be easy to add. but is there demand? + if (step == 4) { + // this is a fairly straightforward implementation and not super-optimized. + uint8x8_t signflip = vdup_n_u8(0x80); + int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); + int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); + int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); + int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); + + for (; i+7 < count; i += 8) { + // load + uint8x8_t y_bytes = vld1_u8(y + i); + uint8x8_t cr_bytes = vld1_u8(pcr + i); + uint8x8_t cb_bytes = vld1_u8(pcb + i); + int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); + int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); + + // expand to s16 + int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); + int16x8_t crw = vshll_n_s8(cr_biased, 7); + int16x8_t cbw = vshll_n_s8(cb_biased, 7); + + // color transform + int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); + int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); + int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); + int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); + int16x8_t rws = vaddq_s16(yws, cr0); + int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); + int16x8_t bws = vaddq_s16(yws, cb1); + + // undo scaling, round, convert to byte + uint8x8x4_t o; + o.val[0] = vqrshrun_n_s16(rws, 4); + o.val[1] = vqrshrun_n_s16(gws, 4); + o.val[2] = vqrshrun_n_s16(bws, 4); + o.val[3] = vdup_n_u8(255); + + // store, interleaving r/g/b/a + vst4_u8(out, o); + out += 8*4; + } + } +#endif + + for (; i < count; ++i) { + int y_fixed = (y[i] << 20) + (1<<19); // rounding + int r,g,b; + int cr = pcr[i] - 128; + int cb = pcb[i] - 128; + r = y_fixed + cr* float2fixed(1.40200f); + g = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); + b = y_fixed + cb* float2fixed(1.77200f); + r >>= 20; + g >>= 20; + b >>= 20; + if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } + if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } + if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } + out[0] = (stbi_uc)r; + out[1] = (stbi_uc)g; + out[2] = (stbi_uc)b; + out[3] = 255; + out += step; + } +} +#endif + +// set up the kernels +static void stbi__setup_jpeg(stbi__jpeg *j) +{ + j->idct_block_kernel = stbi__idct_block; + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; + +#ifdef STBI_SSE2 + if (stbi__sse2_available()) { + j->idct_block_kernel = stbi__idct_simd; + #ifndef STBI_JPEG_OLD + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + #endif + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; + } +#endif + +#ifdef STBI_NEON + j->idct_block_kernel = stbi__idct_simd; + #ifndef STBI_JPEG_OLD + j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; + #endif + j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; +#endif +} + +// clean up the temporary component buffers +static void stbi__cleanup_jpeg(stbi__jpeg *j) +{ + int i; + for (i=0; i < j->s->img_n; ++i) { + if (j->img_comp[i].raw_data) { + STBI_FREE(j->img_comp[i].raw_data); + j->img_comp[i].raw_data = NULL; + j->img_comp[i].data = NULL; + } + if (j->img_comp[i].raw_coeff) { + STBI_FREE(j->img_comp[i].raw_coeff); + j->img_comp[i].raw_coeff = 0; + j->img_comp[i].coeff = 0; + } + if (j->img_comp[i].linebuf) { + STBI_FREE(j->img_comp[i].linebuf); + j->img_comp[i].linebuf = NULL; + } + } +} + +typedef struct +{ + resample_row_func resample; + stbi_uc *line0,*line1; + int hs,vs; // expansion factor in each axis + int w_lores; // horizontal pixels pre-expansion + int ystep; // how far through vertical expansion we are + int ypos; // which pre-expansion row we're on +} stbi__resample; + +static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) +{ + int n, decode_n; + z->s->img_n = 0; // make stbi__cleanup_jpeg safe + + // validate req_comp + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + + // load a jpeg image from whichever source, but leave in YCbCr format + if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } + + // determine actual number of components to generate + n = req_comp ? req_comp : z->s->img_n; + + if (z->s->img_n == 3 && n < 3) + decode_n = 1; + else + decode_n = z->s->img_n; + + // resample and color-convert + { + int k; + unsigned int i,j; + stbi_uc *output; + stbi_uc *coutput[4]; + + stbi__resample res_comp[4]; + + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + + // allocate line buffer big enough for upsampling off the edges + // with upsample factor of 4 + z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); + if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + r->hs = z->img_h_max / z->img_comp[k].h; + r->vs = z->img_v_max / z->img_comp[k].v; + r->ystep = r->vs >> 1; + r->w_lores = (z->s->img_x + r->hs-1) / r->hs; + r->ypos = 0; + r->line0 = r->line1 = z->img_comp[k].data; + + if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; + else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; + else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; + else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; + else r->resample = stbi__resample_row_generic; + } + + // can't error after this so, this is safe + output = (stbi_uc *) stbi__malloc(n * z->s->img_x * z->s->img_y + 1); + if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } + + // now go ahead and resample + for (j=0; j < z->s->img_y; ++j) { + stbi_uc *out = output + n * z->s->img_x * j; + for (k=0; k < decode_n; ++k) { + stbi__resample *r = &res_comp[k]; + int y_bot = r->ystep >= (r->vs >> 1); + coutput[k] = r->resample(z->img_comp[k].linebuf, + y_bot ? r->line1 : r->line0, + y_bot ? r->line0 : r->line1, + r->w_lores, r->hs); + if (++r->ystep >= r->vs) { + r->ystep = 0; + r->line0 = r->line1; + if (++r->ypos < z->img_comp[k].y) + r->line1 += z->img_comp[k].w2; + } + } + if (n >= 3) { + stbi_uc *y = coutput[0]; + if (z->s->img_n == 3) { + z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); + } else + for (i=0; i < z->s->img_x; ++i) { + out[0] = out[1] = out[2] = y[i]; + out[3] = 255; // not used if n==3 + out += n; + } + } else { + stbi_uc *y = coutput[0]; + if (n == 1) + for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; + else + for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255; + } + } + stbi__cleanup_jpeg(z); + *out_x = z->s->img_x; + *out_y = z->s->img_y; + if (comp) *comp = z->s->img_n; // report original components, not output + return output; + } +} + +static unsigned char *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__jpeg j; + j.s = s; + stbi__setup_jpeg(&j); + return load_jpeg_image(&j, x,y,comp,req_comp); +} + +static int stbi__jpeg_test(stbi__context *s) +{ + int r; + stbi__jpeg j; + j.s = s; + stbi__setup_jpeg(&j); + r = stbi__decode_jpeg_header(&j, STBI__SCAN_type); + stbi__rewind(s); + return r; +} + +static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) +{ + if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { + stbi__rewind( j->s ); + return 0; + } + if (x) *x = j->s->img_x; + if (y) *y = j->s->img_y; + if (comp) *comp = j->s->img_n; + return 1; +} + +static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__jpeg j; + j.s = s; + return stbi__jpeg_info_raw(&j, x, y, comp); +} +#endif + +// public domain zlib decode v0.2 Sean Barrett 2006-11-18 +// simple implementation +// - all input must be provided in an upfront buffer +// - all output is written to a single output buffer (can malloc/realloc) +// performance +// - fast huffman + +#ifndef STBI_NO_ZLIB + +// fast-way is faster to check than jpeg huffman, but slow way is slower +#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables +#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) + +// zlib-style huffman encoding +// (jpegs packs from left, zlib from right, so can't share code) +typedef struct +{ + stbi__uint16 fast[1 << STBI__ZFAST_BITS]; + stbi__uint16 firstcode[16]; + int maxcode[17]; + stbi__uint16 firstsymbol[16]; + stbi_uc size[288]; + stbi__uint16 value[288]; +} stbi__zhuffman; + +stbi_inline static int stbi__bitreverse16(int n) +{ + n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); + n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); + n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); + n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); + return n; +} + +stbi_inline static int stbi__bit_reverse(int v, int bits) +{ + STBI_ASSERT(bits <= 16); + // to bit reverse n bits, reverse 16 and shift + // e.g. 11 bits, bit reverse and shift away 5 + return stbi__bitreverse16(v) >> (16-bits); +} + +static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num) +{ + int i,k=0; + int code, next_code[16], sizes[17]; + + // DEFLATE spec for generating codes + memset(sizes, 0, sizeof(sizes)); + memset(z->fast, 0, sizeof(z->fast)); + for (i=0; i < num; ++i) + ++sizes[sizelist[i]]; + sizes[0] = 0; + for (i=1; i < 16; ++i) + if (sizes[i] > (1 << i)) + return stbi__err("bad sizes", "Corrupt PNG"); + code = 0; + for (i=1; i < 16; ++i) { + next_code[i] = code; + z->firstcode[i] = (stbi__uint16) code; + z->firstsymbol[i] = (stbi__uint16) k; + code = (code + sizes[i]); + if (sizes[i]) + if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); + z->maxcode[i] = code << (16-i); // preshift for inner loop + code <<= 1; + k += sizes[i]; + } + z->maxcode[16] = 0x10000; // sentinel + for (i=0; i < num; ++i) { + int s = sizelist[i]; + if (s) { + int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; + stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); + z->size [c] = (stbi_uc ) s; + z->value[c] = (stbi__uint16) i; + if (s <= STBI__ZFAST_BITS) { + int j = stbi__bit_reverse(next_code[s],s); + while (j < (1 << STBI__ZFAST_BITS)) { + z->fast[j] = fastv; + j += (1 << s); + } + } + ++next_code[s]; + } + } + return 1; +} + +// zlib-from-memory implementation for PNG reading +// because PNG allows splitting the zlib stream arbitrarily, +// and it's annoying structurally to have PNG call ZLIB call PNG, +// we require PNG read all the IDATs and combine them into a single +// memory buffer + +typedef struct +{ + stbi_uc *zbuffer, *zbuffer_end; + int num_bits; + stbi__uint32 code_buffer; + + char *zout; + char *zout_start; + char *zout_end; + int z_expandable; + + stbi__zhuffman z_length, z_distance; +} stbi__zbuf; + +stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) +{ + if (z->zbuffer >= z->zbuffer_end) return 0; + return *z->zbuffer++; +} + +static void stbi__fill_bits(stbi__zbuf *z) +{ + do { + STBI_ASSERT(z->code_buffer < (1U << z->num_bits)); + z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; + z->num_bits += 8; + } while (z->num_bits <= 24); +} + +stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) +{ + unsigned int k; + if (z->num_bits < n) stbi__fill_bits(z); + k = z->code_buffer & ((1 << n) - 1); + z->code_buffer >>= n; + z->num_bits -= n; + return k; +} + +static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s,k; + // not resolved by fast table, so compute it the slow way + // use jpeg approach, which requires MSbits at top + k = stbi__bit_reverse(a->code_buffer, 16); + for (s=STBI__ZFAST_BITS+1; ; ++s) + if (k < z->maxcode[s]) + break; + if (s == 16) return -1; // invalid code! + // code size is s, so: + b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; + STBI_ASSERT(z->size[b] == s); + a->code_buffer >>= s; + a->num_bits -= s; + return z->value[b]; +} + +stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) +{ + int b,s; + if (a->num_bits < 16) stbi__fill_bits(a); + b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; + if (b) { + s = b >> 9; + a->code_buffer >>= s; + a->num_bits -= s; + return b & 511; + } + return stbi__zhuffman_decode_slowpath(a, z); +} + +static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes +{ + char *q; + int cur, limit; + z->zout = zout; + if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); + cur = (int) (z->zout - z->zout_start); + limit = (int) (z->zout_end - z->zout_start); + while (cur + n > limit) + limit *= 2; + q = (char *) STBI_REALLOC(z->zout_start, limit); + if (q == NULL) return stbi__err("outofmem", "Out of memory"); + z->zout_start = q; + z->zout = q + cur; + z->zout_end = q + limit; + return 1; +} + +static int stbi__zlength_base[31] = { + 3,4,5,6,7,8,9,10,11,13, + 15,17,19,23,27,31,35,43,51,59, + 67,83,99,115,131,163,195,227,258,0,0 }; + +static int stbi__zlength_extra[31]= +{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; + +static int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, +257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; + +static int stbi__zdist_extra[32] = +{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; + +static int stbi__parse_huffman_block(stbi__zbuf *a) +{ + char *zout = a->zout; + for(;;) { + int z = stbi__zhuffman_decode(a, &a->z_length); + if (z < 256) { + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes + if (zout >= a->zout_end) { + if (!stbi__zexpand(a, zout, 1)) return 0; + zout = a->zout; + } + *zout++ = (char) z; + } else { + stbi_uc *p; + int len,dist; + if (z == 256) { + a->zout = zout; + return 1; + } + z -= 257; + len = stbi__zlength_base[z]; + if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); + z = stbi__zhuffman_decode(a, &a->z_distance); + if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); + dist = stbi__zdist_base[z]; + if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); + if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); + if (zout + len > a->zout_end) { + if (!stbi__zexpand(a, zout, len)) return 0; + zout = a->zout; + } + p = (stbi_uc *) (zout - dist); + if (dist == 1) { // run of one byte; common in images. + stbi_uc v = *p; + if (len) { do *zout++ = v; while (--len); } + } else { + if (len) { do *zout++ = *p++; while (--len); } + } + } + } +} + +static int stbi__compute_huffman_codes(stbi__zbuf *a) +{ + static stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + stbi__zhuffman z_codelength; + stbi_uc lencodes[286+32+137];//padding for maximum single op + stbi_uc codelength_sizes[19]; + int i,n; + + int hlit = stbi__zreceive(a,5) + 257; + int hdist = stbi__zreceive(a,5) + 1; + int hclen = stbi__zreceive(a,4) + 4; + + memset(codelength_sizes, 0, sizeof(codelength_sizes)); + for (i=0; i < hclen; ++i) { + int s = stbi__zreceive(a,3); + codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; + } + if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; + + n = 0; + while (n < hlit + hdist) { + int c = stbi__zhuffman_decode(a, &z_codelength); + if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); + if (c < 16) + lencodes[n++] = (stbi_uc) c; + else if (c == 16) { + c = stbi__zreceive(a,2)+3; + memset(lencodes+n, lencodes[n-1], c); + n += c; + } else if (c == 17) { + c = stbi__zreceive(a,3)+3; + memset(lencodes+n, 0, c); + n += c; + } else { + STBI_ASSERT(c == 18); + c = stbi__zreceive(a,7)+11; + memset(lencodes+n, 0, c); + n += c; + } + } + if (n != hlit+hdist) return stbi__err("bad codelengths","Corrupt PNG"); + if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; + return 1; +} + +static int stbi__parse_uncomperssed_block(stbi__zbuf *a) +{ + stbi_uc header[4]; + int len,nlen,k; + if (a->num_bits & 7) + stbi__zreceive(a, a->num_bits & 7); // discard + // drain the bit-packed data into header + k = 0; + while (a->num_bits > 0) { + header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check + a->code_buffer >>= 8; + a->num_bits -= 8; + } + STBI_ASSERT(a->num_bits == 0); + // now fill header the normal way + while (k < 4) + header[k++] = stbi__zget8(a); + len = header[1] * 256 + header[0]; + nlen = header[3] * 256 + header[2]; + if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); + if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); + if (a->zout + len > a->zout_end) + if (!stbi__zexpand(a, a->zout, len)) return 0; + memcpy(a->zout, a->zbuffer, len); + a->zbuffer += len; + a->zout += len; + return 1; +} + +static int stbi__parse_zlib_header(stbi__zbuf *a) +{ + int cmf = stbi__zget8(a); + int cm = cmf & 15; + /* int cinfo = cmf >> 4; */ + int flg = stbi__zget8(a); + if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec + if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png + if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png + // window = 1 << (8 + cinfo)... but who cares, we fully buffer output + return 1; +} + +// @TODO: should statically initialize these for optimal thread safety +static stbi_uc stbi__zdefault_length[288], stbi__zdefault_distance[32]; +static void stbi__init_zdefaults(void) +{ + int i; // use <= to match clearly with spec + for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; + for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; + for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; + for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; + + for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; +} + +static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) +{ + int final, type; + if (parse_header) + if (!stbi__parse_zlib_header(a)) return 0; + a->num_bits = 0; + a->code_buffer = 0; + do { + final = stbi__zreceive(a,1); + type = stbi__zreceive(a,2); + if (type == 0) { + if (!stbi__parse_uncomperssed_block(a)) return 0; + } else if (type == 3) { + return 0; + } else { + if (type == 1) { + // use fixed code lengths + if (!stbi__zdefault_distance[31]) stbi__init_zdefaults(); + if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , 288)) return 0; + if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; + } else { + if (!stbi__compute_huffman_codes(a)) return 0; + } + if (!stbi__parse_huffman_block(a)) return 0; + } + } while (!final); + return 1; +} + +static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) +{ + a->zout_start = obuf; + a->zout = obuf; + a->zout_end = obuf + olen; + a->z_expandable = exp; + + return stbi__parse_zlib(a, parse_header); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) +{ + return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); +} + +STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(initial_size); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer + len; + if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) + return (int) (a.zout - a.zout_start); + else + return -1; +} + +STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) +{ + stbi__zbuf a; + char *p = (char *) stbi__malloc(16384); + if (p == NULL) return NULL; + a.zbuffer = (stbi_uc *) buffer; + a.zbuffer_end = (stbi_uc *) buffer+len; + if (stbi__do_zlib(&a, p, 16384, 1, 0)) { + if (outlen) *outlen = (int) (a.zout - a.zout_start); + return a.zout_start; + } else { + STBI_FREE(a.zout_start); + return NULL; + } +} + +STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) +{ + stbi__zbuf a; + a.zbuffer = (stbi_uc *) ibuffer; + a.zbuffer_end = (stbi_uc *) ibuffer + ilen; + if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) + return (int) (a.zout - a.zout_start); + else + return -1; +} +#endif + +// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 +// simple implementation +// - only 8-bit samples +// - no CRC checking +// - allocates lots of intermediate memory +// - avoids problem of streaming data between subsystems +// - avoids explicit window management +// performance +// - uses stb_zlib, a PD zlib implementation with fast huffman decoding + +#ifndef STBI_NO_PNG +typedef struct +{ + stbi__uint32 length; + stbi__uint32 type; +} stbi__pngchunk; + +static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) +{ + stbi__pngchunk c; + c.length = stbi__get32be(s); + c.type = stbi__get32be(s); + return c; +} + +static int stbi__check_png_header(stbi__context *s) +{ + static stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; + int i; + for (i=0; i < 8; ++i) + if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); + return 1; +} + +typedef struct +{ + stbi__context *s; + stbi_uc *idata, *expanded, *out; +} stbi__png; + + +enum { + STBI__F_none=0, + STBI__F_sub=1, + STBI__F_up=2, + STBI__F_avg=3, + STBI__F_paeth=4, + // synthetic filters used for first scanline to avoid needing a dummy row of 0s + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static stbi_uc first_row_filter[5] = +{ + STBI__F_none, + STBI__F_sub, + STBI__F_none, + STBI__F_avg_first, + STBI__F_paeth_first +}; + +static int stbi__paeth(int a, int b, int c) +{ + int p = a + b - c; + int pa = abs(p-a); + int pb = abs(p-b); + int pc = abs(p-c); + if (pa <= pb && pa <= pc) return a; + if (pb <= pc) return b; + return c; +} + +static stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; + +// create the png data from post-deflated data +static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) +{ + stbi__context *s = a->s; + stbi__uint32 i,j,stride = x*out_n; + stbi__uint32 img_len, img_width_bytes; + int k; + int img_n = s->img_n; // copy it into a local for later + + STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); + a->out = (stbi_uc *) stbi__malloc(x * y * out_n); // extra bytes to write off the end into + if (!a->out) return stbi__err("outofmem", "Out of memory"); + + img_width_bytes = (((img_n * x * depth) + 7) >> 3); + img_len = (img_width_bytes + 1) * y; + if (s->img_x == x && s->img_y == y) { + if (raw_len != img_len) return stbi__err("not enough pixels","Corrupt PNG"); + } else { // interlaced: + if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); + } + + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *prior = cur - stride; + int filter = *raw++; + int filter_bytes = img_n; + int width = x; + if (filter > 4) + return stbi__err("invalid filter","Corrupt PNG"); + + if (depth < 8) { + STBI_ASSERT(img_width_bytes <= x); + cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place + filter_bytes = 1; + width = img_width_bytes; + } + + // if first row, use special filter that doesn't sample previous row + if (j == 0) filter = first_row_filter[filter]; + + // handle first byte explicitly + for (k=0; k < filter_bytes; ++k) { + switch (filter) { + case STBI__F_none : cur[k] = raw[k]; break; + case STBI__F_sub : cur[k] = raw[k]; break; + case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; + case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; + case STBI__F_avg_first : cur[k] = raw[k]; break; + case STBI__F_paeth_first: cur[k] = raw[k]; break; + } + } + + if (depth == 8) { + if (img_n != out_n) + cur[img_n] = 255; // first pixel + raw += img_n; + cur += out_n; + prior += out_n; + } else { + raw += 1; + cur += 1; + prior += 1; + } + + // this is a little gross, so that we don't switch per-pixel or per-component + if (depth < 8 || img_n == out_n) { + int nk = (width - 1)*img_n; + #define CASE(f) \ + case f: \ + for (k=0; k < nk; ++k) + switch (filter) { + // "none" filter turns into a memcpy here; make that explicit. + case STBI__F_none: memcpy(cur, raw, nk); break; + CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); break; + CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); break; + CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); break; + CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); break; + CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); break; + } + #undef CASE + raw += nk; + } else { + STBI_ASSERT(img_n+1 == out_n); + #define CASE(f) \ + case f: \ + for (i=x-1; i >= 1; --i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \ + for (k=0; k < img_n; ++k) + switch (filter) { + CASE(STBI__F_none) cur[k] = raw[k]; break; + CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-out_n]); break; + CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; + CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-out_n])>>1)); break; + CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],prior[k],prior[k-out_n])); break; + CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-out_n] >> 1)); break; + CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],0,0)); break; + } + #undef CASE + } + } + + // we make a separate pass to expand bits to pixels; for performance, + // this could run two scanlines behind the above code, so it won't + // interfere with filtering but will still be in the cache. + if (depth < 8) { + for (j=0; j < y; ++j) { + stbi_uc *cur = a->out + stride*j; + stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; + // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit + // png guarantee byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop + stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range + + // note that the final byte might overshoot and write more data than desired. + // we can allocate enough data that this never writes out of memory, but it + // could also overwrite the next scanline. can it overwrite non-empty data + // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. + // so we need to explicitly clamp the final ones + + if (depth == 4) { + for (k=x*img_n; k >= 2; k-=2, ++in) { + *cur++ = scale * ((*in >> 4) ); + *cur++ = scale * ((*in ) & 0x0f); + } + if (k > 0) *cur++ = scale * ((*in >> 4) ); + } else if (depth == 2) { + for (k=x*img_n; k >= 4; k-=4, ++in) { + *cur++ = scale * ((*in >> 6) ); + *cur++ = scale * ((*in >> 4) & 0x03); + *cur++ = scale * ((*in >> 2) & 0x03); + *cur++ = scale * ((*in ) & 0x03); + } + if (k > 0) *cur++ = scale * ((*in >> 6) ); + if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); + if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); + } else if (depth == 1) { + for (k=x*img_n; k >= 8; k-=8, ++in) { + *cur++ = scale * ((*in >> 7) ); + *cur++ = scale * ((*in >> 6) & 0x01); + *cur++ = scale * ((*in >> 5) & 0x01); + *cur++ = scale * ((*in >> 4) & 0x01); + *cur++ = scale * ((*in >> 3) & 0x01); + *cur++ = scale * ((*in >> 2) & 0x01); + *cur++ = scale * ((*in >> 1) & 0x01); + *cur++ = scale * ((*in ) & 0x01); + } + if (k > 0) *cur++ = scale * ((*in >> 7) ); + if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); + if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); + if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); + if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); + if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); + if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); + } + if (img_n != out_n) { + int q; + // insert alpha = 255 + cur = a->out + stride*j; + if (img_n == 1) { + for (q=x-1; q >= 0; --q) { + cur[q*2+1] = 255; + cur[q*2+0] = cur[q]; + } + } else { + STBI_ASSERT(img_n == 3); + for (q=x-1; q >= 0; --q) { + cur[q*4+3] = 255; + cur[q*4+2] = cur[q*3+2]; + cur[q*4+1] = cur[q*3+1]; + cur[q*4+0] = cur[q*3+0]; + } + } + } + } + } + + return 1; +} + +static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) +{ + stbi_uc *final; + int p; + if (!interlaced) + return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); + + // de-interlacing + final = (stbi_uc *) stbi__malloc(a->s->img_x * a->s->img_y * out_n); + for (p=0; p < 7; ++p) { + int xorig[] = { 0,4,0,2,0,1,0 }; + int yorig[] = { 0,0,4,0,2,0,1 }; + int xspc[] = { 8,8,4,4,2,2,1 }; + int yspc[] = { 8,8,8,4,4,2,2 }; + int i,j,x,y; + // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 + x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; + y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; + if (x && y) { + stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; + if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { + STBI_FREE(final); + return 0; + } + for (j=0; j < y; ++j) { + for (i=0; i < x; ++i) { + int out_y = j*yspc[p]+yorig[p]; + int out_x = i*xspc[p]+xorig[p]; + memcpy(final + out_y*a->s->img_x*out_n + out_x*out_n, + a->out + (j*x+i)*out_n, out_n); + } + } + STBI_FREE(a->out); + image_data += img_len; + image_data_len -= img_len; + } + } + a->out = final; + + return 1; +} + +static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + // compute color-based transparency, assuming we've + // already got 255 as the alpha value in the output + STBI_ASSERT(out_n == 2 || out_n == 4); + + if (out_n == 2) { + for (i=0; i < pixel_count; ++i) { + p[1] = (p[0] == tc[0] ? 0 : 255); + p += 2; + } + } else { + for (i=0; i < pixel_count; ++i) { + if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) + p[3] = 0; + p += 4; + } + } + return 1; +} + +static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) +{ + stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; + stbi_uc *p, *temp_out, *orig = a->out; + + p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n); + if (p == NULL) return stbi__err("outofmem", "Out of memory"); + + // between here and free(out) below, exiting would leak + temp_out = p; + + if (pal_img_n == 3) { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p += 3; + } + } else { + for (i=0; i < pixel_count; ++i) { + int n = orig[i]*4; + p[0] = palette[n ]; + p[1] = palette[n+1]; + p[2] = palette[n+2]; + p[3] = palette[n+3]; + p += 4; + } + } + STBI_FREE(a->out); + a->out = temp_out; + + STBI_NOTUSED(len); + + return 1; +} + +static int stbi__unpremultiply_on_load = 0; +static int stbi__de_iphone_flag = 0; + +STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) +{ + stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply; +} + +STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) +{ + stbi__de_iphone_flag = flag_true_if_should_convert; +} + +static void stbi__de_iphone(stbi__png *z) +{ + stbi__context *s = z->s; + stbi__uint32 i, pixel_count = s->img_x * s->img_y; + stbi_uc *p = z->out; + + if (s->img_out_n == 3) { // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 3; + } + } else { + STBI_ASSERT(s->img_out_n == 4); + if (stbi__unpremultiply_on_load) { + // convert bgr to rgb and unpremultiply + for (i=0; i < pixel_count; ++i) { + stbi_uc a = p[3]; + stbi_uc t = p[0]; + if (a) { + p[0] = p[2] * 255 / a; + p[1] = p[1] * 255 / a; + p[2] = t * 255 / a; + } else { + p[0] = p[2]; + p[2] = t; + } + p += 4; + } + } else { + // convert bgr to rgb + for (i=0; i < pixel_count; ++i) { + stbi_uc t = p[0]; + p[0] = p[2]; + p[2] = t; + p += 4; + } + } + } +} + +#define STBI__PNG_TYPE(a,b,c,d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d)) + +static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) +{ + stbi_uc palette[1024], pal_img_n=0; + stbi_uc has_trans=0, tc[3]; + stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; + int first=1,k,interlace=0, color=0, depth=0, is_iphone=0; + stbi__context *s = z->s; + + z->expanded = NULL; + z->idata = NULL; + z->out = NULL; + + if (!stbi__check_png_header(s)) return 0; + + if (scan == STBI__SCAN_type) return 1; + + for (;;) { + stbi__pngchunk c = stbi__get_chunk_header(s); + switch (c.type) { + case STBI__PNG_TYPE('C','g','B','I'): + is_iphone = 1; + stbi__skip(s, c.length); + break; + case STBI__PNG_TYPE('I','H','D','R'): { + int comp,filter; + if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); + first = 0; + if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); + s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); + s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); + depth = stbi__get8(s); if (depth != 1 && depth != 2 && depth != 4 && depth != 8) return stbi__err("1/2/4/8-bit only","PNG not supported: 1/2/4/8-bit only"); + color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); + if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); + comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); + filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); + interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); + if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); + if (!pal_img_n) { + s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); + if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); + if (scan == STBI__SCAN_header) return 1; + } else { + // if paletted, then pal_n is our final components, and + // img_n is # components to decompress/filter. + s->img_n = 1; + if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); + // if SCAN_header, have to scan to see if we have a tRNS + } + break; + } + + case STBI__PNG_TYPE('P','L','T','E'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); + pal_len = c.length / 3; + if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); + for (i=0; i < pal_len; ++i) { + palette[i*4+0] = stbi__get8(s); + palette[i*4+1] = stbi__get8(s); + palette[i*4+2] = stbi__get8(s); + palette[i*4+3] = 255; + } + break; + } + + case STBI__PNG_TYPE('t','R','N','S'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); + if (pal_img_n) { + if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } + if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); + if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); + pal_img_n = 4; + for (i=0; i < c.length; ++i) + palette[i*4+3] = stbi__get8(s); + } else { + if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); + if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); + has_trans = 1; + for (k=0; k < s->img_n; ++k) + tc[k] = (stbi_uc) (stbi__get16be(s) & 255) * stbi__depth_scale_table[depth]; // non 8-bit images will be larger + } + break; + } + + case STBI__PNG_TYPE('I','D','A','T'): { + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); + if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } + if ((int)(ioff + c.length) < (int)ioff) return 0; + if (ioff + c.length > idata_limit) { + stbi_uc *p; + if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; + while (ioff + c.length > idata_limit) + idata_limit *= 2; + p = (stbi_uc *) STBI_REALLOC(z->idata, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); + z->idata = p; + } + if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); + ioff += c.length; + break; + } + + case STBI__PNG_TYPE('I','E','N','D'): { + stbi__uint32 raw_len, bpl; + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if (scan != STBI__SCAN_load) return 1; + if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); + // initial guess for decoded data size to avoid unnecessary reallocs + bpl = (s->img_x * depth + 7) / 8; // bytes per line, per component + raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; + z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); + if (z->expanded == NULL) return 0; // zlib should set error + STBI_FREE(z->idata); z->idata = NULL; + if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) + s->img_out_n = s->img_n+1; + else + s->img_out_n = s->img_n; + if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, depth, color, interlace)) return 0; + if (has_trans) + if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; + if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) + stbi__de_iphone(z); + if (pal_img_n) { + // pal_img_n == 3 or 4 + s->img_n = pal_img_n; // record the actual colors we had + s->img_out_n = pal_img_n; + if (req_comp >= 3) s->img_out_n = req_comp; + if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) + return 0; + } + STBI_FREE(z->expanded); z->expanded = NULL; + return 1; + } + + default: + // if critical, fail + if (first) return stbi__err("first not IHDR", "Corrupt PNG"); + if ((c.type & (1 << 29)) == 0) { + #ifndef STBI_NO_FAILURE_STRINGS + // not threadsafe + static char invalid_chunk[] = "XXXX PNG chunk not known"; + invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); + invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); + invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); + invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); + #endif + return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); + } + stbi__skip(s, c.length); + break; + } + // end of PNG chunk, read and skip CRC + stbi__get32be(s); + } +} + +static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp) +{ + unsigned char *result=NULL; + if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); + if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { + result = p->out; + p->out = NULL; + if (req_comp && req_comp != p->s->img_out_n) { + result = stbi__convert_format(result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); + p->s->img_out_n = req_comp; + if (result == NULL) return result; + } + *x = p->s->img_x; + *y = p->s->img_y; + if (n) *n = p->s->img_out_n; + } + STBI_FREE(p->out); p->out = NULL; + STBI_FREE(p->expanded); p->expanded = NULL; + STBI_FREE(p->idata); p->idata = NULL; + + return result; +} + +static unsigned char *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi__png p; + p.s = s; + return stbi__do_png(&p, x,y,comp,req_comp); +} + +static int stbi__png_test(stbi__context *s) +{ + int r; + r = stbi__check_png_header(s); + stbi__rewind(s); + return r; +} + +static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) +{ + if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { + stbi__rewind( p->s ); + return 0; + } + if (x) *x = p->s->img_x; + if (y) *y = p->s->img_y; + if (comp) *comp = p->s->img_n; + return 1; +} + +static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__png p; + p.s = s; + return stbi__png_info_raw(&p, x, y, comp); +} +#endif + +// Microsoft/Windows BMP image + +#ifndef STBI_NO_BMP +static int stbi__bmp_test_raw(stbi__context *s) +{ + int r; + int sz; + if (stbi__get8(s) != 'B') return 0; + if (stbi__get8(s) != 'M') return 0; + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + stbi__get32le(s); // discard data offset + sz = stbi__get32le(s); + r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); + return r; +} + +static int stbi__bmp_test(stbi__context *s) +{ + int r = stbi__bmp_test_raw(s); + stbi__rewind(s); + return r; +} + + +// returns 0..31 for the highest set bit +static int stbi__high_bit(unsigned int z) +{ + int n=0; + if (z == 0) return -1; + if (z >= 0x10000) n += 16, z >>= 16; + if (z >= 0x00100) n += 8, z >>= 8; + if (z >= 0x00010) n += 4, z >>= 4; + if (z >= 0x00004) n += 2, z >>= 2; + if (z >= 0x00002) n += 1, z >>= 1; + return n; +} + +static int stbi__bitcount(unsigned int a) +{ + a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 + a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 + a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits + a = (a + (a >> 8)); // max 16 per 8 bits + a = (a + (a >> 16)); // max 32 per 8 bits + return a & 0xff; +} + +static int stbi__shiftsigned(int v, int shift, int bits) +{ + int result; + int z=0; + + if (shift < 0) v <<= -shift; + else v >>= shift; + result = v; + + z = bits; + while (z < 8) { + result += v >> z; + z += bits; + } + return result; +} + +static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *out; + unsigned int mr=0,mg=0,mb=0,ma=0, all_a=255; + stbi_uc pal[256][4]; + int psize=0,i,j,compress=0,width; + int bpp, flip_vertically, pad, target, offset, hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); + stbi__get32le(s); // discard filesize + stbi__get16le(s); // discard reserved + stbi__get16le(s); // discard reserved + offset = stbi__get32le(s); + hsz = stbi__get32le(s); + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); + if (hsz == 12) { + s->img_x = stbi__get16le(s); + s->img_y = stbi__get16le(s); + } else { + s->img_x = stbi__get32le(s); + s->img_y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); + bpp = stbi__get16le(s); + if (bpp == 1) return stbi__errpuc("monochrome", "BMP type not supported: 1-bit"); + flip_vertically = ((int) s->img_y) > 0; + s->img_y = abs((int) s->img_y); + if (hsz == 12) { + if (bpp < 24) + psize = (offset - 14 - 24) / 3; + } else { + compress = stbi__get32le(s); + if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); + stbi__get32le(s); // discard sizeof + stbi__get32le(s); // discard hres + stbi__get32le(s); // discard vres + stbi__get32le(s); // discard colorsused + stbi__get32le(s); // discard max important + if (hsz == 40 || hsz == 56) { + if (hsz == 56) { + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + stbi__get32le(s); + } + if (bpp == 16 || bpp == 32) { + mr = mg = mb = 0; + if (compress == 0) { + if (bpp == 32) { + mr = 0xffu << 16; + mg = 0xffu << 8; + mb = 0xffu << 0; + ma = 0xffu << 24; + all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 + } else { + mr = 31u << 10; + mg = 31u << 5; + mb = 31u << 0; + } + } else if (compress == 3) { + mr = stbi__get32le(s); + mg = stbi__get32le(s); + mb = stbi__get32le(s); + // not documented, but generated by photoshop and handled by mspaint + if (mr == mg && mg == mb) { + // ?!?!? + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else + return stbi__errpuc("bad BMP", "bad BMP"); + } + } else { + STBI_ASSERT(hsz == 108 || hsz == 124); + mr = stbi__get32le(s); + mg = stbi__get32le(s); + mb = stbi__get32le(s); + ma = stbi__get32le(s); + stbi__get32le(s); // discard color space + for (i=0; i < 12; ++i) + stbi__get32le(s); // discard color space parameters + if (hsz == 124) { + stbi__get32le(s); // discard rendering intent + stbi__get32le(s); // discard offset of profile data + stbi__get32le(s); // discard size of profile data + stbi__get32le(s); // discard reserved + } + } + if (bpp < 16) + psize = (offset - 14 - hsz) >> 2; + } + s->img_n = ma ? 4 : 3; + if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 + target = req_comp; + else + target = s->img_n; // if they want monochrome, we'll post-convert + out = (stbi_uc *) stbi__malloc(target * s->img_x * s->img_y); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + if (bpp < 16) { + int z=0; + if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } + for (i=0; i < psize; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + if (hsz != 12) stbi__get8(s); + pal[i][3] = 255; + } + stbi__skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4)); + if (bpp == 4) width = (s->img_x + 1) >> 1; + else if (bpp == 8) width = s->img_x; + else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } + pad = (-width)&3; + for (j=0; j < (int) s->img_y; ++j) { + for (i=0; i < (int) s->img_x; i += 2) { + int v=stbi__get8(s),v2=0; + if (bpp == 4) { + v2 = v & 15; + v >>= 4; + } + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + if (i+1 == (int) s->img_x) break; + v = (bpp == 8) ? stbi__get8(s) : v2; + out[z++] = pal[v][0]; + out[z++] = pal[v][1]; + out[z++] = pal[v][2]; + if (target == 4) out[z++] = 255; + } + stbi__skip(s, pad); + } + } else { + int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; + int z = 0; + int easy=0; + stbi__skip(s, offset - 14 - hsz); + if (bpp == 24) width = 3 * s->img_x; + else if (bpp == 16) width = 2*s->img_x; + else /* bpp = 32 and pad = 0 */ width=0; + pad = (-width) & 3; + if (bpp == 24) { + easy = 1; + } else if (bpp == 32) { + if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) + easy = 2; + } + if (!easy) { + if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } + // right shift amt to put high bit in position #7 + rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); + gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); + bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); + ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); + } + for (j=0; j < (int) s->img_y; ++j) { + if (easy) { + for (i=0; i < (int) s->img_x; ++i) { + unsigned char a; + out[z+2] = stbi__get8(s); + out[z+1] = stbi__get8(s); + out[z+0] = stbi__get8(s); + z += 3; + a = (easy == 2 ? stbi__get8(s) : 255); + all_a |= a; + if (target == 4) out[z++] = a; + } + } else { + for (i=0; i < (int) s->img_x; ++i) { + stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); + int a; + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); + out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); + a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); + all_a |= a; + if (target == 4) out[z++] = STBI__BYTECAST(a); + } + } + stbi__skip(s, pad); + } + } + + // if alpha channel is all 0s, replace with all 255s + if (target == 4 && all_a == 0) + for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) + out[i] = 255; + + if (flip_vertically) { + stbi_uc t; + for (j=0; j < (int) s->img_y>>1; ++j) { + stbi_uc *p1 = out + j *s->img_x*target; + stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; + for (i=0; i < (int) s->img_x*target; ++i) { + t = p1[i], p1[i] = p2[i], p2[i] = t; + } + } + } + + if (req_comp && req_comp != target) { + out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + *x = s->img_x; + *y = s->img_y; + if (comp) *comp = s->img_n; + return out; +} +#endif + +// Targa Truevision - TGA +// by Jonathan Dummer +#ifndef STBI_NO_TGA +static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) +{ + int tga_w, tga_h, tga_comp; + int sz; + stbi__get8(s); // discard Offset + sz = stbi__get8(s); // color type + if( sz > 1 ) { + stbi__rewind(s); + return 0; // only RGB or indexed allowed + } + sz = stbi__get8(s); // image type + // only RGB or grey allowed, +/- RLE + if ((sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11)) return 0; + stbi__skip(s,9); + tga_w = stbi__get16le(s); + if( tga_w < 1 ) { + stbi__rewind(s); + return 0; // test width + } + tga_h = stbi__get16le(s); + if( tga_h < 1 ) { + stbi__rewind(s); + return 0; // test height + } + sz = stbi__get8(s); // bits per pixel + // only RGB or RGBA or grey allowed + if ((sz != 8) && (sz != 16) && (sz != 24) && (sz != 32)) { + stbi__rewind(s); + return 0; + } + tga_comp = sz; + if (x) *x = tga_w; + if (y) *y = tga_h; + if (comp) *comp = tga_comp / 8; + return 1; // seems to have passed everything +} + +static int stbi__tga_test(stbi__context *s) +{ + int res; + int sz; + stbi__get8(s); // discard Offset + sz = stbi__get8(s); // color type + if ( sz > 1 ) return 0; // only RGB or indexed allowed + sz = stbi__get8(s); // image type + if ( (sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11) ) return 0; // only RGB or grey allowed, +/- RLE + stbi__get16be(s); // discard palette start + stbi__get16be(s); // discard palette length + stbi__get8(s); // discard bits per palette color entry + stbi__get16be(s); // discard x origin + stbi__get16be(s); // discard y origin + if ( stbi__get16be(s) < 1 ) return 0; // test width + if ( stbi__get16be(s) < 1 ) return 0; // test height + sz = stbi__get8(s); // bits per pixel + if ( (sz != 8) && (sz != 16) && (sz != 24) && (sz != 32) ) + res = 0; + else + res = 1; + stbi__rewind(s); + return res; +} + +static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + // read in the TGA header stuff + int tga_offset = stbi__get8(s); + int tga_indexed = stbi__get8(s); + int tga_image_type = stbi__get8(s); + int tga_is_RLE = 0; + int tga_palette_start = stbi__get16le(s); + int tga_palette_len = stbi__get16le(s); + int tga_palette_bits = stbi__get8(s); + int tga_x_origin = stbi__get16le(s); + int tga_y_origin = stbi__get16le(s); + int tga_width = stbi__get16le(s); + int tga_height = stbi__get16le(s); + int tga_bits_per_pixel = stbi__get8(s); + int tga_comp = tga_bits_per_pixel / 8; + int tga_inverted = stbi__get8(s); + // image data + unsigned char *tga_data; + unsigned char *tga_palette = NULL; + int i, j; + unsigned char raw_data[4]; + int RLE_count = 0; + int RLE_repeating = 0; + int read_next_pixel = 1; + + // do a tiny bit of processing + if ( tga_image_type >= 8 ) + { + tga_image_type -= 8; + tga_is_RLE = 1; + } + /* int tga_alpha_bits = tga_inverted & 15; */ + tga_inverted = 1 - ((tga_inverted >> 5) & 1); + + // error check + if ( //(tga_indexed) || + (tga_width < 1) || (tga_height < 1) || + (tga_image_type < 1) || (tga_image_type > 3) || + ((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16) && + (tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32)) + ) + { + return NULL; // we don't report this as a bad TGA because we don't even know if it's TGA + } + + // If I'm paletted, then I'll use the number of bits from the palette + if ( tga_indexed ) + { + tga_comp = tga_palette_bits / 8; + } + + // tga info + *x = tga_width; + *y = tga_height; + if (comp) *comp = tga_comp; + + tga_data = (unsigned char*)stbi__malloc( (size_t)tga_width * tga_height * tga_comp ); + if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); + + // skip to the data's starting position (offset usually = 0) + stbi__skip(s, tga_offset ); + + if ( !tga_indexed && !tga_is_RLE) { + for (i=0; i < tga_height; ++i) { + int row = tga_inverted ? tga_height -i - 1 : i; + stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; + stbi__getn(s, tga_row, tga_width * tga_comp); + } + } else { + // do I need to load a palette? + if ( tga_indexed) + { + // any data to skip? (offset usually = 0) + stbi__skip(s, tga_palette_start ); + // load the palette + tga_palette = (unsigned char*)stbi__malloc( tga_palette_len * tga_palette_bits / 8 ); + if (!tga_palette) { + STBI_FREE(tga_data); + return stbi__errpuc("outofmem", "Out of memory"); + } + if (!stbi__getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 )) { + STBI_FREE(tga_data); + STBI_FREE(tga_palette); + return stbi__errpuc("bad palette", "Corrupt TGA"); + } + } + // load the data + for (i=0; i < tga_width * tga_height; ++i) + { + // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? + if ( tga_is_RLE ) + { + if ( RLE_count == 0 ) + { + // yep, get the next byte as a RLE command + int RLE_cmd = stbi__get8(s); + RLE_count = 1 + (RLE_cmd & 127); + RLE_repeating = RLE_cmd >> 7; + read_next_pixel = 1; + } else if ( !RLE_repeating ) + { + read_next_pixel = 1; + } + } else + { + read_next_pixel = 1; + } + // OK, if I need to read a pixel, do it now + if ( read_next_pixel ) + { + // load however much data we did have + if ( tga_indexed ) + { + // read in 1 byte, then perform the lookup + int pal_idx = stbi__get8(s); + if ( pal_idx >= tga_palette_len ) + { + // invalid index + pal_idx = 0; + } + pal_idx *= tga_bits_per_pixel / 8; + for (j = 0; j*8 < tga_bits_per_pixel; ++j) + { + raw_data[j] = tga_palette[pal_idx+j]; + } + } else + { + // read in the data raw + for (j = 0; j*8 < tga_bits_per_pixel; ++j) + { + raw_data[j] = stbi__get8(s); + } + } + // clear the reading flag for the next pixel + read_next_pixel = 0; + } // end of reading a pixel + + // copy data + for (j = 0; j < tga_comp; ++j) + tga_data[i*tga_comp+j] = raw_data[j]; + + // in case we're in RLE mode, keep counting down + --RLE_count; + } + // do I need to invert the image? + if ( tga_inverted ) + { + for (j = 0; j*2 < tga_height; ++j) + { + int index1 = j * tga_width * tga_comp; + int index2 = (tga_height - 1 - j) * tga_width * tga_comp; + for (i = tga_width * tga_comp; i > 0; --i) + { + unsigned char temp = tga_data[index1]; + tga_data[index1] = tga_data[index2]; + tga_data[index2] = temp; + ++index1; + ++index2; + } + } + } + // clear my palette, if I had one + if ( tga_palette != NULL ) + { + STBI_FREE( tga_palette ); + } + } + + // swap RGB + if (tga_comp >= 3) + { + unsigned char* tga_pixel = tga_data; + for (i=0; i < tga_width * tga_height; ++i) + { + unsigned char temp = tga_pixel[0]; + tga_pixel[0] = tga_pixel[2]; + tga_pixel[2] = temp; + tga_pixel += tga_comp; + } + } + + // convert to target component count + if (req_comp && req_comp != tga_comp) + tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); + + // the things I do to get rid of an error message, and yet keep + // Microsoft's C compilers happy... [8^( + tga_palette_start = tga_palette_len = tga_palette_bits = + tga_x_origin = tga_y_origin = 0; + // OK, done + return tga_data; +} +#endif + +// ************************************************************************************************* +// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB + +#ifndef STBI_NO_PSD +static int stbi__psd_test(stbi__context *s) +{ + int r = (stbi__get32be(s) == 0x38425053); + stbi__rewind(s); + return r; +} + +static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + int pixelCount; + int channelCount, compression; + int channel, i, count, len; + int bitdepth; + int w,h; + stbi_uc *out; + + // Check identifier + if (stbi__get32be(s) != 0x38425053) // "8BPS" + return stbi__errpuc("not PSD", "Corrupt PSD image"); + + // Check file type version. + if (stbi__get16be(s) != 1) + return stbi__errpuc("wrong version", "Unsupported version of PSD image"); + + // Skip 6 reserved bytes. + stbi__skip(s, 6 ); + + // Read the number of channels (R, G, B, A, etc). + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) + return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); + + // Read the rows and columns of the image. + h = stbi__get32be(s); + w = stbi__get32be(s); + + // Make sure the depth is 8 bits. + bitdepth = stbi__get16be(s); + if (bitdepth != 8 && bitdepth != 16) + return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); + + // Make sure the color mode is RGB. + // Valid options are: + // 0: Bitmap + // 1: Grayscale + // 2: Indexed color + // 3: RGB color + // 4: CMYK color + // 7: Multichannel + // 8: Duotone + // 9: Lab color + if (stbi__get16be(s) != 3) + return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); + + // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) + stbi__skip(s,stbi__get32be(s) ); + + // Skip the image resources. (resolution, pen tool paths, etc) + stbi__skip(s, stbi__get32be(s) ); + + // Skip the reserved data. + stbi__skip(s, stbi__get32be(s) ); + + // Find out if the data is compressed. + // Known values: + // 0: no compression + // 1: RLE compressed + compression = stbi__get16be(s); + if (compression > 1) + return stbi__errpuc("bad compression", "PSD has an unknown compression format"); + + // Create the destination image. + out = (stbi_uc *) stbi__malloc(4 * w*h); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + pixelCount = w*h; + + // Initialize the data to zero. + //memset( out, 0, pixelCount * 4 ); + + // Finally, the image data. + if (compression) { + // RLE as used by .PSD and .TIFF + // Loop until you get the number of unpacked bytes you are expecting: + // Read the next source byte into n. + // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. + // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. + // Else if n is 128, noop. + // Endloop + + // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, + // which we're going to just skip. + stbi__skip(s, h * channelCount * 2 ); + + // Read the RLE data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out+channel; + if (channel >= channelCount) { + // Fill this channel with default data. + for (i = 0; i < pixelCount; i++, p += 4) + *p = (channel == 3 ? 255 : 0); + } else { + // Read the RLE data. + count = 0; + while (count < pixelCount) { + len = stbi__get8(s); + if (len == 128) { + // No-op. + } else if (len < 128) { + // Copy next len+1 bytes literally. + len++; + count += len; + while (len) { + *p = stbi__get8(s); + p += 4; + len--; + } + } else if (len > 128) { + stbi_uc val; + // Next -len+1 bytes in the dest are replicated from next source byte. + // (Interpret len as a negative 8-bit int.) + len ^= 0x0FF; + len += 2; + val = stbi__get8(s); + count += len; + while (len) { + *p = val; + p += 4; + len--; + } + } + } + } + } + + } else { + // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) + // where each channel consists of an 8-bit value for each pixel in the image. + + // Read the data by channel. + for (channel = 0; channel < 4; channel++) { + stbi_uc *p; + + p = out + channel; + if (channel >= channelCount) { + // Fill this channel with default data. + stbi_uc val = channel == 3 ? 255 : 0; + for (i = 0; i < pixelCount; i++, p += 4) + *p = val; + } else { + // Read the data. + if (bitdepth == 16) { + for (i = 0; i < pixelCount; i++, p += 4) + *p = (stbi_uc) (stbi__get16be(s) >> 8); + } else { + for (i = 0; i < pixelCount; i++, p += 4) + *p = stbi__get8(s); + } + } + } + } + + if (req_comp && req_comp != 4) { + out = stbi__convert_format(out, 4, req_comp, w, h); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + + if (comp) *comp = 4; + *y = h; + *x = w; + + return out; +} +#endif + +// ************************************************************************************************* +// Softimage PIC loader +// by Tom Seddon +// +// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format +// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ + +#ifndef STBI_NO_PIC +static int stbi__pic_is4(stbi__context *s,const char *str) +{ + int i; + for (i=0; i<4; ++i) + if (stbi__get8(s) != (stbi_uc)str[i]) + return 0; + + return 1; +} + +static int stbi__pic_test_core(stbi__context *s) +{ + int i; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) + return 0; + + for(i=0;i<84;++i) + stbi__get8(s); + + if (!stbi__pic_is4(s,"PICT")) + return 0; + + return 1; +} + +typedef struct +{ + stbi_uc size,type,channel; +} stbi__pic_packet; + +static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) +{ + int mask=0x80, i; + + for (i=0; i<4; ++i, mask>>=1) { + if (channel & mask) { + if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); + dest[i]=stbi__get8(s); + } + } + + return dest; +} + +static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) +{ + int mask=0x80,i; + + for (i=0;i<4; ++i, mask>>=1) + if (channel&mask) + dest[i]=src[i]; +} + +static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) +{ + int act_comp=0,num_packets=0,y,chained; + stbi__pic_packet packets[10]; + + // this will (should...) cater for even some bizarre stuff like having data + // for the same channel in multiple packets. + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return stbi__errpuc("bad format","too many packets"); + + packet = &packets[num_packets++]; + + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + + act_comp |= packet->channel; + + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); + if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? + + for(y=0; ytype) { + default: + return stbi__errpuc("bad format","packet has bad compression type"); + + case 0: {//uncompressed + int x; + + for(x=0;xchannel,dest)) + return 0; + break; + } + + case 1://Pure RLE + { + int left=width, i; + + while (left>0) { + stbi_uc count,value[4]; + + count=stbi__get8(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); + + if (count > left) + count = (stbi_uc) left; + + if (!stbi__readval(s,packet->channel,value)) return 0; + + for(i=0; ichannel,dest,value); + left -= count; + } + } + break; + + case 2: {//Mixed RLE + int left=width; + while (left>0) { + int count = stbi__get8(s), i; + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); + + if (count >= 128) { // Repeated + stbi_uc value[4]; + + if (count==128) + count = stbi__get16be(s); + else + count -= 127; + if (count > left) + return stbi__errpuc("bad file","scanline overrun"); + + if (!stbi__readval(s,packet->channel,value)) + return 0; + + for(i=0;ichannel,dest,value); + } else { // Raw + ++count; + if (count>left) return stbi__errpuc("bad file","scanline overrun"); + + for(i=0;ichannel,dest)) + return 0; + } + left-=count; + } + break; + } + } + } + } + + return result; +} + +static stbi_uc *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp) +{ + stbi_uc *result; + int i, x,y; + + for (i=0; i<92; ++i) + stbi__get8(s); + + x = stbi__get16be(s); + y = stbi__get16be(s); + if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); + if ((1 << 28) / x < y) return stbi__errpuc("too large", "Image too large to decode"); + + stbi__get32be(s); //skip `ratio' + stbi__get16be(s); //skip `fields' + stbi__get16be(s); //skip `pad' + + // intermediate buffer is RGBA + result = (stbi_uc *) stbi__malloc(x*y*4); + memset(result, 0xff, x*y*4); + + if (!stbi__pic_load_core(s,x,y,comp, result)) { + STBI_FREE(result); + result=0; + } + *px = x; + *py = y; + if (req_comp == 0) req_comp = *comp; + result=stbi__convert_format(result,4,req_comp,x,y); + + return result; +} + +static int stbi__pic_test(stbi__context *s) +{ + int r = stbi__pic_test_core(s); + stbi__rewind(s); + return r; +} +#endif + +// ************************************************************************************************* +// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb + +#ifndef STBI_NO_GIF +typedef struct +{ + stbi__int16 prefix; + stbi_uc first; + stbi_uc suffix; +} stbi__gif_lzw; + +typedef struct +{ + int w,h; + stbi_uc *out, *old_out; // output buffer (always 4 components) + int flags, bgindex, ratio, transparent, eflags, delay; + stbi_uc pal[256][4]; + stbi_uc lpal[256][4]; + stbi__gif_lzw codes[4096]; + stbi_uc *color_table; + int parse, step; + int lflags; + int start_x, start_y; + int max_x, max_y; + int cur_x, cur_y; + int line_size; +} stbi__gif; + +static int stbi__gif_test_raw(stbi__context *s) +{ + int sz; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; + sz = stbi__get8(s); + if (sz != '9' && sz != '7') return 0; + if (stbi__get8(s) != 'a') return 0; + return 1; +} + +static int stbi__gif_test(stbi__context *s) +{ + int r = stbi__gif_test_raw(s); + stbi__rewind(s); + return r; +} + +static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) +{ + int i; + for (i=0; i < num_entries; ++i) { + pal[i][2] = stbi__get8(s); + pal[i][1] = stbi__get8(s); + pal[i][0] = stbi__get8(s); + pal[i][3] = transp == i ? 0 : 255; + } +} + +static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) +{ + stbi_uc version; + if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') + return stbi__err("not GIF", "Corrupt GIF"); + + version = stbi__get8(s); + if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); + if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); + + stbi__g_failure_reason = ""; + g->w = stbi__get16le(s); + g->h = stbi__get16le(s); + g->flags = stbi__get8(s); + g->bgindex = stbi__get8(s); + g->ratio = stbi__get8(s); + g->transparent = -1; + + if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments + + if (is_info) return 1; + + if (g->flags & 0x80) + stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); + + return 1; +} + +static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) +{ + stbi__gif g; + if (!stbi__gif_header(s, &g, comp, 1)) { + stbi__rewind( s ); + return 0; + } + if (x) *x = g.w; + if (y) *y = g.h; + return 1; +} + +static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) +{ + stbi_uc *p, *c; + + // recurse to decode the prefixes, since the linked-list is backwards, + // and working backwards through an interleaved image would be nasty + if (g->codes[code].prefix >= 0) + stbi__out_gif_code(g, g->codes[code].prefix); + + if (g->cur_y >= g->max_y) return; + + p = &g->out[g->cur_x + g->cur_y]; + c = &g->color_table[g->codes[code].suffix * 4]; + + if (c[3] >= 128) { + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = c[3]; + } + g->cur_x += 4; + + if (g->cur_x >= g->max_x) { + g->cur_x = g->start_x; + g->cur_y += g->step; + + while (g->cur_y >= g->max_y && g->parse > 0) { + g->step = (1 << g->parse) * g->line_size; + g->cur_y = g->start_y + (g->step >> 1); + --g->parse; + } + } +} + +static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) +{ + stbi_uc lzw_cs; + stbi__int32 len, init_code; + stbi__uint32 first; + stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; + stbi__gif_lzw *p; + + lzw_cs = stbi__get8(s); + if (lzw_cs > 12) return NULL; + clear = 1 << lzw_cs; + first = 1; + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + bits = 0; + valid_bits = 0; + for (init_code = 0; init_code < clear; init_code++) { + g->codes[init_code].prefix = -1; + g->codes[init_code].first = (stbi_uc) init_code; + g->codes[init_code].suffix = (stbi_uc) init_code; + } + + // support no starting clear code + avail = clear+2; + oldcode = -1; + + len = 0; + for(;;) { + if (valid_bits < codesize) { + if (len == 0) { + len = stbi__get8(s); // start new block + if (len == 0) + return g->out; + } + --len; + bits |= (stbi__int32) stbi__get8(s) << valid_bits; + valid_bits += 8; + } else { + stbi__int32 code = bits & codemask; + bits >>= codesize; + valid_bits -= codesize; + // @OPTIMIZE: is there some way we can accelerate the non-clear path? + if (code == clear) { // clear code + codesize = lzw_cs + 1; + codemask = (1 << codesize) - 1; + avail = clear + 2; + oldcode = -1; + first = 0; + } else if (code == clear + 1) { // end of stream code + stbi__skip(s, len); + while ((len = stbi__get8(s)) > 0) + stbi__skip(s,len); + return g->out; + } else if (code <= avail) { + if (first) return stbi__errpuc("no clear code", "Corrupt GIF"); + + if (oldcode >= 0) { + p = &g->codes[avail++]; + if (avail > 4096) return stbi__errpuc("too many codes", "Corrupt GIF"); + p->prefix = (stbi__int16) oldcode; + p->first = g->codes[oldcode].first; + p->suffix = (code == avail) ? p->first : g->codes[code].first; + } else if (code == avail) + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + + stbi__out_gif_code(g, (stbi__uint16) code); + + if ((avail & codemask) == 0 && avail <= 0x0FFF) { + codesize++; + codemask = (1 << codesize) - 1; + } + + oldcode = code; + } else { + return stbi__errpuc("illegal code in raster", "Corrupt GIF"); + } + } + } +} + +static void stbi__fill_gif_background(stbi__gif *g, int x0, int y0, int x1, int y1) +{ + int x, y; + stbi_uc *c = g->pal[g->bgindex]; + for (y = y0; y < y1; y += 4 * g->w) { + for (x = x0; x < x1; x += 4) { + stbi_uc *p = &g->out[y + x]; + p[0] = c[2]; + p[1] = c[1]; + p[2] = c[0]; + p[3] = 0; + } + } +} + +// this function is designed to support animated gifs, although stb_image doesn't support it +static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp) +{ + int i; + stbi_uc *prev_out = 0; + + if (g->out == 0 && !stbi__gif_header(s, g, comp,0)) + return 0; // stbi__g_failure_reason set by stbi__gif_header + + prev_out = g->out; + g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h); + if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory"); + + switch ((g->eflags & 0x1C) >> 2) { + case 0: // unspecified (also always used on 1st frame) + stbi__fill_gif_background(g, 0, 0, 4 * g->w, 4 * g->w * g->h); + break; + case 1: // do not dispose + if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); + g->old_out = prev_out; + break; + case 2: // dispose to background + if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); + stbi__fill_gif_background(g, g->start_x, g->start_y, g->max_x, g->max_y); + break; + case 3: // dispose to previous + if (g->old_out) { + for (i = g->start_y; i < g->max_y; i += 4 * g->w) + memcpy(&g->out[i + g->start_x], &g->old_out[i + g->start_x], g->max_x - g->start_x); + } + break; + } + + for (;;) { + switch (stbi__get8(s)) { + case 0x2C: /* Image Descriptor */ + { + int prev_trans = -1; + stbi__int32 x, y, w, h; + stbi_uc *o; + + x = stbi__get16le(s); + y = stbi__get16le(s); + w = stbi__get16le(s); + h = stbi__get16le(s); + if (((x + w) > (g->w)) || ((y + h) > (g->h))) + return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); + + g->line_size = g->w * 4; + g->start_x = x * 4; + g->start_y = y * g->line_size; + g->max_x = g->start_x + w * 4; + g->max_y = g->start_y + h * g->line_size; + g->cur_x = g->start_x; + g->cur_y = g->start_y; + + g->lflags = stbi__get8(s); + + if (g->lflags & 0x40) { + g->step = 8 * g->line_size; // first interlaced spacing + g->parse = 3; + } else { + g->step = g->line_size; + g->parse = 0; + } + + if (g->lflags & 0x80) { + stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); + g->color_table = (stbi_uc *) g->lpal; + } else if (g->flags & 0x80) { + if (g->transparent >= 0 && (g->eflags & 0x01)) { + prev_trans = g->pal[g->transparent][3]; + g->pal[g->transparent][3] = 0; + } + g->color_table = (stbi_uc *) g->pal; + } else + return stbi__errpuc("missing color table", "Corrupt GIF"); + + o = stbi__process_gif_raster(s, g); + if (o == NULL) return NULL; + + if (prev_trans != -1) + g->pal[g->transparent][3] = (stbi_uc) prev_trans; + + return o; + } + + case 0x21: // Comment Extension. + { + int len; + if (stbi__get8(s) == 0xF9) { // Graphic Control Extension. + len = stbi__get8(s); + if (len == 4) { + g->eflags = stbi__get8(s); + g->delay = stbi__get16le(s); + g->transparent = stbi__get8(s); + } else { + stbi__skip(s, len); + break; + } + } + while ((len = stbi__get8(s)) != 0) + stbi__skip(s, len); + break; + } + + case 0x3B: // gif stream termination code + return (stbi_uc *) s; // using '1' causes warning on some compilers + + default: + return stbi__errpuc("unknown code", "Corrupt GIF"); + } + } + + STBI_NOTUSED(req_comp); +} + +static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *u = 0; + stbi__gif g; + memset(&g, 0, sizeof(g)); + + u = stbi__gif_load_next(s, &g, comp, req_comp); + if (u == (stbi_uc *) s) u = 0; // end of animated gif marker + if (u) { + *x = g.w; + *y = g.h; + if (req_comp && req_comp != 4) + u = stbi__convert_format(u, 4, req_comp, g.w, g.h); + } + else if (g.out) + STBI_FREE(g.out); + + return u; +} + +static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) +{ + return stbi__gif_info_raw(s,x,y,comp); +} +#endif + +// ************************************************************************************************* +// Radiance RGBE HDR loader +// originally by Nicolas Schulz +#ifndef STBI_NO_HDR +static int stbi__hdr_test_core(stbi__context *s) +{ + const char *signature = "#?RADIANCE\n"; + int i; + for (i=0; signature[i]; ++i) + if (stbi__get8(s) != signature[i]) + return 0; + return 1; +} + +static int stbi__hdr_test(stbi__context* s) +{ + int r = stbi__hdr_test_core(s); + stbi__rewind(s); + return r; +} + +#define STBI__HDR_BUFLEN 1024 +static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) +{ + int len=0; + char c = '\0'; + + c = (char) stbi__get8(z); + + while (!stbi__at_eof(z) && c != '\n') { + buffer[len++] = c; + if (len == STBI__HDR_BUFLEN-1) { + // flush to end of line + while (!stbi__at_eof(z) && stbi__get8(z) != '\n') + ; + break; + } + c = (char) stbi__get8(z); + } + + buffer[len] = 0; + return buffer; +} + +static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) +{ + if ( input[3] != 0 ) { + float f1; + // Exponent + f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); + if (req_comp <= 2) + output[0] = (input[0] + input[1] + input[2]) * f1 / 3; + else { + output[0] = input[0] * f1; + output[1] = input[1] * f1; + output[2] = input[2] * f1; + } + if (req_comp == 2) output[1] = 1; + if (req_comp == 4) output[3] = 1; + } else { + switch (req_comp) { + case 4: output[3] = 1; /* fallthrough */ + case 3: output[0] = output[1] = output[2] = 0; + break; + case 2: output[1] = 1; /* fallthrough */ + case 1: output[0] = 0; + break; + } + } +} + +static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + int width, height; + stbi_uc *scanline; + float *hdr_data; + int len; + unsigned char count, value; + int i, j, k, c1,c2, z; + + + // Check identifier + if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) + return stbi__errpf("not HDR", "Corrupt HDR image"); + + // Parse header + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); + + // Parse width and height + // can't use sscanf() if we're not using stdio! + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + height = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); + token += 3; + width = (int) strtol(token, NULL, 10); + + *x = width; + *y = height; + + if (comp) *comp = 3; + if (req_comp == 0) req_comp = 3; + + // Read data + hdr_data = (float *) stbi__malloc(height * width * req_comp * sizeof(float)); + + // Load image data + // image data is stored as some number of sca + if ( width < 8 || width >= 32768) { + // Read flat data + for (j=0; j < height; ++j) { + for (i=0; i < width; ++i) { + stbi_uc rgbe[4]; + main_decode_loop: + stbi__getn(s, rgbe, 4); + stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); + } + } + } else { + // Read RLE-encoded data + scanline = NULL; + + for (j = 0; j < height; ++j) { + c1 = stbi__get8(s); + c2 = stbi__get8(s); + len = stbi__get8(s); + if (c1 != 2 || c2 != 2 || (len & 0x80)) { + // not run-length encoded, so we have to actually use THIS data as a decoded + // pixel (note this can't be a valid pixel--one of RGB must be >= 128) + stbi_uc rgbe[4]; + rgbe[0] = (stbi_uc) c1; + rgbe[1] = (stbi_uc) c2; + rgbe[2] = (stbi_uc) len; + rgbe[3] = (stbi_uc) stbi__get8(s); + stbi__hdr_convert(hdr_data, rgbe, req_comp); + i = 1; + j = 0; + STBI_FREE(scanline); + goto main_decode_loop; // yes, this makes no sense + } + len <<= 8; + len |= stbi__get8(s); + if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } + if (scanline == NULL) scanline = (stbi_uc *) stbi__malloc(width * 4); + + for (k = 0; k < 4; ++k) { + i = 0; + while (i < width) { + count = stbi__get8(s); + if (count > 128) { + // Run + value = stbi__get8(s); + count -= 128; + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = value; + } else { + // Dump + for (z = 0; z < count; ++z) + scanline[i++ * 4 + k] = stbi__get8(s); + } + } + } + for (i=0; i < width; ++i) + stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); + } + STBI_FREE(scanline); + } + + return hdr_data; +} + +static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) +{ + char buffer[STBI__HDR_BUFLEN]; + char *token; + int valid = 0; + + if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) { + stbi__rewind( s ); + return 0; + } + + for(;;) { + token = stbi__hdr_gettoken(s,buffer); + if (token[0] == 0) break; + if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; + } + + if (!valid) { + stbi__rewind( s ); + return 0; + } + token = stbi__hdr_gettoken(s,buffer); + if (strncmp(token, "-Y ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *y = (int) strtol(token, &token, 10); + while (*token == ' ') ++token; + if (strncmp(token, "+X ", 3)) { + stbi__rewind( s ); + return 0; + } + token += 3; + *x = (int) strtol(token, NULL, 10); + *comp = 3; + return 1; +} +#endif // STBI_NO_HDR + +#ifndef STBI_NO_BMP +static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) +{ + int hsz; + if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') { + stbi__rewind( s ); + return 0; + } + stbi__skip(s,12); + hsz = stbi__get32le(s); + if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) { + stbi__rewind( s ); + return 0; + } + if (hsz == 12) { + *x = stbi__get16le(s); + *y = stbi__get16le(s); + } else { + *x = stbi__get32le(s); + *y = stbi__get32le(s); + } + if (stbi__get16le(s) != 1) { + stbi__rewind( s ); + return 0; + } + *comp = stbi__get16le(s) / 8; + return 1; +} +#endif + +#ifndef STBI_NO_PSD +static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) +{ + int channelCount; + if (stbi__get32be(s) != 0x38425053) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 1) { + stbi__rewind( s ); + return 0; + } + stbi__skip(s, 6); + channelCount = stbi__get16be(s); + if (channelCount < 0 || channelCount > 16) { + stbi__rewind( s ); + return 0; + } + *y = stbi__get32be(s); + *x = stbi__get32be(s); + if (stbi__get16be(s) != 8) { + stbi__rewind( s ); + return 0; + } + if (stbi__get16be(s) != 3) { + stbi__rewind( s ); + return 0; + } + *comp = 4; + return 1; +} +#endif + +#ifndef STBI_NO_PIC +static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) +{ + int act_comp=0,num_packets=0,chained; + stbi__pic_packet packets[10]; + + if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { + stbi__rewind(s); + return 0; + } + + stbi__skip(s, 88); + + *x = stbi__get16be(s); + *y = stbi__get16be(s); + if (stbi__at_eof(s)) { + stbi__rewind( s); + return 0; + } + if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { + stbi__rewind( s ); + return 0; + } + + stbi__skip(s, 8); + + do { + stbi__pic_packet *packet; + + if (num_packets==sizeof(packets)/sizeof(packets[0])) + return 0; + + packet = &packets[num_packets++]; + chained = stbi__get8(s); + packet->size = stbi__get8(s); + packet->type = stbi__get8(s); + packet->channel = stbi__get8(s); + act_comp |= packet->channel; + + if (stbi__at_eof(s)) { + stbi__rewind( s ); + return 0; + } + if (packet->size != 8) { + stbi__rewind( s ); + return 0; + } + } while (chained); + + *comp = (act_comp & 0x10 ? 4 : 3); + + return 1; +} +#endif + +// ************************************************************************************************* +// Portable Gray Map and Portable Pixel Map loader +// by Ken Miller +// +// PGM: http://netpbm.sourceforge.net/doc/pgm.html +// PPM: http://netpbm.sourceforge.net/doc/ppm.html +// +// Known limitations: +// Does not support comments in the header section +// Does not support ASCII image data (formats P2 and P3) +// Does not support 16-bit-per-channel + +#ifndef STBI_NO_PNM + +static int stbi__pnm_test(stbi__context *s) +{ + char p, t; + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + return 1; +} + +static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) +{ + stbi_uc *out; + if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n)) + return 0; + *x = s->img_x; + *y = s->img_y; + *comp = s->img_n; + + out = (stbi_uc *) stbi__malloc(s->img_n * s->img_x * s->img_y); + if (!out) return stbi__errpuc("outofmem", "Out of memory"); + stbi__getn(s, out, s->img_n * s->img_x * s->img_y); + + if (req_comp && req_comp != s->img_n) { + out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); + if (out == NULL) return out; // stbi__convert_format frees input on failure + } + return out; +} + +static int stbi__pnm_isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; +} + +static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) +{ + while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) + *c = (char) stbi__get8(s); +} + +static int stbi__pnm_isdigit(char c) +{ + return c >= '0' && c <= '9'; +} + +static int stbi__pnm_getinteger(stbi__context *s, char *c) +{ + int value = 0; + + while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { + value = value*10 + (*c - '0'); + *c = (char) stbi__get8(s); + } + + return value; +} + +static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) +{ + int maxv; + char c, p, t; + + stbi__rewind( s ); + + // Get identifier + p = (char) stbi__get8(s); + t = (char) stbi__get8(s); + if (p != 'P' || (t != '5' && t != '6')) { + stbi__rewind( s ); + return 0; + } + + *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm + + c = (char) stbi__get8(s); + stbi__pnm_skip_whitespace(s, &c); + + *x = stbi__pnm_getinteger(s, &c); // read width + stbi__pnm_skip_whitespace(s, &c); + + *y = stbi__pnm_getinteger(s, &c); // read height + stbi__pnm_skip_whitespace(s, &c); + + maxv = stbi__pnm_getinteger(s, &c); // read max value + + if (maxv > 255) + return stbi__err("max value > 255", "PPM image not 8-bit"); + else + return 1; +} +#endif + +static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) +{ + #ifndef STBI_NO_JPEG + if (stbi__jpeg_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNG + if (stbi__png_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_GIF + if (stbi__gif_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_BMP + if (stbi__bmp_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PSD + if (stbi__psd_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PIC + if (stbi__pic_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_PNM + if (stbi__pnm_info(s, x, y, comp)) return 1; + #endif + + #ifndef STBI_NO_HDR + if (stbi__hdr_info(s, x, y, comp)) return 1; + #endif + + // test tga last because it's a crappy test! + #ifndef STBI_NO_TGA + if (stbi__tga_info(s, x, y, comp)) + return 1; + #endif + return stbi__err("unknown image type", "Image not of any known type, or corrupt"); +} + +#ifndef STBI_NO_STDIO +STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) +{ + FILE *f = stbi__fopen(filename, "rb"); + int result; + if (!f) return stbi__err("can't fopen", "Unable to open file"); + result = stbi_info_from_file(f, x, y, comp); + fclose(f); + return result; +} + +STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) +{ + int r; + stbi__context s; + long pos = ftell(f); + stbi__start_file(&s, f); + r = stbi__info_main(&s,x,y,comp); + fseek(f,pos,SEEK_SET); + return r; +} +#endif // !STBI_NO_STDIO + +STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_mem(&s,buffer,len); + return stbi__info_main(&s,x,y,comp); +} + +STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) +{ + stbi__context s; + stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); + return stbi__info_main(&s,x,y,comp); +} + +#endif // STB_IMAGE_IMPLEMENTATION + +/* + revision history: + 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA + 2.07 (2015-09-13) fix compiler warnings + partial animated GIF support + limited 16-bit PSD support + #ifdef unused functions + bug with < 92 byte PIC,PNM,HDR,TGA + 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value + 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning + 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit + 2.03 (2015-04-12) extra corruption checking (mmozeiko) + stbi_set_flip_vertically_on_load (nguillemot) + fix NEON support; fix mingw support + 2.02 (2015-01-19) fix incorrect assert, fix warning + 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 + 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG + 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) + progressive JPEG (stb) + PGM/PPM support (Ken Miller) + STBI_MALLOC,STBI_REALLOC,STBI_FREE + GIF bugfix -- seemingly never worked + STBI_NO_*, STBI_ONLY_* + 1.48 (2014-12-14) fix incorrectly-named assert() + 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) + optimize PNG (ryg) + fix bug in interlaced PNG with user-specified channel count (stb) + 1.46 (2014-08-26) + fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG + 1.45 (2014-08-16) + fix MSVC-ARM internal compiler error by wrapping malloc + 1.44 (2014-08-07) + various warning fixes from Ronny Chevalier + 1.43 (2014-07-15) + fix MSVC-only compiler problem in code changed in 1.42 + 1.42 (2014-07-09) + don't define _CRT_SECURE_NO_WARNINGS (affects user code) + fixes to stbi__cleanup_jpeg path + added STBI_ASSERT to avoid requiring assert.h + 1.41 (2014-06-25) + fix search&replace from 1.36 that messed up comments/error messages + 1.40 (2014-06-22) + fix gcc struct-initialization warning + 1.39 (2014-06-15) + fix to TGA optimization when req_comp != number of components in TGA; + fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) + add support for BMP version 5 (more ignored fields) + 1.38 (2014-06-06) + suppress MSVC warnings on integer casts truncating values + fix accidental rename of 'skip' field of I/O + 1.37 (2014-06-04) + remove duplicate typedef + 1.36 (2014-06-03) + convert to header file single-file library + if de-iphone isn't set, load iphone images color-swapped instead of returning NULL + 1.35 (2014-05-27) + various warnings + fix broken STBI_SIMD path + fix bug where stbi_load_from_file no longer left file pointer in correct place + fix broken non-easy path for 32-bit BMP (possibly never used) + TGA optimization by Arseny Kapoulkine + 1.34 (unknown) + use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case + 1.33 (2011-07-14) + make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements + 1.32 (2011-07-13) + support for "info" function for all supported filetypes (SpartanJ) + 1.31 (2011-06-20) + a few more leak fixes, bug in PNG handling (SpartanJ) + 1.30 (2011-06-11) + added ability to load files via callbacks to accommodate custom input streams (Ben Wenger) + removed deprecated format-specific test/load functions + removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway + error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) + fix inefficiency in decoding 32-bit BMP (David Woo) + 1.29 (2010-08-16) + various warning fixes from Aurelien Pocheville + 1.28 (2010-08-01) + fix bug in GIF palette transparency (SpartanJ) + 1.27 (2010-08-01) + cast-to-stbi_uc to fix warnings + 1.26 (2010-07-24) + fix bug in file buffering for PNG reported by SpartanJ + 1.25 (2010-07-17) + refix trans_data warning (Won Chun) + 1.24 (2010-07-12) + perf improvements reading from files on platforms with lock-heavy fgetc() + minor perf improvements for jpeg + deprecated type-specific functions so we'll get feedback if they're needed + attempt to fix trans_data warning (Won Chun) + 1.23 fixed bug in iPhone support + 1.22 (2010-07-10) + removed image *writing* support + stbi_info support from Jetro Lauha + GIF support from Jean-Marc Lienher + iPhone PNG-extensions from James Brown + warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) + 1.21 fix use of 'stbi_uc' in header (reported by jon blow) + 1.20 added support for Softimage PIC, by Tom Seddon + 1.19 bug in interlaced PNG corruption check (found by ryg) + 1.18 (2008-08-02) + fix a threading bug (local mutable static) + 1.17 support interlaced PNG + 1.16 major bugfix - stbi__convert_format converted one too many pixels + 1.15 initialize some fields for thread safety + 1.14 fix threadsafe conversion bug + header-file-only version (#define STBI_HEADER_FILE_ONLY before including) + 1.13 threadsafe + 1.12 const qualifiers in the API + 1.11 Support installable IDCT, colorspace conversion routines + 1.10 Fixes for 64-bit (don't use "unsigned long") + optimized upsampling by Fabian "ryg" Giesen + 1.09 Fix format-conversion for PSD code (bad global variables!) + 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz + 1.07 attempt to fix C++ warning/errors again + 1.06 attempt to fix C++ warning/errors again + 1.05 fix TGA loading to return correct *comp and use good luminance calc + 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free + 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR + 1.02 support for (subset of) HDR files, float interface for preferred access to them + 1.01 fix bug: possible bug in handling right-side up bmps... not sure + fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all + 1.00 interface to zlib that skips zlib header + 0.99 correct handling of alpha in palette + 0.98 TGA loader by lonesock; dynamically add loaders (untested) + 0.97 jpeg errors on too large a file; also catch another malloc failure + 0.96 fix detection of invalid v value - particleman@mollyrocket forum + 0.95 during header scan, seek to markers in case of padding + 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same + 0.93 handle jpegtran output; verbose errors + 0.92 read 4,8,16,24,32-bit BMP files of several formats + 0.91 output 24-bit Windows 3.0 BMP files + 0.90 fix a few more warnings; bump version number to approach 1.0 + 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd + 0.60 fix compiling as c++ + 0.59 fix warnings: merge Dave Moore's -Wall fixes + 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian + 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available + 0.56 fix bug: zlib uncompressed mode len vs. nlen + 0.55 fix bug: restart_interval not initialized to 0 + 0.54 allow NULL for 'int *comp' + 0.53 fix bug in png 3->4; speedup png decoding + 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments + 0.51 obey req_comp requests, 1-component jpegs return as 1-component, + on 'test' only check type, not whether we support this variant + 0.50 (2006-11-19) + first released version +*/ From cbfc8f89e963174406d770aad1de90927c0b85cd Mon Sep 17 00:00:00 2001 From: Kristian Bolino Date: Tue, 15 Mar 2022 10:28:47 -0400 Subject: [PATCH 60/89] sdl_renderer: fix Metal rendering (#426) Addresses an issue where the Metal render driver (macOS) could not handle the clipping rectangle {-8192, -8192, 16384, 16384} and would simply draw nothing to the screen. The solution is to ensure the cliprect coordinates are not negative, which also doesn't break the other render drivers. Co-authored-by: Kristian Bolino --- demo/sdl_renderer/nuklear_sdl_renderer.h | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/demo/sdl_renderer/nuklear_sdl_renderer.h b/demo/sdl_renderer/nuklear_sdl_renderer.h index cac4d79..bd85044 100644 --- a/demo/sdl_renderer/nuklear_sdl_renderer.h +++ b/demo/sdl_renderer/nuklear_sdl_renderer.h @@ -19,6 +19,16 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt); NK_API void nk_sdl_render(enum nk_anti_aliasing); NK_API void nk_sdl_shutdown(void); +#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 22) +/* Metal API does not support cliprects with negative coordinates or large + * dimensions. The issue is fixed in SDL2 with version 2.0.22 but until + * that version is released, the NK_SDL_CLAMP_CLIP_RECT flag can be used to + * ensure the cliprect is itself clipped to the viewport. + * See discussion at https://discourse.libsdl.org/t/rendergeometryraw-producing-different-results-in-metal-vs-opengl/34953 + */ +#define NK_SDL_CLAMP_CLIP_RECT +#endif + #endif /* NK_SDL_RENDERER_H_ */ /* @@ -30,6 +40,8 @@ NK_API void nk_sdl_shutdown(void); */ #ifdef NK_SDL_RENDERER_IMPLEMENTATION +#include + struct nk_sdl_device { struct nk_buffer cmds; struct nk_draw_null_texture null; @@ -75,6 +87,9 @@ nk_sdl_render(enum nk_anti_aliasing AA) { SDL_Rect saved_clip; +#ifdef NK_SDL_CLAMP_CLIP_RECT + SDL_Rect viewport; +#endif SDL_bool clipping_enabled; int vs = sizeof(struct nk_sdl_vertex); size_t vp = offsetof(struct nk_sdl_vertex, position); @@ -116,6 +131,9 @@ nk_sdl_render(enum nk_anti_aliasing AA) clipping_enabled = SDL_RenderIsClipEnabled(sdl.renderer); SDL_RenderGetClipRect(sdl.renderer, &saved_clip); +#ifdef NK_SDL_CLAMP_CLIP_RECT + SDL_RenderGetViewport(sdl.renderer, &viewport); +#endif nk_draw_foreach(cmd, &sdl.ctx, &dev->cmds) { @@ -127,6 +145,22 @@ nk_sdl_render(enum nk_anti_aliasing AA) r.y = cmd->clip_rect.y; r.w = cmd->clip_rect.w; r.h = cmd->clip_rect.h; +#ifdef NK_SDL_CLAMP_CLIP_RECT + if (r.x < 0) { + r.w += r.x; + r.x = 0; + } + if (r.y < 0) { + r.h += r.y; + r.y = 0; + } + if (r.h > viewport.h) { + r.h = viewport.h; + } + if (r.w > viewport.w) { + r.w = viewport.w; + } +#endif SDL_RenderSetClipRect(sdl.renderer, &r); } @@ -182,6 +216,25 @@ nk_sdl_clipboard_copy(nk_handle usr, const char *text, int len) NK_API struct nk_context* nk_sdl_init(SDL_Window *win, SDL_Renderer *renderer) { +#ifndef NK_SDL_CLAMP_CLIP_RECT + SDL_RendererInfo info; + SDL_version runtimeVer; + + /* warn for cases where NK_SDL_CLAMP_CLIP_RECT should have been set but isn't */ + SDL_GetRendererInfo(renderer, &info); + SDL_GetVersion(&runtimeVer); + if (strncmp("metal", info.name, 5) == 0 && + SDL_VERSIONNUM(runtimeVer.major, runtimeVer.minor, runtimeVer.patch) < SDL_VERSIONNUM(2, 0, 22)) + { + SDL_LogWarn( + SDL_LOG_CATEGORY_APPLICATION, + "renderer is using Metal API but runtime SDL version %d.%d.%d is older than compiled version %d.%d.%d, " + "which may cause issues with rendering", + runtimeVer.major, runtimeVer.minor, runtimeVer.patch, + SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL + ); + } +#endif sdl.win = win; sdl.renderer = renderer; nk_init_default(&sdl.ctx, 0); From ec4aa9992f8bd13dce8197ee8795071baa512c49 Mon Sep 17 00:00:00 2001 From: Kristian Bolino Date: Mon, 14 Mar 2022 12:26:25 -0400 Subject: [PATCH 61/89] Fix high-DPI scaling in sdl_renderer This commit resolves two issues with high-DPI display rendering: 1. The coordinates were not scaled properly, resulting in tiny output and misalignment of actual cursor position with apparent position; this is fixed by calling SDL_SetRenderScale with appropriate scaling factors determined by comparing the window size to the renderer's output size 2. The fonts were not oversampled, resulting in excessively blurry text; this is fixed by setting oversample_h and oversample_v on the font_config according to the scaling factors --- demo/sdl_renderer/main.c | 56 +++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/demo/sdl_renderer/main.c b/demo/sdl_renderer/main.c index 0208d33..a65a44e 100644 --- a/demo/sdl_renderer/main.c +++ b/demo/sdl_renderer/main.c @@ -76,6 +76,8 @@ main(int argc, char *argv[]) SDL_Renderer *renderer; int running = 1; int flags = 0; + unsigned char oversample_h = 1; + unsigned char oversample_v = 1; /* GUI */ struct nk_context *ctx; @@ -112,22 +114,53 @@ main(int argc, char *argv[]) exit(-1); } + /* scale the renderer output for High-DPI displays */ + { + int render_w, render_h; + int window_w, window_h; + float scale_x, scale_y; + SDL_GetRendererOutputSize(renderer, &render_w, &render_h); + SDL_GetWindowSize(win, &window_w, &window_h); + scale_x = (float)(render_w) / (float)(window_w); + scale_y = (float)(render_h) / (float)(window_h); + SDL_RenderSetScale(renderer, scale_x, scale_y); + if (scale_x > 1) { + oversample_h = nk_iceilf(scale_x); + } + if (scale_y > 1) { + oversample_v = nk_iceilf(scale_y); + } + } /* GUI */ ctx = nk_sdl_init(win, renderer); /* Load Fonts: if none of these are loaded a default font will be used */ /* Load Cursor: if you uncomment cursor loading please hide the cursor */ - {struct nk_font_atlas *atlas; - nk_sdl_font_stash_begin(&atlas); - /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, 0);*/ - /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16, 0);*/ - /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, 0);*/ - /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, 0);*/ - /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);*/ - /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);*/ - nk_sdl_font_stash_end(); - /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ - /*nk_style_set_font(ctx, &roboto->handle)*/;} + { + struct nk_font_atlas *atlas; + struct nk_font_config config = nk_font_config(0); + + /* oversample the fonts for high-DPI displays */ + if (oversample_h > 1) { + config.oversample_h = oversample_h; + } + if (oversample_v > 1) { + config.oversample_v = oversample_v; + } + + /* set up the font atlas and add desired fonts */ + nk_sdl_font_stash_begin(&atlas); + struct nk_font *default_font = nk_font_atlas_add_default(atlas, 12, &config); + /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, &config);*/ + /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16, &config);*/ + /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, &config);*/ + /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, &config);*/ + /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, &config);*/ + /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, &config);*/ + nk_sdl_font_stash_end(); + /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ + nk_style_set_font(ctx, &default_font->handle); + } #ifdef INCLUDE_STYLE /*set_style(ctx, THEME_WHITE);*/ @@ -212,4 +245,3 @@ cleanup: SDL_Quit(); return 0; } - From 779c420d066caa584395c6a6218736e1f6f245d9 Mon Sep 17 00:00:00 2001 From: Kristian Bolino Date: Tue, 15 Mar 2022 11:44:59 -0400 Subject: [PATCH 62/89] Fix C89 warnings and oversample at 3x scale --- demo/sdl_renderer/main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/demo/sdl_renderer/main.c b/demo/sdl_renderer/main.c index a65a44e..63625f8 100644 --- a/demo/sdl_renderer/main.c +++ b/demo/sdl_renderer/main.c @@ -76,6 +76,8 @@ main(int argc, char *argv[]) SDL_Renderer *renderer; int running = 1; int flags = 0; + + /* Nuklear settings */ unsigned char oversample_h = 1; unsigned char oversample_v = 1; @@ -125,7 +127,7 @@ main(int argc, char *argv[]) scale_y = (float)(render_h) / (float)(window_h); SDL_RenderSetScale(renderer, scale_x, scale_y); if (scale_x > 1) { - oversample_h = nk_iceilf(scale_x); + oversample_h = 3 * nk_iceilf(scale_x); } if (scale_y > 1) { oversample_v = nk_iceilf(scale_y); @@ -139,24 +141,25 @@ main(int argc, char *argv[]) { struct nk_font_atlas *atlas; struct nk_font_config config = nk_font_config(0); + struct nk_font *default_font, *droid, *roboto, *future, *clean, *tiny, *cousine; /* oversample the fonts for high-DPI displays */ - if (oversample_h > 1) { + if (oversample_h > config.oversample_h) { config.oversample_h = oversample_h; } - if (oversample_v > 1) { + if (oversample_v > config.oversample_v) { config.oversample_v = oversample_v; } /* set up the font atlas and add desired fonts */ nk_sdl_font_stash_begin(&atlas); - struct nk_font *default_font = nk_font_atlas_add_default(atlas, 12, &config); - /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, &config);*/ - /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16, &config);*/ - /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, &config);*/ - /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, &config);*/ - /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, &config);*/ - /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, &config);*/ + default_font = nk_font_atlas_add_default(atlas, 13, &config); + /*droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, &config);*/ + /*roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16, &config);*/ + /*future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, &config);*/ + /*clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, &config);*/ + /*tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, &config);*/ + /*cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, &config);*/ nk_sdl_font_stash_end(); /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ nk_style_set_font(ctx, &default_font->handle); From 24311a60c2c2aa05e14565e8868c543efa8abcb8 Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Wed, 16 Mar 2022 19:57:35 +0000 Subject: [PATCH 63/89] Delete extra copy of stb_image.h --- stb_image.h | 6509 --------------------------------------------------- 1 file changed, 6509 deletions(-) delete mode 100644 stb_image.h diff --git a/stb_image.h b/stb_image.h deleted file mode 100644 index 1f4d468..0000000 --- a/stb_image.h +++ /dev/null @@ -1,6509 +0,0 @@ -/* stb_image - v2.08 - public domain image loader - http://nothings.org/stb_image.h - no warranty implied; use at your own risk - - Do this: - #define STB_IMAGE_IMPLEMENTATION - before you include this file in *one* C or C++ file to create the implementation. - - // i.e. it should look like this: - #include ... - #include ... - #include ... - #define STB_IMAGE_IMPLEMENTATION - #include "stb_image.h" - - You can #define STBI_ASSERT(x) before the #include to avoid using assert.h. - And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free - - - QUICK NOTES: - Primarily of interest to game developers and other people who can - avoid problematic images and only need the trivial interface - - JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) - PNG 1/2/4/8-bit-per-channel (16 bpc not supported) - - TGA (not sure what subset, if a subset) - BMP non-1bpp, non-RLE - PSD (composited view only, no extra channels, 8/16 bit-per-channel) - - GIF (*comp always reports as 4-channel) - HDR (radiance rgbE format) - PIC (Softimage PIC) - PNM (PPM and PGM binary only) - - Animated GIF still needs a proper API, but here's one way to do it: - http://gist.github.com/urraka/685d9a6340b26b830d49 - - - decode from memory or through FILE (define STBI_NO_STDIO to remove code) - - decode from arbitrary I/O callbacks - - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON) - - Full documentation under "DOCUMENTATION" below. - - - Revision 2.00 release notes: - - - Progressive JPEG is now supported. - - - PPM and PGM binary formats are now supported, thanks to Ken Miller. - - - x86 platforms now make use of SSE2 SIMD instructions for - JPEG decoding, and ARM platforms can use NEON SIMD if requested. - This work was done by Fabian "ryg" Giesen. SSE2 is used by - default, but NEON must be enabled explicitly; see docs. - - With other JPEG optimizations included in this version, we see - 2x speedup on a JPEG on an x86 machine, and a 1.5x speedup - on a JPEG on an ARM machine, relative to previous versions of this - library. The same results will not obtain for all JPGs and for all - x86/ARM machines. (Note that progressive JPEGs are significantly - slower to decode than regular JPEGs.) This doesn't mean that this - is the fastest JPEG decoder in the land; rather, it brings it - closer to parity with standard libraries. If you want the fastest - decode, look elsewhere. (See "Philosophy" section of docs below.) - - See final bullet items below for more info on SIMD. - - - Added STBI_MALLOC, STBI_REALLOC, and STBI_FREE macros for replacing - the memory allocator. Unlike other STBI libraries, these macros don't - support a context parameter, so if you need to pass a context in to - the allocator, you'll have to store it in a global or a thread-local - variable. - - - Split existing STBI_NO_HDR flag into two flags, STBI_NO_HDR and - STBI_NO_LINEAR. - STBI_NO_HDR: suppress implementation of .hdr reader format - STBI_NO_LINEAR: suppress high-dynamic-range light-linear float API - - - You can suppress implementation of any of the decoders to reduce - your code footprint by #defining one or more of the following - symbols before creating the implementation. - - STBI_NO_JPEG - STBI_NO_PNG - STBI_NO_BMP - STBI_NO_PSD - STBI_NO_TGA - STBI_NO_GIF - STBI_NO_HDR - STBI_NO_PIC - STBI_NO_PNM (.ppm and .pgm) - - - You can request *only* certain decoders and suppress all other ones - (this will be more forward-compatible, as addition of new decoders - doesn't require you to disable them explicitly): - - STBI_ONLY_JPEG - STBI_ONLY_PNG - STBI_ONLY_BMP - STBI_ONLY_PSD - STBI_ONLY_TGA - STBI_ONLY_GIF - STBI_ONLY_HDR - STBI_ONLY_PIC - STBI_ONLY_PNM (.ppm and .pgm) - - Note that you can define multiples of these, and you will get all - of them ("only x" and "only y" is interpreted to mean "only x&y"). - - - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still - want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB - - - Compilation of all SIMD code can be suppressed with - #define STBI_NO_SIMD - It should not be necessary to disable SIMD unless you have issues - compiling (e.g. using an x86 compiler which doesn't support SSE - intrinsics or that doesn't support the method used to detect - SSE2 support at run-time), and even those can be reported as - bugs so I can refine the built-in compile-time checking to be - smarter. - - - The old STBI_SIMD system which allowed installing a user-defined - IDCT etc. has been removed. If you need this, don't upgrade. My - assumption is that almost nobody was doing this, and those who - were will find the built-in SIMD more satisfactory anyway. - - - RGB values computed for JPEG images are slightly different from - previous versions of stb_image. (This is due to using less - integer precision in SIMD.) The C code has been adjusted so - that the same RGB values will be computed regardless of whether - SIMD support is available, so your app should always produce - consistent results. But these results are slightly different from - previous versions. (Specifically, about 3% of available YCbCr values - will compute different RGB results from pre-1.49 versions by +-1; - most of the deviating values are one smaller in the G channel.) - - - If you must produce consistent results with previous versions of - stb_image, #define STBI_JPEG_OLD and you will get the same results - you used to; however, you will not get the SIMD speedups for - the YCbCr-to-RGB conversion step (although you should still see - significant JPEG speedup from the other changes). - - Please note that STBI_JPEG_OLD is a temporary feature; it will be - removed in future versions of the library. It is only intended for - near-term back-compatibility use. - - - Latest revision history: - 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA - 2.07 (2015-09-13) partial animated GIF support - limited 16-bit PSD support - minor bugs, code cleanup, and compiler warnings - 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value - 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning - 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit - 2.03 (2015-04-12) additional corruption checking - stbi_set_flip_vertically_on_load - fix NEON support; fix mingw support - 2.02 (2015-01-19) fix incorrect assert, fix warning - 2.01 (2015-01-17) fix various warnings - 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG - 2.00 (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD - progressive JPEG - PGM/PPM support - STBI_MALLOC,STBI_REALLOC,STBI_FREE - STBI_NO_*, STBI_ONLY_* - GIF bugfix - 1.48 (2014-12-14) fix incorrectly-named assert() - 1.47 (2014-12-14) 1/2/4-bit PNG support (both grayscale and paletted) - optimize PNG - fix bug in interlaced PNG with user-specified channel count - - See end of file for full revision history. - - - ============================ Contributors ========================= - - Image formats Bug fixes & warning fixes - Sean Barrett (jpeg, png, bmp) Marc LeBlanc - Nicolas Schulz (hdr, psd) Christpher Lloyd - Jonathan Dummer (tga) Dave Moore - Jean-Marc Lienher (gif) Won Chun - Tom Seddon (pic) the Horde3D community - Thatcher Ulrich (psd) Janez Zemva - Ken Miller (pgm, ppm) Jonathan Blow - urraka@github (animated gif) Laurent Gomila - Aruelien Pocheville - Ryamond Barbiero - David Woo - Extensions, features Martin Golini - Jetro Lauha (stbi_info) Roy Eltham - Martin "SpartanJ" Golini (stbi_info) Luke Graham - James "moose2000" Brown (iPhone PNG) Thomas Ruf - Ben "Disch" Wenger (io callbacks) John Bartholomew - Omar Cornut (1/2/4-bit PNG) Ken Hamada - Nicolas Guillemot (vertical flip) Cort Stratton - Richard Mitton (16-bit PSD) Blazej Dariusz Roszkowski - Thibault Reuille - Paul Du Bois - Guillaume George - Jerry Jansson - Hayaki Saito - Johan Duparc - Ronny Chevalier - Optimizations & bugfixes Michal Cichon - Fabian "ryg" Giesen Tero Hanninen - Arseny Kapoulkine Sergio Gonzalez - Cass Everitt - Engin Manap - If your name should be here but Martins Mozeiko - isn't, let Sean know. Joseph Thomson - Phil Jordan - Nathan Reed - Michaelangel007@github - Nick Verigakis - -LICENSE - -This software is in the public domain. Where that dedication is not -recognized, you are granted a perpetual, irrevocable license to copy, -distribute, and modify this file as you see fit. - -*/ - -#ifndef STBI_INCLUDE_STB_IMAGE_H -#define STBI_INCLUDE_STB_IMAGE_H - -// DOCUMENTATION -// -// Limitations: -// - no 16-bit-per-channel PNG -// - no 12-bit-per-channel JPEG -// - no JPEGs with arithmetic coding -// - no 1-bit BMP -// - GIF always returns *comp=4 -// -// Basic usage (see HDR discussion below for HDR usage): -// int x,y,n; -// unsigned char *data = stbi_load(filename, &x, &y, &n, 0); -// // ... process data if not NULL ... -// // ... x = width, y = height, n = # 8-bit components per pixel ... -// // ... replace '0' with '1'..'4' to force that many components per pixel -// // ... but 'n' will always be the number that it would have been if you said 0 -// stbi_image_free(data) -// -// Standard parameters: -// int *x -- outputs image width in pixels -// int *y -- outputs image height in pixels -// int *comp -- outputs # of image components in image file -// int req_comp -- if non-zero, # of image components requested in result -// -// The return value from an image loader is an 'unsigned char *' which points -// to the pixel data, or NULL on an allocation failure or if the image is -// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels, -// with each pixel consisting of N interleaved 8-bit components; the first -// pixel pointed to is top-left-most in the image. There is no padding between -// image scanlines or between pixels, regardless of format. The number of -// components N is 'req_comp' if req_comp is non-zero, or *comp otherwise. -// If req_comp is non-zero, *comp has the number of components that _would_ -// have been output otherwise. E.g. if you set req_comp to 4, you will always -// get RGBA output, but you can check *comp to see if it's trivially opaque -// because e.g. there were only 3 channels in the source image. -// -// An output image with N components has the following components interleaved -// in this order in each pixel: -// -// N=#comp components -// 1 grey -// 2 grey, alpha -// 3 red, green, blue -// 4 red, green, blue, alpha -// -// If image loading fails for any reason, the return value will be NULL, -// and *x, *y, *comp will be unchanged. The function stbi_failure_reason() -// can be queried for an extremely brief, end-user unfriendly explanation -// of why the load failed. Define STBI_NO_FAILURE_STRINGS to avoid -// compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly -// more user-friendly ones. -// -// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized. -// -// =========================================================================== -// -// Philosophy -// -// stb libraries are designed with the following priorities: -// -// 1. easy to use -// 2. easy to maintain -// 3. good performance -// -// Sometimes I let "good performance" creep up in priority over "easy to maintain", -// and for best performance I may provide less-easy-to-use APIs that give higher -// performance, in addition to the easy to use ones. Nevertheless, it's important -// to keep in mind that from the standpoint of you, a client of this library, -// all you care about is #1 and #3, and stb libraries do not emphasize #3 above all. -// -// Some secondary priorities arise directly from the first two, some of which -// make more explicit reasons why performance can't be emphasized. -// -// - Portable ("ease of use") -// - Small footprint ("easy to maintain") -// - No dependencies ("ease of use") -// -// =========================================================================== -// -// I/O callbacks -// -// I/O callbacks allow you to read from arbitrary sources, like packaged -// files or some other source. Data read from callbacks are processed -// through a small internal buffer (currently 128 bytes) to try to reduce -// overhead. -// -// The three functions you must define are "read" (reads some bytes of data), -// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end). -// -// =========================================================================== -// -// SIMD support -// -// The JPEG decoder will try to automatically use SIMD kernels on x86 when -// supported by the compiler. For ARM Neon support, you must explicitly -// request it. -// -// (The old do-it-yourself SIMD API is no longer supported in the current -// code.) -// -// On x86, SSE2 will automatically be used when available based on a run-time -// test; if not, the generic C versions are used as a fall-back. On ARM targets, -// the typical path is to have separate builds for NEON and non-NEON devices -// (at least this is true for iOS and Android). Therefore, the NEON support is -// toggled by a build flag: define STBI_NEON to get NEON loops. -// -// The output of the JPEG decoder is slightly different from versions where -// SIMD support was introduced (that is, for versions before 1.49). The -// difference is only +-1 in the 8-bit RGB channels, and only on a small -// fraction of pixels. You can force the pre-1.49 behavior by defining -// STBI_JPEG_OLD, but this will disable some of the SIMD decoding path -// and hence cost some performance. -// -// If for some reason you do not want to use any of SIMD code, or if -// you have issues compiling it, you can disable it entirely by -// defining STBI_NO_SIMD. -// -// =========================================================================== -// -// HDR image support (disable by defining STBI_NO_HDR) -// -// stb_image now supports loading HDR images in general, and currently -// the Radiance .HDR file format, although the support is provided -// generically. You can still load any file through the existing interface; -// if you attempt to load an HDR file, it will be automatically remapped to -// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1; -// both of these constants can be reconfigured through this interface: -// -// stbi_hdr_to_ldr_gamma(2.2f); -// stbi_hdr_to_ldr_scale(1.0f); -// -// (note, do not use _inverse_ constants; stbi_image will invert them -// appropriately). -// -// Additionally, there is a new, parallel interface for loading files as -// (linear) floats to preserve the full dynamic range: -// -// float *data = stbi_loadf(filename, &x, &y, &n, 0); -// -// If you load LDR images through this interface, those images will -// be promoted to floating point values, run through the inverse of -// constants corresponding to the above: -// -// stbi_ldr_to_hdr_scale(1.0f); -// stbi_ldr_to_hdr_gamma(2.2f); -// -// Finally, given a filename (or an open file or memory block--see header -// file for details) containing image data, you can query for the "most -// appropriate" interface to use (that is, whether the image is HDR or -// not), using: -// -// stbi_is_hdr(char *filename); -// -// =========================================================================== -// -// iPhone PNG support: -// -// By default we convert iphone-formatted PNGs back to RGB, even though -// they are internally encoded differently. You can disable this conversion -// by by calling stbi_convert_iphone_png_to_rgb(0), in which case -// you will always just get the native iphone "format" through (which -// is BGR stored in RGB). -// -// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per -// pixel to remove any premultiplied alpha *only* if the image file explicitly -// says there's premultiplied data (currently only happens in iPhone images, -// and only if iPhone convert-to-rgb processing is on). -// - - -#ifndef STBI_NO_STDIO -#include -#endif // STBI_NO_STDIO - -#define STBI_VERSION 1 - -enum -{ - STBI_default = 0, // only used for req_comp - - STBI_grey = 1, - STBI_grey_alpha = 2, - STBI_rgb = 3, - STBI_rgb_alpha = 4 -}; - -typedef unsigned char stbi_uc; - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef STB_IMAGE_STATIC -#define STBIDEF static -#else -#define STBIDEF extern -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// PRIMARY API - works on images of any type -// - -// -// load image by filename, open file, or memory buffer -// - -typedef struct -{ - int (*read) (void *user,char *data,int size); // fill 'data' with 'size' bytes. return number of bytes actually read - void (*skip) (void *user,int n); // skip the next 'n' bytes, or 'unget' the last -n bytes if negative - int (*eof) (void *user); // returns nonzero if we are at end of file/data -} stbi_io_callbacks; - -STBIDEF stbi_uc *stbi_load (char const *filename, int *x, int *y, int *comp, int req_comp); -STBIDEF stbi_uc *stbi_load_from_memory (stbi_uc const *buffer, int len , int *x, int *y, int *comp, int req_comp); -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk , void *user, int *x, int *y, int *comp, int req_comp); - -#ifndef STBI_NO_STDIO -STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); -// for stbi_load_from_file, file pointer is left pointing immediately after image -#endif - -#ifndef STBI_NO_LINEAR - STBIDEF float *stbi_loadf (char const *filename, int *x, int *y, int *comp, int req_comp); - STBIDEF float *stbi_loadf_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp); - STBIDEF float *stbi_loadf_from_callbacks (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp); - - #ifndef STBI_NO_STDIO - STBIDEF float *stbi_loadf_from_file (FILE *f, int *x, int *y, int *comp, int req_comp); - #endif -#endif - -#ifndef STBI_NO_HDR - STBIDEF void stbi_hdr_to_ldr_gamma(float gamma); - STBIDEF void stbi_hdr_to_ldr_scale(float scale); -#endif - -#ifndef STBI_NO_LINEAR - STBIDEF void stbi_ldr_to_hdr_gamma(float gamma); - STBIDEF void stbi_ldr_to_hdr_scale(float scale); -#endif // STBI_NO_HDR - -// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user); -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len); -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr (char const *filename); -STBIDEF int stbi_is_hdr_from_file(FILE *f); -#endif // STBI_NO_STDIO - - -// get a VERY brief reason for failure -// NOT THREADSAFE -STBIDEF const char *stbi_failure_reason (void); - -// free the loaded image -- this is just free() -STBIDEF void stbi_image_free (void *retval_from_stbi_load); - -// get image dimensions & components without fully decoding -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp); -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp); - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info (char const *filename, int *x, int *y, int *comp); -STBIDEF int stbi_info_from_file (FILE *f, int *x, int *y, int *comp); - -#endif - - - -// for image formats that explicitly notate that they have premultiplied alpha, -// we just return the colors as stored in the file. set this flag to force -// unpremultiplication. results are undefined if the unpremultiply overflow. -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply); - -// indicate whether we should process iphone images back to canonical format, -// or just pass them through "as-is" -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert); - -// flip the image vertically, so the first pixel in the output array is the bottom left -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip); - -// ZLIB client - used by PNG, available for other purposes - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen); -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header); -STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen); -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - -STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen); -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen); - - -#ifdef __cplusplus -} -#endif - -// -// -//// end header file ///////////////////////////////////////////////////// -#endif // STBI_INCLUDE_STB_IMAGE_H - -#ifdef STB_IMAGE_IMPLEMENTATION - -#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \ - || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \ - || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \ - || defined(STBI_ONLY_ZLIB) - #ifndef STBI_ONLY_JPEG - #define STBI_NO_JPEG - #endif - #ifndef STBI_ONLY_PNG - #define STBI_NO_PNG - #endif - #ifndef STBI_ONLY_BMP - #define STBI_NO_BMP - #endif - #ifndef STBI_ONLY_PSD - #define STBI_NO_PSD - #endif - #ifndef STBI_ONLY_TGA - #define STBI_NO_TGA - #endif - #ifndef STBI_ONLY_GIF - #define STBI_NO_GIF - #endif - #ifndef STBI_ONLY_HDR - #define STBI_NO_HDR - #endif - #ifndef STBI_ONLY_PIC - #define STBI_NO_PIC - #endif - #ifndef STBI_ONLY_PNM - #define STBI_NO_PNM - #endif -#endif - -#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB) -#define STBI_NO_ZLIB -#endif - - -#include -#include // ptrdiff_t on osx -#include -#include - -#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR) -#include // ldexp -#endif - -#ifndef STBI_NO_STDIO -#include -#endif - -#ifndef STBI_ASSERT -#include -#define STBI_ASSERT(x) assert(x) -#endif - - -#ifndef _MSC_VER - #ifdef __cplusplus - #define stbi_inline inline - #else - #define stbi_inline - #endif -#else - #define stbi_inline __forceinline -#endif - - -#ifdef _MSC_VER -typedef unsigned short stbi__uint16; -typedef signed short stbi__int16; -typedef unsigned int stbi__uint32; -typedef signed int stbi__int32; -#else -#include -typedef uint16_t stbi__uint16; -typedef int16_t stbi__int16; -typedef uint32_t stbi__uint32; -typedef int32_t stbi__int32; -#endif - -// should produce compiler error if size is wrong -typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1]; - -#ifdef _MSC_VER -#define STBI_NOTUSED(v) (void)(v) -#else -#define STBI_NOTUSED(v) (void)sizeof(v) -#endif - -#ifdef _MSC_VER -#define STBI_HAS_LROTL -#endif - -#ifdef STBI_HAS_LROTL - #define stbi_lrot(x,y) _lrotl(x,y) -#else - #define stbi_lrot(x,y) (((x) << (y)) | ((x) >> (32 - (y)))) -#endif - -#if defined(STBI_MALLOC) && defined(STBI_FREE) && defined(STBI_REALLOC) -// ok -#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) -// ok -#else -#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC." -#endif - -#ifndef STBI_MALLOC -#define STBI_MALLOC(sz) malloc(sz) -#define STBI_REALLOC(p,sz) realloc(p,sz) -#define STBI_FREE(p) free(p) -#endif - -// x86/x64 detection -#if defined(__x86_64__) || defined(_M_X64) -#define STBI__X64_TARGET -#elif defined(__i386) || defined(_M_IX86) -#define STBI__X86_TARGET -#endif - -#if defined(__GNUC__) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) -// NOTE: not clear do we actually need this for the 64-bit path? -// gcc doesn't support sse2 intrinsics unless you compile with -msse2, -// (but compiling with -msse2 allows the compiler to use SSE2 everywhere; -// this is just broken and gcc are jerks for not fixing it properly -// http://www.virtualdub.org/blog/pivot/entry.php?id=363 ) -#define STBI_NO_SIMD -#endif - -#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD) -// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET -// -// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the -// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant. -// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not -// simultaneously enabling "-mstackrealign". -// -// See https://github.com/nothings/stb/issues/81 for more information. -// -// So default to no SSE2 on 32-bit MinGW. If you've read this far and added -// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2. -#define STBI_NO_SIMD -#endif - -#if !defined(STBI_NO_SIMD) && defined(STBI__X86_TARGET) -#define STBI_SSE2 -#include - -#ifdef _MSC_VER - -#if _MSC_VER >= 1400 // not VC6 -#include // __cpuid -static int stbi__cpuid3(void) -{ - int info[4]; - __cpuid(info,1); - return info[3]; -} -#else -static int stbi__cpuid3(void) -{ - int res; - __asm { - mov eax,1 - cpuid - mov res,edx - } - return res; -} -#endif - -#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name - -static int stbi__sse2_available() -{ - int info3 = stbi__cpuid3(); - return ((info3 >> 26) & 1) != 0; -} -#else // assume GCC-style if not VC++ -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) - -static int stbi__sse2_available() -{ -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later - // GCC 4.8+ has a nice way to do this - return __builtin_cpu_supports("sse2"); -#else - // portable way to do this, preferably without using GCC inline ASM? - // just bail for now. - return 0; -#endif -} -#endif -#endif - -// ARM NEON -#if defined(STBI_NO_SIMD) && defined(STBI_NEON) -#undef STBI_NEON -#endif - -#ifdef STBI_NEON -#include -// assume GCC or Clang on ARM targets -#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16))) -#endif - -#ifndef STBI_SIMD_ALIGN -#define STBI_SIMD_ALIGN(type, name) type name -#endif - -/////////////////////////////////////////////// -// -// stbi__context struct and start_xxx functions - -// stbi__context structure is our basic context used by all images, so it -// contains all the IO context, plus some basic image information -typedef struct -{ - stbi__uint32 img_x, img_y; - int img_n, img_out_n; - - stbi_io_callbacks io; - void *io_user_data; - - int read_from_callbacks; - int buflen; - stbi_uc buffer_start[128]; - - stbi_uc *img_buffer, *img_buffer_end; - stbi_uc *img_buffer_original, *img_buffer_original_end; -} stbi__context; - - -static void stbi__refill_buffer(stbi__context *s); - -// initialize a memory-decode context -static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len) -{ - s->io.read = NULL; - s->read_from_callbacks = 0; - s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer; - s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len; -} - -// initialize a callback-based context -static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user) -{ - s->io = *c; - s->io_user_data = user; - s->buflen = sizeof(s->buffer_start); - s->read_from_callbacks = 1; - s->img_buffer_original = s->buffer_start; - stbi__refill_buffer(s); - s->img_buffer_original_end = s->img_buffer_end; -} - -#ifndef STBI_NO_STDIO - -static int stbi__stdio_read(void *user, char *data, int size) -{ - return (int) fread(data,1,size,(FILE*) user); -} - -static void stbi__stdio_skip(void *user, int n) -{ - fseek((FILE*) user, n, SEEK_CUR); -} - -static int stbi__stdio_eof(void *user) -{ - return feof((FILE*) user); -} - -static stbi_io_callbacks stbi__stdio_callbacks = -{ - stbi__stdio_read, - stbi__stdio_skip, - stbi__stdio_eof, -}; - -static void stbi__start_file(stbi__context *s, FILE *f) -{ - stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f); -} - -//static void stop_file(stbi__context *s) { } - -#endif // !STBI_NO_STDIO - -static void stbi__rewind(stbi__context *s) -{ - // conceptually rewind SHOULD rewind to the beginning of the stream, - // but we just rewind to the beginning of the initial buffer, because - // we only use it after doing 'test', which only ever looks at at most 92 bytes - s->img_buffer = s->img_buffer_original; - s->img_buffer_end = s->img_buffer_original_end; -} - -#ifndef STBI_NO_JPEG -static int stbi__jpeg_test(stbi__context *s); -static stbi_uc *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNG -static int stbi__png_test(stbi__context *s); -static stbi_uc *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_BMP -static int stbi__bmp_test(stbi__context *s); -static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_TGA -static int stbi__tga_test(stbi__context *s); -static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s); -static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_HDR -static int stbi__hdr_test(stbi__context *s); -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_test(stbi__context *s); -static stbi_uc *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_GIF -static int stbi__gif_test(stbi__context *s); -static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -#ifndef STBI_NO_PNM -static int stbi__pnm_test(stbi__context *s); -static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp); -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp); -#endif - -// this is not threadsafe -static const char *stbi__g_failure_reason; - -STBIDEF const char *stbi_failure_reason(void) -{ - return stbi__g_failure_reason; -} - -static int stbi__err(const char *str) -{ - stbi__g_failure_reason = str; - return 0; -} - -static void *stbi__malloc(size_t size) -{ - return STBI_MALLOC(size); -} - -// stbi__err - error -// stbi__errpf - error returning pointer to float -// stbi__errpuc - error returning pointer to unsigned char - -#ifdef STBI_NO_FAILURE_STRINGS - #define stbi__err(x,y) 0 -#elif defined(STBI_FAILURE_USERMSG) - #define stbi__err(x,y) stbi__err(y) -#else - #define stbi__err(x,y) stbi__err(x) -#endif - -#define stbi__errpf(x,y) ((float *)(size_t) (stbi__err(x,y)?NULL:NULL)) -#define stbi__errpuc(x,y) ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL)) - -STBIDEF void stbi_image_free(void *retval_from_stbi_load) -{ - STBI_FREE(retval_from_stbi_load); -} - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp); -#endif - -#ifndef STBI_NO_HDR -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp); -#endif - -static int stbi__vertically_flip_on_load = 0; - -STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) -{ - stbi__vertically_flip_on_load = flag_true_if_should_flip; -} - -static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - #ifndef STBI_NO_JPEG - if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp); - #endif - #ifndef STBI_NO_PNG - if (stbi__png_test(s)) return stbi__png_load(s,x,y,comp,req_comp); - #endif - #ifndef STBI_NO_BMP - if (stbi__bmp_test(s)) return stbi__bmp_load(s,x,y,comp,req_comp); - #endif - #ifndef STBI_NO_GIF - if (stbi__gif_test(s)) return stbi__gif_load(s,x,y,comp,req_comp); - #endif - #ifndef STBI_NO_PSD - if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp); - #endif - #ifndef STBI_NO_PIC - if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp); - #endif - #ifndef STBI_NO_PNM - if (stbi__pnm_test(s)) return stbi__pnm_load(s,x,y,comp,req_comp); - #endif - - #ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) { - float *hdr = stbi__hdr_load(s, x,y,comp,req_comp); - return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp); - } - #endif - - #ifndef STBI_NO_TGA - // test tga last because it's a crappy test! - if (stbi__tga_test(s)) - return stbi__tga_load(s,x,y,comp,req_comp); - #endif - - return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt"); -} - -static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *result = stbi__load_main(s, x, y, comp, req_comp); - - if (stbi__vertically_flip_on_load && result != NULL) { - int w = *x, h = *y; - int depth = req_comp ? req_comp : *comp; - int row,col,z; - stbi_uc temp; - - // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once - for (row = 0; row < (h>>1); row++) { - for (col = 0; col < w; col++) { - for (z = 0; z < depth; z++) { - temp = result[(row * w + col) * depth + z]; - result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; - result[((h - row - 1) * w + col) * depth + z] = temp; - } - } - } - } - - return result; -} - -#ifndef STBI_NO_HDR -static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) -{ - if (stbi__vertically_flip_on_load && result != NULL) { - int w = *x, h = *y; - int depth = req_comp ? req_comp : *comp; - int row,col,z; - float temp; - - // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once - for (row = 0; row < (h>>1); row++) { - for (col = 0; col < w; col++) { - for (z = 0; z < depth; z++) { - temp = result[(row * w + col) * depth + z]; - result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z]; - result[((h - row - 1) * w + col) * depth + z] = temp; - } - } - } - } -} -#endif - -#ifndef STBI_NO_STDIO - -static FILE *stbi__fopen(char const *filename, char const *mode) -{ - FILE *f; -#if defined(_MSC_VER) && _MSC_VER >= 1400 - if (0 != fopen_s(&f, filename, mode)) - f=0; -#else - f = fopen(filename, mode); -#endif - return f; -} - - -STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - unsigned char *result; - if (!f) return stbi__errpuc("can't fopen", "Unable to open file"); - result = stbi_load_from_file(f,x,y,comp,req_comp); - fclose(f); - return result; -} - -STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *result; - stbi__context s; - stbi__start_file(&s,f); - result = stbi__load_flip(&s,x,y,comp,req_comp); - if (result) { - // need to 'unget' all the characters in the IO buffer - fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR); - } - return result; -} -#endif //!STBI_NO_STDIO - -STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__load_flip(&s,x,y,comp,req_comp); -} - -STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__load_flip(&s,x,y,comp,req_comp); -} - -#ifndef STBI_NO_LINEAR -static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - unsigned char *data; - #ifndef STBI_NO_HDR - if (stbi__hdr_test(s)) { - float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp); - if (hdr_data) - stbi__float_postprocess(hdr_data,x,y,comp,req_comp); - return hdr_data; - } - #endif - data = stbi__load_flip(s, x, y, comp, req_comp); - if (data) - return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp); - return stbi__errpf("unknown image type", "Image not of any known type, or corrupt"); -} - -STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} - -STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} - -#ifndef STBI_NO_STDIO -STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp) -{ - float *result; - FILE *f = stbi__fopen(filename, "rb"); - if (!f) return stbi__errpf("can't fopen", "Unable to open file"); - result = stbi_loadf_from_file(f,x,y,comp,req_comp); - fclose(f); - return result; -} - -STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp) -{ - stbi__context s; - stbi__start_file(&s,f); - return stbi__loadf_main(&s,x,y,comp,req_comp); -} -#endif // !STBI_NO_STDIO - -#endif // !STBI_NO_LINEAR - -// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is -// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always -// reports false! - -STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(buffer); - STBI_NOTUSED(len); - return 0; - #endif -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_is_hdr (char const *filename) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result=0; - if (f) { - result = stbi_is_hdr_from_file(f); - fclose(f); - } - return result; -} - -STBIDEF int stbi_is_hdr_from_file(FILE *f) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_file(&s,f); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(f); - return 0; - #endif -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user) -{ - #ifndef STBI_NO_HDR - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); - return stbi__hdr_test(&s); - #else - STBI_NOTUSED(clbk); - STBI_NOTUSED(user); - return 0; - #endif -} - -static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f; -static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f; - -#ifndef STBI_NO_LINEAR -STBIDEF void stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; } -STBIDEF void stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; } -#endif - -STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; } -STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; } - - -////////////////////////////////////////////////////////////////////////////// -// -// Common code used by all image loaders -// - -enum -{ - STBI__SCAN_load=0, - STBI__SCAN_type, - STBI__SCAN_header -}; - -static void stbi__refill_buffer(stbi__context *s) -{ - int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen); - if (n == 0) { - // at end of file, treat same as if from memory, but need to handle case - // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file - s->read_from_callbacks = 0; - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start+1; - *s->img_buffer = 0; - } else { - s->img_buffer = s->buffer_start; - s->img_buffer_end = s->buffer_start + n; - } -} - -stbi_inline static stbi_uc stbi__get8(stbi__context *s) -{ - if (s->img_buffer < s->img_buffer_end) - return *s->img_buffer++; - if (s->read_from_callbacks) { - stbi__refill_buffer(s); - return *s->img_buffer++; - } - return 0; -} - -stbi_inline static int stbi__at_eof(stbi__context *s) -{ - if (s->io.read) { - if (!(s->io.eof)(s->io_user_data)) return 0; - // if feof() is true, check if buffer = end - // special case: we've only got the special 0 character at the end - if (s->read_from_callbacks == 0) return 1; - } - - return s->img_buffer >= s->img_buffer_end; -} - -static void stbi__skip(stbi__context *s, int n) -{ - if (n < 0) { - s->img_buffer = s->img_buffer_end; - return; - } - if (s->io.read) { - int blen = (int) (s->img_buffer_end - s->img_buffer); - if (blen < n) { - s->img_buffer = s->img_buffer_end; - (s->io.skip)(s->io_user_data, n - blen); - return; - } - } - s->img_buffer += n; -} - -static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n) -{ - if (s->io.read) { - int blen = (int) (s->img_buffer_end - s->img_buffer); - if (blen < n) { - int res, count; - - memcpy(buffer, s->img_buffer, blen); - - count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen); - res = (count == (n-blen)); - s->img_buffer = s->img_buffer_end; - return res; - } - } - - if (s->img_buffer+n <= s->img_buffer_end) { - memcpy(buffer, s->img_buffer, n); - s->img_buffer += n; - return 1; - } else - return 0; -} - -static int stbi__get16be(stbi__context *s) -{ - int z = stbi__get8(s); - return (z << 8) + stbi__get8(s); -} - -static stbi__uint32 stbi__get32be(stbi__context *s) -{ - stbi__uint32 z = stbi__get16be(s); - return (z << 16) + stbi__get16be(s); -} - -#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF) -// nothing -#else -static int stbi__get16le(stbi__context *s) -{ - int z = stbi__get8(s); - return z + (stbi__get8(s) << 8); -} -#endif - -#ifndef STBI_NO_BMP -static stbi__uint32 stbi__get32le(stbi__context *s) -{ - stbi__uint32 z = stbi__get16le(s); - return z + (stbi__get16le(s) << 16); -} -#endif - -#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings - - -////////////////////////////////////////////////////////////////////////////// -// -// generic converter from built-in img_n to req_comp -// individual types do this automatically as much as possible (e.g. jpeg -// does all cases internally since it needs to colorspace convert anyway, -// and it never has alpha, so very few cases ). png can automatically -// interleave an alpha=255 channel, but falls back to this for other cases -// -// assume data buffer is malloced, so malloc a new one and free that one -// only failure mode is malloc failing - -static stbi_uc stbi__compute_y(int r, int g, int b) -{ - return (stbi_uc) (((r*77) + (g*150) + (29*b)) >> 8); -} - -static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y) -{ - int i,j; - unsigned char *good; - - if (req_comp == img_n) return data; - STBI_ASSERT(req_comp >= 1 && req_comp <= 4); - - good = (unsigned char *) stbi__malloc(req_comp * x * y); - if (good == NULL) { - STBI_FREE(data); - return stbi__errpuc("outofmem", "Out of memory"); - } - - for (j=0; j < (int) y; ++j) { - unsigned char *src = data + j * x * img_n ; - unsigned char *dest = good + j * x * req_comp; - - #define COMBO(a,b) ((a)*8+(b)) - #define CASE(a,b) case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b) - // convert source image with img_n components to one with req_comp components; - // avoid switch per pixel, so use switch per scanline and massive macros - switch (COMBO(img_n, req_comp)) { - CASE(1,2) dest[0]=src[0], dest[1]=255; break; - CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break; - CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break; - CASE(2,1) dest[0]=src[0]; break; - CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break; - CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break; - CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break; - CASE(3,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; - CASE(3,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255; break; - CASE(4,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break; - CASE(4,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break; - CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break; - default: STBI_ASSERT(0); - } - #undef CASE - } - - STBI_FREE(data); - return good; -} - -#ifndef STBI_NO_LINEAR -static float *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp) -{ - int i,k,n; - float *output = (float *) stbi__malloc(x * y * comp * sizeof(float)); - if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); } - // compute number of non-alpha components - if (comp & 1) n = comp; else n = comp-1; - for (i=0; i < x*y; ++i) { - for (k=0; k < n; ++k) { - output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale); - } - if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f; - } - STBI_FREE(data); - return output; -} -#endif - -#ifndef STBI_NO_HDR -#define stbi__float2int(x) ((int) (x)) -static stbi_uc *stbi__hdr_to_ldr(float *data, int x, int y, int comp) -{ - int i,k,n; - stbi_uc *output = (stbi_uc *) stbi__malloc(x * y * comp); - if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); } - // compute number of non-alpha components - if (comp & 1) n = comp; else n = comp-1; - for (i=0; i < x*y; ++i) { - for (k=0; k < n; ++k) { - float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f; - if (z < 0) z = 0; - if (z > 255) z = 255; - output[i*comp + k] = (stbi_uc) stbi__float2int(z); - } - if (k < comp) { - float z = data[i*comp+k] * 255 + 0.5f; - if (z < 0) z = 0; - if (z > 255) z = 255; - output[i*comp + k] = (stbi_uc) stbi__float2int(z); - } - } - STBI_FREE(data); - return output; -} -#endif - -////////////////////////////////////////////////////////////////////////////// -// -// "baseline" JPEG/JFIF decoder -// -// simple implementation -// - doesn't support delayed output of y-dimension -// - simple interface (only one output format: 8-bit interleaved RGB) -// - doesn't try to recover corrupt jpegs -// - doesn't allow partial loading, loading multiple at once -// - still fast on x86 (copying globals into locals doesn't help x86) -// - allocates lots of intermediate memory (full size of all components) -// - non-interleaved case requires this anyway -// - allows good upsampling (see next) -// high-quality -// - upsampled channels are bilinearly interpolated, even across blocks -// - quality integer IDCT derived from IJG's 'slow' -// performance -// - fast huffman; reasonable integer IDCT -// - some SIMD kernels for common paths on targets with SSE2/NEON -// - uses a lot of intermediate memory, could cache poorly - -#ifndef STBI_NO_JPEG - -// huffman decoding acceleration -#define FAST_BITS 9 // larger handles more cases; smaller stomps less cache - -typedef struct -{ - stbi_uc fast[1 << FAST_BITS]; - // weirdly, repacking this into AoS is a 10% speed loss, instead of a win - stbi__uint16 code[256]; - stbi_uc values[256]; - stbi_uc size[257]; - unsigned int maxcode[18]; - int delta[17]; // old 'firstsymbol' - old 'firstcode' -} stbi__huffman; - -typedef struct -{ - stbi__context *s; - stbi__huffman huff_dc[4]; - stbi__huffman huff_ac[4]; - stbi_uc dequant[4][64]; - stbi__int16 fast_ac[4][1 << FAST_BITS]; - -// sizes for components, interleaved MCUs - int img_h_max, img_v_max; - int img_mcu_x, img_mcu_y; - int img_mcu_w, img_mcu_h; - -// definition of jpeg image component - struct - { - int id; - int h,v; - int tq; - int hd,ha; - int dc_pred; - - int x,y,w2,h2; - stbi_uc *data; - void *raw_data, *raw_coeff; - stbi_uc *linebuf; - short *coeff; // progressive only - int coeff_w, coeff_h; // number of 8x8 coefficient blocks - } img_comp[4]; - - stbi__uint32 code_buffer; // jpeg entropy-coded buffer - int code_bits; // number of valid bits - unsigned char marker; // marker seen while filling entropy buffer - int nomore; // flag if we saw a marker so must stop - - int progressive; - int spec_start; - int spec_end; - int succ_high; - int succ_low; - int eob_run; - - int scan_n, order[4]; - int restart_interval, todo; - -// kernels - void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]); - void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step); - stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs); -} stbi__jpeg; - -static int stbi__build_huffman(stbi__huffman *h, int *count) -{ - int i,j,k=0,code; - // build size list for each symbol (from JPEG spec) - for (i=0; i < 16; ++i) - for (j=0; j < count[i]; ++j) - h->size[k++] = (stbi_uc) (i+1); - h->size[k] = 0; - - // compute actual symbols (from jpeg spec) - code = 0; - k = 0; - for(j=1; j <= 16; ++j) { - // compute delta to add to code to compute symbol id - h->delta[j] = k - code; - if (h->size[k] == j) { - while (h->size[k] == j) - h->code[k++] = (stbi__uint16) (code++); - if (code-1 >= (1 << j)) return stbi__err("bad code lengths","Corrupt JPEG"); - } - // compute largest code + 1 for this size, preshifted as needed later - h->maxcode[j] = code << (16-j); - code <<= 1; - } - h->maxcode[j] = 0xffffffff; - - // build non-spec acceleration table; 255 is flag for not-accelerated - memset(h->fast, 255, 1 << FAST_BITS); - for (i=0; i < k; ++i) { - int s = h->size[i]; - if (s <= FAST_BITS) { - int c = h->code[i] << (FAST_BITS-s); - int m = 1 << (FAST_BITS-s); - for (j=0; j < m; ++j) { - h->fast[c+j] = (stbi_uc) i; - } - } - } - return 1; -} - -// build a table that decodes both magnitude and value of small ACs in -// one go. -static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h) -{ - int i; - for (i=0; i < (1 << FAST_BITS); ++i) { - stbi_uc fast = h->fast[i]; - fast_ac[i] = 0; - if (fast < 255) { - int rs = h->values[fast]; - int run = (rs >> 4) & 15; - int magbits = rs & 15; - int len = h->size[fast]; - - if (magbits && len + magbits <= FAST_BITS) { - // magnitude code followed by receive_extend code - int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits); - int m = 1 << (magbits - 1); - if (k < m) k += (-1 << magbits) + 1; - // if the result is small enough, we can fit it in fast_ac table - if (k >= -128 && k <= 127) - fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits)); - } - } - } -} - -static void stbi__grow_buffer_unsafe(stbi__jpeg *j) -{ - do { - int b = j->nomore ? 0 : stbi__get8(j->s); - if (b == 0xff) { - int c = stbi__get8(j->s); - if (c != 0) { - j->marker = (unsigned char) c; - j->nomore = 1; - return; - } - } - j->code_buffer |= b << (24 - j->code_bits); - j->code_bits += 8; - } while (j->code_bits <= 24); -} - -// (1 << n) - 1 -static stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535}; - -// decode a jpeg huffman value from the bitstream -stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h) -{ - unsigned int temp; - int c,k; - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - - // look at the top FAST_BITS and determine what symbol ID it is, - // if the code is <= FAST_BITS - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - k = h->fast[c]; - if (k < 255) { - int s = h->size[k]; - if (s > j->code_bits) - return -1; - j->code_buffer <<= s; - j->code_bits -= s; - return h->values[k]; - } - - // naive test is to shift the code_buffer down so k bits are - // valid, then test against maxcode. To speed this up, we've - // preshifted maxcode left so that it has (16-k) 0s at the - // end; in other words, regardless of the number of bits, it - // wants to be compared against something shifted to have 16; - // that way we don't need to shift inside the loop. - temp = j->code_buffer >> 16; - for (k=FAST_BITS+1 ; ; ++k) - if (temp < h->maxcode[k]) - break; - if (k == 17) { - // error! code not found - j->code_bits -= 16; - return -1; - } - - if (k > j->code_bits) - return -1; - - // convert the huffman code to the symbol id - c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k]; - STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]); - - // convert the id to a symbol - j->code_bits -= k; - j->code_buffer <<= k; - return h->values[c]; -} - -// bias[n] = (-1<code_bits < n) stbi__grow_buffer_unsafe(j); - - sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB - k = stbi_lrot(j->code_buffer, n); - STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask))); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k + (stbi__jbias[n] & ~sgn); -} - -// get some unsigned bits -stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n) -{ - unsigned int k; - if (j->code_bits < n) stbi__grow_buffer_unsafe(j); - k = stbi_lrot(j->code_buffer, n); - j->code_buffer = k & ~stbi__bmask[n]; - k &= stbi__bmask[n]; - j->code_bits -= n; - return k; -} - -stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j) -{ - unsigned int k; - if (j->code_bits < 1) stbi__grow_buffer_unsafe(j); - k = j->code_buffer; - j->code_buffer <<= 1; - --j->code_bits; - return k & 0x80000000; -} - -// given a value that's at position X in the zigzag stream, -// where does it appear in the 8x8 matrix coded as row-major? -static stbi_uc stbi__jpeg_dezigzag[64+15] = -{ - 0, 1, 8, 16, 9, 2, 3, 10, - 17, 24, 32, 25, 18, 11, 4, 5, - 12, 19, 26, 33, 40, 48, 41, 34, - 27, 20, 13, 6, 7, 14, 21, 28, - 35, 42, 49, 56, 57, 50, 43, 36, - 29, 22, 15, 23, 30, 37, 44, 51, - 58, 59, 52, 45, 38, 31, 39, 46, - 53, 60, 61, 54, 47, 55, 62, 63, - // let corrupt input sample past end - 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63 -}; - -// decode one 64-entry block-- -static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi_uc *dequant) -{ - int diff,dc,k; - int t; - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - t = stbi__jpeg_huff_decode(j, hdc); - if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - - // 0 all the ac values now so we can do it 32-bits at a time - memset(data,0,64*sizeof(data[0])); - - diff = t ? stbi__extend_receive(j, t) : 0; - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - data[0] = (short) (dc * dequant[0]); - - // decode AC components, see JPEG spec - k = 1; - do { - unsigned int zig; - int c,r,s; - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - r = fac[c]; - if (r) { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - j->code_buffer <<= s; - j->code_bits -= s; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) ((r >> 8) * dequant[zig]); - } else { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (rs != 0xf0) break; // end block - k += 16; - } else { - k += r; - // decode into unzigzag'd location - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]); - } - } - } while (k < 64); - return 1; -} - -static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b) -{ - int diff,dc; - int t; - if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - - if (j->succ_high == 0) { - // first scan for DC coefficient, must be first - memset(data,0,64*sizeof(data[0])); // 0 all the ac values now - t = stbi__jpeg_huff_decode(j, hdc); - diff = t ? stbi__extend_receive(j, t) : 0; - - dc = j->img_comp[b].dc_pred + diff; - j->img_comp[b].dc_pred = dc; - data[0] = (short) (dc << j->succ_low); - } else { - // refinement scan for DC coefficient - if (stbi__jpeg_get_bit(j)) - data[0] += (short) (1 << j->succ_low); - } - return 1; -} - -// @OPTIMIZE: store non-zigzagged during the decode passes, -// and only de-zigzag when dequantizing -static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac) -{ - int k; - if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG"); - - if (j->succ_high == 0) { - int shift = j->succ_low; - - if (j->eob_run) { - --j->eob_run; - return 1; - } - - k = j->spec_start; - do { - unsigned int zig; - int c,r,s; - if (j->code_bits < 16) stbi__grow_buffer_unsafe(j); - c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1); - r = fac[c]; - if (r) { // fast-AC path - k += (r >> 4) & 15; // run - s = r & 15; // combined length - j->code_buffer <<= s; - j->code_bits -= s; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) ((r >> 8) << shift); - } else { - int rs = stbi__jpeg_huff_decode(j, hac); - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (r < 15) { - j->eob_run = (1 << r); - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - --j->eob_run; - break; - } - k += 16; - } else { - k += r; - zig = stbi__jpeg_dezigzag[k++]; - data[zig] = (short) (stbi__extend_receive(j,s) << shift); - } - } - } while (k <= j->spec_end); - } else { - // refinement scan for these AC coefficients - - short bit = (short) (1 << j->succ_low); - - if (j->eob_run) { - --j->eob_run; - for (k = j->spec_start; k <= j->spec_end; ++k) { - short *p = &data[stbi__jpeg_dezigzag[k]]; - if (*p != 0) - if (stbi__jpeg_get_bit(j)) - if ((*p & bit)==0) { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } - } else { - k = j->spec_start; - do { - int r,s; - int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh - if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG"); - s = rs & 15; - r = rs >> 4; - if (s == 0) { - if (r < 15) { - j->eob_run = (1 << r) - 1; - if (r) - j->eob_run += stbi__jpeg_get_bits(j, r); - r = 64; // force end of block - } else { - // r=15 s=0 should write 16 0s, so we just do - // a run of 15 0s and then write s (which is 0), - // so we don't have to do anything special here - } - } else { - if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG"); - // sign bit - if (stbi__jpeg_get_bit(j)) - s = bit; - else - s = -bit; - } - - // advance by r - while (k <= j->spec_end) { - short *p = &data[stbi__jpeg_dezigzag[k++]]; - if (*p != 0) { - if (stbi__jpeg_get_bit(j)) - if ((*p & bit)==0) { - if (*p > 0) - *p += bit; - else - *p -= bit; - } - } else { - if (r == 0) { - *p = (short) s; - break; - } - --r; - } - } - } while (k <= j->spec_end); - } - } - return 1; -} - -// take a -128..127 value and stbi__clamp it and convert to 0..255 -stbi_inline static stbi_uc stbi__clamp(int x) -{ - // trick to use a single test to catch both cases - if ((unsigned int) x > 255) { - if (x < 0) return 0; - if (x > 255) return 255; - } - return (stbi_uc) x; -} - -#define stbi__f2f(x) ((int) (((x) * 4096 + 0.5))) -#define stbi__fsh(x) ((x) << 12) - -// derived from jidctint -- DCT_ISLOW -#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \ - int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \ - p2 = s2; \ - p3 = s6; \ - p1 = (p2+p3) * stbi__f2f(0.5411961f); \ - t2 = p1 + p3*stbi__f2f(-1.847759065f); \ - t3 = p1 + p2*stbi__f2f( 0.765366865f); \ - p2 = s0; \ - p3 = s4; \ - t0 = stbi__fsh(p2+p3); \ - t1 = stbi__fsh(p2-p3); \ - x0 = t0+t3; \ - x3 = t0-t3; \ - x1 = t1+t2; \ - x2 = t1-t2; \ - t0 = s7; \ - t1 = s5; \ - t2 = s3; \ - t3 = s1; \ - p3 = t0+t2; \ - p4 = t1+t3; \ - p1 = t0+t3; \ - p2 = t1+t2; \ - p5 = (p3+p4)*stbi__f2f( 1.175875602f); \ - t0 = t0*stbi__f2f( 0.298631336f); \ - t1 = t1*stbi__f2f( 2.053119869f); \ - t2 = t2*stbi__f2f( 3.072711026f); \ - t3 = t3*stbi__f2f( 1.501321110f); \ - p1 = p5 + p1*stbi__f2f(-0.899976223f); \ - p2 = p5 + p2*stbi__f2f(-2.562915447f); \ - p3 = p3*stbi__f2f(-1.961570560f); \ - p4 = p4*stbi__f2f(-0.390180644f); \ - t3 += p1+p4; \ - t2 += p2+p3; \ - t1 += p2+p4; \ - t0 += p1+p3; - -static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64]) -{ - int i,val[64],*v=val; - stbi_uc *o; - short *d = data; - - // columns - for (i=0; i < 8; ++i,++d, ++v) { - // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing - if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0 - && d[40]==0 && d[48]==0 && d[56]==0) { - // no shortcut 0 seconds - // (1|2|3|4|5|6|7)==0 0 seconds - // all separate -0.047 seconds - // 1 && 2|3 && 4|5 && 6|7: -0.047 seconds - int dcterm = d[0] << 2; - v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm; - } else { - STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56]) - // constants scaled things up by 1<<12; let's bring them back - // down, but keep 2 extra bits of precision - x0 += 512; x1 += 512; x2 += 512; x3 += 512; - v[ 0] = (x0+t3) >> 10; - v[56] = (x0-t3) >> 10; - v[ 8] = (x1+t2) >> 10; - v[48] = (x1-t2) >> 10; - v[16] = (x2+t1) >> 10; - v[40] = (x2-t1) >> 10; - v[24] = (x3+t0) >> 10; - v[32] = (x3-t0) >> 10; - } - } - - for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) { - // no fast case since the first 1D IDCT spread components out - STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7]) - // constants scaled things up by 1<<12, plus we had 1<<2 from first - // loop, plus horizontal and vertical each scale by sqrt(8) so together - // we've got an extra 1<<3, so 1<<17 total we need to remove. - // so we want to round that, which means adding 0.5 * 1<<17, - // aka 65536. Also, we'll end up with -128 to 127 that we want - // to encode as 0..255 by adding 128, so we'll add that before the shift - x0 += 65536 + (128<<17); - x1 += 65536 + (128<<17); - x2 += 65536 + (128<<17); - x3 += 65536 + (128<<17); - // tried computing the shifts into temps, or'ing the temps to see - // if any were out of range, but that was slower - o[0] = stbi__clamp((x0+t3) >> 17); - o[7] = stbi__clamp((x0-t3) >> 17); - o[1] = stbi__clamp((x1+t2) >> 17); - o[6] = stbi__clamp((x1-t2) >> 17); - o[2] = stbi__clamp((x2+t1) >> 17); - o[5] = stbi__clamp((x2-t1) >> 17); - o[3] = stbi__clamp((x3+t0) >> 17); - o[4] = stbi__clamp((x3-t0) >> 17); - } -} - -#ifdef STBI_SSE2 -// sse2 integer IDCT. not the fastest possible implementation but it -// produces bit-identical results to the generic C version so it's -// fully "transparent". -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - // This is constructed to match our regular (generic) integer IDCT exactly. - __m128i row0, row1, row2, row3, row4, row5, row6, row7; - __m128i tmp; - - // dot product constant: even elems=x, odd elems=y - #define dct_const(x,y) _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y)) - - // out(0) = c0[even]*x + c0[odd]*y (c0, x, y 16-bit, out 32-bit) - // out(1) = c1[even]*x + c1[odd]*y - #define dct_rot(out0,out1, x,y,c0,c1) \ - __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \ - __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \ - __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \ - __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \ - __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \ - __m128i out1##_h = _mm_madd_epi16(c0##hi, c1) - - // out = in << 12 (in 16-bit, out 32-bit) - #define dct_widen(out, in) \ - __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \ - __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4) - - // wide add - #define dct_wadd(out, a, b) \ - __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_add_epi32(a##_h, b##_h) - - // wide sub - #define dct_wsub(out, a, b) \ - __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \ - __m128i out##_h = _mm_sub_epi32(a##_h, b##_h) - - // butterfly a/b, add bias, then shift by "s" and pack - #define dct_bfly32o(out0, out1, a,b,bias,s) \ - { \ - __m128i abiased_l = _mm_add_epi32(a##_l, bias); \ - __m128i abiased_h = _mm_add_epi32(a##_h, bias); \ - dct_wadd(sum, abiased, b); \ - dct_wsub(dif, abiased, b); \ - out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \ - out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \ - } - - // 8-bit interleave step (for transposes) - #define dct_interleave8(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi8(a, b); \ - b = _mm_unpackhi_epi8(tmp, b) - - // 16-bit interleave step (for transposes) - #define dct_interleave16(a, b) \ - tmp = a; \ - a = _mm_unpacklo_epi16(a, b); \ - b = _mm_unpackhi_epi16(tmp, b) - - #define dct_pass(bias,shift) \ - { \ - /* even part */ \ - dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \ - __m128i sum04 = _mm_add_epi16(row0, row4); \ - __m128i dif04 = _mm_sub_epi16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \ - dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \ - __m128i sum17 = _mm_add_epi16(row1, row7); \ - __m128i sum35 = _mm_add_epi16(row3, row5); \ - dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \ - dct_wadd(x4, y0o, y4o); \ - dct_wadd(x5, y1o, y5o); \ - dct_wadd(x6, y2o, y5o); \ - dct_wadd(x7, y3o, y4o); \ - dct_bfly32o(row0,row7, x0,x7,bias,shift); \ - dct_bfly32o(row1,row6, x1,x6,bias,shift); \ - dct_bfly32o(row2,row5, x2,x5,bias,shift); \ - dct_bfly32o(row3,row4, x3,x4,bias,shift); \ - } - - __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f)); - __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f)); - __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f)); - __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f)); - __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f)); - __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f)); - __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f)); - __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f)); - - // rounding biases in column/row passes, see stbi__idct_block for explanation. - __m128i bias_0 = _mm_set1_epi32(512); - __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17)); - - // load - row0 = _mm_load_si128((const __m128i *) (data + 0*8)); - row1 = _mm_load_si128((const __m128i *) (data + 1*8)); - row2 = _mm_load_si128((const __m128i *) (data + 2*8)); - row3 = _mm_load_si128((const __m128i *) (data + 3*8)); - row4 = _mm_load_si128((const __m128i *) (data + 4*8)); - row5 = _mm_load_si128((const __m128i *) (data + 5*8)); - row6 = _mm_load_si128((const __m128i *) (data + 6*8)); - row7 = _mm_load_si128((const __m128i *) (data + 7*8)); - - // column pass - dct_pass(bias_0, 10); - - { - // 16bit 8x8 transpose pass 1 - dct_interleave16(row0, row4); - dct_interleave16(row1, row5); - dct_interleave16(row2, row6); - dct_interleave16(row3, row7); - - // transpose pass 2 - dct_interleave16(row0, row2); - dct_interleave16(row1, row3); - dct_interleave16(row4, row6); - dct_interleave16(row5, row7); - - // transpose pass 3 - dct_interleave16(row0, row1); - dct_interleave16(row2, row3); - dct_interleave16(row4, row5); - dct_interleave16(row6, row7); - } - - // row pass - dct_pass(bias_1, 17); - - { - // pack - __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7 - __m128i p1 = _mm_packus_epi16(row2, row3); - __m128i p2 = _mm_packus_epi16(row4, row5); - __m128i p3 = _mm_packus_epi16(row6, row7); - - // 8bit 8x8 transpose pass 1 - dct_interleave8(p0, p2); // a0e0a1e1... - dct_interleave8(p1, p3); // c0g0c1g1... - - // transpose pass 2 - dct_interleave8(p0, p1); // a0c0e0g0... - dct_interleave8(p2, p3); // b0d0f0h0... - - // transpose pass 3 - dct_interleave8(p0, p2); // a0b0c0d0... - dct_interleave8(p1, p3); // a4b4c4d4... - - // store - _mm_storel_epi64((__m128i *) out, p0); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p2); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p1); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride; - _mm_storel_epi64((__m128i *) out, p3); out += out_stride; - _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e)); - } - -#undef dct_const -#undef dct_rot -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_interleave8 -#undef dct_interleave16 -#undef dct_pass -} - -#endif // STBI_SSE2 - -#ifdef STBI_NEON - -// NEON integer IDCT. should produce bit-identical -// results to the generic C version. -static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64]) -{ - int16x8_t row0, row1, row2, row3, row4, row5, row6, row7; - - int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f)); - int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f)); - int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f)); - int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f)); - int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f)); - int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f)); - int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f)); - int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f)); - int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f)); - int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f)); - int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f)); - int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f)); - -#define dct_long_mul(out, inq, coeff) \ - int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff) - -#define dct_long_mac(out, acc, inq, coeff) \ - int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \ - int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff) - -#define dct_widen(out, inq) \ - int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \ - int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12) - -// wide add -#define dct_wadd(out, a, b) \ - int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vaddq_s32(a##_h, b##_h) - -// wide sub -#define dct_wsub(out, a, b) \ - int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \ - int32x4_t out##_h = vsubq_s32(a##_h, b##_h) - -// butterfly a/b, then shift using "shiftop" by "s" and pack -#define dct_bfly32o(out0,out1, a,b,shiftop,s) \ - { \ - dct_wadd(sum, a, b); \ - dct_wsub(dif, a, b); \ - out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \ - out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \ - } - -#define dct_pass(shiftop, shift) \ - { \ - /* even part */ \ - int16x8_t sum26 = vaddq_s16(row2, row6); \ - dct_long_mul(p1e, sum26, rot0_0); \ - dct_long_mac(t2e, p1e, row6, rot0_1); \ - dct_long_mac(t3e, p1e, row2, rot0_2); \ - int16x8_t sum04 = vaddq_s16(row0, row4); \ - int16x8_t dif04 = vsubq_s16(row0, row4); \ - dct_widen(t0e, sum04); \ - dct_widen(t1e, dif04); \ - dct_wadd(x0, t0e, t3e); \ - dct_wsub(x3, t0e, t3e); \ - dct_wadd(x1, t1e, t2e); \ - dct_wsub(x2, t1e, t2e); \ - /* odd part */ \ - int16x8_t sum15 = vaddq_s16(row1, row5); \ - int16x8_t sum17 = vaddq_s16(row1, row7); \ - int16x8_t sum35 = vaddq_s16(row3, row5); \ - int16x8_t sum37 = vaddq_s16(row3, row7); \ - int16x8_t sumodd = vaddq_s16(sum17, sum35); \ - dct_long_mul(p5o, sumodd, rot1_0); \ - dct_long_mac(p1o, p5o, sum17, rot1_1); \ - dct_long_mac(p2o, p5o, sum35, rot1_2); \ - dct_long_mul(p3o, sum37, rot2_0); \ - dct_long_mul(p4o, sum15, rot2_1); \ - dct_wadd(sump13o, p1o, p3o); \ - dct_wadd(sump24o, p2o, p4o); \ - dct_wadd(sump23o, p2o, p3o); \ - dct_wadd(sump14o, p1o, p4o); \ - dct_long_mac(x4, sump13o, row7, rot3_0); \ - dct_long_mac(x5, sump24o, row5, rot3_1); \ - dct_long_mac(x6, sump23o, row3, rot3_2); \ - dct_long_mac(x7, sump14o, row1, rot3_3); \ - dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \ - dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \ - dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \ - dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \ - } - - // load - row0 = vld1q_s16(data + 0*8); - row1 = vld1q_s16(data + 1*8); - row2 = vld1q_s16(data + 2*8); - row3 = vld1q_s16(data + 3*8); - row4 = vld1q_s16(data + 4*8); - row5 = vld1q_s16(data + 5*8); - row6 = vld1q_s16(data + 6*8); - row7 = vld1q_s16(data + 7*8); - - // add DC bias - row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0)); - - // column pass - dct_pass(vrshrn_n_s32, 10); - - // 16bit 8x8 transpose - { -// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively. -// whether compilers actually get this is another story, sadly. -#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; } -#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); } -#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); } - - // pass 1 - dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6 - dct_trn16(row2, row3); - dct_trn16(row4, row5); - dct_trn16(row6, row7); - - // pass 2 - dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4 - dct_trn32(row1, row3); - dct_trn32(row4, row6); - dct_trn32(row5, row7); - - // pass 3 - dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0 - dct_trn64(row1, row5); - dct_trn64(row2, row6); - dct_trn64(row3, row7); - -#undef dct_trn16 -#undef dct_trn32 -#undef dct_trn64 - } - - // row pass - // vrshrn_n_s32 only supports shifts up to 16, we need - // 17. so do a non-rounding shift of 16 first then follow - // up with a rounding shift by 1. - dct_pass(vshrn_n_s32, 16); - - { - // pack and round - uint8x8_t p0 = vqrshrun_n_s16(row0, 1); - uint8x8_t p1 = vqrshrun_n_s16(row1, 1); - uint8x8_t p2 = vqrshrun_n_s16(row2, 1); - uint8x8_t p3 = vqrshrun_n_s16(row3, 1); - uint8x8_t p4 = vqrshrun_n_s16(row4, 1); - uint8x8_t p5 = vqrshrun_n_s16(row5, 1); - uint8x8_t p6 = vqrshrun_n_s16(row6, 1); - uint8x8_t p7 = vqrshrun_n_s16(row7, 1); - - // again, these can translate into one instruction, but often don't. -#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; } -#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); } -#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); } - - // sadly can't use interleaved stores here since we only write - // 8 bytes to each scan line! - - // 8x8 8-bit transpose pass 1 - dct_trn8_8(p0, p1); - dct_trn8_8(p2, p3); - dct_trn8_8(p4, p5); - dct_trn8_8(p6, p7); - - // pass 2 - dct_trn8_16(p0, p2); - dct_trn8_16(p1, p3); - dct_trn8_16(p4, p6); - dct_trn8_16(p5, p7); - - // pass 3 - dct_trn8_32(p0, p4); - dct_trn8_32(p1, p5); - dct_trn8_32(p2, p6); - dct_trn8_32(p3, p7); - - // store - vst1_u8(out, p0); out += out_stride; - vst1_u8(out, p1); out += out_stride; - vst1_u8(out, p2); out += out_stride; - vst1_u8(out, p3); out += out_stride; - vst1_u8(out, p4); out += out_stride; - vst1_u8(out, p5); out += out_stride; - vst1_u8(out, p6); out += out_stride; - vst1_u8(out, p7); - -#undef dct_trn8_8 -#undef dct_trn8_16 -#undef dct_trn8_32 - } - -#undef dct_long_mul -#undef dct_long_mac -#undef dct_widen -#undef dct_wadd -#undef dct_wsub -#undef dct_bfly32o -#undef dct_pass -} - -#endif // STBI_NEON - -#define STBI__MARKER_none 0xff -// if there's a pending marker from the entropy stream, return that -// otherwise, fetch from the stream and get a marker. if there's no -// marker, return 0xff, which is never a valid marker value -static stbi_uc stbi__get_marker(stbi__jpeg *j) -{ - stbi_uc x; - if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; } - x = stbi__get8(j->s); - if (x != 0xff) return STBI__MARKER_none; - while (x == 0xff) - x = stbi__get8(j->s); - return x; -} - -// in each scan, we'll have scan_n components, and the order -// of the components is specified by order[] -#define STBI__RESTART(x) ((x) >= 0xd0 && (x) <= 0xd7) - -// after a restart interval, stbi__jpeg_reset the entropy decoder and -// the dc prediction -static void stbi__jpeg_reset(stbi__jpeg *j) -{ - j->code_bits = 0; - j->code_buffer = 0; - j->nomore = 0; - j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0; - j->marker = STBI__MARKER_none; - j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff; - j->eob_run = 0; - // no more than 1<<31 MCUs if no restart_interal? that's plenty safe, - // since we don't even allow 1<<30 pixels -} - -static int stbi__parse_entropy_coded_data(stbi__jpeg *z) -{ - stbi__jpeg_reset(z); - if (!z->progressive) { - if (z->scan_n == 1) { - int i,j; - STBI_SIMD_ALIGN(short, data[64]); - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - // if it's NOT a restart, then just bail, so we get corrupt data - // rather than no data - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } else { // interleaved - int i,j,k,x,y; - STBI_SIMD_ALIGN(short, data[64]); - for (j=0; j < z->img_mcu_y; ++j) { - for (i=0; i < z->img_mcu_x; ++i) { - // scan an interleaved mcu... process scan_n components in order - for (k=0; k < z->scan_n; ++k) { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y=0; y < z->img_comp[n].v; ++y) { - for (x=0; x < z->img_comp[n].h; ++x) { - int x2 = (i*z->img_comp[n].h + x)*8; - int y2 = (j*z->img_comp[n].v + y)*8; - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0; - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data); - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } else { - if (z->scan_n == 1) { - int i,j; - int n = z->order[0]; - // non-interleaved data, we just need to process one block at a time, - // in trivial scanline order - // number of blocks to do just depends on how many actual "pixels" this - // component has, independent of interleaved MCU blocking and such - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - if (z->spec_start == 0) { - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } else { - int ha = z->img_comp[n].ha; - if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha])) - return 0; - } - // every data block is an MCU, so countdown the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } else { // interleaved - int i,j,k,x,y; - for (j=0; j < z->img_mcu_y; ++j) { - for (i=0; i < z->img_mcu_x; ++i) { - // scan an interleaved mcu... process scan_n components in order - for (k=0; k < z->scan_n; ++k) { - int n = z->order[k]; - // scan out an mcu's worth of this component; that's just determined - // by the basic H and V specified for the component - for (y=0; y < z->img_comp[n].v; ++y) { - for (x=0; x < z->img_comp[n].h; ++x) { - int x2 = (i*z->img_comp[n].h + x); - int y2 = (j*z->img_comp[n].v + y); - short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w); - if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n)) - return 0; - } - } - } - // after all interleaved components, that's an interleaved MCU, - // so now count down the restart interval - if (--z->todo <= 0) { - if (z->code_bits < 24) stbi__grow_buffer_unsafe(z); - if (!STBI__RESTART(z->marker)) return 1; - stbi__jpeg_reset(z); - } - } - } - return 1; - } - } -} - -static void stbi__jpeg_dequantize(short *data, stbi_uc *dequant) -{ - int i; - for (i=0; i < 64; ++i) - data[i] *= dequant[i]; -} - -static void stbi__jpeg_finish(stbi__jpeg *z) -{ - if (z->progressive) { - // dequantize and idct the data - int i,j,n; - for (n=0; n < z->s->img_n; ++n) { - int w = (z->img_comp[n].x+7) >> 3; - int h = (z->img_comp[n].y+7) >> 3; - for (j=0; j < h; ++j) { - for (i=0; i < w; ++i) { - short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w); - stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]); - z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data); - } - } - } - } -} - -static int stbi__process_marker(stbi__jpeg *z, int m) -{ - int L; - switch (m) { - case STBI__MARKER_none: // no marker found - return stbi__err("expected marker","Corrupt JPEG"); - - case 0xDD: // DRI - specify restart interval - if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG"); - z->restart_interval = stbi__get16be(z->s); - return 1; - - case 0xDB: // DQT - define quantization table - L = stbi__get16be(z->s)-2; - while (L > 0) { - int q = stbi__get8(z->s); - int p = q >> 4; - int t = q & 15,i; - if (p != 0) return stbi__err("bad DQT type","Corrupt JPEG"); - if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); - for (i=0; i < 64; ++i) - z->dequant[t][stbi__jpeg_dezigzag[i]] = stbi__get8(z->s); - L -= 65; - } - return L==0; - - case 0xC4: // DHT - define huffman table - L = stbi__get16be(z->s)-2; - while (L > 0) { - stbi_uc *v; - int sizes[16],i,n=0; - int q = stbi__get8(z->s); - int tc = q >> 4; - int th = q & 15; - if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG"); - for (i=0; i < 16; ++i) { - sizes[i] = stbi__get8(z->s); - n += sizes[i]; - } - L -= 17; - if (tc == 0) { - if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0; - v = z->huff_dc[th].values; - } else { - if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0; - v = z->huff_ac[th].values; - } - for (i=0; i < n; ++i) - v[i] = stbi__get8(z->s); - if (tc != 0) - stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th); - L -= n; - } - return L==0; - } - // check for comment block or APP blocks - if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) { - stbi__skip(z->s, stbi__get16be(z->s)-2); - return 1; - } - return 0; -} - -// after we see SOS -static int stbi__process_scan_header(stbi__jpeg *z) -{ - int i; - int Ls = stbi__get16be(z->s); - z->scan_n = stbi__get8(z->s); - if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG"); - if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG"); - for (i=0; i < z->scan_n; ++i) { - int id = stbi__get8(z->s), which; - int q = stbi__get8(z->s); - for (which = 0; which < z->s->img_n; ++which) - if (z->img_comp[which].id == id) - break; - if (which == z->s->img_n) return 0; // no match - z->img_comp[which].hd = q >> 4; if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG"); - z->img_comp[which].ha = q & 15; if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG"); - z->order[i] = which; - } - - { - int aa; - z->spec_start = stbi__get8(z->s); - z->spec_end = stbi__get8(z->s); // should be 63, but might be 0 - aa = stbi__get8(z->s); - z->succ_high = (aa >> 4); - z->succ_low = (aa & 15); - if (z->progressive) { - if (z->spec_start > 63 || z->spec_end > 63 || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13) - return stbi__err("bad SOS", "Corrupt JPEG"); - } else { - if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG"); - if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG"); - z->spec_end = 63; - } - } - - return 1; -} - -static int stbi__process_frame_header(stbi__jpeg *z, int scan) -{ - stbi__context *s = z->s; - int Lf,p,i,q, h_max=1,v_max=1,c; - Lf = stbi__get16be(s); if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG - p = stbi__get8(s); if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline - s->img_y = stbi__get16be(s); if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG - s->img_x = stbi__get16be(s); if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires - c = stbi__get8(s); - if (c != 3 && c != 1) return stbi__err("bad component count","Corrupt JPEG"); // JFIF requires - s->img_n = c; - for (i=0; i < c; ++i) { - z->img_comp[i].data = NULL; - z->img_comp[i].linebuf = NULL; - } - - if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG"); - - for (i=0; i < s->img_n; ++i) { - z->img_comp[i].id = stbi__get8(s); - if (z->img_comp[i].id != i+1) // JFIF requires - if (z->img_comp[i].id != i) // some version of jpegtran outputs non-JFIF-compliant files! - return stbi__err("bad component ID","Corrupt JPEG"); - q = stbi__get8(s); - z->img_comp[i].h = (q >> 4); if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG"); - z->img_comp[i].v = q & 15; if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG"); - z->img_comp[i].tq = stbi__get8(s); if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG"); - } - - if (scan != STBI__SCAN_load) return 1; - - if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); - - for (i=0; i < s->img_n; ++i) { - if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h; - if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v; - } - - // compute interleaved mcu info - z->img_h_max = h_max; - z->img_v_max = v_max; - z->img_mcu_w = h_max * 8; - z->img_mcu_h = v_max * 8; - z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w; - z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h; - - for (i=0; i < s->img_n; ++i) { - // number of effective pixels (e.g. for non-interleaved MCU) - z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max; - z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max; - // to simplify generation, we'll allocate enough memory to decode - // the bogus oversized data from using interleaved MCUs and their - // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't - // discard the extra data until colorspace conversion - z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8; - z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8; - z->img_comp[i].raw_data = stbi__malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15); - - if (z->img_comp[i].raw_data == NULL) { - for(--i; i >= 0; --i) { - STBI_FREE(z->img_comp[i].raw_data); - z->img_comp[i].raw_data = NULL; - } - return stbi__err("outofmem", "Out of memory"); - } - // align blocks for idct using mmx/sse - z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15); - z->img_comp[i].linebuf = NULL; - if (z->progressive) { - z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3; - z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3; - z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15); - z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15); - } else { - z->img_comp[i].coeff = 0; - z->img_comp[i].raw_coeff = 0; - } - } - - return 1; -} - -// use comparisons since in some cases we handle more than one case (e.g. SOF) -#define stbi__DNL(x) ((x) == 0xdc) -#define stbi__SOI(x) ((x) == 0xd8) -#define stbi__EOI(x) ((x) == 0xd9) -#define stbi__SOF(x) ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2) -#define stbi__SOS(x) ((x) == 0xda) - -#define stbi__SOF_progressive(x) ((x) == 0xc2) - -static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan) -{ - int m; - z->marker = STBI__MARKER_none; // initialize cached marker to empty - m = stbi__get_marker(z); - if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG"); - if (scan == STBI__SCAN_type) return 1; - m = stbi__get_marker(z); - while (!stbi__SOF(m)) { - if (!stbi__process_marker(z,m)) return 0; - m = stbi__get_marker(z); - while (m == STBI__MARKER_none) { - // some files have extra padding after their blocks, so ok, we'll scan - if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG"); - m = stbi__get_marker(z); - } - } - z->progressive = stbi__SOF_progressive(m); - if (!stbi__process_frame_header(z, scan)) return 0; - return 1; -} - -// decode image to YCbCr format -static int stbi__decode_jpeg_image(stbi__jpeg *j) -{ - int m; - for (m = 0; m < 4; m++) { - j->img_comp[m].raw_data = NULL; - j->img_comp[m].raw_coeff = NULL; - } - j->restart_interval = 0; - if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0; - m = stbi__get_marker(j); - while (!stbi__EOI(m)) { - if (stbi__SOS(m)) { - if (!stbi__process_scan_header(j)) return 0; - if (!stbi__parse_entropy_coded_data(j)) return 0; - if (j->marker == STBI__MARKER_none ) { - // handle 0s at the end of image data from IP Kamera 9060 - while (!stbi__at_eof(j->s)) { - int x = stbi__get8(j->s); - if (x == 255) { - j->marker = stbi__get8(j->s); - break; - } else if (x != 0) { - return stbi__err("junk before marker", "Corrupt JPEG"); - } - } - // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0 - } - } else { - if (!stbi__process_marker(j, m)) return 0; - } - m = stbi__get_marker(j); - } - if (j->progressive) - stbi__jpeg_finish(j); - return 1; -} - -// static jfif-centered resampling (across block boundaries) - -typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1, - int w, int hs); - -#define stbi__div4(x) ((stbi_uc) ((x) >> 2)) - -static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - STBI_NOTUSED(out); - STBI_NOTUSED(in_far); - STBI_NOTUSED(w); - STBI_NOTUSED(hs); - return in_near; -} - -static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples vertically for every one in input - int i; - STBI_NOTUSED(hs); - for (i=0; i < w; ++i) - out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2); - return out; -} - -static stbi_uc* stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate two samples horizontally for every one in input - int i; - stbi_uc *input = in_near; - - if (w == 1) { - // if only one sample, can't do any interpolation - out[0] = out[1] = input[0]; - return out; - } - - out[0] = input[0]; - out[1] = stbi__div4(input[0]*3 + input[1] + 2); - for (i=1; i < w-1; ++i) { - int n = 3*input[i]+2; - out[i*2+0] = stbi__div4(n+input[i-1]); - out[i*2+1] = stbi__div4(n+input[i+1]); - } - out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2); - out[i*2+1] = input[w-1]; - - STBI_NOTUSED(in_far); - STBI_NOTUSED(hs); - - return out; -} - -#define stbi__div16(x) ((stbi_uc) ((x) >> 4)) - -static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i,t0,t1; - if (w == 1) { - out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3*in_near[0] + in_far[0]; - out[0] = stbi__div4(t1+2); - for (i=1; i < w; ++i) { - t0 = t1; - t1 = 3*in_near[i]+in_far[i]; - out[i*2-1] = stbi__div16(3*t0 + t1 + 8); - out[i*2 ] = stbi__div16(3*t1 + t0 + 8); - } - out[w*2-1] = stbi__div4(t1+2); - - STBI_NOTUSED(hs); - - return out; -} - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // need to generate 2x2 samples for every one in input - int i=0,t0,t1; - - if (w == 1) { - out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2); - return out; - } - - t1 = 3*in_near[0] + in_far[0]; - // process groups of 8 pixels for as long as we can. - // note we can't handle the last pixel in a row in this loop - // because we need to handle the filter boundary conditions. - for (; i < ((w-1) & ~7); i += 8) { -#if defined(STBI_SSE2) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - __m128i zero = _mm_setzero_si128(); - __m128i farb = _mm_loadl_epi64((__m128i *) (in_far + i)); - __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i)); - __m128i farw = _mm_unpacklo_epi8(farb, zero); - __m128i nearw = _mm_unpacklo_epi8(nearb, zero); - __m128i diff = _mm_sub_epi16(farw, nearw); - __m128i nears = _mm_slli_epi16(nearw, 2); - __m128i curr = _mm_add_epi16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - __m128i prv0 = _mm_slli_si128(curr, 2); - __m128i nxt0 = _mm_srli_si128(curr, 2); - __m128i prev = _mm_insert_epi16(prv0, t1, 0); - __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - __m128i bias = _mm_set1_epi16(8); - __m128i curs = _mm_slli_epi16(curr, 2); - __m128i prvd = _mm_sub_epi16(prev, curr); - __m128i nxtd = _mm_sub_epi16(next, curr); - __m128i curb = _mm_add_epi16(curs, bias); - __m128i even = _mm_add_epi16(prvd, curb); - __m128i odd = _mm_add_epi16(nxtd, curb); - - // interleave even and odd pixels, then undo scaling. - __m128i int0 = _mm_unpacklo_epi16(even, odd); - __m128i int1 = _mm_unpackhi_epi16(even, odd); - __m128i de0 = _mm_srli_epi16(int0, 4); - __m128i de1 = _mm_srli_epi16(int1, 4); - - // pack and write output - __m128i outv = _mm_packus_epi16(de0, de1); - _mm_storeu_si128((__m128i *) (out + i*2), outv); -#elif defined(STBI_NEON) - // load and perform the vertical filtering pass - // this uses 3*x + y = 4*x + (y - x) - uint8x8_t farb = vld1_u8(in_far + i); - uint8x8_t nearb = vld1_u8(in_near + i); - int16x8_t diff = vreinterpretq_s16_u16(vsubl_u8(farb, nearb)); - int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2)); - int16x8_t curr = vaddq_s16(nears, diff); // current row - - // horizontal filter works the same based on shifted vers of current - // row. "prev" is current row shifted right by 1 pixel; we need to - // insert the previous pixel value (from t1). - // "next" is current row shifted left by 1 pixel, with first pixel - // of next block of 8 pixels added in. - int16x8_t prv0 = vextq_s16(curr, curr, 7); - int16x8_t nxt0 = vextq_s16(curr, curr, 1); - int16x8_t prev = vsetq_lane_s16(t1, prv0, 0); - int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7); - - // horizontal filter, polyphase implementation since it's convenient: - // even pixels = 3*cur + prev = cur*4 + (prev - cur) - // odd pixels = 3*cur + next = cur*4 + (next - cur) - // note the shared term. - int16x8_t curs = vshlq_n_s16(curr, 2); - int16x8_t prvd = vsubq_s16(prev, curr); - int16x8_t nxtd = vsubq_s16(next, curr); - int16x8_t even = vaddq_s16(curs, prvd); - int16x8_t odd = vaddq_s16(curs, nxtd); - - // undo scaling and round, then store with even/odd phases interleaved - uint8x8x2_t o; - o.val[0] = vqrshrun_n_s16(even, 4); - o.val[1] = vqrshrun_n_s16(odd, 4); - vst2_u8(out + i*2, o); -#endif - - // "previous" value for next iter - t1 = 3*in_near[i+7] + in_far[i+7]; - } - - t0 = t1; - t1 = 3*in_near[i] + in_far[i]; - out[i*2] = stbi__div16(3*t1 + t0 + 8); - - for (++i; i < w; ++i) { - t0 = t1; - t1 = 3*in_near[i]+in_far[i]; - out[i*2-1] = stbi__div16(3*t0 + t1 + 8); - out[i*2 ] = stbi__div16(3*t1 + t0 + 8); - } - out[w*2-1] = stbi__div4(t1+2); - - STBI_NOTUSED(hs); - - return out; -} -#endif - -static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs) -{ - // resample with nearest-neighbor - int i,j; - STBI_NOTUSED(in_far); - for (i=0; i < w; ++i) - for (j=0; j < hs; ++j) - out[i*hs+j] = in_near[i]; - return out; -} - -#ifdef STBI_JPEG_OLD -// this is the same YCbCr-to-RGB calculation that stb_image has used -// historically before the algorithm changes in 1.49 -#define float2fixed(x) ((int) ((x) * 65536 + 0.5)) -static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) -{ - int i; - for (i=0; i < count; ++i) { - int y_fixed = (y[i] << 16) + 32768; // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr*float2fixed(1.40200f); - g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f); - b = y_fixed + cb*float2fixed(1.77200f); - r >>= 16; - g >>= 16; - b >>= 16; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} -#else -// this is a reduced-precision calculation of YCbCr-to-RGB introduced -// to make sure the code produces the same results in both SIMD and scalar -#define float2fixed(x) (((int) ((x) * 4096.0f + 0.5f)) << 8) -static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step) -{ - int i; - for (i=0; i < count; ++i) { - int y_fixed = (y[i] << 20) + (1<<19); // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr* float2fixed(1.40200f); - g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb* float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} -#endif - -#if defined(STBI_SSE2) || defined(STBI_NEON) -static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step) -{ - int i = 0; - -#ifdef STBI_SSE2 - // step == 3 is pretty ugly on the final interleave, and i'm not convinced - // it's useful in practice (you wouldn't use it for textures, for example). - // so just accelerate step == 4 case. - if (step == 4) { - // this is a fairly straightforward implementation and not super-optimized. - __m128i signflip = _mm_set1_epi8(-0x80); - __m128i cr_const0 = _mm_set1_epi16( (short) ( 1.40200f*4096.0f+0.5f)); - __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f)); - __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f)); - __m128i cb_const1 = _mm_set1_epi16( (short) ( 1.77200f*4096.0f+0.5f)); - __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128); - __m128i xw = _mm_set1_epi16(255); // alpha channel - - for (; i+7 < count; i += 8) { - // load - __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i)); - __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i)); - __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i)); - __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128 - __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128 - - // unpack to short (and left-shift cr, cb by 8) - __m128i yw = _mm_unpacklo_epi8(y_bias, y_bytes); - __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased); - __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased); - - // color transform - __m128i yws = _mm_srli_epi16(yw, 4); - __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw); - __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw); - __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1); - __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1); - __m128i rws = _mm_add_epi16(cr0, yws); - __m128i gwt = _mm_add_epi16(cb0, yws); - __m128i bws = _mm_add_epi16(yws, cb1); - __m128i gws = _mm_add_epi16(gwt, cr1); - - // descale - __m128i rw = _mm_srai_epi16(rws, 4); - __m128i bw = _mm_srai_epi16(bws, 4); - __m128i gw = _mm_srai_epi16(gws, 4); - - // back to byte, set up for transpose - __m128i brb = _mm_packus_epi16(rw, bw); - __m128i gxb = _mm_packus_epi16(gw, xw); - - // transpose to interleave channels - __m128i t0 = _mm_unpacklo_epi8(brb, gxb); - __m128i t1 = _mm_unpackhi_epi8(brb, gxb); - __m128i o0 = _mm_unpacklo_epi16(t0, t1); - __m128i o1 = _mm_unpackhi_epi16(t0, t1); - - // store - _mm_storeu_si128((__m128i *) (out + 0), o0); - _mm_storeu_si128((__m128i *) (out + 16), o1); - out += 32; - } - } -#endif - -#ifdef STBI_NEON - // in this version, step=3 support would be easy to add. but is there demand? - if (step == 4) { - // this is a fairly straightforward implementation and not super-optimized. - uint8x8_t signflip = vdup_n_u8(0x80); - int16x8_t cr_const0 = vdupq_n_s16( (short) ( 1.40200f*4096.0f+0.5f)); - int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f)); - int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f)); - int16x8_t cb_const1 = vdupq_n_s16( (short) ( 1.77200f*4096.0f+0.5f)); - - for (; i+7 < count; i += 8) { - // load - uint8x8_t y_bytes = vld1_u8(y + i); - uint8x8_t cr_bytes = vld1_u8(pcr + i); - uint8x8_t cb_bytes = vld1_u8(pcb + i); - int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip)); - int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip)); - - // expand to s16 - int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4)); - int16x8_t crw = vshll_n_s8(cr_biased, 7); - int16x8_t cbw = vshll_n_s8(cb_biased, 7); - - // color transform - int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0); - int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0); - int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1); - int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1); - int16x8_t rws = vaddq_s16(yws, cr0); - int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1); - int16x8_t bws = vaddq_s16(yws, cb1); - - // undo scaling, round, convert to byte - uint8x8x4_t o; - o.val[0] = vqrshrun_n_s16(rws, 4); - o.val[1] = vqrshrun_n_s16(gws, 4); - o.val[2] = vqrshrun_n_s16(bws, 4); - o.val[3] = vdup_n_u8(255); - - // store, interleaving r/g/b/a - vst4_u8(out, o); - out += 8*4; - } - } -#endif - - for (; i < count; ++i) { - int y_fixed = (y[i] << 20) + (1<<19); // rounding - int r,g,b; - int cr = pcr[i] - 128; - int cb = pcb[i] - 128; - r = y_fixed + cr* float2fixed(1.40200f); - g = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000); - b = y_fixed + cb* float2fixed(1.77200f); - r >>= 20; - g >>= 20; - b >>= 20; - if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; } - if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; } - if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; } - out[0] = (stbi_uc)r; - out[1] = (stbi_uc)g; - out[2] = (stbi_uc)b; - out[3] = 255; - out += step; - } -} -#endif - -// set up the kernels -static void stbi__setup_jpeg(stbi__jpeg *j) -{ - j->idct_block_kernel = stbi__idct_block; - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row; - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2; - -#ifdef STBI_SSE2 - if (stbi__sse2_available()) { - j->idct_block_kernel = stbi__idct_simd; - #ifndef STBI_JPEG_OLD - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - #endif - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; - } -#endif - -#ifdef STBI_NEON - j->idct_block_kernel = stbi__idct_simd; - #ifndef STBI_JPEG_OLD - j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd; - #endif - j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd; -#endif -} - -// clean up the temporary component buffers -static void stbi__cleanup_jpeg(stbi__jpeg *j) -{ - int i; - for (i=0; i < j->s->img_n; ++i) { - if (j->img_comp[i].raw_data) { - STBI_FREE(j->img_comp[i].raw_data); - j->img_comp[i].raw_data = NULL; - j->img_comp[i].data = NULL; - } - if (j->img_comp[i].raw_coeff) { - STBI_FREE(j->img_comp[i].raw_coeff); - j->img_comp[i].raw_coeff = 0; - j->img_comp[i].coeff = 0; - } - if (j->img_comp[i].linebuf) { - STBI_FREE(j->img_comp[i].linebuf); - j->img_comp[i].linebuf = NULL; - } - } -} - -typedef struct -{ - resample_row_func resample; - stbi_uc *line0,*line1; - int hs,vs; // expansion factor in each axis - int w_lores; // horizontal pixels pre-expansion - int ystep; // how far through vertical expansion we are - int ypos; // which pre-expansion row we're on -} stbi__resample; - -static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp) -{ - int n, decode_n; - z->s->img_n = 0; // make stbi__cleanup_jpeg safe - - // validate req_comp - if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); - - // load a jpeg image from whichever source, but leave in YCbCr format - if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; } - - // determine actual number of components to generate - n = req_comp ? req_comp : z->s->img_n; - - if (z->s->img_n == 3 && n < 3) - decode_n = 1; - else - decode_n = z->s->img_n; - - // resample and color-convert - { - int k; - unsigned int i,j; - stbi_uc *output; - stbi_uc *coutput[4]; - - stbi__resample res_comp[4]; - - for (k=0; k < decode_n; ++k) { - stbi__resample *r = &res_comp[k]; - - // allocate line buffer big enough for upsampling off the edges - // with upsample factor of 4 - z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3); - if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } - - r->hs = z->img_h_max / z->img_comp[k].h; - r->vs = z->img_v_max / z->img_comp[k].v; - r->ystep = r->vs >> 1; - r->w_lores = (z->s->img_x + r->hs-1) / r->hs; - r->ypos = 0; - r->line0 = r->line1 = z->img_comp[k].data; - - if (r->hs == 1 && r->vs == 1) r->resample = resample_row_1; - else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2; - else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2; - else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel; - else r->resample = stbi__resample_row_generic; - } - - // can't error after this so, this is safe - output = (stbi_uc *) stbi__malloc(n * z->s->img_x * z->s->img_y + 1); - if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); } - - // now go ahead and resample - for (j=0; j < z->s->img_y; ++j) { - stbi_uc *out = output + n * z->s->img_x * j; - for (k=0; k < decode_n; ++k) { - stbi__resample *r = &res_comp[k]; - int y_bot = r->ystep >= (r->vs >> 1); - coutput[k] = r->resample(z->img_comp[k].linebuf, - y_bot ? r->line1 : r->line0, - y_bot ? r->line0 : r->line1, - r->w_lores, r->hs); - if (++r->ystep >= r->vs) { - r->ystep = 0; - r->line0 = r->line1; - if (++r->ypos < z->img_comp[k].y) - r->line1 += z->img_comp[k].w2; - } - } - if (n >= 3) { - stbi_uc *y = coutput[0]; - if (z->s->img_n == 3) { - z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); - } else - for (i=0; i < z->s->img_x; ++i) { - out[0] = out[1] = out[2] = y[i]; - out[3] = 255; // not used if n==3 - out += n; - } - } else { - stbi_uc *y = coutput[0]; - if (n == 1) - for (i=0; i < z->s->img_x; ++i) out[i] = y[i]; - else - for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255; - } - } - stbi__cleanup_jpeg(z); - *out_x = z->s->img_x; - *out_y = z->s->img_y; - if (comp) *comp = z->s->img_n; // report original components, not output - return output; - } -} - -static unsigned char *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__jpeg j; - j.s = s; - stbi__setup_jpeg(&j); - return load_jpeg_image(&j, x,y,comp,req_comp); -} - -static int stbi__jpeg_test(stbi__context *s) -{ - int r; - stbi__jpeg j; - j.s = s; - stbi__setup_jpeg(&j); - r = stbi__decode_jpeg_header(&j, STBI__SCAN_type); - stbi__rewind(s); - return r; -} - -static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp) -{ - if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) { - stbi__rewind( j->s ); - return 0; - } - if (x) *x = j->s->img_x; - if (y) *y = j->s->img_y; - if (comp) *comp = j->s->img_n; - return 1; -} - -static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__jpeg j; - j.s = s; - return stbi__jpeg_info_raw(&j, x, y, comp); -} -#endif - -// public domain zlib decode v0.2 Sean Barrett 2006-11-18 -// simple implementation -// - all input must be provided in an upfront buffer -// - all output is written to a single output buffer (can malloc/realloc) -// performance -// - fast huffman - -#ifndef STBI_NO_ZLIB - -// fast-way is faster to check than jpeg huffman, but slow way is slower -#define STBI__ZFAST_BITS 9 // accelerate all cases in default tables -#define STBI__ZFAST_MASK ((1 << STBI__ZFAST_BITS) - 1) - -// zlib-style huffman encoding -// (jpegs packs from left, zlib from right, so can't share code) -typedef struct -{ - stbi__uint16 fast[1 << STBI__ZFAST_BITS]; - stbi__uint16 firstcode[16]; - int maxcode[17]; - stbi__uint16 firstsymbol[16]; - stbi_uc size[288]; - stbi__uint16 value[288]; -} stbi__zhuffman; - -stbi_inline static int stbi__bitreverse16(int n) -{ - n = ((n & 0xAAAA) >> 1) | ((n & 0x5555) << 1); - n = ((n & 0xCCCC) >> 2) | ((n & 0x3333) << 2); - n = ((n & 0xF0F0) >> 4) | ((n & 0x0F0F) << 4); - n = ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); - return n; -} - -stbi_inline static int stbi__bit_reverse(int v, int bits) -{ - STBI_ASSERT(bits <= 16); - // to bit reverse n bits, reverse 16 and shift - // e.g. 11 bits, bit reverse and shift away 5 - return stbi__bitreverse16(v) >> (16-bits); -} - -static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num) -{ - int i,k=0; - int code, next_code[16], sizes[17]; - - // DEFLATE spec for generating codes - memset(sizes, 0, sizeof(sizes)); - memset(z->fast, 0, sizeof(z->fast)); - for (i=0; i < num; ++i) - ++sizes[sizelist[i]]; - sizes[0] = 0; - for (i=1; i < 16; ++i) - if (sizes[i] > (1 << i)) - return stbi__err("bad sizes", "Corrupt PNG"); - code = 0; - for (i=1; i < 16; ++i) { - next_code[i] = code; - z->firstcode[i] = (stbi__uint16) code; - z->firstsymbol[i] = (stbi__uint16) k; - code = (code + sizes[i]); - if (sizes[i]) - if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG"); - z->maxcode[i] = code << (16-i); // preshift for inner loop - code <<= 1; - k += sizes[i]; - } - z->maxcode[16] = 0x10000; // sentinel - for (i=0; i < num; ++i) { - int s = sizelist[i]; - if (s) { - int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s]; - stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i); - z->size [c] = (stbi_uc ) s; - z->value[c] = (stbi__uint16) i; - if (s <= STBI__ZFAST_BITS) { - int j = stbi__bit_reverse(next_code[s],s); - while (j < (1 << STBI__ZFAST_BITS)) { - z->fast[j] = fastv; - j += (1 << s); - } - } - ++next_code[s]; - } - } - return 1; -} - -// zlib-from-memory implementation for PNG reading -// because PNG allows splitting the zlib stream arbitrarily, -// and it's annoying structurally to have PNG call ZLIB call PNG, -// we require PNG read all the IDATs and combine them into a single -// memory buffer - -typedef struct -{ - stbi_uc *zbuffer, *zbuffer_end; - int num_bits; - stbi__uint32 code_buffer; - - char *zout; - char *zout_start; - char *zout_end; - int z_expandable; - - stbi__zhuffman z_length, z_distance; -} stbi__zbuf; - -stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z) -{ - if (z->zbuffer >= z->zbuffer_end) return 0; - return *z->zbuffer++; -} - -static void stbi__fill_bits(stbi__zbuf *z) -{ - do { - STBI_ASSERT(z->code_buffer < (1U << z->num_bits)); - z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits; - z->num_bits += 8; - } while (z->num_bits <= 24); -} - -stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n) -{ - unsigned int k; - if (z->num_bits < n) stbi__fill_bits(z); - k = z->code_buffer & ((1 << n) - 1); - z->code_buffer >>= n; - z->num_bits -= n; - return k; -} - -static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b,s,k; - // not resolved by fast table, so compute it the slow way - // use jpeg approach, which requires MSbits at top - k = stbi__bit_reverse(a->code_buffer, 16); - for (s=STBI__ZFAST_BITS+1; ; ++s) - if (k < z->maxcode[s]) - break; - if (s == 16) return -1; // invalid code! - // code size is s, so: - b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s]; - STBI_ASSERT(z->size[b] == s); - a->code_buffer >>= s; - a->num_bits -= s; - return z->value[b]; -} - -stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z) -{ - int b,s; - if (a->num_bits < 16) stbi__fill_bits(a); - b = z->fast[a->code_buffer & STBI__ZFAST_MASK]; - if (b) { - s = b >> 9; - a->code_buffer >>= s; - a->num_bits -= s; - return b & 511; - } - return stbi__zhuffman_decode_slowpath(a, z); -} - -static int stbi__zexpand(stbi__zbuf *z, char *zout, int n) // need to make room for n bytes -{ - char *q; - int cur, limit; - z->zout = zout; - if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG"); - cur = (int) (z->zout - z->zout_start); - limit = (int) (z->zout_end - z->zout_start); - while (cur + n > limit) - limit *= 2; - q = (char *) STBI_REALLOC(z->zout_start, limit); - if (q == NULL) return stbi__err("outofmem", "Out of memory"); - z->zout_start = q; - z->zout = q + cur; - z->zout_end = q + limit; - return 1; -} - -static int stbi__zlength_base[31] = { - 3,4,5,6,7,8,9,10,11,13, - 15,17,19,23,27,31,35,43,51,59, - 67,83,99,115,131,163,195,227,258,0,0 }; - -static int stbi__zlength_extra[31]= -{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 }; - -static int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193, -257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0}; - -static int stbi__zdist_extra[32] = -{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; - -static int stbi__parse_huffman_block(stbi__zbuf *a) -{ - char *zout = a->zout; - for(;;) { - int z = stbi__zhuffman_decode(a, &a->z_length); - if (z < 256) { - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes - if (zout >= a->zout_end) { - if (!stbi__zexpand(a, zout, 1)) return 0; - zout = a->zout; - } - *zout++ = (char) z; - } else { - stbi_uc *p; - int len,dist; - if (z == 256) { - a->zout = zout; - return 1; - } - z -= 257; - len = stbi__zlength_base[z]; - if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]); - z = stbi__zhuffman_decode(a, &a->z_distance); - if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); - dist = stbi__zdist_base[z]; - if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]); - if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG"); - if (zout + len > a->zout_end) { - if (!stbi__zexpand(a, zout, len)) return 0; - zout = a->zout; - } - p = (stbi_uc *) (zout - dist); - if (dist == 1) { // run of one byte; common in images. - stbi_uc v = *p; - if (len) { do *zout++ = v; while (--len); } - } else { - if (len) { do *zout++ = *p++; while (--len); } - } - } - } -} - -static int stbi__compute_huffman_codes(stbi__zbuf *a) -{ - static stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; - stbi__zhuffman z_codelength; - stbi_uc lencodes[286+32+137];//padding for maximum single op - stbi_uc codelength_sizes[19]; - int i,n; - - int hlit = stbi__zreceive(a,5) + 257; - int hdist = stbi__zreceive(a,5) + 1; - int hclen = stbi__zreceive(a,4) + 4; - - memset(codelength_sizes, 0, sizeof(codelength_sizes)); - for (i=0; i < hclen; ++i) { - int s = stbi__zreceive(a,3); - codelength_sizes[length_dezigzag[i]] = (stbi_uc) s; - } - if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0; - - n = 0; - while (n < hlit + hdist) { - int c = stbi__zhuffman_decode(a, &z_codelength); - if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG"); - if (c < 16) - lencodes[n++] = (stbi_uc) c; - else if (c == 16) { - c = stbi__zreceive(a,2)+3; - memset(lencodes+n, lencodes[n-1], c); - n += c; - } else if (c == 17) { - c = stbi__zreceive(a,3)+3; - memset(lencodes+n, 0, c); - n += c; - } else { - STBI_ASSERT(c == 18); - c = stbi__zreceive(a,7)+11; - memset(lencodes+n, 0, c); - n += c; - } - } - if (n != hlit+hdist) return stbi__err("bad codelengths","Corrupt PNG"); - if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0; - if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0; - return 1; -} - -static int stbi__parse_uncomperssed_block(stbi__zbuf *a) -{ - stbi_uc header[4]; - int len,nlen,k; - if (a->num_bits & 7) - stbi__zreceive(a, a->num_bits & 7); // discard - // drain the bit-packed data into header - k = 0; - while (a->num_bits > 0) { - header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check - a->code_buffer >>= 8; - a->num_bits -= 8; - } - STBI_ASSERT(a->num_bits == 0); - // now fill header the normal way - while (k < 4) - header[k++] = stbi__zget8(a); - len = header[1] * 256 + header[0]; - nlen = header[3] * 256 + header[2]; - if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG"); - if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG"); - if (a->zout + len > a->zout_end) - if (!stbi__zexpand(a, a->zout, len)) return 0; - memcpy(a->zout, a->zbuffer, len); - a->zbuffer += len; - a->zout += len; - return 1; -} - -static int stbi__parse_zlib_header(stbi__zbuf *a) -{ - int cmf = stbi__zget8(a); - int cm = cmf & 15; - /* int cinfo = cmf >> 4; */ - int flg = stbi__zget8(a); - if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec - if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png - if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png - // window = 1 << (8 + cinfo)... but who cares, we fully buffer output - return 1; -} - -// @TODO: should statically initialize these for optimal thread safety -static stbi_uc stbi__zdefault_length[288], stbi__zdefault_distance[32]; -static void stbi__init_zdefaults(void) -{ - int i; // use <= to match clearly with spec - for (i=0; i <= 143; ++i) stbi__zdefault_length[i] = 8; - for ( ; i <= 255; ++i) stbi__zdefault_length[i] = 9; - for ( ; i <= 279; ++i) stbi__zdefault_length[i] = 7; - for ( ; i <= 287; ++i) stbi__zdefault_length[i] = 8; - - for (i=0; i <= 31; ++i) stbi__zdefault_distance[i] = 5; -} - -static int stbi__parse_zlib(stbi__zbuf *a, int parse_header) -{ - int final, type; - if (parse_header) - if (!stbi__parse_zlib_header(a)) return 0; - a->num_bits = 0; - a->code_buffer = 0; - do { - final = stbi__zreceive(a,1); - type = stbi__zreceive(a,2); - if (type == 0) { - if (!stbi__parse_uncomperssed_block(a)) return 0; - } else if (type == 3) { - return 0; - } else { - if (type == 1) { - // use fixed code lengths - if (!stbi__zdefault_distance[31]) stbi__init_zdefaults(); - if (!stbi__zbuild_huffman(&a->z_length , stbi__zdefault_length , 288)) return 0; - if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance, 32)) return 0; - } else { - if (!stbi__compute_huffman_codes(a)) return 0; - } - if (!stbi__parse_huffman_block(a)) return 0; - } - } while (!final); - return 1; -} - -static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header) -{ - a->zout_start = obuf; - a->zout = obuf; - a->zout_end = obuf + olen; - a->z_expandable = exp; - - return stbi__parse_zlib(a, parse_header); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(initial_size); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, 1)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen) -{ - return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen); -} - -STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(initial_size); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer + len; - if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *) ibuffer; - a.zbuffer_end = (stbi_uc *) ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 1)) - return (int) (a.zout - a.zout_start); - else - return -1; -} - -STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen) -{ - stbi__zbuf a; - char *p = (char *) stbi__malloc(16384); - if (p == NULL) return NULL; - a.zbuffer = (stbi_uc *) buffer; - a.zbuffer_end = (stbi_uc *) buffer+len; - if (stbi__do_zlib(&a, p, 16384, 1, 0)) { - if (outlen) *outlen = (int) (a.zout - a.zout_start); - return a.zout_start; - } else { - STBI_FREE(a.zout_start); - return NULL; - } -} - -STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) -{ - stbi__zbuf a; - a.zbuffer = (stbi_uc *) ibuffer; - a.zbuffer_end = (stbi_uc *) ibuffer + ilen; - if (stbi__do_zlib(&a, obuffer, olen, 0, 0)) - return (int) (a.zout - a.zout_start); - else - return -1; -} -#endif - -// public domain "baseline" PNG decoder v0.10 Sean Barrett 2006-11-18 -// simple implementation -// - only 8-bit samples -// - no CRC checking -// - allocates lots of intermediate memory -// - avoids problem of streaming data between subsystems -// - avoids explicit window management -// performance -// - uses stb_zlib, a PD zlib implementation with fast huffman decoding - -#ifndef STBI_NO_PNG -typedef struct -{ - stbi__uint32 length; - stbi__uint32 type; -} stbi__pngchunk; - -static stbi__pngchunk stbi__get_chunk_header(stbi__context *s) -{ - stbi__pngchunk c; - c.length = stbi__get32be(s); - c.type = stbi__get32be(s); - return c; -} - -static int stbi__check_png_header(stbi__context *s) -{ - static stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 }; - int i; - for (i=0; i < 8; ++i) - if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG"); - return 1; -} - -typedef struct -{ - stbi__context *s; - stbi_uc *idata, *expanded, *out; -} stbi__png; - - -enum { - STBI__F_none=0, - STBI__F_sub=1, - STBI__F_up=2, - STBI__F_avg=3, - STBI__F_paeth=4, - // synthetic filters used for first scanline to avoid needing a dummy row of 0s - STBI__F_avg_first, - STBI__F_paeth_first -}; - -static stbi_uc first_row_filter[5] = -{ - STBI__F_none, - STBI__F_sub, - STBI__F_none, - STBI__F_avg_first, - STBI__F_paeth_first -}; - -static int stbi__paeth(int a, int b, int c) -{ - int p = a + b - c; - int pa = abs(p-a); - int pb = abs(p-b); - int pc = abs(p-c); - if (pa <= pb && pa <= pc) return a; - if (pb <= pc) return b; - return c; -} - -static stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 }; - -// create the png data from post-deflated data -static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color) -{ - stbi__context *s = a->s; - stbi__uint32 i,j,stride = x*out_n; - stbi__uint32 img_len, img_width_bytes; - int k; - int img_n = s->img_n; // copy it into a local for later - - STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1); - a->out = (stbi_uc *) stbi__malloc(x * y * out_n); // extra bytes to write off the end into - if (!a->out) return stbi__err("outofmem", "Out of memory"); - - img_width_bytes = (((img_n * x * depth) + 7) >> 3); - img_len = (img_width_bytes + 1) * y; - if (s->img_x == x && s->img_y == y) { - if (raw_len != img_len) return stbi__err("not enough pixels","Corrupt PNG"); - } else { // interlaced: - if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG"); - } - - for (j=0; j < y; ++j) { - stbi_uc *cur = a->out + stride*j; - stbi_uc *prior = cur - stride; - int filter = *raw++; - int filter_bytes = img_n; - int width = x; - if (filter > 4) - return stbi__err("invalid filter","Corrupt PNG"); - - if (depth < 8) { - STBI_ASSERT(img_width_bytes <= x); - cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place - filter_bytes = 1; - width = img_width_bytes; - } - - // if first row, use special filter that doesn't sample previous row - if (j == 0) filter = first_row_filter[filter]; - - // handle first byte explicitly - for (k=0; k < filter_bytes; ++k) { - switch (filter) { - case STBI__F_none : cur[k] = raw[k]; break; - case STBI__F_sub : cur[k] = raw[k]; break; - case STBI__F_up : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; - case STBI__F_avg : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break; - case STBI__F_paeth : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break; - case STBI__F_avg_first : cur[k] = raw[k]; break; - case STBI__F_paeth_first: cur[k] = raw[k]; break; - } - } - - if (depth == 8) { - if (img_n != out_n) - cur[img_n] = 255; // first pixel - raw += img_n; - cur += out_n; - prior += out_n; - } else { - raw += 1; - cur += 1; - prior += 1; - } - - // this is a little gross, so that we don't switch per-pixel or per-component - if (depth < 8 || img_n == out_n) { - int nk = (width - 1)*img_n; - #define CASE(f) \ - case f: \ - for (k=0; k < nk; ++k) - switch (filter) { - // "none" filter turns into a memcpy here; make that explicit. - case STBI__F_none: memcpy(cur, raw, nk); break; - CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); break; - CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; - CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); break; - CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); break; - CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); break; - CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); break; - } - #undef CASE - raw += nk; - } else { - STBI_ASSERT(img_n+1 == out_n); - #define CASE(f) \ - case f: \ - for (i=x-1; i >= 1; --i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \ - for (k=0; k < img_n; ++k) - switch (filter) { - CASE(STBI__F_none) cur[k] = raw[k]; break; - CASE(STBI__F_sub) cur[k] = STBI__BYTECAST(raw[k] + cur[k-out_n]); break; - CASE(STBI__F_up) cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break; - CASE(STBI__F_avg) cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-out_n])>>1)); break; - CASE(STBI__F_paeth) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],prior[k],prior[k-out_n])); break; - CASE(STBI__F_avg_first) cur[k] = STBI__BYTECAST(raw[k] + (cur[k-out_n] >> 1)); break; - CASE(STBI__F_paeth_first) cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],0,0)); break; - } - #undef CASE - } - } - - // we make a separate pass to expand bits to pixels; for performance, - // this could run two scanlines behind the above code, so it won't - // interfere with filtering but will still be in the cache. - if (depth < 8) { - for (j=0; j < y; ++j) { - stbi_uc *cur = a->out + stride*j; - stbi_uc *in = a->out + stride*j + x*out_n - img_width_bytes; - // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit - // png guarantee byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop - stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range - - // note that the final byte might overshoot and write more data than desired. - // we can allocate enough data that this never writes out of memory, but it - // could also overwrite the next scanline. can it overwrite non-empty data - // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel. - // so we need to explicitly clamp the final ones - - if (depth == 4) { - for (k=x*img_n; k >= 2; k-=2, ++in) { - *cur++ = scale * ((*in >> 4) ); - *cur++ = scale * ((*in ) & 0x0f); - } - if (k > 0) *cur++ = scale * ((*in >> 4) ); - } else if (depth == 2) { - for (k=x*img_n; k >= 4; k-=4, ++in) { - *cur++ = scale * ((*in >> 6) ); - *cur++ = scale * ((*in >> 4) & 0x03); - *cur++ = scale * ((*in >> 2) & 0x03); - *cur++ = scale * ((*in ) & 0x03); - } - if (k > 0) *cur++ = scale * ((*in >> 6) ); - if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03); - if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03); - } else if (depth == 1) { - for (k=x*img_n; k >= 8; k-=8, ++in) { - *cur++ = scale * ((*in >> 7) ); - *cur++ = scale * ((*in >> 6) & 0x01); - *cur++ = scale * ((*in >> 5) & 0x01); - *cur++ = scale * ((*in >> 4) & 0x01); - *cur++ = scale * ((*in >> 3) & 0x01); - *cur++ = scale * ((*in >> 2) & 0x01); - *cur++ = scale * ((*in >> 1) & 0x01); - *cur++ = scale * ((*in ) & 0x01); - } - if (k > 0) *cur++ = scale * ((*in >> 7) ); - if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01); - if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01); - if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01); - if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01); - if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01); - if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01); - } - if (img_n != out_n) { - int q; - // insert alpha = 255 - cur = a->out + stride*j; - if (img_n == 1) { - for (q=x-1; q >= 0; --q) { - cur[q*2+1] = 255; - cur[q*2+0] = cur[q]; - } - } else { - STBI_ASSERT(img_n == 3); - for (q=x-1; q >= 0; --q) { - cur[q*4+3] = 255; - cur[q*4+2] = cur[q*3+2]; - cur[q*4+1] = cur[q*3+1]; - cur[q*4+0] = cur[q*3+0]; - } - } - } - } - } - - return 1; -} - -static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced) -{ - stbi_uc *final; - int p; - if (!interlaced) - return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color); - - // de-interlacing - final = (stbi_uc *) stbi__malloc(a->s->img_x * a->s->img_y * out_n); - for (p=0; p < 7; ++p) { - int xorig[] = { 0,4,0,2,0,1,0 }; - int yorig[] = { 0,0,4,0,2,0,1 }; - int xspc[] = { 8,8,4,4,2,2,1 }; - int yspc[] = { 8,8,8,4,4,2,2 }; - int i,j,x,y; - // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1 - x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p]; - y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p]; - if (x && y) { - stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y; - if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) { - STBI_FREE(final); - return 0; - } - for (j=0; j < y; ++j) { - for (i=0; i < x; ++i) { - int out_y = j*yspc[p]+yorig[p]; - int out_x = i*xspc[p]+xorig[p]; - memcpy(final + out_y*a->s->img_x*out_n + out_x*out_n, - a->out + (j*x+i)*out_n, out_n); - } - } - STBI_FREE(a->out); - image_data += img_len; - image_data_len -= img_len; - } - } - a->out = final; - - return 1; -} - -static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - // compute color-based transparency, assuming we've - // already got 255 as the alpha value in the output - STBI_ASSERT(out_n == 2 || out_n == 4); - - if (out_n == 2) { - for (i=0; i < pixel_count; ++i) { - p[1] = (p[0] == tc[0] ? 0 : 255); - p += 2; - } - } else { - for (i=0; i < pixel_count; ++i) { - if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2]) - p[3] = 0; - p += 4; - } - } - return 1; -} - -static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n) -{ - stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y; - stbi_uc *p, *temp_out, *orig = a->out; - - p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n); - if (p == NULL) return stbi__err("outofmem", "Out of memory"); - - // between here and free(out) below, exiting would leak - temp_out = p; - - if (pal_img_n == 3) { - for (i=0; i < pixel_count; ++i) { - int n = orig[i]*4; - p[0] = palette[n ]; - p[1] = palette[n+1]; - p[2] = palette[n+2]; - p += 3; - } - } else { - for (i=0; i < pixel_count; ++i) { - int n = orig[i]*4; - p[0] = palette[n ]; - p[1] = palette[n+1]; - p[2] = palette[n+2]; - p[3] = palette[n+3]; - p += 4; - } - } - STBI_FREE(a->out); - a->out = temp_out; - - STBI_NOTUSED(len); - - return 1; -} - -static int stbi__unpremultiply_on_load = 0; -static int stbi__de_iphone_flag = 0; - -STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply) -{ - stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply; -} - -STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert) -{ - stbi__de_iphone_flag = flag_true_if_should_convert; -} - -static void stbi__de_iphone(stbi__png *z) -{ - stbi__context *s = z->s; - stbi__uint32 i, pixel_count = s->img_x * s->img_y; - stbi_uc *p = z->out; - - if (s->img_out_n == 3) { // convert bgr to rgb - for (i=0; i < pixel_count; ++i) { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 3; - } - } else { - STBI_ASSERT(s->img_out_n == 4); - if (stbi__unpremultiply_on_load) { - // convert bgr to rgb and unpremultiply - for (i=0; i < pixel_count; ++i) { - stbi_uc a = p[3]; - stbi_uc t = p[0]; - if (a) { - p[0] = p[2] * 255 / a; - p[1] = p[1] * 255 / a; - p[2] = t * 255 / a; - } else { - p[0] = p[2]; - p[2] = t; - } - p += 4; - } - } else { - // convert bgr to rgb - for (i=0; i < pixel_count; ++i) { - stbi_uc t = p[0]; - p[0] = p[2]; - p[2] = t; - p += 4; - } - } - } -} - -#define STBI__PNG_TYPE(a,b,c,d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d)) - -static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp) -{ - stbi_uc palette[1024], pal_img_n=0; - stbi_uc has_trans=0, tc[3]; - stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0; - int first=1,k,interlace=0, color=0, depth=0, is_iphone=0; - stbi__context *s = z->s; - - z->expanded = NULL; - z->idata = NULL; - z->out = NULL; - - if (!stbi__check_png_header(s)) return 0; - - if (scan == STBI__SCAN_type) return 1; - - for (;;) { - stbi__pngchunk c = stbi__get_chunk_header(s); - switch (c.type) { - case STBI__PNG_TYPE('C','g','B','I'): - is_iphone = 1; - stbi__skip(s, c.length); - break; - case STBI__PNG_TYPE('I','H','D','R'): { - int comp,filter; - if (!first) return stbi__err("multiple IHDR","Corrupt PNG"); - first = 0; - if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG"); - s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); - s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)"); - depth = stbi__get8(s); if (depth != 1 && depth != 2 && depth != 4 && depth != 8) return stbi__err("1/2/4/8-bit only","PNG not supported: 1/2/4/8-bit only"); - color = stbi__get8(s); if (color > 6) return stbi__err("bad ctype","Corrupt PNG"); - if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG"); - comp = stbi__get8(s); if (comp) return stbi__err("bad comp method","Corrupt PNG"); - filter= stbi__get8(s); if (filter) return stbi__err("bad filter method","Corrupt PNG"); - interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG"); - if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG"); - if (!pal_img_n) { - s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0); - if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode"); - if (scan == STBI__SCAN_header) return 1; - } else { - // if paletted, then pal_n is our final components, and - // img_n is # components to decompress/filter. - s->img_n = 1; - if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG"); - // if SCAN_header, have to scan to see if we have a tRNS - } - break; - } - - case STBI__PNG_TYPE('P','L','T','E'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG"); - pal_len = c.length / 3; - if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG"); - for (i=0; i < pal_len; ++i) { - palette[i*4+0] = stbi__get8(s); - palette[i*4+1] = stbi__get8(s); - palette[i*4+2] = stbi__get8(s); - palette[i*4+3] = 255; - } - break; - } - - case STBI__PNG_TYPE('t','R','N','S'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG"); - if (pal_img_n) { - if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; } - if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG"); - if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG"); - pal_img_n = 4; - for (i=0; i < c.length; ++i) - palette[i*4+3] = stbi__get8(s); - } else { - if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG"); - if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); - has_trans = 1; - for (k=0; k < s->img_n; ++k) - tc[k] = (stbi_uc) (stbi__get16be(s) & 255) * stbi__depth_scale_table[depth]; // non 8-bit images will be larger - } - break; - } - - case STBI__PNG_TYPE('I','D','A','T'): { - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG"); - if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; } - if ((int)(ioff + c.length) < (int)ioff) return 0; - if (ioff + c.length > idata_limit) { - stbi_uc *p; - if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096; - while (ioff + c.length > idata_limit) - idata_limit *= 2; - p = (stbi_uc *) STBI_REALLOC(z->idata, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory"); - z->idata = p; - } - if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG"); - ioff += c.length; - break; - } - - case STBI__PNG_TYPE('I','E','N','D'): { - stbi__uint32 raw_len, bpl; - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if (scan != STBI__SCAN_load) return 1; - if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG"); - // initial guess for decoded data size to avoid unnecessary reallocs - bpl = (s->img_x * depth + 7) / 8; // bytes per line, per component - raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */; - z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone); - if (z->expanded == NULL) return 0; // zlib should set error - STBI_FREE(z->idata); z->idata = NULL; - if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans) - s->img_out_n = s->img_n+1; - else - s->img_out_n = s->img_n; - if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, depth, color, interlace)) return 0; - if (has_trans) - if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0; - if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2) - stbi__de_iphone(z); - if (pal_img_n) { - // pal_img_n == 3 or 4 - s->img_n = pal_img_n; // record the actual colors we had - s->img_out_n = pal_img_n; - if (req_comp >= 3) s->img_out_n = req_comp; - if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n)) - return 0; - } - STBI_FREE(z->expanded); z->expanded = NULL; - return 1; - } - - default: - // if critical, fail - if (first) return stbi__err("first not IHDR", "Corrupt PNG"); - if ((c.type & (1 << 29)) == 0) { - #ifndef STBI_NO_FAILURE_STRINGS - // not threadsafe - static char invalid_chunk[] = "XXXX PNG chunk not known"; - invalid_chunk[0] = STBI__BYTECAST(c.type >> 24); - invalid_chunk[1] = STBI__BYTECAST(c.type >> 16); - invalid_chunk[2] = STBI__BYTECAST(c.type >> 8); - invalid_chunk[3] = STBI__BYTECAST(c.type >> 0); - #endif - return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type"); - } - stbi__skip(s, c.length); - break; - } - // end of PNG chunk, read and skip CRC - stbi__get32be(s); - } -} - -static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp) -{ - unsigned char *result=NULL; - if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error"); - if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) { - result = p->out; - p->out = NULL; - if (req_comp && req_comp != p->s->img_out_n) { - result = stbi__convert_format(result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y); - p->s->img_out_n = req_comp; - if (result == NULL) return result; - } - *x = p->s->img_x; - *y = p->s->img_y; - if (n) *n = p->s->img_out_n; - } - STBI_FREE(p->out); p->out = NULL; - STBI_FREE(p->expanded); p->expanded = NULL; - STBI_FREE(p->idata); p->idata = NULL; - - return result; -} - -static unsigned char *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi__png p; - p.s = s; - return stbi__do_png(&p, x,y,comp,req_comp); -} - -static int stbi__png_test(stbi__context *s) -{ - int r; - r = stbi__check_png_header(s); - stbi__rewind(s); - return r; -} - -static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp) -{ - if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) { - stbi__rewind( p->s ); - return 0; - } - if (x) *x = p->s->img_x; - if (y) *y = p->s->img_y; - if (comp) *comp = p->s->img_n; - return 1; -} - -static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__png p; - p.s = s; - return stbi__png_info_raw(&p, x, y, comp); -} -#endif - -// Microsoft/Windows BMP image - -#ifndef STBI_NO_BMP -static int stbi__bmp_test_raw(stbi__context *s) -{ - int r; - int sz; - if (stbi__get8(s) != 'B') return 0; - if (stbi__get8(s) != 'M') return 0; - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - stbi__get32le(s); // discard data offset - sz = stbi__get32le(s); - r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124); - return r; -} - -static int stbi__bmp_test(stbi__context *s) -{ - int r = stbi__bmp_test_raw(s); - stbi__rewind(s); - return r; -} - - -// returns 0..31 for the highest set bit -static int stbi__high_bit(unsigned int z) -{ - int n=0; - if (z == 0) return -1; - if (z >= 0x10000) n += 16, z >>= 16; - if (z >= 0x00100) n += 8, z >>= 8; - if (z >= 0x00010) n += 4, z >>= 4; - if (z >= 0x00004) n += 2, z >>= 2; - if (z >= 0x00002) n += 1, z >>= 1; - return n; -} - -static int stbi__bitcount(unsigned int a) -{ - a = (a & 0x55555555) + ((a >> 1) & 0x55555555); // max 2 - a = (a & 0x33333333) + ((a >> 2) & 0x33333333); // max 4 - a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits - a = (a + (a >> 8)); // max 16 per 8 bits - a = (a + (a >> 16)); // max 32 per 8 bits - return a & 0xff; -} - -static int stbi__shiftsigned(int v, int shift, int bits) -{ - int result; - int z=0; - - if (shift < 0) v <<= -shift; - else v >>= shift; - result = v; - - z = bits; - while (z < 8) { - result += v >> z; - z += bits; - } - return result; -} - -static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi_uc *out; - unsigned int mr=0,mg=0,mb=0,ma=0, all_a=255; - stbi_uc pal[256][4]; - int psize=0,i,j,compress=0,width; - int bpp, flip_vertically, pad, target, offset, hsz; - if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP"); - stbi__get32le(s); // discard filesize - stbi__get16le(s); // discard reserved - stbi__get16le(s); // discard reserved - offset = stbi__get32le(s); - hsz = stbi__get32le(s); - if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown"); - if (hsz == 12) { - s->img_x = stbi__get16le(s); - s->img_y = stbi__get16le(s); - } else { - s->img_x = stbi__get32le(s); - s->img_y = stbi__get32le(s); - } - if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP"); - bpp = stbi__get16le(s); - if (bpp == 1) return stbi__errpuc("monochrome", "BMP type not supported: 1-bit"); - flip_vertically = ((int) s->img_y) > 0; - s->img_y = abs((int) s->img_y); - if (hsz == 12) { - if (bpp < 24) - psize = (offset - 14 - 24) / 3; - } else { - compress = stbi__get32le(s); - if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE"); - stbi__get32le(s); // discard sizeof - stbi__get32le(s); // discard hres - stbi__get32le(s); // discard vres - stbi__get32le(s); // discard colorsused - stbi__get32le(s); // discard max important - if (hsz == 40 || hsz == 56) { - if (hsz == 56) { - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - stbi__get32le(s); - } - if (bpp == 16 || bpp == 32) { - mr = mg = mb = 0; - if (compress == 0) { - if (bpp == 32) { - mr = 0xffu << 16; - mg = 0xffu << 8; - mb = 0xffu << 0; - ma = 0xffu << 24; - all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0 - } else { - mr = 31u << 10; - mg = 31u << 5; - mb = 31u << 0; - } - } else if (compress == 3) { - mr = stbi__get32le(s); - mg = stbi__get32le(s); - mb = stbi__get32le(s); - // not documented, but generated by photoshop and handled by mspaint - if (mr == mg && mg == mb) { - // ?!?!? - return stbi__errpuc("bad BMP", "bad BMP"); - } - } else - return stbi__errpuc("bad BMP", "bad BMP"); - } - } else { - STBI_ASSERT(hsz == 108 || hsz == 124); - mr = stbi__get32le(s); - mg = stbi__get32le(s); - mb = stbi__get32le(s); - ma = stbi__get32le(s); - stbi__get32le(s); // discard color space - for (i=0; i < 12; ++i) - stbi__get32le(s); // discard color space parameters - if (hsz == 124) { - stbi__get32le(s); // discard rendering intent - stbi__get32le(s); // discard offset of profile data - stbi__get32le(s); // discard size of profile data - stbi__get32le(s); // discard reserved - } - } - if (bpp < 16) - psize = (offset - 14 - hsz) >> 2; - } - s->img_n = ma ? 4 : 3; - if (req_comp && req_comp >= 3) // we can directly decode 3 or 4 - target = req_comp; - else - target = s->img_n; // if they want monochrome, we'll post-convert - out = (stbi_uc *) stbi__malloc(target * s->img_x * s->img_y); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - if (bpp < 16) { - int z=0; - if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); } - for (i=0; i < psize; ++i) { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - if (hsz != 12) stbi__get8(s); - pal[i][3] = 255; - } - stbi__skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4)); - if (bpp == 4) width = (s->img_x + 1) >> 1; - else if (bpp == 8) width = s->img_x; - else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); } - pad = (-width)&3; - for (j=0; j < (int) s->img_y; ++j) { - for (i=0; i < (int) s->img_x; i += 2) { - int v=stbi__get8(s),v2=0; - if (bpp == 4) { - v2 = v & 15; - v >>= 4; - } - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) out[z++] = 255; - if (i+1 == (int) s->img_x) break; - v = (bpp == 8) ? stbi__get8(s) : v2; - out[z++] = pal[v][0]; - out[z++] = pal[v][1]; - out[z++] = pal[v][2]; - if (target == 4) out[z++] = 255; - } - stbi__skip(s, pad); - } - } else { - int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0; - int z = 0; - int easy=0; - stbi__skip(s, offset - 14 - hsz); - if (bpp == 24) width = 3 * s->img_x; - else if (bpp == 16) width = 2*s->img_x; - else /* bpp = 32 and pad = 0 */ width=0; - pad = (-width) & 3; - if (bpp == 24) { - easy = 1; - } else if (bpp == 32) { - if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000) - easy = 2; - } - if (!easy) { - if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); } - // right shift amt to put high bit in position #7 - rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr); - gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg); - bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb); - ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma); - } - for (j=0; j < (int) s->img_y; ++j) { - if (easy) { - for (i=0; i < (int) s->img_x; ++i) { - unsigned char a; - out[z+2] = stbi__get8(s); - out[z+1] = stbi__get8(s); - out[z+0] = stbi__get8(s); - z += 3; - a = (easy == 2 ? stbi__get8(s) : 255); - all_a |= a; - if (target == 4) out[z++] = a; - } - } else { - for (i=0; i < (int) s->img_x; ++i) { - stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s)); - int a; - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount)); - out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount)); - a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255); - all_a |= a; - if (target == 4) out[z++] = STBI__BYTECAST(a); - } - } - stbi__skip(s, pad); - } - } - - // if alpha channel is all 0s, replace with all 255s - if (target == 4 && all_a == 0) - for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4) - out[i] = 255; - - if (flip_vertically) { - stbi_uc t; - for (j=0; j < (int) s->img_y>>1; ++j) { - stbi_uc *p1 = out + j *s->img_x*target; - stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target; - for (i=0; i < (int) s->img_x*target; ++i) { - t = p1[i], p1[i] = p2[i], p2[i] = t; - } - } - } - - if (req_comp && req_comp != target) { - out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - - *x = s->img_x; - *y = s->img_y; - if (comp) *comp = s->img_n; - return out; -} -#endif - -// Targa Truevision - TGA -// by Jonathan Dummer -#ifndef STBI_NO_TGA -static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp) -{ - int tga_w, tga_h, tga_comp; - int sz; - stbi__get8(s); // discard Offset - sz = stbi__get8(s); // color type - if( sz > 1 ) { - stbi__rewind(s); - return 0; // only RGB or indexed allowed - } - sz = stbi__get8(s); // image type - // only RGB or grey allowed, +/- RLE - if ((sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11)) return 0; - stbi__skip(s,9); - tga_w = stbi__get16le(s); - if( tga_w < 1 ) { - stbi__rewind(s); - return 0; // test width - } - tga_h = stbi__get16le(s); - if( tga_h < 1 ) { - stbi__rewind(s); - return 0; // test height - } - sz = stbi__get8(s); // bits per pixel - // only RGB or RGBA or grey allowed - if ((sz != 8) && (sz != 16) && (sz != 24) && (sz != 32)) { - stbi__rewind(s); - return 0; - } - tga_comp = sz; - if (x) *x = tga_w; - if (y) *y = tga_h; - if (comp) *comp = tga_comp / 8; - return 1; // seems to have passed everything -} - -static int stbi__tga_test(stbi__context *s) -{ - int res; - int sz; - stbi__get8(s); // discard Offset - sz = stbi__get8(s); // color type - if ( sz > 1 ) return 0; // only RGB or indexed allowed - sz = stbi__get8(s); // image type - if ( (sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11) ) return 0; // only RGB or grey allowed, +/- RLE - stbi__get16be(s); // discard palette start - stbi__get16be(s); // discard palette length - stbi__get8(s); // discard bits per palette color entry - stbi__get16be(s); // discard x origin - stbi__get16be(s); // discard y origin - if ( stbi__get16be(s) < 1 ) return 0; // test width - if ( stbi__get16be(s) < 1 ) return 0; // test height - sz = stbi__get8(s); // bits per pixel - if ( (sz != 8) && (sz != 16) && (sz != 24) && (sz != 32) ) - res = 0; - else - res = 1; - stbi__rewind(s); - return res; -} - -static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - // read in the TGA header stuff - int tga_offset = stbi__get8(s); - int tga_indexed = stbi__get8(s); - int tga_image_type = stbi__get8(s); - int tga_is_RLE = 0; - int tga_palette_start = stbi__get16le(s); - int tga_palette_len = stbi__get16le(s); - int tga_palette_bits = stbi__get8(s); - int tga_x_origin = stbi__get16le(s); - int tga_y_origin = stbi__get16le(s); - int tga_width = stbi__get16le(s); - int tga_height = stbi__get16le(s); - int tga_bits_per_pixel = stbi__get8(s); - int tga_comp = tga_bits_per_pixel / 8; - int tga_inverted = stbi__get8(s); - // image data - unsigned char *tga_data; - unsigned char *tga_palette = NULL; - int i, j; - unsigned char raw_data[4]; - int RLE_count = 0; - int RLE_repeating = 0; - int read_next_pixel = 1; - - // do a tiny bit of processing - if ( tga_image_type >= 8 ) - { - tga_image_type -= 8; - tga_is_RLE = 1; - } - /* int tga_alpha_bits = tga_inverted & 15; */ - tga_inverted = 1 - ((tga_inverted >> 5) & 1); - - // error check - if ( //(tga_indexed) || - (tga_width < 1) || (tga_height < 1) || - (tga_image_type < 1) || (tga_image_type > 3) || - ((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16) && - (tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32)) - ) - { - return NULL; // we don't report this as a bad TGA because we don't even know if it's TGA - } - - // If I'm paletted, then I'll use the number of bits from the palette - if ( tga_indexed ) - { - tga_comp = tga_palette_bits / 8; - } - - // tga info - *x = tga_width; - *y = tga_height; - if (comp) *comp = tga_comp; - - tga_data = (unsigned char*)stbi__malloc( (size_t)tga_width * tga_height * tga_comp ); - if (!tga_data) return stbi__errpuc("outofmem", "Out of memory"); - - // skip to the data's starting position (offset usually = 0) - stbi__skip(s, tga_offset ); - - if ( !tga_indexed && !tga_is_RLE) { - for (i=0; i < tga_height; ++i) { - int row = tga_inverted ? tga_height -i - 1 : i; - stbi_uc *tga_row = tga_data + row*tga_width*tga_comp; - stbi__getn(s, tga_row, tga_width * tga_comp); - } - } else { - // do I need to load a palette? - if ( tga_indexed) - { - // any data to skip? (offset usually = 0) - stbi__skip(s, tga_palette_start ); - // load the palette - tga_palette = (unsigned char*)stbi__malloc( tga_palette_len * tga_palette_bits / 8 ); - if (!tga_palette) { - STBI_FREE(tga_data); - return stbi__errpuc("outofmem", "Out of memory"); - } - if (!stbi__getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 )) { - STBI_FREE(tga_data); - STBI_FREE(tga_palette); - return stbi__errpuc("bad palette", "Corrupt TGA"); - } - } - // load the data - for (i=0; i < tga_width * tga_height; ++i) - { - // if I'm in RLE mode, do I need to get a RLE stbi__pngchunk? - if ( tga_is_RLE ) - { - if ( RLE_count == 0 ) - { - // yep, get the next byte as a RLE command - int RLE_cmd = stbi__get8(s); - RLE_count = 1 + (RLE_cmd & 127); - RLE_repeating = RLE_cmd >> 7; - read_next_pixel = 1; - } else if ( !RLE_repeating ) - { - read_next_pixel = 1; - } - } else - { - read_next_pixel = 1; - } - // OK, if I need to read a pixel, do it now - if ( read_next_pixel ) - { - // load however much data we did have - if ( tga_indexed ) - { - // read in 1 byte, then perform the lookup - int pal_idx = stbi__get8(s); - if ( pal_idx >= tga_palette_len ) - { - // invalid index - pal_idx = 0; - } - pal_idx *= tga_bits_per_pixel / 8; - for (j = 0; j*8 < tga_bits_per_pixel; ++j) - { - raw_data[j] = tga_palette[pal_idx+j]; - } - } else - { - // read in the data raw - for (j = 0; j*8 < tga_bits_per_pixel; ++j) - { - raw_data[j] = stbi__get8(s); - } - } - // clear the reading flag for the next pixel - read_next_pixel = 0; - } // end of reading a pixel - - // copy data - for (j = 0; j < tga_comp; ++j) - tga_data[i*tga_comp+j] = raw_data[j]; - - // in case we're in RLE mode, keep counting down - --RLE_count; - } - // do I need to invert the image? - if ( tga_inverted ) - { - for (j = 0; j*2 < tga_height; ++j) - { - int index1 = j * tga_width * tga_comp; - int index2 = (tga_height - 1 - j) * tga_width * tga_comp; - for (i = tga_width * tga_comp; i > 0; --i) - { - unsigned char temp = tga_data[index1]; - tga_data[index1] = tga_data[index2]; - tga_data[index2] = temp; - ++index1; - ++index2; - } - } - } - // clear my palette, if I had one - if ( tga_palette != NULL ) - { - STBI_FREE( tga_palette ); - } - } - - // swap RGB - if (tga_comp >= 3) - { - unsigned char* tga_pixel = tga_data; - for (i=0; i < tga_width * tga_height; ++i) - { - unsigned char temp = tga_pixel[0]; - tga_pixel[0] = tga_pixel[2]; - tga_pixel[2] = temp; - tga_pixel += tga_comp; - } - } - - // convert to target component count - if (req_comp && req_comp != tga_comp) - tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height); - - // the things I do to get rid of an error message, and yet keep - // Microsoft's C compilers happy... [8^( - tga_palette_start = tga_palette_len = tga_palette_bits = - tga_x_origin = tga_y_origin = 0; - // OK, done - return tga_data; -} -#endif - -// ************************************************************************************************* -// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB - -#ifndef STBI_NO_PSD -static int stbi__psd_test(stbi__context *s) -{ - int r = (stbi__get32be(s) == 0x38425053); - stbi__rewind(s); - return r; -} - -static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - int pixelCount; - int channelCount, compression; - int channel, i, count, len; - int bitdepth; - int w,h; - stbi_uc *out; - - // Check identifier - if (stbi__get32be(s) != 0x38425053) // "8BPS" - return stbi__errpuc("not PSD", "Corrupt PSD image"); - - // Check file type version. - if (stbi__get16be(s) != 1) - return stbi__errpuc("wrong version", "Unsupported version of PSD image"); - - // Skip 6 reserved bytes. - stbi__skip(s, 6 ); - - // Read the number of channels (R, G, B, A, etc). - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) - return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image"); - - // Read the rows and columns of the image. - h = stbi__get32be(s); - w = stbi__get32be(s); - - // Make sure the depth is 8 bits. - bitdepth = stbi__get16be(s); - if (bitdepth != 8 && bitdepth != 16) - return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit"); - - // Make sure the color mode is RGB. - // Valid options are: - // 0: Bitmap - // 1: Grayscale - // 2: Indexed color - // 3: RGB color - // 4: CMYK color - // 7: Multichannel - // 8: Duotone - // 9: Lab color - if (stbi__get16be(s) != 3) - return stbi__errpuc("wrong color format", "PSD is not in RGB color format"); - - // Skip the Mode Data. (It's the palette for indexed color; other info for other modes.) - stbi__skip(s,stbi__get32be(s) ); - - // Skip the image resources. (resolution, pen tool paths, etc) - stbi__skip(s, stbi__get32be(s) ); - - // Skip the reserved data. - stbi__skip(s, stbi__get32be(s) ); - - // Find out if the data is compressed. - // Known values: - // 0: no compression - // 1: RLE compressed - compression = stbi__get16be(s); - if (compression > 1) - return stbi__errpuc("bad compression", "PSD has an unknown compression format"); - - // Create the destination image. - out = (stbi_uc *) stbi__malloc(4 * w*h); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - pixelCount = w*h; - - // Initialize the data to zero. - //memset( out, 0, pixelCount * 4 ); - - // Finally, the image data. - if (compression) { - // RLE as used by .PSD and .TIFF - // Loop until you get the number of unpacked bytes you are expecting: - // Read the next source byte into n. - // If n is between 0 and 127 inclusive, copy the next n+1 bytes literally. - // Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times. - // Else if n is 128, noop. - // Endloop - - // The RLE-compressed data is preceded by a 2-byte data count for each row in the data, - // which we're going to just skip. - stbi__skip(s, h * channelCount * 2 ); - - // Read the RLE data by channel. - for (channel = 0; channel < 4; channel++) { - stbi_uc *p; - - p = out+channel; - if (channel >= channelCount) { - // Fill this channel with default data. - for (i = 0; i < pixelCount; i++, p += 4) - *p = (channel == 3 ? 255 : 0); - } else { - // Read the RLE data. - count = 0; - while (count < pixelCount) { - len = stbi__get8(s); - if (len == 128) { - // No-op. - } else if (len < 128) { - // Copy next len+1 bytes literally. - len++; - count += len; - while (len) { - *p = stbi__get8(s); - p += 4; - len--; - } - } else if (len > 128) { - stbi_uc val; - // Next -len+1 bytes in the dest are replicated from next source byte. - // (Interpret len as a negative 8-bit int.) - len ^= 0x0FF; - len += 2; - val = stbi__get8(s); - count += len; - while (len) { - *p = val; - p += 4; - len--; - } - } - } - } - } - - } else { - // We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...) - // where each channel consists of an 8-bit value for each pixel in the image. - - // Read the data by channel. - for (channel = 0; channel < 4; channel++) { - stbi_uc *p; - - p = out + channel; - if (channel >= channelCount) { - // Fill this channel with default data. - stbi_uc val = channel == 3 ? 255 : 0; - for (i = 0; i < pixelCount; i++, p += 4) - *p = val; - } else { - // Read the data. - if (bitdepth == 16) { - for (i = 0; i < pixelCount; i++, p += 4) - *p = (stbi_uc) (stbi__get16be(s) >> 8); - } else { - for (i = 0; i < pixelCount; i++, p += 4) - *p = stbi__get8(s); - } - } - } - } - - if (req_comp && req_comp != 4) { - out = stbi__convert_format(out, 4, req_comp, w, h); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - - if (comp) *comp = 4; - *y = h; - *x = w; - - return out; -} -#endif - -// ************************************************************************************************* -// Softimage PIC loader -// by Tom Seddon -// -// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format -// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/ - -#ifndef STBI_NO_PIC -static int stbi__pic_is4(stbi__context *s,const char *str) -{ - int i; - for (i=0; i<4; ++i) - if (stbi__get8(s) != (stbi_uc)str[i]) - return 0; - - return 1; -} - -static int stbi__pic_test_core(stbi__context *s) -{ - int i; - - if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) - return 0; - - for(i=0;i<84;++i) - stbi__get8(s); - - if (!stbi__pic_is4(s,"PICT")) - return 0; - - return 1; -} - -typedef struct -{ - stbi_uc size,type,channel; -} stbi__pic_packet; - -static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest) -{ - int mask=0x80, i; - - for (i=0; i<4; ++i, mask>>=1) { - if (channel & mask) { - if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short"); - dest[i]=stbi__get8(s); - } - } - - return dest; -} - -static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src) -{ - int mask=0x80,i; - - for (i=0;i<4; ++i, mask>>=1) - if (channel&mask) - dest[i]=src[i]; -} - -static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result) -{ - int act_comp=0,num_packets=0,y,chained; - stbi__pic_packet packets[10]; - - // this will (should...) cater for even some bizarre stuff like having data - // for the same channel in multiple packets. - do { - stbi__pic_packet *packet; - - if (num_packets==sizeof(packets)/sizeof(packets[0])) - return stbi__errpuc("bad format","too many packets"); - - packet = &packets[num_packets++]; - - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - - act_comp |= packet->channel; - - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (reading packets)"); - if (packet->size != 8) return stbi__errpuc("bad format","packet isn't 8bpp"); - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel? - - for(y=0; ytype) { - default: - return stbi__errpuc("bad format","packet has bad compression type"); - - case 0: {//uncompressed - int x; - - for(x=0;xchannel,dest)) - return 0; - break; - } - - case 1://Pure RLE - { - int left=width, i; - - while (left>0) { - stbi_uc count,value[4]; - - count=stbi__get8(s); - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pure read count)"); - - if (count > left) - count = (stbi_uc) left; - - if (!stbi__readval(s,packet->channel,value)) return 0; - - for(i=0; ichannel,dest,value); - left -= count; - } - } - break; - - case 2: {//Mixed RLE - int left=width; - while (left>0) { - int count = stbi__get8(s), i; - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (mixed read count)"); - - if (count >= 128) { // Repeated - stbi_uc value[4]; - - if (count==128) - count = stbi__get16be(s); - else - count -= 127; - if (count > left) - return stbi__errpuc("bad file","scanline overrun"); - - if (!stbi__readval(s,packet->channel,value)) - return 0; - - for(i=0;ichannel,dest,value); - } else { // Raw - ++count; - if (count>left) return stbi__errpuc("bad file","scanline overrun"); - - for(i=0;ichannel,dest)) - return 0; - } - left-=count; - } - break; - } - } - } - } - - return result; -} - -static stbi_uc *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp) -{ - stbi_uc *result; - int i, x,y; - - for (i=0; i<92; ++i) - stbi__get8(s); - - x = stbi__get16be(s); - y = stbi__get16be(s); - if (stbi__at_eof(s)) return stbi__errpuc("bad file","file too short (pic header)"); - if ((1 << 28) / x < y) return stbi__errpuc("too large", "Image too large to decode"); - - stbi__get32be(s); //skip `ratio' - stbi__get16be(s); //skip `fields' - stbi__get16be(s); //skip `pad' - - // intermediate buffer is RGBA - result = (stbi_uc *) stbi__malloc(x*y*4); - memset(result, 0xff, x*y*4); - - if (!stbi__pic_load_core(s,x,y,comp, result)) { - STBI_FREE(result); - result=0; - } - *px = x; - *py = y; - if (req_comp == 0) req_comp = *comp; - result=stbi__convert_format(result,4,req_comp,x,y); - - return result; -} - -static int stbi__pic_test(stbi__context *s) -{ - int r = stbi__pic_test_core(s); - stbi__rewind(s); - return r; -} -#endif - -// ************************************************************************************************* -// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb - -#ifndef STBI_NO_GIF -typedef struct -{ - stbi__int16 prefix; - stbi_uc first; - stbi_uc suffix; -} stbi__gif_lzw; - -typedef struct -{ - int w,h; - stbi_uc *out, *old_out; // output buffer (always 4 components) - int flags, bgindex, ratio, transparent, eflags, delay; - stbi_uc pal[256][4]; - stbi_uc lpal[256][4]; - stbi__gif_lzw codes[4096]; - stbi_uc *color_table; - int parse, step; - int lflags; - int start_x, start_y; - int max_x, max_y; - int cur_x, cur_y; - int line_size; -} stbi__gif; - -static int stbi__gif_test_raw(stbi__context *s) -{ - int sz; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0; - sz = stbi__get8(s); - if (sz != '9' && sz != '7') return 0; - if (stbi__get8(s) != 'a') return 0; - return 1; -} - -static int stbi__gif_test(stbi__context *s) -{ - int r = stbi__gif_test_raw(s); - stbi__rewind(s); - return r; -} - -static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp) -{ - int i; - for (i=0; i < num_entries; ++i) { - pal[i][2] = stbi__get8(s); - pal[i][1] = stbi__get8(s); - pal[i][0] = stbi__get8(s); - pal[i][3] = transp == i ? 0 : 255; - } -} - -static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info) -{ - stbi_uc version; - if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') - return stbi__err("not GIF", "Corrupt GIF"); - - version = stbi__get8(s); - if (version != '7' && version != '9') return stbi__err("not GIF", "Corrupt GIF"); - if (stbi__get8(s) != 'a') return stbi__err("not GIF", "Corrupt GIF"); - - stbi__g_failure_reason = ""; - g->w = stbi__get16le(s); - g->h = stbi__get16le(s); - g->flags = stbi__get8(s); - g->bgindex = stbi__get8(s); - g->ratio = stbi__get8(s); - g->transparent = -1; - - if (comp != 0) *comp = 4; // can't actually tell whether it's 3 or 4 until we parse the comments - - if (is_info) return 1; - - if (g->flags & 0x80) - stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1); - - return 1; -} - -static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp) -{ - stbi__gif g; - if (!stbi__gif_header(s, &g, comp, 1)) { - stbi__rewind( s ); - return 0; - } - if (x) *x = g.w; - if (y) *y = g.h; - return 1; -} - -static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code) -{ - stbi_uc *p, *c; - - // recurse to decode the prefixes, since the linked-list is backwards, - // and working backwards through an interleaved image would be nasty - if (g->codes[code].prefix >= 0) - stbi__out_gif_code(g, g->codes[code].prefix); - - if (g->cur_y >= g->max_y) return; - - p = &g->out[g->cur_x + g->cur_y]; - c = &g->color_table[g->codes[code].suffix * 4]; - - if (c[3] >= 128) { - p[0] = c[2]; - p[1] = c[1]; - p[2] = c[0]; - p[3] = c[3]; - } - g->cur_x += 4; - - if (g->cur_x >= g->max_x) { - g->cur_x = g->start_x; - g->cur_y += g->step; - - while (g->cur_y >= g->max_y && g->parse > 0) { - g->step = (1 << g->parse) * g->line_size; - g->cur_y = g->start_y + (g->step >> 1); - --g->parse; - } - } -} - -static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g) -{ - stbi_uc lzw_cs; - stbi__int32 len, init_code; - stbi__uint32 first; - stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear; - stbi__gif_lzw *p; - - lzw_cs = stbi__get8(s); - if (lzw_cs > 12) return NULL; - clear = 1 << lzw_cs; - first = 1; - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - bits = 0; - valid_bits = 0; - for (init_code = 0; init_code < clear; init_code++) { - g->codes[init_code].prefix = -1; - g->codes[init_code].first = (stbi_uc) init_code; - g->codes[init_code].suffix = (stbi_uc) init_code; - } - - // support no starting clear code - avail = clear+2; - oldcode = -1; - - len = 0; - for(;;) { - if (valid_bits < codesize) { - if (len == 0) { - len = stbi__get8(s); // start new block - if (len == 0) - return g->out; - } - --len; - bits |= (stbi__int32) stbi__get8(s) << valid_bits; - valid_bits += 8; - } else { - stbi__int32 code = bits & codemask; - bits >>= codesize; - valid_bits -= codesize; - // @OPTIMIZE: is there some way we can accelerate the non-clear path? - if (code == clear) { // clear code - codesize = lzw_cs + 1; - codemask = (1 << codesize) - 1; - avail = clear + 2; - oldcode = -1; - first = 0; - } else if (code == clear + 1) { // end of stream code - stbi__skip(s, len); - while ((len = stbi__get8(s)) > 0) - stbi__skip(s,len); - return g->out; - } else if (code <= avail) { - if (first) return stbi__errpuc("no clear code", "Corrupt GIF"); - - if (oldcode >= 0) { - p = &g->codes[avail++]; - if (avail > 4096) return stbi__errpuc("too many codes", "Corrupt GIF"); - p->prefix = (stbi__int16) oldcode; - p->first = g->codes[oldcode].first; - p->suffix = (code == avail) ? p->first : g->codes[code].first; - } else if (code == avail) - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - - stbi__out_gif_code(g, (stbi__uint16) code); - - if ((avail & codemask) == 0 && avail <= 0x0FFF) { - codesize++; - codemask = (1 << codesize) - 1; - } - - oldcode = code; - } else { - return stbi__errpuc("illegal code in raster", "Corrupt GIF"); - } - } - } -} - -static void stbi__fill_gif_background(stbi__gif *g, int x0, int y0, int x1, int y1) -{ - int x, y; - stbi_uc *c = g->pal[g->bgindex]; - for (y = y0; y < y1; y += 4 * g->w) { - for (x = x0; x < x1; x += 4) { - stbi_uc *p = &g->out[y + x]; - p[0] = c[2]; - p[1] = c[1]; - p[2] = c[0]; - p[3] = 0; - } - } -} - -// this function is designed to support animated gifs, although stb_image doesn't support it -static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp) -{ - int i; - stbi_uc *prev_out = 0; - - if (g->out == 0 && !stbi__gif_header(s, g, comp,0)) - return 0; // stbi__g_failure_reason set by stbi__gif_header - - prev_out = g->out; - g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h); - if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory"); - - switch ((g->eflags & 0x1C) >> 2) { - case 0: // unspecified (also always used on 1st frame) - stbi__fill_gif_background(g, 0, 0, 4 * g->w, 4 * g->w * g->h); - break; - case 1: // do not dispose - if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); - g->old_out = prev_out; - break; - case 2: // dispose to background - if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h); - stbi__fill_gif_background(g, g->start_x, g->start_y, g->max_x, g->max_y); - break; - case 3: // dispose to previous - if (g->old_out) { - for (i = g->start_y; i < g->max_y; i += 4 * g->w) - memcpy(&g->out[i + g->start_x], &g->old_out[i + g->start_x], g->max_x - g->start_x); - } - break; - } - - for (;;) { - switch (stbi__get8(s)) { - case 0x2C: /* Image Descriptor */ - { - int prev_trans = -1; - stbi__int32 x, y, w, h; - stbi_uc *o; - - x = stbi__get16le(s); - y = stbi__get16le(s); - w = stbi__get16le(s); - h = stbi__get16le(s); - if (((x + w) > (g->w)) || ((y + h) > (g->h))) - return stbi__errpuc("bad Image Descriptor", "Corrupt GIF"); - - g->line_size = g->w * 4; - g->start_x = x * 4; - g->start_y = y * g->line_size; - g->max_x = g->start_x + w * 4; - g->max_y = g->start_y + h * g->line_size; - g->cur_x = g->start_x; - g->cur_y = g->start_y; - - g->lflags = stbi__get8(s); - - if (g->lflags & 0x40) { - g->step = 8 * g->line_size; // first interlaced spacing - g->parse = 3; - } else { - g->step = g->line_size; - g->parse = 0; - } - - if (g->lflags & 0x80) { - stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1); - g->color_table = (stbi_uc *) g->lpal; - } else if (g->flags & 0x80) { - if (g->transparent >= 0 && (g->eflags & 0x01)) { - prev_trans = g->pal[g->transparent][3]; - g->pal[g->transparent][3] = 0; - } - g->color_table = (stbi_uc *) g->pal; - } else - return stbi__errpuc("missing color table", "Corrupt GIF"); - - o = stbi__process_gif_raster(s, g); - if (o == NULL) return NULL; - - if (prev_trans != -1) - g->pal[g->transparent][3] = (stbi_uc) prev_trans; - - return o; - } - - case 0x21: // Comment Extension. - { - int len; - if (stbi__get8(s) == 0xF9) { // Graphic Control Extension. - len = stbi__get8(s); - if (len == 4) { - g->eflags = stbi__get8(s); - g->delay = stbi__get16le(s); - g->transparent = stbi__get8(s); - } else { - stbi__skip(s, len); - break; - } - } - while ((len = stbi__get8(s)) != 0) - stbi__skip(s, len); - break; - } - - case 0x3B: // gif stream termination code - return (stbi_uc *) s; // using '1' causes warning on some compilers - - default: - return stbi__errpuc("unknown code", "Corrupt GIF"); - } - } - - STBI_NOTUSED(req_comp); -} - -static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi_uc *u = 0; - stbi__gif g; - memset(&g, 0, sizeof(g)); - - u = stbi__gif_load_next(s, &g, comp, req_comp); - if (u == (stbi_uc *) s) u = 0; // end of animated gif marker - if (u) { - *x = g.w; - *y = g.h; - if (req_comp && req_comp != 4) - u = stbi__convert_format(u, 4, req_comp, g.w, g.h); - } - else if (g.out) - STBI_FREE(g.out); - - return u; -} - -static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp) -{ - return stbi__gif_info_raw(s,x,y,comp); -} -#endif - -// ************************************************************************************************* -// Radiance RGBE HDR loader -// originally by Nicolas Schulz -#ifndef STBI_NO_HDR -static int stbi__hdr_test_core(stbi__context *s) -{ - const char *signature = "#?RADIANCE\n"; - int i; - for (i=0; signature[i]; ++i) - if (stbi__get8(s) != signature[i]) - return 0; - return 1; -} - -static int stbi__hdr_test(stbi__context* s) -{ - int r = stbi__hdr_test_core(s); - stbi__rewind(s); - return r; -} - -#define STBI__HDR_BUFLEN 1024 -static char *stbi__hdr_gettoken(stbi__context *z, char *buffer) -{ - int len=0; - char c = '\0'; - - c = (char) stbi__get8(z); - - while (!stbi__at_eof(z) && c != '\n') { - buffer[len++] = c; - if (len == STBI__HDR_BUFLEN-1) { - // flush to end of line - while (!stbi__at_eof(z) && stbi__get8(z) != '\n') - ; - break; - } - c = (char) stbi__get8(z); - } - - buffer[len] = 0; - return buffer; -} - -static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp) -{ - if ( input[3] != 0 ) { - float f1; - // Exponent - f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8)); - if (req_comp <= 2) - output[0] = (input[0] + input[1] + input[2]) * f1 / 3; - else { - output[0] = input[0] * f1; - output[1] = input[1] * f1; - output[2] = input[2] * f1; - } - if (req_comp == 2) output[1] = 1; - if (req_comp == 4) output[3] = 1; - } else { - switch (req_comp) { - case 4: output[3] = 1; /* fallthrough */ - case 3: output[0] = output[1] = output[2] = 0; - break; - case 2: output[1] = 1; /* fallthrough */ - case 1: output[0] = 0; - break; - } - } -} - -static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - int width, height; - stbi_uc *scanline; - float *hdr_data; - int len; - unsigned char count, value; - int i, j, k, c1,c2, z; - - - // Check identifier - if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) - return stbi__errpf("not HDR", "Corrupt HDR image"); - - // Parse header - for(;;) { - token = stbi__hdr_gettoken(s,buffer); - if (token[0] == 0) break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; - } - - if (!valid) return stbi__errpf("unsupported format", "Unsupported HDR format"); - - // Parse width and height - // can't use sscanf() if we're not using stdio! - token = stbi__hdr_gettoken(s,buffer); - if (strncmp(token, "-Y ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - height = (int) strtol(token, &token, 10); - while (*token == ' ') ++token; - if (strncmp(token, "+X ", 3)) return stbi__errpf("unsupported data layout", "Unsupported HDR format"); - token += 3; - width = (int) strtol(token, NULL, 10); - - *x = width; - *y = height; - - if (comp) *comp = 3; - if (req_comp == 0) req_comp = 3; - - // Read data - hdr_data = (float *) stbi__malloc(height * width * req_comp * sizeof(float)); - - // Load image data - // image data is stored as some number of sca - if ( width < 8 || width >= 32768) { - // Read flat data - for (j=0; j < height; ++j) { - for (i=0; i < width; ++i) { - stbi_uc rgbe[4]; - main_decode_loop: - stbi__getn(s, rgbe, 4); - stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp); - } - } - } else { - // Read RLE-encoded data - scanline = NULL; - - for (j = 0; j < height; ++j) { - c1 = stbi__get8(s); - c2 = stbi__get8(s); - len = stbi__get8(s); - if (c1 != 2 || c2 != 2 || (len & 0x80)) { - // not run-length encoded, so we have to actually use THIS data as a decoded - // pixel (note this can't be a valid pixel--one of RGB must be >= 128) - stbi_uc rgbe[4]; - rgbe[0] = (stbi_uc) c1; - rgbe[1] = (stbi_uc) c2; - rgbe[2] = (stbi_uc) len; - rgbe[3] = (stbi_uc) stbi__get8(s); - stbi__hdr_convert(hdr_data, rgbe, req_comp); - i = 1; - j = 0; - STBI_FREE(scanline); - goto main_decode_loop; // yes, this makes no sense - } - len <<= 8; - len |= stbi__get8(s); - if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); } - if (scanline == NULL) scanline = (stbi_uc *) stbi__malloc(width * 4); - - for (k = 0; k < 4; ++k) { - i = 0; - while (i < width) { - count = stbi__get8(s); - if (count > 128) { - // Run - value = stbi__get8(s); - count -= 128; - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = value; - } else { - // Dump - for (z = 0; z < count; ++z) - scanline[i++ * 4 + k] = stbi__get8(s); - } - } - } - for (i=0; i < width; ++i) - stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp); - } - STBI_FREE(scanline); - } - - return hdr_data; -} - -static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp) -{ - char buffer[STBI__HDR_BUFLEN]; - char *token; - int valid = 0; - - if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) { - stbi__rewind( s ); - return 0; - } - - for(;;) { - token = stbi__hdr_gettoken(s,buffer); - if (token[0] == 0) break; - if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1; - } - - if (!valid) { - stbi__rewind( s ); - return 0; - } - token = stbi__hdr_gettoken(s,buffer); - if (strncmp(token, "-Y ", 3)) { - stbi__rewind( s ); - return 0; - } - token += 3; - *y = (int) strtol(token, &token, 10); - while (*token == ' ') ++token; - if (strncmp(token, "+X ", 3)) { - stbi__rewind( s ); - return 0; - } - token += 3; - *x = (int) strtol(token, NULL, 10); - *comp = 3; - return 1; -} -#endif // STBI_NO_HDR - -#ifndef STBI_NO_BMP -static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp) -{ - int hsz; - if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') { - stbi__rewind( s ); - return 0; - } - stbi__skip(s,12); - hsz = stbi__get32le(s); - if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) { - stbi__rewind( s ); - return 0; - } - if (hsz == 12) { - *x = stbi__get16le(s); - *y = stbi__get16le(s); - } else { - *x = stbi__get32le(s); - *y = stbi__get32le(s); - } - if (stbi__get16le(s) != 1) { - stbi__rewind( s ); - return 0; - } - *comp = stbi__get16le(s) / 8; - return 1; -} -#endif - -#ifndef STBI_NO_PSD -static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp) -{ - int channelCount; - if (stbi__get32be(s) != 0x38425053) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 1) { - stbi__rewind( s ); - return 0; - } - stbi__skip(s, 6); - channelCount = stbi__get16be(s); - if (channelCount < 0 || channelCount > 16) { - stbi__rewind( s ); - return 0; - } - *y = stbi__get32be(s); - *x = stbi__get32be(s); - if (stbi__get16be(s) != 8) { - stbi__rewind( s ); - return 0; - } - if (stbi__get16be(s) != 3) { - stbi__rewind( s ); - return 0; - } - *comp = 4; - return 1; -} -#endif - -#ifndef STBI_NO_PIC -static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp) -{ - int act_comp=0,num_packets=0,chained; - stbi__pic_packet packets[10]; - - if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) { - stbi__rewind(s); - return 0; - } - - stbi__skip(s, 88); - - *x = stbi__get16be(s); - *y = stbi__get16be(s); - if (stbi__at_eof(s)) { - stbi__rewind( s); - return 0; - } - if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) { - stbi__rewind( s ); - return 0; - } - - stbi__skip(s, 8); - - do { - stbi__pic_packet *packet; - - if (num_packets==sizeof(packets)/sizeof(packets[0])) - return 0; - - packet = &packets[num_packets++]; - chained = stbi__get8(s); - packet->size = stbi__get8(s); - packet->type = stbi__get8(s); - packet->channel = stbi__get8(s); - act_comp |= packet->channel; - - if (stbi__at_eof(s)) { - stbi__rewind( s ); - return 0; - } - if (packet->size != 8) { - stbi__rewind( s ); - return 0; - } - } while (chained); - - *comp = (act_comp & 0x10 ? 4 : 3); - - return 1; -} -#endif - -// ************************************************************************************************* -// Portable Gray Map and Portable Pixel Map loader -// by Ken Miller -// -// PGM: http://netpbm.sourceforge.net/doc/pgm.html -// PPM: http://netpbm.sourceforge.net/doc/ppm.html -// -// Known limitations: -// Does not support comments in the header section -// Does not support ASCII image data (formats P2 and P3) -// Does not support 16-bit-per-channel - -#ifndef STBI_NO_PNM - -static int stbi__pnm_test(stbi__context *s) -{ - char p, t; - p = (char) stbi__get8(s); - t = (char) stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) { - stbi__rewind( s ); - return 0; - } - return 1; -} - -static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) -{ - stbi_uc *out; - if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n)) - return 0; - *x = s->img_x; - *y = s->img_y; - *comp = s->img_n; - - out = (stbi_uc *) stbi__malloc(s->img_n * s->img_x * s->img_y); - if (!out) return stbi__errpuc("outofmem", "Out of memory"); - stbi__getn(s, out, s->img_n * s->img_x * s->img_y); - - if (req_comp && req_comp != s->img_n) { - out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y); - if (out == NULL) return out; // stbi__convert_format frees input on failure - } - return out; -} - -static int stbi__pnm_isspace(char c) -{ - return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r'; -} - -static void stbi__pnm_skip_whitespace(stbi__context *s, char *c) -{ - while (!stbi__at_eof(s) && stbi__pnm_isspace(*c)) - *c = (char) stbi__get8(s); -} - -static int stbi__pnm_isdigit(char c) -{ - return c >= '0' && c <= '9'; -} - -static int stbi__pnm_getinteger(stbi__context *s, char *c) -{ - int value = 0; - - while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) { - value = value*10 + (*c - '0'); - *c = (char) stbi__get8(s); - } - - return value; -} - -static int stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp) -{ - int maxv; - char c, p, t; - - stbi__rewind( s ); - - // Get identifier - p = (char) stbi__get8(s); - t = (char) stbi__get8(s); - if (p != 'P' || (t != '5' && t != '6')) { - stbi__rewind( s ); - return 0; - } - - *comp = (t == '6') ? 3 : 1; // '5' is 1-component .pgm; '6' is 3-component .ppm - - c = (char) stbi__get8(s); - stbi__pnm_skip_whitespace(s, &c); - - *x = stbi__pnm_getinteger(s, &c); // read width - stbi__pnm_skip_whitespace(s, &c); - - *y = stbi__pnm_getinteger(s, &c); // read height - stbi__pnm_skip_whitespace(s, &c); - - maxv = stbi__pnm_getinteger(s, &c); // read max value - - if (maxv > 255) - return stbi__err("max value > 255", "PPM image not 8-bit"); - else - return 1; -} -#endif - -static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp) -{ - #ifndef STBI_NO_JPEG - if (stbi__jpeg_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PNG - if (stbi__png_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_GIF - if (stbi__gif_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_BMP - if (stbi__bmp_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PSD - if (stbi__psd_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PIC - if (stbi__pic_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_PNM - if (stbi__pnm_info(s, x, y, comp)) return 1; - #endif - - #ifndef STBI_NO_HDR - if (stbi__hdr_info(s, x, y, comp)) return 1; - #endif - - // test tga last because it's a crappy test! - #ifndef STBI_NO_TGA - if (stbi__tga_info(s, x, y, comp)) - return 1; - #endif - return stbi__err("unknown image type", "Image not of any known type, or corrupt"); -} - -#ifndef STBI_NO_STDIO -STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp) -{ - FILE *f = stbi__fopen(filename, "rb"); - int result; - if (!f) return stbi__err("can't fopen", "Unable to open file"); - result = stbi_info_from_file(f, x, y, comp); - fclose(f); - return result; -} - -STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp) -{ - int r; - stbi__context s; - long pos = ftell(f); - stbi__start_file(&s, f); - r = stbi__info_main(&s,x,y,comp); - fseek(f,pos,SEEK_SET); - return r; -} -#endif // !STBI_NO_STDIO - -STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_mem(&s,buffer,len); - return stbi__info_main(&s,x,y,comp); -} - -STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp) -{ - stbi__context s; - stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user); - return stbi__info_main(&s,x,y,comp); -} - -#endif // STB_IMAGE_IMPLEMENTATION - -/* - revision history: - 2.08 (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA - 2.07 (2015-09-13) fix compiler warnings - partial animated GIF support - limited 16-bit PSD support - #ifdef unused functions - bug with < 92 byte PIC,PNM,HDR,TGA - 2.06 (2015-04-19) fix bug where PSD returns wrong '*comp' value - 2.05 (2015-04-19) fix bug in progressive JPEG handling, fix warning - 2.04 (2015-04-15) try to re-enable SIMD on MinGW 64-bit - 2.03 (2015-04-12) extra corruption checking (mmozeiko) - stbi_set_flip_vertically_on_load (nguillemot) - fix NEON support; fix mingw support - 2.02 (2015-01-19) fix incorrect assert, fix warning - 2.01 (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2 - 2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG - 2.00 (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg) - progressive JPEG (stb) - PGM/PPM support (Ken Miller) - STBI_MALLOC,STBI_REALLOC,STBI_FREE - GIF bugfix -- seemingly never worked - STBI_NO_*, STBI_ONLY_* - 1.48 (2014-12-14) fix incorrectly-named assert() - 1.47 (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb) - optimize PNG (ryg) - fix bug in interlaced PNG with user-specified channel count (stb) - 1.46 (2014-08-26) - fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG - 1.45 (2014-08-16) - fix MSVC-ARM internal compiler error by wrapping malloc - 1.44 (2014-08-07) - various warning fixes from Ronny Chevalier - 1.43 (2014-07-15) - fix MSVC-only compiler problem in code changed in 1.42 - 1.42 (2014-07-09) - don't define _CRT_SECURE_NO_WARNINGS (affects user code) - fixes to stbi__cleanup_jpeg path - added STBI_ASSERT to avoid requiring assert.h - 1.41 (2014-06-25) - fix search&replace from 1.36 that messed up comments/error messages - 1.40 (2014-06-22) - fix gcc struct-initialization warning - 1.39 (2014-06-15) - fix to TGA optimization when req_comp != number of components in TGA; - fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite) - add support for BMP version 5 (more ignored fields) - 1.38 (2014-06-06) - suppress MSVC warnings on integer casts truncating values - fix accidental rename of 'skip' field of I/O - 1.37 (2014-06-04) - remove duplicate typedef - 1.36 (2014-06-03) - convert to header file single-file library - if de-iphone isn't set, load iphone images color-swapped instead of returning NULL - 1.35 (2014-05-27) - various warnings - fix broken STBI_SIMD path - fix bug where stbi_load_from_file no longer left file pointer in correct place - fix broken non-easy path for 32-bit BMP (possibly never used) - TGA optimization by Arseny Kapoulkine - 1.34 (unknown) - use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case - 1.33 (2011-07-14) - make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements - 1.32 (2011-07-13) - support for "info" function for all supported filetypes (SpartanJ) - 1.31 (2011-06-20) - a few more leak fixes, bug in PNG handling (SpartanJ) - 1.30 (2011-06-11) - added ability to load files via callbacks to accommodate custom input streams (Ben Wenger) - removed deprecated format-specific test/load functions - removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway - error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha) - fix inefficiency in decoding 32-bit BMP (David Woo) - 1.29 (2010-08-16) - various warning fixes from Aurelien Pocheville - 1.28 (2010-08-01) - fix bug in GIF palette transparency (SpartanJ) - 1.27 (2010-08-01) - cast-to-stbi_uc to fix warnings - 1.26 (2010-07-24) - fix bug in file buffering for PNG reported by SpartanJ - 1.25 (2010-07-17) - refix trans_data warning (Won Chun) - 1.24 (2010-07-12) - perf improvements reading from files on platforms with lock-heavy fgetc() - minor perf improvements for jpeg - deprecated type-specific functions so we'll get feedback if they're needed - attempt to fix trans_data warning (Won Chun) - 1.23 fixed bug in iPhone support - 1.22 (2010-07-10) - removed image *writing* support - stbi_info support from Jetro Lauha - GIF support from Jean-Marc Lienher - iPhone PNG-extensions from James Brown - warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva) - 1.21 fix use of 'stbi_uc' in header (reported by jon blow) - 1.20 added support for Softimage PIC, by Tom Seddon - 1.19 bug in interlaced PNG corruption check (found by ryg) - 1.18 (2008-08-02) - fix a threading bug (local mutable static) - 1.17 support interlaced PNG - 1.16 major bugfix - stbi__convert_format converted one too many pixels - 1.15 initialize some fields for thread safety - 1.14 fix threadsafe conversion bug - header-file-only version (#define STBI_HEADER_FILE_ONLY before including) - 1.13 threadsafe - 1.12 const qualifiers in the API - 1.11 Support installable IDCT, colorspace conversion routines - 1.10 Fixes for 64-bit (don't use "unsigned long") - optimized upsampling by Fabian "ryg" Giesen - 1.09 Fix format-conversion for PSD code (bad global variables!) - 1.08 Thatcher Ulrich's PSD code integrated by Nicolas Schulz - 1.07 attempt to fix C++ warning/errors again - 1.06 attempt to fix C++ warning/errors again - 1.05 fix TGA loading to return correct *comp and use good luminance calc - 1.04 default float alpha is 1, not 255; use 'void *' for stbi_image_free - 1.03 bugfixes to STBI_NO_STDIO, STBI_NO_HDR - 1.02 support for (subset of) HDR files, float interface for preferred access to them - 1.01 fix bug: possible bug in handling right-side up bmps... not sure - fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all - 1.00 interface to zlib that skips zlib header - 0.99 correct handling of alpha in palette - 0.98 TGA loader by lonesock; dynamically add loaders (untested) - 0.97 jpeg errors on too large a file; also catch another malloc failure - 0.96 fix detection of invalid v value - particleman@mollyrocket forum - 0.95 during header scan, seek to markers in case of padding - 0.94 STBI_NO_STDIO to disable stdio usage; rename all #defines the same - 0.93 handle jpegtran output; verbose errors - 0.92 read 4,8,16,24,32-bit BMP files of several formats - 0.91 output 24-bit Windows 3.0 BMP files - 0.90 fix a few more warnings; bump version number to approach 1.0 - 0.61 bugfixes due to Marc LeBlanc, Christopher Lloyd - 0.60 fix compiling as c++ - 0.59 fix warnings: merge Dave Moore's -Wall fixes - 0.58 fix bug: zlib uncompressed mode len/nlen was wrong endian - 0.57 fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available - 0.56 fix bug: zlib uncompressed mode len vs. nlen - 0.55 fix bug: restart_interval not initialized to 0 - 0.54 allow NULL for 'int *comp' - 0.53 fix bug in png 3->4; speedup png decoding - 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments - 0.51 obey req_comp requests, 1-component jpegs return as 1-component, - on 'test' only check type, not whether we support this variant - 0.50 (2006-11-19) - first released version -*/ From 04eac1db2a9c4b3d36d16e83e48ec399fcecdefb Mon Sep 17 00:00:00 2001 From: Kristian Bolino Date: Wed, 16 Mar 2022 16:47:36 -0400 Subject: [PATCH 64/89] Scale font height rather than oversampling --- demo/sdl_renderer/main.c | 45 +++++++++++++++------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/demo/sdl_renderer/main.c b/demo/sdl_renderer/main.c index 63625f8..d50f16c 100644 --- a/demo/sdl_renderer/main.c +++ b/demo/sdl_renderer/main.c @@ -76,10 +76,7 @@ main(int argc, char *argv[]) SDL_Renderer *renderer; int running = 1; int flags = 0; - - /* Nuklear settings */ - unsigned char oversample_h = 1; - unsigned char oversample_v = 1; + float font_scale = 1; /* GUI */ struct nk_context *ctx; @@ -126,12 +123,7 @@ main(int argc, char *argv[]) scale_x = (float)(render_w) / (float)(window_w); scale_y = (float)(render_h) / (float)(window_h); SDL_RenderSetScale(renderer, scale_x, scale_y); - if (scale_x > 1) { - oversample_h = 3 * nk_iceilf(scale_x); - } - if (scale_y > 1) { - oversample_v = nk_iceilf(scale_y); - } + font_scale = scale_y; } /* GUI */ @@ -141,28 +133,25 @@ main(int argc, char *argv[]) { struct nk_font_atlas *atlas; struct nk_font_config config = nk_font_config(0); - struct nk_font *default_font, *droid, *roboto, *future, *clean, *tiny, *cousine; + struct nk_font *font; - /* oversample the fonts for high-DPI displays */ - if (oversample_h > config.oversample_h) { - config.oversample_h = oversample_h; - } - if (oversample_v > config.oversample_v) { - config.oversample_v = oversample_v; - } - - /* set up the font atlas and add desired fonts */ + /* set up the font atlas and add desired font; note that font sizes are + * multiplied by font_scale to produce better results at higher DPIs */ nk_sdl_font_stash_begin(&atlas); - default_font = nk_font_atlas_add_default(atlas, 13, &config); - /*droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, &config);*/ - /*roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16, &config);*/ - /*future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, &config);*/ - /*clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, &config);*/ - /*tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, &config);*/ - /*cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, &config);*/ + font = nk_font_atlas_add_default(atlas, 13 * font_scale, &config); + /*font = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14 * font_scale, &config);*/ + /*font = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 16 * font_scale, &config);*/ + /*font = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13 * font_scale, &config);*/ + /*font = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12 * font_scale, &config);*/ + /*font = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10 * font_scale, &config);*/ + /*font = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13 * font_scale, &config);*/ nk_sdl_font_stash_end(); + + /* this hack makes the font appear to be scaled down to the desired + * size and is only necessary when font_scale > 1 */ + font->handle.height /= font_scale; /*nk_style_load_all_cursors(ctx, atlas->cursors);*/ - nk_style_set_font(ctx, &default_font->handle); + nk_style_set_font(ctx, &font->handle); } #ifdef INCLUDE_STYLE From ec14ad2a30fc18628b0b19e5221d87720c5226b6 Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Sat, 19 Mar 2022 22:17:33 +0000 Subject: [PATCH 65/89] Better Display file icons in the filebrowser Icons are now displayed in a "Compact list view" rather than a "icon view" --- demo/common/file_browser.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 2529549..28903bf 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -373,7 +373,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) struct media *media = browser->media; struct nk_rect total_space; - if (nk_begin(ctx, "File Browser", nk_rect(50, 50, 800, 600), + if (nk_begin(ctx, "File Browser", nk_rect(50, 50, 600, 400), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE| NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) { @@ -406,6 +406,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) /* window layout */ total_space = nk_window_get_content_region(ctx); nk_layout_row(ctx, NK_DYNAMIC, total_space.h, 2, ratio); + nk_group_begin(ctx, "Special", NK_WINDOW_NO_SCROLLBAR); { struct nk_image home = media->icons.home; @@ -426,21 +427,25 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) nk_group_begin(ctx, "Content", 0); { int index = -1; - size_t i = 0, j = 0, k = 0; + size_t i = 0, j = 0; size_t rows = 0, cols = 0; size_t count = browser->dir_count + browser->file_count; - cols = 4; + /* File icons layout */ + cols = 2; rows = count / cols; + static float ratio2[] = {0.08f, NK_UNDEFINED}; + nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio2); for (i = 0; i <= rows; i += 1) { - {size_t n = j + cols; - nk_layout_row_dynamic(ctx, 135, (int)cols); + size_t n = j + cols; for (; j < count && j < n; ++j) { - /* draw one row of icons */ + /* draw one column of icons */ if (j < browser->dir_count) { /* draw and execute directory buttons */ if (nk_button_image(ctx,media->icons.directory)) index = (int)j; + + nk_label(ctx, browser->directories[j], NK_TEXT_LEFT); } else { /* draw and execute files buttons */ struct nk_image *icon; @@ -453,18 +458,12 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) ret = 1; } } - }} - {size_t n = k + cols; - nk_layout_row_dynamic(ctx, 20, (int)cols); - for (; k < count && k < n; k++) { - /* draw one row of labels */ - if (k < browser->dir_count) { - nk_label(ctx, browser->directories[k], NK_TEXT_CENTERED); - } else { - size_t t = k-browser->dir_count; - nk_label(ctx,browser->files[t],NK_TEXT_CENTERED); + /* draw one column of labels */ + if (j >= browser->dir_count) { + size_t t = j - browser->dir_count; + nk_label(ctx,browser->files[t],NK_TEXT_LEFT); } - }} + } } if (index != -1) { From ceee8839ab48f2eaa826a90b653c256d23e00254 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 22 Mar 2022 11:22:22 -0400 Subject: [PATCH 66/89] glfw_gl3: Cast the void* to a struct nk_glfw* (#434) While it doesn't fix the issue @tree786isback in #434, it is a good thing to cast the void*'s correctly. --- demo/glfw_opengl3/nuklear_glfw_gl3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/glfw_opengl3/nuklear_glfw_gl3.h b/demo/glfw_opengl3/nuklear_glfw_gl3.h index ca9a04c..fcc8335 100644 --- a/demo/glfw_opengl3/nuklear_glfw_gl3.h +++ b/demo/glfw_opengl3/nuklear_glfw_gl3.h @@ -346,7 +346,7 @@ nk_glfw3_mouse_button_callback(GLFWwindow* win, int button, int action, int mods NK_INTERN void nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { - struct nk_glfw* glfw = usr.ptr; + struct nk_glfw* glfw = (struct nk_glfw*)usr.ptr; const char *text = glfwGetClipboardString(glfw->win); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); (void)usr; @@ -355,7 +355,7 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) NK_INTERN void nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len) { - struct nk_glfw* glfw = usr.ptr; + struct nk_glfw* glfw = (struct nk_glfw*)usr.ptr; char *str = 0; if (!len) return; str = (char*)malloc((size_t)len+1); From a1df0c4f575f19d22ae73dd26a262b9ba3755477 Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Sat, 26 Mar 2022 18:28:49 +0000 Subject: [PATCH 67/89] Further improve file_browser.c -Adds visible boundary to file icon box; -Adds a 'cancel' button that closes the file dialog; -Adds a 'save' button that should be used for the save() routine defined by the user; --- demo/common/file_browser.c | 197 ++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 90 deletions(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 28903bf..f6e0d76 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -1,3 +1,5 @@ +nk_bool file_browser_is_open; + struct icons { struct nk_image desktop; struct nk_image home; @@ -325,6 +327,7 @@ file_browser_reload_directory_content(struct file_browser *browser, const char * static void file_browser_init(struct file_browser *browser, struct media *media) { + file_browser_is_open = nk_true; memset(browser, 0, sizeof(*browser)); browser->media = media; { @@ -373,113 +376,127 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) struct media *media = browser->media; struct nk_rect total_space; - if (nk_begin(ctx, "File Browser", nk_rect(50, 50, 600, 400), - NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE| - NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) + if (file_browser_is_open) { - static float ratio[] = {0.25f, NK_UNDEFINED}; - float spacing_x = ctx->style.window.spacing.x; - - /* output path directory selector in the menubar */ - ctx->style.window.spacing.x = 0; - nk_menubar_begin(ctx); + if (nk_begin(ctx, "File Browser", nk_rect(50, 50, 600, 400), + NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|NK_WINDOW_NO_SCROLLBAR| + NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) { - char *d = browser->directory; - char *begin = d + 1; - nk_layout_row_dynamic(ctx, 25, 6); - while (*d++) { - if (*d == '/') { - *d = '\0'; - if (nk_button_label(ctx, begin)) { - *d++ = '/'; *d = '\0'; - file_browser_reload_directory_content(browser, browser->directory); - break; + static float ratio[] = {0.25f, NK_UNDEFINED}; + float spacing_x = ctx->style.window.spacing.x; + + /* output path directory selector in the menubar */ + ctx->style.window.spacing.x = 0; + nk_menubar_begin(ctx); + { + char *d = browser->directory; + char *begin = d + 1; + nk_layout_row_dynamic(ctx, 25, 6); + while (*d++) { + if (*d == '/') { + *d = '\0'; + if (nk_button_label(ctx, begin)) { + *d++ = '/'; *d = '\0'; + file_browser_reload_directory_content(browser, browser->directory); + break; + } + *d = '/'; + begin = d + 1; } - *d = '/'; - begin = d + 1; } } - } - nk_menubar_end(ctx); - ctx->style.window.spacing.x = spacing_x; + nk_menubar_end(ctx); + ctx->style.window.spacing.x = spacing_x; - /* window layout */ - total_space = nk_window_get_content_region(ctx); - nk_layout_row(ctx, NK_DYNAMIC, total_space.h, 2, ratio); + /* window layout */ + total_space = nk_window_get_content_region(ctx); + nk_layout_row(ctx, NK_DYNAMIC, total_space.h - 40, 2, ratio); - nk_group_begin(ctx, "Special", NK_WINDOW_NO_SCROLLBAR); - { - struct nk_image home = media->icons.home; - struct nk_image desktop = media->icons.desktop; - struct nk_image computer = media->icons.computer; + nk_group_begin(ctx, "Special", NK_WINDOW_NO_SCROLLBAR); + { + struct nk_image home = media->icons.home; + struct nk_image desktop = media->icons.desktop; + struct nk_image computer = media->icons.computer; - nk_layout_row_dynamic(ctx, 40, 1); - if (nk_button_image_label(ctx, home, "home", NK_TEXT_CENTERED)) - file_browser_reload_directory_content(browser, browser->home); - if (nk_button_image_label(ctx,desktop,"desktop",NK_TEXT_CENTERED)) - file_browser_reload_directory_content(browser, browser->desktop); - if (nk_button_image_label(ctx,computer,"computer",NK_TEXT_CENTERED)) - file_browser_reload_directory_content(browser, "/"); - nk_group_end(ctx); - } + nk_layout_row_dynamic(ctx, 40, 1); + if (nk_button_image_label(ctx, home, "home", NK_TEXT_CENTERED)) + file_browser_reload_directory_content(browser, browser->home); + if (nk_button_image_label(ctx,desktop,"desktop",NK_TEXT_CENTERED)) + file_browser_reload_directory_content(browser, browser->desktop); + if (nk_button_image_label(ctx,computer,"computer",NK_TEXT_CENTERED)) + file_browser_reload_directory_content(browser, "/"); + nk_group_end(ctx); + } - /* output directory content window */ - nk_group_begin(ctx, "Content", 0); - { - int index = -1; - size_t i = 0, j = 0; - size_t rows = 0, cols = 0; - size_t count = browser->dir_count + browser->file_count; + /* output directory content window */ + nk_group_begin(ctx, "Content", NK_WINDOW_BORDER); + { + int index = -1; + size_t i = 0, j = 0; + size_t rows = 0, cols = 0; + size_t count = browser->dir_count + browser->file_count; - /* File icons layout */ - cols = 2; - rows = count / cols; - static float ratio2[] = {0.08f, NK_UNDEFINED}; - nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio2); - for (i = 0; i <= rows; i += 1) { - size_t n = j + cols; - for (; j < count && j < n; ++j) { - /* draw one column of icons */ - if (j < browser->dir_count) { - /* draw and execute directory buttons */ - if (nk_button_image(ctx,media->icons.directory)) - index = (int)j; - - nk_label(ctx, browser->directories[j], NK_TEXT_LEFT); - } else { - /* draw and execute files buttons */ - struct nk_image *icon; - size_t fileIndex = ((size_t)j - browser->dir_count); - icon = media_icon_for_file(media,browser->files[fileIndex]); - if (nk_button_image(ctx, *icon)) { - strncpy(browser->file, browser->directory, MAX_PATH_LEN); - n = strlen(browser->file); - strncpy(browser->file + n, browser->files[fileIndex], MAX_PATH_LEN - n); - ret = 1; + /* File icons layout */ + cols = 2; + rows = count / cols; + static float ratio2[] = {0.08f, NK_UNDEFINED}; + nk_layout_row(ctx, NK_DYNAMIC, 30, 2, ratio2); + for (i = 0; i <= rows; i += 1) { + size_t n = j + cols; + for (; j < count && j < n; ++j) { + /* draw one column of icons */ + if (j < browser->dir_count) { + /* draw and execute directory buttons */ + if (nk_button_image(ctx,media->icons.directory)) + index = (int)j; + + nk_label(ctx, browser->directories[j], NK_TEXT_LEFT); + } else { + /* draw and execute files buttons */ + struct nk_image *icon; + size_t fileIndex = ((size_t)j - browser->dir_count); + icon = media_icon_for_file(media,browser->files[fileIndex]); + if (nk_button_image(ctx, *icon)) { + strncpy(browser->file, browser->directory, MAX_PATH_LEN); + n = strlen(browser->file); + strncpy(browser->file + n, browser->files[fileIndex], MAX_PATH_LEN - n); + ret = 1; + } + } + /* draw one column of labels */ + if (j >= browser->dir_count) { + size_t t = j - browser->dir_count; + nk_label(ctx,browser->files[t],NK_TEXT_LEFT); } } - /* draw one column of labels */ - if (j >= browser->dir_count) { - size_t t = j - browser->dir_count; - nk_label(ctx,browser->files[t],NK_TEXT_LEFT); - } } + + if (index != -1) { + size_t n = strlen(browser->directory); + strncpy(browser->directory + n, browser->directories[index], MAX_PATH_LEN - n); + n = strlen(browser->directory); + if (n < MAX_PATH_LEN - 1) { + browser->directory[n] = '/'; + browser->directory[n+1] = '\0'; + } + file_browser_reload_directory_content(browser, browser->directory); + } + nk_group_end(ctx); } - if (index != -1) { - size_t n = strlen(browser->directory); - strncpy(browser->directory + n, browser->directories[index], MAX_PATH_LEN - n); - n = strlen(browser->directory); - if (n < MAX_PATH_LEN - 1) { - browser->directory[n] = '/'; - browser->directory[n+1] = '\0'; - } - file_browser_reload_directory_content(browser, browser->directory); + nk_layout_row_dynamic(ctx, 30, 5); + nk_label(ctx,"",NK_TEXT_LEFT); + nk_label(ctx,"",NK_TEXT_LEFT); + nk_label(ctx,"",NK_TEXT_LEFT); + if(nk_button_label(ctx, "Cancel")) + { + fprintf(stdout, "File dialog has been closed!\n"); + file_browser_is_open = nk_false; } - nk_group_end(ctx); + if(nk_button_label(ctx, "Save")) + fprintf(stdout, "Insert routine to open/save the file!\n"); } + nk_end(ctx); } - nk_end(ctx); return ret; } - From 8377f9147a211b6d27756eeee1198989e3da8fa3 Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Sat, 26 Mar 2022 19:34:40 +0000 Subject: [PATCH 68/89] Use local static variable instead of global --- demo/common/file_browser.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index f6e0d76..08522ee 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -1,5 +1,3 @@ -nk_bool file_browser_is_open; - struct icons { struct nk_image desktop; struct nk_image home; @@ -327,7 +325,6 @@ file_browser_reload_directory_content(struct file_browser *browser, const char * static void file_browser_init(struct file_browser *browser, struct media *media) { - file_browser_is_open = nk_true; memset(browser, 0, sizeof(*browser)); browser->media = media; { @@ -375,6 +372,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) int ret = 0; struct media *media = browser->media; struct nk_rect total_space; + static nk_bool file_browser_is_open = nk_true; if (file_browser_is_open) { @@ -492,7 +490,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) { fprintf(stdout, "File dialog has been closed!\n"); file_browser_is_open = nk_false; - } + } if(nk_button_label(ctx, "Save")) fprintf(stdout, "Insert routine to open/save the file!\n"); } From 8f2ccedfa4ca2103f390a866ce1f8553ee5131ac Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Tue, 29 Mar 2022 21:00:45 +0100 Subject: [PATCH 69/89] Change dialog action from "Save" to "Open" This is because there is yet no text box for the user to write the file name. --- demo/common/file_browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 08522ee..ca331d6 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -491,7 +491,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) fprintf(stdout, "File dialog has been closed!\n"); file_browser_is_open = nk_false; } - if(nk_button_label(ctx, "Save")) + if(nk_button_label(ctx, "Open")) fprintf(stdout, "Insert routine to open/save the file!\n"); } nk_end(ctx); From 0163faffed4f50262795094df70233ab7c3cdeeb Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Sun, 3 Apr 2022 12:40:14 +0100 Subject: [PATCH 70/89] file_browser.c - Display files and folders by alphabetical order --- demo/common/file_browser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index ca331d6..4ae0736 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -366,6 +366,13 @@ file_browser_free(struct file_browser *browser) memset(browser, 0, sizeof(*browser)); } +int cmp_fn(const void *str1, const void *str2) +{ + const char *str1_ret = *(const char **)str1; + const char *str2_ret = *(const char **)str2; + return strcmp(str1_ret, str2_ret); +} + static int file_browser_run(struct file_browser *browser, struct nk_context *ctx) { @@ -448,6 +455,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) if (nk_button_image(ctx,media->icons.directory)) index = (int)j; + qsort(browser->directories, browser->dir_count, sizeof(char *), cmp_fn); nk_label(ctx, browser->directories[j], NK_TEXT_LEFT); } else { /* draw and execute files buttons */ @@ -464,6 +472,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) /* draw one column of labels */ if (j >= browser->dir_count) { size_t t = j - browser->dir_count; + qsort(browser->files, browser->file_count, sizeof(char *), cmp_fn); nk_label(ctx,browser->files[t],NK_TEXT_LEFT); } } From e3cec3b6b116641ba0fbd2223b859b7c93e8b6de Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Sun, 3 Apr 2022 15:53:49 +0100 Subject: [PATCH 71/89] Forgot to include --- demo/common/file_browser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 4ae0736..1780b8e 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -87,6 +87,8 @@ struct file_browser { # include #endif +#include + static void die(const char *fmt, ...) { From e5100bcef6ed2369c23ba59003e086acbc1af6bd Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Wed, 13 Apr 2022 01:07:41 +0100 Subject: [PATCH 72/89] Ignore case when sorting strings alphabetically --- demo/common/file_browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 1780b8e..3204629 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -372,7 +372,7 @@ int cmp_fn(const void *str1, const void *str2) { const char *str1_ret = *(const char **)str1; const char *str2_ret = *(const char **)str2; - return strcmp(str1_ret, str2_ret); + return nk_stricmp(str1_ret, str2_ret); } static int From f58114e45e3992f8cb2634f20d4f8cd110ec384f Mon Sep 17 00:00:00 2001 From: crazyBaboon Date: Wed, 13 Apr 2022 22:44:14 +0100 Subject: [PATCH 73/89] file_browser.c - remove #include It is no longer necessary, since string comparison is now carried out by Nuklear API. --- demo/common/file_browser.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 3204629..74f11e9 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -1,3 +1,12 @@ +#ifdef __unix__ +#include +#include +#endif + +#ifndef _WIN32 +# include +#endif + struct icons { struct nk_image desktop; struct nk_image home; @@ -78,17 +87,6 @@ struct file_browser { struct media *media; }; -#ifdef __unix__ -#include -#include -#endif - -#ifndef _WIN32 -# include -#endif - -#include - static void die(const char *fmt, ...) { From c9d3a3fd20bedafd50db1426122ae25920bcd5f6 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Fri, 15 Apr 2022 17:20:20 -0400 Subject: [PATCH 74/89] file_browser: Bring string.h to the top --- demo/common/file_browser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/demo/common/file_browser.c b/demo/common/file_browser.c index 74f11e9..9095aa3 100644 --- a/demo/common/file_browser.c +++ b/demo/common/file_browser.c @@ -1,3 +1,5 @@ +#include // strcpy, strlen + #ifdef __unix__ #include #include @@ -454,7 +456,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) /* draw and execute directory buttons */ if (nk_button_image(ctx,media->icons.directory)) index = (int)j; - + qsort(browser->directories, browser->dir_count, sizeof(char *), cmp_fn); nk_label(ctx, browser->directories[j], NK_TEXT_LEFT); } else { @@ -499,7 +501,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx) { fprintf(stdout, "File dialog has been closed!\n"); file_browser_is_open = nk_false; - } + } if(nk_button_label(ctx, "Open")) fprintf(stdout, "Insert routine to open/save the file!\n"); } From 068ae5fc3324a38997ebfb248bffae5a842bb4a9 Mon Sep 17 00:00:00 2001 From: tcdude Date: Mon, 18 Apr 2022 17:55:45 +0200 Subject: [PATCH 75/89] Button behavior `NK_BUTTON_TRIGGER_ON_RELEASE` This modifies the trigger behavior of buttons to only activate when the mouse was also over the same button on the mouse button down event. Side note: I also modified my version of Nuklear I use to apply the same logic for hover, because I use Nuklear for touch input devices where traditional hover behavior tends to be misleading. I left this out for now because I can imagine that this could be seen as wrong/faulty behavior by some. --- nuklear.h | 17 +++++++++++++++++ src/CHANGELOG | 2 ++ src/nuklear.h | 3 +++ src/nuklear_input.c | 12 ++++++++++++ 4 files changed, 34 insertions(+) diff --git a/nuklear.h b/nuklear.h index 9a33488..38d72c8 100644 --- a/nuklear.h +++ b/nuklear.h @@ -4654,6 +4654,9 @@ struct nk_mouse_button { struct nk_mouse { struct nk_mouse_button buttons[NK_BUTTON_MAX]; struct nk_vec2 pos; +#ifdef NK_BUTTON_TRIGGER_ON_RELEASE + struct nk_vec2 down_pos; +#endif struct nk_vec2 prev; struct nk_vec2 delta; struct nk_vec2 scroll_delta; @@ -17881,6 +17884,13 @@ nk_input_button(struct nk_context *ctx, enum nk_buttons id, int x, int y, nk_boo btn->clicked_pos.y = (float)y; btn->down = down; btn->clicked++; +#ifdef NK_BUTTON_TRIGGER_ON_RELEASE + if (down == 1 && id == NK_BUTTON_LEFT) + { + in->mouse.down_pos.x = btn->clicked_pos.x; + in->mouse.down_pos.y = btn->clicked_pos.y; + } +#endif } NK_API void nk_input_scroll(struct nk_context *ctx, struct nk_vec2 val) @@ -17941,7 +17951,12 @@ nk_input_has_mouse_click_in_rect(const struct nk_input *i, enum nk_buttons id, const struct nk_mouse_button *btn; if (!i) return nk_false; btn = &i->mouse.buttons[id]; +#ifdef NK_BUTTON_TRIGGER_ON_RELEASE + if (!NK_INBOX(btn->clicked_pos.x,btn->clicked_pos.y,b.x,b.y,b.w,b.h) + || !NK_INBOX(i->mouse.down_pos.x,i->mouse.down_pos.y,b.x,b.y,b.w,b.h)) +#else if (!NK_INBOX(btn->clicked_pos.x,btn->clicked_pos.y,b.x,b.y,b.w,b.h)) +#endif return nk_false; return nk_true; } @@ -29629,6 +29644,8 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to +/// only trigger when the mouse position was inside the same button on down /// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS /// - 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions /// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized diff --git a/src/CHANGELOG b/src/CHANGELOG index 4be9f04..869c890 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,8 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to +/// only trigger when the mouse position was inside the same button on down /// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS /// - 2021/12/22 (4.9.5) - Revert layout bounds not accounting for padding due to regressions /// - 2021/12/22 (4.9.4) - Fix checking hovering when window is minimized diff --git a/src/nuklear.h b/src/nuklear.h index b97c95c..7979958 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -4433,6 +4433,9 @@ struct nk_mouse_button { struct nk_mouse { struct nk_mouse_button buttons[NK_BUTTON_MAX]; struct nk_vec2 pos; +#ifdef NK_BUTTON_TRIGGER_ON_RELEASE + struct nk_vec2 down_pos; +#endif struct nk_vec2 prev; struct nk_vec2 delta; struct nk_vec2 scroll_delta; diff --git a/src/nuklear_input.c b/src/nuklear_input.c index 0c3e14d..b22afa6 100644 --- a/src/nuklear_input.c +++ b/src/nuklear_input.c @@ -83,6 +83,13 @@ nk_input_button(struct nk_context *ctx, enum nk_buttons id, int x, int y, nk_boo btn->clicked_pos.y = (float)y; btn->down = down; btn->clicked++; +#ifdef NK_BUTTON_TRIGGER_ON_RELEASE + if (down == 1 && id == NK_BUTTON_LEFT) + { + in->mouse.down_pos.x = btn->clicked_pos.x; + in->mouse.down_pos.y = btn->clicked_pos.y; + } +#endif } NK_API void nk_input_scroll(struct nk_context *ctx, struct nk_vec2 val) @@ -143,7 +150,12 @@ nk_input_has_mouse_click_in_rect(const struct nk_input *i, enum nk_buttons id, const struct nk_mouse_button *btn; if (!i) return nk_false; btn = &i->mouse.buttons[id]; +#ifdef NK_BUTTON_TRIGGER_ON_RELEASE + if (!NK_INBOX(btn->clicked_pos.x,btn->clicked_pos.y,b.x,b.y,b.w,b.h) + || !NK_INBOX(i->mouse.down_pos.x,i->mouse.down_pos.y,b.x,b.y,b.w,b.h)) +#else if (!NK_INBOX(btn->clicked_pos.x,btn->clicked_pos.y,b.x,b.y,b.w,b.h)) +#endif return nk_false; return nk_true; } From cacdf6baa46d5f28ecb573d4e02cb69b6f47830e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCssig?= Date: Thu, 12 May 2022 12:52:05 +0200 Subject: [PATCH 76/89] Added the arc methods to the GDI binding --- demo/gdi/nuklear_gdi.h | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index aef8425..70380ca 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -391,6 +391,60 @@ nk_gdi_stroke_polyline(HDC dc, const struct nk_vec2i *pnts, } } +static void +nk_gdi_stroke_arc(HDC dc, short cx, short cy, unsigned short r, float amin, float adelta, unsigned short line_thickness, struct nk_color col) +{ + COLORREF color = convert_color(col); + + /* setup pen */ + HPEN pen = NULL; + if (line_thickness == 1) + SetDCPenColor(dc, color); + else + { + /* the flat endcap makes thick arcs look better */ + DWORD pen_style = PS_SOLID | PS_ENDCAP_FLAT | PS_GEOMETRIC; + + LOGBRUSH brush; + brush.lbStyle = BS_SOLID; + brush.lbColor = color; + brush.lbHatch = 0; + + pen = ExtCreatePen(pen_style, line_thickness, &brush, 0, NULL); + SelectObject(dc, pen); + } + + /* calculate arc and draw */ + int start_x = cx + (int) ((float)r*nk_cos(amin+adelta)), + start_y = cy + (int) ((float)r*nk_sin(amin+adelta)), + end_x = cx + (int) ((float)r*nk_cos(amin)), + end_y = cy + (int) ((float)r*nk_sin(amin)); + + SetArcDirection(dc, AD_COUNTERCLOCKWISE); + Pie(dc, cx-r, cy-r, cx+r, cy+r, start_x, start_y, end_x, end_y); + + if (pen) + { + SelectObject(dc, GetStockObject(DC_PEN)); + DeleteObject(pen); + } +} + +static void +nk_gdi_fill_arc(HDC dc, short cx, short cy, unsigned short r, float amin, float adelta, struct nk_color col) +{ + COLORREF color = convert_color(col); + SetDCBrushColor(dc, color); + SetDCPenColor(dc, color); + + int start_x = cx + (int) ((float)r*nk_cos(amin+adelta)), + start_y = cy + (int) ((float)r*nk_sin(amin+adelta)), + end_x = cx + (int) ((float)r*nk_cos(amin)), + end_y = cy + (int) ((float)r*nk_sin(amin)); + + Pie(dc, cx-r, cy-r, cx+r, cy+r, start_x, start_y, end_x, end_y); +} + static void nk_gdi_fill_circle(HDC dc, short x, short y, unsigned short w, unsigned short h, struct nk_color col) @@ -414,6 +468,7 @@ nk_gdi_stroke_circle(HDC dc, short x, short y, unsigned short w, SelectObject(dc, pen); } + SelectObject(dc, GetStockObject(NULL_BRUSH)); SetDCBrushColor(dc, OPAQUE); Ellipse(dc, x, y, x + w, y + h); From 321badb389c96cb08c6f6a4217656cec26ebe3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCssig?= Date: Thu, 12 May 2022 12:52:44 +0200 Subject: [PATCH 77/89] Implemented select all for GDI --- demo/gdi/nuklear_gdi.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index 70380ca..e6c6878 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -771,6 +771,13 @@ nk_gdi_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) case VK_PRIOR: nk_input_key(&gdi.ctx, NK_KEY_SCROLL_UP, down); return 1; + + case 'A': + if (ctrl) { + nk_input_key(&gdi.ctx, NK_KEY_TEXT_SELECT_ALL, down); + return 1; + } + break; case 'C': if (ctrl) { From e698bb15315e3750ad0b8aa8a7b7c015e8d9cb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCssig?= Date: Thu, 12 May 2022 12:54:03 +0200 Subject: [PATCH 78/89] Added the GDI arc drawing commands to the dispatch switch-case --- demo/gdi/nuklear_gdi.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index e6c6878..3a01dd5 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -921,6 +921,14 @@ nk_gdi_render(struct nk_color clear) const struct nk_command_circle_filled *c = (const struct nk_command_circle_filled *)cmd; nk_gdi_fill_circle(memory_dc, c->x, c->y, c->w, c->h, c->color); } break; + case NK_COMMAND_ARC: { + const struct nk_command_arc *q = (const struct nk_command_arc *)cmd; + nk_gdi_stroke_arc(memory_dc, q->cx, q->cy, q->r, q->a[0], q->a[1], q->line_thickness, q->color); + } break; + case NK_COMMAND_ARC_FILLED: { + const struct nk_command_arc_filled *q = (const struct nk_command_arc_filled *)cmd; + nk_gdi_fill_arc(memory_dc, q->cx, q->cy, q->r, q->a[0], q->a[1], q->color); + } break; case NK_COMMAND_TRIANGLE: { const struct nk_command_triangle*t = (const struct nk_command_triangle*)cmd; nk_gdi_stroke_triangle(memory_dc, t->a.x, t->a.y, t->b.x, t->b.y, @@ -963,8 +971,7 @@ nk_gdi_render(struct nk_color clear) const struct nk_command_image *i = (const struct nk_command_image *)cmd; nk_gdi_draw_image(i->x, i->y, i->w, i->h, i->img, i->col); } break; - case NK_COMMAND_ARC: - case NK_COMMAND_ARC_FILLED: + case NK_COMMAND_CUSTOM: default: break; } } From 628cc61263c5ff2734e5ccd5ba730f0923ceafd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCssig?= Date: Thu, 12 May 2022 13:04:42 +0200 Subject: [PATCH 79/89] Added the wingdi header to the GDI binding --- demo/gdi/nuklear_gdi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index 3a01dd5..f60a087 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -15,6 +15,7 @@ #define WIN32_LEAN_AND_MEAN #include +#include typedef struct GdiFont GdiFont; NK_API struct nk_context* nk_gdi_init(GdiFont *font, HDC window_dc, unsigned int width, unsigned int height); From dca0f6fcfcfe9e3d9e4289b6530d789f01b08cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20M=C3=BCssig?= Date: Thu, 12 May 2022 13:30:18 +0200 Subject: [PATCH 80/89] Corrected the fill bugs in the GDI binding --- demo/gdi/nuklear_gdi.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index f60a087..8efc8da 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -421,8 +421,10 @@ nk_gdi_stroke_arc(HDC dc, short cx, short cy, unsigned short r, float amin, floa end_x = cx + (int) ((float)r*nk_cos(amin)), end_y = cy + (int) ((float)r*nk_sin(amin)); + HGDIOBJ br = SelectObject(dc, GetStockObject(NULL_BRUSH)); SetArcDirection(dc, AD_COUNTERCLOCKWISE); Pie(dc, cx-r, cy-r, cx+r, cy+r, start_x, start_y, end_x, end_y); + SelectObject(dc, br); if (pen) { @@ -468,10 +470,11 @@ nk_gdi_stroke_circle(HDC dc, short x, short y, unsigned short w, pen = CreatePen(PS_SOLID, line_thickness, color); SelectObject(dc, pen); } - - SelectObject(dc, GetStockObject(NULL_BRUSH)); + + HGDIOBJ br = SelectObject(dc, GetStockObject(NULL_BRUSH)); SetDCBrushColor(dc, OPAQUE); Ellipse(dc, x, y, x + w, y + h); + SelectObject(dc, br); if (pen) { SelectObject(dc, GetStockObject(DC_PEN)); From a931a8d499ecb59334bcda5f21c6b15e414c07a2 Mon Sep 17 00:00:00 2001 From: tcdude Date: Fri, 27 May 2022 04:12:11 +0200 Subject: [PATCH 81/89] Fix regression introduced in #448 This adds a new `nk_input_has_mouse_click_in_rect_button` function that is being used only by buttons. This allows `nk_input_has_mouse_click_in_rect` to act as its name suggests while still allowing for the behavior introduced in #448 --- nuklear.h | 15 ++++++++++++++- src/CHANGELOG | 1 + src/nuklear.h | 1 + src/nuklear_button.c | 2 +- src/nuklear_input.c | 11 +++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/nuklear.h b/nuklear.h index 38d72c8..121cf91 100644 --- a/nuklear.h +++ b/nuklear.h @@ -4682,6 +4682,7 @@ struct nk_input { NK_API nk_bool nk_input_has_mouse_click(const struct nk_input*, enum nk_buttons); NK_API nk_bool nk_input_has_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); +NK_API nk_bool nk_input_has_mouse_click_in_rect_button(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_has_mouse_click_down_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect, nk_bool down); NK_API nk_bool nk_input_is_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_is_mouse_click_down_in_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b, nk_bool down); @@ -17947,6 +17948,17 @@ nk_input_has_mouse_click(const struct nk_input *i, enum nk_buttons id) NK_API nk_bool nk_input_has_mouse_click_in_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b) +{ + const struct nk_mouse_button *btn; + if (!i) return nk_false; + btn = &i->mouse.buttons[id]; + if (!NK_INBOX(btn->clicked_pos.x,btn->clicked_pos.y,b.x,b.y,b.w,b.h)) + return nk_false; + return nk_true; +} +NK_API nk_bool +nk_input_has_mouse_click_in_rect_button(const struct nk_input *i, enum nk_buttons id, + struct nk_rect b) { const struct nk_mouse_button *btn; if (!i) return nk_false; @@ -23770,7 +23782,7 @@ nk_button_behavior(nk_flags *state, struct nk_rect r, *state = NK_WIDGET_STATE_HOVERED; if (nk_input_is_mouse_down(i, NK_BUTTON_LEFT)) *state = NK_WIDGET_STATE_ACTIVE; - if (nk_input_has_mouse_click_in_rect(i, NK_BUTTON_LEFT, r)) { + if (nk_input_has_mouse_click_in_rect_button(i, NK_BUTTON_LEFT, r)) { ret = (behavior != NK_BUTTON_DEFAULT) ? nk_input_is_mouse_down(i, NK_BUTTON_LEFT): #ifdef NK_BUTTON_TRIGGER_ON_RELEASE @@ -29644,6 +29656,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_rect_button() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down /// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS diff --git a/src/CHANGELOG b/src/CHANGELOG index 869c890..7f05782 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_rect_button() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down /// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS diff --git a/src/nuklear.h b/src/nuklear.h index 7979958..6d06be9 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -4461,6 +4461,7 @@ struct nk_input { NK_API nk_bool nk_input_has_mouse_click(const struct nk_input*, enum nk_buttons); NK_API nk_bool nk_input_has_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); +NK_API nk_bool nk_input_has_mouse_click_in_rect_button(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_has_mouse_click_down_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect, nk_bool down); NK_API nk_bool nk_input_is_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_is_mouse_click_down_in_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b, nk_bool down); diff --git a/src/nuklear_button.c b/src/nuklear_button.c index 54f02f7..5ca736c 100644 --- a/src/nuklear_button.c +++ b/src/nuklear_button.c @@ -70,7 +70,7 @@ nk_button_behavior(nk_flags *state, struct nk_rect r, *state = NK_WIDGET_STATE_HOVERED; if (nk_input_is_mouse_down(i, NK_BUTTON_LEFT)) *state = NK_WIDGET_STATE_ACTIVE; - if (nk_input_has_mouse_click_in_rect(i, NK_BUTTON_LEFT, r)) { + if (nk_input_has_mouse_click_in_rect_button(i, NK_BUTTON_LEFT, r)) { ret = (behavior != NK_BUTTON_DEFAULT) ? nk_input_is_mouse_down(i, NK_BUTTON_LEFT): #ifdef NK_BUTTON_TRIGGER_ON_RELEASE diff --git a/src/nuklear_input.c b/src/nuklear_input.c index b22afa6..c959a32 100644 --- a/src/nuklear_input.c +++ b/src/nuklear_input.c @@ -146,6 +146,17 @@ nk_input_has_mouse_click(const struct nk_input *i, enum nk_buttons id) NK_API nk_bool nk_input_has_mouse_click_in_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b) +{ + const struct nk_mouse_button *btn; + if (!i) return nk_false; + btn = &i->mouse.buttons[id]; + if (!NK_INBOX(btn->clicked_pos.x,btn->clicked_pos.y,b.x,b.y,b.w,b.h)) + return nk_false; + return nk_true; +} +NK_API nk_bool +nk_input_has_mouse_click_in_rect_button(const struct nk_input *i, enum nk_buttons id, + struct nk_rect b) { const struct nk_mouse_button *btn; if (!i) return nk_false; From 5bb591b0fbb880cda5b71be780e2c7442e161633 Mon Sep 17 00:00:00 2001 From: tcdude Date: Fri, 27 May 2022 21:28:34 +0200 Subject: [PATCH 82/89] Rename function --- nuklear.h | 8 ++++---- src/CHANGELOG | 2 +- src/nuklear.h | 2 +- src/nuklear_button.c | 2 +- src/nuklear_input.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nuklear.h b/nuklear.h index 121cf91..aef8f7f 100644 --- a/nuklear.h +++ b/nuklear.h @@ -4682,7 +4682,7 @@ struct nk_input { NK_API nk_bool nk_input_has_mouse_click(const struct nk_input*, enum nk_buttons); NK_API nk_bool nk_input_has_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); -NK_API nk_bool nk_input_has_mouse_click_in_rect_button(const struct nk_input*, enum nk_buttons, struct nk_rect); +NK_API nk_bool nk_input_has_mouse_click_in_button_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_has_mouse_click_down_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect, nk_bool down); NK_API nk_bool nk_input_is_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_is_mouse_click_down_in_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b, nk_bool down); @@ -17957,7 +17957,7 @@ nk_input_has_mouse_click_in_rect(const struct nk_input *i, enum nk_buttons id, return nk_true; } NK_API nk_bool -nk_input_has_mouse_click_in_rect_button(const struct nk_input *i, enum nk_buttons id, +nk_input_has_mouse_click_in_button_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b) { const struct nk_mouse_button *btn; @@ -23782,7 +23782,7 @@ nk_button_behavior(nk_flags *state, struct nk_rect r, *state = NK_WIDGET_STATE_HOVERED; if (nk_input_is_mouse_down(i, NK_BUTTON_LEFT)) *state = NK_WIDGET_STATE_ACTIVE; - if (nk_input_has_mouse_click_in_rect_button(i, NK_BUTTON_LEFT, r)) { + if (nk_input_has_mouse_click_in_button_rect(i, NK_BUTTON_LEFT, r)) { ret = (behavior != NK_BUTTON_DEFAULT) ? nk_input_is_mouse_down(i, NK_BUTTON_LEFT): #ifdef NK_BUTTON_TRIGGER_ON_RELEASE @@ -29656,7 +29656,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// -/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_rect_button() to fix window move bug +/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down /// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS diff --git a/src/CHANGELOG b/src/CHANGELOG index 7f05782..44223af 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,7 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// -/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_rect_button() to fix window move bug +/// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down /// - 2022/02/03 (4.9.6) - Allow overriding the NK_INV_SQRT function, similar to NK_SIN and NK_COS diff --git a/src/nuklear.h b/src/nuklear.h index 6d06be9..67b2aa9 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -4461,7 +4461,7 @@ struct nk_input { NK_API nk_bool nk_input_has_mouse_click(const struct nk_input*, enum nk_buttons); NK_API nk_bool nk_input_has_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); -NK_API nk_bool nk_input_has_mouse_click_in_rect_button(const struct nk_input*, enum nk_buttons, struct nk_rect); +NK_API nk_bool nk_input_has_mouse_click_in_button_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_has_mouse_click_down_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect, nk_bool down); NK_API nk_bool nk_input_is_mouse_click_in_rect(const struct nk_input*, enum nk_buttons, struct nk_rect); NK_API nk_bool nk_input_is_mouse_click_down_in_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b, nk_bool down); diff --git a/src/nuklear_button.c b/src/nuklear_button.c index 5ca736c..2636b60 100644 --- a/src/nuklear_button.c +++ b/src/nuklear_button.c @@ -70,7 +70,7 @@ nk_button_behavior(nk_flags *state, struct nk_rect r, *state = NK_WIDGET_STATE_HOVERED; if (nk_input_is_mouse_down(i, NK_BUTTON_LEFT)) *state = NK_WIDGET_STATE_ACTIVE; - if (nk_input_has_mouse_click_in_rect_button(i, NK_BUTTON_LEFT, r)) { + if (nk_input_has_mouse_click_in_button_rect(i, NK_BUTTON_LEFT, r)) { ret = (behavior != NK_BUTTON_DEFAULT) ? nk_input_is_mouse_down(i, NK_BUTTON_LEFT): #ifdef NK_BUTTON_TRIGGER_ON_RELEASE diff --git a/src/nuklear_input.c b/src/nuklear_input.c index c959a32..e438581 100644 --- a/src/nuklear_input.c +++ b/src/nuklear_input.c @@ -155,7 +155,7 @@ nk_input_has_mouse_click_in_rect(const struct nk_input *i, enum nk_buttons id, return nk_true; } NK_API nk_bool -nk_input_has_mouse_click_in_rect_button(const struct nk_input *i, enum nk_buttons id, +nk_input_has_mouse_click_in_button_rect(const struct nk_input *i, enum nk_buttons id, struct nk_rect b) { const struct nk_mouse_button *btn; From 7597cc7a09eed867a9afe520a9ad74a5bed0f3b7 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 9 Jul 2022 17:18:15 -0400 Subject: [PATCH 83/89] x11: Free XVisualInfo after use Fixes #473 --- demo/x11_opengl2/main.c | 1 + demo/x11_opengl3/main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/demo/x11_opengl2/main.c b/demo/x11_opengl2/main.c index e751eef..5145c3b 100644 --- a/demo/x11_opengl2/main.c +++ b/demo/x11_opengl2/main.c @@ -172,6 +172,7 @@ int main(void) glXGetFBConfigAttrib(win.dpy, fbc[i], GLX_SAMPLES, &samples); if ((fb_best < 0) || (sample_buffer && samples > best_num_samples)) fb_best = i, best_num_samples = samples; + XFree(vi); } } win.fbc = fbc[fb_best]; diff --git a/demo/x11_opengl3/main.c b/demo/x11_opengl3/main.c index 7e415b5..faaad12 100644 --- a/demo/x11_opengl3/main.c +++ b/demo/x11_opengl3/main.c @@ -170,6 +170,7 @@ int main(void) glXGetFBConfigAttrib(win.dpy, fbc[i], GLX_SAMPLES, &samples); if ((fb_best < 0) || (sample_buffer && samples > best_num_samples)) fb_best = i, best_num_samples = samples; + XFree(vi); } } win.fbc = fbc[fb_best]; From 3b5009255e8fdcf13d0e4b7895812f0acd561c0e Mon Sep 17 00:00:00 2001 From: opsJson <54485405+opsJson@users.noreply.github.com> Date: Mon, 25 Jul 2022 20:07:20 -0300 Subject: [PATCH 84/89] Fix Shift + End in nk_edit --- nuklear.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index aef8f7f..fde970a 100644 --- a/nuklear.h +++ b/nuklear.h @@ -26423,6 +26423,7 @@ retry: if (shift_mod) { nk_textedit_prep_selection_at_cursor(state); state->cursor = state->select_end = state->string.len; + if (state->select_start >= state->select_end) state->select_start = 0; state->has_preferred_x = 0; } else { state->cursor = state->string.len; @@ -30006,4 +30007,3 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// in libraries and brought me to create some of my own. Finally Apoorva Joshi /// for his single header file packer. */ - From d28d145732a8b9e17a16348a1d86d2174b5b9d96 Mon Sep 17 00:00:00 2001 From: opsJson <54485405+opsJson@users.noreply.github.com> Date: Sat, 30 Jul 2022 21:33:46 -0300 Subject: [PATCH 85/89] Fixed cursor position overflow --- nuklear.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index fde970a..377fa6b 100644 --- a/nuklear.h +++ b/nuklear.h @@ -26163,6 +26163,7 @@ nk_textedit_text(struct nk_text_edit *state, const char *text, int total_len) { nk_textedit_makeundo_insert(state, state->cursor, 1); ++state->cursor; + state->cursor = NK_MIN(state->cursor, state->string.len); state->has_preferred_x = 0; } } @@ -26423,7 +26424,6 @@ retry: if (shift_mod) { nk_textedit_prep_selection_at_cursor(state); state->cursor = state->select_end = state->string.len; - if (state->select_start >= state->select_end) state->select_start = 0; state->has_preferred_x = 0; } else { state->cursor = state->string.len; @@ -30007,3 +30007,4 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// in libraries and brought me to create some of my own. Finally Apoorva Joshi /// for his single header file packer. */ + From 9f0a6013954d6fa0ac44307245450f65b22cfb11 Mon Sep 17 00:00:00 2001 From: opsJson <54485405+opsJson@users.noreply.github.com> Date: Sat, 30 Jul 2022 21:36:01 -0300 Subject: [PATCH 86/89] Update nuklear_text_editor.c --- src/nuklear_text_editor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nuklear_text_editor.c b/src/nuklear_text_editor.c index 5b0c03a..bd93250 100644 --- a/src/nuklear_text_editor.c +++ b/src/nuklear_text_editor.c @@ -395,6 +395,7 @@ nk_textedit_text(struct nk_text_edit *state, const char *text, int total_len) { nk_textedit_makeundo_insert(state, state->cursor, 1); ++state->cursor; + state->cursor = NK_MIN(state->cursor, state->string.len); state->has_preferred_x = 0; } } From c7c3069dc2e6c070dcbb9c99f3292076dc5a69a0 Mon Sep 17 00:00:00 2001 From: opsJson Date: Mon, 1 Aug 2022 15:33:42 -0300 Subject: [PATCH 87/89] following the read me --- clib.json | 2 +- src/CHANGELOG | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/clib.json b/clib.json index 27c495f..3fe7d63 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name": "nuklear", - "version": "4.9.6", + "version": "4.10.1", "repo": "Immediate-Mode-UI/Nuklear", "description": "A small ANSI C gui toolkit", "keywords": ["gl", "ui", "toolkit"], diff --git a/src/CHANGELOG b/src/CHANGELOG index 44223af..bb0aad8 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than nk_edit_xxx limit /// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down From df86105c695b4dbb5e3974b12a23377e170e031b Mon Sep 17 00:00:00 2001 From: opsJson Date: Mon, 1 Aug 2022 16:19:45 -0300 Subject: [PATCH 88/89] Fix tabs --- src/CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index bb0aad8..00ee208 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,7 +7,8 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// -/// - 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than nk_edit_xxx limit +/// - 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than +/// nk_edit_xxx limit /// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down From e57ee582ab087af05ff61f767d977bb9aba3ca6c Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Wed, 3 Aug 2022 13:00:54 -0400 Subject: [PATCH 89/89] Update NK_MIN() call to save a line of code --- nuklear.h | 5 +++-- src/nuklear_text_editor.c | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nuklear.h b/nuklear.h index 377fa6b..7af8bb1 100644 --- a/nuklear.h +++ b/nuklear.h @@ -26162,8 +26162,7 @@ nk_textedit_text(struct nk_text_edit *state, const char *text, int total_len) text+text_len, 1)) { nk_textedit_makeundo_insert(state, state->cursor, 1); - ++state->cursor; - state->cursor = NK_MIN(state->cursor, state->string.len); + state->cursor = NK_MIN(state->cursor + 1, state->string.len); state->has_preferred_x = 0; } } @@ -29657,6 +29656,8 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2022/08/01 (4.10.1) - Fix cursor jumping back to beginning of text when typing more than +/// nk_edit_xxx limit /// - 2022/05/27 (4.10.0) - Add nk_input_has_mouse_click_in_button_rect() to fix window move bug /// - 2022/04/18 (4.9.7) - Change button behavior when NK_BUTTON_TRIGGER_ON_RELEASE is defined to /// only trigger when the mouse position was inside the same button on down diff --git a/src/nuklear_text_editor.c b/src/nuklear_text_editor.c index bd93250..e381857 100644 --- a/src/nuklear_text_editor.c +++ b/src/nuklear_text_editor.c @@ -394,8 +394,7 @@ nk_textedit_text(struct nk_text_edit *state, const char *text, int total_len) text+text_len, 1)) { nk_textedit_makeundo_insert(state, state->cursor, 1); - ++state->cursor; - state->cursor = NK_MIN(state->cursor, state->string.len); + state->cursor = NK_MIN(state->cursor + 1, state->string.len); state->has_preferred_x = 0; } }