prep example 67 for further work

Author: devsh

67_RayQueryGeometry/include/common.hpp

@@ -1,95 +1,18 @@
-#ifndef __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
-#define __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+#ifndef _NBL_THIS_EXAMPLE_COMMON_H_INCLUDED_
+#define _NBL_THIS_EXAMPLE_COMMON_H_INCLUDED_
 
-#include <nabla.h>
-#include "nbl/asset/utils/CGeometryCreator.h"
-#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
-
-#include "SimpleWindowedApplication.hpp"
-
-#include "InputSystem.hpp"
-#include "CEventCallback.hpp"
-
-#include "CCamera.hpp"
-
-#include <nbl/builtin/hlsl/cpp_compat.hlsl>
-#include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
+#include "nbl/examples/examples.hpp"
 
 using namespace nbl;
-using namespace core;
-using namespace hlsl;
-using namespace system;
-using namespace asset;
-using namespace ui;
-using namespace video;
-using namespace scene;
+using namespace nbl::core;
+using namespace nbl::hlsl;
+using namespace nbl::system;
+using namespace nbl::asset;
+using namespace nbl::ui;
+using namespace nbl::video;
+using namespace nbl::application_templates;
+using namespace nbl::examples;
 
 #include "app_resources/common.hlsl"
 
-namespace nbl::scene
-{
-enum ObjectType : uint8_t
-{
-	OT_CUBE,
-	OT_SPHERE,
-	OT_CYLINDER,
-	OT_RECTANGLE,
-	OT_DISK,
-	OT_ARROW,
-	OT_CONE,
-	OT_ICOSPHERE,
-
-	OT_COUNT,
-	OT_UNKNOWN = std::numeric_limits<uint8_t>::max()
-};
-
-struct ObjectMeta
-{
-	ObjectType type = OT_UNKNOWN;
-	std::string_view name = "Unknown";
-};
-
-struct ObjectDrawHookCpu
-{
-	nbl::core::matrix3x4SIMD model;
-	nbl::asset::SBasicViewParameters viewParameters;
-	ObjectMeta meta;
-};
-
-enum GeometryShader
-{
-	GP_BASIC = 0,
-	GP_CONE,
-	GP_ICO,
-
-	GP_COUNT
-};
-
-struct ReferenceObjectCpu
-{
-	ObjectMeta meta;
-	GeometryShader shadersType;
-	nbl::asset::CGeometryCreator::return_type data;
-};
-
-struct ReferenceObjectGpu
-{
-	struct Bindings
-	{
-		nbl::asset::SBufferBinding<IGPUBuffer> vertex, index;
-	};
-
-	ObjectMeta meta;
-	Bindings bindings;
-	uint32_t vertexStride;
-	nbl::asset::E_INDEX_TYPE indexType = nbl::asset::E_INDEX_TYPE::EIT_UNKNOWN;
-	uint32_t indexCount = {};
-
-	const bool useIndex() const
-	{
-		return bindings.index.buffer && (indexType != E_INDEX_TYPE::EIT_UNKNOWN);
-	}
-};
-}
-
-#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+#endif // _NBL_THIS_EXAMPLE_COMMON_H_INCLUDED_

67_RayQueryGeometry/main.cpp

@@ -3,10 +3,10 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "common.hpp"
 
-class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
+class RayQueryGeometryApp final : public SimpleWindowedApplication, public MonoAssetManagerAndBuiltinResourceApplication
 {
-		using device_base_t = examples::SimpleWindowedApplication;
-		using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
+		using device_base_t = SimpleWindowedApplication;
+		using asset_base_t = MonoAssetManagerAndBuiltinResourceApplication;
 		using clock_t = std::chrono::steady_clock;
 
 		constexpr static inline uint32_t WIN_W = 1280, WIN_H = 720;
@@ -121,7 +121,6 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 				return logFail("Could not create HDR Image");
 
 			auto assetManager = make_smart_refctd_ptr<nbl::asset::IAssetManager>(smart_refctd_ptr(system));
-			auto* geometryCreator = assetManager->getGeometryCreator();
 
 			auto cQueue = getComputeQueue();
 
@@ -138,9 +137,9 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 					std::this_thread::yield();
 			}
 			// Nsight is special and can't capture anything not on the queue that performs the swapchain acquire/release
-			createAccelerationStructureDS(gQueue,geometryCreator);
+			createAccelerationStructureDS(gQueue);
 #else
-			createAccelerationStructureDS(cQueue,geometryCreator);
+			createAccelerationStructureDS(cQueue);
 #endif
 			if (!renderDs)
 				return logFail("Could not create acceleration structures and descriptor set");
@@ -258,11 +257,9 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 			cmdbuf->beginDebugMarker("RayQueryGeometryApp Frame");
 			{
 				camera.beginInputProcessing(nextPresentationTimestamp);
-				mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); mouseProcess(events); }, m_logger.get());
+				mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); }, m_logger.get());
 				keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void { camera.keyboardProcess(events); }, m_logger.get());
 				camera.endInputProcessing(nextPresentationTimestamp);
-
-				const auto type = static_cast<ObjectType>(gcIndex);
 			}
 
 			const auto viewMatrix = camera.getViewMatrix();
@@ -487,9 +484,12 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 			return (dim + size - 1) / size;
 		}
 
-		smart_refctd_ptr<IGPUDescriptorSet> createAccelerationStructureDS(video::CThreadSafeQueueAdapter* queue, const IGeometryCreator* gc)
+		smart_refctd_ptr<IGPUDescriptorSet> createAccelerationStructureDS(video::CThreadSafeQueueAdapter* queue)
 		{
 			// get geometries in ICPUBuffers
+#if 1
+			return nullptr;
+#else
 			std::array<ReferenceObjectCpu, OT_COUNT> objectsCpu;
 			objectsCpu[OT_CUBE] = ReferenceObjectCpu{ .meta = {.type = OT_CUBE, .name = "Cube Mesh" }, .shadersType = GP_BASIC, .data = gc->createCubeMesh(nbl::core::vector3df(1.f, 1.f, 1.f)) };
 			objectsCpu[OT_SPHERE] = ReferenceObjectCpu{ .meta = {.type = OT_SPHERE, .name = "Sphere Mesh" }, .shadersType = GP_BASIC, .data = gc->createSphereMesh(2, 16, 16) };
@@ -892,6 +892,7 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 			m_api->endCapture();
 
 			return reservation.getGPUObjects<ICPUDescriptorSet>().front().value;
+#endif
 		}
 
 
@@ -915,19 +916,6 @@ class RayQueryGeometryApp final : public examples::SimpleWindowedApplication, pu
 
 		smart_refctd_ptr<IGPUComputePipeline> renderPipeline;
 		smart_refctd_ptr<IGPUDescriptorSet> renderDs;
-
-		uint16_t gcIndex = {};
-
-		void mouseProcess(const nbl::ui::IMouseEventChannel::range_t& events)
-		{
-			for (auto eventIt = events.begin(); eventIt != events.end(); eventIt++)
-			{
-				auto ev = *eventIt;
-
-				if (ev.type == nbl::ui::SMouseEvent::EET_SCROLL)
-					gcIndex = std::clamp<uint16_t>(int16_t(gcIndex) + int16_t(core::sign(ev.scrollEvent.verticalScroll)), int64_t(0), int64_t(OT_COUNT - (uint8_t)1u));
-			}
-		}
 };
 
 NBL_MAIN_FUNC(RayQueryGeometryApp)