hs

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | Submodules | LICENSE

commit 9e77179681afdec5ce799e48cdcfd6ec00e20c4b
parent 2612995ac88b78ebf7f7da55dffc82c305267358
Author: Samdal <samdal@protonmail.com>
Date:   Thu, 26 Aug 2021 22:28:13 +0200

nuklear

Diffstat:
A.gitmodules | 3+++
RKHR/khrplatform.h -> external/KHR/khrplatform.h | 0
Rglad/glad.h -> external/glad/glad.h | 0
Rglad/glad_impl.h -> external/glad/glad_impl.h | 0
Rglfw/cocoa_init.m -> external/glfw/cocoa_init.m | 0
Rglfw/cocoa_joystick.h -> external/glfw/cocoa_joystick.h | 0
Rglfw/cocoa_joystick.m -> external/glfw/cocoa_joystick.m | 0
Rglfw/cocoa_monitor.m -> external/glfw/cocoa_monitor.m | 0
Rglfw/cocoa_platform.h -> external/glfw/cocoa_platform.h | 0
Rglfw/cocoa_time.c -> external/glfw/cocoa_time.c | 0
Rglfw/cocoa_window.m -> external/glfw/cocoa_window.m | 0
Rglfw/context.c -> external/glfw/context.c | 0
Rglfw/egl_context.c -> external/glfw/egl_context.c | 0
Rglfw/egl_context.h -> external/glfw/egl_context.h | 0
Rglfw/glfw.rc.in -> external/glfw/glfw.rc.in | 0
Rglfw/glfw3.h -> external/glfw/glfw3.h | 0
Rglfw/glfw3native.h -> external/glfw/glfw3native.h | 0
Rglfw/glfw_config.h.in -> external/glfw/glfw_config.h.in | 0
Rglfw/glfw_impl.h -> external/glfw/glfw_impl.h | 0
Rglfw/glx_context.c -> external/glfw/glx_context.c | 0
Rglfw/glx_context.h -> external/glfw/glx_context.h | 0
Rglfw/init.c -> external/glfw/init.c | 0
Rglfw/input.c -> external/glfw/input.c | 0
Rglfw/internal.h -> external/glfw/internal.h | 0
Rglfw/linux_joystick.c -> external/glfw/linux_joystick.c | 0
Rglfw/linux_joystick.h -> external/glfw/linux_joystick.h | 0
Rglfw/mappings.h -> external/glfw/mappings.h | 0
Rglfw/mappings.h.in -> external/glfw/mappings.h.in | 0
Rglfw/monitor.c -> external/glfw/monitor.c | 0
Rglfw/nsgl_context.h -> external/glfw/nsgl_context.h | 0
Rglfw/nsgl_context.m -> external/glfw/nsgl_context.m | 0
Rglfw/null_init.c -> external/glfw/null_init.c | 0
Rglfw/null_joystick.c -> external/glfw/null_joystick.c | 0
Rglfw/null_joystick.h -> external/glfw/null_joystick.h | 0
Rglfw/null_monitor.c -> external/glfw/null_monitor.c | 0
Rglfw/null_platform.h -> external/glfw/null_platform.h | 0
Rglfw/null_window.c -> external/glfw/null_window.c | 0
Rglfw/osmesa_context.c -> external/glfw/osmesa_context.c | 0
Rglfw/osmesa_context.h -> external/glfw/osmesa_context.h | 0
Rglfw/posix_thread.c -> external/glfw/posix_thread.c | 0
Rglfw/posix_thread.h -> external/glfw/posix_thread.h | 0
Rglfw/posix_time.c -> external/glfw/posix_time.c | 0
Rglfw/posix_time.h -> external/glfw/posix_time.h | 0
Rglfw/vulkan.c -> external/glfw/vulkan.c | 0
Rglfw/wgl_context.c -> external/glfw/wgl_context.c | 0
Rglfw/wgl_context.h -> external/glfw/wgl_context.h | 0
Rglfw/win32_init.c -> external/glfw/win32_init.c | 0
Rglfw/win32_joystick.c -> external/glfw/win32_joystick.c | 0
Rglfw/win32_joystick.h -> external/glfw/win32_joystick.h | 0
Rglfw/win32_monitor.c -> external/glfw/win32_monitor.c | 0
Rglfw/win32_platform.h -> external/glfw/win32_platform.h | 0
Rglfw/win32_thread.c -> external/glfw/win32_thread.c | 0
Rglfw/win32_time.c -> external/glfw/win32_time.c | 0
Rglfw/win32_window.c -> external/glfw/win32_window.c | 0
Rglfw/window.c -> external/glfw/window.c | 0
Rglfw/wl_init.c -> external/glfw/wl_init.c | 0
Rglfw/wl_monitor.c -> external/glfw/wl_monitor.c | 0
Rglfw/wl_platform.h -> external/glfw/wl_platform.h | 0
Rglfw/wl_window.c -> external/glfw/wl_window.c | 0
Rglfw/x11_init.c -> external/glfw/x11_init.c | 0
Rglfw/x11_monitor.c -> external/glfw/x11_monitor.c | 0
Rglfw/x11_platform.h -> external/glfw/x11_platform.h | 0
Rglfw/x11_window.c -> external/glfw/x11_window.c | 0
Rglfw/xkb_unicode.c -> external/glfw/xkb_unicode.c | 0
Rglfw/xkb_unicode.h -> external/glfw/xkb_unicode.h | 0
Aexternal/nuklear | 1+
Aexternal/nuklear_glfw_gl3.h | 498+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Rstb_image.h -> external/stb_image.h | 0
Mhs_graphics.h | 49++++++++++++++++++++++++++++++++-----------------
69 files changed, 534 insertions(+), 17 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "external/nuklear"] + path = external/nuklear + url = https://github.com/Immediate-Mode-UI/Nuklear diff --git a/KHR/khrplatform.h b/external/KHR/khrplatform.h diff --git a/glad/glad.h b/external/glad/glad.h diff --git a/glad/glad_impl.h b/external/glad/glad_impl.h diff --git a/glfw/cocoa_init.m b/external/glfw/cocoa_init.m diff --git a/glfw/cocoa_joystick.h b/external/glfw/cocoa_joystick.h diff --git a/glfw/cocoa_joystick.m b/external/glfw/cocoa_joystick.m diff --git a/glfw/cocoa_monitor.m b/external/glfw/cocoa_monitor.m diff --git a/glfw/cocoa_platform.h b/external/glfw/cocoa_platform.h diff --git a/glfw/cocoa_time.c b/external/glfw/cocoa_time.c diff --git a/glfw/cocoa_window.m b/external/glfw/cocoa_window.m diff --git a/glfw/context.c b/external/glfw/context.c diff --git a/glfw/egl_context.c b/external/glfw/egl_context.c diff --git a/glfw/egl_context.h b/external/glfw/egl_context.h diff --git a/glfw/glfw.rc.in b/external/glfw/glfw.rc.in diff --git a/glfw/glfw3.h b/external/glfw/glfw3.h diff --git a/glfw/glfw3native.h b/external/glfw/glfw3native.h diff --git a/glfw/glfw_config.h.in b/external/glfw/glfw_config.h.in diff --git a/glfw/glfw_impl.h b/external/glfw/glfw_impl.h diff --git a/glfw/glx_context.c b/external/glfw/glx_context.c diff --git a/glfw/glx_context.h b/external/glfw/glx_context.h diff --git a/glfw/init.c b/external/glfw/init.c diff --git a/glfw/input.c b/external/glfw/input.c diff --git a/glfw/internal.h b/external/glfw/internal.h diff --git a/glfw/linux_joystick.c b/external/glfw/linux_joystick.c diff --git a/glfw/linux_joystick.h b/external/glfw/linux_joystick.h diff --git a/glfw/mappings.h b/external/glfw/mappings.h diff --git a/glfw/mappings.h.in b/external/glfw/mappings.h.in diff --git a/glfw/monitor.c b/external/glfw/monitor.c diff --git a/glfw/nsgl_context.h b/external/glfw/nsgl_context.h diff --git a/glfw/nsgl_context.m b/external/glfw/nsgl_context.m diff --git a/glfw/null_init.c b/external/glfw/null_init.c diff --git a/glfw/null_joystick.c b/external/glfw/null_joystick.c diff --git a/glfw/null_joystick.h b/external/glfw/null_joystick.h diff --git a/glfw/null_monitor.c b/external/glfw/null_monitor.c diff --git a/glfw/null_platform.h b/external/glfw/null_platform.h diff --git a/glfw/null_window.c b/external/glfw/null_window.c diff --git a/glfw/osmesa_context.c b/external/glfw/osmesa_context.c diff --git a/glfw/osmesa_context.h b/external/glfw/osmesa_context.h diff --git a/glfw/posix_thread.c b/external/glfw/posix_thread.c diff --git a/glfw/posix_thread.h b/external/glfw/posix_thread.h diff --git a/glfw/posix_time.c b/external/glfw/posix_time.c diff --git a/glfw/posix_time.h b/external/glfw/posix_time.h diff --git a/glfw/vulkan.c b/external/glfw/vulkan.c diff --git a/glfw/wgl_context.c b/external/glfw/wgl_context.c diff --git a/glfw/wgl_context.h b/external/glfw/wgl_context.h diff --git a/glfw/win32_init.c b/external/glfw/win32_init.c diff --git a/glfw/win32_joystick.c b/external/glfw/win32_joystick.c diff --git a/glfw/win32_joystick.h b/external/glfw/win32_joystick.h diff --git a/glfw/win32_monitor.c b/external/glfw/win32_monitor.c diff --git a/glfw/win32_platform.h b/external/glfw/win32_platform.h diff --git a/glfw/win32_thread.c b/external/glfw/win32_thread.c diff --git a/glfw/win32_time.c b/external/glfw/win32_time.c diff --git a/glfw/win32_window.c b/external/glfw/win32_window.c diff --git a/glfw/window.c b/external/glfw/window.c diff --git a/glfw/wl_init.c b/external/glfw/wl_init.c diff --git a/glfw/wl_monitor.c b/external/glfw/wl_monitor.c diff --git a/glfw/wl_platform.h b/external/glfw/wl_platform.h diff --git a/glfw/wl_window.c b/external/glfw/wl_window.c diff --git a/glfw/x11_init.c b/external/glfw/x11_init.c diff --git a/glfw/x11_monitor.c b/external/glfw/x11_monitor.c diff --git a/glfw/x11_platform.h b/external/glfw/x11_platform.h diff --git a/glfw/x11_window.c b/external/glfw/x11_window.c diff --git a/glfw/xkb_unicode.c b/external/glfw/xkb_unicode.c diff --git a/glfw/xkb_unicode.h b/external/glfw/xkb_unicode.h diff --git a/external/nuklear b/external/nuklear @@ -0,0 +1 @@ +Subproject commit 6322f53cb569bb989873ee8a1b71ae705b230708 diff --git a/external/nuklear_glfw_gl3.h b/external/nuklear_glfw_gl3.h @@ -0,0 +1,498 @@ +/* + * Nuklear - 1.32.0 - public domain + * no warrenty implied; use at your own risk. + * authored from 2015-2016 by Micha Mettke + */ +/* + * ============================================================== + * + * API + * + * =============================================================== + */ +#ifndef NK_GLFW_GL3_H_ +#define NK_GLFW_GL3_H_ + +#include "glfw/glfw3.h" + +enum nk_glfw_init_state{ + NK_GLFW3_DEFAULT=0, + NK_GLFW3_INSTALL_CALLBACKS +}; + +#ifndef NK_GLFW_TEXT_MAX +#define NK_GLFW_TEXT_MAX 256 +#endif + +struct nk_glfw_device { + struct nk_buffer cmds; + struct nk_draw_null_texture null; + GLuint vbo, vao, ebo; + GLuint prog; + GLuint vert_shdr; + GLuint frag_shdr; + GLint attrib_pos; + GLint attrib_uv; + GLint attrib_col; + GLint uniform_tex; + GLint uniform_proj; + GLuint font_tex; +}; + +struct nk_glfw { + GLFWwindow *win; + int width, height; + int display_width, display_height; + struct nk_glfw_device ogl; + struct nk_context ctx; + struct nk_font_atlas atlas; + struct nk_vec2 fb_scale; + unsigned int text[NK_GLFW_TEXT_MAX]; + int text_len; + struct nk_vec2 scroll; + double last_button_click; + int is_double_click_down; + struct nk_vec2 double_click_pos; +}; + +NK_API struct nk_context* nk_glfw3_init(struct nk_glfw* glfw, GLFWwindow *win, enum nk_glfw_init_state); +NK_API void nk_glfw3_shutdown(struct nk_glfw* glfw); +NK_API void nk_glfw3_font_stash_begin(struct nk_glfw* glfw, struct nk_font_atlas **atlas); +NK_API void nk_glfw3_font_stash_end(struct nk_glfw* glfw); +NK_API void nk_glfw3_new_frame(struct nk_glfw* glfw); +NK_API void nk_glfw3_render(struct nk_glfw* glfw, enum nk_anti_aliasing, int max_vertex_buffer, int max_element_buffer); + +NK_API void nk_glfw3_device_destroy(struct nk_glfw* glfw); +NK_API void nk_glfw3_device_create(struct nk_glfw* glfw); + +NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint); +NK_API void 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); + +#endif +/* + * ============================================================== + * + * IMPLEMENTATION + * + * =============================================================== + */ +#ifdef NK_GLFW_GL3_IMPLEMENTATION + +#ifndef NK_GLFW_DOUBLE_CLICK_LO +#define NK_GLFW_DOUBLE_CLICK_LO 0.02 +#endif +#ifndef NK_GLFW_DOUBLE_CLICK_HI +#define NK_GLFW_DOUBLE_CLICK_HI 0.2 +#endif + +struct nk_glfw_vertex { + float position[2]; + float uv[2]; + nk_byte col[4]; +}; + +#ifdef __APPLE__ + #define NK_SHADER_VERSION "#version 150\n" +#else + #define NK_SHADER_VERSION "#version 300 es\n" +#endif + +NK_API void +nk_glfw3_device_create(struct nk_glfw* glfw) +{ + GLint status; + static const GLchar *vertex_shader = + NK_SHADER_VERSION + "uniform mat4 ProjMtx;\n" + "in vec2 Position;\n" + "in vec2 TexCoord;\n" + "in vec4 Color;\n" + "out vec2 Frag_UV;\n" + "out vec4 Frag_Color;\n" + "void main() {\n" + " Frag_UV = TexCoord;\n" + " Frag_Color = Color;\n" + " gl_Position = ProjMtx * vec4(Position.xy, 0, 1);\n" + "}\n"; + static const GLchar *fragment_shader = + NK_SHADER_VERSION + "precision mediump float;\n" + "uniform sampler2D Texture;\n" + "in vec2 Frag_UV;\n" + "in vec4 Frag_Color;\n" + "out vec4 Out_Color;\n" + "void main(){\n" + " Out_Color = Frag_Color * texture(Texture, Frag_UV.st);\n" + "}\n"; + + struct nk_glfw_device *dev = &glfw->ogl; + nk_buffer_init_default(&dev->cmds); + dev->prog = glCreateProgram(); + dev->vert_shdr = glCreateShader(GL_VERTEX_SHADER); + dev->frag_shdr = glCreateShader(GL_FRAGMENT_SHADER); + glShaderSource(dev->vert_shdr, 1, &vertex_shader, 0); + glShaderSource(dev->frag_shdr, 1, &fragment_shader, 0); + glCompileShader(dev->vert_shdr); + glCompileShader(dev->frag_shdr); + glGetShaderiv(dev->vert_shdr, GL_COMPILE_STATUS, &status); + assert(status == GL_TRUE); + glGetShaderiv(dev->frag_shdr, GL_COMPILE_STATUS, &status); + assert(status == GL_TRUE); + glAttachShader(dev->prog, dev->vert_shdr); + glAttachShader(dev->prog, dev->frag_shdr); + glLinkProgram(dev->prog); + glGetProgramiv(dev->prog, GL_LINK_STATUS, &status); + assert(status == GL_TRUE); + + dev->uniform_tex = glGetUniformLocation(dev->prog, "Texture"); + dev->uniform_proj = glGetUniformLocation(dev->prog, "ProjMtx"); + dev->attrib_pos = glGetAttribLocation(dev->prog, "Position"); + dev->attrib_uv = glGetAttribLocation(dev->prog, "TexCoord"); + dev->attrib_col = glGetAttribLocation(dev->prog, "Color"); + + { + /* buffer setup */ + GLsizei vs = sizeof(struct nk_glfw_vertex); + size_t vp = offsetof(struct nk_glfw_vertex, position); + size_t vt = offsetof(struct nk_glfw_vertex, uv); + size_t vc = offsetof(struct nk_glfw_vertex, col); + + glGenBuffers(1, &dev->vbo); + glGenBuffers(1, &dev->ebo); + glGenVertexArrays(1, &dev->vao); + + glBindVertexArray(dev->vao); + glBindBuffer(GL_ARRAY_BUFFER, dev->vbo); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, dev->ebo); + + glEnableVertexAttribArray((GLuint)dev->attrib_pos); + glEnableVertexAttribArray((GLuint)dev->attrib_uv); + glEnableVertexAttribArray((GLuint)dev->attrib_col); + + glVertexAttribPointer((GLuint)dev->attrib_pos, 2, GL_FLOAT, GL_FALSE, vs, (void*)vp); + glVertexAttribPointer((GLuint)dev->attrib_uv, 2, GL_FLOAT, GL_FALSE, vs, (void*)vt); + glVertexAttribPointer((GLuint)dev->attrib_col, 4, GL_UNSIGNED_BYTE, GL_TRUE, vs, (void*)vc); + } + + glBindTexture(GL_TEXTURE_2D, 0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindVertexArray(0); +} + +NK_INTERN void +nk_glfw3_device_upload_atlas(struct nk_glfw* glfw, const void *image, int width, int height) +{ + struct nk_glfw_device *dev = &glfw->ogl; + glGenTextures(1, &dev->font_tex); + glBindTexture(GL_TEXTURE_2D, dev->font_tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, + GL_RGBA, GL_UNSIGNED_BYTE, image); +} + +NK_API void +nk_glfw3_device_destroy(struct nk_glfw* glfw) +{ + struct nk_glfw_device *dev = &glfw->ogl; + glDetachShader(dev->prog, dev->vert_shdr); + glDetachShader(dev->prog, dev->frag_shdr); + glDeleteShader(dev->vert_shdr); + glDeleteShader(dev->frag_shdr); + glDeleteProgram(dev->prog); + glDeleteTextures(1, &dev->font_tex); + glDeleteBuffers(1, &dev->vbo); + glDeleteBuffers(1, &dev->ebo); + nk_buffer_free(&dev->cmds); +} + +NK_API void +nk_glfw3_render(struct nk_glfw* glfw, enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_buffer) +{ + struct nk_glfw_device *dev = &glfw->ogl; + struct nk_buffer vbuf, ebuf; + GLfloat ortho[4][4] = { + {2.0f, 0.0f, 0.0f, 0.0f}, + {0.0f,-2.0f, 0.0f, 0.0f}, + {0.0f, 0.0f,-1.0f, 0.0f}, + {-1.0f,1.0f, 0.0f, 1.0f}, + }; + ortho[0][0] /= (GLfloat)glfw->width; + ortho[1][1] /= (GLfloat)glfw->height; + + /* setup global state */ + glEnable(GL_BLEND); + glBlendEquation(GL_FUNC_ADD); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDisable(GL_CULL_FACE); + glDisable(GL_DEPTH_TEST); + glEnable(GL_SCISSOR_TEST); + glActiveTexture(GL_TEXTURE0); + + /* setup program */ + glUseProgram(dev->prog); + glUniform1i(dev->uniform_tex, 0); + glUniformMatrix4fv(dev->uniform_proj, 1, GL_FALSE, &ortho[0][0]); + glViewport(0,0,(GLsizei)glfw->display_width,(GLsizei)glfw->display_height); + { + /* convert from command queue into draw list and draw to screen */ + const struct nk_draw_command *cmd; + void *vertices, *elements; + const nk_draw_index *offset = NULL; + + /* allocate vertex and element buffer */ + glBindVertexArray(dev->vao); + glBindBuffer(GL_ARRAY_BUFFER, dev->vbo); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, dev->ebo); + + glBufferData(GL_ARRAY_BUFFER, max_vertex_buffer, NULL, GL_STREAM_DRAW); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, max_element_buffer, NULL, GL_STREAM_DRAW); + + /* load draw vertices & elements directly into vertex + element buffer */ + vertices = glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY); + elements = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_WRITE_ONLY); + { + /* fill convert 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_glfw_vertex, position)}, + {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_glfw_vertex, uv)}, + {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)}, + {NK_VERTEX_LAYOUT_END} + }; + 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); + 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; + + /* setup buffers to load vertices and elements */ + nk_buffer_init_fixed(&vbuf, vertices, (size_t)max_vertex_buffer); + nk_buffer_init_fixed(&ebuf, elements, (size_t)max_element_buffer); + nk_convert(&glfw->ctx, &dev->cmds, &vbuf, &ebuf, &config); + } + glUnmapBuffer(GL_ARRAY_BUFFER); + glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER); + + /* iterate over and execute each draw command */ + nk_draw_foreach(cmd, &glfw->ctx, &dev->cmds) + { + if (!cmd->elem_count) continue; + glBindTexture(GL_TEXTURE_2D, (GLuint)cmd->texture.id); + glScissor( + (GLint)(cmd->clip_rect.x * glfw->fb_scale.x), + (GLint)((glfw->height - (GLint)(cmd->clip_rect.y + cmd->clip_rect.h)) * glfw->fb_scale.y), + (GLint)(cmd->clip_rect.w * glfw->fb_scale.x), + (GLint)(cmd->clip_rect.h * glfw->fb_scale.y)); + glDrawElements(GL_TRIANGLES, (GLsizei)cmd->elem_count, GL_UNSIGNED_SHORT, offset); + offset += cmd->elem_count; + } + nk_clear(&glfw->ctx); + nk_buffer_clear(&dev->cmds); + } + + /* default OpenGL state */ + glUseProgram(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindVertexArray(0); + glDisable(GL_BLEND); + glDisable(GL_SCISSOR_TEST); +} + +NK_API void +nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) +{ + struct nk_glfw* glfw = glfwGetWindowUserPointer(win); + if (glfw->text_len < NK_GLFW_TEXT_MAX) + glfw->text[glfw->text_len++] = codepoint; +} + +NK_API void +nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff) +{ + struct nk_glfw* glfw = glfwGetWindowUserPointer(win); + (void)xoff; + glfw->scroll.x += (float)xoff; + glfw->scroll.y += (float)yoff; +} + +NK_API void +nk_glfw3_mouse_button_callback(GLFWwindow* win, int button, int action, int mods) +{ + 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; + if (dt > NK_GLFW_DOUBLE_CLICK_LO && dt < NK_GLFW_DOUBLE_CLICK_HI) { + glfw->is_double_click_down = nk_true; + glfw->double_click_pos = nk_vec2((float)x, (float)y); + } + glfw->last_button_click = glfwGetTime(); + } else glfw->is_double_click_down = nk_false; +} + +NK_INTERN void +nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) +{ + struct nk_glfw* glfw = usr.ptr; + const char *text = glfwGetClipboardString(glfw->win); + if (text) nk_textedit_paste(edit, text, nk_strlen(text)); + (void)usr; +} + +NK_INTERN void +nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len) +{ + 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); +} + +NK_API struct nk_context* +nk_glfw3_init(struct nk_glfw* glfw, GLFWwindow *win, enum nk_glfw_init_state init_state) +{ + glfwSetWindowUserPointer(win, glfw); + glfw->win = win; + if (init_state == NK_GLFW3_INSTALL_CALLBACKS) { + glfwSetScrollCallback(win, nk_gflw3_scroll_callback); + glfwSetCharCallback(win, nk_glfw3_char_callback); + glfwSetMouseButtonCallback(win, nk_glfw3_mouse_button_callback); + } + nk_init_default(&glfw->ctx, 0); + glfw->ctx.clip.copy = nk_glfw3_clipboard_copy; + glfw->ctx.clip.paste = nk_glfw3_clipboard_paste; + glfw->ctx.clip.userdata = nk_handle_ptr(&glfw); + glfw->last_button_click = 0; + nk_glfw3_device_create(glfw); + + glfw->is_double_click_down = nk_false; + glfw->double_click_pos = nk_vec2(0, 0); + + return &glfw->ctx; +} + +NK_API void +nk_glfw3_font_stash_begin(struct nk_glfw* glfw, struct nk_font_atlas **atlas) +{ + nk_font_atlas_init_default(&glfw->atlas); + nk_font_atlas_begin(&glfw->atlas); + *atlas = &glfw->atlas; +} + +NK_API void +nk_glfw3_font_stash_end(struct nk_glfw* glfw) +{ + const void *image; int w, h; + image = nk_font_atlas_bake(&glfw->atlas, &w, &h, NK_FONT_ATLAS_RGBA32); + nk_glfw3_device_upload_atlas(glfw, image, w, h); + nk_font_atlas_end(&glfw->atlas, nk_handle_id((int)glfw->ogl.font_tex), &glfw->ogl.null); + if (glfw->atlas.default_font) + nk_style_set_font(&glfw->ctx, &glfw->atlas.default_font->handle); +} + +NK_API void +nk_glfw3_new_frame(struct nk_glfw* glfw) +{ + int i; + double x, y; + struct nk_context *ctx = &glfw->ctx; + struct GLFWwindow *win = glfw->win; + + glfwGetWindowSize(win, &glfw->width, &glfw->height); + glfwGetFramebufferSize(win, &glfw->display_width, &glfw->display_height); + glfw->fb_scale.x = (float)glfw->display_width/(float)glfw->width; + glfw->fb_scale.y = (float)glfw->display_height/(float)glfw->height; + + nk_input_begin(ctx); + for (i = 0; i < glfw->text_len; ++i) + nk_input_unicode(ctx, glfw->text[i]); + +#ifdef NK_GLFW_GL3_MOUSE_GRABBING + /* optional grabbing behavior */ + if (ctx->input.mouse.grab) + glfwSetInputMode(glfw.win, GLFW_CURSOR, GLFW_CURSOR_HIDDEN); + else if (ctx->input.mouse.ungrab) + glfwSetInputMode(glfw->win, GLFW_CURSOR, GLFW_CURSOR_NORMAL); +#endif + + nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_DOWN, glfwGetKey(win, GLFW_KEY_DOWN) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TEXT_START, glfwGetKey(win, GLFW_KEY_HOME) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TEXT_END, glfwGetKey(win, GLFW_KEY_END) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_SCROLL_START, glfwGetKey(win, GLFW_KEY_HOME) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_SCROLL_END, glfwGetKey(win, GLFW_KEY_END) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_SCROLL_DOWN, glfwGetKey(win, GLFW_KEY_PAGE_DOWN) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_SCROLL_UP, glfwGetKey(win, GLFW_KEY_PAGE_UP) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_SHIFT, glfwGetKey(win, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS|| + glfwGetKey(win, GLFW_KEY_RIGHT_SHIFT) == GLFW_PRESS); + + if (glfwGetKey(win, GLFW_KEY_LEFT_CONTROL) == GLFW_PRESS || + glfwGetKey(win, GLFW_KEY_RIGHT_CONTROL) == GLFW_PRESS) { + nk_input_key(ctx, NK_KEY_COPY, glfwGetKey(win, GLFW_KEY_C) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_PASTE, glfwGetKey(win, GLFW_KEY_V) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_CUT, glfwGetKey(win, GLFW_KEY_X) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TEXT_UNDO, glfwGetKey(win, GLFW_KEY_Z) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TEXT_REDO, glfwGetKey(win, GLFW_KEY_R) == GLFW_PRESS); + nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, glfwGetKey(win, GLFW_KEY_LEFT) == GLFW_PRESS); + 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); + } 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); + nk_input_key(ctx, NK_KEY_COPY, 0); + nk_input_key(ctx, NK_KEY_PASTE, 0); + nk_input_key(ctx, NK_KEY_CUT, 0); + nk_input_key(ctx, NK_KEY_SHIFT, 0); + } + + glfwGetCursorPos(win, &x, &y); + nk_input_motion(ctx, (int)x, (int)y); +#ifdef NK_GLFW_GL3_MOUSE_GRABBING + if (ctx->input.mouse.grabbed) { + glfwSetCursorPos(glfw->win, ctx->input.mouse.prev.x, ctx->input.mouse.prev.y); + ctx->input.mouse.pos.x = ctx->input.mouse.prev.x; + ctx->input.mouse.pos.y = ctx->input.mouse.prev.y; + } +#endif + nk_input_button(ctx, NK_BUTTON_LEFT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS); + nk_input_button(ctx, NK_BUTTON_MIDDLE, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_MIDDLE) == GLFW_PRESS); + nk_input_button(ctx, NK_BUTTON_RIGHT, (int)x, (int)y, glfwGetMouseButton(win, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS); + nk_input_button(ctx, NK_BUTTON_DOUBLE, (int)glfw->double_click_pos.x, (int)glfw->double_click_pos.y, glfw->is_double_click_down); + nk_input_scroll(ctx, glfw->scroll); + nk_input_end(&glfw->ctx); + glfw->text_len = 0; + glfw->scroll = nk_vec2(0,0); +} + +NK_API +void nk_glfw3_shutdown(struct nk_glfw* glfw) +{ + nk_font_atlas_clear(&glfw->atlas); + nk_free(&glfw->ctx); + nk_glfw3_device_destroy(glfw); + memset(glfw, 0, sizeof(*glfw)); +} + +#endif diff --git a/stb_image.h b/external/stb_image.h diff --git a/hs_graphics.h b/hs_graphics.h @@ -1,8 +1,8 @@ #ifndef HS_GRAPHICS_H_ #define HS_GRAPHICS_H_ -#include "glad/glad.h" -#include "glfw/glfw3.h" +#include "external/glad/glad.h" +#include "external/glfw/glfw3.h" #include <stdlib.h> #include <assert.h> #include <stdio.h> @@ -10,7 +10,7 @@ #ifndef NO_STBI #define STB_IMAGE_IMPLEMENTATION -#include "stb_image.h" +#include "external/stb_image.h" #endif #ifdef WIN32 @@ -18,6 +18,21 @@ #include <windows.h> #endif +#ifdef HS_NUKLEAR +#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_GLFW_GL3_IMPLEMENTATION +#define NK_KEYSTATE_BASED_INPUT +#include "external/nuklear/nuklear.h" +#include "external/nuklear_glfw_gl3.h" +#endif + #include "hs_math.h" #include "hs_data.h" @@ -164,7 +179,7 @@ extern vec2i hs_aabb2i_half_size(const aabb2i rect); extern void hs_bsp_recti_split_in_place_append(aabb2i* rects, const uint32_t new_rect_index, const vec2i min_rect_size); /* Physics */ -extern uint_fast16_t hs_aabb_check_collide(const aabb2 r1, const aabb2 r2); +extern uint32_t hs_aabb_check_collide(const aabb2 r1, const aabb2 r2); extern void hs_aabb_check_and_do_collide(aabb2* r1, aabb2* r2); extern void hs_aabb_check_and_do_collide_static(aabb2* r1, aabb2* r2); @@ -214,9 +229,9 @@ extern void hs_fps_callback_init(const hs_game_data gd, void(*mouse_callback)(GL #ifdef HS_IMPL #define GLAD_IMPL -#include "glad/glad_impl.h" +#include "external/glad/glad_impl.h" #define GLFW_IMPL -#include "glfw/glfw_impl.h" +#include "external/glfw/glfw_impl.h" inline void hs_clear(const float r, const float g, const float b, const float a, const GLbitfield mask) @@ -623,7 +638,7 @@ hs_bsp_recti_split_in_place_append(aabb2i* rects, const uint32_t new_rect_index, // half rect size instead of size since we are trying to split it half_rect_size = hs_aabb2i_half_size(rects[rect_index]); - if (min_rect_size.x < half_rect_size.x || min_rect_size.y < half_rect_size.y) + if (min_rect_size.x <= half_rect_size.x && min_rect_size.y <= half_rect_size.y) goto random_rect_found; } @@ -632,32 +647,32 @@ hs_bsp_recti_split_in_place_append(aabb2i* rects, const uint32_t new_rect_index, for (rect_index = 0; rect_index < new_rect_index; rect_index++) { half_rect_size = hs_aabb2i_half_size(rects[rect_index]); - if (min_rect_size.x < half_rect_size.x || min_rect_size.y < half_rect_size.y) + if (min_rect_size.x <= half_rect_size.x && min_rect_size.y <= half_rect_size.y) goto random_rect_found; } - // uhhhhh so this will be our error message + // uhhhhh so this will be our error message, TODO: handle errors propperly rects[0].tr.x = 0; return; - random_rect_found:; + random_rect_found: rects[new_rect_index] = rects[rect_index]; - const uint32_t axis = rand() % 2; + // TODO maybe add some randomness to this + const uint32_t axis = half_rect_size.x >= half_rect_size.y ? 0 : 1; const int32_t max_split = half_rect_size.xy[axis] - min_rect_size.xy[axis]; - const int32_t split = (rand() % (max_split * 2)) - max_split; + int32_t split = (rand() % (max_split * 2)) - max_split; + split = 0; - printf("split: %d %d\n", split, max_split); - - const int32_t rect_center = hs_aabb2i_center(rects[axis]).x; + const int32_t rect_center = hs_aabb2i_center(rects[rect_index]).xy[axis]; rects[rect_index].bl.xy[axis] = rect_center - split; - rects[new_rect_index].tr.xy[axis] = rect_center + split; + rects[new_rect_index].tr.xy[axis] = rect_center + split - 1; } -inline uint_fast16_t +inline uint32_t hs_aabb_check_collide(const aabb2 r1, const aabb2 r2) { if (r1.tr.y <= r2.bl.y || r2.tr.y <= r1.bl.y ||