From eea20285e42c755a6e3be2d071baa0a70341a19f Mon Sep 17 00:00:00 2001 From: Riyyi Date: Thu, 14 Jan 2021 03:07:02 +0100 Subject: [PATCH] Remove unused parameter --- inferno/src/inferno/application.cpp | 2 +- inferno/src/inferno/render/renderer.cpp | 7 +------ inferno/src/inferno/render/renderer.h | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/inferno/src/inferno/application.cpp b/inferno/src/inferno/application.cpp index e6cac5d..6380bdd 100644 --- a/inferno/src/inferno/application.cpp +++ b/inferno/src/inferno/application.cpp @@ -175,7 +175,7 @@ namespace Inferno { Renderer2D::the().drawQuad(quad2.get(), { 0.5f, 0.6f, 0.8f, 1.0f }, m_texture); Renderer2D::the().drawQuad(quad3.get(), { 1.0f, 1.0f, 1.0f, 1.0f }, m_texture2); - RendererCharacter::the().drawCharacter(character, {1,1,1,1}, f->texture()); + RendererCharacter::the().drawCharacter(character, f->texture()); Renderer2D::the().endScene(); RendererCharacter::the().endScene(); diff --git a/inferno/src/inferno/render/renderer.cpp b/inferno/src/inferno/render/renderer.cpp index c1b319a..85c07b2 100644 --- a/inferno/src/inferno/render/renderer.cpp +++ b/inferno/src/inferno/render/renderer.cpp @@ -349,12 +349,7 @@ namespace Inferno { nextBatch(); } - void RendererCharacter::drawCharacter(std::array& characterQuad, glm::vec4 color, std::shared_ptr texture) - { - drawCharacter(characterQuad, glm::mat4 { color, color, color, color }, texture); - } - - void RendererCharacter::drawCharacter(std::array& characterQuad, glm::mat4 color, std::shared_ptr texture) + void RendererCharacter::drawCharacter(std::array& characterQuad, std::shared_ptr texture) { // Create a new batch if the quad limit has been reached if (m_quadIndex >= quadCount) { diff --git a/inferno/src/inferno/render/renderer.h b/inferno/src/inferno/render/renderer.h index f2ac15c..e5aab38 100644 --- a/inferno/src/inferno/render/renderer.h +++ b/inferno/src/inferno/render/renderer.h @@ -134,8 +134,7 @@ namespace Inferno { void beginScene(); void endScene(); - void drawCharacter(std::array& characterQuad, glm::vec4 color, std::shared_ptr texture); - void drawCharacter(std::array& characterQuad, glm::mat4 color, std::shared_ptr texture); + void drawCharacter(std::array& characterQuad, std::shared_ptr texture); static inline RendererCharacter& the() { return *s_instance; }