picrate 2.3.0-java → 2.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e297a6447b346b596fdc87a909fe388a0cd42f7f8a7f4b2a48d523bba03a2e6
-  data.tar.gz: 8d0ead8d48a2c9a05caa6e0e27674f433af3acea1c1fd9045f19aa00f45f08db
+  metadata.gz: 648440446709f65ab3078f0a76525114d496e740b9e6584869bfd7c975017096
+  data.tar.gz: d31bd972a3e7b362319bffbbd0a5374c9e0112a76be8cae66037217561353065
 SHA512:
-  metadata.gz: e1f3cdf8c0d0e22193b6d2686a4b0d5bb2f37129e5df058086b5279ca2711fdd6eee91d6701cccc59c7c564db2012da86fad2cfd648df31ed6f091e1166b4409
-  data.tar.gz: 7df4dfab9072b06f42190aa042fa47cb91979f323f3040b6697b799e31dfff79ca4f6b12f7998bd7909ca8dcb90566ab152fd1ab4e50f639b597671b6885e8a5
+  metadata.gz: 5baa9ec19140c192d992773b1f37618d67332ac5917ee0f14e6198612c380b4997908ce32ff8f2f81cabf9fd48b739bb40a2e4eccc3f7172388541599c7e4fb6
+  data.tar.gz: 828d1c8aa7e31cfd47c0f4a73307cbc7e962e1e1f8860e256d2e4591ab8933391841c8a3df9b22e3de1f0cf80d7d6c67fdc3234433e21c1c4f8de98b6f6db468

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+v2.4.0 Refactor noise to two modules, FastNoise (default) & SmoothNoise, with terrain noise `:tnoise` option.
+
 v2.3.0 Abandon Processing Value Noise in favour of OpenSimplex2, with choosable options. Added pdf library using iText5.
 
 v2.2.0 Bump to latest JOGL-rc January 2021

data/README.md

@@ -19,7 +19,7 @@ Requires java to build (and [jogl-2.4.0-rc jars][jogl_jars]), but uses a maven w
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.2.0-java.gem
+jgem install picrate-2.4.0-java.gem
 
 ```
 To create a template sketch:-

data/lib/picrate/app.rb

@@ -16,10 +16,6 @@ module Processing
     java_import 'monkstone.vecmath.ShapeRender'
   end
 
-  module NoiseModule
-    java_import 'monkstone.noise.NoiseMode'
-  end
-
   # This class is the base class the user should inherit from when making
   # their own sketch.
   #
@@ -59,7 +55,7 @@ module Processing
     include HelperMethods
     include MathTool
     include Math
-    include NoiseModule
+    include FastNoise
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/library/pdf/pdf.rb

@@ -2,5 +2,6 @@
 
 # @TODO usage
 class Processing::App
+  require_relative 'itextpdf-5.5.13.2.jar'
   java_import Java::ProcessingPdf::PGraphicsPDF
 end

data/library/svg/svg.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  require_relative 'batik-all-1.14.jar'
+  java_import Java::ProcessingSvg::PGraphicsSVG
+end

data/picrate.gemspec

@@ -27,10 +27,11 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-armv6hf.jar'
   gem.files << 'lib/jogl-all-natives-linux-aarch64.jar'
-  gem.files << 'lib/itextpdf-5.5.13.2.jar'
+  gem.files << 'library/pdf/itextpdf-5.5.13.2.jar'
+  gem.files << 'library/svg/batik-all-1.14.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_development_dependency 'minitest', '~> 5.10'
+  gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_runtime_dependency 'rake', '~> 13.0'
   gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.1'
   gem.require_paths = ['lib']

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.3.0'
+  id 'ruby-processing:picrate:2.4.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,18 +24,20 @@ project 'picrate', 'http://maven.apache.org' do
   issue_management 'https://github.com/ruby-processing/PiCrate/issues', 'Github'
   # Need to update to jogl 2.4.1 as soon as available, then make a dependency
   properties('jogl.version' => '2.3.2',
+             'batik.version' => '1.14',
              'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',
              'source.directory' => 'src',
              'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
              'picrate.basedir' => '${project.basedir}',
-             'project.build.sourceEncoding' => 'utf-8',
+             'project.build.sourceEncoding' => 'UTF-8',
              'polyglot.dump.pom' => 'pom.xml')
 
   pom 'org.jruby:jruby:9.2.16.0'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
+  jar 'org.apache.xmlgraphics:batik-all:${batik.version}'
   jar 'com.itextpdf:itextpdf:${itextpdf.version}'
 end
 
@@ -44,13 +46,19 @@ overrides do
   plugin :dependency, '3.1.2' do
     execute_goals( id: 'default-cli',
       artifactItems:[
-      { groupId: 'com.itextpdf',
-        artifactId: 'itextpdf',
-        version: '${itextpdf.version}',
-        type: 'jar',
-        outputDirectory: '${picrate.basedir}/lib'
-      }
-    ]
+        { groupId: 'com.itextpdf',
+          artifactId: 'itextpdf',
+          version: '${itextpdf.version}',
+          type: 'jar',
+          outputDirectory: '${picrate.basedir}/library/pdf'
+        },
+        { groupId: 'org.apache.xmlgraphics',
+          artifactId: 'batik-all',
+          version: '${batik.version}',
+          type: 'jar',
+          outputDirectory: '${picrate.basedir}/library/svg'
+        }
+      ]
     )
   end
   plugin(:compiler, '3.8.1',

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</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,13 +64,14 @@ DO NOT MODIFY - 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>
@@ -95,6 +96,11 @@ DO NOT MODIFY - 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>
@@ -140,7 +146,14 @@ DO NOT MODIFY - GENERATED CODE
                     <artifactId>itextpdf</artifactId>
                     <version>${itextpdf.version}</version>
                     <type>jar</type>
-                    <outputDirectory>${picrate.basedir}/lib</outputDirectory>
+                    <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>

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

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