From 1cdc7388396e167d2a795e9e1fd2a241109b1da6 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Wed, 7 Jun 2023 12:36:31 +0200 Subject: [PATCH] refactor: rename zoom function --- include/render/Renderer.h | 2 +- src/render/Renderer.cpp | 2 +- src/render/WorldRenderer.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/render/Renderer.h b/include/render/Renderer.h index c5db2d7..4a220b1 100644 --- a/include/render/Renderer.h +++ b/include/render/Renderer.h @@ -54,7 +54,7 @@ public: void RenderVAO(const GL::VertexArray& vao); void RenderModel(const Model& model); - void SetZoom(float zoom); + void AddZoom(float zoom); void SetCamAngularMovement(const Vec2f& mov); void SetCamMovement(const Vec2f& lastCursorPos, const Vec2f& currentCursorPos); void SetCamLook(const Vec2f& worldPos); diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 960a206..322baa8 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -86,7 +86,7 @@ void Renderer::Resize(int width, int height) { glViewport(0, 0, width, height); } -void Renderer::SetZoom(float zoom) { +void Renderer::AddZoom(float zoom) { m_Camera.CamPos.y = std::max(1.0f, m_Camera.CamPos.y - zoom); m_Camera.CamDistance = std::max(1.0f, m_Camera.CamDistance - zoom); SetCamLook(m_Camera.CamLook); diff --git a/src/render/WorldRenderer.cpp b/src/render/WorldRenderer.cpp index 56c4f14..74b0ffc 100644 --- a/src/render/WorldRenderer.cpp +++ b/src/render/WorldRenderer.cpp @@ -32,7 +32,6 @@ void WorldRenderer::LoadModels() { } WorldRenderer::WorldRenderer(game::World* world, client::ClientGame* client) : m_Client(client), m_Renderer(m_Client->GetRenderer()), m_World(world), m_Zoom(0.1) { - m_Renderer->SetZoom(m_Zoom); m_TowerPlacePopup = std::make_unique(m_Client->GetClient()); m_TowerUpgradePopup = std::make_unique(m_Client->GetClient()); m_MobTooltip = std::make_unique(m_Client->GetClient()); @@ -153,7 +152,7 @@ void WorldRenderer::ChangeZoom(float zoomStep) { if (m_WorldVao == nullptr) return; - m_Renderer->SetZoom(zoomStep); + m_Renderer->AddZoom(zoomStep); } void WorldRenderer::Click() {