From d4feaa15ec198e9978b10e0877c6d6c35f764700 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Sun, 28 Jul 2024 10:59:30 -0400 Subject: [PATCH] Added extra texture bind function to shader --- Nuake/src/Rendering/Shaders/Shader.cpp | 8 ++++++++ Nuake/src/Rendering/Shaders/Shader.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/Nuake/src/Rendering/Shaders/Shader.cpp b/Nuake/src/Rendering/Shaders/Shader.cpp index 8fe9d038..17285b79 100644 --- a/Nuake/src/Rendering/Shaders/Shader.cpp +++ b/Nuake/src/Rendering/Shaders/Shader.cpp @@ -347,4 +347,12 @@ namespace Nuake SetUniform1i(name, slot); texture->Bind(slot); } + + void Shader::SetUniformTex(const std::string& name, Ref texture, unsigned int slot) + { + //ASSERT(texture != nullptr); + + SetUniform1i(name, slot); + texture->Bind(slot); + } } diff --git a/Nuake/src/Rendering/Shaders/Shader.h b/Nuake/src/Rendering/Shaders/Shader.h index bffd6c60..7eddfac7 100644 --- a/Nuake/src/Rendering/Shaders/Shader.h +++ b/Nuake/src/Rendering/Shaders/Shader.h @@ -6,6 +6,7 @@ #include "glm/gtc/matrix_transform.hpp" #include "src/Core/Maths.h" #include "src/Rendering/Textures/Texture.h" +#include "src/Core/Core.h" namespace Nuake { @@ -42,6 +43,7 @@ namespace Nuake void SetUniform1f(const std::string& name, float v0); void SetUniform1b(const std::string& name, bool v0); void SetUniformTex(const std::string& name, Texture* texture, unsigned int slot = 0); + void SetUniformTex(const std::string& name, Ref texture, unsigned int slot = 0); void SetUniform1i(const std::string& name, int v0); void SetUniform1i(uint32_t location, int v0);