propane 3.8.0-java → 4.0.0-java

data/src/main/java/monkstone/slider/CustomHorizontalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/CustomVerticalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/SimpleHorizontalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/SimpleVerticalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/SliderBar.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/SliderGroup.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/WheelHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-20 Martin Prout
+ * Copyright (c) 2015-22 Martin Prout
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,5 +31,5 @@ public interface WheelHandler {
      *
      * @param amount int
      */
-    public void handleWheel(final short amount);
+    void handleWheel(final short amount);
 }

data/src/main/java/monkstone/vecmath/JRender.java

@@ -11,14 +11,14 @@ public interface JRender {
      * @param x double
      * @param y double
      */
-    public void vertex(double x, double y);
+    void vertex(double x, double y);
 
     /**
      *
      * @param x double
      * @param y double
      */
-    public void curveVertex(double x, double y);
+    void curveVertex(double x, double y);
 
     /**
      *
@@ -26,7 +26,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void vertex(double x, double y, double z);
+    void vertex(double x, double y, double z);
 
     /**
      *
@@ -36,7 +36,7 @@ public interface JRender {
      * @param u double
      * @param v double
      */
-    public void vertex(double x, double y, double z, double u, double v);
+    void vertex(double x, double y, double z, double u, double v);
 
     /**
      *
@@ -44,7 +44,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void curveVertex(double x, double y, double z);
+    void curveVertex(double x, double y, double z);
 
     /**
      *
@@ -52,5 +52,5 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void normal(double x, double y, double z);
+    void normal(double x, double y, double z);
 }

data/src/main/java/monkstone/vecmath/package-info.java

@@ -1,5 +1,5 @@
 /* 
-* Copyright (c) 2015-20 Martin Prout
+* Copyright (c) 2015-22 Martin Prout
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public

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

@@ -1,7 +1,7 @@
 package monkstone.vecmath.vec2;
 
 /*
-* Copyright (c) 2015-20 Martin Prout
+* Copyright (c) 2015-22 Martin Prout
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@ package monkstone.vecmath.vec2;
 *
 * 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,11 +41,10 @@ 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;
-
     private double jx = 0;
     private double jy = 0;
 
@@ -73,7 +73,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;
@@ -91,17 +91,15 @@ 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 = jvalue(args[0]);
+            jy = jvalue(args[1]);
         }   // 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)
-                    ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
-                    ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
+            jx = jvalue(args[0].callMethod(context, "x"));
+            jy = jvalue(args[0].callMethod(context, "y"));
         }
     }
 
@@ -137,13 +135,14 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject aref(ThreadContext context, IRubyObject key) {
         Ruby runtime = context.runtime;
-        if (key instanceof RubySymbol) {
-            if (key == RubySymbol.newSymbol(runtime, "x")) {
+        if (key instanceof RubySymbol rubySymbol) {
+            if (rubySymbol.equals(RubySymbol.newSymbol(runtime, "x"))) {
                 return runtime.newFloat(jx);
-            } else if (key == RubySymbol.newSymbol(runtime, "y")) {
+            }
+            if (rubySymbol.equals(RubySymbol.newSymbol(runtime, "y"))) {
                 return runtime.newFloat(jy);
             } else {
-                throw runtime.newIndexError("invalid key");
+                throw runtime.newIndexError("unknown key");
             }
         } else {
             throw runtime.newIndexError("invalid key");
@@ -160,13 +159,13 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject aset(ThreadContext context, IRubyObject key, IRubyObject value) {
         Ruby runtime = context.runtime;
-        if (key instanceof RubySymbol) {
-            if (key == RubySymbol.newSymbol(runtime, "x")) {
-                jx = (value instanceof RubyFloat)
-                        ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
-            } else if (key == RubySymbol.newSymbol(runtime, "y")) {
-                jy = (value instanceof RubyFloat)
-                        ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
+        if (key instanceof RubySymbol rubySymbol) {
+            if (rubySymbol.equals(RubySymbol.newSymbol(runtime, "x"))) {
+                jx = jvalue(value);
+            } else if (rubySymbol.equals(RubySymbol.newSymbol(runtime, "y"))) {
+                jy = jvalue(value);
+            } else {
+                throw runtime.newIndexError("unknown key");
             }
         } else {
             throw runtime.newIndexError("invalid key");
@@ -183,11 +182,7 @@ public class Vec2 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 = jvalue(other);
         return other;
     }
 
@@ -200,11 +195,7 @@ public class Vec2 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 = jvalue(other);
         return other;
     }
 
@@ -219,28 +210,36 @@ public class Vec2 extends RubyObject {
     public IRubyObject dist(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
-        if (other instanceof Vec2) {
-            b = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vec) {
+            b = vec.toJava(Vec2.class);
         } 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);
+        if (other instanceof Vec2 vec) {
+            b = vec.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -258,8 +257,8 @@ public class Vec2 extends RubyObject {
     public IRubyObject dot(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
-        if (other instanceof Vec2) {
-            b = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vec) {
+            b = vec.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -277,8 +276,8 @@ public class Vec2 extends RubyObject {
     public IRubyObject op_plus(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
-        if (other instanceof Vec2) {
-            b = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vec) {
+            b = vec.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -298,8 +297,8 @@ public class Vec2 extends RubyObject {
     public IRubyObject op_minus(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
-        if (other instanceof Vec2) {
-            b = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vec) {
+            b = vec.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -308,6 +307,38 @@ public class Vec2 extends RubyObject {
             runtime.newFloat(jy - b.jy)});
     }
 
+    /**
+     * Utility method
+     *
+     * @param obj
+     * @return scalar value of object or unity (preempts poss division by zero)
+     */
+    private static double jscalar(IRubyObject obj) {
+        if (obj instanceof RubyFloat rubyFloat) {
+            return rubyFloat.getValue();
+        }
+        if (obj instanceof RubyFixnum rubyFixnum) {
+            return rubyFixnum.getDoubleValue();
+        }
+        return 1.0;
+    }
+
+    /**
+     * Utility method
+     *
+     * @param obj
+     * @return parse float value of object or zero
+     */
+    private static double jvalue(IRubyObject obj) {
+        if (obj instanceof RubyFloat rubyFloat) {
+            return rubyFloat.getValue();
+        }
+        if (obj instanceof RubyFixnum rubyFixnum) {
+            return rubyFixnum.getDoubleValue();
+        }
+        return 0;
+    }
+
     /**
      *
      * @param context ThreadContext
@@ -318,8 +349,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_mul(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
-                ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
+        double scalar = jscalar(other);
         return Vec2.rbNew(context, this.getMetaClass(),
                 new IRubyObject[]{runtime.newFloat(jx * scalar),
                     runtime.newFloat(jy * scalar)});
@@ -335,8 +365,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_div(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
-                ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
+        double scalar = jscalar(other);
         if (Math.abs(scalar) < Vec2.EPSILON) {
             return this;
         }
@@ -400,10 +429,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) {
@@ -489,8 +516,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)
-                ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
+        double angle = jvalue(scalar);
         return Vec2.rbNew(context, klazz, new IRubyObject[]{
             runtime.newFloat(Math.cos(angle)),
             runtime.newFloat(Math.sin(angle))});
@@ -520,10 +546,9 @@ public class Vec2 extends RubyObject {
      */
     @JRubyMethod(name = "rotate!")
     public IRubyObject rotate_bang(ThreadContext context, IRubyObject scalar) {
-        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 theta = jvalue(scalar);
+        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;
@@ -538,8 +563,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)
-                ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
+        double theta = jvalue(scalar);
         IRubyObject[] ary = new IRubyObject[]{
             runtime.newFloat(jx * Math.cos(theta) - jy * Math.sin(theta)),
             runtime.newFloat(jx * Math.sin(theta) + jy * Math.cos(theta))};
@@ -559,9 +583,8 @@ public class Vec2 extends RubyObject {
             throw runtime.newSyntaxError("Check syntax");
         }
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
-        double scalar = (args[1] instanceof RubyFloat)
-                ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        assert (scalar >= 0 && scalar < 1.0) :
+        double scalar = jvalue(args[1]);
+        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),
@@ -581,9 +604,8 @@ public class Vec2 extends RubyObject {
             throw runtime.newSyntaxError("Check syntax");
         }
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
-        double scalar = (args[1] instanceof RubyFloat)
-                ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        assert (scalar >= 0 && scalar < 1.0) :
+        double scalar = jvalue(args[1]);
+        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;
@@ -601,8 +623,8 @@ public class Vec2 extends RubyObject {
     public IRubyObject angleBetween(ThreadContext context, IRubyObject other) {
         Vec2 vec = null;
         Ruby runtime = context.runtime;
-        if (other instanceof Vec2) {
-            vec = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vector) {
+            vec = vector.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -620,8 +642,8 @@ public class Vec2 extends RubyObject {
     public IRubyObject fastAngleBetween(ThreadContext context, IRubyObject other) {
         Vec2 vec = null;
         Ruby runtime = context.runtime;
-        if (other instanceof Vec2) {
-            vec = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vector) {
+            vec = vector.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -742,12 +764,10 @@ public class Vec2 extends RubyObject {
         if (obj == this) {
             return true;
         }
-        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;
-            }
+        if (obj instanceof Vec2 vec2) {
+            final Vec2 other = vec2;
+            return Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0;
         }
         return false;
     }
@@ -764,10 +784,10 @@ public class Vec2 extends RubyObject {
         if (other == this) {
             return runtime.newBoolean(true);
         }
-        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 (other instanceof Vec2 vector) {
+            Vec2 v = vector.toJava(Vec2.class);
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0) {
                 return runtime.newBoolean(true);
             }
         }
@@ -788,8 +808,8 @@ public class Vec2 extends RubyObject {
         if (other == this) {
             return runtime.newBoolean(true);
         }
-        if (other instanceof Vec2) {
-            Vec2 v = (Vec2) other.toJava(Vec2.class);
+        if (other instanceof Vec2 vector) {
+            Vec2 v = vector.toJava(Vec2.class);
             double diff = jx - v.jx;
             if ((diff < 0 ? -diff : diff) > Vec2.EPSILON) {
                 return runtime.newBoolean(false);