Skip to content

feat(ofShader): allow setting uniform3f from ofFloatColor #8362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofTheo merged 1 commit into from
Mar 8, 2025
Merged

feat(ofShader): allow setting uniform3f from ofFloatColor #8362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions libs/openFrameworks/gl/ofShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofShader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down