Cameraz

.gitignore

@@ -13,3 +13,5 @@ compiled.spv
 */.vscode/*
 */__main__.py
 tmp
+/tmp/rtSamples.bin
+/runtime/

09_GeometryCreator/include/common.hpp

@@ -3,6 +3,7 @@
 
 
 #include "nbl/examples/examples.hpp"
+#include "nbl/examples/cameras/CCameraSimpleFPSUtilities.hpp"
 
 using namespace nbl;
 using namespace core;
@@ -15,4 +16,4 @@ using namespace scene;
 using namespace nbl::examples;
 
 
-#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__

09_GeometryCreator/main.cpp

@@ -72,10 +72,15 @@ class GeometryCreatorApp final : public MonoWindowApplication, public BuiltinRes
 
 			// camera
 			{
-				core::vectorSIMDf cameraPosition(-5.81655884, 2.58630896, -4.23974705);
-				core::vectorSIMDf cameraTarget(-0.349590302, -0.213266611, 0.317821503);
-				float32_t4x4 projectionMatrix = hlsl::math::thin_lens::lhPerspectiveFovMatrix<float>(core::radians(60.0f), float(m_initialResolution.x) / m_initialResolution.y, 0.1f, 10000.0f);
-				camera = Camera(cameraPosition, cameraTarget, projectionMatrix, 1.069f, 0.4f);
+				const auto cameraPosition = hlsl::float64_t3(-5.81655884, 2.58630896, -4.23974705);
+				const auto cameraTarget = hlsl::float64_t3(-0.349590302, -0.213266611, 0.317821503);
+				cameraProjection = hlsl::math::thin_lens::lhPerspectiveFovMatrix<float>(core::radians(60.0f), float(m_initialResolution.x) / m_initialResolution.y, 0.1f, 10000.0f);
+
+				camera = CCameraSimpleFPSUtilities::createFromLookAt(cameraPosition, cameraTarget, {1.069, 0.4});
+				if (!camera)
+					return logFail("Could not initialize camera orientation!");
+				ui::CCameraInputBindingUtilities::applyDefaultCameraInputBindingPreset(cameraInputBinder, *camera);
+				cameraInputRuntime.binder = &cameraInputBinder;
 			}
 
 			onAppInitializedFinish();
@@ -94,10 +99,18 @@ class GeometryCreatorApp final : public MonoWindowApplication, public BuiltinRes
 			cb->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
 			cb->beginDebugMarker("GeometryCreatorApp Frame");
 			{
-				camera.beginInputProcessing(nextPresentationTimestamp);
-				mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); mouseProcess(events); }, m_logger.get());
-				keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void { camera.keyboardProcess(events); }, m_logger.get());
-				camera.endInputProcessing(nextPresentationTimestamp);
+				std::vector<ui::SMouseEvent> mouseEvents;
+				std::vector<ui::SKeyboardEvent> keyboardEvents;
+
+				mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { mouseEvents.insert(mouseEvents.end(), events.begin(), events.end()); }, m_logger.get());
+				keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void { keyboardEvents.insert(keyboardEvents.end(), events.begin(), events.end()); }, m_logger.get());
+
+				mouseProcess({ mouseEvents.data(), mouseEvents.size() });
+
+				const auto virtualEvents = CCameraSimpleFPSUtilities::collectBasicVirtualEvents(mouseEvents, keyboardEvents, nextPresentationTimestamp, cameraInputRuntime, cameraInputConfig);
+
+				if (!virtualEvents.empty())
+					camera->manipulate(std::span<const core::CVirtualGimbalEvent>(virtualEvents.data(), virtualEvents.size()));
 			}
 
 
@@ -140,8 +153,8 @@ class GeometryCreatorApp final : public MonoWindowApplication, public BuiltinRes
 				cb->beginRenderPass(info, IGPUCommandBuffer::SUBPASS_CONTENTS::INLINE);
 			}
 
-			float32_t3x4 viewMatrix = camera.getViewMatrix();
-			float32_t4x4 viewProjMatrix = camera.getConcatenatedMatrix();
+			const auto viewMatrix = hlsl::float32_t3x4(camera->getGimbal().getViewMatrix());
+			const auto viewProjMatrix = hlsl::math::linalg::promoted_mul(cameraProjection, viewMatrix);
 			const auto viewParams = CSimpleDebugRenderer::SViewParams(viewMatrix,viewProjMatrix);
 
 			// tear down scene every frame
@@ -247,16 +260,18 @@ class GeometryCreatorApp final : public MonoWindowApplication, public BuiltinRes
 		InputSystem::ChannelReader<IKeyboardEventChannel> keyboard;
 
 		//
-		Camera camera = Camera(core::vectorSIMDf(0, 0, 0), core::vectorSIMDf(0, 0, 0), hlsl::float32_t4x4());
+		core::smart_refctd_ptr<core::CFPSCamera> camera;
+		ui::CGimbalInputBinder cameraInputBinder;
+		CCameraSimpleFPSUtilities::SBasicInputRuntime cameraInputRuntime = {};
+		CCameraSimpleFPSUtilities::SBasicInputConfig cameraInputConfig = {};
+		hlsl::float32_t4x4 cameraProjection = hlsl::float32_t4x4(1.0f);
 
 		uint16_t gcIndex = {};
 
-		void mouseProcess(const nbl::ui::IMouseEventChannel::range_t& events)
+		void mouseProcess(std::span<const nbl::ui::SMouseEvent> events)
 		{
-			for (auto eventIt = events.begin(); eventIt != events.end(); eventIt++)
+			for (const auto& ev : events)
 			{
-				auto ev = *eventIt;
-
 				if (ev.type==nbl::ui::SMouseEvent::EET_SCROLL && m_renderer)
 				{
 					gcIndex += int16_t(core::sign(ev.scrollEvent.verticalScroll));

0_ImportanceSamplingEnvMaps/main.cpp

@@ -4,9 +4,12 @@
 
 #define _NBL_STATIC_LIB_
 #include <nabla.h>
+#include "nbl/examples/cameras/CCameraSimpleFPSUtilities.hpp"
 #include "nbl/ext/FullScreenTriangle/FullScreenTriangle.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
-#include "CCamera.hpp"
+#include "nbl/ext/Cameras/CCameraInputBindingUtilities.hpp"
+#include "nbl/ext/Cameras/CFPSCamera.hpp"
+#include "nbl/ext/Cameras/CGimbalInputBinder.hpp"
 #include "../common/CommonAPI.h"
 
 using namespace nbl;
@@ -122,7 +125,11 @@ class ImportanceSamplingEnvMaps : public ApplicationBase
 
 	CommonAPI::InputSystem::ChannelReader<IMouseEventChannel> mouse;
 	CommonAPI::InputSystem::ChannelReader<IKeyboardEventChannel> keyboard;
-	Camera camera = Camera(vectorSIMDf(0, 0, 0), vectorSIMDf(0, 0, 0), matrix4SIMD());
+	core::smart_refctd_ptr<core::CFPSCamera> camera;
+	ui::CGimbalInputBinder cameraInputBinder;
+	nbl::examples::CCameraSimpleFPSUtilities::SBasicInputRuntime cameraInputRuntime = {};
+	nbl::examples::CCameraSimpleFPSUtilities::SBasicInputConfig cameraInputConfig = {};
+	hlsl::float32_t4x4 cameraProjection = hlsl::float32_t4x4(1.0f);
 
 	core::smart_refctd_ptr<IGPUGraphicsPipeline> gpuEnvmapPipeline;
 	core::smart_refctd_ptr<IGPUMeshBuffer> gpuEnvmapMeshBuffer;
@@ -297,10 +304,14 @@ class ImportanceSamplingEnvMaps : public ApplicationBase
 		logger = std::move(initOutput.logger);
 		inputSystem = std::move(initOutput.inputSystem);
 
-		core::vectorSIMDf cameraPosition(-0.0889001, 0.678913, -4.01774);
-		core::vectorSIMDf cameraTarget(1.80119, 0.515374, -0.410544);
-		matrix4SIMD projectionMatrix = matrix4SIMD::buildProjectionMatrixPerspectiveFovLH(core::radians(60.0f), float(WIN_W) / WIN_H, 0.03125f, 200.0f);
-		camera = Camera(cameraPosition, cameraTarget, projectionMatrix, 10.f, 1.f);
+		const auto cameraPosition = hlsl::float64_t3(-0.0889001, 0.678913, -4.01774);
+		const auto cameraTarget = hlsl::float64_t3(1.80119, 0.515374, -0.410544);
+		cameraProjection = matrix4SIMD::buildProjectionMatrixPerspectiveFovLH(core::radians(60.0f), float(WIN_W) / WIN_H, 0.03125f, 200.0f);
+		camera = nbl::examples::CCameraSimpleFPSUtilities::createFromLookAt(cameraPosition, cameraTarget, {10.0, 1.0});
+		if (!camera)
+			return logFail("Could not initialize camera orientation!");
+		ui::CCameraInputBindingUtilities::applyDefaultCameraInputBindingPreset(cameraInputBinder, *camera);
+		cameraInputRuntime.binder = &cameraInputBinder;
 
 		descriptorPool = createDescriptorPool(1u);
 
@@ -775,10 +786,10 @@ class ImportanceSamplingEnvMaps : public ApplicationBase
 
 	void onAppTerminated_impl() override
 	{
-		const core::vectorSIMDf& last_cam_pos = camera.getPosition();
-		const core::vectorSIMDf& last_cam_target = camera.getTarget();
-		std::cout << "Last camera position: (" << last_cam_pos.X << ", " << last_cam_pos.Y << ", " << last_cam_pos.Z << ")" << std::endl;
-		std::cout << "Last camera target: (" << last_cam_target.X << ", " << last_cam_target.Y << ", " << last_cam_target.Z << ")" << std::endl;
+		const auto& lastCamPos = camera->getGimbal().getPosition();
+		const auto lastCamTarget = camera->getGimbal().getWorldTarget();
+		std::cout << "Last camera position: (" << lastCamPos.x << ", " << lastCamPos.y << ", " << lastCamPos.z << ")" << std::endl;
+		std::cout << "Last camera target: (" << lastCamTarget.x << ", " << lastCamTarget.y << ", " << lastCamTarget.z << ")" << std::endl;
 	}
 
 	void workLoopBody() override
@@ -802,14 +813,23 @@ class ImportanceSamplingEnvMaps : public ApplicationBase
 			inputSystem->getDefaultMouse(&mouse);
 			inputSystem->getDefaultKeyboard(&keyboard);
 
-			camera.beginInputProcessing(nextPresentationTimestamp);
-			mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); }, logger.get());
-			keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void { camera.keyboardProcess(events); }, logger.get());
-			camera.endInputProcessing(nextPresentationTimestamp);
+			std::vector<SMouseEvent> mouseEvents;
+			std::vector<SKeyboardEvent> keyboardEvents;
+			mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void
+			{
+				mouseEvents.insert(mouseEvents.end(), events.begin(), events.end());
+			}, logger.get());
+			keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void
+			{
+				keyboardEvents.insert(keyboardEvents.end(), events.begin(), events.end());
+			}, logger.get());
+			const auto virtualEvents = nbl::examples::CCameraSimpleFPSUtilities::collectBasicVirtualEvents(mouseEvents, keyboardEvents, nextPresentationTimestamp, cameraInputRuntime, cameraInputConfig);
+			if (!virtualEvents.empty())
+				camera->manipulate(std::span<const core::CVirtualGimbalEvent>(virtualEvents.data(), virtualEvents.size()));
 		}
 
-		const auto& viewMatrix = camera.getViewMatrix();
-		const auto& viewProjectionMatrix = camera.getConcatenatedMatrix();
+		const auto viewMatrix = hlsl::float32_t3x4(camera->getGimbal().getViewMatrix());
+		const auto viewProjectionMatrix = hlsl::math::linalg::promoted_mul(cameraProjection, viewMatrix);
 
 		asset::SViewport viewport;
 		viewport.minDepth = 1.f;
@@ -883,4 +903,4 @@ class ImportanceSamplingEnvMaps : public ApplicationBase
 		return windowCb->isWindowOpen();
 	}
 };
-NBL_COMMON_API_MAIN(ImportanceSamplingEnvMaps)
+NBL_COMMON_API_MAIN(ImportanceSamplingEnvMaps)

12_MeshLoaders/include/common.hpp

@@ -3,6 +3,11 @@
 
 
 #include "nbl/examples/examples.hpp"
+#include "nbl/examples/cameras/CCameraSimpleFPSUtilities.hpp"
+#include "nbl/ext/Cameras/CCameraInputBindingUtilities.hpp"
+#include "nbl/ext/Cameras/CCameraMathUtilities.hpp"
+#include "nbl/ext/Cameras/CFPSCamera.hpp"
+#include "nbl/ext/Cameras/CGimbalInputBinder.hpp"
 
 using namespace nbl;
 using namespace core;
@@ -15,4 +20,4 @@ using namespace scene;
 using namespace nbl::examples;
 
 
-#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__

12_MeshLoaders/main.cpp

@@ -117,7 +117,8 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 			if (!reloadModel())
 				return false;
 
-		camera.mapKeysToArrows();
+		ui::CCameraInputBindingUtilities::applyDefaultCameraInputBindingPreset(cameraInputBinder, *camera);
+		cameraInputRuntime.binder = &cameraInputBinder;
 
 		onAppInitializedFinish();
 		return true;
@@ -169,8 +170,12 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 				// late latch input
 				{
 					bool reload = false;
-					camera.beginInputProcessing(nextPresentationTimestamp);
-					mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void { camera.mouseProcess(events); }, m_logger.get());
+					std::vector<SMouseEvent> cameraMouseEvents;
+					std::vector<SKeyboardEvent> cameraKeyboardEvents;
+					mouse.consumeEvents([&](const IMouseEventChannel::range_t& events) -> void
+						{
+							cameraMouseEvents.insert(cameraMouseEvents.end(), events.begin(), events.end());
+						}, m_logger.get());
 					keyboard.consumeEvents([&](const IKeyboardEventChannel::range_t& events) -> void
 						{
 							for (const auto& event : events)
@@ -182,17 +187,19 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 									m_drawBBMode = DrawBoundingBoxMode((m_drawBBMode + 1) % DBBM_COUNT);
 								}
 							}
-							camera.keyboardProcess(events);
+							cameraKeyboardEvents.insert(cameraKeyboardEvents.end(), events.begin(), events.end());
 						},
 						m_logger.get()
 					);
-					camera.endInputProcessing(nextPresentationTimestamp);
+					const auto virtualEvents = CCameraSimpleFPSUtilities::collectBasicVirtualEvents(cameraMouseEvents, cameraKeyboardEvents, nextPresentationTimestamp, cameraInputRuntime, cameraInputConfig);
+					if (!virtualEvents.empty())
+						camera->manipulate(std::span<const core::CVirtualGimbalEvent>(virtualEvents.data(), virtualEvents.size()));
 					if (reload)
 						reloadModel();
 				}
 				// draw scene
-				float32_t3x4 viewMatrix = camera.getViewMatrix();
-				float32_t4x4 viewProjMatrix = camera.getConcatenatedMatrix();
+				float32_t3x4 viewMatrix = hlsl::float32_t3x4(camera->getGimbal().getViewMatrixRH());
+				float32_t4x4 viewProjMatrix = hlsl::math::linalg::promoted_mul(cameraProjection, viewMatrix);
 				m_renderer->render(cb,CSimpleDebugRenderer::SViewParams(viewMatrix,viewProjMatrix));
 #ifdef NBL_BUILD_DEBUG_DRAW
 				if (m_drawBBMode != DBBM_NONE)
@@ -521,16 +528,20 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 		{
 			const double distance = 0.05;
 			const auto diagonal = bound.getExtent();
+			const auto pos = bound.maxVx + diagonal * distance;
+			const auto center = (bound.minVx + bound.maxVx) * 0.5;
 			{
 				const auto measure = hlsl::length(diagonal);
 				const auto aspectRatio = float(m_window->getWidth()) / float(m_window->getHeight());
-				camera.setProjectionMatrix(hlsl::math::thin_lens::rhPerspectiveFovMatrix<float>(1.2f, aspectRatio, distance * measure * 0.1, measure * 4.0));
-				camera.setMoveSpeed(measure * 0.04);
+				cameraProjection = hlsl::math::thin_lens::rhPerspectiveFovMatrix<float>(1.2f, aspectRatio, distance * measure * 0.1, measure * 4.0);
+				camera = CCameraSimpleFPSUtilities::createFromLookAt(
+					hlsl::float64_t3(pos.x, pos.y, pos.z),
+					hlsl::float64_t3(center.x, center.y, center.z),
+					{measure * 0.04, cameraRotateSpeed});
+				if (!camera)
+					return logFail("Could not initialize camera orientation!");
+				cameraInputRuntime.binder = &cameraInputBinder;
 			}
-			const auto pos = bound.maxVx + diagonal * distance;
-			camera.setPosition(vectorSIMDf(pos.x, pos.y, pos.z));
-			const auto center = (bound.minVx + bound.maxVx) * 0.5;
-			camera.setTarget(vectorSIMDf(center.x, center.y, center.z));
 		}
 
 		// TODO: write out the geometry
@@ -560,7 +571,12 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 	InputSystem::ChannelReader<IMouseEventChannel> mouse;
 	InputSystem::ChannelReader<IKeyboardEventChannel> keyboard;
 	//
-	Camera camera = Camera(core::vectorSIMDf(0, 0, 0), core::vectorSIMDf(0, 0, 0), hlsl::float32_t4x4());
+	core::smart_refctd_ptr<core::CFPSCamera> camera;
+	ui::CGimbalInputBinder cameraInputBinder;
+	CCameraSimpleFPSUtilities::SBasicInputRuntime cameraInputRuntime = {};
+	CCameraSimpleFPSUtilities::SBasicInputConfig cameraInputConfig = {};
+	hlsl::float32_t4x4 cameraProjection = hlsl::float32_t4x4(1.0f);
+	float cameraRotateSpeed = 1.0f;
 	// mutables
 	std::string m_modelPath;
 
@@ -578,4 +594,4 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 	nbl::system::path m_saveGeomPrefixPath;
 };
 
-NBL_MAIN_FUNC(MeshLoadersApp)
+NBL_MAIN_FUNC(MeshLoadersApp)

31_HLSLPathTracer/include/nbl/this_example/common.hpp

@@ -5,13 +5,17 @@
 
 // common api
 #include "nbl/examples/common/SimpleWindowedApplication.hpp"
+#include "nbl/examples/cameras/CCameraSimpleFPSUtilities.hpp"
 #include "nbl/examples/examples.hpp"
-#include "nbl/examples/cameras/CCamera.hpp"
+#include "nbl/ext/Cameras/CCameraInputBindingUtilities.hpp"
+#include "nbl/ext/Cameras/CCameraMathUtilities.hpp"
+#include "nbl/ext/Cameras/CFPSCamera.hpp"
+#include "nbl/ext/Cameras/CGimbalInputBinder.hpp"
 #include "nbl/examples/common/CEventCallback.hpp"
 
 // example's own headers
 #include "nbl/ui/ICursorControl.h"
 #include "nbl/ext/ImGui/ImGui.h"
 #include "imgui/imgui_internal.h"
 
-#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
+#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__