Updated NuklearDemo (close #235)

Author: TheMostDiligent

README.md

@@ -406,7 +406,7 @@ This sample demonstrates the integration of the engine with [dear imgui](https:/
 
 ![](Samples/NuklearDemo/Screenshot.png)
 
-This sample demonstrates the integration of the engine with [nuklear](https://github.com/vurtun/nuklear) UI library.
+This sample demonstrates the integration of the engine with [nuklear](https://github.com/Immediate-Mode-UI/Nuklear) UI library.
 
 
 ## [Hello AR](Android/HelloAR)
@@ -477,7 +477,7 @@ See [Apache 2.0 license](License.txt).
 
 This project has some third-party dependencies, each of which may have independent licensing:
 
-* [nuklear](https://github.com/vurtun/nuklear): A single-header ANSI C gui library ([MIT or Public domain license](https://github.com/DiligentGraphics/nuklear/blob/master/Readme.md)).
+* [nuklear](https://github.com/Immediate-Mode-UI/Nuklear): A single-header ANSI C gui library ([MIT or Public domain license](https://github.com/Immediate-Mode-UI/Nuklear/blob/master/LICENSE)).
 * [glfw](https://github.com/glfw/glfw): A multi-platform library for OpenGL, OpenGL ES, Vulkan, window and input ([zlib License](https://github.com/DiligentGraphics/glfw/blob/master/LICENSE.md)).
 * [ImGuizmo](https://github.com/CedricGuillemet/ImGuizmo): Immediate mode 3D gizmo for scene editing and other controls based on Dear Imgui ([MIT](https://github.com/CedricGuillemet/ImGuizmo/blob/master/LICENSE)).
 

Samples/NuklearDemo/src/NkDiligent.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -353,7 +353,7 @@ nk_diligent_render(struct nk_diligent_context* nk_dlg_ctx,
         config.circle_segment_count = 22;
         config.curve_segment_count  = 22;
         config.arc_segment_count    = 22;
-        config.null                 = nk_dlg_ctx->null;
+        config.tex_null             = nk_dlg_ctx->null;
 
         // setup buffers to load vertices and elements
         struct nk_buffer vbuf, ibuf;

Samples/NuklearDemo/src/NkInputWin32.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@
 
 #define NK_INCLUDE_FIXED_TYPES
 #define NK_INCLUDE_STANDARD_VARARGS
-#include "../../../ThirdParty/nuklear/nuklear.h"
+#include "../../../ThirdParty/Nuklear/nuklear.h"
 
 #include "WinHPreface.h"
 #include <Windows.h>

Samples/NuklearDemo/src/NuklearDemo.cpp

@@ -31,13 +31,14 @@
 
 #define NK_INCLUDE_FIXED_TYPES
 #define NK_INCLUDE_STANDARD_VARARGS
-#include "../../../ThirdParty/nuklear/nuklear.h"
+#include "../../../ThirdParty/Nuklear/nuklear.h"
 
 #include "NkDiligent.h"
 
-#include "../../../ThirdParty/nuklear/demo/style.c"
-#include "../../../ThirdParty/nuklear/demo/overview.c"
+#include "../../../ThirdParty/Nuklear/demo/common/style.c"
 
+static const struct nk_color nk_white = {255, 255, 255, 255};
+#include "../../../ThirdParty/Nuklear/demo/common/overview.c"
 
 namespace Diligent
 {

Samples/NuklearDemo/src/NuklearDemoWin32.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@
 
 #define NK_INCLUDE_FIXED_TYPES
 #define NK_INCLUDE_STANDARD_VARARGS
-#include "../../../ThirdParty/nuklear/nuklear.h"
+#include "../../../ThirdParty/Nuklear/nuklear.h"
 
 #include "WinHPreface.h"
 #include <Windows.h>

ThirdParty/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.10)
 file(RELATIVE_PATH SAMPLES_DIR "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
 if (NOT DILIGENT_NUKLEAR_DIR)
-    set(DILIGENT_NUKLEAR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/nuklear" CACHE PATH "nuklear source directory")
+    set(DILIGENT_NUKLEAR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Nuklear" CACHE PATH "nuklear source directory")
 endif()
 if (NOT EXISTS "${DILIGENT_NUKLEAR_DIR}/nuklear.h")
     message(FATAL_ERROR "${DILIGENT_NUKLEAR_DIR}/nuklear.h does not exist. This indicates that nuklear submodule is not checked out or DILIGENT_NUKLEAR_DIR variable contains invalid path.")