propane 3.4.1-java → 3.7.1-java

data/lib/propane/native_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This class knows how to dynamically set the 'java' native library path
 # It might not work with java 9?
 class NativeLoader
@@ -21,6 +23,7 @@ class NativeLoader
     field = JC::Class.for_name('java.lang.ClassLoader')
                      .get_declared_field('sys_paths')
     return unless field
+
     field.accessible = true # some jruby magic
     field.set(JC::Class.for_name('java.lang.System').get_class_loader, nil)
   end

data/lib/propane/runner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require 'optparse'
 require_relative 'version'
 
@@ -54,6 +55,8 @@ module Propane
         # assumed to have this option.
         opts.on('-h', '--help', 'Display this screen') do
           puts opts
+          puts ''
+          puts 'Run a sketch: jruby [--dev] [<sketch.rb>]'
           exit
         end
       end
@@ -66,28 +69,31 @@ module Propane
       SketchWriter.new(File.basename(filename, '.rb'), argc).write
     end
 
-    def show_version
-
-      v_format = "Propane version %s\nJRuby version %s"
-      puts format(v_format, Propane::VERSION, JRUBY_VERSION)
-    end
-
     def show_version
       require 'erb'
       require_relative 'helpers/version_error'
-      raise JDKVersionError.new if ENV_JAVA['java.specification.version'] < '11'
-      template = ERB.new <<-EOF
+      raise JDKVersionError if ENV_JAVA['java.specification.version'] < '11'
+
+      template = ERB.new <<-VERSION
         propane version <%= Propane::VERSION %>
         JRuby version <%= JRUBY_VERSION %>
-      EOF
+      VERSION
       puts template.result(binding)
     end
 
     def install(library)
+      library ||= 'new'
       choice = library.downcase
-      valid = Regexp.union('samples', 'sound', 'video', 'glvideo')
-      return warn format('No installer for %s', choice) unless valid =~ choice
-      system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
+      case choice
+      when /samples|sound|video/
+        system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
+      when /new/
+        system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_samples"
+      else
+        warn format('No installer for %<lib>s', lib: choice)
+      end
     end
-  end # class Runner
-end # module Propane
+  end
+  # class Runner
+end
+# module Propane

data/lib/propane/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Propane
-  VERSION = '3.4.1'
+  VERSION = '3.7.1'
 end

data/library/boids/boids.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Boids -- after Tom de Smedt.
 # See his Python version: http://nodebox.net/code/index.php/Boids
 # This is an example of how a pure-Ruby library can work. Original for
@@ -7,7 +9,8 @@ class Boid
   attr_accessor :boids, :pos, :vel, :is_perching, :perch_time
 
   def initialize(boids, pos)
-    @boids, @flock = boids, boids
+    @boids = boids
+    @flock = boids
     @pos = pos
     @vel = Vec3D.new
     @is_perching = false
@@ -53,6 +56,7 @@ class Boid
     # Tweet, Tweet! The boid police will bust you for breaking the speed limit.
     most = [vel.x.abs, vel.y.abs, vel.z.abs].max
     return if most < max
+
     scale = max / most.to_f
     @vel *= scale
   end
@@ -75,7 +79,7 @@ class Boids
   extend Forwardable
   def_delegators(:@boids, :reject, :<<, :each, :shuffle!, :length, :next)
 
-  attr_reader :has_goal, :perch, :perch_tm, :perch_y
+  attr_reader :has_goal, :perchance, :perch_tm, :perch_y
 
   def initialize
     @boids = []
@@ -88,16 +92,20 @@ class Boids
 
   def setup(n, x, y, w, h)
     n.times do
-      dx, dy = rand(w), rand(h)
+      dx = rand(w)
+      dy = rand(h)
       z = rand(200.0)
       self << Boid.new(self, Vec3D.new(x + dx, y + dy, z))
     end
-    @x, @y, @w, @h = x, y, w, h
+    @x = x
+    @y = y
+    @w = w
+    @h = h
     @scattered = false
     @scatter = 0.005
     @scatter_time = 50.0
     @scatter_i = 0.0
-    @perch = 1.0 # Lower this number to divebomb.
+    @perchance = 1.0 # Lower this number to divebomb.
     @perch_y = h
     @perch_tm = -> { 25.0 + rand(50.0) }
     @has_goal = false
@@ -118,11 +126,11 @@ class Boids
   def perch(ground = nil, chance = 1.0, frames = nil)
     @perch_tm = frames.nil? ? -> { 25.0 + rand(50.0) } : frames
     @perch_y = ground.nil? ? @h : ground
-    @perch = chance
+    @perchance = chance
   end
 
   def no_perch
-    @perch = 0.0
+    @perchance = 0.0
   end
 
   def goal(target:, flee: false)
@@ -138,7 +146,8 @@ class Boids
 
   def constrain
     # Put them boids in a cage.
-    dx, dy = @w * 0.1, @h * 0.1
+    dx = @w * 0.1
+    dy = @h * 0.1
     each do |b|
       b.vel.x += rand(dx) if b.pos.x < @x - dx
       b.vel.x += rand(dy) if b.pos.y < @y - dy
@@ -146,9 +155,10 @@ class Boids
       b.vel.y -= rand(dy) if b.pos.y > @y + @h + dy
       b.vel.z += 10.0 if b.pos.z < 0.0
       b.vel.z -= 10.0 if b.pos.z > 100.0
-      next unless b.pos.y > perch_y && rand < perch
+      next unless b.pos.y > perch_y && rand < perchance
+
       b.pos.y = perch_y
-      b.vel.y = -(b.vel.y.abs) * 0.2
+      b.vel.y = -b.vel.y.abs * 0.2
       b.is_perching = true
       b.perch_time = perch_tm.respond_to?(:call) ? perch_tm.call : perch_tm
     end
@@ -166,7 +176,7 @@ class Boids
     m2 = 1.0 # separation
     m3 = 1.0 # alignment
     m4 = 1.0 # goal
-    @scattered = true if !(@scattered) && rand < @scatter
+    @scattered = true if !@scattered && rand < @scatter
     if @scattered
       m1 = -m1
       m3 *= 0.25

data/library/color_group/color_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 java_import Java::Monkstone::ColorUtil
 
 # class wraps a java color array, supports shuffle!, last and ruby_string

data/library/control_panel/control_panel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Here's a little library for quickly hooking up controls to sketches.
 # For messing with the parameters and such.
 # These controls will set instance variables on the sketches.
@@ -25,7 +27,7 @@ module ControlPanel
       add_change_listener do
         update_label(label, name, value)
         ControlPanel.app_value(name, value)
-        proc.call(value) if proc
+        proc&.call(value)
       end
       ControlPanel.app_value(name, val)
     end
@@ -49,7 +51,7 @@ module ControlPanel
       control_panel.add_element(self, name)
       add_action_listener do
         ControlPanel.app_value(name, value) unless value.nil?
-        proc.call(value) if proc
+        proc&.call(value)
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
     end
@@ -69,7 +71,7 @@ module ControlPanel
       control_panel.add_element(self, name, false)
       add_action_listener do
         ControlPanel.app_value(name, value)
-        proc.call(value) if proc
+        proc&.call(value)
       end
     end
 
@@ -87,7 +89,7 @@ module ControlPanel
       control_panel.add_element(self, name, false, true)
       add_action_listener do
         Propane.app.send(name)
-        proc.call(value) if proc
+        proc&.call(value)
       end
     end
   end
@@ -160,7 +162,7 @@ module ControlPanel
     def feel(lf = 'metal')
       lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
       laf = lafinfo.to_ary.find do |info|
-        info.name =~ Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE)
+        Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE).match?(info.name)
       end
       javax.swing.UIManager.setLookAndFeel(laf.class_name)
     end
@@ -171,6 +173,7 @@ module ControlPanel
     def control_panel
       @control_panel ||= ControlPanel::Panel.new
       return @control_panel unless block_given?
+
       yield(@control_panel)
       @control_panel.display
       @control_panel.set_visible true

data/library/dxf/dxf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @TODO usage
 class Propane::App
   java_import Java::ProcessingDxf::RawDXF

data/library/file_chooser/chooser.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 # Usage: :wq
 # load_library :chooser
-# 
+#
 # def setup
-  # java_signature 'void selectInput(String, String)'
-  # selectInput('Select a file to process:', 'fileSelected')
+# java_signature 'void selectInput(String, String)'
+# selectInput('Select a file to process:', 'fileSelected')
 # end
-# 
+#
 # def fileSelected(selection)
-  # if selection.nil?
-    # puts 'Window was closed or the user hit cancel.'
-  # else
-    # puts format('User selected %s', selection.get_absolute_path)
-  # end
+# if selection.nil?
+# puts 'Window was closed or the user hit cancel.'
+# else
+# puts format('User selected %s', selection.get_absolute_path)
+# end
 # end
 class Propane::App
   include Java::MonkstoneFilechooser::Chooser

data/library/file_chooser/file_chooser.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
-# Usage: 
+
+# Usage:
 # load_library :file_chooser
 # class ...
 # def setup
-  # java_signature 'void selectInput(String, String)'
-  # selectInput('Select a file to process:', 'fileSelected')
+# java_signature 'void selectInput(String, String)'
+# selectInput('Select a file to process:', 'fileSelected')
 # end
-# 
+#
 # def fileSelected(selection)
-  # if selection.nil?
-    # puts 'Window was closed or the user hit cancel.'
-  # else
-    # puts format('User selected %s', selection.get_absolute_path)
-  # end
+# if selection.nil?
+# puts 'Window was closed or the user hit cancel.'
+# else
+# puts format('User selected %s', selection.get_absolute_path)
+# end
 # end
 # ...
 class Propane::App

data/library/library_proxy/library_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 java_import Java::MonkstoneCore::LibraryProxy
 java_import Java::ProcessingEvent::KeyEvent
 java_import Java::ProcessingEvent::MouseEvent

data/library/net/net.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @TODO usage
 class Propane::App
   java_import Java::ProcessingNet::Client

data/library/simplex_noise/simplex_noise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Propane::App
   SimplexNoise = Java::MonkstoneNoise::SimplexNoise
 end

data/library/slider/slider.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 # Here's a little library for quickly hooking up in sketch sliders.
-# Copyright (c) 2016-19 Martin Prout.
+# Copyright (c) 2015-20 Martin Prout.
 
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'
@@ -9,27 +10,27 @@ java_import 'monkstone.slider.CustomVerticalSlider'
 module Slider
   def self.slider(app:, x:, y:, name:, **opts)
     options = default.merge opts
-    if options[:vertical]
-      slider = CustomVerticalSlider.new(
-        app,
-        x,
-        y,
-        options[:length],
-        options[:range].first,
-        options[:range].last,
-        name
-    )
-    else
-      slider = CustomHorizontalSlider.new(
-        app,
-        x,
-        y,
-        options[:length],
-        options[:range].first,
-        options[:range].last,
-        name
-    )
-    end
+    slider = if options[:vertical]
+               CustomVerticalSlider.new(
+                 app,
+                 x,
+                 y,
+                 options[:length],
+                 options[:range].first,
+                 options[:range].last,
+                 name
+               )
+             else
+               CustomHorizontalSlider.new(
+                 app,
+                 x,
+                 y,
+                 options[:length],
+                 options[:range].first,
+                 options[:range].last,
+                 name
+               )
+             end
     unless opts.empty?
       slider.bar_width(opts.fetch(:bar_width, 10))
       slider.set_value(opts.fetch(:initial_value, 0))

data/library/vector_utils/vector_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PHI ||= (1 + Math.sqrt(5)) / 2 # golden ratio
 GA = PHI * 2 * Math::PI # golden angle
 
@@ -48,6 +50,7 @@ module VectorUtil
   def self.cartesian_to_polar(vec:)
     res = Vec3D.new(vec.mag, 0, 0)
     return Vec3D.new unless res.x > 0
+
     res.y = -Math.atan2(vec.z, vec.x)
     res.z = Math.asin(vec.y / res.x)
     res
@@ -64,6 +67,7 @@ module VectorUtil
 
   def self.polar_to_cartesian(vec:)
     return Vec3D.new if vec.mag <= 0
+
     Vec3D.new(Math.asin(vec.y / vec.mag), vec.mag, -Math.atan2(vec.z, vec.x))
   end
 end

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.1'
+  id 'propane:propane:3.7.1'
   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.15.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