change batch render to take span of InstanceData

Author: keptsecret

include/nbl/ext/DebugDraw/CDrawAABB.h

@@ -58,14 +58,10 @@ class DrawAABB final : public core::IReferenceCounted
         // records draw command for single AABB, user has to set pipeline outside
         bool renderSingle(video::IGPUCommandBuffer* commandBuffer, const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4& color, const hlsl::float32_t4x4& cameraMat);
 
-        bool render(video::IGPUCommandBuffer* commandBuffer, video::ISemaphore::SWaitInfo waitInfo, const hlsl::float32_t4x4& cameraMat);
+        bool render(video::IGPUCommandBuffer* commandBuffer, video::ISemaphore::SWaitInfo waitInfo, std::span<const InstanceData> aabbInstances, const hlsl::float32_t4x4& cameraMat);
 
         static hlsl::float32_t4x4 getTransformFromAABB(const hlsl::shapes::AABB<3, float>& aabb);
 
-        void addAABB(const hlsl::shapes::AABB<3,float>& aabb, const hlsl::float32_t4& color = { 1,0,0,1 });
-        void addOBB(const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4x4& transform, const hlsl::float32_t4& color = { 1,0,0,1 });
-        void clearAABBs();
-
     protected:
 	    DrawAABB(SCreationParameters&& _params, core::smart_refctd_ptr<video::IGPUGraphicsPipeline> singlePipeline, core::smart_refctd_ptr<video::IGPUGraphicsPipeline> batchPipeline,
             core::smart_refctd_ptr<video::IGPUBuffer> indicesBuffer, core::smart_refctd_ptr<video::IGPUBuffer> verticesBuffer);
@@ -77,7 +73,6 @@ class DrawAABB final : public core::IReferenceCounted
         static core::smart_refctd_ptr<video::IGPUBuffer> createIndicesBuffer(SCreationParameters& params);
         static core::smart_refctd_ptr<video::IGPUBuffer> createVerticesBuffer(SCreationParameters& params);
 
-        std::vector<debug_draw::InstanceData> m_instances;
         core::smart_refctd_ptr<video::IGPUBuffer> m_indicesBuffer;
         core::smart_refctd_ptr<video::IGPUBuffer> m_verticesBuffer;
 

src/nbl/ext/DebugDraw/CDrawAABB.cpp

@@ -336,7 +336,7 @@ bool DrawAABB::renderSingle(IGPUCommandBuffer* commandBuffer, const hlsl::shapes
 	return true;
 }
 
-bool DrawAABB::render(IGPUCommandBuffer* commandBuffer, ISemaphore::SWaitInfo waitInfo, const hlsl::float32_t4x4& cameraMat)
+bool DrawAABB::render(IGPUCommandBuffer* commandBuffer, ISemaphore::SWaitInfo waitInfo, std::span<const InstanceData> aabbInstances, const hlsl::float32_t4x4& cameraMat)
 {
 	using offset_t = SCachedCreationParameters::streaming_buffer_t::size_type;
 	constexpr auto MdiSizes = std::to_array<offset_t>({ sizeof(float32_t3), sizeof(InstanceData) });
@@ -355,9 +355,11 @@ bool DrawAABB::render(IGPUCommandBuffer* commandBuffer, ISemaphore::SWaitInfo wa
 	asset::SBufferBinding<video::IGPUBuffer> indexBinding = { .offset = 0, .buffer = m_indicesBuffer };
 	commandBuffer->bindIndexBuffer(indexBinding, asset::EIT_32BIT);
 
-	auto instances = m_instances;
-	for (auto& inst : instances)
+	std::vector<InstanceData> instances(aabbInstances.size());
+	for (uint32_t i = 0; i < aabbInstances.size(); i++)
 	{
+		auto& inst = instances[i];
+		inst = aabbInstances[i];
 		inst.transform = hlsl::mul(cameraMat, inst.transform);
 	}
 
@@ -409,25 +411,4 @@ hlsl::float32_t4x4 DrawAABB::getTransformFromAABB(const hlsl::shapes::AABB<3, fl
 	return transform;
 }
 
-void DrawAABB::addAABB(const hlsl::shapes::AABB<3,float>& aabb, const hlsl::float32_t4& color)
-{
-	const auto transform = hlsl::float32_t4x4(1);
-	addOBB(aabb, transform, color);
-}
-
-void DrawAABB::addOBB(const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4x4& transform, const hlsl::float32_t4& color)
-{
-	InstanceData instance;
-	instance.color = color;
-
-	hlsl::float32_t4x4 instanceTransform = getTransformFromAABB(aabb);
-	instance.transform = math::linalg::promoted_mul(transform, instanceTransform);
-	m_instances.push_back(instance);
-}
-
-void DrawAABB::clearAABBs()
-{
-	m_instances.clear();
-}
-
 }