Merge branch 'newBuiltinResources' into FileArchiveTweaks

Author: Hazardu

.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()

3rdparty/bullet3

@@ -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)

3rdparty/imgui

@@ -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"
+}

3rdparty/jitify

@@ -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_}")

CMakeLists.txt

@@ -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; }