New Geometry Asset classes and Mesh Loader replacements

include/nbl/asset/IAsset.h

@@ -83,14 +83,14 @@ class IAsset : virtual public core::IReferenceCounted
 			ET_ANIMATION_LIBRARY = 1ull<<8,						//!< asset::ICPUAnimationLibrary
 			ET_PIPELINE_LAYOUT = 1ull<<9,						//!< asset::ICPUPipelineLayout
 			ET_SHADER = 1ull<<10,								//!< asset::ICPUShader
-			ET_RENDERPASS_INDEPENDENT_PIPELINE = 1ull<<12,		//!< asset::ICPURenderpassIndependentPipeline
+			ET_GEOMETRY = 1ull<<12,		//!< anything inheriting from asset::IGeometry<ICPUBuffer>
 			ET_RENDERPASS = 1ull<<13,							//!< asset::ICPURenderpass
 			ET_FRAMEBUFFER = 1ull<<14,							//!< asset::ICPUFramebuffer
 			ET_GRAPHICS_PIPELINE = 1ull<<15,					//!< asset::ICPUGraphicsPipeline
 			ET_BOTOM_LEVEL_ACCELERATION_STRUCTURE = 1ull<<16,	//!< asset::ICPUBottomLevelAccelerationStructure
 			ET_TOP_LEVEL_ACCELERATION_STRUCTURE = 1ull<<17,		//!< asset::ICPUTopLevelAccelerationStructure
-			ET_SUB_MESH = 1ull<<18,							    //!< DEPRECATED asset::ICPUMeshBuffer
-			ET_MESH = 1ull<<19,								    //!< DEPRECATED asset::ICPUMesh
+			ET_GEOMETRY_COLLECTION = 1ull<<18,					//!< asset::ICPUGeometryCollection
+			ET_MORPH_TARGETS = 1ull<<19,						//!< asset::ICPUMorphTargets
 			ET_COMPUTE_PIPELINE = 1ull<<20,                     //!< asset::ICPUComputePipeline
 			ET_PIPELINE_CACHE = 1ull<<21,						//!< asset::ICPUPipelineCache
 			ET_SCENE = 1ull<<22,								//!< reserved, to implement later

include/nbl/asset/ICPUGeometryCollection.h

@@ -0,0 +1,137 @@
+// 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_GEOMETRY_COLLECTION_H_INCLUDED_
+#define _NBL_ASSET_I_CPU_GEOMETRY_COLLECTION_H_INCLUDED_
+
+
+#include "nbl/asset/IAsset.h"
+#include "nbl/asset/ICPUBuffer.h"
+#include "nbl/asset/IGeometryCollection.h"
+
+
+namespace nbl::asset
+{
+//
+class NBL_API2 ICPUGeometryCollection : public IAsset, public IGeometryCollection<ICPUBuffer>
+{
+        using base_t = IGeometryCollection<ICPUBuffer>;
+
+    public:
+        inline ICPUGeometryCollection() = default;
+
+        constexpr static inline auto AssetType = ET_GEOMETRY_COLLECTION;
+        inline E_TYPE getAssetType() const override {return AssetType;}
+
+        //
+        inline bool valid() const //override
+        {
+            for (const auto& ref : m_geometries)
+            if (!ref.geometry->valid())
+                return false;
+            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<ICPUGeometryCollection>();
+            retval->m_aabb = m_aabb;
+            retval->m_inverseBindPoseView = m_inverseBindPoseView.clone(nextDepth);
+            retval->m_jointAABBView = m_jointAABBView.clone(nextDepth);
+            retval->m_geometries.reserve(m_geometries.size());
+            for (const auto& in : m_geometries)
+            {
+                auto& out = retval->m_geometries.emplace_back();
+                out.transform = in.transform;
+                out.geometry = core::smart_refctd_ptr_static_cast<IGeometry<ICPUBuffer>>(in.geometry->clone(nextDepth));
+                out.jointRedirectView = in.jointRedirectView.clone(nextDepth);
+            }
+            return retval;
+        }
+
+        // TODO: remove after https://github.com/Devsh-Graphics-Programming/Nabla/pull/871 merge
+        inline size_t getDependantCount() const override
+        {
+           size_t count = 0;
+           visitDependents([&current](const IAsset* dep)->bool
+               {
+                   count++;
+                   return true;
+               }
+           );
+           return count;
+        }
+
+        // 
+        inline bool setAABB(const SAABBStorage& aabb)
+        {
+            if (isMutable())
+            {
+                m_aabb = aabb;
+                return true;
+            }
+            return false;
+        }
+
+        //
+        inline core::vector<SGeometryReference>* getGeometries()
+        {
+            if (isMutable())
+                return &m_geometries;
+            return nullptr;
+        }
+
+        //
+        inline bool setSkin(SDataView&& inverseBindPoseView, SDataView&& jointAABBView)
+        {
+            if (isMutable())
+                return setSkin(std::move(inverseBindPoseView),std::move(jointAABBView));
+            return false;
+        }
+
+        //
+        template<typename Iterator>// requires std::is_same_v<decltype(*declval<Iterator>()),decltype(ICPUBottomLevelAccelerationStructure::Triangles&)>
+        inline Iterator exportForBLAS(Iterator out, uint32_t* pWrittenOrdinals=nullptr) const
+        {
+            return exportForBLAS(std;:forward<Iterator>(out),[](const hlsl::float32_t3x4& lhs, const hlsl::float32_t3x4& rhs)->void
+                {
+                    lhs = rhs;
+                    if (pWrittenOrdinals)
+                        *(pWrittenOrdinals++) = (ptrdiff_t(&rhs)-offsetof(SGeometryReference,transform)-ptrdiff_t(m_geoemtries.data()))/sizeof(SGeometryReference);
+                }
+            );
+        }
+
+    protected:
+        //
+        inline void visitDependents(std::function<bool(const IAsset*)> visit) const //override
+        {
+            auto nonNullOnly = [&visit](const IAsset* dep)->bool
+            {
+                if (dep)
+                    return visit(dep);
+                return true;
+            };
+            if (!nonNullOnly(m_inverseBindPoseView.src.buffer.get())) return;
+            if (!nonNullOnly(m_jointAABBView.src.buffer.get())) return;
+            for (const auto& ref : m_geometries)
+                if (!nonNullOnly(ref.geometry.get())) return;
+        }
+        // TODO: remove after https://github.com/Devsh-Graphics-Programming/Nabla/pull/871 merge
+        inline IAsset* getDependant_impl(const size_t ix) override
+        {
+           const IAsset* retval = nullptr;
+           size_t current = 0;
+           visitDependents([&current](const IAsset* dep)->bool
+               {
+                   retval = dep;
+                   return ix<current++;
+               }
+           );
+           return const_cast<IAsset*>(retval);
+        }
+};
+
+}
+#endif