Mitsuba Loader Stub

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_OPTIX "Enable nbl::ext::OptiX?" OFF)

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",

include/nbl/asset/IAsset.h

@@ -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/ICPUMorphTargets.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/ICPUScene.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/IScene.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/asset.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"

include/nbl/asset/interchange/IAssetLoader.h

@@ -4,13 +4,15 @@
 #ifndef _NBL_ASSET_I_ASSET_LOADER_H_INCLUDED_
 #define _NBL_ASSET_I_ASSET_LOADER_H_INCLUDED_
 
+
 #include "nbl/system/declarations.h"
 
 #include "nbl/system/ISystem.h"
 #include "nbl/system/ILogger.h"
 
 #include "nbl/asset/interchange/SAssetBundle.h"
 
+
 namespace nbl::asset
 {
 
@@ -86,8 +88,8 @@ class NBL_API2 IAssetLoader : public virtual core::IReferenceCounted
 		enum E_LOADER_PARAMETER_FLAGS : uint64_t
 		{
 			ELPF_NONE = 0,											//!< default value, it doesn't do anything
-			ELPF_RIGHT_HANDED_MESHES = 0x1,							//!< specifies that a mesh will be flipped in such a way that it'll look correctly in right-handed camera system
-			ELPF_DONT_COMPILE_GLSL = 0x2,							//!< it states that GLSL won't be compiled to SPIR-V if it is loaded or generated
+			/*deprecated*/ELPF_RIGHT_HANDED_MESHES = 0x1,							//!< specifies that a mesh will be flipped in such a way that it'll look correctly in right-handed camera system
+			/*deprecated*/ELPF_DONT_COMPILE_GLSL = 0x2,							//!< it states that GLSL won't be compiled to SPIR-V if it is loaded or generated
 			ELPF_LOAD_METADATA_ONLY = 0x4							//!< it forces the loader to not load the entire scene for performance in special cases to fetch metadata.
 		};
 

include/nbl/asset/interchange/IImageLoader.h

@@ -1,9 +1,8 @@
 // Copyright (C) 2018-2020 - 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_IMAGE_LOADER_H_INCLUDED__
-#define __NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED__
+#ifndef _NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED_
+#define _NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED_
 
 #include "nbl/core/declarations.h"
 

include/nbl/asset/interchange/ISceneLoader.h

@@ -0,0 +1,30 @@
+// 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_LOADER_H_INCLUDED_
+#define _NBL_ASSET_I_SCENE_LOADER_H_INCLUDED_
+
+
+#include "nbl/core/declarations.h"
+
+#include "nbl/asset/ICPUScene.h"
+#include "nbl/asset/interchange/IAssetLoader.h"
+
+
+namespace nbl::asset
+{
+
+class ISceneLoader : public IAssetLoader
+{
+	public:
+		virtual inline uint64_t getSupportedAssetTypesBitfield() const override {return IAsset::ET_SCENE;}
+
+	protected:
+		inline ISceneLoader() {}
+
+	private:
+};
+
+}
+
+#endif

include/nbl/core/algorithm/utility.h

@@ -18,6 +18,30 @@ struct type_list_size<type_list<T...>> : std::integral_constant<size_t,sizeof...
 template<typename TypeList>
 inline constexpr size_t type_list_size_v = type_list_size<TypeList>::value;
 
+template<template<typename> class, typename TypeList>
+struct filter;
+template<template<typename> class Pred, typename... T>
+struct filter<Pred,type_list<T...>>
+{
+    using type = type_list<>;
+};
+
+template<template<typename> class Pred, typename T, typename... Ts>
+struct filter<Pred,type_list<T,Ts...>>
+{
+    template<typename, typename>
+    struct Cons;
+    template<typename Head, typename... Tail>
+    struct Cons<Head,type_list<Tail...>>
+    {
+        using type = type_list<Head,Tail...>;
+    };
+
+    using type = std::conditional_t<Pred<T>::value,typename Cons<T,typename filter<Pred,type_list<Ts...>>::type>::type,typename filter<Pred,type_list<Ts...>>::type>;
+};
+template<template<typename> class Pred, typename TypeList>
+using filter_t = filter<Pred,TypeList>::type;
+
 template<template<class...> class ListLikeOutT, template<class> class X, typename ListLike>
 struct list_transform
 {

include/nbl/core/hash/blake.h

@@ -4,10 +4,13 @@
 #ifndef _NBL_CORE_HASH_BLAKE3_H_INCLUDED_
 #define _NBL_CORE_HASH_BLAKE3_H_INCLUDED_
 
+
+#include "nbl/config/BuildConfigOptions.h"
 #include "blake3.h"
 
 #include <span>
 
+
 namespace nbl::core
 {
 struct blake3_hash_t final

include/nbl/ext/MitsubaLoader/CElementBSDF.h

@@ -1,19 +1,15 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-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_EXT_MISTUBA_LOADER_C_ELEMENT_BSDF_H_INCLUDED_
+#define _NBL_EXT_MISTUBA_LOADER_C_ELEMENT_BSDF_H_INCLUDED_
 
-#ifndef __C_ELEMENT_BSDF_H_INCLUDED__
-#define __C_ELEMENT_BSDF_H_INCLUDED__
 
 #include "nbl/ext/MitsubaLoader/CElementTexture.h"
 
-namespace nbl
-{
-namespace ext
-{
-namespace MitsubaLoader
-{
 
+namespace nbl::ext::MitsubaLoader
+{
 
 class CElementBSDF : public IElement
 {
@@ -293,6 +289,10 @@ class CElementBSDF : public IElement
 			CElementTexture::SpectrumOrTexture diffuseReflectance = 0.5f;
 		};
 
+		//
+		static AddPropertyMap<CElementBSDF> compAddPropertyMap();
+
+		//
 		inline CElementBSDF(const char* id) : IElement(id), type(Type::INVALID)
 		{
 		}
@@ -373,27 +373,28 @@ class CElementBSDF : public IElement
 			return *this;
 		}
 
-		bool addProperty(SNamedPropertyElement&& _property) override;
-		bool onEndTag(asset::IAssetLoader::IAssetLoaderOverride* _override, CMitsubaMetadata* globalMetadata) override;
-		IElement::Type getType() const override { return IElement::Type::BSDF; }
+		bool onEndTag(CMitsubaMetadata* globalMetadata, system::logger_opt_ptr logger) override;
+
+		constexpr static inline auto ElementType = IElement::Type::BSDF;
+		inline IElement::Type getType() const override { return ElementType; }
 		std::string getLogName() const override { return "bsdf"; }
 
 		bool processChildData(IElement* _child, const std::string& name) override;
 
-		bool isMeta() const
+		inline bool isMeta() const
 		{
 			switch (type)
 			{
-			case COATING: [[fallthrough]];
-			case ROUGHCOATING: [[fallthrough]];
-			case TWO_SIDED: [[fallthrough]];
-			case MASK: [[fallthrough]];
-			case BLEND_BSDF: [[fallthrough]];
-			case MIXTURE_BSDF: [[fallthrough]];
-			case BUMPMAP:
-				return true;
-			default:
-				return false;
+				case COATING: [[fallthrough]];
+				case ROUGHCOATING: [[fallthrough]];
+				case TWO_SIDED: [[fallthrough]];
+				case MASK: [[fallthrough]];
+				case BLEND_BSDF: [[fallthrough]];
+				case MIXTURE_BSDF: [[fallthrough]];
+				case BUMPMAP:
+					return true;
+				default:
+					return false;
 			}
 		}
 
@@ -422,9 +423,5 @@ class CElementBSDF : public IElement
 };
 
 
-
 }
-}
-}
-
 #endif