ex using new debug draw aabb + added draw mesh obb in ex 12

12_MeshLoaders/CMakeLists.txt

@@ -17,5 +17,12 @@ nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_L
 # TODO: Arek temporarily disabled cause I haven't figured out how to make this target yet
 # LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} nblExamplesGeometrySpirvBRD)
 
+if (NBL_BUILD_DEBUG_DRAW)
+	add_dependencies(${EXECUTABLE_NAME} ${NBL_EXT_DEBUG_DRAW_TARGET})
+	target_link_libraries(${EXECUTABLE_NAME} PRIVATE ${NBL_EXT_DEBUG_DRAW_TARGET})
+	target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:${NBL_EXT_DEBUG_DRAW_TARGET},INCLUDE_DIRECTORIES>)
+endif()
+
+
 add_dependencies(${EXECUTABLE_NAME} argparse)
 target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:argparse,INTERFACE_INCLUDE_DIRECTORIES>)

12_MeshLoaders/main.cpp

@@ -10,6 +10,10 @@
 #include "nbl/ext/MitsubaLoader/CSerializedLoader.h"
 #endif
 
+#ifdef NBL_BUILD_DEBUG_DRAW
+#include "nbl/ext/DebugDraw/CDrawAABB.h"
+#endif
+
 class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourcesApplication
 {
 	using device_base_t = MonoWindowApplication;
@@ -88,9 +92,23 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 		if (!m_renderer)
 			return logFail("Failed to create renderer!");
 
-		//
-		if (!reloadModel())
-			return false;
+#ifdef NBL_BUILD_DEBUG_DRAW
+			{
+				auto* renderpass = scRes->getRenderpass();
+				ext::debug_draw::DrawAABB::SCreationParameters params = {};
+				params.assetManager = m_assetMgr;
+				params.transfer = getTransferUpQueue();
+				params.drawMode = ext::debug_draw::DrawAABB::ADM_DRAW_BATCH;
+				params.batchPipelineLayout = ext::debug_draw::DrawAABB::createDefaultPipelineLayout(m_device.get());
+				params.renderpass = smart_refctd_ptr<IGPURenderpass>(renderpass);
+				params.utilities = m_utils;
+				m_drawAABB = ext::debug_draw::DrawAABB::create(std::move(params));
+			}
+#endif
+
+			//
+			if (!reloadModel())
+				return false;
 
 		camera.mapKeysToArrows();
 
@@ -131,48 +149,59 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 				};
 				cb->beginRenderPass(info, IGPUCommandBuffer::SUBPASS_CONTENTS::INLINE);
 
-				const SViewport viewport = {
-					.x = static_cast<float>(currentRenderArea.offset.x),
-					.y = static_cast<float>(currentRenderArea.offset.y),
-					.width = static_cast<float>(currentRenderArea.extent.width),
-					.height = static_cast<float>(currentRenderArea.extent.height)
-				};
-				cb->setViewport(0u, 1u, &viewport);
-
-				cb->setScissor(0u, 1u, &currentRenderArea);
-			}
-			// late latch input
-			{
-				bool reload = false;
-				camera.beginInputProcessing(nextPresentationTimestamp);
-				mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); }, m_logger.get());
-				keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void
-					{
-						for (const auto& event : events)
-							if (event.keyCode == E_KEY_CODE::EKC_R && event.action == SKeyboardEvent::ECA_RELEASED)
-								reload = true;
-						camera.keyboardProcess(events);
-					},
-					m_logger.get()
-				);
-				camera.endInputProcessing(nextPresentationTimestamp);
-				if (reload)
-					reloadModel();
-			}
-			// draw scene
-			{
+					const SViewport viewport = {
+						.x = static_cast<float>(currentRenderArea.offset.x),
+						.y = static_cast<float>(currentRenderArea.offset.y),
+						.width = static_cast<float>(currentRenderArea.extent.width),
+						.height = static_cast<float>(currentRenderArea.extent.height)
+					};
+					cb->setViewport(0u,1u,&viewport);
+
+					cb->setScissor(0u,1u,&currentRenderArea);
+				}
+				// late latch input
+				{
+					bool reload = false;
+					camera.beginInputProcessing(nextPresentationTimestamp);
+					mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); }, m_logger.get());
+					keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void
+						{
+							for (const auto& event : events)
+							{
+								if (event.keyCode == E_KEY_CODE::EKC_R && event.action == SKeyboardEvent::ECA_RELEASED)
+									reload = true;
+								if (event.keyCode == E_KEY_CODE::EKC_B && event.action == SKeyboardEvent::ECA_RELEASED)
+									m_drawBBs = !m_drawBBs;
+							}
+							camera.keyboardProcess(events);
+						},
+						m_logger.get()
+					);
+					camera.endInputProcessing(nextPresentationTimestamp);
+					if (reload)
+						reloadModel();
+				}
+				// draw scene
 				float32_t3x4 viewMatrix;
 				float32_t4x4 viewProjMatrix;
-				// TODO: get rid of legacy matrices
 				{
-					memcpy(&viewMatrix, camera.getViewMatrix().pointer(), sizeof(viewMatrix));
-					memcpy(&viewProjMatrix, camera.getConcatenatedMatrix().pointer(), sizeof(viewProjMatrix));
+					// TODO: get rid of legacy matrices
+					{
+						memcpy(&viewMatrix,camera.getViewMatrix().pointer(),sizeof(viewMatrix));
+						memcpy(&viewProjMatrix,camera.getConcatenatedMatrix().pointer(),sizeof(viewProjMatrix));
+					}
+ 					m_renderer->render(cb,CSimpleDebugRenderer::SViewParams(viewMatrix,viewProjMatrix));
+				}
+#ifdef NBL_BUILD_DEBUG_DRAW
+				if (m_drawBBs)
+				{
+					const ISemaphore::SWaitInfo drawFinished = { .semaphore = m_semaphore.get(),.value = m_realFrameIx + 1u };
+					m_drawAABB->render(cb, drawFinished, m_aabbInstances, viewProjMatrix);
 				}
-				m_renderer->render(cb, CSimpleDebugRenderer::SViewParams(viewMatrix, viewProjMatrix));
+#endif
+				cb->endRenderPass();
 			}
-			cb->endRenderPass();
-		}
-		cb->end();
+			cb->end();
 
 		IQueue::SSubmitInfo::SSemaphoreInfo retval =
 		{
@@ -410,36 +439,51 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 				cpar.utilities = m_utils.get();
 				cpar.transfer = &transfer;
 
-				// basically it records all data uploads and submits them right away
-				auto future = reservation.convert(cpar);
-				if (future.copy() != IQueue::RESULT::SUCCESS)
-				{
-					m_logger->log("Failed to await submission feature!", ILogger::ELL_ERROR);
-					return false;
+					// basically it records all data uploads and submits them right away
+					auto future = reservation.convert(cpar);
+					if (future.copy()!=IQueue::RESULT::SUCCESS)
+					{
+						m_logger->log("Failed to await submission feature!", ILogger::ELL_ERROR);
+						return false;
+					}
 				}
-			}
 
-			auto tmp = hlsl::float32_t4x3(
-				hlsl::float32_t3(1, 0, 0),
-				hlsl::float32_t3(0, 1, 0),
-				hlsl::float32_t3(0, 0, 1),
-				hlsl::float32_t3(0, 0, 0)
-			);
-			core::vector<hlsl::float32_t3x4> worldTforms;
-			const auto& converted = reservation.getGPUObjects<ICPUPolygonGeometry>();
-			for (const auto& geom : converted)
-			{
-				const auto promoted = geom.value->getAABB<aabb_t>();
-				printAABB(promoted, "Geometry");
-				tmp[3].x += promoted.getExtent().x;
-				const auto promotedWorld = hlsl::float64_t3x4(worldTforms.emplace_back(hlsl::transpose(tmp)));
-				const auto transformed = hlsl::shapes::util::transform(promotedWorld, promoted);
-				printAABB(transformed, "Transformed");
-				bound = hlsl::shapes::util::union_(transformed, bound);
-			}
-			printAABB(bound, "Total");
-			if (!m_renderer->addGeometries({ &converted.front().get(),converted.size() }))
-				return false;
+				auto tmp = hlsl::float32_t4x3(
+					hlsl::float32_t3(1,0,0),
+					hlsl::float32_t3(0,1,0),
+					hlsl::float32_t3(0,0,1),
+					hlsl::float32_t3(0,0,0)
+				);
+				core::vector<hlsl::float32_t3x4> worldTforms;
+				const auto& converted = reservation.getGPUObjects<ICPUPolygonGeometry>();
+				m_aabbInstances.resize(converted.size());
+				for (uint32_t i = 0; i < converted.size(); i++)
+				{
+					const auto& geom = converted[i];
+					const auto promoted = geom.value->getAABB<aabb_t>();
+					printAABB(promoted,"Geometry");
+					tmp[3].x += promoted.getExtent().x;
+					const auto promotedWorld = hlsl::float64_t3x4(worldTforms.emplace_back(hlsl::transpose(tmp)));
+					const auto transformed = hlsl::shapes::util::transform(promotedWorld,promoted);
+					printAABB(transformed,"Transformed");
+					bound = hlsl::shapes::util::union_(transformed,bound);
+
+#ifdef NBL_BUILD_DEBUG_DRAW
+					auto& inst = m_aabbInstances[i];
+					const auto tmpAabb = shapes::AABB<3,float>(promoted.minVx, promoted.maxVx);
+					hlsl::float32_t4x4 instanceTransform = ext::debug_draw::DrawAABB::getTransformFromAABB(tmpAabb);
+					const auto tmpWorld = hlsl::float32_t3x4(promotedWorld);
+					inst.color = { 1,1,1,1 };
+					inst.transform[0] = tmpWorld[0];
+					inst.transform[1] = tmpWorld[1];
+					inst.transform[2] = tmpWorld[2];
+					inst.transform[3] = float32_t4(0, 0, 0, 1);
+					inst.transform = hlsl::mul(inst.transform, instanceTransform);
+#endif
+				}
+				printAABB(bound,"Total");
+				if (!m_renderer->addGeometries({ &converted.front().get(),converted.size() }))
+					return false;
 
 			auto worlTformsIt = worldTforms.begin();
 			for (const auto& geo : m_renderer->getGeometries())
@@ -496,6 +540,12 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 	// mutables
 	std::string m_modelPath;
 
+		bool m_drawBBs = true;
+#ifdef NBL_BUILD_DEBUG_DRAW
+		smart_refctd_ptr<ext::debug_draw::DrawAABB> m_drawAABB;
+		std::vector<ext::debug_draw::InstanceData> m_aabbInstances;
+#endif
+
 	bool m_saveGeom = false;
 	std::future<void> m_saveGeomTaskFuture;
 	std::optional<const std::string> m_specifiedGeomSavePath;

34_DebugDraw/CMakeLists.txt

@@ -0,0 +1,11 @@
+if(NBL_BUILD_DEBUG_DRAW)
+	set(NBL_INCLUDE_SERACH_DIRECTORIES
+		"${CMAKE_CURRENT_SOURCE_DIR}/include"
+	)
+
+	nbl_create_executable_project("${NBL_EXTRA_SOURCES}" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
+
+	add_dependencies(${EXECUTABLE_NAME} ${NBL_EXT_DEBUG_DRAW_TARGET})
+	target_link_libraries(${EXECUTABLE_NAME} PRIVATE ${NBL_EXT_DEBUG_DRAW_TARGET})
+	target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:${NBL_EXT_DEBUG_DRAW_TARGET},INCLUDE_DIRECTORIES>)
+endif()

34_DebugDraw/config.json.template

@@ -0,0 +1,28 @@
+{
+  "enableParallelBuild": true,
+  "threadsPerBuildProcess" : 2,
+  "isExecuted": false,
+  "scriptPath": "",
+  "cmake": {
+    "configurations": [ "Release", "Debug", "RelWithDebInfo" ],
+    "buildModes": [],
+    "requiredOptions": []
+  }, 
+  "profiles": [
+    {
+      "backend": "vulkan",
+      "platform": "windows",
+      "buildModes": [],
+      "runConfiguration": "Release",
+      "gpuArchitectures": []
+    }
+  ],
+  "dependencies": [],
+  "data": [
+    {
+      "dependencies": [],
+      "command": [""],
+      "outputs": []
+    }
+  ]
+}

34_DebugDraw/include/common.hpp

@@ -0,0 +1,23 @@
+#ifndef __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+#define __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+
+#include <nabla.h>
+
+#include "nbl/examples/cameras/CCamera.hpp"
+#include "nbl/examples/common/SimpleWindowedApplication.hpp"
+#include "nbl/examples/common/CEventCallback.hpp"
+#include "nbl/examples/examples.hpp"
+
+//#include "nbl/CDrawAABB.h"
+#include "nbl/ext/DebugDraw/CDrawAABB.h"
+
+using namespace nbl;
+using namespace core;
+using namespace hlsl;
+using namespace system;
+using namespace asset;
+using namespace ui;
+using namespace video;
+using namespace nbl::examples;
+
+#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__