picrate 2.0.1-java → 2.3.0-java

data/lib/picrate.rb

@@ -9,4 +9,5 @@ end
 Dir["#{PICRATE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
-require_relative 'picrate/app'
+require "#{PICRATE_ROOT}/lib/picrate/app"
+require "#{PICRATE_ROOT}/lib/picrate/helpers/numeric"

data/lib/picrate/app.rb

@@ -5,7 +5,7 @@ require_relative 'helper_methods'
 require_relative 'library_loader'
 # A wrapper module for the processing App
 module Processing
-  include_package 'processing.core' # imports the processing jar.
+  include_package 'processing.core' # imports the processing classes.
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::PicrateLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
@@ -16,6 +16,10 @@ 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.
   #
@@ -55,6 +59,7 @@ module Processing
     include HelperMethods
     include MathTool
     include Math
+    include NoiseModule
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
@@ -144,7 +149,7 @@ module Processing
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
       Dir.mkdir(dat_root) unless File.exist?(dat_root)
-      File.join(dat_root, dat)
+      File.join(dat_root, dat).to_java(:string)
     end
 
     private

data/lib/picrate/helper_methods.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 # processing module wrapper
-require_relative 'helpers/numeric'
+
 module Processing
   # Provides some convenience methods
   module HelperMethods

data/lib/picrate/native_folder.rb

@@ -1,5 +1,3 @@
-require 'rbconfig'
-
 # Utility to load native binaries on Java CLASSPATH
 #HACK until jruby returns a more specific 'host_os' than 'linux'
 class NativeFolder
@@ -10,7 +8,7 @@ class NativeFolder
   ARM64 = '-aarch64'.freeze
 
   def initialize
-    @os = RbConfig::CONFIG['host_os'].downcase
+    @os = java.lang.System.get_property('os.name')
     @bit = java.lang.System.get_property('os.arch')
   end
 

data/lib/picrate/runner.rb

@@ -32,7 +32,7 @@ module Processing
       opt_parser = OptionParser.new do |opts|
         # Set a banner, displayed at the top
         # of the help screen.
-        opts.banner = 'Usage: picrate [options] [<sketch.rb>]'
+        opts.banner = 'Usage: picrate [options] [<name>]'
 
         # Define the options, and what they do
         options[:version] = false
@@ -55,6 +55,8 @@ module Processing
         # assumed to have this option.
         opts.on_tail('-h', '--help', 'Display this screen') do
           puts opts
+          puts ''
+          puts 'Run a sketch: jruby [--dev] [<sketch.rb>]'
           exit
         end
       end
@@ -81,9 +83,7 @@ module Processing
       library ||= 'new'
       choice = library.downcase
       case choice
-      when /sound/
-        warn 'The sound library is broken, try minim instead'
-      when /samples|video/
+      when /samples|sound|video/
         system "cd #{PICRATE_ROOT}/vendors && rake install_#{choice}"
       when /new/
         # install samples and config geany

data/lib/picrate/version.rb

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

data/library/jcomplex/jcomplex.rb

@@ -0,0 +1 @@
+java_import Java::MonkstoneComplex::JComplex

data/library/pdf/pdf.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  java_import Java::ProcessingPdf::PGraphicsPDF
+end

data/mvnw

@@ -212,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;

data/mvnw.cmd

@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
 FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...

data/picrate.gemspec

@@ -27,12 +27,13 @@ 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.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 'rake', '~> 12.3'
+  gem.add_runtime_dependency 'rake', '~> 13.0'
   gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.1'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime == 11'
+  gem.requirements << 'java runtime == 11+'
 end

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.0.1'
+  id 'ruby-processing:picrate:2.3.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,6 +24,7 @@ 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',
+             'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',
              'source.directory' => 'src',
              'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
@@ -31,15 +32,27 @@ project 'picrate', 'http://maven.apache.org' do
              'project.build.sourceEncoding' => 'utf-8',
              'polyglot.dump.pom' => 'pom.xml')
 
-  pom 'org.jruby:jruby:9.2.11.0'
+  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 'com.itextpdf:itextpdf:${itextpdf.version}'
 end
 
 overrides do
   plugin :resources, '3.1.0'
-  plugin :dependency, '3.1.2'
+  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'
+      }
+    ]
+    )
+  end
   plugin(:compiler, '3.8.1',
          'release' => '11')
   plugin(:javadoc, '2.10.4',
@@ -47,11 +60,12 @@ overrides do
          'links' => ['${processing.api}',
                      '${jruby.api}'])
   plugin(:jar, '3.2.0',
-         'archive' => {
-           'manifestEntries' => {
-             'Class-Path' => 'gluegen-rt.jar jog-all.jar'
-           }
-         })
+    'archive' => {
+      'manifestEntries' => {
+        'Automatic-Module-Name' => 'processing.core'
+      }
+    }
+  )
   plugin :jdeps, '3.1.2' do
     execute_goals 'jdkinternals', 'test-jdkinternals'
   end

data/pom.xml

@@ -2,16 +2,16 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.0.1</version>
+  <version>2.3.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,6 +64,7 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/PiCrate/issues</url>
   </issueManagement>
   <properties>
+    <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>
@@ -76,7 +77,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.11.0</version>
+      <version>9.2.16.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -94,6 +95,11 @@ DO NOT MODIFIY - GENERATED CODE
       <artifactId>video</artifactId>
       <version>3.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>${itextpdf.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -124,6 +130,22 @@ 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}/lib</outputDirectory>
+                  </artifactItem>
+                </artifactItems>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -149,7 +171,7 @@ DO NOT MODIFIY - GENERATED CODE
           <configuration>
             <archive>
               <manifestEntries>
-                <Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
+                <Automatic-Module-Name>processing.core</Automatic-Module-Name>
               </manifestEntries>
             </archive>
           </configuration>

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.

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