From a578be93ec8087a632bed1c273e1f0a738bb3e44 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Tue, 23 Jul 2024 23:02:22 +0200 Subject: [PATCH] Add some functions --- openVulkanoCpp/Math/Math.hpp | 6 ++++++ openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp | 5 ++++- openVulkanoCpp/Vulkan/VulkanDrawContext.hpp | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/openVulkanoCpp/Math/Math.hpp b/openVulkanoCpp/Math/Math.hpp index ac06bca..4dc74ec 100644 --- a/openVulkanoCpp/Math/Math.hpp +++ b/openVulkanoCpp/Math/Math.hpp @@ -29,6 +29,12 @@ namespace OpenVulkano::Math constexpr T CONVERSION = std::numbers::pi_v / 180.0; return degree * CONVERSION; } + + template + constexpr T Square(T val) + { + return val * val; + } } template using Matrix2_SIMD = glm::tmat2x2; diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp index 7996b4a..1832fec 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp @@ -7,6 +7,7 @@ #pragma once #include "Base/ICloseable.hpp" +#include "Scene/Camera.hpp" #include "IRecordable.hpp" #include "Vulkan/Resources/UniformBuffer.hpp" @@ -39,5 +40,7 @@ namespace OpenVulkano::Vulkan m_camera = nullptr; delete m_buffer; } + + [[nodiscard]] Scene::Camera* GetCamera() const { return m_camera; } }; -} \ No newline at end of file +} diff --git a/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp b/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp index 87723d8..169858e 100644 --- a/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp +++ b/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp @@ -35,6 +35,8 @@ namespace OpenVulkano::Vulkan void SetCamera(Scene::Camera* camera); - VulkanShader* GetShader() const { return m_lastShader; } + [[nodiscard]] VulkanShader* GetShader() const { return m_lastShader; } + + [[nodiscard]] VulkanCamera* GetCamera() const { return m_lastCamera; } }; }