Skip to content

Commit ced5262

Browse files
committed
Merge branch 'PShader.set(boolean)' of https://github.com/AmnonOwed/processing
2 parents 85606e5 + c7b5ae9 commit ced5262

1 file changed

Lines changed: 34 additions & 0 deletions

File tree

core/src/processing/opengl/PShader.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,26 @@ public void set(String name, PVector vec) {
443443
}
444444

445445

446+
public void set(String name, boolean x) {
447+
setUniformImpl(name, UniformValue.INT1, new int[] { (x)?1:0 });
448+
}
449+
450+
451+
public void set(String name, boolean x, boolean y) {
452+
setUniformImpl(name, UniformValue.INT2, new int[] { (x)?1:0, (y)?1:0 });
453+
}
454+
455+
456+
public void set(String name, boolean x, boolean y, boolean z) {
457+
setUniformImpl(name, UniformValue.INT3, new int[] { (x)?1:0, (y)?1:0, (z)?1:0 });
458+
}
459+
460+
461+
public void set(String name, boolean x, boolean y, boolean z, boolean w) {
462+
setUniformImpl(name, UniformValue.INT4, new int[] { (x)?1:0, (y)?1:0, (z)?1:0, (w)?1:0 });
463+
}
464+
465+
446466
public void set(String name, int[] vec) {
447467
set(name, vec, 1);
448468
}
@@ -490,6 +510,20 @@ public void set(String name, float[] vec, int ncoords) {
490510
}
491511
}
492512

513+
public void set(String name, boolean[] vec) {
514+
set(name, vec, 1);
515+
}
516+
517+
518+
public void set(String name, boolean[] boolvec, int ncoords) {
519+
int[] vec = new int[boolvec.length];
520+
for (int i=0; i<boolvec.length; i++) {
521+
vec[i] = (boolvec[i])?1:0;
522+
}
523+
set(name, vec, ncoords);
524+
}
525+
526+
493527
/**
494528
* @param mat matrix of values
495529
*/

0 commit comments

Comments
 (0)