propane 3.4.2-java → 3.8.0-java

data/library/video_event/video_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Propane::App
   include Java::MonkstoneVideoevent::CaptureEvent
   include Java::MonkstoneVideoevent::MovieEvent

data/pom.rb

@@ -1,7 +1,8 @@
-project 'propane', 'https://github.com/monkstone/propane' do
+# frozen_string_literal: true
 
+project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.4.2'
+  id 'propane:propane:3.8.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -33,49 +34,49 @@ project 'propane', 'https://github.com/monkstone/propane' do
 
   issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
 
-  source_control( :url => 'https://github.com/ruby-processing/propane',
-    :connection => 'scm:git:git://github.com/ruby-processing/propane.git',
-    :developer_connection => 'scm:git:git@github.com/ruby-processing/propane.git' )
+  source_control(url: 'https://github.com/ruby-processing/propane',
+    connection: 'scm:git:git://github.com/ruby-processing/propane.git',
+    developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git')
 
-    properties( 'propane.basedir' => '${project.basedir}',
+    properties('propane.basedir' => '${project.basedir}',
       'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
       'source.directory' => 'src',
       'polyglot.dump.pom' => 'pom.xml',
       'project.build.sourceEncoding' => 'utf-8',
-      'jogl.version' => '2.3.2',
-      'jruby.api' => 'http://jruby.org/apidocs/' )
+      'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
+      'jruby.api' => 'http://jruby.org/apidocs/')
 
-      pom 'org.jruby:jruby:9.2.9.0'
-      jar 'org.processing:video:3.3.7'
+    pom 'org.jruby:jruby:9.2.16.0'
+      jar 'org.processing:video:3.3.7' # only for compiling
       jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
       jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
 
       overrides do
-        plugin( 'org.codehaus.mojo:versions-maven-plugin:2.7',
-          'generateBackupPoms' =>  'false' )
-          plugin( :compiler, '3.8.1',
-            'release' =>  '11' )
-            plugin( :javadoc, '3.1.1',
-              'detectOfflineLinks' =>  'false',
-              'links' => [ '${jruby.api}',
-                '${processing.api}' ] )
-                plugin(
-                  :jar, '3.1.2',
+        plugin('org.codehaus.mojo:versions-maven-plugin:2.7',
+          'generateBackupPoms' => 'false')
+          plugin(:compiler, '3.8.1',
+            'release' => '11')
+            plugin(:javadoc, '3.2.0',
+              'detectOfflineLinks' => 'false',
+              'links' => ['${jruby.api}',
+                '${processing.api}'])
+                plugin(:jar, '3.2.0',
                   'archive' => {
-                    'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
-                  }
-                )
-              end
-              build do
-                resource do
-                  directory '${source.directory}/main/java'
-                  includes '**/**/*.glsl', '**/*.jnilib'
-                  excludes '**/**/*.java'
-                end
-                resource do
-                  directory '${source.directory}/main/resources'
-                  includes '**/*.png', '*.txt'
-                  excludes
+                    'manifestEntries' => {
+                      'Automatic-Module-Name' => 'processing.core'
+                    }
+                    })
+                  end
+                  build do
+                    resource do
+                      directory '${source.directory}/main/java'
+                      includes '**/**/*.glsl', '**/*.jnilib'
+                      excludes '**/**/*.java'
+                    end
+                    resource do
+                      directory '${source.directory}/main/resources'
+                      includes '**/*.png', '*.txt'
+                      excludes
+                    end
+                  end
                 end
-              end
-            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>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.4.2</version>
+  <version>3.8.0</version>
   <name>propane</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>https://github.com/monkstone/propane</url>
@@ -74,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.9.0</version>
+      <version>9.2.16.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -132,7 +132,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.2.0</version>
           <configuration>
             <detectOfflineLinks>false</detectOfflineLinks>
             <links>
@@ -143,11 +143,11 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.2</version>
+          <version>3.2.0</version>
           <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/propane.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'propane/version'
 
@@ -8,27 +9,30 @@ Gem::Specification.new do |gem|
   gem.version       = Propane::VERSION
   gem.authors       = ['monkstone']
   gem.email         = ['mamba2928@yahoo.co.uk']
-  gem.licenses     = %w(GPL-3.0 LGPL-2.0)
+  gem.licenses     = %w[GPL-3.0 LGPL-2.0]
   gem.description  = <<-EOS
   A batteries included version of processing in ruby targetting jdk11.
   EOS
-  gem.summary       = %q{ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)}
+  gem.summary       = 'ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)'
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.files << "lib/propane-#{Propane::VERSION}.jar"
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
   gem.files << 'lib/gluegen-rt-natives-macosx-universal.jar'
+#  gem.files << 'lib/gluegen-rt-natives-ios-arm64.jar'
   gem.files << 'lib/gluegen-rt-natives-windows-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
   gem.files << 'lib/jogl-all-natives-macosx-universal.jar'
+#  gem.files << 'lib/jogl-all-natives-ios-arm64.jar'
   gem.files << 'lib/jogl-all-natives-windows-amd64.jar'
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  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 'rake', '~> 12.3'
-  gem.add_development_dependency 'minitest', '~> 5.11'
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0'
+  gem.add_development_dependency 'jruby-openssl', '~> 0.1.0', '>=0.1.3'
+  gem.add_development_dependency 'minitest', '~> 5.14'
+  gem.add_runtime_dependency 'rake', '~> 12.3'
+  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
   gem.requirements << 'java runtime >= 11.0.2+'

data/src/main/java/japplemenubar/JAppleMenuBar.java

@@ -19,9 +19,8 @@
 */ 
 package japplemenubar;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+
 import processing.core.PApplet;
 
 
@@ -59,6 +58,7 @@ public class JAppleMenuBar {
 	    }
 	  } catch (IOException e) {
 	    sadness("Unknown error, here's the stack trace.");
+	    e.printStackTrace();
 	  }
 	}
 	

data/src/main/java/monkstone/ColorUtil.java

@@ -3,7 +3,7 @@
  * in their sketches. Includes a method to efficiently convert an array of web
  * strings to an array of color int, and another to convert an array of color
  * int to a string that can be used in ruby code (to generate web color array).
- * Copyright (c) 2015-19 Martin Prout.
+ * Copyright (c) 2015-20 Martin Prout.
  * This utility 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
@@ -13,8 +13,6 @@
  */
 package monkstone;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 /**
  *

data/src/main/java/monkstone/MathToolModule.java

@@ -2,7 +2,7 @@
 * The purpose of this tool is to allow JRubyArt users to use an alternative
 * to processing.org map, lerp and norm methods in their sketches and to implement
 * JRubyArt convenenience method grid(width, height, stepW, stepH) { |x, y| do stuff }
-* Copyright (c) 2015-19 Martin Prout. This tool is free software; you can
+* Copyright (c) 2015-20 Martin Prout. This tool 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/PropaneLibrary.java

@@ -1,6 +1,6 @@
 /**
  * The purpose of this class is to load the MathTool into ruby-processing runtime
- * Copyright (C) 2015-19 Martin Prout. This code is free software; you can
+ * Copyright (C) 2015-20 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.
@@ -41,6 +41,6 @@ public class PropaneLibrary implements Library {
      */
     @Override
     public void load(final Ruby runtime, boolean wrap) throws IOException {
-        load(runtime);
+        PropaneLibrary.load(runtime);
     }
 }

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

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

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-19 Martin Prout
+ * Copyright (c) 2015-21 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 package monkstone.fastmath;
 
 import org.jruby.Ruby;
-import org.jruby.RubyInteger;
+import org.jruby.RubyNumeric;
 import org.jruby.RubyModule;
 import org.jruby.anno.JRubyModule;
 import org.jruby.anno.JRubyMethod;
@@ -34,38 +34,6 @@ import org.jruby.runtime.builtin.IRubyObject;
 @JRubyModule(name = "DegLut")
 public class Deglut {
 
-    /**
-     * Lookup table for degree cosine/sine, has a fixed precision 1.0 degrees
-     * Quite accurate but imprecise
-     *
-     * @author Martin Prout <martin_p@lineone.net>
-     */
-    static final double[] SIN_DEG_LUT = new double[91];
-    /**
-     *
-     */
-    public static final double TO_RADIANS = Math.PI / 180;
-    /**
-     *
-     */
-    private static boolean initialized = false;
-
-    private final static int NINETY = 90;
-    private final static int FULL = 360;
-    private static final long serialVersionUID = -1466528933765940101L;
-
-    /**
-     * Initialize sin table with values (first quadrant only)
-     */
-    public static final void initTable() {
-        if (initialized == false) {
-            for (int i = 0; i <= NINETY; i++) {
-                SIN_DEG_LUT[i] = Math.sin(TO_RADIANS * i);
-            }
-            initialized = true;
-        }
-    }
-
     /**
      *
      * @param runtime Ruby
@@ -73,7 +41,6 @@ public class Deglut {
     public static void createDeglut(final Ruby runtime) {
         RubyModule deglutModule = runtime.defineModule("DegLut");
         deglutModule.defineAnnotatedMethods(Deglut.class);
-        Deglut.initTable();
     }
 
     /**
@@ -84,18 +51,9 @@ public class Deglut {
      * @return sin IRubyObject
      */
     @JRubyMethod(name = "sin", module = true)
-
     public static IRubyObject sin(ThreadContext context, IRubyObject recv, IRubyObject other) {
-        int thet = (int) ((RubyInteger) other).getLongValue();
-        while (thet < 0) {
-            thet += FULL; // Needed because negative modulus plays badly in java
-        }
-        int theta = thet % FULL;
-        int y = theta % NINETY;
-        double result = (theta < NINETY) ? SIN_DEG_LUT[y] : (theta < 180)
-                ? SIN_DEG_LUT[NINETY - y] : (theta < 270)
-                        ? -SIN_DEG_LUT[y] : -SIN_DEG_LUT[NINETY - y];
-        return context.runtime.newFloat(result);
+        float thet = (float) ((RubyNumeric) other).getLongValue();
+        return context.runtime.newFloat(DegLutTables.sinDeg(thet));
     }
 
     /**
@@ -107,15 +65,7 @@ public class Deglut {
      */
     @JRubyMethod(name = "cos", module = true)
     public static IRubyObject cos(ThreadContext context, IRubyObject recv, IRubyObject other) {
-        int thet = (int) ((RubyInteger) other).getLongValue();
-        while (thet < 0) {
-            thet += FULL; // Needed because negative modulus plays badly in java
-        }
-        int theta = thet % FULL;
-        int y = theta % NINETY;
-        double result = (theta < NINETY) ? SIN_DEG_LUT[NINETY - y] : (theta < 180)
-                ? -SIN_DEG_LUT[y] : (theta < 270)
-                        ? -SIN_DEG_LUT[NINETY - y] : SIN_DEG_LUT[y];
-        return context.runtime.newFloat(result);
+        float thet = (float) ((RubyNumeric) other).getLongValue();
+        return context.runtime.newFloat(DegLutTables.cosDeg(thet));
     }
 }