Merge branch 'master' into minor_adjustments_to_bxdf_and_path_tracing_stuff

Author: keptsecret

.github/workflows/build-nabla.yml

@@ -146,11 +146,12 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           result-encoding: string
           script: |
+            const headSha = context.payload.pull_request ? context.payload.pull_request.head.sha : context.sha;
             const response = await github.rest.checks.create({
               owner: context.repo.owner,
               repo: context.repo.repo,
               name: `Examples (${{ matrix.os }}, ${{ matrix.vendor }}-${{ matrix.tag }}, ${{ matrix.config }})`,
-              head_sha: context.sha,
+              head_sha: headSha,
               status: 'in_progress'
             });
             return response.data.id;

CMakeLists.txt

@@ -173,7 +173,7 @@ option(NBL_BUILD_DPL "Enable DPL (Dynamic Parallelism Library)" OFF)
 option(NBL_PCH "Enable pre-compiled header" ON)
 option(NBL_FAST_MATH "Enable fast low-precision math" OFF) # the reason OFF is by default now is the var controling it at build time was set AFTER BuildConfigOptions was generated - resulting in the feature being always OFF regardless the value xD - so just for sanity, keeping the same behaviour by default
 option(NBL_BUILD_EXAMPLES "Enable building examples" ON)
-option(NBL_BUILD_MITSUBA_LOADER "Enable nbl::ext::MitsubaLoader?" OFF) # TODO: once it compies turn this ON by default!
+option(NBL_BUILD_MITSUBA_LOADER "Enable nbl::ext::MitsubaLoader?" ON)
 option(NBL_BUILD_IMGUI "Enable nbl::ext::ImGui?" ON)
 option(NBL_BUILD_DEBUG_DRAW "Enable Nabla Debug Draw extension?" ON)
 

CMakePresets.json

@@ -15,7 +15,7 @@
 				"NBL_UPDATE_GIT_SUBMODULE": "OFF",
 				"NBL_COMPILE_WITH_CUDA": "OFF",
 				"NBL_BUILD_OPTIX": "OFF",
-				"NBL_BUILD_MITSUBA_LOADER": "OFF",
+				"NBL_BUILD_MITSUBA_LOADER": "ON",
 				"NBL_BUILD_RADEON_RAYS": "OFF",
 				"_NBL_COMPILE_WITH_OPEN_EXR_": "ON",
 				"NBL_EXPLICIT_MODULE_LOAD_LOG": "ON",

cmake/common.cmake

@@ -350,13 +350,6 @@ function(nbl_install_media _FILE)
 	nbl_install_lib_spec("${_FILE}" "")
 endfunction()
 
-function(nbl_install_builtin_resources _TARGET_)
-	get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ ${_TARGET_} BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
-	get_target_property(_BUILTIN_RESOURCES_HEADERS_ ${_TARGET_} BUILTIN_RESOURCES_HEADERS)
-	
-	nbl_install_headers_spec("${_BUILTIN_RESOURCES_HEADERS_}" "${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}")
-endfunction()
-
 function(NBL_TEST_MODULE_INSTALL_FILE _NBL_FILEPATH_)
 	file(RELATIVE_PATH _NBL_REL_INSTALL_DEST_ "${NBL_ROOT_PATH}" "${_NBL_FILEPATH_}")
 	cmake_path(GET _NBL_REL_INSTALL_DEST_ PARENT_PATH _NBL_REL_INSTALL_DEST_)
@@ -1484,42 +1477,41 @@ namespace @IMPL_NAMESPACE@ {
 				file(WRITE "${CONFIG_FILE}" "${CONFIG_CONTENT}")
 
 				# generate keys and commands for compiling shaders
-				foreach(BUILD_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
-					set(FINAL_KEY_REL_PATH "${BUILD_CONFIGURATION}/${FINAL_KEY}")
-					set(TARGET_OUTPUT "${IMPL_BINARY_DIR}/${FINAL_KEY_REL_PATH}")
-
-					set(NBL_NSC_COMPILE_COMMAND
-						"$<TARGET_FILE:nsc>"
-						-Fc "${TARGET_OUTPUT}"
-						${COMPILE_OPTIONS} ${REQUIRED_OPTIONS} ${IMPL_COMMON_OPTIONS}
-						"${CONFIG_FILE}"
-					)
-
-					add_custom_command(OUTPUT "${TARGET_OUTPUT}"
-						COMMAND ${NBL_NSC_COMPILE_COMMAND}
-						DEPENDS ${DEPENDS_ON}
-						COMMENT "Creating \"${TARGET_OUTPUT}\""
-						VERBATIM
-						COMMAND_EXPAND_LISTS
-					)
-
-					set(HEADER_ONLY_LIKE "${CONFIG_FILE}" "${TARGET_INPUT}" "${TARGET_OUTPUT}")
-					target_sources(${IMPL_TARGET} PRIVATE ${HEADER_ONLY_LIKE})
-
-					set_source_files_properties(${HEADER_ONLY_LIKE} PROPERTIES 
-						HEADER_FILE_ONLY ON
-						VS_TOOL_OVERRIDE None
-					)
-
-					set_source_files_properties("${TARGET_OUTPUT}" PROPERTIES
-						NBL_SPIRV_REGISTERED_INPUT "${TARGET_INPUT}"
-						NBL_SPIRV_PERMUTATION_CONFIG "${CONFIG_FILE}"
-						NBL_SPIRV_BINARY_DIR "${IMPL_BINARY_DIR}"
-						NBL_SPIRV_ACCESS_KEY "${FINAL_KEY_REL_PATH}"
-					)
-
-					set_property(TARGET ${IMPL_TARGET} APPEND PROPERTY NBL_SPIRV_OUTPUTS "${TARGET_OUTPUT}")
-					endforeach()
+				set(FINAL_KEY_REL_PATH "$<CONFIG>/${FINAL_KEY}")
+				set(TARGET_OUTPUT "${IMPL_BINARY_DIR}/${FINAL_KEY_REL_PATH}")
+
+				set(NBL_NSC_COMPILE_COMMAND
+					"$<TARGET_FILE:nsc>"
+					-Fc "${TARGET_OUTPUT}"
+					${COMPILE_OPTIONS} ${REQUIRED_OPTIONS} ${IMPL_COMMON_OPTIONS}
+					"${CONFIG_FILE}"
+				)
+
+				add_custom_command(OUTPUT "${TARGET_OUTPUT}"
+					COMMAND ${NBL_NSC_COMPILE_COMMAND}
+					DEPENDS ${DEPENDS_ON}
+					COMMENT "Creating \"${TARGET_OUTPUT}\""
+					VERBATIM
+					COMMAND_EXPAND_LISTS
+				)
+				set_source_files_properties("${TARGET_OUTPUT}" PROPERTIES GENERATED TRUE)
+
+				set(HEADER_ONLY_LIKE "${CONFIG_FILE}" "${TARGET_INPUT}" "${TARGET_OUTPUT}")
+				target_sources(${IMPL_TARGET} PRIVATE ${HEADER_ONLY_LIKE})
+
+				set_source_files_properties(${HEADER_ONLY_LIKE} PROPERTIES 
+					HEADER_FILE_ONLY ON
+					VS_TOOL_OVERRIDE None
+				)
+
+				set_source_files_properties("${TARGET_OUTPUT}" PROPERTIES
+					NBL_SPIRV_REGISTERED_INPUT "${TARGET_INPUT}"
+					NBL_SPIRV_PERMUTATION_CONFIG "${CONFIG_FILE}"
+					NBL_SPIRV_BINARY_DIR "${IMPL_BINARY_DIR}"
+					NBL_SPIRV_ACCESS_KEY "${FINAL_KEY_REL_PATH}"
+				)
+
+				set_property(TARGET ${IMPL_TARGET} APPEND PROPERTY NBL_SPIRV_OUTPUTS "${TARGET_OUTPUT}")
 				return()
 			endif()
 

examples_tests

@@ -156,24 +156,24 @@ class IAsset : virtual public core::IReferenceCounted
 		//!
 		inline bool isMutable() const {return m_mutable;}
 
-    inline void visitDependents(std::function<bool(const IAsset*)> visit) const
-    {
-        visitDependents_impl([&visit](const IAsset* dep)->bool
-        {
-            if (dep)
-                return visit(dep);
-            return true;
-        });
-    }
-
-    inline void visitDependents(std::function<bool(IAsset*)> visit)
-    {
-        assert(isMutable());
-        visitDependents([&](const IAsset* dependent) -> bool
-        {
-            return visit(const_cast<IAsset*>(dependent));
-        });
-    }
+		inline void visitDependents(std::function<bool(const IAsset*)> visit) const
+		{
+			visitDependents_impl([&visit](const IAsset* dep)->bool
+			{
+				if (dep)
+					return visit(dep);
+				return true;
+			});
+		}
+
+		inline void visitDependents(std::function<bool(IAsset*)> visit)
+		{
+			assert(isMutable());
+			visitDependents([&](const IAsset* dependent) -> bool
+			{
+				return visit(const_cast<IAsset*>(dependent));
+			});
+		}
 
 		virtual bool valid() const = 0;
 

include/nbl/asset/IAsset.h

@@ -23,7 +23,7 @@ class NBL_API2 ICPUMorphTargets : public IAsset, public IMorphTargets<ICPUGeomet
         inline E_TYPE getAssetType() const override {return AssetType;}
 
         //
-        inline bool valid() const //override
+        inline bool valid() const override
         {
             for (const auto& target : m_targets)
             if (!target || !target.geoCollection->valid())
@@ -55,7 +55,7 @@ class NBL_API2 ICPUMorphTargets : public IAsset, public IMorphTargets<ICPUGeomet
 
     protected:
         //
-        inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const //override
+        inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
         {
             auto nonNullOnly = [&visit](const IAsset* dep)->bool
             {

include/nbl/asset/ICPUMorphTargets.h

@@ -0,0 +1,54 @@
+// Copyright (C) 2025-2025 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_ASSET_I_CPU_SCENE_H_INCLUDED_
+#define _NBL_ASSET_I_CPU_SCENE_H_INCLUDED_
+
+
+#include "nbl/asset/IScene.h"
+// TODO: change to true IR later
+#include "nbl/asset/material_compiler3/CFrontendIR.h"
+
+
+namespace nbl::asset
+{
+// 
+class NBL_API2 ICPUScene : public IAsset, public IScene
+{
+        using base_t = IScene;
+
+    public:
+        inline ICPUScene() = default;
+
+        constexpr static inline auto AssetType = ET_SCENE;
+        inline E_TYPE getAssetType() const override { return AssetType; }
+
+        inline bool valid() const override
+        {
+            return true;
+        }
+
+        inline core::smart_refctd_ptr<IAsset> clone(uint32_t _depth=~0u) const
+        {
+            const auto nextDepth = _depth ? (_depth-1):0;
+            auto retval = core::smart_refctd_ptr<ICPUScene>();
+            return retval;
+        }
+
+    protected:
+        //
+        inline void visitDependents_impl(std::function<bool(const IAsset*)> visit) const override
+        {
+        }
+
+
+        // suggested contents:
+        // - morph target list
+        // - material table
+        // - instance list (morph target, keyframed transforms, material table indexings, FUTURE: reference skeleton)
+        // - area light list (OBB decompositions, material table indexings)
+        // - envlight data
+};
+}
+
+#endif

include/nbl/asset/ICPUScene.h

@@ -0,0 +1,23 @@
+// Copyright (C) 2025-2025 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_ASSET_I_SCENE_H_INCLUDED_
+#define _NBL_ASSET_I_SCENE_H_INCLUDED_
+
+
+#include "nbl/asset/IMorphTargets.h"
+
+
+namespace nbl::asset
+{
+// This is incredibly temporary, lots of things are going to change
+class NBL_API2 IScene : public virtual core::IReferenceCounted
+{
+    public:
+
+    protected:
+        virtual ~IScene() = default;
+};
+}
+
+#endif

include/nbl/asset/IScene.h

@@ -61,6 +61,7 @@
 #include "nbl/asset/interchange/IAssetLoader.h"
 #include "nbl/asset/interchange/IImageLoader.h"
 #include "nbl/asset/interchange/IGeometryLoader.h"
+#include "nbl/asset/interchange/ISceneLoader.h"
 #include "nbl/asset/interchange/IAssetWriter.h"
 #include "nbl/asset/interchange/IImageWriter.h"
 #include "nbl/asset/metadata/COpenEXRMetadata.h"