picrate 2.1.0-java → 2.4.0-java

data/src/main/java/monkstone/PicrateLibrary.java

@@ -1,6 +1,6 @@
 /**
  * The purpose of this class is to load the MathTool into PiCrate runtime
- * Copyright (C) 2018-20 Martin Prout. This code is free software; you can
+ * Copyright (C) 2018-21 Martin Prout. This code is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
  * Public License as published by the Free Software Foundation; either version
  * 2.1 of the License, or (at your option) any later version.
@@ -30,6 +30,8 @@ public class PicrateLibrary implements Library{
      */
     public static void load(final Ruby runtime) {
         MathToolModule.createMathToolModule(runtime);
+        FastNoiseModuleJava.createNoiseModule(runtime);
+        SmoothNoiseModuleJava.createNoiseModule(runtime);
         Deglut.createDeglut(runtime);
         Vec2.createVec2(runtime);
         Vec3.createVec3(runtime);

data/src/main/java/monkstone/SmoothNoiseModuleJava.java

@@ -0,0 +1,127 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package monkstone;
+
+import monkstone.noise.OpenSimplex2S;
+import org.jruby.Ruby;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyFloat;
+import org.jruby.RubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author Martin Prout
+ */
+@JRubyModule(name = "SmoothNoise")
+public class SmoothNoiseModuleJava {
+
+    static OpenSimplex2S ng = new OpenSimplex2S(System.currentTimeMillis());
+
+    /**
+     *
+     * @param runtime Ruby
+     */
+    public static void createNoiseModule(Ruby runtime) {
+        RubyModule noiseModule = runtime.defineModule("SmoothNoise");
+        noiseModule.defineAnnotatedMethods(SmoothNoiseModuleJava.class);
+    }
+
+    /**
+     *
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of numeric values
+     * @return mapped value RubyFloat
+     */
+    @JRubyMethod(name = "tnoise", rest = true, module = true)
+    public static IRubyObject terrainNoiseImpl(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        double result = 0;
+        double one;
+        double two;
+        double three;
+        double four;
+        switch (args.length) {
+            case 2:
+                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise2_XBeforeY(one, two);
+                break;
+            case 3:
+                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise3_XYBeforeZ(one, two, three);
+                break;
+            case 4:
+                four = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise4_XYBeforeZW(one, two, three, four);
+                break;
+            default:
+                throw new RuntimeException("Min 2D Max 4D Noise");
+        }
+        return RubyFloat.newFloat(context.runtime, result);
+    }
+
+    /**
+     *
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of numeric values
+     * @return mapped value RubyFloat
+     */
+    @JRubyMethod(name = "noise", rest = true, module = true)
+    public static IRubyObject noiseImpl(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        double result = 0;
+        double one;
+        double two;
+        double three;
+        double four;
+        switch (args.length) {
+            case 1:
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise2(one, 0);
+                break;
+            case 2:
+                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise2(one, two);
+                break;
+            case 3:
+                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise3_Classic(one, two, three);
+                break;
+            case 4:
+                four = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise4_Classic(one, two, three, four);
+                break;
+            default:
+                throw new RuntimeException("Maximum of 4D Noise");
+        }
+        return RubyFloat.newFloat(context.runtime, result);
+    }
+//    @JRubyMethod(name = "noise_seed", rest = true, module = true)
+//    public static IRubyObject noiseSeedImpl(ThreadContext context, IRubyObject recv, IRubyObject arg) {
+//        long seed;
+//        if (arg instanceof RubyNumeric) {
+//            seed = ((RubyNumeric) arg).getLongValue();
+//            ng = new OpenSimplex2S(seed);
+//            return RubyBoolean.newBoolean(context.runtime, true);
+//        }
+//       return RubyBoolean.newBoolean(context.runtime, false);
+//    }
+}

data/src/main/java/monkstone/complex/JComplex.java

@@ -0,0 +1,252 @@
+package monkstone.complex;
+
+import java.util.Objects;
+
+/**
+ * The purpose of this class is to to make Complex operations more efficient
+ * than JRuby RubyComplex, by having a simpler interface, only modest
+ * improvements were obtained (but this is better than nothing on RaspberryPI).
+ */
+public final class JComplex {
+
+    private final double re;   // the real part
+    private final double im;   // the imaginary part
+    private final static JComplex ZERO = new JComplex(0, 0);
+    private final static JComplex NAN = new JComplex(Double.NaN, Double.NaN);
+
+    /**
+     * create a new object with the given real and imaginary parts
+     *
+     * @param real
+     * @param imag
+     */
+    public JComplex(double real, double imag) {
+        re = real;
+        im = imag;
+    }
+
+    /**
+     * @return a string representation of the invoking Complex object
+     */
+    @Override
+    public String toString() {
+        return "JComplex(" + re + ", " + im + "i)";
+    }
+
+    /**
+     *
+     * @return abs/modulus/magnitude
+     */
+    public final double abs() {
+        return Math.hypot(re, im);
+    }
+
+    /**
+     *
+     * @return square of abs/modulus/magnitude
+     */
+    public final double abs2() {
+        return re * re + im * im;
+    }
+
+    /**
+     *
+     * @return angle/phase/argument, normalized to be between -pi and pi
+     */
+    public final double phase() {
+        return Math.atan2(im, re);
+    }
+
+    /**
+     *
+     * @param b
+     * @return a new Complex object whose value is (this + b)
+     */
+    public final JComplex add(JComplex b) {
+        JComplex a = this;             // invoking object
+        double real = a.re + b.re;
+        double imag = a.im + b.im;
+        return new JComplex(real, imag);
+    }
+
+    /**
+     *
+     * @param scalar
+     * @return a new Complex object whose value is (this + scalar)
+     */
+    public final JComplex add(double scalar) {
+        return new JComplex(re + scalar, im);
+    }
+
+    public final boolean zero() {
+        return this.equals(ZERO);
+    }
+
+    /**
+     *
+     * @param b
+     * @return a new Complex object whose value is (this - b)
+     */
+    public final JComplex sub(JComplex b) {
+        JComplex a = this;
+        double real = a.re - b.re;
+        double imag = a.im - b.im;
+        return new JComplex(real, imag);
+    }
+
+    /**
+     *
+     * @param scalar
+     * @return a new Complex object whose value is (this - scalar)
+     */
+    public final JComplex sub(double scalar) {
+        return new JComplex(re - scalar, im);
+    }
+
+    /**
+     *
+     * @param b
+     * @return a new Complex object whose value is (this * b)
+     */
+    public final JComplex mul(JComplex b) {
+        JComplex a = this;
+        double real = a.re * b.re - a.im * b.im;
+        double imag = a.re * b.im + a.im * b.re;
+        return new JComplex(real, imag);
+    }
+
+    /**
+     * Also known as scale
+     *
+     * @param b
+     * @return a new Complex object whose value is (this * b)
+     */
+    public final JComplex mul(double b) {
+        return new JComplex(re * b, im * b);
+    }
+
+    /**
+     *
+     * @return a new Complex object whose value is the conjugate of this
+     */
+    public final JComplex conjugate() {
+        return new JComplex(re, -im);
+    }
+
+    /**
+     *
+     * @return a new Complex object whose value is the reciprocal of this
+     */
+    private JComplex reciprocal() {
+        double scale = re * re + im * im; // self dot product
+        return new JComplex(re / scale, -im / scale);
+    }
+
+    /**
+     *
+     * @param other
+     * @return this^other
+     */
+    public final JComplex pow(JComplex other) {
+        if (this.zero()) {
+            if (other.zero()) {
+                return ZERO;
+            }
+            return NAN;
+        }
+        return (this).log().mul(other).exp();
+    }
+
+    /**
+     *
+     * @param scalar
+     * @return this^scalar
+     */
+    public final JComplex pow(double scalar) {
+        if (this.zero()) {
+            if (scalar == 0) {
+                return ZERO;
+            }
+            return NAN;
+        }
+        return (this).log().mul(scalar).exp();
+    }
+
+    /**
+     *
+     * @return log
+     */
+    private JComplex log() {
+        return new JComplex(Math.log(abs()), Math.atan2(im, re));
+    }
+
+    /**
+     *
+     * @return real part
+     */
+    public final double re() {
+        return re;
+    }
+
+    /**
+     *
+     * @return imaginary part
+     */
+    public final double im() {
+        return im;
+    }
+
+    /**
+     *
+     * @param b
+     * @return a / b
+     */
+    public final JComplex div(JComplex b) {
+        JComplex a = this;
+        return a.mul(b.reciprocal());
+    }
+
+    /**
+     *
+     * @param b
+     * @return a / b
+     */
+    public final JComplex div(double b) {
+        if (b == 0) {
+            return NAN;
+        }
+        return new JComplex(re / b, im / b);
+    }
+
+    /**
+     *
+     * @return a new Complex object whose value is the complex exponential of
+     * this
+     */
+    public final JComplex exp() {
+        return new JComplex(Math.exp(re) * Math.cos(im), Math.exp(re) * Math.sin(im));
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(re, im);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final JComplex other = (JComplex) obj;
+        if (Double.doubleToLongBits(this.re) != Double.doubleToLongBits(other.re)) {
+            return false;
+        }
+        return Double.doubleToLongBits(this.im) == Double.doubleToLongBits(other.im);
+    }
+}

data/src/main/java/monkstone/fastmath/DegLutTables.java

@@ -0,0 +1,111 @@
+/* 
+ * Copyright (c) 2021 Martin Prout
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 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
+ */
+package monkstone.fastmath;
+
+public final class DegLutTables {
+
+    /**
+     *
+     */
+    static public final float PI = 3.1415927f;
+
+    /**
+     *
+     */
+    static public final float PI2 = PI * 2;
+    static private final int SIN_BITS = 15; // 16KB. Adjust for accuracy.
+    static private final int SIN_MASK = ~(-1 << SIN_BITS);
+    static private final int SIN_COUNT = SIN_MASK + 1;
+
+    static private final float RAD_FULL = PI * 2;
+    static private final float DEG_FULL = 360;
+    static private final float RAD_TO_INDEX = SIN_COUNT / RAD_FULL;
+    static private final float DEG_TO_INDEX = SIN_COUNT / DEG_FULL;
+
+    /**
+     * multiply by this to convert from radians to degrees
+     */
+    static public final float RADIANS_TO_DEGREES = 180f / PI;
+
+    /**
+     *
+     */
+    static public final float RAD_DEG = RADIANS_TO_DEGREES;
+    /**
+     * multiply by this to convert from degrees to radians
+     */
+    static public final float DEGREES_TO_RADIANS = PI / 180;
+
+    /**
+     *
+     */
+    static public final float DEG_RAD = DEGREES_TO_RADIANS;
+
+    static private class Sin {
+
+        static final float[] table = new float[SIN_COUNT];
+
+        static {
+            for (int i = 0; i < SIN_COUNT; i++) {
+                table[i] = (float) Math.sin((i + 0.5f) / SIN_COUNT * RAD_FULL);
+            }
+            for (int i = 0; i < 360; i += 90) {
+                table[(int) (i * DEG_TO_INDEX) & SIN_MASK] = (float) Math.sin(i * DEGREES_TO_RADIANS);
+            }
+        }
+    }
+
+    /**
+     * Returns the sine in radians from a lookup table.
+     * @param radians
+     * @return 
+     */
+    static public final float sin(float radians) {
+        return Sin.table[(int) (radians * RAD_TO_INDEX) & SIN_MASK];
+    }
+
+    /**
+     * Returns the cosine in radians from a lookup table.
+     * @param radians
+     * @return 
+     */
+    static public final float cos(float radians) {
+        return Sin.table[(int) ((radians + PI / 2) * RAD_TO_INDEX) & SIN_MASK];
+    }
+
+    /**
+     * Returns the sine in radians from a lookup table.
+     * @param degrees
+     * @return 
+     */
+    static public final float sinDeg(float degrees) {
+        return Sin.table[(int) (degrees * DEG_TO_INDEX) & SIN_MASK];
+    }
+
+    /**
+     * Returns the cosine in radians from a lookup table.
+     * @param degrees
+     * @return 
+     */
+    static public final float cosDeg(float degrees) {
+        return Sin.table[(int) ((degrees + 90) * DEG_TO_INDEX) & SIN_MASK];
+    }
+}
+