diff --git a/openVulkanoCpp/Controller/ArCameraController.cpp b/openVulkanoCpp/Controller/ArCameraController.cpp index ef56f47..2e511c0 100644 --- a/openVulkanoCpp/Controller/ArCameraController.cpp +++ b/openVulkanoCpp/Controller/ArCameraController.cpp @@ -61,7 +61,7 @@ namespace openVulkanoCpp } m_updated = false; - m_arSession->OnNewCameraViewMatrix += EventHandler(this, &ArCameraController::UpdateCameraTransformation); + m_arSession->OnNewCameraViewMatrix += EventHandler(this, &ArCameraController::UpdateCameraViewMatrix); } void ArCameraController::Init(Scene::Camera* camera, const std::shared_ptr& session, const Math::Matrix4f& registration) @@ -78,7 +78,7 @@ namespace openVulkanoCpp if (!GetCamera() || !m_updated) return; std::unique_lock lock(m_mutex); - Math::Matrix4f mat = m_registration * Math::Utils::inverse(m_matrixToUpdate); + Math::Matrix4f mat = m_registration * Math::Utils::inverse(m_viewMatrixToUpdate); GetCamera()->SetMatrix(mat); m_updated = false; } @@ -86,15 +86,15 @@ namespace openVulkanoCpp void ArCameraController::Close() { if (!GetCamera()) return; - m_arSession->OnNewCameraViewMatrix -= EventHandler(this, &ArCameraController::UpdateCameraTransformation); + m_arSession->OnNewCameraViewMatrix -= EventHandler(this, &ArCameraController::UpdateCameraViewMatrix); SetCamera(nullptr); m_arSession = nullptr; } - void ArCameraController::UpdateCameraTransformation(const Math::Matrix4f& transform) + void ArCameraController::UpdateCameraViewMatrix(const Math::Matrix4f& transform) { std::unique_lock lock(m_mutex); - m_matrixToUpdate = transform; + m_viewMatrixToUpdate = transform; m_updated = true; } } \ No newline at end of file diff --git a/openVulkanoCpp/Controller/ArCameraController.hpp b/openVulkanoCpp/Controller/ArCameraController.hpp index 9436324..d2818a9 100644 --- a/openVulkanoCpp/Controller/ArCameraController.hpp +++ b/openVulkanoCpp/Controller/ArCameraController.hpp @@ -23,7 +23,7 @@ namespace openVulkanoCpp { std::shared_ptr m_arSession; Math::Matrix4f m_registration; - Math::Matrix4f m_matrixToUpdate; + Math::Matrix4f m_viewMatrixToUpdate; std::mutex m_mutex; std::atomic m_updated; @@ -45,6 +45,6 @@ namespace openVulkanoCpp private: void Init(); - void UpdateCameraTransformation(const Math::Matrix4f& transform); + void UpdateCameraViewMatrix(const Math::Matrix4f& transform); }; } \ No newline at end of file diff --git a/openVulkanoCpp/Controller/FreeCamCameraController.hpp b/openVulkanoCpp/Controller/FreeCamCameraController.hpp index 81c5b39..307fd9b 100644 --- a/openVulkanoCpp/Controller/FreeCamCameraController.hpp +++ b/openVulkanoCpp/Controller/FreeCamCameraController.hpp @@ -11,11 +11,6 @@ namespace openVulkanoCpp { - namespace Scene - { - class Camera; - } - namespace Input { class InputAction;