From 162cab72fbd425181af6f4ebf639fe9156005a9b Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 23 Jun 2024 23:25:38 +0200 Subject: [PATCH] Small CameraController extension --- openVulkanoCpp/Controller/ArCameraController.hpp | 2 ++ openVulkanoCpp/Controller/ArcballCameraController.hpp | 2 +- openVulkanoCpp/Controller/CameraController.hpp | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openVulkanoCpp/Controller/ArCameraController.hpp b/openVulkanoCpp/Controller/ArCameraController.hpp index 607f331..58f6ab0 100644 --- a/openVulkanoCpp/Controller/ArCameraController.hpp +++ b/openVulkanoCpp/Controller/ArCameraController.hpp @@ -40,6 +40,8 @@ namespace OpenVulkano void Close() override; + void SetRegistration(const Math::Matrix4f& reg) { m_registration = reg; } + [[nodiscard]] std::shared_ptr GetArSession() const { return m_arSession; } private: diff --git a/openVulkanoCpp/Controller/ArcballCameraController.hpp b/openVulkanoCpp/Controller/ArcballCameraController.hpp index 6d80263..a9f3a01 100644 --- a/openVulkanoCpp/Controller/ArcballCameraController.hpp +++ b/openVulkanoCpp/Controller/ArcballCameraController.hpp @@ -40,7 +40,7 @@ namespace OpenVulkano void SetPivotPoint(const Math::Vector4f_SIMD& pivotPoint) { m_pivotPoint = pivotPoint; } - void SetActive(); + void SetActive() override; void SetDefaultKeybindings(); diff --git a/openVulkanoCpp/Controller/CameraController.hpp b/openVulkanoCpp/Controller/CameraController.hpp index aba113d..80bfa2d 100644 --- a/openVulkanoCpp/Controller/CameraController.hpp +++ b/openVulkanoCpp/Controller/CameraController.hpp @@ -35,5 +35,7 @@ namespace OpenVulkano void SetCamera(Scene::Camera* camera) { m_camera = camera; } Scene::Camera* GetCamera() { return m_camera; } + + virtual void SetActive() {} }; }