picrate 2.1.2-java → 2.4.2-java

data/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.1.2</version>
+  <version>2.4.2</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -64,19 +64,21 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/PiCrate/issues</url>
   </issueManagement>
   <properties>
+    <batik.version>1.14</batik.version>
+    <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
     <picrate.basedir>${project.basedir}</picrate.basedir>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
-    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <source.directory>src</source.directory>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.14.0</version>
+      <version>9.2.19.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -94,6 +96,16 @@ DO NOT MODIFIY - GENERATED CODE
       <artifactId>video</artifactId>
       <version>3.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-all</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>${itextpdf.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -124,6 +136,29 @@ DO NOT MODIFIY - GENERATED CODE
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <version>3.1.2</version>
+          <executions>
+            <execution>
+              <id>default-cli</id>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>com.itextpdf</groupId>
+                    <artifactId>itextpdf</artifactId>
+                    <version>${itextpdf.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${picrate.basedir}/library/pdf</outputDirectory>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>batik-all</artifactId>
+                    <version>${batik.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${picrate.basedir}/library/svg</outputDirectory>
+                  </artifactItem>
+                </artifactItems>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>

data/src/main/java/monkstone/FastNoiseModuleJava.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.OpenSimplex2F;
+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 = "FastNoise")
+public class FastNoiseModuleJava {
+
+    static OpenSimplex2F ng = new OpenSimplex2F(System.currentTimeMillis());
+
+    /**
+     *
+     * @param runtime Ruby
+     */
+    public static void createNoiseModule(Ruby runtime) {
+        RubyModule noiseModule = runtime.defineModule("FastNoise");
+        noiseModule.defineAnnotatedMethods(FastNoiseModuleJava.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 OpenSimplex2F(seed);
+//        return RubyBoolean.newBoolean(context.runtime, true);
+//        }
+//       return RubyBoolean.newBoolean(context.runtime, false);
+//    }
+}

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/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];
+    }
+}
+