propane 3.4.2-java → 3.5.0-java

data/src/main/java/processing/opengl/PShader.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -18,7 +20,8 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
+
 package processing.opengl;
 
 import processing.core.*;
@@ -30,49 +33,48 @@ import java.nio.IntBuffer;
 import java.util.HashMap;
 
 /**
- * This class encapsulates a GLSL shader program, including a vertex and a
- * fragment shader. Based on the GLSLShader class from GLGraphics, which in turn
- * was originally based in the code by JohnG:
+ * This class encapsulates a GLSL shader program, including a vertex
+ * and a fragment shader. Based on the GLSLShader class from GLGraphics, which
+ * in turn was originally based in the code by JohnG:
  * http://processing.org/discourse/beta/num_1159494801.html
  *
  * @webref rendering:shaders
  */
 public class PShader implements PConstants {
-
-  static protected final int POINT = 0;
-  static protected final int LINE = 1;
-  static protected final int POLY = 2;
-  static protected final int COLOR = 3;
-  static protected final int LIGHT = 4;
-  static protected final int TEXTURE = 5;
+  static protected final int POINT    = 0;
+  static protected final int LINE     = 1;
+  static protected final int POLY     = 2;
+  static protected final int COLOR    = 3;
+  static protected final int LIGHT    = 4;
+  static protected final int TEXTURE  = 5;
   static protected final int TEXLIGHT = 6;
 
-  static protected String pointShaderAttrRegexp
-    = "attribute *vec2 *offset";
-  static protected String pointShaderInRegexp
-    = "in *vec2 *offset;";
-  static protected String lineShaderAttrRegexp
-    = "attribute *vec4 *direction";
-  static protected String lineShaderInRegexp
-    = "in *vec4 *direction";
-  static protected String pointShaderDefRegexp
-    = "#define *PROCESSING_POINT_SHADER";
-  static protected String lineShaderDefRegexp
-    = "#define *PROCESSING_LINE_SHADER";
-  static protected String colorShaderDefRegexp
-    = "#define *PROCESSING_COLOR_SHADER";
-  static protected String lightShaderDefRegexp
-    = "#define *PROCESSING_LIGHT_SHADER";
-  static protected String texShaderDefRegexp
-    = "#define *PROCESSING_TEXTURE_SHADER";
-  static protected String texlightShaderDefRegexp
-    = "#define *PROCESSING_TEXLIGHT_SHADER";
-  static protected String polyShaderDefRegexp
-    = "#define *PROCESSING_POLYGON_SHADER";
-  static protected String triShaderAttrRegexp
-    = "#define *PROCESSING_TRIANGLES_SHADER";
-  static protected String quadShaderAttrRegexp
-    = "#define *PROCESSING_QUADS_SHADER";
+  static protected String pointShaderAttrRegexp =
+    "attribute *vec2 *offset";
+  static protected String pointShaderInRegexp =
+    "in *vec2 *offset;";
+  static protected String lineShaderAttrRegexp =
+    "attribute *vec4 *direction";
+  static protected String lineShaderInRegexp =
+    "in *vec4 *direction";
+  static protected String pointShaderDefRegexp =
+    "#define *PROCESSING_POINT_SHADER";
+  static protected String lineShaderDefRegexp =
+    "#define *PROCESSING_LINE_SHADER";
+  static protected String colorShaderDefRegexp =
+    "#define *PROCESSING_COLOR_SHADER";
+  static protected String lightShaderDefRegexp =
+    "#define *PROCESSING_LIGHT_SHADER";
+  static protected String texShaderDefRegexp =
+    "#define *PROCESSING_TEXTURE_SHADER";
+  static protected String texlightShaderDefRegexp =
+    "#define *PROCESSING_TEXLIGHT_SHADER";
+  static protected String polyShaderDefRegexp =
+    "#define *PROCESSING_POLYGON_SHADER";
+  static protected String triShaderAttrRegexp =
+    "#define *PROCESSING_TRIANGLES_SHADER";
+  static protected String quadShaderAttrRegexp =
+    "#define *PROCESSING_QUADS_SHADER";
 
   protected PApplet parent;
   // The main renderer associated to the parent PApplet.
@@ -183,16 +185,19 @@ public class PShader implements PConstants {
     type = -1;
   }
 
+
   public PShader(PApplet parent) {
     this();
     this.parent = parent;
-    primaryPG = (PGraphicsOpenGL) parent.g;
+    primaryPG = (PGraphicsOpenGL)parent.g;
     pgl = primaryPG.pgl;
     context = pgl.createEmptyContext();
   }
 
+
   /**
-   * Creates a shader program using the specified vertex and fragment shaders.
+   * Creates a shader program using the specified vertex and fragment
+   * shaders.
    *
    * @param parent the parent program
    * @param vertFilename name of the vertex shader
@@ -200,7 +205,7 @@ public class PShader implements PConstants {
    */
   public PShader(PApplet parent, String vertFilename, String fragFilename) {
     this.parent = parent;
-    primaryPG = (PGraphicsOpenGL) parent.g;
+    primaryPG = (PGraphicsOpenGL)parent.g;
     pgl = primaryPG.pgl;
 
     this.vertexURL = null;
@@ -225,21 +230,21 @@ public class PShader implements PConstants {
       type = fragType;
     } else if (fragType == -1) {
       type = vertType;
-    } else if (fragType == vertType) {
+    } else if (fragType == vertType)  {
       type = vertType;
     } else {
       PGraphics.showWarning(PGraphicsOpenGL.INCONSISTENT_SHADER_TYPES);
     }
   }
 
+
   /**
-   * @param parent
    * @param vertURL network location of the vertex shader
    * @param fragURL network location of the fragment shader
    */
   public PShader(PApplet parent, URL vertURL, URL fragURL) {
     this.parent = parent;
-    primaryPG = (PGraphicsOpenGL) parent.g;
+    primaryPG = (PGraphicsOpenGL)parent.g;
     pgl = primaryPG.pgl;
 
     this.vertexURL = vertURL;
@@ -264,7 +269,7 @@ public class PShader implements PConstants {
       type = fragType;
     } else if (fragType == -1) {
       type = vertType;
-    } else if (fragType == vertType) {
+    } else if (fragType == vertType)  {
       type = vertType;
     } else {
       PGraphics.showWarning(PGraphicsOpenGL.INCONSISTENT_SHADER_TYPES);
@@ -273,7 +278,7 @@ public class PShader implements PConstants {
 
   public PShader(PApplet parent, String[] vertSource, String[] fragSource) {
     this.parent = parent;
-    primaryPG = (PGraphicsOpenGL) parent.g;
+    primaryPG = (PGraphicsOpenGL)parent.g;
     pgl = primaryPG.pgl;
 
     this.vertexURL = null;
@@ -298,32 +303,37 @@ public class PShader implements PConstants {
       type = fragType;
     } else if (fragType == -1) {
       type = vertType;
-    } else if (fragType == vertType) {
+    } else if (fragType == vertType)  {
       type = vertType;
     } else {
       PGraphics.showWarning(PGraphicsOpenGL.INCONSISTENT_SHADER_TYPES);
     }
   }
 
+
   public void setVertexShader(String vertFilename) {
     this.vertexFilename = vertFilename;
     vertexShaderSource = pgl.loadVertexShader(vertFilename);
   }
 
+
   public void setVertexShader(URL vertURL) {
     this.vertexURL = vertURL;
     vertexShaderSource = pgl.loadVertexShader(vertURL);
   }
 
+
   public void setVertexShader(String[] vertSource) {
     vertexShaderSource = vertSource;
   }
 
+
   public void setFragmentShader(String fragFilename) {
     this.fragmentFilename = fragFilename;
     fragmentShaderSource = pgl.loadFragmentShader(fragFilename);
   }
 
+
   public void setFragmentShader(URL fragURL) {
     this.fragmentURL = fragURL;
     fragmentShaderSource = pgl.loadFragmentShader(fragURL);
@@ -333,6 +343,7 @@ public class PShader implements PConstants {
     fragmentShaderSource = fragSource;
   }
 
+
   /**
    * Initializes (if needed) and binds the shader program.
    */
@@ -345,18 +356,15 @@ public class PShader implements PConstants {
       bindTextures();
     }
 
-    if (hasType()) {
-      bindTyped();
-    }
+    if (hasType()) bindTyped();
   }
 
+
   /**
    * Unbinds the shader program.
    */
   public void unbind() {
-    if (hasType()) {
-      unbindTyped();
-    }
+    if (hasType()) unbindTyped();
 
     if (bound) {
       unbindTextures();
@@ -365,10 +373,10 @@ public class PShader implements PConstants {
     }
   }
 
+
   /**
    * Returns true if the shader is bound, false otherwise.
-   *
-   * @return
+   * @return 
    */
   public boolean bound() {
     return bound;
@@ -381,94 +389,88 @@ public class PShader implements PConstants {
    * @param x first component of the variable to modify
    */
   public void set(String name, int x) {
-    setUniformImpl(name, UniformValue.INT1, new int[]{x});
+    setUniformImpl(name, UniformValue.INT1, new int[] { x });
   }
 
   /**
-   * @param name
-   * @param x
-   * @param y second component of the variable to modify. The variable has to be
-   * declared with an array/vector type in the shader (i.e.: int[2], vec2)
+   * @param y second component of the variable to modify. The variable has to be declared with an array/vector type in the shader (i.e.: int[2], vec2)
    */
   public void set(String name, int x, int y) {
-    setUniformImpl(name, UniformValue.INT2, new int[]{x, y});
+    setUniformImpl(name, UniformValue.INT2, new int[] { x, y });
   }
 
   /**
-   * @param name
-   * @param x
-   * @param y
-   * @param z third component of the variable to modify. The variable has to be
-   * declared with an array/vector type in the shader (i.e.: int[3], vec3)
+   * @param z third component of the variable to modify. The variable has to be declared with an array/vector type in the shader (i.e.: int[3], vec3)
    */
   public void set(String name, int x, int y, int z) {
-    setUniformImpl(name, UniformValue.INT3, new int[]{x, y, z});
+    setUniformImpl(name, UniformValue.INT3, new int[] { x, y, z });
   }
 
   /**
-   * @param name
-   * @param x
-   * @param y
-   * @param z
-   * @param w fourth component of the variable to modify. The variable has to be
-   * declared with an array/vector type in the shader (i.e.: int[4], vec4)
+   * @param w fourth component of the variable to modify. The variable has to be declared with an array/vector type in the shader (i.e.: int[4], vec4)
    */
   public void set(String name, int x, int y, int z, int w) {
-    setUniformImpl(name, UniformValue.INT4, new int[]{x, y, z, w});
+    setUniformImpl(name, UniformValue.INT4, new int[] { x, y, z, w });
   }
 
+
   public void set(String name, float x) {
-    setUniformImpl(name, UniformValue.FLOAT1, new float[]{x});
+    setUniformImpl(name, UniformValue.FLOAT1, new float[] { x });
   }
 
+
   public void set(String name, float x, float y) {
-    setUniformImpl(name, UniformValue.FLOAT2, new float[]{x, y});
+    setUniformImpl(name, UniformValue.FLOAT2, new float[] { x, y });
   }
 
+
   public void set(String name, float x, float y, float z) {
-    setUniformImpl(name, UniformValue.FLOAT3, new float[]{x, y, z});
+    setUniformImpl(name, UniformValue.FLOAT3, new float[] { x, y, z });
   }
 
+
   public void set(String name, float x, float y, float z, float w) {
-    setUniformImpl(name, UniformValue.FLOAT4, new float[]{x, y, z, w});
+    setUniformImpl(name, UniformValue.FLOAT4, new float[] { x, y, z, w });
   }
 
   /**
-   * @param name
-   * @param vec modifies all the components of an array/vector uniform variable.
-   * PVector can only be used if the type of the variable is vec3.
+   * @param vec modifies all the components of an array/vector uniform variable. PVector can only be used if the type of the variable is vec3.
    */
   public void set(String name, PVector vec) {
     setUniformImpl(name, UniformValue.FLOAT3,
-      new float[]{vec.x, vec.y, vec.z});
+                   new float[] { vec.x, vec.y, vec.z });
   }
 
+
   public void set(String name, boolean x) {
-    setUniformImpl(name, UniformValue.INT1, new int[]{(x) ? 1 : 0});
+    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});
+                   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});
+                   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});
+                   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 name
-   * @param vec
    * @param ncoords number of coordinates per element, max 4
    */
   public void set(String name, int[] vec, int ncoords) {
@@ -481,17 +483,19 @@ public class PShader implements PConstants {
     } else if (ncoords == 4) {
       setUniformImpl(name, UniformValue.INT4VEC, vec);
     } else if (4 < ncoords) {
-      PGraphics.showWarning("Only up to 4 coordinates per element are "
-        + "supported.");
+      PGraphics.showWarning("Only up to 4 coordinates per element are " +
+                            "supported.");
     } else {
       PGraphics.showWarning("Wrong number of coordinates: it is negative!");
     }
   }
 
+
   public void set(String name, float[] vec) {
     set(name, vec, 1);
   }
 
+
   public void set(String name, float[] vec, int ncoords) {
     if (ncoords == 1) {
       setUniformImpl(name, UniformValue.FLOAT1VEC, vec);
@@ -502,84 +506,86 @@ public class PShader implements PConstants {
     } else if (ncoords == 4) {
       setUniformImpl(name, UniformValue.FLOAT4VEC, vec);
     } else if (4 < ncoords) {
-      PGraphics.showWarning("Only up to 4 coordinates per element are "
-        + "supported.");
+      PGraphics.showWarning("Only up to 4 coordinates per element are " +
+                            "supported.");
     } else {
       PGraphics.showWarning("Wrong number of coordinates: it is negative!");
     }
   }
 
+
   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;
+      vec[i] = (boolvec[i])?1:0;
     }
     set(name, vec, ncoords);
   }
 
+
   /**
-   * @param name
    * @param mat matrix of values
    */
   public void set(String name, PMatrix2D mat) {
-    float[] matv = {mat.m00, mat.m01,
-      mat.m10, mat.m11};
+    float[] matv = { mat.m00, mat.m01,
+                     mat.m10, mat.m11 };
     setUniformImpl(name, UniformValue.MAT2, matv);
   }
 
+
   public void set(String name, PMatrix3D mat) {
     set(name, mat, false);
   }
 
   /**
-   * @param name
-   * @param mat
    * @param use3x3 enforces the matrix is 3 x 3
    */
   public void set(String name, PMatrix3D mat, boolean use3x3) {
     if (use3x3) {
-      float[] matv = {mat.m00, mat.m01, mat.m02,
-        mat.m10, mat.m11, mat.m12,
-        mat.m20, mat.m21, mat.m22};
+      float[] matv = { mat.m00, mat.m01, mat.m02,
+                       mat.m10, mat.m11, mat.m12,
+                       mat.m20, mat.m21, mat.m22 };
       setUniformImpl(name, UniformValue.MAT3, matv);
     } else {
-      float[] matv = {mat.m00, mat.m01, mat.m02, mat.m03,
-        mat.m10, mat.m11, mat.m12, mat.m13,
-        mat.m20, mat.m21, mat.m22, mat.m23,
-        mat.m30, mat.m31, mat.m32, mat.m33};
+      float[] matv = { mat.m00, mat.m01, mat.m02, mat.m03,
+                       mat.m10, mat.m11, mat.m12, mat.m13,
+                       mat.m20, mat.m21, mat.m22, mat.m23,
+                       mat.m30, mat.m31, mat.m32, mat.m33 };
       setUniformImpl(name, UniformValue.MAT4, matv);
     }
   }
 
   /**
-   * @param name
-   * @param tex sets the sampler uniform variable to read from this image
-   * texture
+   * @param tex sets the sampler uniform variable to read from this image texture
    */
   public void set(String name, PImage tex) {
     setUniformImpl(name, UniformValue.SAMPLER2D, tex);
   }
 
+
   /**
    * Extra initialization method that can be used by subclasses, called after
-   * compiling and attaching the vertex and fragment shaders, and before linking
-   * the shader program.
+   * compiling and attaching the vertex and fragment shaders, and before
+   * linking the shader program.
    *
    */
   protected void setup() {
   }
 
+
   protected void draw(int idxId, int count, int offset) {
     pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, idxId);
     pgl.drawElements(PGL.TRIANGLES, count, PGL.INDEX_TYPE,
-      offset * PGL.SIZEOF_INDEX);
+                     offset * PGL.SIZEOF_INDEX);
     pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
   }
 
+
   /**
    * Returns the ID location of the attribute parameter given its name.
    *
@@ -591,6 +597,7 @@ public class PShader implements PConstants {
     return pgl.getAttribLocation(glProgram, name);
   }
 
+
   /**
    * Returns the ID location of the uniform parameter given its name.
    *
@@ -602,38 +609,44 @@ public class PShader implements PConstants {
     return pgl.getUniformLocation(glProgram, name);
   }
 
+
   protected void setAttributeVBO(int loc, int vboId, int size, int type,
-    boolean normalized, int stride, int offset) {
+                                 boolean normalized, int stride, int offset) {
     if (-1 < loc) {
       pgl.bindBuffer(PGL.ARRAY_BUFFER, vboId);
       pgl.vertexAttribPointer(loc, size, type, normalized, stride, offset);
     }
   }
 
+
   protected void setUniformValue(int loc, int x) {
     if (-1 < loc) {
       pgl.uniform1i(loc, x);
     }
   }
 
+
   protected void setUniformValue(int loc, int x, int y) {
     if (-1 < loc) {
       pgl.uniform2i(loc, x, y);
     }
   }
 
+
   protected void setUniformValue(int loc, int x, int y, int z) {
     if (-1 < loc) {
       pgl.uniform3i(loc, x, y, z);
     }
   }
 
+
   protected void setUniformValue(int loc, int x, int y, int z, int w) {
     if (-1 < loc) {
       pgl.uniform4i(loc, x, y, z, w);
     }
   }
 
+
   protected void setUniformValue(int loc, float x) {
     if (-1 < loc) {
       pgl.uniform1f(loc, x);
@@ -646,20 +659,23 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void setUniformValue(int loc, float x, float y, float z) {
     if (-1 < loc) {
       pgl.uniform3f(loc, x, y, z);
     }
   }
 
+
   protected void setUniformValue(int loc, float x, float y, float z, float w) {
     if (-1 < loc) {
       pgl.uniform4f(loc, x, y, z, w);
     }
   }
 
+
   protected void setUniformVector(int loc, int[] vec, int ncoords,
-    int length) {
+                                  int length) {
     if (-1 < loc) {
       updateIntBuffer(vec);
       switch (ncoords) {
@@ -681,8 +697,9 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void setUniformVector(int loc, float[] vec, int ncoords,
-    int length) {
+                                  int length) {
     if (-1 < loc) {
       updateFloatBuffer(vec);
       switch (ncoords) {
@@ -704,6 +721,7 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void setUniformMatrix(int loc, float[] mat) {
     if (-1 < loc) {
       updateFloatBuffer(mat);
@@ -723,6 +741,7 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void setUniformTex(int loc, Texture tex) {
     if (texUnits != null) {
       Integer unit = texUnits.get(loc);
@@ -735,6 +754,7 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void setUniformImpl(String name, int type, Object value) {
     if (uniformValues == null) {
       uniformValues = new HashMap<>();
@@ -742,176 +762,120 @@ public class PShader implements PConstants {
     uniformValues.put(name, new UniformValue(type, value));
   }
 
+
   protected void consumeUniforms() {
     if (uniformValues != null && 0 < uniformValues.size()) {
       int unit = 0;
-      for (String name : uniformValues.keySet()) {
+      for (String name: uniformValues.keySet()) {
         int loc = getUniformLoc(name);
         if (loc == -1) {
-          PGraphics.showWarning("The shader doesn't have a uniform called \""
-            + name + "\" OR the uniform was removed during "
-            + "compilation because it was unused.");
+          PGraphics.showWarning("The shader doesn't have a uniform called \"" +
+                                name + "\" OR the uniform was removed during " +
+                                "compilation because it was unused.");
           continue;
         }
         UniformValue val = uniformValues.get(name);
-        switch (val.type) {
-          case UniformValue.INT1:
-            {
-              int[] v = ((int[]) val.value);
-              pgl.uniform1i(loc, v[0]);
-              break;
-            }
-          case UniformValue.INT2:
-            {
-              int[] v = ((int[]) val.value);
-              pgl.uniform2i(loc, v[0], v[1]);
-              break;
-            }
-          case UniformValue.INT3:
-            {
-              int[] v = ((int[]) val.value);
-              pgl.uniform3i(loc, v[0], v[1], v[2]);
-              break;
-            }
-          case UniformValue.INT4:
-            {
-              int[] v = ((int[]) val.value);
-              pgl.uniform4i(loc, v[0], v[1], v[2], v[3]);
-              break;
-            }
-          case UniformValue.FLOAT1:
-            {
-              float[] v = ((float[]) val.value);
-              pgl.uniform1f(loc, v[0]);
-              break;
-            }
-          case UniformValue.FLOAT2:
-            {
-              float[] v = ((float[]) val.value);
-              pgl.uniform2f(loc, v[0], v[1]);
-              break;
-            }
-          case UniformValue.FLOAT3:
-            {
-              float[] v = ((float[]) val.value);
-              pgl.uniform3f(loc, v[0], v[1], v[2]);
-              break;
-            }
-          case UniformValue.FLOAT4:
-            {
-              float[] v = ((float[]) val.value);
-              pgl.uniform4f(loc, v[0], v[1], v[2], v[3]);
-              break;
-            }
-          case UniformValue.INT1VEC:
-            {
-              int[] v = ((int[]) val.value);
-              updateIntBuffer(v);
-              pgl.uniform1iv(loc, v.length, intBuffer);
-              break;
-            }
-          case UniformValue.INT2VEC:
-            {
-              int[] v = ((int[]) val.value);
-              updateIntBuffer(v);
-              pgl.uniform2iv(loc, v.length / 2, intBuffer);
-              break;
-            }
-          case UniformValue.INT3VEC:
-            {
-              int[] v = ((int[]) val.value);
-              updateIntBuffer(v);
-              pgl.uniform3iv(loc, v.length / 3, intBuffer);
-              break;
-            }
-          case UniformValue.INT4VEC:
-            {
-              int[] v = ((int[]) val.value);
-              updateIntBuffer(v);
-              pgl.uniform4iv(loc, v.length / 4, intBuffer);
-              break;
-            }
-          case UniformValue.FLOAT1VEC:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniform1fv(loc, v.length, floatBuffer);
-              break;
-            }
-          case UniformValue.FLOAT2VEC:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniform2fv(loc, v.length / 2, floatBuffer);
-              break;
-            }
-          case UniformValue.FLOAT3VEC:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniform3fv(loc, v.length / 3, floatBuffer);
-              break;
-            }
-          case UniformValue.FLOAT4VEC:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniform4fv(loc, v.length / 4, floatBuffer);
-              break;
-            }
-          case UniformValue.MAT2:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniformMatrix2fv(loc, 1, false, floatBuffer);
-              break;
-            }
-          case UniformValue.MAT3:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniformMatrix3fv(loc, 1, false, floatBuffer);
-              break;
-            }
-          case UniformValue.MAT4:
-            {
-              float[] v = ((float[]) val.value);
-              updateFloatBuffer(v);
-              pgl.uniformMatrix4fv(loc, 1, false, floatBuffer);
-              break;
-            }
-          case UniformValue.SAMPLER2D:
-            PImage img = (PImage) val.value;
-            Texture tex = currentPG.getTexture(img);
-            if (textures == null) {
-              textures = new HashMap<>();
-            } textures.put(loc, tex);
-            if (texUnits == null) {
-              texUnits = new HashMap<>();
-            } if (texUnits.containsKey(loc)) {
-              unit = texUnits.get(loc);
-              pgl.uniform1i(loc, unit);
-            } else {
-              texUnits.put(loc, unit);
-              pgl.uniform1i(loc, unit);
-            } unit++;
-            break;
-          default:
-            break;
+        if (val.type == UniformValue.INT1) {
+          int[] v = ((int[])val.value);
+          pgl.uniform1i(loc, v[0]);
+        } else if (val.type == UniformValue.INT2) {
+          int[] v = ((int[])val.value);
+          pgl.uniform2i(loc, v[0], v[1]);
+        } else if (val.type == UniformValue.INT3) {
+          int[] v = ((int[])val.value);
+          pgl.uniform3i(loc, v[0], v[1], v[2]);
+        } else if (val.type == UniformValue.INT4) {
+          int[] v = ((int[])val.value);
+          pgl.uniform4i(loc, v[0], v[1], v[2], v[3]);
+        } else if (val.type == UniformValue.FLOAT1) {
+          float[] v = ((float[])val.value);
+          pgl.uniform1f(loc, v[0]);
+        } else if (val.type == UniformValue.FLOAT2) {
+          float[] v = ((float[])val.value);
+          pgl.uniform2f(loc, v[0], v[1]);
+        } else if (val.type == UniformValue.FLOAT3) {
+          float[] v = ((float[])val.value);
+          pgl.uniform3f(loc, v[0], v[1], v[2]);
+        } else if (val.type == UniformValue.FLOAT4) {
+          float[] v = ((float[])val.value);
+          pgl.uniform4f(loc, v[0], v[1], v[2], v[3]);
+        } else if (val.type == UniformValue.INT1VEC) {
+          int[] v = ((int[])val.value);
+          updateIntBuffer(v);
+          pgl.uniform1iv(loc, v.length, intBuffer);
+        } else if (val.type == UniformValue.INT2VEC) {
+          int[] v = ((int[])val.value);
+          updateIntBuffer(v);
+          pgl.uniform2iv(loc, v.length / 2, intBuffer);
+        } else if (val.type == UniformValue.INT3VEC) {
+          int[] v = ((int[])val.value);
+          updateIntBuffer(v);
+          pgl.uniform3iv(loc, v.length / 3, intBuffer);
+        } else if (val.type == UniformValue.INT4VEC) {
+          int[] v = ((int[])val.value);
+          updateIntBuffer(v);
+          pgl.uniform4iv(loc, v.length / 4, intBuffer);
+        } else if (val.type == UniformValue.FLOAT1VEC) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniform1fv(loc, v.length, floatBuffer);
+        } else if (val.type == UniformValue.FLOAT2VEC) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniform2fv(loc, v.length / 2, floatBuffer);
+        } else if (val.type == UniformValue.FLOAT3VEC) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniform3fv(loc, v.length / 3, floatBuffer);
+        } else if (val.type == UniformValue.FLOAT4VEC) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniform4fv(loc, v.length / 4, floatBuffer);
+        } else if (val.type == UniformValue.MAT2) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniformMatrix2fv(loc, 1, false, floatBuffer);
+        } else if (val.type == UniformValue.MAT3) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniformMatrix3fv(loc, 1, false, floatBuffer);
+        } else if (val.type == UniformValue.MAT4) {
+          float[] v = ((float[])val.value);
+          updateFloatBuffer(v);
+          pgl.uniformMatrix4fv(loc, 1, false, floatBuffer);
+        } else if (val.type == UniformValue.SAMPLER2D) {
+          PImage img = (PImage)val.value;
+          Texture tex = currentPG.getTexture(img);
+
+          if (textures == null) textures = new HashMap<>();
+          textures.put(loc, tex);
+
+          if (texUnits == null) texUnits = new HashMap<>();
+          if (texUnits.containsKey(loc)) {
+            unit = texUnits.get(loc);
+            pgl.uniform1i(loc, unit);
+          } else {
+            texUnits.put(loc, unit);
+            pgl.uniform1i(loc, unit);
+          }
+          unit++;
         }
       }
       uniformValues.clear();
     }
   }
 
+
   protected void updateIntBuffer(int[] vec) {
     intBuffer = PGL.updateIntBuffer(intBuffer, vec, false);
   }
 
+
   protected void updateFloatBuffer(float[] vec) {
     floatBuffer = PGL.updateFloatBuffer(floatBuffer, vec, false);
   }
 
+
   protected void bindTextures() {
     if (textures != null && texUnits != null) {
       textures.keySet().forEach((loc) -> {
@@ -927,6 +891,7 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void unbindTextures() {
     if (textures != null && texUnits != null) {
       textures.keySet().forEach((loc) -> {
@@ -943,6 +908,7 @@ public class PShader implements PConstants {
     }
   }
 
+
   public void init() {
     if (glProgram == 0 || contextIsOutdated()) {
       create();
@@ -959,11 +925,13 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void create() {
     context = pgl.getCurrentContext();
     glres = new GLResourceShader(this);
   }
 
+
   protected boolean compile() {
     boolean vertRes = true;
     if (hasVertexShader()) {
@@ -982,23 +950,25 @@ public class PShader implements PConstants {
     return vertRes && fragRes;
   }
 
+
   protected void validate() {
     pgl.getProgramiv(glProgram, PGL.LINK_STATUS, intBuffer);
     boolean linked = intBuffer.get(0) != 0;
     if (!linked) {
-      PGraphics.showException("Cannot link shader program:\n"
-        + pgl.getProgramInfoLog(glProgram));
+      PGraphics.showException("Cannot link shader program:\n" +
+                              pgl.getProgramInfoLog(glProgram));
     }
 
     pgl.validateProgram(glProgram);
     pgl.getProgramiv(glProgram, PGL.VALIDATE_STATUS, intBuffer);
     boolean validated = intBuffer.get(0) != 0;
     if (!validated) {
-      PGraphics.showException("Cannot validate shader program:\n"
-        + pgl.getProgramInfoLog(glProgram));
+      PGraphics.showException("Cannot validate shader program:\n" +
+                              pgl.getProgramInfoLog(glProgram));
     }
   }
 
+
   protected boolean contextIsOutdated() {
     boolean outdated = !pgl.contextIsCurrent(context);
     if (outdated) {
@@ -1007,16 +977,20 @@ public class PShader implements PConstants {
     return outdated;
   }
 
+
+
   protected boolean hasVertexShader() {
     return vertexShaderSource != null && 0 < vertexShaderSource.length;
   }
 
+
   protected boolean hasFragmentShader() {
     return fragmentShaderSource != null && 0 < fragmentShaderSource.length;
   }
 
+
   /**
-   * @return 
+   * @param shaderSource a string containing the shader's code
    */
   protected boolean compileVertexShader() {
     pgl.shaderSource(glVertex, PApplet.join(vertexShaderSource, "\n"));
@@ -1025,14 +999,15 @@ public class PShader implements PConstants {
     pgl.getShaderiv(glVertex, PGL.COMPILE_STATUS, intBuffer);
     boolean compiled = intBuffer.get(0) != 0;
     if (!compiled) {
-      PGraphics.showException("Cannot compile vertex shader:\n"
-        + pgl.getShaderInfoLog(glVertex));
+      PGraphics.showException("Cannot compile vertex shader:\n" +
+                              pgl.getShaderInfoLog(glVertex));
       return false;
     } else {
       return true;
     }
   }
 
+
   /**
    * @return 
    */
@@ -1043,14 +1018,15 @@ public class PShader implements PConstants {
     pgl.getShaderiv(glFragment, PGL.COMPILE_STATUS, intBuffer);
     boolean compiled = intBuffer.get(0) != 0;
     if (!compiled) {
-      PGraphics.showException("Cannot compile fragment shader:\n"
-        + pgl.getShaderInfoLog(glFragment));
+      PGraphics.showException("Cannot compile fragment shader:\n" +
+                              pgl.getShaderInfoLog(glFragment));
       return false;
     } else {
       return true;
     }
   }
 
+
   protected void dispose() {
     if (glres != null) {
       glres.dispose();
@@ -1061,71 +1037,78 @@ public class PShader implements PConstants {
     }
   }
 
+
   static protected int getShaderType(String[] source, int defaultType) {
     for (String source1 : source) {
       String line = source1.trim();
-      if (PApplet.match(line, colorShaderDefRegexp) != null) {
+      if (PApplet.match(line, colorShaderDefRegexp) != null)
         return PShader.COLOR;
-      } else if (PApplet.match(line, lightShaderDefRegexp) != null) {
+      else if (PApplet.match(line, lightShaderDefRegexp) != null)
         return PShader.LIGHT;
-      } else if (PApplet.match(line, texShaderDefRegexp) != null) {
+      else if (PApplet.match(line, texShaderDefRegexp) != null)
         return PShader.TEXTURE;
-      } else if (PApplet.match(line, texlightShaderDefRegexp) != null) {
+      else if (PApplet.match(line, texlightShaderDefRegexp) != null)
         return PShader.TEXLIGHT;
-      } else if (PApplet.match(line, polyShaderDefRegexp) != null) {
+      else if (PApplet.match(line, polyShaderDefRegexp) != null)
         return PShader.POLY;
-      } else if (PApplet.match(line, triShaderAttrRegexp) != null) {
+      else if (PApplet.match(line, triShaderAttrRegexp) != null)
         return PShader.POLY;
-      } else if (PApplet.match(line, quadShaderAttrRegexp) != null) {
+      else if (PApplet.match(line, quadShaderAttrRegexp) != null)
         return PShader.POLY;
-      } else if (PApplet.match(line, pointShaderDefRegexp) != null) {
+      else if (PApplet.match(line, pointShaderDefRegexp) != null)
         return PShader.POINT;
-      } else if (PApplet.match(line, lineShaderDefRegexp) != null) {
+      else if (PApplet.match(line, lineShaderDefRegexp) != null)
         return PShader.LINE;
-      } else if (PApplet.match(line, pointShaderAttrRegexp) != null) {
+      else if (PApplet.match(line, pointShaderAttrRegexp) != null)
         return PShader.POINT;
-      } else if (PApplet.match(line, pointShaderInRegexp) != null) {
+      else if (PApplet.match(line, pointShaderInRegexp) != null)
         return PShader.POINT;
-      } else if (PApplet.match(line, lineShaderAttrRegexp) != null) {
+      else if (PApplet.match(line, lineShaderAttrRegexp) != null)
         return PShader.LINE;
-      } else if (PApplet.match(line, lineShaderInRegexp) != null) {
+      else if (PApplet.match(line, lineShaderInRegexp) != null)
         return PShader.LINE;
-      }
     }
     return defaultType;
   }
 
+
   // ***************************************************************************
   //
   // Processing specific
+
+
   protected int getType() {
     return type;
   }
 
+
   protected void setType(int type) {
     this.type = type;
   }
 
+
   protected boolean hasType() {
     return POINT <= type && type <= TEXLIGHT;
   }
 
+
   protected boolean isPointShader() {
     return type == POINT;
   }
 
+
   protected boolean isLineShader() {
     return type == LINE;
   }
 
+
   protected boolean isPolyShader() {
     return POLY <= type && type <= TEXLIGHT;
   }
 
+
   protected boolean checkPolyType(int type) {
-    if (getType() == PShader.POLY) {
-      return true;
-    }
+    if (getType() == PShader.POLY) return true;
 
     if (getType() != type) {
       switch (type) {
@@ -1150,23 +1133,22 @@ public class PShader implements PConstants {
     return true;
   }
 
+
   protected int getLastTexUnit() {
     return texUnits == null ? -1 : texUnits.size() - 1;
   }
 
+
   protected void setRenderer(PGraphicsOpenGL pg) {
     this.currentPG = pg;
   }
 
+
   protected void loadAttributes() {
-    if (loadedAttributes) {
-      return;
-    }
+    if (loadedAttributes) return;
 
     vertexLoc = getAttributeLoc("vertex");
-    if (vertexLoc == -1) {
-      vertexLoc = getAttributeLoc("position");
-    }
+    if (vertexLoc == -1) vertexLoc = getAttributeLoc("position");
 
     colorLoc = getAttributeLoc("color");
     texCoordLoc = getAttributeLoc("texCoord");
@@ -1187,24 +1169,20 @@ public class PShader implements PConstants {
     loadedAttributes = true;
   }
 
+
   protected void loadUniforms() {
-    if (loadedUniforms) {
-      return;
-    }
+    if (loadedUniforms) return;
     transformMatLoc = getUniformLoc("transform");
-    if (transformMatLoc == -1) {
+    if (transformMatLoc == -1)
       transformMatLoc = getUniformLoc("transformMatrix");
-    }
 
     modelviewMatLoc = getUniformLoc("modelview");
-    if (modelviewMatLoc == -1) {
+    if (modelviewMatLoc == -1)
       modelviewMatLoc = getUniformLoc("modelviewMatrix");
-    }
 
     projectionMatLoc = getUniformLoc("projection");
-    if (projectionMatLoc == -1) {
+    if (projectionMatLoc == -1)
       projectionMatLoc = getUniformLoc("projectionMatrix");
-    }
 
     viewportLoc = getUniformLoc("viewport");
     resolutionLoc = getUniformLoc("resolution");
@@ -1234,6 +1212,7 @@ public class PShader implements PConstants {
     loadedUniforms = true;
   }
 
+
   protected void setCommonUniforms() {
     if (-1 < transformMatLoc) {
       currentPG.updateGLProjmodelview();
@@ -1274,6 +1253,7 @@ public class PShader implements PConstants {
     }
   }
 
+
   protected void bindTyped() {
     if (currentPG == null) {
       setRenderer(primaryPG.getCurrentPG());
@@ -1282,36 +1262,20 @@ public class PShader implements PConstants {
     }
     setCommonUniforms();
 
-    if (-1 < vertexLoc) {
-      pgl.enableVertexAttribArray(vertexLoc);
-    }
-    if (-1 < colorLoc) {
-      pgl.enableVertexAttribArray(colorLoc);
-    }
-    if (-1 < texCoordLoc) {
-      pgl.enableVertexAttribArray(texCoordLoc);
-    }
-    if (-1 < normalLoc) {
-      pgl.enableVertexAttribArray(normalLoc);
-    }
+    if (-1 < vertexLoc) pgl.enableVertexAttribArray(vertexLoc);
+    if (-1 < colorLoc) pgl.enableVertexAttribArray(colorLoc);
+    if (-1 < texCoordLoc) pgl.enableVertexAttribArray(texCoordLoc);
+    if (-1 < normalLoc) pgl.enableVertexAttribArray(normalLoc);
 
     if (-1 < normalMatLoc) {
       currentPG.updateGLNormal();
       setUniformMatrix(normalMatLoc, currentPG.glNormal);
     }
 
-    if (-1 < ambientLoc) {
-      pgl.enableVertexAttribArray(ambientLoc);
-    }
-    if (-1 < specularLoc) {
-      pgl.enableVertexAttribArray(specularLoc);
-    }
-    if (-1 < emissiveLoc) {
-      pgl.enableVertexAttribArray(emissiveLoc);
-    }
-    if (-1 < shininessLoc) {
-      pgl.enableVertexAttribArray(shininessLoc);
-    }
+    if (-1 < ambientLoc) pgl.enableVertexAttribArray(ambientLoc);
+    if (-1 < specularLoc) pgl.enableVertexAttribArray(specularLoc);
+    if (-1 < emissiveLoc) pgl.enableVertexAttribArray(emissiveLoc);
+    if (-1 < shininessLoc) pgl.enableVertexAttribArray(shininessLoc);
 
     int count = currentPG.lightCount;
     setUniformValue(lightCountLoc, count);
@@ -1322,21 +1286,17 @@ public class PShader implements PConstants {
       setUniformVector(lightDiffuseLoc, currentPG.lightDiffuse, 3, count);
       setUniformVector(lightSpecularLoc, currentPG.lightSpecular, 3, count);
       setUniformVector(lightFalloffLoc, currentPG.lightFalloffCoefficients,
-        3, count);
+                       3, count);
       setUniformVector(lightSpotLoc, currentPG.lightSpotParameters, 2, count);
     }
 
-    if (-1 < directionLoc) {
-      pgl.enableVertexAttribArray(directionLoc);
-    }
+    if (-1 < directionLoc) pgl.enableVertexAttribArray(directionLoc);
 
-    if (-1 < offsetLoc) {
-      pgl.enableVertexAttribArray(offsetLoc);
-    }
+    if (-1 < offsetLoc) pgl.enableVertexAttribArray(offsetLoc);
 
     if (-1 < perspectiveLoc) {
-      if (currentPG.getHint(ENABLE_STROKE_PERSPECTIVE)
-        && currentPG.nonOrthoProjection()) {
+      if (currentPG.getHint(ENABLE_STROKE_PERSPECTIVE) &&
+          currentPG.nonOrthoProjection()) {
         setUniformValue(perspectiveLoc, 1);
       } else {
         setUniformValue(perspectiveLoc, 0);
@@ -1358,13 +1318,9 @@ public class PShader implements PConstants {
   }
 
   protected void unbindTyped() {
-    if (-1 < offsetLoc) {
-      pgl.disableVertexAttribArray(offsetLoc);
-    }
+    if (-1 < offsetLoc) pgl.disableVertexAttribArray(offsetLoc);
 
-    if (-1 < directionLoc) {
-      pgl.disableVertexAttribArray(directionLoc);
-    }
+    if (-1 < directionLoc) pgl.disableVertexAttribArray(directionLoc);
 
     if (-1 < textureLoc && texture != null) {
       pgl.activeTexture(PGL.TEXTURE0 + texUnit);
@@ -1373,31 +1329,15 @@ public class PShader implements PConstants {
       texture = null;
     }
 
-    if (-1 < ambientLoc) {
-      pgl.disableVertexAttribArray(ambientLoc);
-    }
-    if (-1 < specularLoc) {
-      pgl.disableVertexAttribArray(specularLoc);
-    }
-    if (-1 < emissiveLoc) {
-      pgl.disableVertexAttribArray(emissiveLoc);
-    }
-    if (-1 < shininessLoc) {
-      pgl.disableVertexAttribArray(shininessLoc);
-    }
+    if (-1 < ambientLoc) pgl.disableVertexAttribArray(ambientLoc);
+    if (-1 < specularLoc) pgl.disableVertexAttribArray(specularLoc);
+    if (-1 < emissiveLoc) pgl.disableVertexAttribArray(emissiveLoc);
+    if (-1 < shininessLoc) pgl.disableVertexAttribArray(shininessLoc);
 
-    if (-1 < vertexLoc) {
-      pgl.disableVertexAttribArray(vertexLoc);
-    }
-    if (-1 < colorLoc) {
-      pgl.disableVertexAttribArray(colorLoc);
-    }
-    if (-1 < texCoordLoc) {
-      pgl.disableVertexAttribArray(texCoordLoc);
-    }
-    if (-1 < normalLoc) {
-      pgl.disableVertexAttribArray(normalLoc);
-    }
+    if (-1 < vertexLoc) pgl.disableVertexAttribArray(vertexLoc);
+    if (-1 < colorLoc) pgl.disableVertexAttribArray(colorLoc);
+    if (-1 < texCoordLoc) pgl.disableVertexAttribArray(texCoordLoc);
+    if (-1 < normalLoc) pgl.disableVertexAttribArray(normalLoc);
 
     if (-1 < ppixelsLoc) {
       pgl.enableFBOLayer();
@@ -1414,29 +1354,29 @@ public class PShader implements PConstants {
 
     float scaleu = 1;
     float scalev = 1;
-    float dispu = 0;
-    float dispv = 0;
+    float dispu  = 0;
+    float dispv  = 0;
 
     if (tex != null) {
       if (tex.invertedX()) {
         scaleu = -1;
-        dispu = 1;
+        dispu  = 1;
       }
 
       if (tex.invertedY()) {
         scalev = -1;
-        dispv = 1;
+        dispv  = 1;
       }
 
       scaleu *= tex.maxTexcoordU();
-      dispu *= tex.maxTexcoordU();
+      dispu  *= tex.maxTexcoordU();
       scalev *= tex.maxTexcoordV();
-      dispv *= tex.maxTexcoordV();
+      dispv  *= tex.maxTexcoordV();
 
       setUniformValue(texOffsetLoc, 1.0f / tex.width, 1.0f / tex.height);
 
       if (-1 < textureLoc) {
-        texUnit = -1 < ppixelsUnit ? ppixelsUnit + 1 : getLastTexUnit() + 1;
+        texUnit =  -1 < ppixelsUnit ? ppixelsUnit + 1 : getLastTexUnit() + 1;
         setUniformValue(textureLoc, texUnit);
         pgl.activeTexture(PGL.TEXTURE0 + texUnit);
         tex.bind();
@@ -1447,26 +1387,15 @@ public class PShader implements PConstants {
       if (tcmat == null) {
         tcmat = new float[16];
       }
-      tcmat[0] = scaleu;
-      tcmat[4] = 0;
-      tcmat[8] = 0;
-      tcmat[12] = dispu;
-      tcmat[1] = 0;
-      tcmat[5] = scalev;
-      tcmat[9] = 0;
-      tcmat[13] = dispv;
-      tcmat[2] = 0;
-      tcmat[6] = 0;
-      tcmat[10] = 0;
-      tcmat[14] = 0;
-      tcmat[3] = 0;
-      tcmat[7] = 0;
-      tcmat[11] = 0;
-      tcmat[15] = 0;
+      tcmat[0] = scaleu; tcmat[4] = 0;      tcmat[ 8] = 0; tcmat[12] = dispu;
+      tcmat[1] = 0;      tcmat[5] = scalev; tcmat[ 9] = 0; tcmat[13] = dispv;
+      tcmat[2] = 0;      tcmat[6] = 0;      tcmat[10] = 0; tcmat[14] = 0;
+      tcmat[3] = 0;      tcmat[7] = 0;      tcmat[11] = 0; tcmat[15] = 0;
       setUniformMatrix(texMatrixLoc, tcmat);
     }
   }
 
+
   protected boolean supportsTexturing() {
     return -1 < textureLoc;
   }
@@ -1484,85 +1413,85 @@ public class PShader implements PConstants {
   }
 
   protected boolean accessLightAttribs() {
-    return -1 < ambientLoc || -1 < specularLoc || -1 < emissiveLoc
-      || -1 < shininessLoc;
+    return -1 < ambientLoc || -1 < specularLoc || -1 < emissiveLoc ||
+           -1 < shininessLoc;
   }
 
   protected void setVertexAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                    int stride, int offset) {
     setAttributeVBO(vertexLoc, vboId, size, type, false, stride, offset);
   }
 
   protected void setColorAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                   int stride, int offset) {
     setAttributeVBO(colorLoc, vboId, size, type, true, stride, offset);
   }
 
   protected void setNormalAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                    int stride, int offset) {
     setAttributeVBO(normalLoc, vboId, size, type, false, stride, offset);
   }
 
   protected void setTexcoordAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                      int stride, int offset) {
     setAttributeVBO(texCoordLoc, vboId, size, type, false, stride, offset);
   }
 
   protected void setAmbientAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                     int stride, int offset) {
     setAttributeVBO(ambientLoc, vboId, size, type, true, stride, offset);
   }
 
   protected void setSpecularAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                      int stride, int offset) {
     setAttributeVBO(specularLoc, vboId, size, type, true, stride, offset);
   }
 
   protected void setEmissiveAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                      int stride, int offset) {
     setAttributeVBO(emissiveLoc, vboId, size, type, true, stride, offset);
   }
 
   protected void setShininessAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                       int stride, int offset) {
     setAttributeVBO(shininessLoc, vboId, size, type, false, stride, offset);
   }
 
   protected void setLineAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                  int stride, int offset) {
     setAttributeVBO(directionLoc, vboId, size, type, false, stride, offset);
   }
 
   protected void setPointAttribute(int vboId, int size, int type,
-    int stride, int offset) {
+                                   int stride, int offset) {
     setAttributeVBO(offsetLoc, vboId, size, type, false, stride, offset);
   }
 
+
   // ***************************************************************************
   //
   // Class to store a user-specified value for a uniform parameter
   // in the shader
   protected static class UniformValue {
-
-    static final int INT1 = 0;
-    static final int INT2 = 1;
-    static final int INT3 = 2;
-    static final int INT4 = 3;
-    static final int FLOAT1 = 4;
-    static final int FLOAT2 = 5;
-    static final int FLOAT3 = 6;
-    static final int FLOAT4 = 7;
-    static final int INT1VEC = 8;
-    static final int INT2VEC = 9;
-    static final int INT3VEC = 10;
-    static final int INT4VEC = 11;
+    static final int INT1      = 0;
+    static final int INT2      = 1;
+    static final int INT3      = 2;
+    static final int INT4      = 3;
+    static final int FLOAT1    = 4;
+    static final int FLOAT2    = 5;
+    static final int FLOAT3    = 6;
+    static final int FLOAT4    = 7;
+    static final int INT1VEC   = 8;
+    static final int INT2VEC   = 9;
+    static final int INT3VEC   = 10;
+    static final int INT4VEC   = 11;
     static final int FLOAT1VEC = 12;
     static final int FLOAT2VEC = 13;
     static final int FLOAT3VEC = 14;
     static final int FLOAT4VEC = 15;
-    static final int MAT2 = 16;
-    static final int MAT3 = 17;
-    static final int MAT4 = 18;
+    static final int MAT2      = 16;
+    static final int MAT3      = 17;
+    static final int MAT4      = 18;
     static final int SAMPLER2D = 19;
 
     int type;