implement ICPUMorphTargets

Author: devsh

include/nbl/asset/ICPUMorphTargets.h

@@ -0,0 +1,98 @@
+// 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_MORPH_TARGETS_H_INCLUDED_
+#define _NBL_ASSET_I_CPU_MORPH_TARGETS_H_INCLUDED_
+
+
+#include "nbl/asset/IAsset.h"
+#include "nbl/asset/IMorphTargets.h"
+
+
+namespace nbl::asset
+{
+//
+class NBL_API2 ICPUMorphTargets : public IAsset, public IMorphTargets<ICPUGeometryCollection>
+{
+        using base_t = IMorphTargets<ICPUBuffer>;
+
+    public:
+        inline ICPUMorphTargets() = default;
+        
+        constexpr static inline auto AssetType = ET_MORPH_TARGETS;
+        inline E_TYPE getAssetType() const override {return AssetType;}
+
+        //
+        inline bool valid() const //override
+        {
+            for (const auto& target : m_targets)
+            if (!target || !target.geoCollection->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<ICPUMorphTargets>();
+            retval->m_targets.reserve(m_targets.size());
+            for (const auto& in : m_targets)
+            {
+                auto& out = retval->m_targets.push_back();
+                out.geoCollection = core::smart_refctd_ptr_static_cast<ICPUGeometryCollection>(in.geoCollection->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 core::vector<SGeometryReference>* getTargets()
+        {
+            if (isMutable())
+                return &m_targets;
+            return nullptr;
+        }
+
+    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;
+            };
+            for (const auto& ref : m_targets)
+            if (!nonNullOnly(ref.geoCollection.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

include/nbl/asset/ICPUPolygonGeometry.h

@@ -68,7 +68,10 @@ class NBL_API2 ICPUPolygonGeometry final : public IAsset, public IPolygonGeometr
         inline bool setPositionView(SDataView&& view)
         {
             if (isMutable() && (!view || view.composed.isFormatted()))
-                return base_t::setPositionView(std::move(view));
+            {
+                m_positionView = std::move(view);
+                return true;
+            }
             return false;
         }
 

include/nbl/asset/IGeometry.h

@@ -338,14 +338,6 @@ class NBL_API2 IGeometry : public IGeometryBase
     protected:
         virtual inline ~IGeometry() = default;
 
-        // needs to be hidden because of mutability checking
-        inline bool setPositionView(SDataView&& view)
-        {
-            if (!view)
-                return false;
-            m_positionView = std::move(view);
-            return true;
-        }
         // 
         inline bool setJointOBBView(SDataView&& view)
         {
@@ -396,7 +388,7 @@ class NBL_API2 IIndexableGeometry : public IGeometry<BufferType>
         // Needs to be hidden because ICPU base class shall check mutability
         inline bool setIndexView(SDataView&& view)
         {
-            if (view.isFormattedScalarInteger())
+            if (!view || view.isFormattedScalarInteger())
             {
                 m_indexView = std::move(strm);
                 return true;

include/nbl/asset/IGeometryCollection.h

@@ -14,9 +14,9 @@ namespace nbl::asset
 template<class BufferType>
 class NBL_API2 IGeometryCollection : public virtual core::IReferenceCounted
 {
+    public:
         using SDataView = IGeometry<BufferType>::SDataView;
 
-    public:
         //
         inline const auto& getAABB() const {return m_aabb;}
 
@@ -124,6 +124,6 @@ class NBL_API2 IGeometryCollection : public virtual core::IReferenceCounted
         //
         core::vector<SGeometryReference> m_geometries;
 };
-}
 
+}
 #endif

include/nbl/asset/IMorphTargets.h

@@ -13,7 +13,7 @@ namespace nbl::asset
 // Unlike glTF we don't require same index buffers and maintaining isomorphisms between primitives/vertices in different geometries. But most of the use cases would have such mappings.
 // The semantics are really up to you, these are just collections of Geometries which can be swapped out or interpolated between.
 // Note: A LoD set can also be viewed as a morph shape per LoD, while a Motion Blur BLAS can be viewed as representing the interval between two Morph Targets. 
-template<class BufferType>
+template<class GeometryCollection>
 class NBL_API2 IMorphTargets : public virtual core::IReferenceCounted
 {
     public:
@@ -54,10 +54,15 @@ class NBL_API2 IMorphTargets : public virtual core::IReferenceCounted
 
         struct STarget
         {
-            core::smart_refctd_ptr<IGeometryCollection<BufferType>> geoCollection = {};
+            inline operator bool() const
+            {
+                return geoCollection && (!jointRedirectView || jointRedirectView.composed.isFormattedScalarInteger());
+            }
+
+            core::smart_refctd_ptr<GeometryCollection> geoCollection = {};
             // The geometry may be using a smaller set of joint/bone IDs which need to be remapped to a larger or common skeleton.
             // Ignored if the collection is not skinned.
-            SDataView jointRedirectView = {};
+            GeometryCollection::SDataView jointRedirectView = {};
         };
         inline const core::vector<STarget>& getTargets() const {return m_targets;}
 
@@ -67,7 +72,7 @@ class NBL_API2 IMorphTargets : public virtual core::IReferenceCounted
         //
         inline core::vector<STarget>& getTargets() {return m_targets;}
 
-        // TODO: utility to make IBottomLevelAccelerationStructure::Triangles from two targets
+        // TODO: utility to make motion-blur IBottomLevelAccelerationStructure::Triangles from two targets
 
         //
         core::vector<STarget> m_targets;

include/nbl/asset/asset.h

@@ -19,9 +19,8 @@
 #include "nbl/asset/format/decodePixels.h"
 #include "nbl/asset/format/encodePixels.h"
 
-// base
+// buffers
 #include "nbl/asset/ICPUBuffer.h"
-#include "nbl/asset/IMesh.h" //depr
 
 // images
 #include "nbl/asset/ICPUImage.h"
@@ -51,21 +50,19 @@
 #include "nbl/asset/ICPUAnimationLibrary.h"
 #include "nbl/asset/ICPUSkeleton.h"
 
-// meshes
-#include "nbl/asset/ICPUMeshBuffer.h"
-#include "nbl/asset/ICPUMesh.h"
+// geometry
 #include "nbl/asset/utils/IGeometryCreator.h"
-// #include "nbl/asset/utils/IMeshPacker.h"
+#include "nbl/asset/utils/ICPUGeometryCollection.h"
+#include "nbl/asset/utils/ICPUMorphTargets.h"
 
 // manipulation + reflection + introspection
-#include "nbl/asset/utils/IMeshManipulator.h"
+#include "nbl/asset/utils/CSmoothNormalGenerator.h"
 
 
 #include "nbl/asset/IAssetManager.h"
 // importexport
 #include "nbl/asset/interchange/IAssetLoader.h"
 #include "nbl/asset/interchange/IImageLoader.h"
-#include "nbl/asset/interchange/IRenderpassIndependentPipelineLoader.h"
 #include "nbl/asset/interchange/IAssetWriter.h"
 #include "nbl/asset/interchange/IImageWriter.h"
 #include "nbl/asset/metadata/COpenEXRMetadata.h"
@@ -74,8 +71,4 @@
 #include "nbl/asset/metadata/CPLYMetadata.h"
 #include "nbl/asset/metadata/CSTLMetadata.h"
 
-//VT
-// #include "nbl/asset/utils/CCPUMeshPackerV1.h"
-// #include "nbl/asset/utils/CCPUMeshPackerV2.h"
-
 #endif

src/nbl/CMakeLists.txt

@@ -178,7 +178,7 @@ set(NBL_ASSET_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CForsythVertexCacheOptimizer.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CSmoothNormalGenerator.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CGeometryCreator.cpp
-	${NBL_ROOT_PATH}/src/nbl/asset/utils/CMeshManipulator.cpp
+	${NBL_ROOT_PATH}/src/nbl/asset/utils/CPolygonGeometryManipulator.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/COverdrawMeshOptimizer.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CSmoothNormalGenerator.cpp
 

src/nbl/asset/utils/CSmoothNormalGenerator.h

@@ -16,10 +16,10 @@ namespace nbl::asset
 class CSmoothNormalGenerator
 {
 	public:
-		static core::smart_refctd_ptr<ICPUMeshBuffer> calculateNormals(ICPUMeshBuffer* buffer, float epsilon, uint32_t normalAttrID, IMeshManipulator::VxCmpFunction function);
-
 		CSmoothNormalGenerator() = delete;
 		~CSmoothNormalGenerator() = delete;
+#if 0
+		static core::smart_refctd_ptr<ICPUMeshBuffer> calculateNormals(ICPUMeshBuffer* buffer, float epsilon, uint32_t normalAttrID, IMeshManipulator::VxCmpFunction function);
 
 	private:
 		class VertexHashMap
@@ -66,7 +66,7 @@ class CSmoothNormalGenerator
 	private:
 		static VertexHashMap setupData(const ICPUMeshBuffer* buffer, float epsilon);
 		static void processConnectedVertices(ICPUMeshBuffer* buffer, VertexHashMap& vertices, float epsilon, uint32_t normalAttrID, IMeshManipulator::VxCmpFunction vxcmp);
-
+#endif
 };
 
 }