picrate 0.2.0-java → 0.3.0-java

data/src/main/java/processing/core/PShape.java

@@ -78,16 +78,8 @@ import processing.core.PApplet;
  * @instanceName sh any variable of type PShape
  */
 public class PShape implements PConstants {
-
-    /**
-     *
-     */
-    protected String name;
-
-    /**
-     *
-     */
-    protected Map<String,PShape> nameTable;
+  protected String name;
+  protected Map<String,PShape> nameTable;
 
 //  /** Generic, only draws its child objects. */
 //  static public final int GROUP = 0;
@@ -108,53 +100,29 @@ public class PShape implements PConstants {
   /** ELLIPSE, LINE, QUAD; TRIANGLE_FAN, QUAD_STRIP; etc. */
   protected int kind;
 
-    /**
-     *
-     */
-    protected PMatrix matrix;
+  protected PMatrix matrix;
 
-    /**
-     *
-     */
-    protected int textureMode;
+  protected int textureMode;
 
   /** Texture or image data associated with this shape. */
   protected PImage image;
 
-    /**
-     *
-     */
-    public static final String OUTSIDE_BEGIN_END_ERROR =
+  public static final String OUTSIDE_BEGIN_END_ERROR =
     "%1$s can only be called between beginShape() and endShape()";
 
-    /**
-     *
-     */
-    public static final String INSIDE_BEGIN_END_ERROR =
+  public static final String INSIDE_BEGIN_END_ERROR =
     "%1$s can only be called outside beginShape() and endShape()";
 
-    /**
-     *
-     */
-    public static final String NO_SUCH_VERTEX_ERROR =
+  public static final String NO_SUCH_VERTEX_ERROR =
     "%1$s vertex index does not exist";
 
-    /**
-     *
-     */
-    static public final String NO_VERTICES_ERROR =
+  static public final String NO_VERTICES_ERROR =
     "getVertexCount() only works with PATH or GEOMETRY shapes";
 
-    /**
-     *
-     */
-    public static final String NOT_A_SIMPLE_VERTEX =
+  public static final String NOT_A_SIMPLE_VERTEX =
     "%1$s can not be called on quadratic or bezier vertices";
 
-    /**
-     *
-     */
-    static public final String PER_VERTEX_UNSUPPORTED =
+  static public final String PER_VERTEX_UNSUPPORTED =
     "This renderer does not support %1$s for individual vertices";
 
   /**
@@ -182,117 +150,39 @@ public class PShape implements PConstants {
    */
   public float height;
 
-    /**
-     *
-     */
-    public float depth;
+  public float depth;
 
   PGraphics g;
 
   // set to false if the object is hidden in the layers palette
-
-    /**
-     *
-     */
   protected boolean visible = true;
 
     /** Retained shape being created with beginShape/endShape */
   protected boolean openShape = false;
 
-    /**
-     *
-     */
-    protected boolean openContour = false;
-
-    /**
-     *
-     */
-    protected boolean stroke;
-
-    /**
-     *
-     */
-    protected int strokeColor;
-
-    /**
-     *
-     */
-    protected float strokeWeight; // default is 1
-
-    /**
-     *
-     */
-    protected int strokeCap;
-
-    /**
-     *
-     */
-    protected int strokeJoin;
-
-    /**
-     *
-     */
-    protected boolean fill;
-
-    /**
-     *
-     */
-    protected int fillColor;
-
-    /**
-     *
-     */
-    protected boolean tint;
-
-    /**
-     *
-     */
-    protected int tintColor;
-
-    /**
-     *
-     */
-    protected int ambientColor;
-
-    /**
-     *
-     */
-    protected boolean setAmbient;
-
-    /**
-     *
-     */
-    protected int specularColor;
-
-    /**
-     *
-     */
-    protected int emissiveColor;
-
-    /**
-     *
-     */
-    protected float shininess;
-
-    /**
-     *
-     */
-    protected int sphereDetailU,
-
-    /**
-     *
-     */
-    sphereDetailV;
-
-    /**
-     *
-     */
-    protected int rectMode;
-
-    /**
-     *
-     */
-    protected int ellipseMode;
+  protected boolean openContour = false;
+
+  protected boolean stroke;
+  protected int strokeColor;
+  protected float strokeWeight; // default is 1
+  protected int strokeCap;
+  protected int strokeJoin;
+
+  protected boolean fill;
+  protected int fillColor;
+
+  protected boolean tint;
+  protected int tintColor;
+
+  protected int ambientColor;
+  protected boolean setAmbient;
+  protected int specularColor;
+  protected int emissiveColor;
+  protected float shininess;
+
+  protected int sphereDetailU, sphereDetailV;
+  protected int rectMode;
+  protected int ellipseMode;
 
   /** Temporary toggle for whether styles should be honored. */
   protected boolean style = true;
@@ -300,10 +190,7 @@ public class PShape implements PConstants {
   /** For primitive shapes in particular, params like x/y/w/h or x1/y1/x2/y2. */
   protected float[] params;
 
-    /**
-     *
-     */
-    protected int vertexCount;
+  protected int vertexCount;
   /**
    * When drawing POLYGON shapes, the second param is an array of length
    * VERTEX_FIELD_COUNT. When drawing PATH shapes, the second param has only
@@ -311,85 +198,24 @@ public class PShape implements PConstants {
    */
   protected float[][] vertices;
 
-    /**
-     *
-     */
-    protected PShape parent;
-
-    /**
-     *
-     */
-    protected int childCount;
-
-    /**
-     *
-     */
-    protected PShape[] children;
+  protected PShape parent;
+  protected int childCount;
+  protected PShape[] children;
 
 
   /** Array of VERTEX, BEZIER_VERTEX, and CURVE_VERTEX calls. */
   protected int vertexCodeCount;
-
-    /**
-     *
-     */
-    protected int[] vertexCodes;
+  protected int[] vertexCodes;
   /** True if this is a closed path. */
   protected boolean close;
 
   // ........................................................
 
   // internal color for setting/calculating
-
-    /**
-     *
-     */
-  protected float calcR,
-
-    /**
-     *
-     */
-    calcG,
-
-    /**
-     *
-     */
-    calcB,
-
-    /**
-     *
-     */
-    calcA;
-
-    /**
-     *
-     */
-    protected int calcRi,
-
-    /**
-     *
-     */
-    calcGi,
-
-    /**
-     *
-     */
-    calcBi,
-
-    /**
-     *
-     */
-    calcAi;
-
-    /**
-     *
-     */
-    protected int calcColor;
-
-    /**
-     *
-     */
-    protected boolean calcAlpha;
+  protected float calcR, calcG, calcB, calcA;
+  protected int calcRi, calcGi, calcBi, calcAi;
+  protected int calcColor;
+  protected boolean calcAlpha;
 
   /** The current colorMode */
   public int colorMode; // = RGB;
@@ -415,10 +241,7 @@ public class PShape implements PConstants {
   /** True if contains 3D data */
   protected boolean is3D = false;
 
-    /**
-     *
-     */
-    protected boolean perVertexStyles = false;
+  protected boolean perVertexStyles = false;
 
   // should this be called vertices (consistent with PGraphics internals)
   // or does that hurt flexibility?
@@ -465,7 +288,6 @@ public class PShape implements PConstants {
 
 
   /**
-     * @param family
    * @nowebref
    */
   public PShape(int family) {
@@ -474,8 +296,6 @@ public class PShape implements PConstants {
 
 
   /**
-     * @param g
-     * @param family
    * @nowebref
    */
   public PShape(PGraphics g, int family) {
@@ -537,47 +357,30 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param g
-     * @param kind
-     * @param params
-     */
-    public PShape(PGraphics g, int kind, float... params) {
+
+  public PShape(PGraphics g, int kind, float... params) {
     this(g, PRIMITIVE);
     setKind(kind);
     setParams(params);
   }
 
-    /**
-     *
-     * @param family
-     */
-    public void setFamily(int family) {
+
+  public void setFamily(int family) {
     this.family = family;
   }
 
-    /**
-     *
-     * @param kind
-     */
-    public void setKind(int kind) {
+
+  public void setKind(int kind) {
     this.kind = kind;
   }
 
-    /**
-     *
-     * @param name
-     */
-    public void setName(String name) {
+
+  public void setName(String name) {
     this.name = name;
   }
 
-    /**
-     *
-     * @return
-     */
-    public String getName() {
+
+  public String getName() {
     return name;
   }
 
@@ -592,7 +395,6 @@ public class PShape implements PConstants {
    * showing or hiding the shape in the layers palette in Adobe Illustrator.
    *
    * ( end auto-generated )
-     * @return 
    * @webref pshape:method
    * @usage web_application
    * @brief Returns a boolean value "true" if the image is set to be visible, "false" if not
@@ -688,7 +490,6 @@ public class PShape implements PConstants {
 
   /**
    * Get the width of the drawing area (not necessarily the shape boundary).
-     * @return 
    */
   public float getWidth() {
     //checkBounds();
@@ -698,7 +499,6 @@ public class PShape implements PConstants {
 
   /**
    * Get the height of the drawing area (not necessarily the shape boundary).
-     * @return 
    */
   public float getHeight() {
     //checkBounds();
@@ -709,7 +509,6 @@ public class PShape implements PConstants {
   /**
    * Get the depth of the shape area (not necessarily the shape boundary). Only makes sense for 3D PShape subclasses,
    * such as PShape3D.
-     * @return 
    */
   public float getDepth() {
     //checkBounds();
@@ -749,7 +548,6 @@ public class PShape implements PConstants {
 
   /**
    * Return true if this shape is 2D. Defaults to true.
-     * @return 
    */
   public boolean is2D() {
     return !is3D;
@@ -758,17 +556,13 @@ public class PShape implements PConstants {
 
   /**
    * Return true if this shape is 3D. Defaults to false.
-     * @return 
    */
   public boolean is3D() {
     return is3D;
   }
 
-    /**
-     *
-     * @param val
-     */
-    public void set3D(boolean val) {
+
+  public void set3D(boolean val) {
     is3D = val;
   }
 
@@ -788,11 +582,6 @@ public class PShape implements PConstants {
 
   // Drawing methods
 
-    /**
-     *
-     * @param mode
-     */
-
   public void textureMode(int mode) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "textureMode()");
@@ -802,11 +591,7 @@ public class PShape implements PConstants {
     textureMode = mode;
   }
 
-    /**
-     *
-     * @param tex
-     */
-    public void texture(PImage tex) {
+  public void texture(PImage tex) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "texture()");
       return;
@@ -815,10 +600,7 @@ public class PShape implements PConstants {
     image = tex;
   }
 
-    /**
-     *
-     */
-    public void noTexture() {
+  public void noTexture() {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "noTexture()");
       return;
@@ -829,11 +611,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param solid
-     */
   protected void solid(boolean solid) {
   }
 
@@ -862,10 +639,8 @@ public class PShape implements PConstants {
     beginContourImpl();
   }
 
-    /**
-     *
-     */
-    protected void beginContourImpl() {
+
+  protected void beginContourImpl() {
     if (vertexCodes == null) {
       vertexCodes = new int[10];
     } else if (vertexCodes.length == vertexCodeCount) {
@@ -899,18 +674,12 @@ public class PShape implements PConstants {
     openContour = false;
   }
 
-    /**
-     *
-     */
-    protected void endContourImpl() {
+
+  protected void endContourImpl() {
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    public void vertex(float x, float y) {
+
+  public void vertex(float x, float y) {
     if (vertices == null) {
       vertices = new float[10][2];
     } else if (vertices.length == vertexCount) {
@@ -933,96 +702,44 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param u
-     * @param v
-     */
-    public void vertex(float x, float y, float u, float v) {
+
+  public void vertex(float x, float y, float u, float v) {
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void vertex(float x, float y, float z) {
+
+  public void vertex(float x, float y, float z) {
     vertex(x, y);  // maybe? maybe not?
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param u
-     * @param v
-     */
-    public void vertex(float x, float y, float z, float u, float v) {
+
+  public void vertex(float x, float y, float z, float u, float v) {
   }
 
-    /**
-     *
-     * @param nx
-     * @param ny
-     * @param nz
-     */
-    public void normal(float nx, float ny, float nz) {
+
+  public void normal(float nx, float ny, float nz) {
   }
 
-    /**
-     *
-     * @param name
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void attribPosition(String name, float x, float y, float z) {
+
+  public void attribPosition(String name, float x, float y, float z) {
   }
 
-    /**
-     *
-     * @param name
-     * @param nx
-     * @param ny
-     * @param nz
-     */
-    public void attribNormal(String name, float nx, float ny, float nz) {
+  public void attribNormal(String name, float nx, float ny, float nz) {
   }
 
-    /**
-     *
-     * @param name
-     * @param color
-     */
-    public void attribColor(String name, int color) {
+
+  public void attribColor(String name, int color) {
   }
 
-    /**
-     *
-     * @param name
-     * @param values
-     */
-    public void attrib(String name, float... values) {
+
+  public void attrib(String name, float... values) {
   }
 
-    /**
-     *
-     * @param name
-     * @param values
-     */
-    public void attrib(String name, int... values) {
+
+  public void attrib(String name, int... values) {
   }
 
-    /**
-     *
-     * @param name
-     * @param values
-     */
-    public void attrib(String name, boolean... values) {
+
+  public void attrib(String name, boolean... values) {
   }
 
 
@@ -1035,11 +752,8 @@ public class PShape implements PConstants {
     beginShape(POLYGON);
   }
 
-    /**
-     *
-     * @param kind
-     */
-    public void beginShape(int kind) {
+
+  public void beginShape(int kind) {
     this.kind = kind;
     openShape = true;
   }
@@ -1053,11 +767,8 @@ public class PShape implements PConstants {
     endShape(OPEN);
   }
 
-    /**
-     *
-     * @param mode
-     */
-    public void endShape(int mode) {
+
+  public void endShape(int mode) {
     if (family == GROUP) {
       PGraphics.showWarning("Cannot end GROUP shape");
       return;
@@ -1079,11 +790,6 @@ public class PShape implements PConstants {
 
   // STROKE CAP/JOIN/WEIGHT
 
-    /**
-     *
-     * @param weight
-     */
-
 
   public void strokeWeight(float weight) {
     if (!openShape) {
@@ -1094,11 +800,7 @@ public class PShape implements PConstants {
     strokeWeight = weight;
   }
 
-    /**
-     *
-     * @param join
-     */
-    public void strokeJoin(int join) {
+  public void strokeJoin(int join) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "strokeJoin()");
       return;
@@ -1107,11 +809,7 @@ public class PShape implements PConstants {
     strokeJoin = join;
   }
 
-    /**
-     *
-     * @param cap
-     */
-    public void strokeCap(int cap) {
+  public void strokeCap(int cap) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "strokeCap()");
       return;
@@ -1125,10 +823,6 @@ public class PShape implements PConstants {
 
   // FILL COLOR
 
-    /**
-     *
-     */
-
 
   public void noFill() {
     if (!openShape) {
@@ -1144,11 +838,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param rgb
-     */
-    public void fill(int rgb) {
+
+  public void fill(int rgb) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "fill()");
       return;
@@ -1163,12 +854,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param rgb
-     * @param alpha
-     */
-    public void fill(int rgb, float alpha) {
+
+  public void fill(int rgb, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "fill()");
       return;
@@ -1183,11 +870,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param gray
-     */
-    public void fill(float gray) {
+
+  public void fill(float gray) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "fill()");
       return;
@@ -1202,12 +886,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param gray
-     * @param alpha
-     */
-    public void fill(float gray, float alpha) {
+
+  public void fill(float gray, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "fill()");
       return;
@@ -1227,13 +907,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void fill(float x, float y, float z) {
+
+  public void fill(float x, float y, float z) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "fill()");
       return;
@@ -1248,14 +923,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param a
-     */
-    public void fill(float x, float y, float z, float a) {
+
+  public void fill(float x, float y, float z, float a) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "fill()");
       return;
@@ -1275,10 +944,6 @@ public class PShape implements PConstants {
 
   // STROKE COLOR
 
-    /**
-     *
-     */
-
 
   public void noStroke() {
     if (!openShape) {
@@ -1289,11 +954,8 @@ public class PShape implements PConstants {
     stroke = false;
   }
 
-    /**
-     *
-     * @param rgb
-     */
-    public void stroke(int rgb) {
+
+  public void stroke(int rgb) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "stroke()");
       return;
@@ -1304,12 +966,8 @@ public class PShape implements PConstants {
     strokeColor = calcColor;
   }
 
-    /**
-     *
-     * @param rgb
-     * @param alpha
-     */
-    public void stroke(int rgb, float alpha) {
+
+  public void stroke(int rgb, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "stroke()");
       return;
@@ -1320,11 +978,8 @@ public class PShape implements PConstants {
     strokeColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     */
-    public void stroke(float gray) {
+
+  public void stroke(float gray) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "stroke()");
       return;
@@ -1335,12 +990,8 @@ public class PShape implements PConstants {
     strokeColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     * @param alpha
-     */
-    public void stroke(float gray, float alpha) {
+
+  public void stroke(float gray, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "stroke()");
       return;
@@ -1351,13 +1002,8 @@ public class PShape implements PConstants {
     strokeColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void stroke(float x, float y, float z) {
+
+  public void stroke(float x, float y, float z) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "stroke()");
       return;
@@ -1368,14 +1014,8 @@ public class PShape implements PConstants {
     strokeColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param alpha
-     */
-    public void stroke(float x, float y, float z, float alpha) {
+
+  public void stroke(float x, float y, float z, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "stroke()");
       return;
@@ -1391,10 +1031,6 @@ public class PShape implements PConstants {
 
   // TINT COLOR
 
-    /**
-     *
-     */
-
 
   public void noTint() {
     if (!openShape) {
@@ -1405,11 +1041,8 @@ public class PShape implements PConstants {
     tint = false;
   }
 
-    /**
-     *
-     * @param rgb
-     */
-    public void tint(int rgb) {
+
+  public void tint(int rgb) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "tint()");
       return;
@@ -1420,12 +1053,8 @@ public class PShape implements PConstants {
     tintColor = calcColor;
   }
 
-    /**
-     *
-     * @param rgb
-     * @param alpha
-     */
-    public void tint(int rgb, float alpha) {
+
+  public void tint(int rgb, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "tint()");
       return;
@@ -1436,11 +1065,8 @@ public class PShape implements PConstants {
     tintColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     */
-    public void tint(float gray) {
+
+  public void tint(float gray) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "tint()");
       return;
@@ -1451,12 +1077,8 @@ public class PShape implements PConstants {
     tintColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     * @param alpha
-     */
-    public void tint(float gray, float alpha) {
+
+  public void tint(float gray, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "tint()");
       return;
@@ -1467,13 +1089,8 @@ public class PShape implements PConstants {
     tintColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void tint(float x, float y, float z) {
+
+  public void tint(float x, float y, float z) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "tint()");
       return;
@@ -1484,14 +1101,8 @@ public class PShape implements PConstants {
     tintColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param alpha
-     */
-    public void tint(float x, float y, float z, float alpha) {
+
+  public void tint(float x, float y, float z, float alpha) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "tint()");
       return;
@@ -1507,11 +1118,6 @@ public class PShape implements PConstants {
 
   // Ambient set/update
 
-    /**
-     *
-     * @param rgb
-     */
-
   public void ambient(int rgb) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "ambient()");
@@ -1523,11 +1129,8 @@ public class PShape implements PConstants {
     ambientColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     */
-    public void ambient(float gray) {
+
+  public void ambient(float gray) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "ambient()");
       return;
@@ -1538,13 +1141,8 @@ public class PShape implements PConstants {
     ambientColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void ambient(float x, float y, float z) {
+
+  public void ambient(float x, float y, float z) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "ambient()");
       return;
@@ -1560,11 +1158,6 @@ public class PShape implements PConstants {
 
   // Specular set/update
 
-    /**
-     *
-     * @param rgb
-     */
-
   public void specular(int rgb) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "specular()");
@@ -1575,11 +1168,8 @@ public class PShape implements PConstants {
     specularColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     */
-    public void specular(float gray) {
+
+  public void specular(float gray) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "specular()");
       return;
@@ -1589,13 +1179,8 @@ public class PShape implements PConstants {
     specularColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void specular(float x, float y, float z) {
+
+  public void specular(float x, float y, float z) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "specular()");
       return;
@@ -1610,11 +1195,6 @@ public class PShape implements PConstants {
 
   // Emissive set/update
 
-    /**
-     *
-     * @param rgb
-     */
-
   public void emissive(int rgb) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "emissive()");
@@ -1625,11 +1205,8 @@ public class PShape implements PConstants {
     emissiveColor = calcColor;
   }
 
-    /**
-     *
-     * @param gray
-     */
-    public void emissive(float gray) {
+
+  public void emissive(float gray) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "emissive()");
       return;
@@ -1639,13 +1216,8 @@ public class PShape implements PConstants {
     emissiveColor = calcColor;
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void emissive(float x, float y, float z) {
+
+  public void emissive(float x, float y, float z) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "emissive()");
       return;
@@ -1660,11 +1232,6 @@ public class PShape implements PConstants {
 
   // Shininess set/update
 
-    /**
-     *
-     * @param shine
-     */
-
   public void shininess(float shine) {
     if (!openShape) {
       PGraphics.showWarning(OUTSIDE_BEGIN_END_ERROR, "shininess()");
@@ -1680,23 +1247,12 @@ public class PShape implements PConstants {
 
   // Bezier curves
 
-    /**
-     *
-     * @param detail
-     */
-    public void bezierDetail(int detail) {
-  }
-
-    /**
-     *
-     * @param x2
-     * @param y2
-     * @param x3
-     * @param y3
-     * @param x4
-     * @param y4
-     */
-    public void bezierVertex(float x2, float y2,
+
+  public void bezierDetail(int detail) {
+  }
+
+
+  public void bezierVertex(float x2, float y2,
                            float x3, float y3,
                            float x4, float y4) {
     if (vertices == null) {
@@ -1722,31 +1278,14 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param x2
-     * @param y2
-     * @param z2
-     * @param x3
-     * @param y3
-     * @param z3
-     * @param x4
-     * @param y4
-     * @param z4
-     */
-    public void bezierVertex(float x2, float y2, float z2,
+
+  public void bezierVertex(float x2, float y2, float z2,
                            float x3, float y3, float z3,
                            float x4, float y4, float z4) {
   }
 
-    /**
-     *
-     * @param cx
-     * @param cy
-     * @param x3
-     * @param y3
-     */
-    public void quadraticVertex(float cx, float cy,
+
+  public void quadraticVertex(float cx, float cy,
                               float x3, float y3) {
     if (vertices == null) {
       vertices = new float[10][];
@@ -1770,16 +1309,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param cx
-     * @param cy
-     * @param cz
-     * @param x3
-     * @param y3
-     * @param z3
-     */
-    public void quadraticVertex(float cx, float cy, float cz,
+
+  public void quadraticVertex(float cx, float cy, float cz,
                               float x3, float y3, float z3) {
   }
 
@@ -1790,36 +1321,16 @@ public class PShape implements PConstants {
 
   // Catmull-Rom curves
 
-    /**
-     *
-     * @param detail
-     */
-
   public void curveDetail(int detail) {
   }
 
-    /**
-     *
-     * @param tightness
-     */
-    public void curveTightness(float tightness) {
+  public void curveTightness(float tightness) {
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    public void curveVertex(float x, float y) {
+  public void curveVertex(float x, float y) {
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    public void curveVertex(float x, float y, float z) {
+  public void curveVertex(float x, float y, float z) {
   }
 
 
@@ -1842,12 +1353,6 @@ public class PShape implements PConstants {
   int shapeModeSaved;
   */
 
-    /**
-     *
-     * @param g
-     */
-
-
 
   protected void pre(PGraphics g) {
     if (matrix != null) {
@@ -1875,11 +1380,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void styles(PGraphics g) {
+
+  protected void styles(PGraphics g) {
     // should not be necessary because using only the int version of color
     //parent.colorMode(PConstants.RGB, 255);
 
@@ -1900,11 +1402,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void post(PGraphics g) {
+
+  protected void post(PGraphics g) {
 //    for (int i = 0; i < childCount; i++) {
 //      children[i].draw(g);
 //    }
@@ -1939,13 +1438,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param parent
-     * @param src
-     * @return
-     */
   static protected PShape createShape(PApplet parent, PShape src) {
     PShape dest = null;
     if (src.family == GROUP) {
@@ -1967,13 +1459,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param parent
-     * @param src
-     * @param dest
-     */
   static protected void copyGroup(PApplet parent, PShape src, PShape dest) {
     copyMatrix(src, dest);
     copyStyles(src, dest);
@@ -1986,12 +1471,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param src
-     * @param dest
-     */
   static protected void copyPrimitive(PShape src, PShape dest) {
     copyMatrix(src, dest);
     copyStyles(src, dest);
@@ -2000,12 +1479,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param src
-     * @param dest
-     */
   static protected void copyGeometry(PShape src, PShape dest) {
     dest.beginShape(src.getKind());
 
@@ -2055,12 +1528,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param src
-     * @param dest
-     */
   static protected void copyPath(PShape src, PShape dest) {
     copyMatrix(src, dest);
     copyStyles(src, dest);
@@ -2071,12 +1538,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param src
-     * @param dest
-     */
   static protected void copyMatrix(PShape src, PShape dest) {
     if (src.matrix != null) {
       dest.applyMatrix(src.matrix);
@@ -2085,12 +1546,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param src
-     * @param dest
-     */
   static protected void copyStyles(PShape src, PShape dest) {
     dest.ellipseMode = src.ellipseMode;
     dest.rectMode = src.rectMode;
@@ -2115,12 +1570,6 @@ public class PShape implements PConstants {
 
 
   // TODO unapproved
-
-    /**
-     *
-     * @param src
-     * @param dest
-     */
   static protected void copyImage(PShape src, PShape dest) {
     if (src.image != null) {
       dest.texture(src.image);
@@ -2136,7 +1585,6 @@ public class PShape implements PConstants {
    * Called by the following (the shape() command adds the g)
    * PShape s = loadShape("blah.svg");
    * shape(s);
-     * @param g
    */
   public void draw(PGraphics g) {
     if (visible) {
@@ -2149,7 +1597,6 @@ public class PShape implements PConstants {
 
   /**
    * Draws the SVG document.
-     * @param g
    */
   protected void drawImpl(PGraphics g) {
     if (family == GROUP) {
@@ -2165,21 +1612,15 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void drawGroup(PGraphics g) {
+
+  protected void drawGroup(PGraphics g) {
     for (int i = 0; i < childCount; i++) {
       children[i].draw(g);
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void drawPrimitive(PGraphics g) {
+
+  protected void drawPrimitive(PGraphics g) {
     if (kind == POINT) {
       g.point(params[0], params[1]);
 
@@ -2261,11 +1702,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param g
-     */
-    protected void drawGeometry(PGraphics g) {
+
+  protected void drawGeometry(PGraphics g) {
     // get cache object using g.
     g.beginShape(kind);
     if (style) {
@@ -2340,12 +1778,6 @@ public class PShape implements PConstants {
   }
   */
 
-    /**
-     *
-     * @param g
-     */
-
-
   protected void drawPath(PGraphics g) {
     // Paths might be empty (go figure)
     // http://dev.processing.org/bugs/show_bug.cgi?id=982
@@ -2450,18 +1882,12 @@ public class PShape implements PConstants {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-    /**
-     *
-     * @return
-     */
-
 
   public PShape getParent() {
     return parent;
   }
 
   /**
-     * @return 
    * @webref
    * @brief Returns the number of children
    */
@@ -2478,11 +1904,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @return
-     */
-    public PShape[] getChildren() {
+
+  public PShape[] getChildren() {
     crop();
     return children;
   }
@@ -2495,7 +1918,6 @@ public class PShape implements PConstants {
    * <b>PShape</b> object, or <b>null</b> is returned if there is an error.
    *
    * ( end auto-generated )
-     * @return 
    * @webref pshape:method
    * @usage web_application
    * @brief Returns a child element of a shape as a PShape object
@@ -2509,7 +1931,6 @@ public class PShape implements PConstants {
 
  /**
   * @param target the name of the shape to get
-     * @return 
   */
   public PShape getChild(String target) {
     if (name != null && name.equals(target)) {
@@ -2530,8 +1951,6 @@ public class PShape implements PConstants {
   /**
    * Same as getChild(name), except that it first walks all the way up the
    * hierarchy to the eldest grandparent, so that children can be found anywhere.
-     * @param target
-     * @return 
    */
   public PShape findChild(String target) {
     if (parent == null) {
@@ -2568,7 +1987,6 @@ public class PShape implements PConstants {
 
   // adds child who exactly at position idx in the array of children.
   /**
-     * @param who
    * @param idx the layer position in which to insert the new child
    */
   public void addChild(PShape who, int idx) {
@@ -2596,7 +2014,6 @@ public class PShape implements PConstants {
 
   /**
    * Remove the child shape with index idx.
-     * @param idx
    */
   public void removeChild(int idx) {
     if (idx < childCount) {
@@ -2617,8 +2034,6 @@ public class PShape implements PConstants {
 
   /**
    * Add a shape to the name lookup table.
-     * @param nom
-     * @param shape
    */
   public void addName(String nom, PShape shape) {
     if (parent != null) {
@@ -2634,8 +2049,6 @@ public class PShape implements PConstants {
 
   /**
    * Returns the index of child who.
-     * @param who
-     * @return 
    */
   public int getChildIndex(PShape who) {
     for (int i = 0; i < childCount; i++) {
@@ -2646,11 +2059,8 @@ public class PShape implements PConstants {
     return -1;
   }
 
-    /**
-     *
-     * @return
-     */
-    public PShape getTessellation() {
+
+  public PShape getTessellation() {
     return null;
   }
 
@@ -2658,34 +2068,23 @@ public class PShape implements PConstants {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  /** The shape type, one of GROUP, PRIMITIVE, PATH, or GEOMETRY.
-     * @return  */
+  /** The shape type, one of GROUP, PRIMITIVE, PATH, or GEOMETRY. */
   public int getFamily() {
     return family;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int getKind() {
+
+  public int getKind() {
     return kind;
   }
 
-    /**
-     *
-     * @return
-     */
-    public float[] getParams() {
+
+  public float[] getParams() {
     return getParams(null);
   }
 
-    /**
-     *
-     * @param target
-     * @return
-     */
-    public float[] getParams(float[] target) {
+
+  public float[] getParams(float[] target) {
     if (target == null || target.length != params.length) {
       target = new float[params.length];
     }
@@ -2693,20 +2092,13 @@ public class PShape implements PConstants {
     return target;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getParam(int index) {
+
+  public float getParam(int index) {
     return params[index];
   }
 
-    /**
-     *
-     * @param source
-     */
-    protected void setParams(float[] source) {
+
+  protected void setParams(float[] source) {
     if (params == null) {
       params = new float[source.length];
     }
@@ -2717,23 +2109,13 @@ public class PShape implements PConstants {
     PApplet.arrayCopy(source, params);
   }
 
-    /**
-     *
-     * @param vcount
-     * @param verts
-     */
-    public void setPath(int vcount, float[][] verts) {
+
+  public void setPath(int vcount, float[][] verts) {
     setPath(vcount, verts, 0, null);
   }
 
-    /**
-     *
-     * @param vcount
-     * @param verts
-     * @param ccount
-     * @param codes
-     */
-    protected void setPath(int vcount, float[][] verts, int ccount, int[] codes) {
+
+  protected void setPath(int vcount, float[][] verts, int ccount, int[] codes) {
     if (verts == null || verts.length < vcount) return;
     if (0 < ccount && (codes == null || codes.length < ccount)) return;
 
@@ -2752,7 +2134,6 @@ public class PShape implements PConstants {
   }
 
   /**
-     * @return 
    * @webref pshape:method
    * @brief Returns the total number of vertices as an int
    * @see PShape#getVertex(int)
@@ -2767,7 +2148,6 @@ public class PShape implements PConstants {
 
 
   /**
-     * @return 
    * @webref pshape:method
    * @brief Returns the vertex at the index position
    * @param index the location of the vertex
@@ -2780,9 +2160,7 @@ public class PShape implements PConstants {
 
 
   /**
-     * @param index
    * @param vec PVector to assign the data to
-     * @return 
    */
   public PVector getVertex(int index, PVector vec) {
     if (vec == null) {
@@ -2799,30 +2177,18 @@ public class PShape implements PConstants {
     return vec;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getVertexX(int index) {
+
+  public float getVertexX(int index) {
     return vertices[index][X];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getVertexY(int index) {
+
+  public float getVertexY(int index) {
     return vertices[index][Y];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getVertexZ(int index) {
+
+  public float getVertexZ(int index) {
     return vertices[index][Z];
   }
 
@@ -2848,10 +2214,7 @@ public class PShape implements PConstants {
 
 
   /**
-     * @param index
-     * @param x
    * @param z the z value for the vertex
-     * @param y
    */
   public void setVertex(int index, float x, float y, float z) {
     if (openShape) {
@@ -2866,7 +2229,6 @@ public class PShape implements PConstants {
 
 
   /**
-     * @param index
    * @param vec the PVector to define the x, y, z coordinates
    */
   public void setVertex(int index, PVector vec) {
@@ -2885,22 +2247,13 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public PVector getNormal(int index) {
+
+  public PVector getNormal(int index) {
     return getNormal(index, null);
   }
 
-    /**
-     *
-     * @param index
-     * @param vec
-     * @return
-     */
-    public PVector getNormal(int index, PVector vec) {
+
+  public PVector getNormal(int index, PVector vec) {
     if (vec == null) {
       vec = new PVector();
     }
@@ -2910,41 +2263,23 @@ public class PShape implements PConstants {
     return vec;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getNormalX(int index) {
+
+  public float getNormalX(int index) {
     return vertices[index][PGraphics.NX];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getNormalY(int index) {
+
+  public float getNormalY(int index) {
     return vertices[index][PGraphics.NY];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getNormalZ(int index) {
+
+  public float getNormalZ(int index) {
     return vertices[index][PGraphics.NZ];
   }
 
-    /**
-     *
-     * @param index
-     * @param nx
-     * @param ny
-     * @param nz
-     */
-    public void setNormal(int index, float nx, float ny, float nz) {
+
+  public void setNormal(int index, float nx, float ny, float nz) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setNormal()");
       return;
@@ -2955,58 +2290,31 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.NZ] = nz;
   }
 
-    /**
-     *
-     * @param name
-     * @param index
-     * @param values
-     */
-    public void setAttrib(String name, int index, float... values) {
+
+
+  public void setAttrib(String name, int index, float... values) {
   }
 
-    /**
-     *
-     * @param name
-     * @param index
-     * @param values
-     */
-    public void setAttrib(String name, int index, int... values) {
+
+  public void setAttrib(String name, int index, int... values) {
   }
 
-    /**
-     *
-     * @param name
-     * @param index
-     * @param values
-     */
-    public void setAttrib(String name, int index, boolean... values) {
+
+  public void setAttrib(String name, int index, boolean... values) {
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getTextureU(int index) {
+
+  public float getTextureU(int index) {
     return vertices[index][PGraphics.U];
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getTextureV(int index) {
+
+  public float getTextureV(int index) {
     return vertices[index][PGraphics.V];
   }
 
-    /**
-     *
-     * @param index
-     * @param u
-     * @param v
-     */
-    public void setTextureUV(int index, float u, float v) {
+
+  public void setTextureUV(int index, float u, float v) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTextureUV()");
       return;
@@ -3024,11 +2332,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.V] = v;
   }
 
-    /**
-     *
-     * @param mode
-     */
-    public void setTextureMode(int mode) {
+
+  public void setTextureMode(int mode) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTextureMode()");
       return;
@@ -3037,11 +2342,8 @@ public class PShape implements PConstants {
     textureMode = mode;
   }
 
-    /**
-     *
-     * @param tex
-     */
-    public void setTexture(PImage tex) {
+
+  public void setTexture(PImage tex) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTexture()");
       return;
@@ -3050,12 +2352,8 @@ public class PShape implements PConstants {
     image = tex;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public int getFill(int index) {
+
+  public int getFill(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null ||
         index >= vertices.length) {
@@ -3075,7 +2373,6 @@ public class PShape implements PConstants {
   }
 
  /**
-     * @param fill
   * @nowebref
   */
   public void setFill(boolean fill) {
@@ -3121,8 +2418,6 @@ public class PShape implements PConstants {
   }
 
  /**
-     * @param index
-     * @param fill
   * @nowebref
   */
   public void setFill(int index, int fill) {
@@ -3150,12 +2445,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public int getTint(int index) {
+
+  public int getTint(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null || index >= vertices.length) {
       PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getTint()");
@@ -3173,11 +2464,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param tint
-     */
-    public void setTint(boolean tint) {
+
+  public void setTint(boolean tint) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTint()");
       return;
@@ -3186,11 +2474,8 @@ public class PShape implements PConstants {
     this.tint = tint;
   }
 
-    /**
-     *
-     * @param fill
-     */
-    public void setTint(int fill) {
+
+  public void setTint(int fill) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTint()");
       return;
@@ -3205,12 +2490,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param tint
-     */
-    public void setTint(int index, int tint) {
+
+  public void setTint(int index, int tint) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setTint()");
       return;
@@ -3231,12 +2512,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public int getStroke(int index) {
+
+  public int getStroke(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null ||
         index >= vertices.length) {
@@ -3252,7 +2529,6 @@ public class PShape implements PConstants {
   }
 
   /**
-     * @param stroke
    * @nowebref
    */
   public void setStroke(boolean stroke) {
@@ -3298,8 +2574,6 @@ public class PShape implements PConstants {
   }
 
   /**
-     * @param index
-     * @param stroke
    * @nowebref
    */
   public void setStroke(int index, int stroke) {
@@ -3325,12 +2599,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.SB] = ((stroke >>  0) & 0xFF) / 255.0f;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getStrokeWeight(int index) {
+
+  public float getStrokeWeight(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null || index >= vertices.length) {
       PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getStrokeWeight()");
@@ -3340,11 +2610,8 @@ public class PShape implements PConstants {
     return vertices[index][PGraphics.SW];
   }
 
-    /**
-     *
-     * @param weight
-     */
-    public void setStrokeWeight(float weight) {
+
+  public void setStrokeWeight(float weight) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeWeight()");
       return;
@@ -3359,12 +2626,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param weight
-     */
-    public void setStrokeWeight(int index, float weight) {
+
+  public void setStrokeWeight(int index, float weight) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeWeight()");
       return;
@@ -3384,11 +2647,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.SW] = weight;
   }
 
-    /**
-     *
-     * @param join
-     */
-    public void setStrokeJoin(int join) {
+
+  public void setStrokeJoin(int join) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeJoin()");
       return;
@@ -3397,11 +2657,8 @@ public class PShape implements PConstants {
     strokeJoin = join;
   }
 
-    /**
-     *
-     * @param cap
-     */
-    public void setStrokeCap(int cap) {
+
+  public void setStrokeCap(int cap) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStrokeCap()");
       return;
@@ -3410,12 +2667,8 @@ public class PShape implements PConstants {
     strokeCap = cap;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public int getAmbient(int index) {
+
+  public int getAmbient(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null || index >= vertices.length) {
       PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getAmbient()");
@@ -3428,11 +2681,8 @@ public class PShape implements PConstants {
     return 0xff000000 | (r << 16) | (g << 8) | b;
   }
 
-    /**
-     *
-     * @param ambient
-     */
-    public void setAmbient(int ambient) {
+
+  public void setAmbient(int ambient) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setAmbient()");
       return;
@@ -3447,12 +2697,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param ambient
-     */
-    public void setAmbient(int index, int ambient) {
+
+  public void setAmbient(int index, int ambient) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setAmbient()");
       return;
@@ -3469,12 +2715,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.AB] = ((ambient >>  0) & 0xFF) / 255.0f;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public int getSpecular(int index) {
+
+  public int getSpecular(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null || index >= vertices.length) {
       PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getSpecular()");
@@ -3487,11 +2729,8 @@ public class PShape implements PConstants {
     return 0xff000000 | (r << 16) | (g << 8) | b;
   }
 
-    /**
-     *
-     * @param specular
-     */
-    public void setSpecular(int specular) {
+
+  public void setSpecular(int specular) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setSpecular()");
       return;
@@ -3506,12 +2745,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param specular
-     */
-    public void setSpecular(int index, int specular) {
+
+  public void setSpecular(int index, int specular) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setSpecular()");
       return;
@@ -3528,12 +2763,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.SPB] = ((specular >>  0) & 0xFF) / 255.0f;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public int getEmissive(int index) {
+
+  public int getEmissive(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null || index >= vertices.length) {
       PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getEmissive()");
@@ -3546,11 +2777,8 @@ public class PShape implements PConstants {
     return 0xff000000 | (r << 16) | (g << 8) | b;
   }
 
-    /**
-     *
-     * @param emissive
-     */
-    public void setEmissive(int emissive) {
+
+  public void setEmissive(int emissive) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setEmissive()");
       return;
@@ -3565,12 +2793,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param emissive
-     */
-    public void setEmissive(int index, int emissive) {
+
+  public void setEmissive(int index, int emissive) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setEmissive()");
       return;
@@ -3588,12 +2812,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.EB] = ((emissive >>  0) & 0xFF) / 255.0f;
   }
 
-    /**
-     *
-     * @param index
-     * @return
-     */
-    public float getShininess(int index) {
+
+  public float getShininess(int index) {
     // make sure we allocated the vertices array and that vertex exists
     if (vertices == null ||
         index >= vertices.length) {
@@ -3604,11 +2824,8 @@ public class PShape implements PConstants {
     return vertices[index][PGraphics.SHINE];
   }
 
-    /**
-     *
-     * @param shine
-     */
-    public void setShininess(float shine) {
+
+  public void setShininess(float shine) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setShininess()");
       return;
@@ -3623,12 +2840,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param index
-     * @param shine
-     */
-    public void setShininess(int index, float shine) {
+
+  public void setShininess(int index, float shine) {
     if (openShape) {
       PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setShininess()");
       return;
@@ -3645,11 +2858,8 @@ public class PShape implements PConstants {
     vertices[index][PGraphics.SHINE] = shine;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int[] getVertexCodes() {
+
+  public int[] getVertexCodes() {
     if (vertexCodes == null) {
       return null;
     }
@@ -3659,29 +2869,21 @@ public class PShape implements PConstants {
     return vertexCodes;
   }
 
-    /**
-     *
-     * @return
-     */
-    public int getVertexCodeCount() {
+
+  public int getVertexCodeCount() {
     return vertexCodeCount;
   }
 
 
   /**
    * One of VERTEX, BEZIER_VERTEX, CURVE_VERTEX, or BREAK.
-     * @param index
-     * @return 
    */
   public int getVertexCode(int index) {
     return vertexCodes[index];
   }
 
-    /**
-     *
-     * @return
-     */
-    public boolean isClosed() {
+
+  public boolean isClosed() {
     return close;
   }
 
@@ -3690,13 +2892,6 @@ public class PShape implements PConstants {
 
 
   // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
-
-    /**
-     *
-     * @param x
-     * @param y
-     * @return
-     */
   public boolean contains(float x, float y) {
     if (family == PATH) {
       boolean c = false;
@@ -3757,9 +2952,7 @@ public class PShape implements PConstants {
   }
 
   /**
-     * @param x
    * @param z forward/back translation
-     * @param y
    */
   public void translate(float x, float y, float z) {
     checkMatrix(3);
@@ -3900,10 +3093,6 @@ public class PShape implements PConstants {
   }
 
 /**
-     * @param angle
-     * @param v0
-     * @param v1
-     * @param v2
  * @nowebref
  */
   public void rotate(float angle, float v0, float v1, float v2) {
@@ -3951,12 +3140,8 @@ public class PShape implements PConstants {
     matrix.scale(s);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    public void scale(float x, float y) {
+
+  public void scale(float x, float y) {
     checkMatrix(2);
     matrix.scale(x, y);
   }
@@ -3993,11 +3178,8 @@ public class PShape implements PConstants {
     matrix.reset();
   }
 
-    /**
-     *
-     * @param source
-     */
-    public void applyMatrix(PMatrix source) {
+
+  public void applyMatrix(PMatrix source) {
     if (source instanceof PMatrix2D) {
       applyMatrix((PMatrix2D) source);
     } else if (source instanceof PMatrix3D) {
@@ -4005,64 +3187,32 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param source
-     */
-    public void applyMatrix(PMatrix2D source) {
+
+  public void applyMatrix(PMatrix2D source) {
     applyMatrix(source.m00, source.m01, 0, source.m02,
                 source.m10, source.m11, 0, source.m12,
                 0, 0, 1, 0,
                 0, 0, 0, 1);
   }
 
-    /**
-     *
-     * @param n00
-     * @param n01
-     * @param n02
-     * @param n10
-     * @param n11
-     * @param n12
-     */
-    public void applyMatrix(float n00, float n01, float n02,
+
+  public void applyMatrix(float n00, float n01, float n02,
                           float n10, float n11, float n12) {
     checkMatrix(2);
     matrix.apply(n00, n01, n02,
                  n10, n11, n12);
   }
 
-    /**
-     *
-     * @param source
-     */
-    public void applyMatrix(PMatrix3D source) {
+
+  public void applyMatrix(PMatrix3D source) {
     applyMatrix(source.m00, source.m01, source.m02, source.m03,
                 source.m10, source.m11, source.m12, source.m13,
                 source.m20, source.m21, source.m22, source.m23,
                 source.m30, source.m31, source.m32, source.m33);
   }
 
-    /**
-     *
-     * @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
-     */
-    public void applyMatrix(float n00, float n01, float n02, float n03,
+
+  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,
                           float n30, float n31, float n32, float n33) {
@@ -4080,7 +3230,6 @@ public class PShape implements PConstants {
   /**
    * Make sure that the shape's matrix is 1) not null, and 2) has a matrix
    * that can handle <em>at least</em> the specified number of dimensions.
-     * @param dimensions
    */
   protected void checkMatrix(int dimensions) {
     if (matrix == null) {
@@ -4113,7 +3262,6 @@ public class PShape implements PConstants {
 
   /**
    * Set the pivot point for all transformations.
-     * @param mode
    */
 //  public void pivot(float x, float y) {
 //    px = x;
@@ -4129,7 +3277,6 @@ public class PShape implements PConstants {
   }
 
   /**
-     * @param mode
    * @param max range for all color elements
    */
   public void colorMode(int mode, float max) {
@@ -4138,7 +3285,6 @@ public class PShape implements PConstants {
 
 
   /**
-     * @param mode
    * @param maxX range for the red or hue depending on the current color mode
    * @param maxY range for the green or saturation depending on the current color mode
    * @param maxZ range for the blue or brightness depending on the current color mode
@@ -4148,11 +3294,7 @@ public class PShape implements PConstants {
   }
 
 /**
-     * @param mode
  * @param maxA range for the alpha
-     * @param maxY
-     * @param maxX
-     * @param maxZ
  */
   public void colorMode(int mode,
                         float maxX, float maxY, float maxZ, float maxA) {
@@ -4174,11 +3316,8 @@ public class PShape implements PConstants {
       (colorModeY == 255) && (colorModeZ == 255);
   }
 
-    /**
-     *
-     * @param rgb
-     */
-    protected void colorCalc(int rgb) {
+
+  protected void colorCalc(int rgb) {
     if (((rgb & 0xff000000) == 0) && (rgb <= colorModeX)) {
       colorCalc((float) rgb);
 
@@ -4187,12 +3326,8 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param rgb
-     * @param alpha
-     */
-    protected void colorCalc(int rgb, float alpha) {
+
+  protected void colorCalc(int rgb, float alpha) {
     if (((rgb & 0xff000000) == 0) && (rgb <= colorModeX)) {  // see above
       colorCalc((float) rgb, alpha);
 
@@ -4201,20 +3336,13 @@ public class PShape implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param gray
-     */
-    protected void colorCalc(float gray) {
+
+  protected void colorCalc(float gray) {
     colorCalc(gray, colorModeA);
   }
 
-    /**
-     *
-     * @param gray
-     * @param alpha
-     */
-    protected void colorCalc(float gray, float alpha) {
+
+  protected void colorCalc(float gray, float alpha) {
     if (gray > colorModeX) gray = colorModeX;
     if (alpha > colorModeA) alpha = colorModeA;
 
@@ -4232,24 +3360,13 @@ public class PShape implements PConstants {
     calcAlpha = (calcAi != 255);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     */
-    protected void colorCalc(float x, float y, float z) {
+
+  protected void colorCalc(float x, float y, float z) {
     colorCalc(x, y, z, colorModeA);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param a
-     */
-    protected void colorCalc(float x, float y, float z, float a) {
+
+  protected void colorCalc(float x, float y, float z, float a) {
     if (x > colorModeX) x = colorModeX;
     if (y > colorModeY) y = colorModeY;
     if (z > colorModeZ) z = colorModeZ;
@@ -4306,12 +3423,8 @@ public class PShape implements PConstants {
     calcAlpha = (calcAi != 255);
   }
 
-    /**
-     *
-     * @param argb
-     * @param alpha
-     */
-    protected void colorCalcARGB(int argb, float alpha) {
+
+  protected void colorCalcARGB(int argb, float alpha) {
     if (alpha == colorModeA) {
       calcAi = (argb >> 24) & 0xff;
       calcColor = argb;