From 5d11b29ec28e32cebcd7dd83ba3f911fdd46560f Mon Sep 17 00:00:00 2001 From: alexandre burton Date: Fri, 7 Mar 2025 17:45:57 -0500 Subject: [PATCH] feat(ofShader): allow setting uniform3f from ofFloatColor --- libs/openFrameworks/gl/ofShader.cpp | 5 +++++ libs/openFrameworks/gl/ofShader.h | 1 + 2 files changed, 6 insertions(+) diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index b4df3358905..00eb4fdb12c 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -1065,6 +1065,11 @@ void ofShader::setUniform4f(const string & name, const glm::vec4 & v) const { setUniform4f(name, v.x, v.y, v.z, v.w); } +//-------------------------------------------------------------- +void ofShader::setUniform3f(const string & name, const ofFloatColor & v) const { + setUniform3f(name, v.r, v.g, v.b); +} + //-------------------------------------------------------------- void ofShader::setUniform4f(const string & name, const ofFloatColor & v) const { setUniform4f(name, v.r, v.g, v.b, v.a); diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h index e52cdc18d26..d17f4ec1b99 100644 --- a/libs/openFrameworks/gl/ofShader.h +++ b/libs/openFrameworks/gl/ofShader.h @@ -174,6 +174,7 @@ class ofShader { void setUniform2f(const std::string & name, const glm::vec2 & v) const; void setUniform3f(const std::string & name, const glm::vec3 & v) const; void setUniform4f(const std::string & name, const glm::vec4 & v) const; + void setUniform3f(const std::string & name, const ofFloatColor & v) const; void setUniform4f(const std::string & name, const ofFloatColor & v) const; // set an array of uniform values