Add Skeleton to MeshBuffer

Author: devshgraphicsprogramming

examples_tests/04.Keyframe/main.cpp

@@ -111,7 +111,7 @@ int main()
 	}
 	const char* jointNames[] = {"root","bendy"};
 	auto skeleton = core::make_smart_refctd_ptr<asset::ICPUSkeleton>(std::move(parentIDs),std::move(inverseBindPoses),&jointNames[0],&jointNames[0]+kJointCount);
-	//auto gpuSkeleton = driver->getGPUObjectsFromAssets<asset::ICPUSkeleton>(&skeleton,&skeleton+1u); // TODO: Test conversion path, linker error
+	auto gpuSkeleton = driver->getGPUObjectsFromAssets<asset::ICPUSkeleton>(&skeleton,&skeleton+1u)->begin()[0];
 
 	//
 	core::smart_refctd_ptr<video::IGPUMeshBuffer> mb;
@@ -182,7 +182,7 @@ int main()
 
 		asset::SBufferBinding<video::IGPUBuffer> bindings[video::IGPUMeshBuffer::MAX_ATTR_BUF_BINDING_COUNT];
 		bindings[0u] = {0u,driver->createFilledDeviceLocalGPUBufferOnDedMem(sizeof(vertices),vertices)};
-		mb = core::make_smart_refctd_ptr<video::IGPUMeshBuffer>(std::move(pipeline),nullptr,bindings,asset::SBufferBinding<video::IGPUBuffer>{0u,driver->createFilledDeviceLocalGPUBufferOnDedMem(sizeof(indices_indexed16),indices_indexed16)});
+		mb = core::make_smart_refctd_ptr<video::IGPUMeshBuffer>(std::move(pipeline),nullptr,std::move(gpuSkeleton),bindings,asset::SBufferBinding<video::IGPUBuffer>{0u,driver->createFilledDeviceLocalGPUBufferOnDedMem(sizeof(indices_indexed16),indices_indexed16)});
 		{
 			mb->setIndexType(asset::EIT_16BIT);
 			mb->setIndexCount(2*3*6);

include/nbl/asset/ICPUMeshBuffer.h

@@ -6,6 +6,7 @@
 #define __NBL_ASSET_I_CPU_MESH_BUFFER_H_INCLUDED__
 
 #include "nbl/asset/IMeshBuffer.h"
+#include "nbl/asset/ICPUSkeleton.h"
 #include "nbl/asset/ICPUDescriptorSet.h"
 #include "nbl/asset/ICPURenderpassIndependentPipeline.h"
 #include "nbl/asset/bawformat/blobs/MeshBufferBlob.h"
@@ -57,29 +58,27 @@ namespace impl
     }
 }
 
-class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURenderpassIndependentPipeline>, public BlobSerializable, public IAsset
+class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer,ICPUDescriptorSet,ICPURenderpassIndependentPipeline,ICPUSkeleton>, public BlobSerializable, public IAsset
 {
-        using base_t = IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURenderpassIndependentPipeline>;
+        using base_t = IMeshBuffer<ICPUBuffer,ICPUDescriptorSet,ICPURenderpassIndependentPipeline,ICPUSkeleton>;
         // knowing the position attribute ID is important for AABB computations etc.
         uint32_t posAttrId : 5;
         uint32_t normalAttrId : 5;
         // by having one attribute only, we limit the number of bones per vertex to 4
         uint32_t jointIDAttrId : 5;
         uint32_t jointWeightAttrId : 5;
-        uint32_t maxJointsPerVx : 3;
 
     protected:
         virtual ~ICPUMeshBuffer() = default;
 
     public:
         //! Default constructor (initializes pipeline, desc set and buffer bindings to nullptr)
-        ICPUMeshBuffer() : base_t(nullptr, nullptr, nullptr, SBufferBinding<ICPUBuffer>{})
+        ICPUMeshBuffer() : base_t(nullptr, nullptr, nullptr, nullptr, SBufferBinding<ICPUBuffer>{})
         {
             posAttrId = 0u;
             normalAttrId = MAX_VERTEX_ATTRIB_COUNT;
             jointIDAttrId = MAX_VERTEX_ATTRIB_COUNT;
             jointWeightAttrId = MAX_VERTEX_ATTRIB_COUNT;
-            maxJointsPerVx = 0u;
         }
         using base_t::base_t;
 
@@ -94,6 +93,8 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
             clone_common(cp.get());
             cp->m_descriptorSet = (_depth > 0u && m_descriptorSet) ? core::smart_refctd_ptr_static_cast<ICPUDescriptorSet>(m_descriptorSet->clone(_depth - 1u)) : m_descriptorSet;
             cp->m_pipeline = (_depth > 0u && m_pipeline) ? core::smart_refctd_ptr_static_cast<ICPURenderpassIndependentPipeline>(m_pipeline->clone(_depth - 1u)) : m_pipeline;
+            cp->m_skeleton = (_depth > 0u && m_skeleton) ? core::smart_refctd_ptr_static_cast<ICPUSkeleton>(m_skeleton->clone(_depth - 1u)) : m_skeleton;
+            cp->maxJointsPerVx = maxJointsPerVx;
 
             cp->boundingBox = boundingBox;
             cp->indexType = indexType;
@@ -107,7 +108,6 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
             cp->normalAttrId = normalAttrId;
             cp->jointIDAttrId = jointIDAttrId;
             cp->jointWeightAttrId = jointWeightAttrId;
-            cp->maxJointsPerVx = maxJointsPerVx;
 
             cp->m_indexBufferBinding.offset = m_indexBufferBinding.offset;
             cp->m_indexBufferBinding.buffer = (_depth > 0u && m_indexBufferBinding.buffer) ?
@@ -136,6 +136,8 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
 				        m_vertexBufferBindings[i].buffer->convertToDummyObject(referenceLevelsBelowToConvert);
                 if (m_indexBufferBinding.buffer)
 			        m_indexBufferBinding.buffer->convertToDummyObject(referenceLevelsBelowToConvert);
+                if (m_skeleton)
+                    m_skeleton->convertToDummyObject(referenceLevelsBelowToConvert);
                 if (m_descriptorSet)
 			        m_descriptorSet->convertToDummyObject(referenceLevelsBelowToConvert);
                 if (m_pipeline)
@@ -194,13 +196,30 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
 		    m_indexBufferBinding = std::move(bufferBinding);
 	    }
 
+        //!
+        inline const ICPUSkeleton* getSkeleton() const
+        {
+            return base_t::getSkeleton();
+        }
+        inline ICPUSkeleton* getSkeleton()
+        {
+            assert(!isImmutable_debug());
+            return m_skeleton.get();
+        }
+        inline void setSkeleton(core::smart_refctd_ptr<ICPUSkeleton>&& skeleton)
+        {
+            assert(!isImmutable_debug());
+            m_skeleton = std::move(skeleton);
+        }
+
         //!
         inline const ICPUDescriptorSet* getAttachedDescriptorSet() const
         {
             return base_t::getAttachedDescriptorSet();
         }
         inline ICPUDescriptorSet* getAttachedDescriptorSet()
         {
+            //assert(!isImmutable_debug()); // TODO? @Crisspl?
             return m_descriptorSet.get();
         }
 	    inline void setAttachedDescriptorSet(core::smart_refctd_ptr<ICPUDescriptorSet>&& descriptorSet)
@@ -299,9 +318,6 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
             return core::min(safelyGetAttributeFormatChannelCount(jointIDAttrId),safelyGetAttributeFormatChannelCount(jointWeightAttrId)+1u);
         }
 
-        //! Returns max joint influences
-        inline uint32_t getMaxJointsPerVertex() const { return maxJointsPerVx; }
-
         //! Sets max joint influences
         inline uint32_t setMaxJointsPerVertex(const uint32_t _maxJointsPerVx)
         {
@@ -310,7 +326,7 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
         }
 
         //! Tells us if the mesh is skinned
-        inline bool isSkinned() const { return deduceMaxJointsPerVertex()>0u && getMaxJointsPerVertex()>0u; }
+        inline bool isSkinned() const override { return base_t::isSkinned() && deduceMaxJointsPerVertex()>0u; }
 
         //! Get access to Indices.
         /** \return Pointer to indices array. */
@@ -636,15 +652,16 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
                     return false;
             }
 
+            if ((!m_skeleton) != (!other->m_skeleton))
+                return false;
+            if (m_skeleton && !m_skeleton->canBeRestoredFrom(other->m_skeleton.get()))
+                return false;
+
             if ((!m_descriptorSet) != (!other->m_descriptorSet))
                 return false;
             if (m_descriptorSet && !m_descriptorSet->canBeRestoredFrom(other->m_descriptorSet.get()))
                 return false;
 
-            /*
-            if ((!m_pipeline || !other->m_pipeline) && m_pipeline != other->m_pipeline)
-                return false;
-            */
             // pipeline is not optional
             if (!m_pipeline->canBeRestoredFrom(other->m_pipeline.get()))
                 return false;
@@ -666,6 +683,9 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
                 if (m_descriptorSet)
                     restoreFromDummy_impl_call(m_descriptorSet.get(), other->m_descriptorSet.get(), _levelsBelow);
 
+                if (m_skeleton)
+                    restoreFromDummy_impl_call(m_skeleton.get(), other->m_skeleton.get(), _levelsBelow);
+
                 for (uint32_t i = 0u; i < MAX_ATTR_BUF_BINDING_COUNT; ++i)
                     if (m_vertexBufferBindings[i].buffer)
                         restoreFromDummy_impl_call(m_vertexBufferBindings[i].buffer.get(), other->m_vertexBufferBindings[i].buffer.get(), _levelsBelow);
@@ -681,6 +701,8 @@ class ICPUMeshBuffer : public IMeshBuffer<ICPUBuffer, ICPUDescriptorSet, ICPURen
                 return true;
             if (m_descriptorSet && m_descriptorSet->isAnyDependencyDummy(_levelsBelow))
                 return true;
+            if (m_skeleton && m_skeleton->isAnyDependencyDummy(_levelsBelow))
+                return true;
 
             for (uint32_t i = 0u; i < MAX_ATTR_BUF_BINDING_COUNT; ++i)
                 if (m_vertexBufferBindings[i].buffer && m_vertexBufferBindings[i].buffer->isAnyDependencyDummy(_levelsBelow))

include/nbl/asset/IMeshBuffer.h

@@ -14,14 +14,14 @@ namespace asset
 {
 
 //! Where to move it so its not floating around scopeless?
-enum E_INDEX_TYPE
+enum E_INDEX_TYPE : uint32_t
 {
     EIT_16BIT = 0,
     EIT_32BIT,
     EIT_UNKNOWN
 };
 
-template <class BufferType, class DescSetType, class PipelineType>
+template <class BufferType, class DescSetType, class PipelineType, class SkeletonType>
 class IMeshBuffer : public virtual core::IReferenceCounted
 {
 public:
@@ -33,32 +33,44 @@ class IMeshBuffer : public virtual core::IReferenceCounted
 protected:
     virtual ~IMeshBuffer() = default;
 
-    core::aabbox3df boundingBox;
+    alignas(32) core::aabbox3df boundingBox;
 
     SBufferBinding<BufferType> m_vertexBufferBindings[MAX_ATTR_BUF_BINDING_COUNT];
     SBufferBinding<BufferType> m_indexBufferBinding;
 
+    //! Skeleton
+    core::smart_refctd_ptr<SkeletonType> m_skeleton;
+
     //! Descriptor set which goes to set=3
     core::smart_refctd_ptr<DescSetType> m_descriptorSet;
+
+    alignas(64) uint8_t m_pushConstantsData[MAX_PUSH_CONSTANT_BYTESIZE]{};//by putting m_pushConstantsData here, alignas(64) takes no extra place
+
+    //! Pipeline for drawing
     core::smart_refctd_ptr<PipelineType> m_pipeline;
 
+    uint32_t maxJointsPerVx;
 	//indices
 	E_INDEX_TYPE indexType;
 	int32_t baseVertex;
-    alignas(64) uint8_t m_pushConstantsData[MAX_PUSH_CONSTANT_BYTESIZE]{};//by putting m_pushConstantsData here, alignas(64) takes no extra place
-    uint64_t indexCount;
-    //
-    size_t instanceCount;
+    uint32_t indexCount;
+    // instances
+    uint32_t instanceCount;
     uint32_t baseInstance;
 
 public:
 	//! Constructor.
-	IMeshBuffer(core::smart_refctd_ptr<PipelineType>&& _pipeline, core::smart_refctd_ptr<DescSetType>&& _ds,
+	IMeshBuffer(core::smart_refctd_ptr<PipelineType>&& _pipeline,
+        core::smart_refctd_ptr<DescSetType>&& _ds,
+        core::smart_refctd_ptr<SkeletonType>&& _skeleton,
         SBufferBinding<BufferType> _vtxBindings[MAX_ATTR_BUF_BINDING_COUNT],
         SBufferBinding<BufferType>&& _indexBinding
-        ) : boundingBox(), m_indexBufferBinding(std::move(_indexBinding)), m_descriptorSet(std::move(_ds)), m_pipeline(std::move(_pipeline)),
-            indexType(EIT_UNKNOWN), baseVertex(0), indexCount(0u),
-            instanceCount(1ull), baseInstance(0u)
+    ) : boundingBox(), m_indexBufferBinding(std::move(_indexBinding)),
+        m_skeleton(),
+        m_descriptorSet(std::move(_ds)), m_pipeline(std::move(_pipeline)),
+        maxJointsPerVx(0u),
+        indexType(EIT_UNKNOWN), baseVertex(0), indexCount(0u),
+        instanceCount(1u), baseInstance(0u)
 	{
         if (_vtxBindings)
             std::copy(_vtxBindings, _vtxBindings+MAX_ATTR_BUF_BINDING_COUNT, m_vertexBufferBindings);
@@ -136,48 +148,58 @@ class IMeshBuffer : public virtual core::IReferenceCounted
     {
         return reinterpret_cast<const SBufferBinding<const BufferType>&>(m_indexBufferBinding);
     }
-    inline const PipelineType* getPipeline() const
+
+    //!
+    inline const SkeletonType* getSkeleton() const
     {
-        return m_pipeline.get();
+        return m_skeleton.get();
     }
+
+    //! Returns max joint influences
+    inline auto getMaxJointsPerVertex() const { return maxJointsPerVx; }
+
+    //!
+    virtual inline bool isSkinned() const
+    {
+        return m_skeleton.get() && maxJointsPerVx>0u;
+    }
+
+    //!
     inline const DescSetType* getAttachedDescriptorSet() const
     {
         return m_descriptorSet.get();
     }
 
+    //!
+    inline const PipelineType* getPipeline() const
+    {
+        return m_pipeline.get();
+    }
+
 	//! Get type of index data which is stored in this meshbuffer.
 	/** \return Index type of this buffer. */
-	inline const E_INDEX_TYPE& getIndexType() const {return indexType;}
-	inline void setIndexType(const E_INDEX_TYPE& type)
+	inline E_INDEX_TYPE getIndexType() const {return indexType;}
+	inline void setIndexType(const E_INDEX_TYPE type)
 	{
 		indexType = type;
 	}
 
 	//! Get amount of indices in this meshbuffer.
 	/** \return Number of indices in this buffer. */
-	inline const uint64_t& getIndexCount() const {return indexCount;}
+	inline auto getIndexCount() const {return indexCount;}
 	//! It sets amount of indices - value that is being passed to glDrawArrays as vertices amount or to glDrawElements as index amount.
 	/** @returns Whether set amount exceeds mapped buffer's size. Regardless of result the amount is set. */
-	inline bool setIndexCount(const uint64_t &newIndexCount)
+	inline bool setIndexCount(const uint32_t newIndexCount)
 	{
-		/*
-		#ifdef _NBL_DEBUG
-			if (size<0x7fffffffffffffffuLL&&ixbuf&&(ixbuf->getSize()>size+offset))
-			{
-				os::Printer::log("MeshBuffer map vertex buffer overflow!\n",ELL_ERROR);
-				return;
-			}
-		#endif // _NBL_DEBUG
-		*/
         indexCount = newIndexCount;
         if (m_indexBufferBinding.buffer)
         {
             switch (indexType)
             {
                 case EIT_16BIT:
-                    return indexCount*2+m_indexBufferBinding.offset < m_indexBufferBinding.buffer->getSize();
+                    return indexCount*sizeof(uint16_t)+m_indexBufferBinding.offset < m_indexBufferBinding.buffer->getSize();
                 case EIT_32BIT:
-                    return indexCount*4+m_indexBufferBinding.offset < m_indexBufferBinding.buffer->getSize();
+                    return indexCount*sizeof(uint32_t)+m_indexBufferBinding.offset < m_indexBufferBinding.buffer->getSize();
                 default:
                     return false;
             }
@@ -188,21 +210,21 @@ class IMeshBuffer : public virtual core::IReferenceCounted
 
 	//! Accesses base vertex number.
 	/** @returns base vertex number. */
-    inline const int32_t& getBaseVertex() const {return baseVertex;}
+    inline int32_t getBaseVertex() const {return baseVertex;}
 	//! Sets base vertex.
-    inline void setBaseVertex(const int32_t& baseVx)
+    inline void setBaseVertex(const int32_t baseVx)
     {
         baseVertex = baseVx;
     }
 
-	inline size_t getInstanceCount() const {return instanceCount;}
-	inline void setInstanceCount(const size_t& count)
+	inline uint32_t getInstanceCount() const {return instanceCount;}
+	inline void setInstanceCount(const uint32_t count)
 	{
 		instanceCount = count;
 	}
 
 	inline uint32_t getBaseInstance() const {return baseInstance;}
-	inline void setBaseInstance(const uint32_t& base)
+	inline void setBaseInstance(const uint32_t base)
 	{
 		baseInstance = base;
 	}