jruby_art 2.2.0 → 2.4.1

data/lib/jruby_art/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
+
 # A wrapper for version
 module JRubyArt
-	VERSION = '2.2.0'
+  VERSION = '2.4.1'
 end

data/library/boids/boids.rb

@@ -1,4 +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
@@ -8,7 +9,8 @@ class Boid
   attr_reader :boids
   attr_accessor :vel, :pos, :is_perching, :perch_time
   def initialize(boids, pos)
-    @boids, @flock = boids, boids
+    @boids = boids
+    @flock = boids
     @pos = pos
     @vel = Vec3D.new
     @is_perching = false
@@ -54,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
@@ -70,13 +73,13 @@ end
 
 require 'forwardable'
 
-# The Boids class
+# The Boids class NB: perchance => perch chance
 class Boids
   include Enumerable
   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 = []
@@ -89,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
@@ -119,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 reset_goal(target)
@@ -146,7 +153,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.y += rand(dy) if b.pos.y < @y - dy
@@ -154,7 +162,8 @@ 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.is_perching = true

data/library/chooser/chooser.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 # Usage:
 # 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 Processing::App
   include Java::MonkstoneFilechooser::Chooser

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
         Processing.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)
+        info.name.match?(Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE))
       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 Processing::App
   java_import Java::ProcessingDxf::RawDXF

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 Processing::App
   java_import Java::ProcessingNet::Client

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'
@@ -8,34 +9,34 @@ 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))
     end
     slider
   end
-  
+
   def self.default
     { length: 100, range: (0..100) }
   end

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
 
@@ -47,7 +49,8 @@ module VectorUtil
 
   def self.cartesian_to_polar(vec:)
     res = Vec3D.new(vec.mag, 0, 0)
-    return Vec3D.new unless res.x > 0
+    return Vec3D.new unless res.x.positive?
+
     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,7 @@
+# frozen_string_literal: true
+
+# include interfaces
 class Processing::App
-  include Java::MonkstoneVideoevent::VideoInterface
+  include Java::MonkstoneVideoevent::MovieEvent
+  include Java::MonkstoneVideoevent::CaptureEvent
 end

data/vendors/Rakefile

@@ -1,50 +1,57 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'rake/clean'
 
-WARNING = <<-WARN.freeze
-   WARNING: you may not have wget installed, you could just download
-   the correct version of jruby-complete to the vendors folder, and
-   re-run k9 setup install instead of installing wget. Some systems
-   may also require 'sudo' access to install, NB: this is untested....
+WARNING = <<~WARN
+  WARNING: you may not have wget installed, you could just download
+  the correct version of jruby-complete to the vendors folder, and
+  re-run k9 setup install instead of installing wget. Some systems
+  may also require 'sudo' access to install, NB: this is untested....
 
 WARN
-
-JRUBYC_VERSION     = '9.2.8.0'.freeze
-
-EXAMPLES           = '3.4'.freeze
+# https://github.com/processing/processing-video/releases/download/r6-v2.0-beta4/video-2.0-beta4.zip
+JRUBYC_VERSION = '9.2.12.0'
+SOUND = 'sound.zip'
+SOUND_VERSION = 'v2.2.2'
+VIDEO = 'video-2.0-beta4.zip'
+VIDEO_VERSION = 'r6-v2.0-beta4'
+EXAMPLES = '3.7'
 HOME_DIR = ENV['HOME']
-MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
+MAC_OR_LINUX = /linux|mac|darwin/.match?(RbConfig::CONFIG['host_os'])
 
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar"
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
 
-file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
-  begin
-    system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
-  rescue
-    warn(WARNING)
-  end
+desc 'dependency check'
+task :wget_check do
+  WGET ||= `which wget`.freeze
+  warn WARNING unless WGET
 end
 
-desc 'get sha256'
-task get_sha256: ["jruby-complete-#{JRUBYC_VERSION}.jar.sha256"]
-
-desc 'download, and copy to jruby_art'
-task default: %i[get_sha256 download copy_ruby]
-
-desc 'download JRuby upstream sources'
-task download: ["jruby-complete-#{JRUBYC_VERSION}.jar"]
+file "jruby-complete-#{JRUBYC_VERSION}.jar.sha256" do
+  system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
+end
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   begin
     system "wget https://repo1.maven.org/maven2/org/jruby/jruby-complete/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"
-  rescue
+  rescue NameError
     warn(WARNING)
   end
   value = File.read("jruby-complete-#{JRUBYC_VERSION}.jar.sha256")
   check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", value)
 end
 
+desc 'get sha256'
+task get_sha256: ['wget_check', "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"]
+
+desc 'download, and copy to jruby_art'
+task default: %i[wget_check download copy_ruby install_samples]
+
+desc 'download JRuby upstream sources'
+task download: ['get_sha256', "jruby-complete-#{JRUBYC_VERSION}.jar"]
+
 directory '../lib/ruby'
 
 desc 'copy jruby-complete'
@@ -67,32 +74,78 @@ def check_sha256(filename, expected_hash)
   raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
 end
 
+desc 'initialize ~/.jruby_art directories'
+task :init_dir do
+  unless File.exist? "#{HOME_DIR}/.jruby_art/libraries"
+    FileUtils.mkdir_p "#{HOME_DIR}/.jruby_art/libraries"
+  end
+end
+
+desc 'download and copy sound library to ~/.jruby_art'
+task download_and_copy_sound: %i[wget_check init_dir download_sound copy_sound clobber]
+
+desc 'download and copy video library to ~/.jruby_art'
+task download_and_copy_video: %i[wget_check init_dir download_video copy_video clobber]
+
+desc 'download sound library'
+task :download_sound do
+  wget_base = 'wget https://github.com/processing/processing-sound'
+  wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
+  puts wget_string
+  system wget_string
+end
+
+desc 'download video library'
+task :download_video do
+  wget_base = 'wget https://github.com/processing/processing-video'
+  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
+  system wget_string
+end
+
+desc 'copy sound library'
+task copy_sound: SOUND do
+  system "unzip #{SOUND}"
+  if File.exist? "#{HOME_DIR}/.jruby_art/libraries/sound"
+    FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/sound"
+  end
+  FileUtils.cp_r 'sound', "#{HOME_DIR}/.jruby_art/libraries"
+  FileUtils.rm_r 'sound'
+end
+
+desc 'copy video library'
+task copy_video: VIDEO do
+  system "unzip #{VIDEO}"
+  if File.exist? "#{HOME_DIR}/.jruby_art/libraries/video"
+    FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/video"
+  end
+  FileUtils.cp_r 'video', "#{HOME_DIR}/.jruby_art/libraries/video"
+  FileUtils.rm_r 'video'
+end
+
 desc 'download, and copy to jruby_art'
-task unpack_samples: %i[download_examples copy_examples]
+task install_samples: %i[download_examples copy_examples]
 
 desc 'download and copy examples to user home'
 task :download_examples
 file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
-  begin
-    if MAC_OR_LINUX.nil?
-      system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
-    else
-      system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
-    end
-  rescue
-    warn(WARNING)
+  if MAC_OR_LINUX.nil?
+    system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
+  else
+    system "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
   end
 end
 
 desc 'copy examples'
 task copy_examples: file_name do
   if MAC_OR_LINUX.nil?
-    sh "unzip #{EXAMPLES}.zip"
+    system  "unzip #{EXAMPLES}.zip"
   else
-    sh "tar xzvf #{EXAMPLES}.tar.gz"
+    system  "tar xzvf #{EXAMPLES}.tar.gz"
+  end
+  if File.exist? "#{HOME_DIR}/k9_samples"
+    FileUtils.rm_r("#{HOME_DIR}/k9_samples")
   end
-  FileUtils.rm_r("#{HOME_DIR}/k9_samples") if File.exist? "#{HOME_DIR}/k9_samples"
   FileUtils.cp_r("JRubyArt-examples-#{EXAMPLES}", "#{HOME_DIR}/k9_samples")
   FileUtils.rm_r("JRubyArt-examples-#{EXAMPLES}")
 end