picrate 0.7.0-java → 0.8.0-java

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

@@ -64,415 +64,127 @@ import java.util.Stack;
  */
 public class PShapeOpenGL extends PShape {
   // Testing these constants, not use as they might go away...
-
-    /**
-     *
-     */
   static public final int POSITION  = 0;
+  static public final int NORMAL    = 1;
+  static public final int TEXCOORD  = 2;
+  static public final int DIRECTION = 3;
+  static public final int OFFSET    = 4;
+
+  static protected final int TRANSLATE = 0;
+  static protected final int ROTATE    = 1;
+  static protected final int SCALE     = 2;
+  static protected final int MATRIX    = 3;
+
+  protected PGraphicsOpenGL pg;
+  protected PGL pgl;
+  protected int context;      // The context that created this shape.
 
-    /**
-     *
-     */
-    static public final int NORMAL    = 1;
-
-    /**
-     *
-     */
-    static public final int TEXCOORD  = 2;
-
-    /**
-     *
-     */
-    static public final int DIRECTION = 3;
-
-    /**
-     *
-     */
-    static public final int OFFSET    = 4;
-
-    /**
-     *
-     */
-    static protected final int TRANSLATE = 0;
-
-    /**
-     *
-     */
-    static protected final int ROTATE    = 1;
-
-    /**
-     *
-     */
-    static protected final int SCALE     = 2;
-
-    /**
-     *
-     */
-    static protected final int MATRIX    = 3;
-
-    /**
-     *
-     */
-    protected PGraphicsOpenGL pg;
-
-    /**
-     *
-     */
-    protected PGL pgl;
-
-    /**
-     *
-     */
-    protected int context;      // The context that created this shape.
-
-    /**
-     *
-     */
-    protected PShapeOpenGL root;
+  protected PShapeOpenGL root;
 
   // ........................................................
 
   // Input, tessellated geometry
 
-    /**
-     *
-     */
-
   protected InGeometry inGeo;
+  protected TessGeometry tessGeo;
+  protected Tessellator tessellator;
 
-    /**
-     *
-     */
-    protected TessGeometry tessGeo;
-
-    /**
-     *
-     */
-    protected Tessellator tessellator;
-
-    /**
-     *
-     */
-    protected AttributeMap polyAttribs;
+  protected AttributeMap polyAttribs;
 
   // ........................................................
 
   // Texturing
 
-    /**
-     *
-     */
-
   protected HashSet<PImage> textures;
-
-    /**
-     *
-     */
-    protected boolean strokedTexture;
-
-    /**
-     *
-     */
-    protected boolean untexChild;
+  protected boolean strokedTexture;
+  protected boolean untexChild;
 
   // ........................................................
 
   // OpenGL buffers
 
-    /**
-     *
-     */
-
   protected VertexBuffer bufPolyVertex;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyColor;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyNormal;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyTexcoord;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyAmbient;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolySpecular;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyEmissive;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyShininess;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPolyIndex;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufLineVertex;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufLineColor;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufLineAttrib;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufLineIndex;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPointVertex;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPointColor;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPointAttrib;
-
-    /**
-     *
-     */
-    protected VertexBuffer bufPointIndex;
+  protected VertexBuffer bufPolyColor;
+  protected VertexBuffer bufPolyNormal;
+  protected VertexBuffer bufPolyTexcoord;
+  protected VertexBuffer bufPolyAmbient;
+  protected VertexBuffer bufPolySpecular;
+  protected VertexBuffer bufPolyEmissive;
+  protected VertexBuffer bufPolyShininess;
+  protected VertexBuffer bufPolyIndex;
+
+  protected VertexBuffer bufLineVertex;
+  protected VertexBuffer bufLineColor;
+  protected VertexBuffer bufLineAttrib;
+  protected VertexBuffer bufLineIndex;
+
+  protected VertexBuffer bufPointVertex;
+  protected VertexBuffer bufPointColor;
+  protected VertexBuffer bufPointAttrib;
+  protected VertexBuffer bufPointIndex;
 
   // Testing this field, not use as it might go away...
-
-    /**
-     *
-     */
   public int glUsage = PGL.STATIC_DRAW;
 
   // ........................................................
 
   // Offsets for geometry aggregation and update.
 
-    /**
-     *
-     */
-
   protected int polyVertCopyOffset;
-
-    /**
-     *
-     */
-    protected int polyIndCopyOffset;
-
-    /**
-     *
-     */
-    protected int lineVertCopyOffset;
-
-    /**
-     *
-     */
-    protected int lineIndCopyOffset;
-
-    /**
-     *
-     */
-    protected int pointVertCopyOffset;
-
-    /**
-     *
-     */
-    protected int pointIndCopyOffset;
-
-    /**
-     *
-     */
-    protected int polyIndexOffset;
-
-    /**
-     *
-     */
-    protected int polyVertexOffset;
-
-    /**
-     *
-     */
-    protected int polyVertexAbs;
-
-    /**
-     *
-     */
-    protected int polyVertexRel;
-
-    /**
-     *
-     */
-    protected int lineIndexOffset;
-
-    /**
-     *
-     */
-    protected int lineVertexOffset;
-
-    /**
-     *
-     */
-    protected int lineVertexAbs;
-
-    /**
-     *
-     */
-    protected int lineVertexRel;
-
-    /**
-     *
-     */
-    protected int pointIndexOffset;
-
-    /**
-     *
-     */
-    protected int pointVertexOffset;
-
-    /**
-     *
-     */
-    protected int pointVertexAbs;
-
-    /**
-     *
-     */
-    protected int pointVertexRel;
-
-    /**
-     *
-     */
-    protected int firstPolyIndexCache;
-
-    /**
-     *
-     */
-    protected int lastPolyIndexCache;
-
-    /**
-     *
-     */
-    protected int firstLineIndexCache;
-
-    /**
-     *
-     */
-    protected int lastLineIndexCache;
-
-    /**
-     *
-     */
-    protected int firstPointIndexCache;
-
-    /**
-     *
-     */
-    protected int lastPointIndexCache;
-
-    /**
-     *
-     */
-    protected int firstPolyVertex;
-
-    /**
-     *
-     */
-    protected int lastPolyVertex;
-
-    /**
-     *
-     */
-    protected int firstLineVertex;
-
-    /**
-     *
-     */
-    protected int lastLineVertex;
-
-    /**
-     *
-     */
-    protected int firstPointVertex;
-
-    /**
-     *
-     */
-    protected int lastPointVertex;
+  protected int polyIndCopyOffset;
+  protected int lineVertCopyOffset;
+  protected int lineIndCopyOffset;
+  protected int pointVertCopyOffset;
+  protected int pointIndCopyOffset;
+
+  protected int polyIndexOffset;
+  protected int polyVertexOffset;
+  protected int polyVertexAbs;
+  protected int polyVertexRel;
+
+  protected int lineIndexOffset;
+  protected int lineVertexOffset;
+  protected int lineVertexAbs;
+  protected int lineVertexRel;
+
+  protected int pointIndexOffset;
+  protected int pointVertexOffset;
+  protected int pointVertexAbs;
+  protected int pointVertexRel;
+
+  protected int firstPolyIndexCache;
+  protected int lastPolyIndexCache;
+  protected int firstLineIndexCache;
+  protected int lastLineIndexCache;
+  protected int firstPointIndexCache;
+  protected int lastPointIndexCache;
+
+  protected int firstPolyVertex;
+  protected int lastPolyVertex;
+  protected int firstLineVertex;
+  protected int lastLineVertex;
+  protected int firstPointVertex;
+  protected int lastPointVertex;
 
   // ........................................................
 
   // Geometric transformations.
 
-    /**
-     *
-     */
-
   protected PMatrix transform;
-
-    /**
-     *
-     */
-    protected Stack<PMatrix> transformStack;
+  protected Stack<PMatrix> transformStack;
 
   // ........................................................
 
   // State/rendering flags
 
-    /**
-     *
-     */
-
   protected boolean tessellated;
-
-    /**
-     *
-     */
-    protected boolean needBufferInit = false;
+  protected boolean needBufferInit = false;
 
   // Flag to indicate if the shape can have holes or not.
-
-    /**
-     *
-     */
   protected boolean solid = true;
 
-    /**
-     *
-     */
-    protected boolean breakShape = false;
-
-    /**
-     *
-     */
-    protected boolean shapeCreated = false;
+  protected boolean breakShape = false;
+  protected boolean shapeCreated = false;
 
   // These variables indicate if the shape contains
   // polygon, line and/or point geometry. In the case of
@@ -481,409 +193,122 @@ public class PShapeOpenGL extends PShape {
   // However, for 2D shapes the poly geometry contains all of
   // the three since the same rendering shader applies to
   // fill, line and point geometry.
-
-    /**
-     *
-     */
   protected boolean hasPolys;
-
-    /**
-     *
-     */
-    protected boolean hasLines;
-
-    /**
-     *
-     */
-    protected boolean hasPoints;
+  protected boolean hasLines;
+  protected boolean hasPoints;
 
   // ........................................................
 
   // Bezier and Catmull-Rom curves
 
-    /**
-     *
-     */
-
   protected int bezierDetail;
+  protected int curveDetail;
+  protected float curveTightness;
 
-    /**
-     *
-     */
-    protected int curveDetail;
-
-    /**
-     *
-     */
-    protected float curveTightness;
-
-    /**
-     *
-     */
-    protected int savedBezierDetail;
-
-    /**
-     *
-     */
-    protected int savedCurveDetail;
-
-    /**
-     *
-     */
-    protected float savedCurveTightness;
+  protected int savedBezierDetail;
+  protected int savedCurveDetail;
+  protected float savedCurveTightness;
 
   // ........................................................
 
   // Normals
 
-    /**
-     *
-     */
-
-  protected float normalX,
-
-    /**
-     *
-     */
-    normalY,
-
-    /**
-     *
-     */
-    normalZ;
+  protected float normalX, normalY, normalZ;
 
   // normal calculated per triangle
-
-    /**
-     *
-     */
   static protected final int NORMAL_MODE_AUTO = 0;
   // one normal manually specified per shape
-
-    /**
-     *
-     */
   static protected final int NORMAL_MODE_SHAPE = 1;
   // normals specified for each shape vertex
-
-    /**
-     *
-     */
   static protected final int NORMAL_MODE_VERTEX = 2;
 
   // Current mode for normals, one of AUTO, SHAPE, or VERTEX
-
-    /**
-     *
-     */
   protected int normalMode;
 
   // ........................................................
 
   // Modification variables (used only by the root shape)
 
-    /**
-     *
-     */
-
   protected boolean modified;
 
-    /**
-     *
-     */
-    protected boolean modifiedPolyVertices;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolyColors;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolyNormals;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolyTexCoords;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolyAmbient;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolySpecular;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolyEmissive;
-
-    /**
-     *
-     */
-    protected boolean modifiedPolyShininess;
-
-    /**
-     *
-     */
-    protected boolean modifiedLineVertices;
-
-    /**
-     *
-     */
-    protected boolean modifiedLineColors;
-
-    /**
-     *
-     */
-    protected boolean modifiedLineAttributes;
-
-    /**
-     *
-     */
-    protected boolean modifiedPointVertices;
-
-    /**
-     *
-     */
-    protected boolean modifiedPointColors;
-
-    /**
-     *
-     */
-    protected boolean modifiedPointAttributes;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyVertex;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyVertex;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyColor;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyColor;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyNormal;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyNormal;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyTexcoord;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyTexcoord;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyAmbient;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyAmbient;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolySpecular;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolySpecular;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyEmissive;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyEmissive;
-
-    /**
-     *
-     */
-    protected int firstModifiedPolyShininess;
-
-    /**
-     *
-     */
-    protected int lastModifiedPolyShininess;
-
-    /**
-     *
-     */
-    protected int firstModifiedLineVertex;
-
-    /**
-     *
-     */
-    protected int lastModifiedLineVertex;
-
-    /**
-     *
-     */
-    protected int firstModifiedLineColor;
-
-    /**
-     *
-     */
-    protected int lastModifiedLineColor;
-
-    /**
-     *
-     */
-    protected int firstModifiedLineAttribute;
-
-    /**
-     *
-     */
-    protected int lastModifiedLineAttribute;
-
-    /**
-     *
-     */
-    protected int firstModifiedPointVertex;
-
-    /**
-     *
-     */
-    protected int lastModifiedPointVertex;
-
-    /**
-     *
-     */
-    protected int firstModifiedPointColor;
-
-    /**
-     *
-     */
-    protected int lastModifiedPointColor;
-
-    /**
-     *
-     */
-    protected int firstModifiedPointAttribute;
-
-    /**
-     *
-     */
-    protected int lastModifiedPointAttribute;
+  protected boolean modifiedPolyVertices;
+  protected boolean modifiedPolyColors;
+  protected boolean modifiedPolyNormals;
+  protected boolean modifiedPolyTexCoords;
+  protected boolean modifiedPolyAmbient;
+  protected boolean modifiedPolySpecular;
+  protected boolean modifiedPolyEmissive;
+  protected boolean modifiedPolyShininess;
+
+  protected boolean modifiedLineVertices;
+  protected boolean modifiedLineColors;
+  protected boolean modifiedLineAttributes;
+
+  protected boolean modifiedPointVertices;
+  protected boolean modifiedPointColors;
+  protected boolean modifiedPointAttributes;
+
+  protected int firstModifiedPolyVertex;
+  protected int lastModifiedPolyVertex;
+  protected int firstModifiedPolyColor;
+  protected int lastModifiedPolyColor;
+  protected int firstModifiedPolyNormal;
+  protected int lastModifiedPolyNormal;
+  protected int firstModifiedPolyTexcoord;
+  protected int lastModifiedPolyTexcoord;
+  protected int firstModifiedPolyAmbient;
+  protected int lastModifiedPolyAmbient;
+  protected int firstModifiedPolySpecular;
+  protected int lastModifiedPolySpecular;
+  protected int firstModifiedPolyEmissive;
+  protected int lastModifiedPolyEmissive;
+  protected int firstModifiedPolyShininess;
+  protected int lastModifiedPolyShininess;
+
+  protected int firstModifiedLineVertex;
+  protected int lastModifiedLineVertex;
+  protected int firstModifiedLineColor;
+  protected int lastModifiedLineColor;
+  protected int firstModifiedLineAttribute;
+  protected int lastModifiedLineAttribute;
+
+  protected int firstModifiedPointVertex;
+  protected int lastModifiedPointVertex;
+  protected int firstModifiedPointColor;
+  protected int lastModifiedPointColor;
+  protected int firstModifiedPointAttribute;
+  protected int lastModifiedPointAttribute;
 
   // ........................................................
 
   // Saved style variables to style can be re-enabled after disableStyle,
   // although it won't work if properties are defined on a per-vertex basis.
 
-    /**
-     *
-     */
-
   protected boolean savedStroke;
+  protected int savedStrokeColor;
+  protected float savedStrokeWeight;
+  protected int savedStrokeCap;
+  protected int savedStrokeJoin;
 
-    /**
-     *
-     */
-    protected int savedStrokeColor;
-
-    /**
-     *
-     */
-    protected float savedStrokeWeight;
-
-    /**
-     *
-     */
-    protected int savedStrokeCap;
-
-    /**
-     *
-     */
-    protected int savedStrokeJoin;
-
-    /**
-     *
-     */
-    protected boolean savedFill;
-
-    /**
-     *
-     */
-    protected int savedFillColor;
-
-    /**
-     *
-     */
-    protected boolean savedTint;
-
-    /**
-     *
-     */
-    protected int savedTintColor;
-
-    /**
-     *
-     */
-    protected int savedAmbientColor;
-
-    /**
-     *
-     */
-    protected int savedSpecularColor;
-
-    /**
-     *
-     */
-    protected int savedEmissiveColor;
-
-    /**
-     *
-     */
-    protected float savedShininess;
-
-    /**
-     *
-     */
-    protected int savedTextureMode;
+  protected boolean savedFill;
+  protected int savedFillColor;
+
+  protected boolean savedTint;
+  protected int savedTintColor;
+
+  protected int savedAmbientColor;
+  protected int savedSpecularColor;
+  protected int savedEmissiveColor;
+  protected float savedShininess;
+
+  protected int savedTextureMode;
 
 
   PShapeOpenGL() {
   }
 
-    /**
-     *
-     * @param pg
-     * @param family
-     */
-    public PShapeOpenGL(PGraphicsOpenGL pg, int family) {
+
+  public PShapeOpenGL(PGraphicsOpenGL pg, int family) {
     this.pg = pg;
     this.family = family;
 
@@ -978,10 +403,7 @@ public class PShapeOpenGL extends PShape {
   }
 
 
-  /** Create a shape from the PRIMITIVE family, using this kind and these params
-     * @param pg
-     * @param kind
-     * @param p */
+  /** Create a shape from the PRIMITIVE family, using this kind and these params */
   public PShapeOpenGL(PGraphicsOpenGL pg, int kind, float... p) {
     this(pg, PRIMITIVE);
     setKind(kind);
@@ -1079,11 +501,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param root
-     */
-    protected void updateRoot(PShape root) {
+
+  protected void updateRoot(PShape root) {
     this.root = (PShapeOpenGL) root;
     if (family == GROUP) {
       for (int i = 0; i < childCount; i++) {
@@ -1099,13 +518,6 @@ public class PShapeOpenGL extends PShape {
   //
   // Shape creation (temporary hack)
 
-    /**
-     *
-     * @param pg
-     * @param src
-     * @return
-     */
-
 
   public static PShapeOpenGL createShape(PGraphicsOpenGL pg, PShape src) {
     PShapeOpenGL dest = null;
@@ -1161,14 +573,6 @@ public class PShapeOpenGL extends PShape {
   }
 */
 
-    /**
-     *
-     * @param pg
-     * @param src
-     * @param dest
-     */
-
-
   static public void copyGroup(PGraphicsOpenGL pg, PShape src, PShape dest) {
     copyMatrix(src, dest);
     copyStyles(src, dest);
@@ -1245,11 +649,8 @@ public class PShapeOpenGL extends PShape {
     return depth;
   }
 
-    /**
-     *
-     * @param min
-     */
-    protected void getVertexMin(PVector min) {
+
+  protected void getVertexMin(PVector min) {
     updateTessellation();
 
     if (family == GROUP) {
@@ -1272,11 +673,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param max
-     */
-    protected void getVertexMax(PVector max) {
+
+  protected void getVertexMax(PVector max) {
     updateTessellation();
 
     if (family == GROUP) {
@@ -1299,13 +697,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param sum
-     * @param count
-     * @return
-     */
-    protected int getVertexSum(PVector sum, int count) {
+
+  protected int getVertexSum(PVector sum, int count) {
     updateTessellation();
 
     if (family == GROUP) {
@@ -1338,11 +731,6 @@ public class PShapeOpenGL extends PShape {
 
   // Drawing methods
 
-    /**
-     *
-     * @param mode
-     */
-
 
   @Override
   public void setTextureMode(int mode) {
@@ -1361,11 +749,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param mode
-     */
-    protected void setTextureModeImpl(int mode) {
+
+  protected void setTextureModeImpl(int mode) {
     if (textureMode == mode) return;
     textureMode = mode;
     if (image != null) {
@@ -1379,11 +764,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tex
-     */
-    @Override
+
+  @Override
   public void setTexture(PImage tex) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTexture()");
@@ -1400,11 +782,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tex
-     */
-    protected void setTextureImpl(PImage tex) {
+
+  protected void setTextureImpl(PImage tex) {
     PImage image0 = image;
     image = tex;
 
@@ -1434,12 +813,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param uFactor
-     * @param vFactor
-     */
-    protected void scaleTextureUV(float uFactor, float vFactor) {
+
+  protected void scaleTextureUV(float uFactor, float vFactor) {
     if (PGraphicsOpenGL.same(uFactor, 1) &&
         PGraphicsOpenGL.same(vFactor, 1)) return;
 
@@ -1469,11 +844,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tex
-     */
-    protected void addTexture(PImage tex) {
+
+  protected void addTexture(PImage tex) {
     if (textures == null) {
       textures = new HashSet<PImage>();
     }
@@ -1483,12 +855,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tex
-     * @param caller
-     */
-    protected void removeTexture(PImage tex, PShapeOpenGL caller) {
+
+  protected void removeTexture(PImage tex, PShapeOpenGL caller) {
     if (textures == null || !textures.contains(tex)) return; // Nothing to remove.
 
     // First check that none of the child shapes have texture tex...
@@ -1517,20 +885,13 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param newValue
-     */
-    protected void strokedTexture(boolean newValue) {
+
+  protected void strokedTexture(boolean newValue) {
     strokedTexture(newValue, null);
   }
 
-    /**
-     *
-     * @param newValue
-     * @param caller
-     */
-    protected void strokedTexture(boolean newValue, PShapeOpenGL caller) {
+
+  protected void strokedTexture(boolean newValue, PShapeOpenGL caller) {
     if (strokedTexture == newValue) return; // Nothing to change.
 
     if (newValue) {
@@ -1554,20 +915,13 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param newValue
-     */
-    protected void untexChild(boolean newValue) {
+
+  protected void untexChild(boolean newValue) {
     untexChild(newValue, null);
   }
 
-    /**
-     *
-     * @param newValue
-     * @param caller
-     */
-    protected void untexChild(boolean newValue, PShapeOpenGL caller) {
+
+  protected void untexChild(boolean newValue, PShapeOpenGL caller) {
     if (untexChild == newValue) return; // Nothing to change.
 
     if (newValue) {
@@ -1591,11 +945,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @return
-     */
-    protected boolean hasTexture() {
+
+  protected boolean hasTexture() {
     if (family == GROUP) {
       return textures != null && 0 < textures.size();
     } else {
@@ -1603,12 +954,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tex
-     * @return
-     */
-    protected boolean hasTexture(PImage tex) {
+
+  protected boolean hasTexture(PImage tex) {
     if (family == GROUP) {
       return textures != null && textures.contains(tex);
     } else {
@@ -1616,11 +963,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @return
-     */
-    protected boolean hasStrokedTexture() {
+
+  protected boolean hasStrokedTexture() {
     if (family == GROUP) {
       return strokedTexture;
     } else {
@@ -1628,11 +972,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param solid
-     */
-    @Override
+
+  @Override
   public void solid(boolean solid) {
     if (family == GROUP) {
       for (int i = 0; i < childCount; i++) {
@@ -1644,80 +985,47 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    @Override
+
+  @Override
   protected void beginContourImpl() {
     breakShape = true;
   }
 
-    /**
-     *
-     */
-    @Override
+
+  @Override
   protected void endContourImpl() {
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    @Override
+
+  @Override
   public void vertex(float x, float y) {
     vertexImpl(x, y, 0, 0, 0);
     if (image != null)
       PGraphics.showWarning(PGraphicsOpenGL.MISSING_UV_TEXCOORDS_ERROR);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param u
-     * @param v
-     */
-    @Override
+
+  @Override
   public void vertex(float x, float y, float u, float v) {
     vertexImpl(x, y, 0, u, v);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    @Override
+
+  @Override
   public void vertex(float x, float y, float z) {
     vertexImpl(x, y, z, 0, 0);
     if (image != null)
       PGraphics.showWarning(PGraphicsOpenGL.MISSING_UV_TEXCOORDS_ERROR);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param u
-     * @param v
-     */
-    @Override
+
+  @Override
   public void vertex(float x, float y, float z, float u, float v) {
     vertexImpl(x, y, z, u, v);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param u
-     * @param v
-     */
-    protected void vertexImpl(float x, float y, float z, float u, float v) {
+
+  protected void vertexImpl(float x, float y, float z, float u, float v) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "vertex()");
       return;
@@ -1765,11 +1073,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @return
-     */
-    protected boolean vertexBreak() {
+
+  protected boolean vertexBreak() {
     if (breakShape) {
       breakShape = false;
       return true;
@@ -1777,13 +1082,8 @@ public class PShapeOpenGL extends PShape {
     return false;
   }
 
-    /**
-     *
-     * @param nx
-     * @param ny
-     * @param nz
-     */
-    @Override
+
+  @Override
   public void normal(float nx, float ny, float nz) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "normal()");
@@ -1810,90 +1110,55 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param name
-     * @param x
-     * @param y
-     * @param z
-     */
-    @Override
+
+  @Override
   public void attribPosition(String name, float x, float y, float z) {
     VertexAttribute attrib = attribImpl(name, VertexAttribute.POSITION,
                                         PGL.FLOAT, 3);
     if (attrib != null) attrib.set(x, y, z);
   }
 
-    /**
-     *
-     * @param name
-     * @param nx
-     * @param ny
-     * @param nz
-     */
-    @Override
+
+  @Override
   public void attribNormal(String name, float nx, float ny, float nz) {
     VertexAttribute attrib = attribImpl(name, VertexAttribute.NORMAL,
                                         PGL.FLOAT, 3);
     if (attrib != null) attrib.set(nx, ny, nz);
   }
 
-    /**
-     *
-     * @param name
-     * @param color
-     */
-    @Override
+
+  @Override
   public void attribColor(String name, int color) {
     VertexAttribute attrib = attribImpl(name, VertexAttribute.COLOR, PGL.INT, 1);
     if (attrib != null) attrib.set(new int[] {color});
   }
 
-    /**
-     *
-     * @param name
-     * @param values
-     */
-    @Override
+
+  @Override
   public void attrib(String name, float... values) {
     VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.FLOAT,
                                         values.length);
     if (attrib != null) attrib.set(values);
   }
 
-    /**
-     *
-     * @param name
-     * @param values
-     */
-    @Override
+
+  @Override
   public void attrib(String name, int... values) {
     VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.INT,
                                         values.length);
     if (attrib != null) attrib.set(values);
   }
 
-    /**
-     *
-     * @param name
-     * @param values
-     */
-    @Override
+
+  @Override
   public void attrib(String name, boolean... values) {
     VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.BOOL,
                                         values.length);
     if (attrib != null) attrib.set(values);
   }
 
-    /**
-     *
-     * @param name
-     * @param kind
-     * @param type
-     * @param size
-     * @return
-     */
-    protected VertexAttribute attribImpl(String name, int kind, int type, int size) {
+
+  protected VertexAttribute attribImpl(String name, int kind, int type, int size) {
     if (4 < size) {
       PGraphics.showWarning("Vertex attributes cannot have more than 4 values");
       return null;
@@ -1919,11 +1184,8 @@ public class PShapeOpenGL extends PShape {
     return attrib;
   }
 
-    /**
-     *
-     * @param mode
-     */
-    @Override
+
+  @Override
   public void endShape(int mode) {
     super.endShape(mode);
 
@@ -1936,11 +1198,8 @@ public class PShapeOpenGL extends PShape {
     shapeCreated = true;
   }
 
-    /**
-     *
-     * @param source
-     */
-    @Override
+
+  @Override
   public void setParams(float[] source) {
     if (family != PRIMITIVE) {
       PGraphics.showWarning("Parameters can only be set to PRIMITIVE shapes");
@@ -1952,14 +1211,8 @@ public class PShapeOpenGL extends PShape {
     shapeCreated = true;
   }
 
-    /**
-     *
-     * @param vcount
-     * @param verts
-     * @param ccount
-     * @param codes
-     */
-    @Override
+
+  @Override
   public void setPath(int vcount, float[][] verts, int ccount, int[] codes) {
     if (family != PATH) {
       PGraphics.showWarning("Vertex coordinates and codes can only be set to " +
@@ -2035,12 +1288,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    @Override
+
+  @Override
   public void scale(float x, float y) {
     if (is3D) {
       transform(SCALE, x, y, 1);
@@ -2055,52 +1304,23 @@ public class PShapeOpenGL extends PShape {
     transform(SCALE, x, y, z);
   }
 
-    /**
-     *
-     * @param source
-     */
-    @Override
+
+  @Override
   public void applyMatrix(PMatrix2D source) {
     transform(MATRIX, source.m00, source.m01, source.m02,
                       source.m10, source.m11, source.m12);
   }
 
-    /**
-     *
-     * @param n00
-     * @param n01
-     * @param n02
-     * @param n10
-     * @param n11
-     * @param n12
-     */
-    @Override
+
+  @Override
   public void applyMatrix(float n00, float n01, float n02,
                           float n10, float n11, float n12) {
     transform(MATRIX, n00, n01, n02,
                       n10, n11, n12);
   }
 
-    /**
-     *
-     * @param n00
-     * @param n01
-     * @param n02
-     * @param n03
-     * @param n10
-     * @param n11
-     * @param n12
-     * @param n13
-     * @param n20
-     * @param n21
-     * @param n22
-     * @param n23
-     * @param n30
-     * @param n31
-     * @param n32
-     * @param n33
-     */
-    @Override
+
+  @Override
   public void applyMatrix(float n00, float n01, float n02, float n03,
                           float n10, float n11, float n12, float n13,
                           float n20, float n21, float n22, float n23,
@@ -2135,12 +1355,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param type
-     * @param args
-     */
-    protected void transform(int type, float... args) {
+
+  protected void transform(int type, float... args) {
     int dimensions = is3D ? 3 : 2;
     checkMatrix(dimensions);
     if (transform == null) {
@@ -2199,10 +1415,8 @@ public class PShapeOpenGL extends PShape {
     if (tessellated) applyMatrixImpl(transform);
   }
 
-    /**
-     *
-     */
-    protected void pushTransform() {
+
+  protected void pushTransform() {
     if (transformStack == null) transformStack = new Stack<PMatrix>();
     PMatrix mat;
     if (transform instanceof PMatrix2D) {
@@ -2214,20 +1428,13 @@ public class PShapeOpenGL extends PShape {
     transformStack.push(mat);
   }
 
-    /**
-     *
-     * @return
-     */
-    protected PMatrix popTransform() {
+
+  protected PMatrix popTransform() {
     if (transformStack == null || transformStack.size() == 0) return null;
     return transformStack.pop();
   }
 
-    /**
-     *
-     * @param matrix
-     */
-    protected void applyMatrixImpl(PMatrix matrix) {
+  protected void applyMatrixImpl(PMatrix matrix) {
     if (hasPolys) {
       tessGeo.applyMatrixOnPolyGeometry(matrix,
                                         firstPolyVertex, lastPolyVertex);
@@ -2264,11 +1471,6 @@ public class PShapeOpenGL extends PShape {
 
   // Bezier curves
 
-    /**
-     *
-     * @param detail
-     */
-
 
   @Override
   public void bezierDetail(int detail) {
@@ -2279,16 +1481,8 @@ public class PShapeOpenGL extends PShape {
     //pg.bezierDetail(detail); // setting the detail in the renderer, WTF??
   }
 
-    /**
-     *
-     * @param x2
-     * @param y2
-     * @param x3
-     * @param y3
-     * @param x4
-     * @param y4
-     */
-    @Override
+
+  @Override
   public void bezierVertex(float x2, float y2,
                            float x3, float y3,
                            float x4, float y4) {
@@ -2297,19 +1491,8 @@ public class PShapeOpenGL extends PShape {
                      x4, y4, 0);
   }
 
-    /**
-     *
-     * @param x2
-     * @param y2
-     * @param z2
-     * @param x3
-     * @param y3
-     * @param z3
-     * @param x4
-     * @param y4
-     * @param z4
-     */
-    @Override
+
+  @Override
   public void bezierVertex(float x2, float y2, float z2,
                            float x3, float y3, float z3,
                            float x4, float y4, float z4) {
@@ -2318,19 +1501,8 @@ public class PShapeOpenGL extends PShape {
                      x4, y4, z4);
   }
 
-    /**
-     *
-     * @param x2
-     * @param y2
-     * @param z2
-     * @param x3
-     * @param y3
-     * @param z3
-     * @param x4
-     * @param y4
-     * @param z4
-     */
-    protected void bezierVertexImpl(float x2, float y2, float z2,
+
+  protected void bezierVertexImpl(float x2, float y2, float z2,
                                   float x3, float y3, float z3,
                                   float x4, float y4, float z4) {
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
@@ -2341,46 +1513,24 @@ public class PShapeOpenGL extends PShape {
                           x4, y4, z4, vertexBreak());
   }
 
-    /**
-     *
-     * @param cx
-     * @param cy
-     * @param x3
-     * @param y3
-     */
-    @Override
+
+  @Override
   public void quadraticVertex(float cx, float cy,
                               float x3, float y3) {
     quadraticVertexImpl(cx, cy, 0,
                         x3, y3, 0);
   }
 
-    /**
-     *
-     * @param cx
-     * @param cy
-     * @param cz
-     * @param x3
-     * @param y3
-     * @param z3
-     */
-    @Override
+
+  @Override
   public void quadraticVertex(float cx, float cy, float cz,
                               float x3, float y3, float z3) {
     quadraticVertexImpl(cx, cy, cz,
                         x3, y3, z3);
   }
 
-    /**
-     *
-     * @param cx
-     * @param cy
-     * @param cz
-     * @param x3
-     * @param y3
-     * @param z3
-     */
-    protected void quadraticVertexImpl(float cx, float cy, float cz,
+
+  protected void quadraticVertexImpl(float cx, float cy, float cz,
                                      float x3, float y3, float z3) {
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
                       ambientColor, specularColor, emissiveColor, shininess);
@@ -2396,11 +1546,6 @@ public class PShapeOpenGL extends PShape {
 
   // Catmull-Rom curves
 
-    /**
-     *
-     * @param detail
-     */
-
 
   @Override
   public void curveDetail(int detail) {
@@ -2411,11 +1556,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tightness
-     */
-    @Override
+
+  @Override
   public void curveTightness(float tightness) {
     curveTightness = tightness;
 //    pg.curveTightness(tightness);
@@ -2424,34 +1566,20 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    @Override
+
+  @Override
   public void curveVertex(float x, float y) {
     curveVertexImpl(x, y, 0);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    @Override
+
+  @Override
   public void curveVertex(float x, float y, float z) {
     curveVertexImpl(x, y, z);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    protected void curveVertexImpl(float x, float y, float z) {
+
+  protected void curveVertexImpl(float x, float y, float z) {
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
                       ambientColor, specularColor, emissiveColor, shininess);
     inGeo.setNormal(normalX, normalY, normalZ);
@@ -2491,32 +1619,20 @@ public class PShapeOpenGL extends PShape {
     return vec;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getVertexX(int index) {
     return inGeo.vertices[3 * index + 0];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getVertexY(int index) {
     return inGeo.vertices[3 * index + 1];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getVertexZ(int index) {
     return inGeo.vertices[3 * index + 2];
   }
@@ -2587,13 +1703,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param index
-     * @param vec
-     * @return
-     */
-    @Override
+
+  @Override
   public PVector getNormal(int index, PVector vec) {
     if (vec == null) {
       vec = new PVector();
@@ -2604,44 +1715,26 @@ public class PShapeOpenGL extends PShape {
     return vec;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getNormalX(int index) {
     return inGeo.normals[3 * index + 0];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getNormalY(int index) {
     return inGeo.normals[3 * index + 1];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getNormalZ(int index) {
     return inGeo.normals[3 * index + 2];
   }
 
-    /**
-     *
-     * @param index
-     * @param nx
-     * @param ny
-     * @param nz
-     */
-    @Override
+
+  @Override
   public void setNormal(int index, float nx, float ny, float nz) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setNormal()");
@@ -2654,13 +1747,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param name
-     * @param index
-     * @param values
-     */
-    @Override
+
+  @Override
   public void setAttrib(String name, int index, float... values) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setNormal()");
@@ -2675,13 +1763,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param name
-     * @param index
-     * @param values
-     */
-    @Override
+
+  @Override
   public void setAttrib(String name, int index, int... values) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setNormal()");
@@ -2696,13 +1779,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param name
-     * @param index
-     * @param values
-     */
-    @Override
+
+  @Override
   public void setAttrib(String name, int index, boolean... values) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setNormal()");
@@ -2717,33 +1795,20 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getTextureU(int index) {
     return inGeo.texcoords[2 * index + 0];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getTextureV(int index) {
     return inGeo.texcoords[2 * index + 1];
   }
 
-    /**
-     *
-     * @param index
-     * @param u
-     * @param v
-     */
-    @Override
+
+  @Override
   public void setTextureUV(int index, float u, float v) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTextureUV()");
@@ -2760,12 +1825,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public int getFill(int index) {
     if (family != GROUP && image == null) {
       return PGL.nativeToJavaARGB(inGeo.colors[index]);
@@ -2811,11 +1872,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param fill
-     */
-    protected void setFillImpl(int fill) {
+
+  protected void setFillImpl(int fill) {
     if (fillColor == fill) return;
     fillColor = fill;
 
@@ -2862,12 +1920,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public int getTint(int index) {
     if (family != GROUP && image != null) {
       return PGL.nativeToJavaARGB(inGeo.colors[index]);
@@ -2876,11 +1930,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tint
-     */
-    @Override
+
+  @Override
   public void setTint(boolean tint) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTint()");
@@ -2898,11 +1949,8 @@ public class PShapeOpenGL extends PShape {
     this.tint = tint;
   }
 
-    /**
-     *
-     * @param tint
-     */
-    @Override
+
+  @Override
   public void setTint(int tint) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTint()");
@@ -2919,11 +1967,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param tint
-     */
-    protected void setTintImpl(int tint) {
+
+  protected void setTintImpl(int tint) {
     if (tintColor == tint) return;
     tintColor = tint;
 
@@ -2947,12 +1992,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param tint
-     */
-    @Override
+
+  @Override
   public void setTint(int index, int tint) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTint()");
@@ -2965,12 +2006,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public int getStroke(int index) {
     if (family != GROUP) {
       return PGL.nativeToJavaARGB(inGeo.strokeColors[index]);
@@ -2998,11 +2035,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param stroke
-     */
-    protected void setStrokeImpl(boolean stroke) {
+
+  protected void setStrokeImpl(boolean stroke) {
     if (this.stroke != stroke) {
       if (stroke) {
         // Before there was no stroke, now there is stroke, so current stroke
@@ -3040,11 +2074,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param stroke
-     */
-    protected void setStrokeImpl(int stroke) {
+
+  protected void setStrokeImpl(int stroke) {
     if (strokeColor == stroke) return;
     strokeColor = stroke;
 
@@ -3088,12 +2119,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getStrokeWeight(int index) {
     if (family != GROUP) {
       return inGeo.strokeWeights[index];
@@ -3102,11 +2129,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param weight
-     */
-    @Override
+
+  @Override
   public void setStrokeWeight(float weight) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeWeight()");
@@ -3123,11 +2147,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param weight
-     */
-    protected void setStrokeWeightImpl(float weight) {
+
+  protected void setStrokeWeightImpl(float weight) {
     if (PGraphicsOpenGL.same(strokeWeight, weight)) return;
     float oldWeight = strokeWeight;
     strokeWeight = weight;
@@ -3165,12 +2186,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param weight
-     */
-    @Override
+
+  @Override
   public void setStrokeWeight(int index, float weight) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeWeight()");
@@ -3181,11 +2198,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param join
-     */
-    @Override
+
+  @Override
   public void setStrokeJoin(int join) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeJoin()");
@@ -3208,11 +2222,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param cap
-     */
-    @Override
+
+  @Override
   public void setStrokeCap(int cap) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeCap()");
@@ -3235,12 +2246,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public int getAmbient(int index) {
     if (family != GROUP) {
       return PGL.nativeToJavaARGB(inGeo.ambient[index]);
@@ -3249,11 +2256,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param ambient
-     */
-    @Override
+
+  @Override
   public void setAmbient(int ambient) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setAmbient()");
@@ -3270,11 +2274,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param ambient
-     */
-    protected void setAmbientImpl(int ambient) {
+
+  protected void setAmbientImpl(int ambient) {
     if (ambientColor == ambient) return;
     ambientColor = ambient;
 
@@ -3297,12 +2298,8 @@ public class PShapeOpenGL extends PShape {
     setAmbient = true;
   }
 
-    /**
-     *
-     * @param index
-     * @param ambient
-     */
-    @Override
+
+  @Override
   public void setAmbient(int index, int ambient) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setAmbient()");
@@ -3314,12 +2311,8 @@ public class PShapeOpenGL extends PShape {
     setAmbient = true;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public int getSpecular(int index) {
     if (family == GROUP) {
       return PGL.nativeToJavaARGB(inGeo.specular[index]);
@@ -3328,11 +2321,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param specular
-     */
-    @Override
+
+  @Override
   public void setSpecular(int specular) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setSpecular()");
@@ -3349,11 +2339,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param specular
-     */
-    protected void setSpecularImpl(int specular) {
+
+  protected void setSpecularImpl(int specular) {
     if (specularColor == specular) return;
     specularColor = specular;
 
@@ -3375,12 +2362,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param specular
-     */
-    @Override
+
+  @Override
   public void setSpecular(int index, int specular) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setSpecular()");
@@ -3391,12 +2374,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public int getEmissive(int index) {
     if (family == GROUP) {
       return PGL.nativeToJavaARGB(inGeo.emissive[index]);
@@ -3405,11 +2384,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param emissive
-     */
-    @Override
+
+  @Override
   public void setEmissive(int emissive) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setEmissive()");
@@ -3426,11 +2402,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param emissive
-     */
-    protected void setEmissiveImpl(int emissive) {
+
+  protected void setEmissiveImpl(int emissive) {
     if (emissiveColor == emissive) return;
     emissiveColor = emissive;
 
@@ -3452,12 +2425,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param emissive
-     */
-    @Override
+
+  @Override
   public void setEmissive(int index, int emissive) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setEmissive()");
@@ -3468,12 +2437,8 @@ public class PShapeOpenGL extends PShape {
     markForTessellation();
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    @Override
+
+  @Override
   public float getShininess(int index) {
     if (family == GROUP) {
       return inGeo.shininess[index];
@@ -3482,11 +2447,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param shininess
-     */
-    @Override
+
+  @Override
   public void setShininess(float shininess) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setShininess()");
@@ -3503,11 +2465,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param shininess
-     */
-    protected void setShininessImpl(float shininess) {
+
+  protected void setShininessImpl(float shininess) {
     if (PGraphicsOpenGL.same(this.shininess, shininess)) return;
     this.shininess = shininess;
 
@@ -3527,12 +2486,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param shine
-     */
-    @Override
+
+  @Override
   public void setShininess(int index, float shine) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setShininess()");
@@ -3549,11 +2504,8 @@ public class PShapeOpenGL extends PShape {
 
   // Vertex codes
 
-    /**
-     *
-     * @return
-     */
-    @Override
+
+  @Override
   public int[] getVertexCodes() {
     if (family == GROUP) return null;
     else {
@@ -3567,11 +2519,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @return
-     */
-    @Override
+
+  @Override
   public int getVertexCodeCount() {
     if (family == GROUP) return 0;
     else {
@@ -3587,8 +2536,6 @@ public class PShapeOpenGL extends PShape {
 
   /**
    * One of VERTEX, BEZIER_VERTEX, CURVE_VERTEX, or BREAK.
-     * @param index
-     * @return 
    */
   @Override
   public int getVertexCode(int index) {
@@ -3602,11 +2549,6 @@ public class PShapeOpenGL extends PShape {
 
   // Tessellated geometry getter.
 
-    /**
-     *
-     * @return
-     */
-
 
   @Override
   public PShape getTessellation() {
@@ -3707,13 +2649,6 @@ public class PShapeOpenGL extends PShape {
   }
 
   // Testing this method, not use as it might go away...
-
-    /**
-     *
-     * @param kind
-     * @param data
-     * @return
-     */
   public float[] getTessellation(int kind, int data) {
     updateTessellation();
 
@@ -3815,10 +2750,6 @@ public class PShapeOpenGL extends PShape {
 
   // Tessellation
 
-    /**
-     *
-     */
-
 
   protected void updateTessellation() {
     if (!root.tessellated) {
@@ -3829,18 +2760,14 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void markForTessellation() {
+
+  protected void markForTessellation() {
     root.tessellated = false;
     tessellated = false;
   }
 
-    /**
-     *
-     */
-    protected void initModified() {
+
+  protected void initModified() {
     modified = false;
 
     modifiedPolyVertices = false;
@@ -3892,10 +2819,8 @@ public class PShapeOpenGL extends PShape {
     lastModifiedPointAttribute = PConstants.MIN_INT;
   }
 
-    /**
-     *
-     */
-    protected void tessellate() {
+
+  protected void tessellate() {
     if (root == this && parent == null) { // Root shape
       if (polyAttribs == null) {
         polyAttribs = PGraphicsOpenGL.newAttributeMap();
@@ -3920,10 +2845,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void collectPolyAttribs() {
+
+  protected void collectPolyAttribs() {
     AttributeMap rootAttribs = root.polyAttribs;
 
     if (family == GROUP) {
@@ -3947,10 +2870,7 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void tessellateImpl() {
+  protected void tessellateImpl() {
     tessGeo = root.tessGeo;
 
     firstPolyIndexCache = -1;
@@ -4084,10 +3004,8 @@ public class PShapeOpenGL extends PShape {
     tessellated = true;
   }
 
-    /**
-     *
-     */
-    protected void tessellatePoint() {
+
+  protected void tessellatePoint() {
     float x = 0, y = 0, z = 0;
     if (params.length == 2) {
       x = params[0];
@@ -4106,10 +3024,8 @@ public class PShapeOpenGL extends PShape {
     tessellator.tessellatePoints();
   }
 
-    /**
-     *
-     */
-    protected void tessellateLine() {
+
+  protected void tessellateLine() {
     float x1 = 0, y1 = 0, z1 = 0;
     float x2 = 0, y2 = 0, z2 = 0;
     if (params.length == 4) {
@@ -4135,10 +3051,8 @@ public class PShapeOpenGL extends PShape {
     tessellator.tessellateLines();
   }
 
-    /**
-     *
-     */
-    protected void tessellateTriangle() {
+
+  protected void tessellateTriangle() {
     float x1 = 0, y1 = 0;
     float x2 = 0, y2 = 0;
     float x3 = 0, y3 = 0;
@@ -4161,10 +3075,8 @@ public class PShapeOpenGL extends PShape {
     tessellator.tessellateTriangles();
   }
 
-    /**
-     *
-     */
-    protected void tessellateQuad() {
+
+  protected void tessellateQuad() {
     float x1 = 0, y1 = 0;
     float x2 = 0, y2 = 0;
     float x3 = 0, y3 = 0;
@@ -4191,10 +3103,8 @@ public class PShapeOpenGL extends PShape {
     tessellator.tessellateQuads();
   }
 
-    /**
-     *
-     */
-    protected void tessellateRect() {
+
+  protected void tessellateRect() {
     float a = 0, b = 0, c = 0, d = 0;
     float tl = 0, tr = 0, br = 0, bl = 0;
     boolean rounded = false;
@@ -4277,10 +3187,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void tessellateEllipse() {
+
+  protected void tessellateEllipse() {
     float a = 0, b = 0, c = 0, d = 0;
     int mode = ellipseMode;
 
@@ -4328,10 +3236,8 @@ public class PShapeOpenGL extends PShape {
     tessellator.tessellateTriangleFan();
   }
 
-    /**
-     *
-     */
-    protected void tessellateArc() {
+
+  protected void tessellateArc() {
     float a = 0, b = 0, c = 0, d = 0;
     float start = 0, stop = 0;
     int mode = ellipseMode;
@@ -4392,10 +3298,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void tessellateBox() {
+
+  protected void tessellateBox() {
     float w = 0, h = 0, d = 0;
     if (params.length == 1) {
       w = h = d = params[0];
@@ -4411,10 +3315,8 @@ public class PShapeOpenGL extends PShape {
     tessellator.tessellateQuads();
   }
 
-    /**
-     *
-     */
-    protected void tessellateSphere() {
+
+  protected void tessellateSphere() {
     float r = 0;
     int nu = sphereDetailU;
     int nv = sphereDetailV;
@@ -4448,10 +3350,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void tessellatePath() {
+
+  protected void tessellatePath() {
     if (vertices == null) return;
 
     inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
@@ -4577,29 +3477,20 @@ public class PShapeOpenGL extends PShape {
     if (curv) restoreCurveVertexSettings();
   }
 
-    /**
-     *
-     */
-    protected void saveBezierVertexSettings() {
+  protected void saveBezierVertexSettings() {
     savedBezierDetail = pg.bezierDetail;
     if (pg.bezierDetail != bezierDetail) {
       pg.bezierDetail(bezierDetail);
     }
   }
 
-    /**
-     *
-     */
-    protected void restoreBezierVertexSettings() {
+  protected void restoreBezierVertexSettings() {
     if (savedBezierDetail != bezierDetail) {
       pg.bezierDetail(savedBezierDetail);
     }
   }
 
-    /**
-     *
-     */
-    protected void saveCurveVertexSettings() {
+  protected void saveCurveVertexSettings() {
     savedCurveDetail = pg.curveDetail;
     savedCurveTightness = pg.curveTightness;
     if (pg.curveDetail != curveDetail) {
@@ -4610,10 +3501,7 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void restoreCurveVertexSettings() {
+  protected void restoreCurveVertexSettings() {
     if (savedCurveDetail != curveDetail) {
       pg.curveDetail(savedCurveDetail);
     }
@@ -4628,10 +3516,8 @@ public class PShapeOpenGL extends PShape {
 
   // Aggregation
 
-    /**
-     *
-     */
-    protected void aggregate() {
+
+  protected void aggregate() {
     if (root == this && parent == null) {
       // Initializing auxiliary variables in root node
       // needed for aggregation.
@@ -4683,10 +3569,6 @@ public class PShapeOpenGL extends PShape {
   // vertices (4 + 5 + 6 + 3 = 18) being rendered, while calling
   // draw() from either child groups 0 or 1 should result in the first
   // 4 vertices or the last 14 vertices being rendered, respectively.
-
-    /**
-     *
-     */
   protected void aggregateImpl() {
     if (family == GROUP) {
       // Recursively aggregating the child shapes.
@@ -4736,10 +3618,6 @@ public class PShapeOpenGL extends PShape {
 
 
   // Updates the index cache for the range that corresponds to this shape.
-
-    /**
-     *
-     */
   protected void updatePolyIndexCache() {
     IndexCache cache = tessGeo.polyIndexCache;
     if (family == GROUP) {
@@ -4840,22 +3718,14 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param n
-     * @return
-     */
-    protected boolean startStrokedTex(int n) {
+
+  protected boolean startStrokedTex(int n) {
     return image != null && (n == firstLineIndexCache ||
                                n == firstPointIndexCache);
   }
 
-    /**
-     *
-     * @param n
-     * @param vert
-     */
-    protected void setFirstStrokeVertex(int n, int vert) {
+
+  protected void setFirstStrokeVertex(int n, int vert) {
     if (n == firstLineIndexCache && firstLineVertex == -1) {
       firstLineVertex = lastLineVertex = vert;
     }
@@ -4864,11 +3734,7 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param vert
-     */
-    protected void setLastStrokeVertex(int vert) {
+  protected void setLastStrokeVertex(int vert) {
     if (-1 < lastLineVertex) {
       lastLineVertex = vert;
     }
@@ -4877,10 +3743,7 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void updateLineIndexCache() {
+  protected void updateLineIndexCache() {
     IndexCache cache = tessGeo.lineIndexCache;
     if (family == GROUP) {
       firstLineIndexCache = lastLineIndexCache = -1;
@@ -4942,10 +3805,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void updatePointIndexCache() {
+
+  protected void updatePointIndexCache() {
     IndexCache cache = tessGeo.pointIndexCache;
     if (family == GROUP) {
       firstPointIndexCache = lastPointIndexCache = -1;
@@ -5020,10 +3881,6 @@ public class PShapeOpenGL extends PShape {
 
   //  Buffer initialization
 
-    /**
-     *
-     */
-
 
   protected void initBuffers() {
     boolean outdated = contextIsOutdated();
@@ -5044,10 +3901,8 @@ public class PShapeOpenGL extends PShape {
     needBufferInit = false;
   }
 
-    /**
-     *
-     */
-    protected void initPolyBuffers() {
+
+  protected void initPolyBuffers() {
     int size = tessGeo.polyVertexCount;
     int sizef = size * PGL.SIZEOF_FLOAT;
     int sizei = size * PGL.SIZEOF_INT;
@@ -5130,10 +3985,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     */
-    protected void initLineBuffers() {
+
+  protected void initLineBuffers() {
     int size = tessGeo.lineVertexCount;
     int sizef = size * PGL.SIZEOF_FLOAT;
     int sizei = size * PGL.SIZEOF_INT;
@@ -5172,10 +4025,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     */
-    protected void initPointBuffers() {
+
+  protected void initPointBuffers() {
     int size = tessGeo.pointVertexCount;
     int sizef = size * PGL.SIZEOF_FLOAT;
     int sizei = size * PGL.SIZEOF_INT;
@@ -5214,11 +4065,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @return
-     */
-    protected boolean contextIsOutdated() {
+
+  protected boolean contextIsOutdated() {
     boolean outdated = !pgl.contextIsCurrent(context);
     if (outdated) {
       bufPolyVertex.dispose();
@@ -5254,10 +4102,6 @@ public class PShapeOpenGL extends PShape {
 
   //  Geometry update
 
-    /**
-     *
-     */
-
 
   protected void updateGeometry() {
     root.initBuffers();
@@ -5266,10 +4110,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     */
-    protected void updateGeometryImpl() {
+
+  protected void updateGeometryImpl() {
     if (modifiedPolyVertices) {
       int offset = firstModifiedPolyVertex;
       int size = lastModifiedPolyVertex - offset + 1;
@@ -5399,12 +4241,8 @@ public class PShapeOpenGL extends PShape {
     modified = false;
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyVertices(int offset, int size) {
+
+  protected void copyPolyVertices(int offset, int size) {
     tessGeo.updatePolyVerticesBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyVertex.glId);
     tessGeo.polyVerticesBuffer.position(4 * offset);
@@ -5414,12 +4252,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyColors(int offset, int size) {
+
+  protected void copyPolyColors(int offset, int size) {
     tessGeo.updatePolyColorsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyColor.glId);
     tessGeo.polyColorsBuffer.position(offset);
@@ -5429,12 +4263,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyNormals(int offset, int size) {
+
+  protected void copyPolyNormals(int offset, int size) {
     tessGeo.updatePolyNormalsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyNormal.glId);
     tessGeo.polyNormalsBuffer.position(3 * offset);
@@ -5444,12 +4274,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyTexCoords(int offset, int size) {
+
+  protected void copyPolyTexCoords(int offset, int size) {
     tessGeo.updatePolyTexCoordsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyTexcoord.glId);
     tessGeo.polyTexCoordsBuffer.position(2 * offset);
@@ -5459,12 +4285,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyAmbient(int offset, int size) {
+
+  protected void copyPolyAmbient(int offset, int size) {
     tessGeo.updatePolyAmbientBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyAmbient.glId);
     tessGeo.polyAmbientBuffer.position(offset);
@@ -5474,12 +4296,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolySpecular(int offset, int size) {
+
+  protected void copyPolySpecular(int offset, int size) {
     tessGeo.updatePolySpecularBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolySpecular.glId);
     tessGeo.polySpecularBuffer.position(offset);
@@ -5489,12 +4307,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyEmissive(int offset, int size) {
+
+  protected void copyPolyEmissive(int offset, int size) {
     tessGeo.updatePolyEmissiveBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyEmissive.glId);
     tessGeo.polyEmissiveBuffer.position(offset);
@@ -5504,12 +4318,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyShininess(int offset, int size) {
+
+  protected void copyPolyShininess(int offset, int size) {
     tessGeo.updatePolyShininessBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyShininess.glId);
     tessGeo.polyShininessBuffer.position(offset);
@@ -5519,13 +4329,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param attrib
-     * @param offset
-     * @param size
-     */
-    protected void copyPolyAttrib(VertexAttribute attrib, int offset, int size) {
+
+  protected void copyPolyAttrib(VertexAttribute attrib, int offset, int size) {
     tessGeo.updateAttribBuffer(attrib.name, offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, attrib.buf.glId);
     Buffer buf = tessGeo.polyAttribBuffers.get(attrib.name);
@@ -5536,12 +4341,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyLineVertices(int offset, int size) {
+
+  protected void copyLineVertices(int offset, int size) {
     tessGeo.updateLineVerticesBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineVertex.glId);
     tessGeo.lineVerticesBuffer.position(4 * offset);
@@ -5551,12 +4352,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyLineColors(int offset, int size) {
+
+  protected void copyLineColors(int offset, int size) {
     tessGeo.updateLineColorsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineColor.glId);
     tessGeo.lineColorsBuffer.position(offset);
@@ -5566,12 +4363,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyLineAttributes(int offset, int size) {
+
+  protected void copyLineAttributes(int offset, int size) {
     tessGeo.updateLineDirectionsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineAttrib.glId);
     tessGeo.lineDirectionsBuffer.position(4 * offset);
@@ -5581,12 +4374,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPointVertices(int offset, int size) {
+
+  protected void copyPointVertices(int offset, int size) {
     tessGeo.updatePointVerticesBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointVertex.glId);
     tessGeo.pointVerticesBuffer.position(4 * offset);
@@ -5596,12 +4385,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPointColors(int offset, int size) {
+
+  protected void copyPointColors(int offset, int size) {
     tessGeo.updatePointColorsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointColor.glId);
     tessGeo.pointColorsBuffer.position(offset);
@@ -5611,12 +4396,8 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param offset
-     * @param size
-     */
-    protected void copyPointAttributes(int offset, int size) {
+
+  protected void copyPointAttributes(int offset, int size) {
     tessGeo.updatePointOffsetsBuffer(offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointAttrib.glId);
     tessGeo.pointOffsetsBuffer.position(2 * offset);
@@ -5626,181 +4407,120 @@ public class PShapeOpenGL extends PShape {
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyVertices(int first, int last) {
+
+  protected void setModifiedPolyVertices(int first, int last) {
     if (first < firstModifiedPolyVertex) firstModifiedPolyVertex = first;
     if (last > lastModifiedPolyVertex) lastModifiedPolyVertex = last;
     modifiedPolyVertices = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyColors(int first, int last) {
+
+  protected void setModifiedPolyColors(int first, int last) {
     if (first < firstModifiedPolyColor) firstModifiedPolyColor = first;
     if (last > lastModifiedPolyColor) lastModifiedPolyColor = last;
     modifiedPolyColors = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyNormals(int first, int last) {
+
+  protected void setModifiedPolyNormals(int first, int last) {
     if (first < firstModifiedPolyNormal) firstModifiedPolyNormal = first;
     if (last > lastModifiedPolyNormal) lastModifiedPolyNormal = last;
     modifiedPolyNormals = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyTexCoords(int first, int last) {
+
+  protected void setModifiedPolyTexCoords(int first, int last) {
     if (first < firstModifiedPolyTexcoord) firstModifiedPolyTexcoord = first;
     if (last > lastModifiedPolyTexcoord) lastModifiedPolyTexcoord = last;
     modifiedPolyTexCoords = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyAmbient(int first, int last) {
+
+  protected void setModifiedPolyAmbient(int first, int last) {
     if (first < firstModifiedPolyAmbient) firstModifiedPolyAmbient = first;
     if (last > lastModifiedPolyAmbient) lastModifiedPolyAmbient = last;
     modifiedPolyAmbient = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolySpecular(int first, int last) {
+
+  protected void setModifiedPolySpecular(int first, int last) {
     if (first < firstModifiedPolySpecular) firstModifiedPolySpecular = first;
     if (last > lastModifiedPolySpecular) lastModifiedPolySpecular = last;
     modifiedPolySpecular = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyEmissive(int first, int last) {
+
+  protected void setModifiedPolyEmissive(int first, int last) {
     if (first < firstModifiedPolyEmissive) firstModifiedPolyEmissive = first;
     if (last > lastModifiedPolyEmissive) lastModifiedPolyEmissive = last;
     modifiedPolyEmissive = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyShininess(int first, int last) {
+
+  protected void setModifiedPolyShininess(int first, int last) {
     if (first < firstModifiedPolyShininess) firstModifiedPolyShininess = first;
     if (last > lastModifiedPolyShininess) lastModifiedPolyShininess = last;
     modifiedPolyShininess = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param attrib
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPolyAttrib(VertexAttribute attrib, int first, int last) {
+
+  protected void setModifiedPolyAttrib(VertexAttribute attrib, int first, int last) {
     if (first < attrib.firstModified) attrib.firstModified = first;
     if (last > attrib.lastModified) attrib.lastModified = last;
     attrib.modified = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedLineVertices(int first, int last) {
+
+  protected void setModifiedLineVertices(int first, int last) {
     if (first < firstModifiedLineVertex) firstModifiedLineVertex = first;
     if (last > lastModifiedLineVertex) lastModifiedLineVertex = last;
     modifiedLineVertices = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedLineColors(int first, int last) {
+
+  protected void setModifiedLineColors(int first, int last) {
     if (first < firstModifiedLineColor) firstModifiedLineColor = first;
     if (last > lastModifiedLineColor) lastModifiedLineColor = last;
     modifiedLineColors = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedLineAttributes(int first, int last) {
+
+  protected void setModifiedLineAttributes(int first, int last) {
     if (first < firstModifiedLineAttribute) firstModifiedLineAttribute = first;
     if (last > lastModifiedLineAttribute) lastModifiedLineAttribute = last;
     modifiedLineAttributes = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPointVertices(int first, int last) {
+
+  protected void setModifiedPointVertices(int first, int last) {
     if (first < firstModifiedPointVertex) firstModifiedPointVertex = first;
     if (last > lastModifiedPointVertex) lastModifiedPointVertex = last;
     modifiedPointVertices = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPointColors(int first, int last) {
+
+  protected void setModifiedPointColors(int first, int last) {
     if (first < firstModifiedPointColor) firstModifiedPointColor = first;
     if (last > lastModifiedPointColor) lastModifiedPointColor = last;
     modifiedPointColors = true;
     modified = true;
   }
 
-    /**
-     *
-     * @param first
-     * @param last
-     */
-    protected void setModifiedPointAttributes(int first, int last) {
+
+  protected void setModifiedPointAttributes(int first, int last) {
     if (first < firstModifiedPointAttribute) firstModifiedPointAttribute = first;
     if (last > lastModifiedPointAttribute) lastModifiedPointAttribute = last;
     modifiedPointAttributes = true;
@@ -5878,11 +4598,8 @@ public class PShapeOpenGL extends PShape {
     super.enableStyle();
   }
 
-    /**
-     *
-     * @param g
-     */
-    @Override
+
+  @Override
   protected void styles(PGraphics g) {
     if (g instanceof PGraphicsOpenGL) {
       if (g.stroke) {
@@ -6066,23 +4783,14 @@ public class PShapeOpenGL extends PShape {
   // so they cannot rendered in a single call.
   // Or accurate 2D mode is enabled, which forces each
   // shape to be rendered separately.
-
-    /**
-     *
-     * @param g
-     * @return
-     */
   protected boolean fragmentedGroup(PGraphicsOpenGL g) {
     return g.getHint(DISABLE_OPTIMIZED_STROKE) ||
            (textures != null && (1 < textures.size() || untexChild)) ||
            strokedTexture;
   }
 
-    /**
-     *
-     * @param g
-     */
-    @Override
+
+  @Override
   protected void pre(PGraphics g) {
     if (g instanceof PGraphicsOpenGL) {
       if (!style) {
@@ -6093,11 +4801,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    @Override
+
+  @Override
   protected void post(PGraphics g) {
     if (g instanceof PGraphicsOpenGL) {
     } else {
@@ -6105,11 +4810,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    @Override
+
+  @Override
   protected void drawGeometry(PGraphics g) {
     vertexCount = inGeo.vertexCount;
     vertices = inGeo.getVertexData();
@@ -6123,12 +4825,6 @@ public class PShapeOpenGL extends PShape {
 
   // Render the geometry stored in the root shape as VBOs, for the vertices
   // corresponding to this shape. Sometimes we can have root == this.
-
-    /**
-     *
-     * @param g
-     * @param texture
-     */
   protected void render(PGraphicsOpenGL g, PImage texture) {
     if (root == null) {
       // Some error. Root should never be null. At least it should be 'this'.
@@ -6162,12 +4858,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param g
-     * @param textureImage
-     */
-    protected void renderPolys(PGraphicsOpenGL g, PImage textureImage) {
+
+  protected void renderPolys(PGraphicsOpenGL g, PImage textureImage) {
     boolean customShader = g.polyShader != null;
     boolean needNormals = customShader ? g.polyShader.accessNormals() : false;
     boolean needTexCoords = customShader ? g.polyShader.accessTexCoords() : false;
@@ -6261,12 +4953,8 @@ public class PShapeOpenGL extends PShape {
     }
   }
 
-    /**
-     *
-     * @param g
-     * @param textureImage
-     */
-    protected void rawPolys(PGraphicsOpenGL g, PImage textureImage) {
+
+  protected void rawPolys(PGraphicsOpenGL g, PImage textureImage) {
     PGraphics raw = g.getRaw();
 
     raw.colorMode(RGB);
@@ -6360,11 +5048,8 @@ public class PShapeOpenGL extends PShape {
     raw.endShape();
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void renderLines(PGraphicsOpenGL g) {
+
+  protected void renderLines(PGraphicsOpenGL g) {
     PShader shader = g.getLineShader();
     shader.bind();
 
@@ -6387,11 +5072,8 @@ public class PShapeOpenGL extends PShape {
     shader.unbind();
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void rawLines(PGraphicsOpenGL g) {
+
+  protected void rawLines(PGraphicsOpenGL g) {
     PGraphics raw = g.getRaw();
 
     raw.colorMode(RGB);
@@ -6463,11 +5145,8 @@ public class PShapeOpenGL extends PShape {
     raw.endShape();
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void renderPoints(PGraphicsOpenGL g) {
+
+  protected void renderPoints(PGraphicsOpenGL g) {
     PShader shader = g.getPointShader();
     shader.bind();
 
@@ -6490,11 +5169,8 @@ public class PShapeOpenGL extends PShape {
     shader.unbind();
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void rawPoints(PGraphicsOpenGL g) {
+
+  protected void rawPoints(PGraphicsOpenGL g) {
     PGraphics raw = g.getRaw();
 
     raw.colorMode(RGB);