Merge pull request vurtun#2 from vurtun/master

Syncing fork to the original repository
Arkinux · Oct 28, 2018 · 4566f8d · 4566f8d
2 parents 708a7eb + 19c14bb
commit 4566f8d
Show file tree

Hide file tree

Showing 112 changed files with 46,936 additions and 12,044 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,8 @@
 demo/*/*.exe
 demo/*/*.obj
+demo/*/bin/*
+example/bin/*
+docs/xml
+docs/build
+docs/src
+*.tmp
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -11,5 +11,6 @@ before_install:
     - if [ $TRAVIS_OS_NAME == linux ]; then sudo add-apt-repository -y ppa:pyglfw/pyglfw && sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libglew-dev; fi
 
 script:
-    - make -C demo/glfw_opengl3
+    - make -C demo/glfw_opengl3 CFLAGS="-Wall -DINCLUDE_ALL"
     - make -C demo/glfw_opengl2
+    - make -C example
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
diff --git a/Readme.md b/Readme.md
@@ -5,7 +5,7 @@
 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
+a default render backend 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
@@ -25,6 +25,7 @@ render backends it only focuses on the actual UI.
 - No global or hidden state
 - Customizable library modules (you can compile and use only what you need)
 - Optional font baker and vertex buffer output
+- [Documentation](https://rawgit.com/vurtun/nuklear/master/doc/nuklear.html)
 
 ## Building
 
@@ -98,27 +99,69 @@ languages. Furthermore there are no guarantee that all bindings will always be k
 - [Java](https://github.com/glegris/nuklear4j) by Guillaume Legris
 - [Golang](https://github.com/golang-ui/nuklear) by golang-ui@github.com
 - [Rust](https://github.com/snuk182/nuklear-rust) by snuk182@github.com
-- [Chicken](https://github.com/wasamasa/nuklear) by wasamasa@github.comx
+- [Chicken](https://github.com/wasamasa/nuklear) by wasamasa@github.com
 - [Nim](https://github.com/zacharycarter/nuklear-nim) by zacharycarter@github.com
-- [Lua/Löve2d](https://github.com/keharriso/love-nuklear) by Kevin Harrison
+- Lua
+  - [LÖVE-Nuklear](https://github.com/keharriso/love-nuklear) by Kevin Harrison
+  - [MoonNuklear](https://github.com/stetre/moonnuklear) by Stefano Trettel
+- Python
+  - [pyNuklear](https://github.com/billsix/pyNuklear) by William Emerison Six (ctypes-based wrapper)
+  - [pynk](https://github.com/nathanrw/nuklear-cffi) by nathanrw@github.com (cffi binding)
+- [CSharp/.NET](https://github.com/cartman300/NuklearDotNet) by cartman300@github.com
 
 ## Credits
 Developed by Micha Mettke and every direct or indirect contributor to the GitHub.
 
 
-Embeds `stb_texedit`, `stb_truetype` and `stb_rectpack` by Sean Barret (public domain)  
+Embeds `stb_texedit`, `stb_truetype` and `stb_rectpack` by Sean Barrett (public domain)
 Embeds `ProggyClean.ttf` font by Tristan Grimmer (MIT license).
 
 
 Big thank you to Omar Cornut (ocornut@github) for his [imgui](https://github.com/ocornut/imgui) library 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](https://github.com/nothings/stb) which restored my faith
-in libraries and brought me to create some of my own.
+Barrett for his amazing single header [libraries](https://github.com/nothings/stb) which restored my faith
+in libraries and brought me to create some of my own. Finally Apoorva Joshi for his singe-header [file packer](http://apoorvaj.io/single-header-packer.html).
 
 ## License
-
-This software is dual-licensed to the public domain and under the following
-license: you are granted a perpetual, irrevocable license to copy, modify,
-publish and distribute this file as you see fit.
-
+```
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 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.
+-----------------------------------------------------------------------------
+```
diff --git a/demo/allegro5/Makefile b/demo/allegro5/Makefile
@@ -2,7 +2,7 @@
 BIN = demo
 
 # Flags
-CFLAGS = -std=c99 -pedantic -O2
+CFLAGS += -std=c99 -pedantic -O2
 
 SRC = main.c
 OBJ = $(SRC:.c=.o)

diff --git a/demo/d3d11/main.c b/demo/d3d11/main.c
@@ -32,17 +32,32 @@
  *
  * ===============================================================*/
 /* 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. */
- #define UNUSED(a) (void)a
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- #define MAX(a,b) ((a) < (b) ? (b) : (a))
- #define LEN(a) (sizeof(a)/sizeof(a)[0])
-
-/*#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_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
 
 /* ===============================================================
  *
@@ -79,7 +94,7 @@ set_swap_chain_size(int width, int height)
     desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
     desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
 
-    hr = IDXGISwapChain_GetBuffer(swap_chain, 0, &IID_ID3D11Texture2D, &back_buffer);
+    hr = IDXGISwapChain_GetBuffer(swap_chain, 0, &IID_ID3D11Texture2D, (void **)&back_buffer);
     assert(SUCCEEDED(hr));
 
     hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)back_buffer, &desc, &rt_view);
@@ -117,7 +132,7 @@ WindowProc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
 int main(void)
 {
     struct nk_context *ctx;
-    struct nk_color background;
+    struct nk_colorf bg;
 
     WNDCLASSW wc;
     RECT rect = { 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT };
@@ -189,12 +204,14 @@ int main(void)
     /*nk_style_set_font(ctx, &droid->handle)*/;}
 
     /* 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
 
-    background = nk_rgb(28,48,62);
+    bg.r = 0.10f, bg.g = 0.18f, bg.b = 0.24f, bg.a = 1.0f;
     while (running)
     {
         /* Input */
@@ -230,29 +247,33 @@ int main(void)
             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, background, nk_vec2(nk_widget_width(ctx),400))) {
+            if (nk_combo_begin_color(ctx, nk_rgb_cf(bg), nk_vec2(nk_widget_width(ctx),400))) {
                 nk_layout_row_dynamic(ctx, 120, 1);
-                background = nk_color_picker(ctx, background, NK_RGBA);
+                bg = nk_color_picker(ctx, bg, NK_RGBA);
                 nk_layout_row_dynamic(ctx, 25, 1);
-                background.r = (nk_byte)nk_propertyi(ctx, "#R:", 0, background.r, 255, 1,1);
-                background.g = (nk_byte)nk_propertyi(ctx, "#G:", 0, background.g, 255, 1,1);
-                background.b = (nk_byte)nk_propertyi(ctx, "#B:", 0, background.b, 255, 1,1);
-                background.a = (nk_byte)nk_propertyi(ctx, "#A:", 0, background.a, 255, 1,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 ---------------- */
-        /*calculator(ctx);*/
-        /*overview(ctx);*/
-        /*node_editor(ctx);*/
+        #ifdef INCLUDE_CALCULATOR
+          calculator(ctx);
+        #endif
+        #ifdef INCLUDE_OVERVIEW
+          overview(ctx);
+        #endif
+        #ifdef INCLUDE_NODE_EDITOR
+          node_editor(ctx);
+        #endif
         /* ----------------------------------------- */
 
-        {/* Draw */
-        float bg[4];
-        nk_color_fv(bg, background);
-        ID3D11DeviceContext_ClearRenderTargetView(context, rt_view, bg);
+        /* Draw */
+        ID3D11DeviceContext_ClearRenderTargetView(context, rt_view, &bg.r);
         ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rt_view, NULL);
         nk_d3d11_render(context, NK_ANTI_ALIASING_ON);
         hr = IDXGISwapChain_Present(swap_chain, 1, 0);
@@ -264,12 +285,12 @@ int main(void)
             /* window is not visible, so vsync won't work. Let's sleep a bit to reduce CPU usage */
             Sleep(10);
         }
-        assert(SUCCEEDED(hr));}
+        assert(SUCCEEDED(hr));
     }
 
     ID3D11DeviceContext_ClearState(context);
     nk_d3d11_shutdown();
-    ID3D11ShaderResourceView_Release(rt_view);
+    ID3D11RenderTargetView_Release(rt_view);
     ID3D11DeviceContext_Release(context);
     ID3D11Device_Release(device);
     IDXGISwapChain_Release(swap_chain);

diff --git a/demo/d3d11/nuklear_d3d11.h b/demo/d3d11/nuklear_d3d11.h
@@ -358,7 +358,7 @@ nk_d3d11_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
 }
 
 static void
-nk_d3d11_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
+nk_d3d11_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
 {
     (void)usr;
     if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL))
@@ -392,7 +392,7 @@ nk_d3d11_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
 }
 
 static void
-nk_d3d11_clipbard_copy(nk_handle usr, const char *text, int len)
+nk_d3d11_clipboard_copy(nk_handle usr, const char *text, int len)
 {
     (void)usr;
     if (OpenClipboard(NULL))
@@ -427,8 +427,8 @@ nk_d3d11_init(ID3D11Device *device, int width, int height, unsigned int max_vert
     ID3D11Device_AddRef(device);
 
     nk_init_default(&d3d11.ctx, 0);
-    d3d11.ctx.clip.copy = nk_d3d11_clipbard_copy;
-    d3d11.ctx.clip.paste = nk_d3d11_clipbard_paste;
+    d3d11.ctx.clip.copy = nk_d3d11_clipboard_copy;
+    d3d11.ctx.clip.paste = nk_d3d11_clipboard_paste;
     d3d11.ctx.clip.userdata = nk_handle_ptr(0);
 
     nk_buffer_init_default(&d3d11.cmds);