Skip to content

Commit 1354c64

Browse files
committed
Engine fixes: shader() pointer overload, PShader::set() double overloads
Processing.h: - void shader(PShader* s) pointer overload (Problem 2.2) - PShader::set() double overloads for 1-4 args (Problem 3.1) Prevents double/float ambiguity on undecorated numeric literals
1 parent 812b206 commit 1354c64

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

src/Processing.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3236,9 +3236,13 @@ class PShader {
32363236

32373237
void set(const std::string& n, float v) { glUniform1f(glGetUniformLocation(program,n.c_str()),v); }
32383238
void set(const std::string& n, int v) { glUniform1i(glGetUniformLocation(program,n.c_str()),v); }
3239+
void set(const std::string& n, double v) { set(n,(float)v); }
32393240
void set(const std::string& n, float x, float y) { glUniform2f(glGetUniformLocation(program,n.c_str()),x,y); }
3241+
void set(const std::string& n, double x, double y) { set(n,(float)x,(float)y); }
32403242
void set(const std::string& n, float x, float y, float z) { glUniform3f(glGetUniformLocation(program,n.c_str()),x,y,z); }
3243+
void set(const std::string& n, double x, double y, double z) { set(n,(float)x,(float)y,(float)z); }
32413244
void set(const std::string& n, float x, float y, float z, float w){ glUniform4f(glGetUniformLocation(program,n.c_str()),x,y,z,w); }
3245+
void set(const std::string& n, double x, double y, double z, double w){ set(n,(float)x,(float)y,(float)z,(float)w); }
32423246

32433247
~PShader() { if(program)glDeleteProgram(program); if(vert)glDeleteShader(vert); if(frag)glDeleteShader(frag); }
32443248
PShader(const PShader&) __attribute__((error(

0 commit comments

Comments
 (0)