propane 3.4.2-java → 3.8.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6230638aa8f3fba662a21f16d203f35d4e54cbf8fa90f3d35aeec00aeae0aed
-  data.tar.gz: 62b86da2a9d1b46fa7f2f09463be5edbfd1d05336adf79ae17df362382b1fa34
+  metadata.gz: 5df47b4eba645e3b5de5e4c6bbcd5af6c2955cc2e34c326fcb712b967d272c2e
+  data.tar.gz: fd791b044c4780f082aa2f6660a7818266603fd6fdcbb6463c8af6c42e34a41d
 SHA512:
-  metadata.gz: 8f8c4c2177460c3b96817b7c870de6312ebf864853216f3039bc33fec3ae97e713c4fe31c829a4e39d7e4aea56537cddece1399b772a0432e2d7695ec0f19e37
-  data.tar.gz: 286d27b5c13890175871709260d4a117545bf203679a40672518927a20a51940266cc5ae8293024d01a76f02f4ceac5ecdae61b686d9cf2f7259743500ea7b26
+  metadata.gz: 49bab01156deeea38dc4710486fa371dc93a0b0056f7e93d5110fc2343f4477093fcbd2cc50cc7d3153668916d80ed1dff74a0e3fdcce652784d0d6d8d99c90a
+  data.tar.gz: 752c53bb1719652fc1b11514add89b0dff33b2dba23b72ed44db0c58a3d86b99373d1f69f7d928c12e829fb4d1b942da89805d3d4dc3c427bcc36477d60abd75

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.6</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

@@ -2,7 +2,7 @@ language: java
 dist: bionic
 
 rvm:
-  - jruby-9.2.9.0
+  - jruby-9.2.12.0
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,6 +1,14 @@
+**v3.8.0** Refactor noise to delegate pattern, improve default implementation and add simplex noise option
+
+**v3.7.1** Recommend JRuby-9.2.15.0 use
+
+**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.1** Update to jruby-9.2.9.0
 
 **v3.4.0** Experimental refactoring of ThinkDifferent, and some other processing classes
 

data/Gemfile

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

data/README.md

@@ -8,12 +8,10 @@ adjust above for your OS/distro setup.
 
 ## Requirements
 
-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.
+Previously there has been linker issue with P2D or P3D sketches with stock openjdk with some linux distros, but that seems to have gone away. [Adopt open jdk binaries][adopt] have always worked.
 
-- `jdk-11.0.3+`
-- `jruby-9.2.9.0`
-
-Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
+- `jdk-11.0.7+`
+- `jruby-9.2.16.0`
 
 ## Building and testing
 
@@ -27,10 +25,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.4.2-java.gem # local install
+jgem install propane-3.8.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.4.2-java.gem # local install
+jruby -S gem install propane-3.8.0-java.gem # local install
 ```
 
 ## Check Install
@@ -39,7 +37,6 @@ To check version and confirm gem bin files are on your path (also checks JDK ver
 ```bash
 propane --version
 ```
-
 ## Usage
 
 A propane sketch:-
@@ -91,12 +88,12 @@ 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.
+ please move existing `propane_samples` if you wish to keep them. The current release features some noise sketches that exploit the new choice of noise implementation.
 
 [adopt]: https://adoptopenjdk.net/
 [building]:http://ruby-processing.github.io/building/building/

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 './mvnw javadoc:javadoc'
+  sh './mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-	sh './mvnw 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.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,5 +1,6 @@
 # frozen_string_literal: false
 
+require 'jruby'
 require_relative 'helper_methods'
 require_relative 'library_loader'
 
@@ -15,6 +16,9 @@ module Propane
     java_import 'monkstone.vecmath.ShapeRender'
   end
 
+  VALUE = Java::MonkstoneNoise::NoiseMode::PERLIN
+  SIMPLEX = Java::MonkstoneNoise::NoiseMode::SIMPLEX
+
   # This class is the base class the user should inherit from when making
   # their own sketch.
   #
@@ -132,7 +136,7 @@ module Propane
       @width ||= w
       @height ||= h
       @render_mode ||= mode
-      import_opengl if /opengl/ =~ mode
+      import_opengl if /opengl/.match?(mode)
       super(*args)
     end
 

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,6 +52,7 @@ module Propane
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
@@ -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

data/lib/propane/helpers/numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Numeric #:nodoc:
   def degrees
     self * 57.29577951308232

data/lib/propane/helpers/version_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class JDKVersionError < StandardError
   def message

data/lib/propane/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'native_folder'
 require_relative 'native_loader'
 require 'pathname'
@@ -18,6 +20,7 @@ class Library
     return if (@path = Pathname.new(
       File.join(PROPANE_ROOT, 'library', name, "#{name}.rb")
     )).exist?
+
     locate_java
   end
 
@@ -46,10 +49,11 @@ class Library
   end
 
   def load_jars
-    Dir.glob("#{dir}/*.jar").each do |jar|
+    Dir.glob("#{dir}/*.jar").sort.each do |jar|
       require jar
     end
     return true unless native_binaries?
+
     add_binaries_to_classpath
   end