Merge branch 'master' into ray_query_geometry_creator_example

Author: keptsecret

3rdparty/CMakeLists.txt

@@ -383,8 +383,17 @@ if(NBL_BUILD_IMGUI)
 
 	target_link_libraries(imtestengine PUBLIC imtestsuite)
 
-	set(IMGUIZMO_BUILD_EXAMPLE OFF)
-	add_subdirectory(imguizmo EXCLUDE_FROM_ALL)
+	# imguizmo
+	add_library(imguizmo 
+		"${CMAKE_CURRENT_SOURCE_DIR}/imguizmo/GraphEditor.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/imguizmo/ImCurveEdit.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/imguizmo/ImGradient.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/imguizmo/ImGuizmo.cpp"
+		"${CMAKE_CURRENT_SOURCE_DIR}/imguizmo/ImSequencer.cpp"
+	)
+
+	target_include_directories(imguizmo PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/imguizmo>)
+	target_link_libraries(imguizmo PUBLIC imgui)
 
 	# note we override imgui config with our own
 	set(NBL_IMGUI_USER_CONFIG_FILEPATH "${NBL_IMGUI_ROOT}/nabla_imconfig.h")

3rdparty/imguizmo

@@ -434,7 +434,7 @@ smart_refctd_ptr<IGPUImageView> UI::createFontAtlasTexture(const SCreationParame
 		// set its contents
 		{
 			const size_t image_size = getTexelOrBlockBytesize(NBL_FORMAT_FONT)*width*height;
-			auto buffer = make_smart_refctd_ptr<CCustomAllocatorCPUBuffer<null_allocator<uint8_t>>>(image_size,pixels,adopt_memory);
+			auto buffer = ICPUBuffer::create({.size=image_size,.data=pixels,.alignment=alignof(uint32_t),.memoryResource=core::getNullMemoryResource()},adopt_memory);
 			auto regions = make_refctd_dynamic_array<smart_refctd_dynamic_array<ICPUImage::SBufferCopy>>(1ull);
 			{
 				auto region = regions->begin();