rework the BLAS exports of geometry collections completely

Author: devshgraphicsprogramming

include/nbl/asset/ICPUGeometryCollection.h

@@ -84,17 +84,17 @@ class NBL_API2 ICPUGeometryCollection : public IAsset, public IGeometryCollectio
         }
 
         //
-        template<typename Iterator>// requires std::is_same_v<decltype(*declval<Iterator>()),decltype(ICPUBottomLevelAccelerationStructure::Triangles&)>
-        inline Iterator exportForBLAS(Iterator out, uint32_t* pWrittenOrdinals=nullptr) const
+        class CBLASExporter final : public IBLASExporter
         {
-            return exportForBLAS(std::forward<Iterator>(out),[](const hlsl::float32_t3x4& lhs, const hlsl::float32_t3x4& rhs)->void
+            protected:
+                inline void setTransform(BLASTriangles& out, const uint32_t geomIndex) override
                 {
-                    lhs = rhs;
-                    if (pWrittenOrdinals)
-                        *(pWrittenOrdinals++) = (ptrdiff_t(&rhs)-offsetof(SGeometryReference,transform)-ptrdiff_t(base_t::m_geometries.data()))/sizeof(SGeometryReference);
+                    out.transform = m_geoms[geomIndex].transform;
                 }
-            );
-        }
+
+            public:
+                inline CBLASExporter(const core::vector<SGeometryReference>& _geoms) : IBLASExporter(_geoms) {}
+        };
 
     protected:
         //

include/nbl/asset/IGeometryCollection.h

@@ -56,7 +56,45 @@ class NBL_API2 IGeometryCollection : public virtual core::IReferenceCounted
         inline bool isSkinned() const {return getJointCount()>0;}
         // View of matrices being the inverse bind pose
         inline const SDataView& getInverseBindPoseView() const {return m_inverseBindPoseView;}
+        
+        
+        //
+        class IBLASExporter
+        {
+            protected:
+                using BLASTriangles = IBottomLevelAccelerationStructure::Triangles<std::remove_const_t<BufferType>>;
 
+                inline IBLASExporter(const core::vector<SGeometryReference>& _geoms) : m_geoms(_geoms) {}
+                virtual void setTransform(BLASTriangles& out, const uint32_t geomIndex) = 0;
+
+                const core::vector<SGeometryReference>& m_geoms;
+
+            public:
+                template<typename TriIter, typename PrimCountIter> // requires (std::is_same_v<decltype(*declval<TriIter>()),decltype(BLASTriangles&)> && PrimCountIter is integral && OrdinalIter is also)
+                inline TriIter operator()(TriIter outIt, PrimCountIter outPrimCount, uint32_t* pWrittenOrdinals=nullptr)
+                {
+                    for (const auto& ref : m_geoms)
+                    {
+                        // not a polygon geometry
+                        const auto* geo = ref.geometry.get();
+                        if (geo->getPrimitiveType()!=IGeometryBase::EPrimitiveType::Polygon)
+                            continue;
+                        const auto ordinal = std::distance(m_geoms.data(),&ref);
+                        const auto* polyGeo = static_cast<const IPolygonGeometry<BufferType>*>(geo);
+                        *outIt = polyGeo->exportForBLAS();
+                        if (outIt->vertexData[0])
+                        {
+                            if (pWrittenOrdinals)
+                                *(pWrittenOrdinals++) = ordinal;
+                            *(outPrimCount++) = polyGeo->getPrimitiveCount();
+                            if (ref.hasTransform())
+                                setTransform(*outIt,ordinal);
+                            outIt++;
+                        }
+                    }
+                    return outIt;
+                }
+        };
 
     protected:
         virtual ~IGeometryCollection() = default;
@@ -93,25 +131,6 @@ class NBL_API2 IGeometryCollection : public virtual core::IReferenceCounted
             m_jointAABBView = std::move(jointAABBView);
             return true;
         }
-        
-        // need to be protected because of the mess around `transform` requires us to provide diffferent signatures for ICPUGeometryCollection and IGPUGeometryCollection
-        using BLASTriangles = IBottomLevelAccelerationStructure::Triangles<std::remove_const_t<BufferType>>;
-        template<typename Iterator, typename Callback>// requires std::is_same_v<decltype(*declval<Iterator>()),decltype(BLASTriangles&)>
-        inline Iterator exportForBLAS(Iterator out, Callback& setTransform) const
-        {
-            for (const auto& ref : m_geometries)
-            {
-                // not a polygon geometry
-                const auto* geo = ref.geometry.get();
-                if (geo->getPrimitiveType()==IGeometryBase::EPrimitiveType::Polygon)
-                    continue;
-                const auto* polyGeo = static_cast<const IPolygonGeometry<BufferType>*>(geo);
-                *out = polyGeo->exportForBLAS();
-                if (out->vertexData[0])
-                    out++;
-            }
-            return out;
-        }
 
 
         // For the entire collection, as always it should NOT include any geometry which is affected by a joint.

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -261,7 +261,7 @@ SAssetBundle CMitsubaLoader::loadAsset(system::IFile* _file, const IAssetLoader:
 				return;
 			}
 			const auto index = instances.size();
-			instances.resize(index+1);
+			instances.resize(index+1,true);
 			instances.getMorphTargets()[index] = core::smart_refctd_ptr<ICPUMorphTargets>(const_cast<ICPUMorphTargets*>(targets.get()));
 			// TODO: add materials (incl emission) to the instances
 			/*