propane 3.4.0-java → 3.7.0.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a17549b4cc5bcc10bb764cca572641ea1cc26e03f3634e6ca6765566d74e31a
-  data.tar.gz: 365bcb651c4a64e0218c35c21ee08b7e62c7dd55523d4fc6d1a4552bd8bbc636
+  metadata.gz: b0e8998483c06aa7d27737cd3b9d1f87ef8edb0268367f58d42356b7f5c20aa1
+  data.tar.gz: de9bb8230f17b2aa2cd0da453b465c8d9f529a74b74c0de0f6c39aa62fb39eb9
 SHA512:
-  metadata.gz: 6cfc69cad0fe6d1d3a2e663ae267bb8057c4552702133554febb911aec0495cfbe231801489419e2b1d85ce1d4e55e87c2e66d69d3606d1d864a5fc074fa84c5
-  data.tar.gz: 298859b0bf5f3ac80796b85d306fb0f1f20b99c28857c469a0bd7ae896abb81d96d74b4a8c3105a7ccd26345ca4569659d695c22322bcfa07b90c880147e138b
+  metadata.gz: a54ad411a64dd89249880b5a72cf4687b475267196659bb1887b0fe9dbbce3013357ba5196a0da2369cbc92a49a9410c1c9155f9028feff3152149725c021957
+  data.tar.gz: 2ca39c591cb7a15b0a9f592c4f335ba5062c1a9b6dbda26afb7707d981b9d73278c0e84044b948f61f4f53eb274f5dd9430c96600d599db5a29c06cd47849c44

data/.mvn/extensions.xml

@@ -3,7 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.5</version>
   </extension>
 </extensions>
-

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -20,7 +20,7 @@ import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
-    private static final String WRAPPER_VERSION = "0.5.5";
+    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */
@@ -89,7 +89,7 @@ public class MavenWrapperDownloader {
             System.exit(0);
         } catch (Throwable e) {
             System.out.println("- Error downloading");
-            e.printStackTrace();
+      
             System.exit(1);
         }
     }

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/.travis.yml

@@ -1,8 +1,8 @@
 language: java
-dist: trusty
+dist: bionic
 
 rvm:
-  - jruby-9.2.7.0
+  - jruby-9.2.12.0
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+**v3.7.0** Experimental support for ios-arm64
+
+**v3.6.0** Recommend JRuby-9.2.14.0 use video-2.0 release
+
+**v3.5.0** Rebase processing core code around Sam Pottingers latest fixes for JOGL an image save, does mean breaking some of Diwis and Joshua Davis examples, but one hopes codeanticode knows what he's doing.
+
+**v3.4.3** Use Map.of to initialize HashMap bump processing version in build bump to jruby-9.2.11.0
+
+**v3.4.2** Fix native library bug on windows (thanks to Jay Scott). Add minim library examples
+
+**v3.4.1** Update to jruby-9.2.9.0
+
 **v3.4.0** Experimental refactoring of ThinkDifferent, and some other processing classes
 
 **v3.3.1** Reflection makes refactoring a nightmare DesktopHandler => ThinkDifferent

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,6 +1,6 @@
-# Propane ![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)
+# Propane [![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane) ![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)
 
-This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up. Unfortunately there is a cockup in debian distributions, and it is currently safer to use the Oracle version on debian (Archlinux openjdk version is fine).
+This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up.
 
 A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported again @sampottinger is currently working on [vanilla processing][vanilla] to use OpenJFX. It would be nice make use of java modules, but I think we should let jruby project do that first (unless processing.org beat them to it).
 
@@ -8,9 +8,12 @@ adjust above for your OS/distro setup.
 
 ## Requirements
 
-- `jdk-11.0.2+`
-- `jruby-9.2.7.0`
-- `mvn-3.5.4+`
+There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
+
+- `jdk-11.0.3+`
+- `jruby-9.2.12.0`
+
+Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
 
 ## Building and testing
 
@@ -24,10 +27,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.3.0-java.gem # local install
+jgem install propane-3.6.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.3.0-java.gem # local install
+jruby -S gem install propane-3.6.0-java.gem # local install
 ```
 
 ## Check Install
@@ -37,6 +40,10 @@ To check version and confirm gem bin files are on your path (also checks JDK ver
 propane --version
 ```
 
+## Suppressing Reflective Access warnings
+
+Since propane-3.5.0 it is possible to suppress reflective access warnings by setting JAVA_HOME environmental variable jruby does the rest.
+
 ## Usage
 
 A propane sketch:-
@@ -88,13 +95,15 @@ See [gh-pages][gh-pages] for more detailed instructions and much more.
 
 ## Examples
 
-[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.4
+[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.5
 + syntax now we can. To install the samples.  The samples get copied to `~/propane_samples`. Depends on wget.
 ```bash
 propane --install samples
 ```
  please move existing `propane_samples` if you wish to keep them. The current release features several PixelFlow glsl library examples, including a few shadertoy demos as sketches.
 
+[adopt]: https://adoptopenjdk.net/
 [building]:http://ruby-processing.github.io/building/building/
 [gh-pages]:https://ruby-processing.github.io/propane/
 [vanilla]:https://github.com/processing/processing/pull/5753
+[warning]: https://monkstone.github.io/jruby_art/update/2019/09/10/Reflective_Access.html

data/Rakefile

@@ -1,18 +1,17 @@
 # frozen_string_literal: false
+
 require_relative 'lib/propane/version'
 
-task default: [:init, :compile, :install, :test, :gem]
+task default: %i[init compile install test gem]
 
-# depends on installed processing, with processing on path
+# Currently depends on local jogl-2.4.0 jars on path ~/jogl24
 desc 'Copy Jars'
 task :init do
-  # processing_root = File.dirname(`readlink -f $(which processing)`) # for Archlinux etc
-  processing_root = File.join(ENV['HOME'], 'processing-3.5.3') # alternative for debian linux etc
-  jar_dir = File.join(processing_root, 'core', 'library')
-  opengl = Dir.entries(jar_dir).grep(/amd64|macosx-universal/)
+  jogl24 = File.join(ENV['HOME'], 'jogl24')
+  opengl = Dir.entries(jogl24).grep(/amd64|universal|arm64/).select { |jar| jar =~ /linux|windows|macosx|ios|/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
-    FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
+    FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
   end
 end
 
@@ -23,17 +22,17 @@ end
 
 desc 'Gem'
 task :gem do
-  sh 'gem build propane.gemspec'
+  sh 'jgem build propane.gemspec'
 end
 
 desc 'Document'
 task :javadoc do
-  sh 'mvn javadoc:javadoc'
+  sh './mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-  sh 'mvn package'
+  sh './mvnw package'
 end
 
 desc 'JRuby-Complete'
@@ -53,7 +52,7 @@ end
 
 desc 'clean'
 task :clean do
-  Dir["./**/*.{jar,gem}"].each do |path|
+  Dir['./**/*.{jar,gem}'].each do |path|
     puts "Deleting #{path} ..."
     File.delete(path)
   end

data/bin/propane

@@ -1,6 +1,8 @@
 #!/usr/bin/env jruby
+# frozen_string_literal: true
+
 unless defined? PROPANE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+  $LOAD_PATH << __dir__
   PROPANE_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 

data/lib/propane.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
 require 'java'
 unless defined? PROPANE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  PROPANE_ROOT = File.absolute_path(File.dirname(__dir__))
+  $LOAD_PATH << File.dirname(__dir__)
+  PROPANE_ROOT = File.dirname(__dir__)
 end
-Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
+Dir["#{PROPANE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
-require_relative 'propane/app'
+require "#{PROPANE_ROOT}/lib/propane/app"
+require "#{PROPANE_ROOT}/lib/propane/helpers/numeric"

data/lib/propane/app.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: false
+
+require 'jruby'
 require_relative 'helper_methods'
 require_relative 'library_loader'
 
@@ -8,7 +10,7 @@ module Propane
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
-
+  # import custom Vecmath renderers
   module Render
     java_import 'monkstone.vecmath.GfxRender'
     java_import 'monkstone.vecmath.ShapeRender'
@@ -49,13 +51,15 @@ module Propane
 
   # All sketches extend this class
   class App < PApplet
-    include Math, MathTool, HelperMethods, Render
+    include HelperMethods
+    include Math
+    include MathTool
+    include Render
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
     alias rgb color
     alias gray color
-    field_reader :surface
 
     def sketch_class
       self.class.sketch_class
@@ -75,8 +79,8 @@ module Propane
     #
     class << self
       # Handy getters and setters on the class go here:
-      attr_accessor :sketch_class, :library_loader, :title, :arguments, :options
-
+      attr_accessor :sketch_class, :library_loader, :arguments, :options
+      attr_reader :surface
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -99,6 +103,7 @@ module Propane
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
         return unless METHODS_TO_ALIAS.key?(method_name)
+
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
@@ -112,12 +117,14 @@ module Propane
       proxy_java_fields
       raise TypeError unless options.is_a? Hash
       raise TypeError unless arguments.is_a? Array
+
       # Set up the sketch.
       super()
       post_initialize(options)
       Propane.app = self
       @arguments = arguments
       @options   = options
+      @surface   = get_surface
       run_propane
     end
 
@@ -126,12 +133,11 @@ module Propane
       @width ||= w
       @height ||= h
       @render_mode ||= mode
-      import_opengl if /opengl/ =~ mode
+      import_opengl if /opengl/.match?(mode)
       super(*args)
     end
 
-    def post_initialize(_args)
-    end
+    def post_initialize(_args); end
 
     def sketch_title(title)
       surface.set_title(title)
@@ -164,6 +170,7 @@ module Propane
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:
       return unless METHODS_TO_ALIAS.key?(method_name)
+
       alias_method METHODS_TO_ALIAS[method_name], method_name
     end
   end
@@ -181,7 +188,10 @@ module Propane
 
     def method_missing(name, *args, &block)
       return Propane.app.send(name, *args) if Propane.app.respond_to? name
+
       super
     end
-  end # Processing::Proxy
-end # Propane
+  end
+  # end Processing::Proxy
+end
+# end Propane

data/lib/propane/creators/sketch_class.rb

@@ -5,7 +5,10 @@ class SketchClass
   attr_reader :name, :width, :height, :mode
 
   def initialize(name:, width: 150, height: 150, mode: nil)
-    @name, @width, @height, @mode = name, width, height, mode
+    @name = name
+    @width = width
+    @height = height
+    @mode = mode
   end
 
   def class_sketch
@@ -26,6 +29,7 @@ class SketchClass
 
   def size
     return format('    size %d, %d', width.to_i, height.to_i) unless mode
+
     format('    size %d, %d, %s', width.to_i, height.to_i, mode.upcase)
   end
 
@@ -36,6 +40,7 @@ class SketchClass
 
   def method_lines(name, content = nil)
     return [format('  def %s', name), '', '  end'] unless content
+
     [format('  def %s', name), content, '  end', '']
   end
 
@@ -43,6 +48,7 @@ class SketchClass
     lines = [
       '#!/usr/bin/env jruby',
       '# frozen_string_literal: false',
+      '',
       "require 'propane'",
       '',
       class_sketch

data/lib/propane/creators/sketch_factory.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'sketch_writer'
 
 class SketchFactory
-  NAMES = %w[One Two Three]
-  def initialize(argc)
+  NAMES = %w[One Two Three].freeze
+  def initialize(_argc)
     NAMES.each do |name|
       SketchWriter.new(File.basename(name, '.rb'), width: 300, height: 300).write
     end

data/lib/propane/creators/sketch_writer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'sketch_class'
 
 # The file writer can write a sketch when given instance of Sketch type

data/lib/propane/helper_methods.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
+
 # processing module wrapper
-require_relative 'helpers/numeric'
 module Propane
   # Provides some convenience methods
   module HelperMethods
@@ -52,11 +52,12 @@ module Propane
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
     def web_to_color_array(web)
-      Java::Monkstone::ColorUtil.webArray(web)
+      Java::Monkstone::ColorUtil.webArray(web.to_java(:string))
     end
 
     def int_to_ruby_colors(hex)
@@ -66,11 +67,8 @@ module Propane
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
-      if block_given?
-        Thread.new(&block)
-      else
-        raise ArgumentError, 'thread must be called with a block', caller
-      end
+      warn 'A Block is Needed' unless block_given?
+      Java::JavaLang::Thread.new(&block).start
     end
 
     # explicitly provide 'processing.org' min instance method
@@ -94,9 +92,9 @@ module Propane
     def dist(*args)
       case args.length
       when 4
-        return dist2d(*args)
+        dist2d(*args)
       when 6
-        return dist3d(*args)
+        dist3d(*args)
       else
         raise ArgumentError, 'takes 4 or 6 parameters'
       end
@@ -111,13 +109,13 @@ module Propane
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new(method_name.to_s, true)
-      methods.sort.select { |meth| reg.match(meth) }
+      methods.sort.select { |meth| reg.match?(meth) }
     end
 
     # Proxy over a list of Java declared fields that have the same name as
     # some methods. Add to this list as needed.
     def proxy_java_fields
-      fields = %w(key frameRate mousePressed keyPressed)
+      fields = %w[key frameRate mousePressed keyPressed]
       methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
@@ -163,6 +161,7 @@ module Propane
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
       return @declared_fields['frameRate'].value(java_self) unless fps
+
       super(fps)
     end
 
@@ -178,21 +177,19 @@ module Propane
 
     private
 
-    INTEGER_COL = -> (x) { x.is_a?(Integer) }
-    STRING_COL = -> (x) { x.is_a?(String) }
-    FLOAT_COL = -> (x) { x.is_a?(Float) }
     # parse single argument color int/double/String
-    def hex_color(a)
-      case a
-      when INTEGER_COL
-        Java::Monkstone::ColorUtil.colorLong(a)
-      when STRING_COL
-        return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        raise StandardError, 'Dodgy Hexstring'
-      when FLOAT_COL
-        Java::Monkstone::ColorUtil.colorDouble(a)
+    def hex_color(arg)
+      case arg
+      when Integer
+        Java::Monkstone::ColorUtil.colorLong(arg)
+      when String
+        raise 'Dodgy Hexstring' unless /#\h{6}$/.match?(arg)
+
+        Java::Monkstone::ColorUtil.colorString(arg)
+      when Float
+        Java::Monkstone::ColorUtil.colorDouble(arg)
       else
-        raise StandardError, 'Dodgy Color Conversion'
+        raise 'Dodgy Color Conversion'
       end
     end
 
@@ -200,6 +197,7 @@ module Propane
       dx = args[0] - args[2]
       dy = args[1] - args[3]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON
+
       Math.hypot(dx, dy)
     end
 
@@ -208,6 +206,7 @@ module Propane
       dy = args[1] - args[4]
       dz = args[2] - args[5]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
+
       Math.sqrt(dx * dx + dy * dy + dz * dz)
     end
   end