aabb local transform is 3x4, common draw param struct between single and batch

Author: keptsecret

include/nbl/ext/DebugDraw/CDrawAABB.h

@@ -69,6 +69,13 @@ namespace nbl::ext::debug_draw
             }
         };
 
+        struct DrawParameters
+        {
+            video::IGPUCommandBuffer* commandBuffer = nullptr;
+            hlsl::float32_t4x4 cameraMat = hlsl::float32_t4x4(1);
+            float lineWidth = 1.f;
+        };
+
         // creates an instance that can draw one AABB via push constant or multiple using streaming buffer
         static core::smart_refctd_ptr<DrawAABB> create(SCreationParameters&& params);
 
@@ -84,11 +91,11 @@ namespace nbl::ext::debug_draw
         inline const SCachedCreationParameters& getCreationParameters() const { return m_cachedCreationParams; }
 
         // 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 renderSingle(const DrawParameters& params, const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4& color);
 
         // records draw command for rendering batch of AABB instances as InstanceData
         // user has to set span of filled-in InstanceData; camera matrix used in push constant
-        inline bool render(video::IGPUCommandBuffer* commandBuffer, video::ISemaphore::SWaitInfo waitInfo, std::span<const InstanceData> aabbInstances, const hlsl::float32_t4x4& cameraMat)
+        inline bool render(const DrawParameters& params, video::ISemaphore::SWaitInfo waitInfo, std::span<const InstanceData> aabbInstances)
         {
             if (!(m_cachedCreationParams.drawMode & ADM_DRAW_BATCH))
             {
@@ -108,8 +115,9 @@ namespace nbl::ext::debug_draw
             auto* const streamingPtr = reinterpret_cast<uint8_t*>(streaming->getBufferPointer());
             assert(streamingPtr);
 
+            auto& commandBuffer = params.commandBuffer;
             commandBuffer->bindGraphicsPipeline(m_batchPipeline.get());
-            commandBuffer->setLineWidth(1.f);
+            commandBuffer->setLineWidth(params.lineWidth);
             asset::SBufferBinding<video::IGPUBuffer> indexBinding = { .offset = 0, .buffer = m_indicesBuffer };
             commandBuffer->bindIndexBuffer(indexBinding, asset::EIT_32BIT);
 
@@ -118,7 +126,7 @@ namespace nbl::ext::debug_draw
             {
                 auto& inst = instances[i];
                 inst = aabbInstances[i];
-                inst.transform = hlsl::mul(cameraMat, inst.transform);
+                inst.transform = hlsl::mul(params.cameraMat, inst.transform);
             }
 
             auto instancesIt = instances.begin();
@@ -154,7 +162,7 @@ namespace nbl::ext::debug_draw
             return true;
         }
 
-        static hlsl::float32_t4x4 getTransformFromAABB(const hlsl::shapes::AABB<3, float>& aabb);
+        static hlsl::float32_t3x4 getTransformFromAABB(const hlsl::shapes::AABB<3, float>& aabb);
 
     protected:
 	    DrawAABB(SCreationParameters&& _params, core::smart_refctd_ptr<video::IGPUGraphicsPipeline> singlePipeline, core::smart_refctd_ptr<video::IGPUGraphicsPipeline> batchPipeline,

src/nbl/ext/DebugDraw/CDrawAABB.cpp

@@ -304,23 +304,23 @@ core::smart_refctd_ptr<video::IGPUPipelineLayout> DrawAABB::createDefaultPipelin
 	return createPipelineLayoutFromPCRange(device, pcRange);
 }
 
-bool DrawAABB::renderSingle(IGPUCommandBuffer* commandBuffer, const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4& color, const hlsl::float32_t4x4& cameraMat)
+bool DrawAABB::renderSingle(const DrawParameters& params, const hlsl::shapes::AABB<3, float>& aabb, const hlsl::float32_t4& color)
 {
 	if (!(m_cachedCreationParams.drawMode & ADM_DRAW_SINGLE))
 	{
 		m_cachedCreationParams.utilities->getLogger()->log("DrawAABB has not been enabled for draw single!", ILogger::ELL_ERROR);
 		return false;
 	}
 
+	auto& commandBuffer = params.commandBuffer;
 	commandBuffer->bindGraphicsPipeline(m_singlePipeline.get());
-	commandBuffer->setLineWidth(1.f);
+	commandBuffer->setLineWidth(params.lineWidth);
 	asset::SBufferBinding<video::IGPUBuffer> indexBinding = { .offset = 0, .buffer = m_indicesBuffer };
 	commandBuffer->bindIndexBuffer(indexBinding, asset::EIT_32BIT);
 
 	SSinglePushConstants pc;
-
-	hlsl::float32_t4x4 instanceTransform = getTransformFromAABB(aabb);
-	pc.instance.transform = hlsl::mul(cameraMat, instanceTransform);
+	hlsl::float32_t3x4 instanceTransform = getTransformFromAABB(aabb);
+	pc.instance.transform = math::linalg::promoted_mul(params.cameraMat, instanceTransform);
 	pc.instance.color = color;
 
 	commandBuffer->pushConstants(m_singlePipeline->getLayout(), ESS_VERTEX, 0, sizeof(SSinglePushConstants), &pc);
@@ -329,14 +329,13 @@ bool DrawAABB::renderSingle(IGPUCommandBuffer* commandBuffer, const hlsl::shapes
 	return true;
 }
 
-hlsl::float32_t4x4 DrawAABB::getTransformFromAABB(const hlsl::shapes::AABB<3, float>& aabb)
+hlsl::float32_t3x4 DrawAABB::getTransformFromAABB(const hlsl::shapes::AABB<3, float>& aabb)
 {
 	const auto diagonal = aabb.getExtent();
-	hlsl::float32_t4x4 transform;
+	hlsl::float32_t3x4 transform;
 	transform[0][3] = aabb.minVx.x;
 	transform[1][3] = aabb.minVx.y;
 	transform[2][3] = aabb.minVx.z;
-	transform[3][3] = 1.f;
 	transform[0][0] = diagonal.x;
 	transform[1][1] = diagonal.y;
 	transform[2][2] = diagonal.z;