Builtin Resources CMake Refactor

.gitmodules

@@ -84,3 +84,6 @@
 [submodule "3rdparty/tcpp"]
 	path = 3rdparty/tcpp
 	url = git@github.com:Erfan-Ahmadi/tcpp.git
+[submodule "3rdparty/imgui"]
+	path = 3rdparty/imgui
+	url = git@github.com:ocornut/imgui.git

3rdparty/CMakeLists.txt

@@ -228,6 +228,29 @@ add_library(spirv_cross OBJECT
 )
 target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
 
+if(NBL_BUILD_IMGUI)
+	add_library(imgui STATIC
+		"imgui/imconfig.h"
+		"imgui/imgui_demo.cpp"
+		"imgui/imgui_draw.cpp"
+		"imgui/imgui_internal.h"
+		"imgui/imgui_tables.cpp"
+		"imgui/imgui_widgets.cpp"
+		"imgui/imgui.cpp"
+		"imgui/imgui.h"
+		"imgui/misc/cpp/imgui_stdlib.cpp"
+		"imgui/misc/cpp/imgui_stdlib.h"
+		"imgui/imstb_rectpack.h"
+		"imgui/imstb_textedit.h"
+		"imgui/imstb_truetype.h"
+	)
+	target_include_directories(imgui
+		PUBLIC "imgui"
+		PUBLIC "imgui/misc/cpp"
+		PUBLIC "imgui/backends"
+	)
+
+endif()
 
 add_library(aesGladman OBJECT
 	aesGladman/aes_ni.c
@@ -336,6 +359,9 @@ endif()
 if (NBL_BUILD_MITSUBA_LOADER)
 	list(APPEND NBL_3RDPARTY_TARGETS expat)
 endif()
+if (NBL_BUILD_IMGUI)
+	list(APPEND NBL_3RDPARTY_TARGETS imgui)
+endif()
 if(ENABLE_HLSL)
 	list(APPEND NBL_3RDPARTY_TARGETS HLSL)
 endif()

CMakeLists.txt

@@ -274,6 +274,8 @@ option(NBL_BUILD_TOOLS "Enable building tools (just convert2BAW as for now)" ON)
 
 option(NBL_BUILD_MITSUBA_LOADER "Enable nbl::ext::MitsubaLoader?" OFF) # TODO: once it compies turn this ON by default!
 
+option(NBL_BUILD_IMGUI "Enable nbl::ext::ImGui?" ON)
+
 option(NBL_BUILD_OPTIX "Enable nbl::ext::OptiX?" OFF)
 if(NBL_COMPILE_WITH_CUDA)
 	find_package(OPTIX REQUIRED)

Jenkinsfile

@@ -0,0 +1,11 @@
+stage('CMake')
+{
+	  bat returnStatus: true, script: "cmake -DNBL_COMPILE_WITH_CUDA:BOOL=ON -DNBL_BUILD_OPTIX:BOOL=ON -DNBL_BUILD_MITSUBA_LOADER:BOOL=ON -DNBL_BUILD_RADEON_RAYS:BOOL=ON -DNBL_RUN_TESTS:BOOL=ON -S ./ -B ./build -T v143"
+	  bat "git -C ./3rdparty/gli reset --hard" // due to gli build system bug
+	  bat "cmake -DNBL_COMPILE_WITH_CUDA:BOOL=ON -DNBL_BUILD_OPTIX:BOOL=ON -DNBL_BUILD_MITSUBA_LOADER:BOOL=ON -DNBL_BUILD_RADEON_RAYS:BOOL=ON -DNBL_RUN_TESTS:BOOL=ON -S ./ -B ./build -T v143"
+}
+
+stage('Compile Nabla')
+{
+	  bat "cmake --build ./build --target Nabla --config Release -j12 -v"
+}

cmake/common.cmake

@@ -221,6 +221,7 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 	add_dependencies(${LIB_NAME} Nabla)
 
 	get_target_property(_NBL_NABLA_TARGET_BINARY_DIR_ Nabla BINARY_DIR)
+	get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ nblBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
 
 	target_include_directories(${LIB_NAME}
 		PUBLIC ${_NBL_NABLA_TARGET_BINARY_DIR_}/build/import
@@ -230,6 +231,7 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 		PUBLIC ${CMAKE_SOURCE_DIR}/include
 		PUBLIC ${CMAKE_SOURCE_DIR}/src
 		PUBLIC ${CMAKE_SOURCE_DIR}/source/Nabla
+		PUBLIC ${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}
 		PRIVATE ${LIB_INCLUDES}
 	)
 	add_dependencies(${LIB_NAME} Nabla)
@@ -363,8 +365,8 @@ endfunction()
 # @_BS_TARGET_@ is a builtin resource target
 
 function(LINK_BUILTIN_RESOURCES_TO_TARGET _TARGET_ _BS_TARGET_)
-	add_dependencies(${EXECUTABLE_NAME} systemTestBuiltinResourceData)
-	target_link_libraries(${EXECUTABLE_NAME} PUBLIC systemTestBuiltinResourceData)
+	add_dependencies(${EXECUTABLE_NAME} ${_BS_TARGET_})
+	target_link_libraries(${EXECUTABLE_NAME} PUBLIC ${_BS_TARGET_})
 
 	get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ ${_BS_TARGET_} BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
 	target_include_directories(${EXECUTABLE_NAME} PUBLIC "${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}")

include/nbl/core/decl/smart_refctd_ptr.h

@@ -98,7 +98,6 @@ class smart_refctd_ptr
 		inline I_REFERENCE_COUNTED& operator[](size_t idx) { return ptr[idx]; }
 		inline const I_REFERENCE_COUNTED& operator[](size_t idx) const { return ptr[idx]; }
 
-
 		inline explicit operator bool() const { return ptr; }
 		inline bool operator!() const { return !ptr; }
 

include/nbl/ext/ImGui/ImGui.h

@@ -0,0 +1,158 @@
+#ifndef NBL_EXT_IMGUI_UI_H
+#define NBL_EXT_IMGUI_UI_H
+
+#include <glm/vec3.hpp>
+
+namespace nbl::ext::imgui
+{
+	class NBL_API2 UI final : public core::IReferenceCounted{
+	public:
+
+		explicit UI(
+			core::smart_refctd_ptr<video::ILogicalDevice> device,
+			int maxFramesInFlight,
+			core::smart_refctd_ptr<video::IGPURenderpass>& renderPass,
+			video::IGPUPipelineCache* pipelineCache,
+			video::IGPUObjectFromAssetConverter::SParams& cpu2GpuParams,
+			core::smart_refctd_ptr<ui::IWindow> window
+		);
+
+		~UI() override;
+
+		bool Render(nbl::video::IGPUCommandBuffer& commandBuffer, int frameIndex);
+
+		void Update(
+			float deltaTimeInSec,
+			float mousePosX,
+			float mousePosY,
+			size_t mouseEventsCount,
+			ui::SMouseEvent const * mouseEvents
+			// TODO: Keyboard events
+		);
+
+		void BeginWindow(char const* windowName);
+
+		void EndWindow();
+
+		int Register(std::function<void()> const& listener);
+
+		bool UnRegister(int listenerId);
+
+		void SetNextItemWidth(float nextItemWidth);
+
+		void SetWindowSize(float width, float height);
+
+		void Text(char const* label, ...);
+
+		void InputFloat(char const* label, float* value);
+
+		void InputFloat2(char const* label, float* value);
+
+		void InputFloat3(char const* label, float* value);
+
+		void InputFloat4(char const* label, float* value);
+
+		void InputFloat3(char const* label, glm::vec3& value);
+
+		bool Combo(
+			char const* label,
+			int32_t* selectedItemIndex,
+			char const** items,
+			int32_t itemsCount
+		);
+
+		bool Combo(
+			const char* label,
+			int* selectedItemIndex,
+			std::vector<std::string>& values
+		);
+
+		void SliderInt(
+			char const* label,
+			int* value,
+			int minValue,
+			int maxValue
+		);
+
+		void SliderFloat(
+			char const* label,
+			float* value,
+			float minValue,
+			float maxValue
+		);
+
+		void Checkbox(
+			char const* label,
+			bool* value
+		);
+
+		void Spacing();
+
+		void Button(
+			char const* label,
+			std::function<void()> const& onPress
+		);
+
+		void InputText(
+			char const* label,
+			std::string& outValue
+		);
+
+		[[nodiscard]]
+		bool HasFocus();
+
+		[[nodiscard]]
+		bool IsItemActive();
+
+		[[nodiscard]]
+		bool TreeNode(char const* name);
+
+		void TreePop();
+
+	private:
+
+		core::smart_refctd_ptr<video::IGPUDescriptorSetLayout> CreateDescriptorSetLayout();
+
+		void CreatePipeline(
+			core::smart_refctd_ptr<video::IGPURenderpass>& renderPass,
+			video::IGPUPipelineCache* pipelineCache
+		);
+
+		void CreateFontTexture(video::IGPUObjectFromAssetConverter::SParams& cpu2GpuParams);
+
+		void UpdateDescriptorSets();
+
+		void CreateFontSampler();
+
+		void CreateDescriptorPool();
+
+		void HandleMouseEvents(
+			float mousePosX,
+			float mousePosY,
+			size_t mouseEventsCount,
+			ui::SMouseEvent const * mouseEvents
+		) const;
+
+		core::smart_refctd_ptr<video::ILogicalDevice> m_device{};
+		core::smart_refctd_ptr<video::IGPUSampler> m_fontSampler{};
+		core::smart_refctd_ptr<video::IDescriptorPool> m_descriptorPool{};
+		core::smart_refctd_ptr<video::IGPUDescriptorSet> m_gpuDescriptorSet{};
+		core::smart_refctd_ptr<video::IGPURenderpassIndependentPipeline> m_independentPipeline{};
+		core::smart_refctd_ptr<video::IGPUGraphicsPipeline> m_pipeline{};
+		core::smart_refctd_ptr<video::IGPUImageView> m_fontTexture{};
+		core::smart_refctd_ptr<ui::IWindow> m_window{};
+		std::vector<core::smart_refctd_ptr<video::IGPUBuffer>> m_vertexBuffers{};
+		std::vector<core::smart_refctd_ptr<video::IGPUBuffer>> m_indexBuffers{};
+		bool hasFocus = false;
+
+		// TODO: Use a signal class instead like Signal<> UIRecordSignal{};
+		struct Subscriber {
+			int id = -1;
+			std::function<void()> listener = nullptr;
+		};
+		std::vector<Subscriber> m_subscribers{};
+
+	};
+};
+
+#endif	// NBL_EXT_IMGUI_UI_H

include/nbl/system/CFileViewVirtualAllocatorWin32.h

@@ -4,7 +4,7 @@
 namespace nbl::system 
 {
 #ifdef _NBL_PLATFORM_WINDOWS_
-class CFileViewVirtualAllocatorWin32 : public IFileViewAllocator
+class NBL_API2 CFileViewVirtualAllocatorWin32 : public IFileViewAllocator
 {
 	public:
 		using IFileViewAllocator::IFileViewAllocator;

include/nbl/system/IFileArchive.h

@@ -21,7 +21,7 @@ namespace nbl::system
 class IFile;
 
 //! The FileArchive manages archives and provides access to files inside them.
-class IFileArchive : public core::IReferenceCounted
+class NBL_API2 IFileArchive : public core::IReferenceCounted
 {
 	public:
 		enum E_ALLOCATOR_TYPE

src/nbl/CMakeLists.txt

@@ -361,11 +361,15 @@ file(GLOB_RECURSE NABLA_HEADERS_PRIV1 "*.h")
 file(GLOB_RECURSE NABLA_HEADERS_PRIV2 "${NBL_ROOT_PATH}/src/nbl/*.h")
 
 #always install builtins (some may be included in cpp regardless if embedded or not)
+
+get_target_property(_BUILTIN_RESOURCES_BUNDLE_ARCHIVE_ABSOLUTE_PATH_ nblBuiltinResourceData BUILTIN_RESOURCES_BUNDLE_ARCHIVE_ABSOLUTE_PATH)
 foreach(X IN LISTS NBL_RESOURCES_TO_EMBED)
-	list(APPEND NABLA_RESOURCES_TO_EMBED_PUBLIC "${NBL_ROOT_PATH}/include/${X}")
+	list(APPEND NABLA_RESOURCES_TO_EMBED_PUBLIC "${NBL_ROOT_PATH}/include/${_BUILTIN_RESOURCES_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}/${X}")
 endforeach()
 list(APPEND NABLA_HEADERS_PUBLIC ${NABLA_RESOURCES_TO_EMBED_PUBLIC})
 source_group("Resources to embed" FILES ${NABLA_RESOURCES_TO_EMBED_PUBLIC})
+set_source_files_properties(${NABLA_RESOURCES_TO_EMBED_PUBLIC}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
 
 set(NABLA_HEADERS "${NBL_ROOT_PATH}/include/nabla.h" ${NABLA_HEADERS_PUBLIC} ${NABLA_HEADERS_PIRV1} ${NABLA_HEADERS_PRIV2})