From 6ded78531fb0ed4d6efb0fc5fe180cc59d648f0c Mon Sep 17 00:00:00 2001 From: Light Date: Mon, 21 Jun 2021 18:39:19 +0430 Subject: [PATCH] DrawQuad tint - Renderer::DrawQuad now uses the parameter's value rather than the hardcoded ones. --- Engine/src/Engine/Graphics/Renderer.cpp | 8 ++++---- Sandbox/src/SandboxLayer.h | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Engine/src/Engine/Graphics/Renderer.cpp b/Engine/src/Engine/Graphics/Renderer.cpp index 81a4ded..85e318f 100644 --- a/Engine/src/Engine/Graphics/Renderer.cpp +++ b/Engine/src/Engine/Graphics/Renderer.cpp @@ -51,19 +51,19 @@ namespace Light { // TOP_LEFT m_QuadRenderer.mapCurrent[0].position = { xMin, yMin, position.z }; - m_QuadRenderer.mapCurrent[0].tint = glm::vec4(0.1f, 0.1f, 1.0f, 1.0f); + m_QuadRenderer.mapCurrent[0].tint = tint; // TOP_RIGHT m_QuadRenderer.mapCurrent[1].position = { xMax, yMin, position.z }; - m_QuadRenderer.mapCurrent[1].tint = glm::vec4(0.3f, 0.3f, 0.3f, 1.0f); + m_QuadRenderer.mapCurrent[1].tint = tint; // BOTTOM_RIGHT m_QuadRenderer.mapCurrent[2].position = { xMax, yMax, position.z }; - m_QuadRenderer.mapCurrent[2].tint = glm::vec4(0.1f, 1.0f, 0.1f, 1.0f); + m_QuadRenderer.mapCurrent[2].tint = tint; // BOTTOM_LEFT m_QuadRenderer.mapCurrent[3].position = { xMin, yMax, position.z }; - m_QuadRenderer.mapCurrent[3].tint = glm::vec4(1.0f, 0.1f, 0.1f, 1.0f); + m_QuadRenderer.mapCurrent[3].tint = tint; // advance m_QuadRenderer.mapCurrent += 4; diff --git a/Sandbox/src/SandboxLayer.h b/Sandbox/src/SandboxLayer.h index 7ffec6b..24b35ce 100644 --- a/Sandbox/src/SandboxLayer.h +++ b/Sandbox/src/SandboxLayer.h @@ -8,6 +8,9 @@ public: void OnRender() override { Light::Renderer::DrawQuad(glm::vec3(-0.5f, -0.5f, 0.0f), glm::vec2(1.f, 1.f), glm::vec4(1.12f, 1.41f, 1.72f, 1.0f)); + Light::Renderer::DrawQuad(glm::vec3(-0.75f, -0.75f, 0.0f), glm::vec2(0.7f, 0.1f), glm::vec4(1.f, .2f, .2f, 1.0f)); + Light::Renderer::DrawQuad(glm::vec3(0.2f, 0.5f, 0.0f), glm::vec2(0.6f, 0.6f), glm::vec4(.2f, 1.f, .2f, 1.0f)); + Light::Renderer::DrawQuad(glm::vec3(-0.3f, 0.2f, 0.0f), glm::vec2(.4f, .4f), glm::vec4(.2f, 2.f, 1.f, 1.0f)); } };