Merge branch 'PShader.set(boolean)' of https://github.com/AmnonOwed/processing

This commit is contained in:
codeanticode
2013-10-24 23:45:31 -04:00

View File

@@ -443,6 +443,26 @@ public class PShader implements PConstants {
}
public void set(String name, boolean x) {
setUniformImpl(name, UniformValue.INT1, new int[] { (x)?1:0 });
}
public void set(String name, boolean x, boolean y) {
setUniformImpl(name, UniformValue.INT2, new int[] { (x)?1:0, (y)?1:0 });
}
public void set(String name, boolean x, boolean y, boolean z) {
setUniformImpl(name, UniformValue.INT3, new int[] { (x)?1:0, (y)?1:0, (z)?1:0 });
}
public void set(String name, boolean x, boolean y, boolean z, boolean w) {
setUniformImpl(name, UniformValue.INT4, new int[] { (x)?1:0, (y)?1:0, (z)?1:0, (w)?1:0 });
}
public void set(String name, int[] vec) {
set(name, vec, 1);
}
@@ -490,6 +510,20 @@ public class PShader implements PConstants {
}
}
public void set(String name, boolean[] vec) {
set(name, vec, 1);
}
public void set(String name, boolean[] boolvec, int ncoords) {
int[] vec = new int[boolvec.length];
for (int i=0; i<boolvec.length; i++) {
vec[i] = (boolvec[i])?1:0;
}
set(name, vec, ncoords);
}
/**
* @param mat matrix of values
*/