From bb2b1ed38f1aa20b7993115d3061016be29a1913 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Thu, 14 Jan 2021 15:25:36 +0100 Subject: [PATCH] Rename camera projection view function name --- inferno/src/inferno/scene/scene.cpp | 2 +- inferno/src/inferno/systems/camera.cpp | 2 +- inferno/src/inferno/systems/camera.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inferno/src/inferno/scene/scene.cpp b/inferno/src/inferno/scene/scene.cpp index e17993e..bddf653 100644 --- a/inferno/src/inferno/scene/scene.cpp +++ b/inferno/src/inferno/scene/scene.cpp @@ -105,7 +105,7 @@ namespace Inferno { glm::mat4 Scene::cameraProjectionView() { - return CameraSystem::the().cameraProjectionView(); + return CameraSystem::the().projectionView(); } } diff --git a/inferno/src/inferno/systems/camera.cpp b/inferno/src/inferno/systems/camera.cpp index f209dfa..d57f79a 100644 --- a/inferno/src/inferno/systems/camera.cpp +++ b/inferno/src/inferno/systems/camera.cpp @@ -43,7 +43,7 @@ namespace Inferno { s_instance = nullptr; } - glm::mat4 CameraSystem::cameraProjectionView() + glm::mat4 CameraSystem::projectionView() { auto orthoView = m_registry->view(); diff --git a/inferno/src/inferno/systems/camera.h b/inferno/src/inferno/systems/camera.h index 9a8bb4e..1380000 100644 --- a/inferno/src/inferno/systems/camera.h +++ b/inferno/src/inferno/systems/camera.h @@ -24,7 +24,7 @@ namespace Inferno { void update(); void destroy(); - glm::mat4 cameraProjectionView(); + glm::mat4 projectionView(); void setRegistry(const std::shared_ptr& registry) { m_registry = registry; };