add setters for boolean uniforms contributed by AmnonOwed, fixes processing#1991.

codeanticode · codeanticode · commit bfba153ccd68 · 2013-10-24T23:58:45.000-04:00
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -5230,9 +5230,9 @@ protected void drawPixels(int x, int y, int w, int h) {
 
     try {
       if (0 < x || 0 < y || w < width || h < height) {
-        // The pixels to copy to the texture need to be consecutive, and they
-        // are not in the pixels array, so putting each row one after another
-        // in nativePixels.
+        // The pixels to be copied to the texture need to be consecutive, and
+        // they are not in the pixels array, so putting each row one after
+        // another in nativePixels.
         int offset0 = y * width + x;
         int offset1 = 0;
 
@@ -5324,6 +5324,17 @@ protected void setImpl(PImage sourceImage,
     setgetPixels = true;
     super.setImpl(sourceImage, sourceX, sourceY, sourceWidth, sourceHeight,
                   targetX, targetY);
+// do we need this?
+// see https://github.com/processing/processing/issues/2125
+//    if (sourceImage.format == RGB) {
+//      int targetOffset = targetY * width + targetX;
+//      for (int y = sourceY; y < sourceY + sourceHeight; y++) {
+//        for (int x = targetOffset; x < targetOffset + sourceWidth; x++) {
+//          pixels[x] |= 0xff000000;
+//        }
+//        targetOffset += width;
+//      }
+//    }
   }
 
 
diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java
@@ -449,24 +449,28 @@ public void set(String name, boolean x) {
 
 
   public void set(String name, boolean x, boolean y) {
-    setUniformImpl(name, UniformValue.INT2, new int[] { (x)?1:0, (y)?1:0 });
+    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 });
+    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 });
+    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);
   }
 
+
   /**
    * @param ncoords number of coordinates per element, max 4
    */
@@ -510,14 +514,15 @@ public void set(String name, float[] vec, int ncoords) {
     }
   }
 
+
   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++) {
+    for (int i = 0; i < boolvec.length; i++) {
       vec[i] = (boolvec[i])?1:0;
     }
     set(name, vec, ncoords);

Original file line number	Diff line number	Diff line change
`@@ -449,24 +449,28 @@ public void set(String name, boolean x) {`
`449`	`449`
`450`	`450`
`451`	`451`	`public void set(String name, boolean x, boolean y) {`
`452`		`- setUniformImpl(name, UniformValue.INT2, new int[] { (x)?1:0, (y)?1:0 });`
	`452`	`+ setUniformImpl(name, UniformValue.INT2,`
	`453`	`+ new int[] { (x)?1:0, (y)?1:0 });`
`453`	`454`	`}`
`454`	`455`
`455`	`456`
`456`	`457`	`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`	`+ setUniformImpl(name, UniformValue.INT3,`
	`459`	`+ new int[] { (x)?1:0, (y)?1:0, (z)?1:0 });`
`458`	`460`	`}`
`459`	`461`
`460`	`462`
`461`	`463`	`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 });`
	`464`	`+ setUniformImpl(name, UniformValue.INT4,`
	`465`	`+ new int[] { (x)?1:0, (y)?1:0, (z)?1:0, (w)?1:0 });`
`463`	`466`	`}`
`464`	`467`
`465`	`468`
`466`	`469`	`public void set(String name, int[] vec) {`
`467`	`470`	`set(name, vec, 1);`
`468`	`471`	`}`
`469`	`472`
	`473`	`+`
`470`	`474`	`/**`
`471`	`475`	`* @param ncoords number of coordinates per element, max 4`
`472`	`476`	`*/`
`@@ -510,14 +514,15 @@ public void set(String name, float[] vec, int ncoords) {`
`510`	`514`	`}`
`511`	`515`	`}`
`512`	`516`
	`517`	`+`
`513`	`518`	`public void set(String name, boolean[] vec) {`
`514`	`519`	`set(name, vec, 1);`
`515`	`520`	`}`
`516`	`521`
`517`	`522`
`518`	`523`	`public void set(String name, boolean[] boolvec, int ncoords) {`
`519`	`524`	`int[] vec = new int[boolvec.length];`
`520`		`- for (int i=0; i<boolvec.length; i++) {`
	`525`	`+ for (int i = 0; i < boolvec.length; i++) {`
`521`	`526`	`vec[i] = (boolvec[i])?1:0;`
`522`	`527`	`}`
`523`	`528`	`set(name, vec, ncoords);`