picrate 1.2.3-java → 2.1.0-java

data/lib/picrate/app.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: false
+
+require 'jruby'
 require_relative 'helper_methods'
 require_relative 'library_loader'
 # A wrapper module for the processing App
@@ -49,7 +51,10 @@ module Processing
 
   # All sketches extend this class
   class App < PApplet
-    include Math, MathTool, HelperMethods, Render
+    include Render
+    include HelperMethods
+    include MathTool
+    include Math
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
@@ -101,6 +106,7 @@ module Processing
       # 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
@@ -113,6 +119,7 @@ module Processing
       # Guard against invalid input.
       proxy_java_fields
       raise TypeError unless options.is_a?(Hash) && arguments.is_a?(Array)
+
       # Set up the sketch.
       super()
       post_initialize(options)
@@ -132,8 +139,7 @@ module Processing
       super(*args)
     end
 
-    def post_initialize(_args)
-    end
+    def post_initialize(_args); end
 
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
@@ -162,6 +168,7 @@ module Processing
     # 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
@@ -179,6 +186,7 @@ module Processing
 
     def method_missing(name, *args, &block)
       return Processing.app.send(name, *args) if Processing.app.respond_to? name
+
       super
     end
   end # Processing::Proxy

data/lib/picrate/creators/parameters.rb

@@ -11,13 +11,13 @@ module Parameters
   PARAM = { 'sketch' =>
     { 'width' => 640, 'height' => 480, 'mode' => 'P2D' } }.freeze
 
-    def self.write
-      FileUtils.mkdir_p PATH
-      File.write(FILE, PARAM.to_yaml)
-    end
+  def self.write
+    FileUtils.mkdir_p PATH
+    File.write(FILE, PARAM.to_yaml)
+  end
 
-    def self.read
-      write unless File.exist?(FILE)
-      YAML.load_file(FILE)
-    end
+  def self.read
+    write unless File.exist?(FILE)
+    YAML.load_file(FILE)
   end
+end

data/lib/picrate/creators/sketch_factory.rb

@@ -1,8 +1,10 @@
-require_relative 'sketch_writer'
+# frozen_string_literal: true
 
+require_relative 'sketch_writer'
+# Sketch Factory
 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')).write
     end

data/lib/picrate/helper_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # processing module wrapper
 require_relative 'helpers/numeric'
 module Processing
@@ -52,6 +53,7 @@ module Processing
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
@@ -66,11 +68,8 @@ module Processing
     # 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 'you must provide a block' unless block_given?
+      Java::JavaLang::Thread.new(&block).start
     end
 
     # explicitly provide 'processing.org' min instance method
@@ -94,9 +93,9 @@ module Processing
     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 +110,13 @@ module Processing
     # 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 +162,7 @@ module Processing
     # 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,19 +178,17 @@ module Processing
 
     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 StandardError, 'Dodgy Hexstring' unless arg.match(/#\h{6}$/)
+
+        Java::Monkstone::ColorUtil.colorString(arg)
+      when Float
+        Java::Monkstone::ColorUtil.colorDouble(arg)
       else
         raise StandardError, 'Dodgy Color Conversion'
       end
@@ -200,6 +198,7 @@ module Processing
       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 +207,7 @@ module Processing
       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/picrate/helpers/numeric.rb

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

data/lib/picrate/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(PICRATE_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
 

data/lib/picrate/library_loader.rb

@@ -33,10 +33,12 @@ module Processing
 
     def loader(name)
       return true if @loaded_libraries.include?(name)
+
       fname = name.to_s
       library = Library.new(fname)
       library.locate
       return require_library(library, name) if library.ruby?
+
       warn("Not found library: #{fname}") unless library.exist?
       load_jars(library, name)
     end

data/lib/picrate/native_folder.rb

@@ -7,7 +7,7 @@ class NativeFolder
 
   LINUX_FORMAT = 'linux%s'.freeze
   ARM32 = '-armv6hf'.freeze
-  # ARM64 = '-aarch64'.freeze
+  ARM64 = '-aarch64'.freeze
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
@@ -18,6 +18,7 @@ class NativeFolder
     if /linux/.match?(os)
       return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
       return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
+      return format(LINUX_FORMAT, ARM64) if /aarch/.match?(bit)
     end
     raise RuntimeError, "Unsupported Architecture"
   end

data/lib/picrate/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/picrate/runner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require 'optparse'
 require_relative 'version'
 
@@ -40,7 +41,7 @@ module Processing
         end
 
         options[:install] = false
-        message = '<Samples><GLVideo><Video><Sound> Install samples or library'
+        message = '<Samples><Video> Install samples or library'
         opts.on('-i', '--install', message) do
           options[:install] = true
         end
@@ -80,7 +81,9 @@ module Processing
       library ||= 'new'
       choice = library.downcase
       case choice
-      when /samples|sound|video/
+      when /sound/
+        warn 'The sound library is broken, try minim instead'
+      when /samples|video/
         system "cd #{PICRATE_ROOT}/vendors && rake install_#{choice}"
       when /new/
         # install samples and config geany

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '1.2.3'
+  VERSION = '2.1.0'
 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 = Vec2D.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].max
     return if most < max
+
     scale = max / most.to_f
     @vel *= scale
   end
@@ -76,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 = []
@@ -89,15 +92,19 @@ class Boids
 
   def setup(n, x, y, w, h)
     n.times do
-      dx, dy = rand(w), rand(h)
+      dx = rand(w)
+      dy = rand(h)
       self << Boid.new(self, Vec2D.new(x + dx, y + dy))
     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 +125,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)
@@ -145,13 +152,15 @@ 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
       b.vel.x -= rand(dx) if b.pos.x > @x + @w + dx
       b.vel.y -= rand(dy) if b.pos.y > @y + @h + dy
       next unless b.pos.y > perch_y && rand < perch
+
       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 (of signed int), supports shuffle!, last and

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
@@ -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