Merge remote-tracking branch 'origin/hlsl_path_tracer_example' into imguizmo-lights

# Conflicts:
#	examples_tests

Author: karimsayedre

examples_tests

@@ -41,6 +41,7 @@ struct CascadeAccumulator
 
     using cascade_layer_scalar_type = typename vector_traits<CascadeLayerType>::scalar_type;
     using this_t = CascadeAccumulator<CascadeLayerType, CascadeCount>;
+    using input_sample_type = CascadeLayerType;
     using output_storage_type = CascadeEntry;
     using initialization_data = SplattingParameters;
     output_storage_type accumulation;
@@ -66,7 +67,7 @@ struct CascadeAccumulator
     }
 
     // most of this code is stolen from https://cg.ivd.kit.edu/publications/2018/rwmc/tool/split.cpp
-    void addSample(uint32_t sampleCount, CascadeLayerType _sample)
+    void addSample(uint32_t sampleCount, input_sample_type _sample)
     {
         const cascade_layer_scalar_type log2Start = splattingParameters.log2Start;
         const cascade_layer_scalar_type log2Base = splattingParameters.log2Base;

include/nbl/builtin/hlsl/rwmc/CascadeAccumulator.hlsl

@@ -103,7 +103,7 @@ if (NBL_COMPILE_WITH_CUDA)
 	endif()
 endif()
 
-# => TODO: clean
+# => TODO: clean!
 # a little bit of globbing for headers never hurt anyone
 file(GLOB_RECURSE TEMP_GLOB_RES "${NBL_ROOT_PATH}/include/*.h")
 set(NABLA_HEADERS_PUBLIC ${NABLA_HEADERS_PUBLIC} ${TEMP_GLOB_RES})
@@ -112,6 +112,9 @@ set(NABLA_HEADERS_PUBLIC ${NABLA_HEADERS_PUBLIC} ${TEMP_GLOB_RES})
 file(GLOB_RECURSE TEMP_GLOB_RES  "${NBL_ROOT_PATH}/src/*.h")
 set(NABLA_HEADERS_PUBLIC2 ${NABLA_HEADERS_PUBLIC2} ${TEMP_GLOB_RES}) # TODO: we should have moved all headers from src directory to /include, but we need it for install target
 
+file(GLOB_RECURSE NABLA_HLSL_PUBLIC "${NBL_ROOT_PATH}/include/*.hlsl")
+list(APPEND NABLA_HEADERS_PUBLIC ${NABLA_HLSL_PUBLIC})
+
 foreach(NBL_CURRENT_HEADER IN LISTS NABLA_HEADERS_PUBLIC2)
 	cmake_path(GET NBL_CURRENT_HEADER PARENT_PATH NBL_CURRENT_HEADER_DIR)
 	file(RELATIVE_PATH NBL_TMP_REL_DESTINATION "${NBL_ROOT_PATH}/src" ${NBL_CURRENT_HEADER_DIR})
@@ -350,6 +353,7 @@ else()
 	)
 endif()
 add_library(Nabla::Nabla ALIAS Nabla)
+set_source_files_properties(${NABLA_HLSL_PUBLIC} PROPERTIES HEADER_FILE_ONLY ON)
 
 # from old build config template:
 # 
@@ -846,4 +850,29 @@ target_compile_definitions(Nabla
 	INTERFACE NBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY="${_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_}"
 )
 
-NBL_ADJUST_FOLDERS(src)
+NBL_ADJUST_FOLDERS(src)
+function(EXTRACT_BY_REGEX OUT REGEX)
+    set(tmp "${ARGN}")
+    list(FILTER tmp INCLUDE REGEX "${REGEX}")
+    set(${OUT} "${tmp}" PARENT_SCOPE)
+endfunction()
+
+get_target_property(SRC Nabla SOURCES)
+EXTRACT_BY_REGEX(NABLA_HLSL_FILES ".*\\.hlsl$" ${SRC})
+EXTRACT_BY_REGEX(NABLA_HEADER_FILES ".*\\.(h|hpp|tcc)$" ${SRC})
+EXTRACT_BY_REGEX(NABLA_SOURCE_FILES ".*\\.(c|cpp)$" ${SRC})
+
+source_group(TREE "${NBL_ROOT_PATH}"
+    PREFIX "HLSL Files"
+    FILES  ${NABLA_HLSL_FILES}
+)
+
+source_group(TREE "${NBL_ROOT_PATH}"
+    PREFIX "Header Files"
+    FILES  ${NABLA_HEADER_FILES}
+)
+
+source_group(TREE "${NBL_ROOT_PATH}"
+    PREFIX "Source Files"
+    FILES  ${NABLA_SOURCE_FILES}
+)