picrate 2.4.1-java → 2.5.2-java

data/src/main/java/monkstone/vecmath/vec2/Vec2.java

@@ -20,7 +20,8 @@ package monkstone.vecmath.vec2;
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * fastAtan2 algorithm from https://github.com/libgdx/libgdx (Apache 2.0 license)
-*/
+ */
+import java.util.logging.Logger; 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -40,7 +41,7 @@ import monkstone.vecmath.JRender;
  * @author Martin Prout
  */
 @JRubyClass(name = "Vec2D")
-public class Vec2 extends RubyObject {
+public final class Vec2 extends RubyObject {
 
     static final double EPSILON = 9.999999747378752e-05; // matches processing.org EPSILON
     private static final long serialVersionUID = -2950154560223211646L;
@@ -57,18 +58,10 @@ public class Vec2 extends RubyObject {
         vec2Cls.defineAnnotatedMethods(Vec2.class);
     }
 
-    /**
-     *
-     * @return x value :double
-     */
     public double javax() {
         return jx;
     }
 
-    /**
-     *
-     * @return y value :double
-     */
     public double javay() {
         return jy;
     }
@@ -81,7 +74,7 @@ public class Vec2 extends RubyObject {
      * @return new Vec2 object (ruby)
      */
     @JRubyMethod(name = "new", meta = true, rest = true)
-    public static final IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
         Vec2 vec2 = (Vec2) ((RubyClass) klazz).allocate();
         vec2.init(context, args);
         return vec2;
@@ -99,16 +92,16 @@ public class Vec2 extends RubyObject {
     void init(ThreadContext context, IRubyObject... args) {
         int count = args.length;
         if (count == 2) {
-            jx = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+            jx = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+            jy = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         }   // allow ruby ducktyping in constructor
         if (count == 1) {
             if (!(args[0].respondsTo("x"))) {
                 throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
             }
-            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+            jx = args[0].callMethod(context, "x") instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+            jy = args[0].callMethod(context, "y") instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
         }
     }
@@ -170,10 +163,10 @@ public class Vec2 extends RubyObject {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
             if (key == RubySymbol.newSymbol(runtime, "x")) {
-                jx = (value instanceof RubyFloat)
+                jx = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "y")) {
-                jy = (value instanceof RubyFloat)
+                jy = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             }
         } else {
@@ -232,23 +225,31 @@ public class Vec2 extends RubyObject {
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
-        double result = Math.hypot((jx - b.jx), (jy - b.jy));
+        double result = Math.hypot(jx - b.jx, jy - b.jy);
         return runtime.newFloat(result);
     }
 
+    @Deprecated
+    @JRubyMethod(name = "cross", required = 1)
+    public IRubyObject cross(ThreadContext context, IRubyObject other) {
+        Logger log = Logger.getGlobal();
+        log.warning("prefer ^ operator");
+        return op_wedge(context, other);
+    }
+
     /**
      *
      * @param context ThreadContext
      * @param other IRubyObject
-     * @return cross product IRubyObject
+     * @return wedge product IRubyObject
      */
-    @JRubyMethod(name = "cross", required = 1)
+    @JRubyMethod(name = "^", required = 1)
 
-    public IRubyObject cross(ThreadContext context, IRubyObject other) {
+    public IRubyObject op_wedge(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
         if (other instanceof Vec2) {
-            b = (Vec2) other.toJava(Vec2.class);
+            b = other.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -326,7 +327,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_mul(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
+        double scalar = other instanceof RubyFloat
                 ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
         return Vec2.rbNew(context, this.getMetaClass(),
                 new IRubyObject[]{runtime.newFloat(jx * scalar),
@@ -343,7 +344,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_div(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
+        double scalar = other instanceof RubyFloat
                 ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
         if (Math.abs(scalar) < Vec2.EPSILON) {
             return this;
@@ -408,10 +409,8 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
         double new_mag = scalar.toJava(Double.class);
-        if (block.isGiven()) {
-            if (!(boolean) block.yield(context, scalar).toJava(Boolean.class)) {
-                return this;
-            }
+        if (block.isGiven() && !block.yield(context, scalar).toJava(Boolean.class)) {
+            return this;
         }
         double current = 0;
         if (Math.abs(jx) > EPSILON && Math.abs(jy) > EPSILON) {
@@ -497,7 +496,7 @@ public class Vec2 extends RubyObject {
     @JRubyMethod(name = "from_angle", meta = true)
     public static IRubyObject from_angle(ThreadContext context, IRubyObject klazz, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double angle = (scalar instanceof RubyFloat)
+        double angle = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         return Vec2.rbNew(context, klazz, new IRubyObject[]{
             runtime.newFloat(Math.cos(angle)),
@@ -528,10 +527,10 @@ public class Vec2 extends RubyObject {
      */
     @JRubyMethod(name = "rotate!")
     public IRubyObject rotate_bang(ThreadContext context, IRubyObject scalar) {
-        double theta = (scalar instanceof RubyFloat)
+        double theta = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
-        double x = (jx * Math.cos(theta) - jy * Math.sin(theta));
-        double y = (jx * Math.sin(theta) + jy * Math.cos(theta));
+        double x = jx * Math.cos(theta) - jy * Math.sin(theta);
+        double y = jx * Math.sin(theta) + jy * Math.cos(theta);
         jx = x;
         jy = y;
         return this;
@@ -546,7 +545,7 @@ public class Vec2 extends RubyObject {
     @JRubyMethod(name = "rotate")
     public IRubyObject rotate(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double theta = (scalar instanceof RubyFloat)
+        double theta = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         IRubyObject[] ary = new IRubyObject[]{
             runtime.newFloat(jx * Math.cos(theta) - jy * Math.sin(theta)),
@@ -567,9 +566,9 @@ public class Vec2 extends RubyObject {
             throw runtime.newSyntaxError("Check syntax");
         }
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
-        double scalar = (args[1] instanceof RubyFloat)
+        double scalar = args[1] instanceof RubyFloat
                 ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        assert (scalar >= 0 && scalar < 1.0) :
+        assert scalar >= 0 && scalar < 1.0 :
                 "Lerp value " + scalar + " out of range 0..1.0";
         return Vec2.rbNew(context, this.getMetaClass(), new IRubyObject[]{
             runtime.newFloat(jx + (vec.jx - jx) * scalar),
@@ -589,9 +588,9 @@ public class Vec2 extends RubyObject {
             throw runtime.newSyntaxError("Check syntax");
         }
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
-        double scalar = (args[1] instanceof RubyFloat)
+        double scalar = args[1] instanceof RubyFloat
                 ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        assert (scalar >= 0 && scalar < 1.0) :
+        assert scalar >= 0 && scalar < 1.0 :
                 "Lerp value " + scalar + " out of range 0..1.0";
         jx += (vec.jx - jx) * scalar;
         jy += (vec.jy - jy) * scalar;
@@ -752,10 +751,8 @@ public class Vec2 extends RubyObject {
         }
         if (obj instanceof Vec2) {
             final Vec2 other = (Vec2) obj;
-            if ((Double.compare(jx, (Double) other.jx) == 0)
-                    && (Double.compare(jy, (Double) other.jy) == 0)) {
-                return true;
-            }
+            return Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0;
         }
         return false;
     }
@@ -774,8 +771,8 @@ public class Vec2 extends RubyObject {
         }
         if (other instanceof Vec2) {
             Vec2 v = (Vec2) other.toJava(Vec2.class);
-            if ((Double.compare(jx, (Double) v.jx) == 0)
-                    && (Double.compare(jy, (Double) v.jy) == 0)) {
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0) {
                 return runtime.newBoolean(true);
             }
         }

data/src/main/java/monkstone/vecmath/vec3/Vec3.java

@@ -1,12 +1,12 @@
 package monkstone.vecmath.vec3;
 
 /*
-* Copyright (c) 2018-21 Martin Prout
+* Copyright (c) 2015-20 Martin Prout
 *
 * This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
+* modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
-* version 3.0 of the License, or (at your option) any later version.
+* version 2.1 of the License, or (at your option) any later version.
 *
 * http://creativecommons.org/licenses/LGPL/2.1/
 *
@@ -15,7 +15,7 @@ package monkstone.vecmath.vec3;
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
-* You should have received a copy of the GNU General Public
+* You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
@@ -35,7 +35,6 @@ import monkstone.vecmath.JRender;
 import monkstone.vecmath.vec2.Vec2;
 
 /**
- *
  *
  * @author Martin Prout
  */
@@ -66,7 +65,7 @@ public final class Vec3 extends RubyObject {
      * @return new Vec3 object (ruby)
      */
     @JRubyMethod(name = "new", meta = true, rest = true)
-    public final static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
         Vec3 vec = (Vec3) ((RubyClass) klazz).allocate();
         vec.init(context, args);
         return vec;
@@ -84,27 +83,27 @@ public final class Vec3 extends RubyObject {
     void init(ThreadContext context, IRubyObject... args) {
         int count = args.length;
         if (count >= 2) {
-            jx = (args[0] instanceof RubyFloat)
+            jx = args[0] instanceof RubyFloat
                     ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat)
+            jy = args[1] instanceof RubyFloat
                     ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         }
         if (count == 3) {
-            jz = (args[2] instanceof RubyFloat)
+            jz = args[2] instanceof RubyFloat
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
         } // allow ruby ducktyping in constructor
         if (count == 1) {
             if (!(args[0].respondsTo("x"))) {
                 throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
             }
-            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+            jx = (args[0].callMethod(context, "x")) instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+            jy = (args[0].callMethod(context, "y")) instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
             if (!(args[0].respondsTo("z"))) {
                 return;
             } // allow promotion from 2D to 3D, sets jz = 0
-            jz = ((args[0].callMethod(context, "z")) instanceof RubyFloat) ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
+            jz = (args[0].callMethod(context, "z")) instanceof RubyFloat ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
         }
     }
 
@@ -148,11 +147,7 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "x=")
     public IRubyObject setX(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFloat) {
-            jx = ((RubyFloat) other).getValue();
-        } else {
-            jx = ((RubyFixnum) other).getDoubleValue();
-        }
+        jx = other instanceof RubyFloat ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();   
         return other;
     }
 
@@ -164,11 +159,7 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "y=")
     public IRubyObject setY(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFloat) {
-            jy = ((RubyFloat) other).getValue();
-        } else {
-            jy = ((RubyFixnum) other).getDoubleValue();
-        }
+        jy = other instanceof RubyFloat ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue(); 
         return other;
     }
 
@@ -180,11 +171,7 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "z=")
     public IRubyObject setZ(ThreadContext context, IRubyObject other) {
-        if (other instanceof RubyFloat) {
-            jz = ((RubyFloat) other).getValue();
-        } else {
-            jz = ((RubyFixnum) other).getDoubleValue();
-        }
+        jz = other instanceof RubyFloat ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue(); 
         return other;
     }
 
@@ -223,13 +210,13 @@ public final class Vec3 extends RubyObject {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
             if (key == RubySymbol.newSymbol(runtime, "x")) {
-                jx = (value instanceof RubyFloat)
+                jx = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "y")) {
-                jy = (value instanceof RubyFloat)
+                jy = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "z")) {
-                jz = (value instanceof RubyFloat)
+                jz = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else {
                 throw runtime.newIndexError("invalid key");
@@ -369,7 +356,7 @@ public final class Vec3 extends RubyObject {
     @JRubyMethod(name = "*", required = 1)
     public IRubyObject op_mul(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double multi = (scalar instanceof RubyFloat)
+        double multi = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         return Vec3.rbNew(context, this.getMetaClass(), new IRubyObject[]{
             runtime.newFloat(jx * multi),
@@ -386,7 +373,7 @@ public final class Vec3 extends RubyObject {
     @JRubyMethod(name = "/", required = 1)
     public IRubyObject op_div(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double divisor = (scalar instanceof RubyFloat)
+        double divisor = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         if (Math.abs(divisor) < Vec3.EPSILON) {
             return this;
@@ -428,12 +415,10 @@ public final class Vec3 extends RubyObject {
      */
     @JRubyMethod(name = "set_mag")
     public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
-        if (block.isGiven()) {
-            if (!(boolean) block.yield(context, scalar).toJava(Boolean.class)) {
-                return this;
-            }
+        if (block.isGiven() && !block.yield(context, scalar).toJava(Boolean.class)) {
+            return this;        
         }
-        double new_mag = (scalar instanceof RubyFloat)
+        double new_mag = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         double current = Math.sqrt(jx * jx + jy * jy + jz * jz);
         if (current > EPSILON) {
@@ -599,9 +584,9 @@ public final class Vec3 extends RubyObject {
         double u = 0;
         double v = 0;
         if (count == 3) {
-            u = (args[1] instanceof RubyFloat)
+            u = args[1] instanceof RubyFloat
                     ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-            v = (args[2] instanceof RubyFloat)
+            v = args[2] instanceof RubyFloat
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
         }
         if (count == 2) {
@@ -663,9 +648,9 @@ public final class Vec3 extends RubyObject {
         }
         if (obj instanceof Vec3) {
             final Vec3 other = (Vec3) obj;
-            if ((Double.compare(jx, (Double) other.jx) == 0)
-                    && (Double.compare(jy, (Double) other.jy) == 0)
-                    && (Double.compare(jz, (Double) other.jz) == 0)) {
+            if (Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0
+                    && Double.compare(jz, (Double) other.jz) == 0) {
                 return true;
             }
 
@@ -687,9 +672,9 @@ public final class Vec3 extends RubyObject {
         }
         if (other instanceof Vec3) {
             Vec3 v = (Vec3) other.toJava(Vec3.class);
-            if ((Double.compare(jx, (Double) v.jx) == 0)
-                    && (Double.compare(jy, (Double) v.jy) == 0)
-                    && (Double.compare(jz, (Double) v.jz) == 0)) {
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0
+                    && Double.compare(jz, (Double) v.jz) == 0) {
                 return runtime.newBoolean(true);
             }
 

data/src/main/java/processing/awt/PImageAWT.java

@@ -262,7 +262,7 @@ public class PImageAWT extends PImage {
    * Use ImageIO functions from Java 1.4 and later to handle image save.
    * Various formats are supported, typically jpeg, png, bmp, and wbmp.
    * To get a list of the supported formats for writing, use: <BR>
-   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   * <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
    *
    * @path The path to which the file should be written.
    */

data/src/main/java/processing/awt/ShimAWT.java

@@ -354,7 +354,7 @@ public class ShimAWT implements PConstants {
    * Use ImageIO functions from Java 1.4 and later to handle image save.
    * Various formats are supported, typically jpeg, png, bmp, and wbmp.
    * To get a list of the supported formats for writing, use: <BR>
-   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   * <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
    */
   static protected boolean saveImageIO(PImage image, String path) throws IOException {
     try {

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

@@ -167,8 +167,8 @@ public class PApplet implements PConstants {
      * that people use the sketchPath() method and it's inited properly. Call
      * sketchPath() once to set the default.
      */
+   
     private String sketchPath;
-//  public String sketchPath;
 
     static final boolean DEBUG = false;
 //  static final boolean DEBUG = true;

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

@@ -1523,24 +1523,24 @@ public class PImage implements PConstants, Cloneable {
    *     Sometimes called "Normal" or "Copy" in other software.
    *
    * <LI>BLEND - linear interpolation of colours:
-   *     <TT>C = A*factor + B</TT>
+   *     <code>C = A*factor + B</code>
    *
    * <LI>ADD - additive blending with white clip:
-   *     <TT>C = min(A*factor + B, 255)</TT>.
+   *     <code>C = min(A*factor + B, 255)</code>.
    *     Clipped to 0..255, Photoshop calls this "Linear Burn",
    *     and Director calls it "Add Pin".
    *
    * <LI>SUBTRACT - subtractive blend with black clip:
-   *     <TT>C = max(B - A*factor, 0)</TT>.
+   *     <code>C = max(B - A*factor, 0)</code>.
    *     Clipped to 0..255, Photoshop calls this "Linear Dodge",
    *     and Director calls it "Subtract Pin".
    *
    * <LI>DARKEST - only the darkest colour succeeds:
-   *     <TT>C = min(A*factor, B)</TT>.
+   *     <code>C = min(A*factor, B)</code>.
    *     Illustrator calls this "Darken".
    *
    * <LI>LIGHTEST - only the lightest colour succeeds:
-   *     <TT>C = max(A*factor, B)</TT>.
+   *     <code>C = max(A*factor, B)</code>.
    *     Illustrator calls this "Lighten".
    *
    * <LI>DIFFERENCE - subtract colors from underlying image.
@@ -1571,12 +1571,12 @@ public class PImage implements PConstants, Cloneable {
    * <P>It is important to note that Processing uses "fast" code, not
    * necessarily "correct" code. No biggie, most software does. A nitpicker
    * can find numerous "off by 1 division" problems in the blend code where
-   * <TT>&gt;&gt;8</TT> or <TT>&gt;&gt;7</TT> is used when strictly speaking
-   * <TT>/255.0</T> or <TT>/127.0</TT> should have been used.</P>
+   * <code>&gt;&gt;8</code> or <code>&gt;&gt;7</code> is used when strictly speaking
+   * <code>/255.0</T> or <code>/127.0</code> should have been used.</P>
    * <P>For instance, exclusion (not intended for real-time use) reads
-   * <TT>r1 + r2 - ((2 * r1 * r2) / 255)</TT> because <TT>255 == 1.0</TT>
-   * not <TT>256 == 1.0</TT>. In other words, <TT>(255*255)>>8</TT> is not
-   * the same as <TT>(255*255)/255</TT>. But for real-time use the shifts
+   * <code>r1 + r2 - ((2 * r1 * r2) / 255)</code> because <code>255 == 1.0</code>
+   * not <code>256 == 1.0</code>. In other words, <code>(255*255)>>8</code> is not
+   * the same as <code>(255*255)/255</code>. But for real-time use the shifts
    * are preferable, and the difference is insignificant for applications
    * built with Processing.</P>
    *
@@ -3104,9 +3104,9 @@ int testFunction(int dst, int src) {
    * </p>
    * Starting with revision 0092, the format setting is taken into account:
    * <UL>
-   * <LI><TT>ALPHA</TT> images written as 8bit grayscale (uses lowest byte)
-   * <LI><TT>RGB</TT> &rarr; 24 bits
-   * <LI><TT>ARGB</TT> &rarr; 32 bits
+   * <LI><code>ALPHA</code> images written as 8bit grayscale (uses lowest byte)
+   * <LI><code>RGB</code> &rarr; 24 bits
+   * <LI><code>ARGB</code> &rarr; 32 bits
    * </UL>
    * All versions are RLE compressed.
    * </p>
@@ -3278,7 +3278,7 @@ int testFunction(int dst, int src) {
    * and the extension used is supported (usually png, jpg, jpeg, bmp,
    * and tiff), then those methods will be used to write the image.
    * To get a list of the supported formats for writing, use: <BR>
-   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   * <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
    * <p>
    * To use the original built-in image writers, use .tga or .tif as the
    * extension, or don't include an extension. When no extension is used,

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

@@ -181,32 +181,32 @@ public class PGraphicsOpenGL extends PGraphics {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;

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

@@ -1757,16 +1757,10 @@ public class PShader implements PConstants {
     colorLoc = getAttributeLoc("color");
     texCoordLoc = getAttributeLoc("texCoord");
     normalLoc = getAttributeLoc("normal");
-
     ambientLoc = getAttributeLoc("ambient");
     specularLoc = getAttributeLoc("specular");
     emissiveLoc = getAttributeLoc("emissive");
     shininessLoc = getAttributeLoc("shininess");
-
-    directionLoc = getAttributeLoc("direction");
-
-    offsetLoc = getAttributeLoc("offset");
-
     directionLoc = getAttributeLoc("direction");
     offsetLoc = getAttributeLoc("offset");
 

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

@@ -944,10 +944,10 @@ public class PSurfaceJOGL implements PSurface {
       boolean hide = (sketch != null) &&
         (PApplet.platform == PConstants.WINDOWS);
       if (hide) setVisible(false);
-      
+
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-      
+
       if (hide) setVisible(true);
     });
   }
@@ -963,7 +963,7 @@ public class PSurfaceJOGL implements PSurface {
       String name = cursorNames.get(kind);
       if (name != null) {
         ImageIcon icon =
-          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+          new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
         PImage img = new PImageAWT(icon.getImage());
         // Most cursors just use the center as the hotspot...
         int x = img.width / 2;
@@ -1538,7 +1538,7 @@ public class PSurfaceJOGL implements PSurface {
 //            String name = cursorNames.get(kind);
 //            if (name != null) {
 //                ImageIcon icon
-//                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+//                        = new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
 //                PImage img = new PImage(icon.getImage());
 //                // Most cursors just use the center as the hotspot...
 //                int x = img.width / 2;