ruby-processing 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2afd84f1f31d6bb5a7646833da3198a47d36c288
-  data.tar.gz: eb51a2021e9294b6976de2b755e5b0ff90a81d9e
+  metadata.gz: b0e7df4d8034c02dcfe15463749d38214bbe608f
+  data.tar.gz: e4a17499eeb39eadc078e071eb05b277afd2c03f
 SHA512:
-  metadata.gz: f4fa0f3ac500132fcd125e67adc181de0706464431809fe96369d73432b2379b40a9edfef07a1dc19dfa030eafa77be5757920e22877088ab51ef8256d108ebe
-  data.tar.gz: 395804d382878458e4e9e2dc001c35cc1c6d81367ab4604a850ed636c1b334c2401e3c1cc6c68963178cc597c4422483dd51ce50665156cb310c7ddf673caf18
+  metadata.gz: 8bfc1d032a6c94051c9a727f4daa0523dc4429cb02744a34c0f6f20c84a220a653d3ba1b6716a9745622a1fd1465d9ce5506b1fe1f238980dfb64181c2f03686
+  data.tar.gz: d555e878a9d35ea17fc64ae4f713413364c943e92be126e2b9683b503ab4db7d03b3ac8c1b68a775770a7c9a636e059614f4a4109b8e9757ec1a10865e5f93ab

data/lib/ruby-processing.rb

@@ -29,4 +29,4 @@ module Processing
   autoload :Runner,               'ruby-processing/runner'
   autoload :Watcher,              'ruby-processing/runners/watch'
 
-end
+end

data/lib/ruby-processing/app.rb

@@ -10,7 +10,8 @@ require_relative '../ruby-processing/config'
 Dir["#{Processing::RB_CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each { |jar| require jar }
 
 # Include some core processing classes that we'd like to use:
-%w(PApplet PConstants PFont PImage PShape PShapeOBJ PShapeSVG PStyle PGraphicsJava2D PGraphics PFont PVector PMatrix2D PMatrix3D).each do |klass|
+%w(PApplet PConstants PFont PImage PShape PShapeOBJ PShapeSVG PStyle 
+   PGraphicsJava2D PGraphics PFont PVector PMatrix2D PMatrix3D).each do |klass|
   java_import "processing.core.#{klass}"
 end
 
@@ -50,26 +51,11 @@ module Processing
         key_released:   :keyReleased,
         key_typed:      :keyTyped
       }
-      if methods_to_alias.keys.include?(method_name)
+      if methods_to_alias.key?(method_name)
         alias_method methods_to_alias[method_name], method_name
       end
     end    
-    
-    # Some class methods made available in the instance.
-     [:day, :month, :year, :sq, :mag, :println, :hex, :abs, :binary, :ceil,
-      :nf, :nfc, :nfp, :nfs, :round, :trim, :unbinary, :unhex ].each do |meth|
-      method = <<-EOS
-      def #{meth}(*args)
-        self.class.#{meth}(*args)
-      end
-      EOS
-      eval method
-    end
-    
-    # Above block deprecated from processing-2.5.1, you should in general prefer 
-    # ruby alternatives (eg t = Time.now and t.sec to second):-
-    # constrain, dist, map, norm, lerp and blend_color are implemented directly
-    
+   
     # Handy getters and setters on the class go here:
     def self.sketch_class;  @sketch_class;        end
     @@full_screen = false

data/lib/ruby-processing/exporters/application_exporter.rb

@@ -55,7 +55,7 @@ module Processing
       cp_r(@libraries, File.join(@dest, @prefix, 'library')) unless @libraries.empty?
       # Then move the icon
       potential_icon = Dir.glob(File.join(@dest, @prefix, 'data/*.icns'))[0]
-      move(potential_icon, File.join(@dest, 'Contents/Resources/sketch.icns'), force: true) if potential_icon
+      move(potential_icon, File.join(@dest, 'Contents/Resources/sketch.icns'), force: true) if potential_icon 
     end
 
     def calculate_substitutions
@@ -66,7 +66,7 @@ module Processing
     end
 
     def create_executables
-      render_erb_in_path_with_binding(@dest, binding, :delete => true)
+      render_erb_in_path_with_binding(@dest, binding, delete: true)
       rm Dir.glob(@dest + '/**/*.java')
       runnable = @dest + '/' + File.basename(@main_file, '.rb')
       move @dest + '/run', runnable

data/lib/ruby-processing/exporters/base_exporter.rb

@@ -4,10 +4,9 @@ require_relative '../../ruby-processing/library_loader'
 
 module Processing
   # This base exporter implements some of the common
-  # code-munging needed to generate apps.
+  # code-munging needed to generate apps/ blank sketches.
   class BaseExporter
     include FileUtils
-    ## hashes with strings as keys need to retain old hash syntax
     DEFAULT_DIMENSIONS = { 'width' => '100', 'height' => '100' }
     DEFAULT_DESCRIPTION = ''
     NECESSARY_FOLDERS = %w(data lib vendor)
@@ -43,17 +42,20 @@ module Processing
 
     # Searches the source for a title.
     def extract_title(source)
-      match = source.match(/#{@info[:class_name]}\.new.*?:title\s=>\s["'](.+?)["']/m)
+      filter = /#{@info[:class_name]}\.new.*?:title\s=>\s["'](.+?)["']/m
+      match = source.match(filter)
       match ? match[1] : File.basename(@file, '.rb').titleize
     end
 
     # Searches the source for the width and height of the sketch.
     def extract_dimension(source, dimension)
-      match = source.match(/#{@info[:class_name]}\.new.*?:#{dimension}\s?=>\s?(\d+)/m)
-      size_match = source.match(/^[^#]*size\(?\s*(\d+)\s*,\s*(\d+)\s*\)?/)
+      filter = /#{@info[:class_name]}\.new.*?:#{dimension}\s?=>\s?(\d+)/m
+      match = source.match(filter)
+      sz_match = source.match(/^[^#]*size\(?\s*(\d+)\s*,\s*(\d+)\s*\)?/)
       return match[1] if match
-      return (dimension == 'width' ? size_match[1] : size_match[2]) if size_match
-      warn 'using default dimensions for export, please use constants integer values in size() call instead of computed ones'
+      return (dimension == 'width' ? sz_match[1] : sz_match[2]) if sz_match
+      warn 'using default dimensions for export, please use constants integer'\
+        'values in size() call instead of computed ones'
       DEFAULT_DIMENSIONS[dimension]
     end
 
@@ -83,11 +85,14 @@ module Processing
       requirements = []
       partial_paths = []
       loop do
-        matchdata = code.match(/^.*[^::\.\w](require_relative|require|load)\b.*$/)
+        matchdata = code.match(
+          /^.*[^::\.\w](require_relative|require|load)\b.*$/
+        )
         break unless matchdata
         line = matchdata[0].gsub('__FILE__', "'#{@main_file_path}'")
-        if (line =~ /\b(require_relative|require|load)\b/)
-          ln = line.gsub(/\b(require_relative|require|load)\b/, '') 
+        req = /\b(require_relative|require|load)\b/
+        if req =~ line
+          ln = line.gsub(req, '')
           partial_paths << ln
           where = "{#{local_dir}/,}{#{partial_paths.join(',')}}"
           where += '.{rb,jar}' unless line =~ /\.[^.]+$/

data/lib/ruby-processing/exporters/creator.rb

@@ -1,56 +1,113 @@
 module Processing
   require_relative '../../ruby-processing/exporters/base_exporter'
-  # This class creates blank sketches, with the boilerplate filled in.
+  Param = Struct.new(:name, :file_name, :title, :width, :height, :mode)
+  # An abstract class providing common methods for real creators
   class Creator < BaseExporter
 
     ALL_DIGITS = /\A\d+\Z/
 
-    # Create a blank sketch, given a path.
-    # @TODO reduce cyclomatic complexity
-    def create!(path, args, p3d)
-      usage if /\?/ =~ path || /--help/ =~ path
-      main_file = File.basename(path, '.rb')
-      # Check to make sure that the main file doesn't exist already
-      already_exists(path)
+    def already_exist(path)
+      new_file = "#{File.dirname(path)}/#{path.underscore}.rb"
+      if !File.exist?(path) && !File.exist?(new_file)
+        return
+      else
+        puts 'That file already exists!'
+        exit
+      end
+    end
 
-      # Get the substitutions
-      @name           = main_file.camelize
-      @file_name      = main_file.underscore
-      @title          = main_file.titleize
+    # Show the help/usage message for create.
+    def usage
+      puts <<-USAGE
 
-      @width, @height = args[0], args[1]
-      @with_size      = @width && @width.match(ALL_DIGITS) &&
-                        @height && @height.match(ALL_DIGITS)
+      Usage: rp5 create <sketch_to_generate> <width> <height> <mode>
+      mode can be P2D / P3D.
+      Use    --wrap for a sketch wrapped as a class
+      Use    --inner to generated a ruby version of 'java' Inner class
+      Examples: rp5 create fancy_drawing/app 800 600
+      rp5 create fancy_drawing/app 800 600 P3D --wrap
+      rp5 create inner_class --inner
 
+      USAGE
+    end
+
+    def create_file(path, param, rendered, type)
       # Make the file
       dir = File.dirname path
       mkdir_p dir
-      template_name = p3d ? 'p3d_sketch.rb.erb' : 'blank_sketch.rb.erb'
+      ful_path = File.join(dir, "#{param.file_name}.rb")
+      File.open(ful_path, 'w') { |f| f.print(rendered) }
+      puts "Created #{type} \"#{param.title}\" in #{ful_path.sub(/\A\.\//, '')}"
+    end
+  end
+
+  # This class creates bare sketches, with an optional render mode
+  class BasicSketch < Creator
+    # Create a blank sketch, given a path.
+    def create!(path, args)
+      return usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb')
+      # Check to make sure that the main file doesn't exist already
+      already_exist(path)
+      @param = Param.new(
+        main_file.camelize,
+        main_file.underscore,
+        main_file.titleize,
+        args[0],
+        args[1],
+        args[2]
+        )
+      @with_size = @param.width && @param.width.match(ALL_DIGITS) &&
+        @param.height && @param.height.match(ALL_DIGITS)
+      template_name = @param.mode.nil? ? 'basic.rb.erb' : 'basic_mode.rb.erb'
       template = File.new("#{RP5_ROOT}/lib/templates/create/#{template_name}")
       rendered = render_erb_from_string_with_binding(template.read, binding)
-      full_path = File.join(dir, "#{@file_name}.rb")
-      File.open(full_path, 'w') { |f| f.print(rendered) }
-      puts "Created a new Sketch in #{full_path.sub(/\A\.\//, '')}"
+      create_file(path, @param, rendered, 'Sketch')
     end
+  end
 
-    def already_exist(path)
-      if File.exist?(path) || File.exist?("#{File.dirname(path)}/#{main_file.underscore}.rb")
-        puts 'That sketch already exists.'
-      end
-      exit
+  # This class creates class wrapped sketches, with an optional render mode
+  class ClassSketch < Creator
+    # Create a bare blank sketch, given a path.
+    def create!(path, args)
+      return usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb')
+      # Check to make sure that the main file doesn't exist already
+      already_exist(path)
+      @param = Param.new(
+        main_file.camelize,
+        main_file.underscore,
+        main_file.titleize,
+        args[0],
+        args[1],
+        args[2]
+        )
+      @with_size = @param.width && @param.width.match(ALL_DIGITS) &&
+        @param.height && @param.height.match(ALL_DIGITS)
+      t_name = @param.mode.nil? ? 'basic_wrap.rb.erb' : 'mode_wrap.rb.erb'
+      template = File.new("#{RP5_ROOT}/lib/templates/create/#{t_name}")
+      rendered = render_erb_from_string_with_binding(template.read, binding)
+      create_file(path, @param, rendered, 'Sketch')
     end
+  end
 
-    # Show the help/usage message for create.
-    def usage
-      puts <<-USAGE
-
-      Usage: script/generate <sketch_to_generate> <width> <height>
-      Width and Height are optional.
-
-      Example: script/generate fancy_drawing/app 800 600
-
-      USAGE
-      exit
+  # This class creates a ruby-processing class that mimics java inner class
+  class Inner < Creator
+    # Create a blank sketch, given a path.
+    def create!(path, _args_)
+      return usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb')
+      # Check to make sure that the main file doesn't exist already
+      already_exist(path)
+      @param = Param.new(
+        main_file.camelize,
+        main_file.underscore,
+        main_file.titleize
+        )
+      template_name = 'inner_class.rb.erb'
+      template = File.new("#{RP5_ROOT}/lib/templates/create/#{template_name}")
+      rendered = render_erb_from_string_with_binding(template.read, binding)
+      create_file(path, @param, rendered, "\"Inner Class\"")
     end
   end
 end

data/lib/ruby-processing/helper_methods.rb

@@ -33,7 +33,7 @@ module Processing
       # convert to signed int
       if args.length == 1
         if a.is_a?(Fixnum) && a >= 2**31
-          args = [ a - 2**32 ]
+          args = [a - 2**32]
         elsif a.is_a?(String) && a[0].eql?('#')
           h = a[1..-1].rjust(6, '0').prepend('ff')
           return color(h.hex)
@@ -64,7 +64,13 @@ module Processing
       end
     end
     
-     # explicitly provide 'processing.org' map instance method
+    # Explicitly provides 'processing.org' map instance method, in which
+    # value is mapped from range 1, to range 2 (NB: values are not clamped to
+    # range 1). It may be better to explicitly write your own interpolate function
+    # @param [float] value input
+    # @param [range] start1, stop1
+    # @param [range] start1, stop2
+    # @return [float] mapped value
     def map(value, start1, stop1, start2, stop2)
       start2 + (stop2 - start2) * ((value - start1).to_f / (stop1 - start1))
     end
@@ -92,6 +98,24 @@ module Processing
     def max(*args)
       args.max { |a, b| a <=> b }
     end
+    
+    # explicitly provide 'processing.org' abs instance method
+    def abs(val)
+      warn 'abs(val) is deprecated use val.abs to avoid this warning'
+      val.abs
+    end
+
+    # explicitly provide 'processing.org' ceil instance method
+    def ceil(val)
+      warn 'ceil(val) is deprecated use val.ceil to avoid this warning'
+      val.ceil
+    end
+    
+    # explicitly provide 'processing.org' round instance method
+    def round(val)
+      warn 'round(val) is deprecated use val.round to avoid this warning'
+      val.round
+    end
 
     # explicitly provide 'processing.org' dist instance method
     def dist(*args)
@@ -111,28 +135,98 @@ module Processing
 
     # explicitly provide 'processing.org' pow instance method
     def pow(x, exp)
-      # warn 'pow(x, exp) is deprecated use x**exp to avoid this warning'
+      warn 'pow(x, exp) is deprecated use x**exp to avoid this warning'
       x**exp
     end
 
     # explicitly provide 'processing.org' radians instance method
     def radians(theta)
-      # warn 'radians(theta) is deprecated use theta.radians to avoid this warning'
+      warn 'radians(theta) is deprecated use theta.radians to avoid this warning'
       theta.radians
     end
     
+        # explicitly provide 'processing.org' degrees instance method
+    def degrees(theta)
+      warn 'degrees(theta) is deprecated use theta.radians to avoid this warning'
+      theta.degrees
+    end
+    
+    # explicitly provide 'processing.org' hex instance method
+    def hex(x)
+      warn 'hex(x) is deprecated use x.hex to avoid this warning'
+      x.hex
+    end
+    
+     # explicitly provide 'processing.org' unhex instance method
+    def unhex(str)
+      warn 'unhex(str) is deprecated use str.to_i(base=16)'
+      str.to_i(base=16)
+    end
+    
+    # explicitly provide 'processing.org' binary instance method
+    def binary(x)
+      warn 'binary(x) is deprecated use x.to_s(2) to avoid this warning'
+      x.to_s(2)
+    end
+    
+    # explicitly provide 'processing.org' unbinary instance method
+    def unhex(str)
+      warn 'unbinary(str) is deprecated use str.to_i(base=2)'
+      str.to_i(base=2)
+    end
+    
+    # explicitly provide 'processing.org' nf instance method
+    def nf(*args)
+      warn 'nf(num, digits) is deprecated use num.to_s.rjust(digits) '\
+        'to avoid this warning'
+      if args.length == 2
+        return args[0].to_s.rjust(args[1], '0')
+      elsif args.length == 3
+        return args[0].to_s.rjust(args[1], '0').ljust(args[1] + args[2], '0')
+      else
+        fail ArgumentError, 'takes 2 or 3 parameters'
+      end
+    end
+
+     # explicitly provide 'processing.org' mag instance method
+    def mag(*vec)
+      warn 'mag(x, y) is deprecated use hypot(x, y)'
+      if vec.length == 2
+        return hypot(vec[0], vec[1])
+      elsif vec.length == 3
+        return Math.sqrt(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2])
+      else
+        fail ArgumentError, 'takes 2 or 3 parameters'
+      end
+    end
+    
+    # explicitly provide 'processing.org' trim instance method
+    def trim(str)
+      warn 'deprecated use str.strip'
+      str.strip
+    end
+    
+    # explicitly provide 'processing.org' println instance method
+    def println(str)
+      warn 'deprecated use puts(str)'
+      puts str
+    end
+    
+    # explicitly provide 'processing.org' hour instance method
     def hour
-      # warn 'deprecated use t = Time.now and t.hour'
+      warn 'deprecated use t = Time.now and t.hour'
       PApplet.hour
     end
     
+    # explicitly provide 'processing.org' second instance method
     def second
-      # warn 'deprecated use t = Time.now and t.sec'
+      warn 'deprecated use t = Time.now and t.sec'
       PApplet.second
     end
     
+    # explicitly provide 'processing.org' minute instance method
     def minute
-      # warn 'deprecated use t = Time.now and t.min'
+       'deprecated use t = Time.now and t.min'
       PApplet.minute
     end
     
@@ -218,4 +312,4 @@ module Processing
       @declared_fields['keyPressed'].value(java_self)
     end
   end
-end
+end

data/lib/ruby-processing/helpers/numeric.rb

@@ -1,5 +1,4 @@
-class Numeric #:nodoc
-
+class Numeric #:nodoc: 
   def degrees
     self * 180 / Math::PI
   end

data/lib/ruby-processing/helpers/string.rb

@@ -1,26 +1,25 @@
 class String #:nodoc:
-
   def titleize
-    self.underscore.humanize.gsub(/\b([a-z])/) { $1.capitalize }
+    underscore.humanize.gsub(/\b([a-z])/) { $1.capitalize }
   end
 
-  def humanize()
-    self.gsub(/_id$/, '').gsub(/_/, ' ').capitalize
+  def humanize
+    gsub(/_id$/, '').gsub(/_/, ' ').capitalize
   end
 
   def camelize(first_letter_in_uppercase = true)
     if first_letter_in_uppercase
-      self.gsub(/\/(.?)/) { '::' + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      gsub(/\/(.?)/) { '::' + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
     else
-      self.first + self.camelize[1..-1]
+      first + camelize[1..-1]
     end
   end
 
   def underscore
-    self.gsub(/::/, '/')
+    gsub(/::/, '/')
       .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       .gsub(/([a-z\d])([A-Z])/, '\1_\2')
       .tr('-', '_')
       .downcase
   end
-end
+end

data/lib/ruby-processing/runner.rb

@@ -23,7 +23,7 @@ module Processing
     run:              run sketch once
     watch:            watch for changes on the file and relaunch it on the fly
     live:                  launch sketch and give an interactive IRB shell
-    create [width height]: create a new sketch.
+    create [width height][mode][flag]: create a new sketch.
     app:              create an application version of the sketch
     setup:            check setup, install jruby-complete, unpack samples
 
@@ -34,8 +34,8 @@ module Processing
     Examples:
     rp5 setup unpack_samples
     rp5 run samples/contributed/jwishy.rb
-    rp5 create some_new_sketch 640 480
-    rp5 create some_new_sketch --p3d 640 480
+    rp5 create some_new_sketch 640 480 p3d (P3D mode example) 
+    rp5 create some_new_sketch 640 480 --wrap (a class wrapped default sketch)
     rp5 watch some_new_sketch.rb
 
     Everything Else:
@@ -56,7 +56,7 @@ module Processing
       when 'run'    then run(@options.path, @options.args)
       when 'watch'  then watch(@options.path, @options.args)
       when 'live'   then live(@options.path, @options.args)
-      when 'create' then create(@options.path, @options.args, @options.p3d)
+      when 'create' then create(@options.path, @options.args)
       when 'app'    then app(@options.path)
       when 'setup'  then setup(@options.path)
       when /-v/     then show_version
@@ -69,7 +69,8 @@ module Processing
     # Parse the command-line options. Keep it simple.
     def parse_options(args)
       @options = OpenStruct.new
-      @options.p3d   = !args.delete('--p3d').nil?
+      @options.wrap   = !args.delete('--wrap').nil?
+      @options.inner   = !args.delete('--inner').nil?
       @options.jruby  = !args.delete('--jruby').nil?
       @options.nojruby  = !args.delete('--nojruby').nil?
       @options.action = args[0]     || nil
@@ -79,9 +80,14 @@ module Processing
 
     # Create a fresh Ruby-Processing sketch, with the necessary
     # boilerplate filled out.
-    def create(sketch, args, p3d)
+    def create(sketch, args)
       require_relative '../ruby-processing/exporters/creator'
-      Processing::Creator.new.create!(sketch, args, p3d)
+      return Processing::Inner.new.create!(sketch, args) if @options.inner
+      if @options.wrap
+        Processing::ClassSketch.new.create!(sketch, args)
+      else
+        Processing::BasicSketch.new.create!(sketch, args)
+      end
     end
 
     # Just simply run a ruby-processing sketch.

data/lib/ruby-processing/runners/watch.rb

@@ -1,11 +1,9 @@
 require_relative '../runners/base'
 
 module Processing
-
   # A sketch loader, observer, and reloader, to tighten
   # the feedback between code and effect.
   class Watcher
-
     # Sic a new Processing::Watcher on the sketch
     def initialize
       reload_files_to_watch
@@ -13,7 +11,6 @@ module Processing
       start_watching
     end
 
-
     # Kicks off a thread to watch the sketch, reloading Ruby-Processing
     # and restarting the sketch whenever it changes.
     def start_watching

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

data/lib/templates/create/basic.rb.erb

@@ -0,0 +1,10 @@
+# <%= @param.file_name %>.rb
+
+def setup
+  <%= "size #{@param.width}, #{@param.height}" if @with_size %>
+  
+end
+
+def draw
+  
+end

data/lib/templates/create/basic_mode.rb.erb

@@ -0,0 +1,10 @@
+# <%= @param.file_name %>.rb
+
+def setup
+  <%= "size #{@param.width}, #{@param.height}, #{@param.mode.upcase}" if @with_size %>
+  
+end
+
+def draw
+  
+end

data/lib/templates/create/basic_wrap.rb.erb

@@ -0,0 +1,15 @@
+# <%= @param.file_name %>.rb
+
+class <%= @param.name %> < Processing::App
+
+  def setup
+    <%= "size #{@param.width}, #{@param.height}" if @with_size %>
+
+  end
+  
+  def draw
+  
+  end  
+end
+
+<%= @param.name %>.new(x: 20, y: 30)

data/lib/templates/create/inner_class.rb.erb

@@ -0,0 +1,9 @@
+# <%= @param.file_name %>.rb
+
+class <%= @param.name %>
+  include Processing::Proxy
+ 
+  def initialize
+  
+  end  
+end

data/lib/templates/create/mode_wrap.rb.erb

@@ -0,0 +1,15 @@
+# <%= @param.file_name %>.rb
+
+class <%= @param.name %> < Processing::App
+
+  def setup
+    <%= "size #{@param.width}, #{@param.height}, #{@param.mode.upcase}" if @with_size %>
+    
+  end
+  
+  def draw
+  
+  end  
+end
+
+<%= @param.name %>.new(x: 20, y: 30)

data/library/control_panel/control_panel.rb

@@ -6,15 +6,17 @@
 # (optionally) pass the range and default value.
 
 module ControlPanel
-  
+  # class used to create slider elements for control_panel
   class Slider < javax.swing.JSlider
-    def initialize(control_panel, name, range, initial_value, proc=nil)
+    def initialize(control_panel, name, range, initial_value, proc = nil)
       min = range.begin * 100
-      max = ((range.exclude_end? && range.begin.respond_to?(:succ)) ? range.max : range.end) * 100
+      max = (
+        (range.exclude_end? && range.begin.respond_to?(:succ)) ?
+          range.max : range.end) * 100
       super(min, max)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
-      paint_labels = true
+      # paint_labels = true
       set_preferred_size(java.awt.Dimension.new(190, 30))
       label = control_panel.add_element(self, name)
       add_change_listener do
@@ -22,22 +24,22 @@ module ControlPanel
         $app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
-      set_value(initial_value ? initial_value*100 : min)
+      set_value(initial_value ? initial_value * 100 : min)
       fire_state_changed
     end
-    
+
     def value
       get_value / 100.0
     end
-    
+
     def update_label(label, name, value)
       value = value.to_s
       value << '0' if value.length < 4
-      label.set_text "<html><br><b>#{name.to_s}: #{value}</b></html>"
+      label.set_text "<html><br><b>#{name}: #{value}</b></html>"
     end
   end
-  
-  
+
+  # class used to combo_box menu elements for control_panel
   class Menu < javax.swing.JComboBox
     def initialize(control_panel, name, elements, initial_value, proc = nil)
       super(elements.to_java(:String))
@@ -49,13 +51,13 @@ module ControlPanel
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
     end
-    
+
     def value
       get_selected_item
     end
   end
-  
-  
+
+  # Creates check-box elements for control_panel
   class Checkbox < javax.swing.JCheckBox
     def initialize(control_panel, name, proc=nil)
       @control_panel = control_panel
@@ -68,15 +70,15 @@ module ControlPanel
         proc.call(value) if proc
       end
     end
-    
+
     def value
       is_selected
     end
   end
-  
-  
+
+  # Creates button elements for control_panel
   class Button < javax.swing.JButton
-    def initialize(control_panel, name, proc=nil)
+    def initialize(control_panel, name, proc = nil)
       super(name.to_s)
       set_preferred_size(java.awt.Dimension.new(170, 64))
       control_panel.add_element(self, name, false, true)
@@ -86,19 +88,20 @@ module ControlPanel
       end
     end
   end
-  
-  
+
+  # class used to contain control_panel elements
   class Panel < javax.swing.JFrame
     java_import javax.swing.UIManager
-    
+
     attr_accessor :elements, :panel
-    
-    def initialize 
+
+    def initialize
       super()
       @elements = []
       @panel = javax.swing.JPanel.new(java.awt.FlowLayout.new(1, 0, 0))
+      set_feel
     end
-    
+
     def display
       add panel
       set_size 200, 30 + (64 * elements.size)
@@ -107,49 +110,57 @@ module ControlPanel
       set_location($app.width + 10, 0) unless ($app.width + 10 > $app.displayWidth)
       panel.visible = true
     end
-    
-    def add_element(element, name, has_label=true, button=false)
+
+    def add_element(element, name, has_label = true, _button_ = false)
       if has_label
         label = javax.swing.JLabel.new("<html><br><b>#{name}</b></html>")
         panel.add label
       end
       elements << element
       panel.add element
-      return has_label ? label : nil
+      has_label ? label : nil
     end
-    
+
     def remove
       remove_all
       dispose
     end
-    
-    def slider(name, range=0..100, initial_value = nil, &block)
-      slider = Slider.new(self, name, range, initial_value, block || nil)
+
+    def slider(name, range = 0..100, initial_value = nil, &block)
+      Slider.new(self, name, range, initial_value, block || nil)
     end
-    
+
     def menu(name, elements, initial_value = nil, &block)
-      menu = Menu.new(self, name, elements, initial_value, block || nil)
+      Menu.new(self, name, elements, initial_value, block || nil)
     end
-    
+
     def checkbox(name, initial_value = nil, &block)
       checkbox = Checkbox.new(self, name, block || nil)
       checkbox.do_click if initial_value == true
     end
-    
+
     def button(name, &block)
-      button = Button.new(self, name, block || nil)
+      Button.new(self, name, block || nil)
     end
-    
-    def look_feel(lf = 'Metal') 
-      lafs = javax.swing.UIManager::getInstalledLookAndFeels.select { |info| info.getName.eql? lf }
-      javax.swing.UIManager::setLookAndFeel(lafs[0].getClassName) if lafs.size > 0
+
+    def look_feel(lf)
+      set_feel(lf)
     end
     
+    private
+    
+    def set_feel(lf = 'metal')
+      lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
+      laf = lafinfo.select do |info|
+        info.getName.eql? lf.capitalize
+      end
+      javax.swing.UIManager.setLookAndFeel(laf[0].getClassName) 
+    end
   end
-  
-  
+
+  # instance methods module
   module InstanceMethods
-    def control_panel 
+    def control_panel
       @control_panel = ControlPanel::Panel.new unless @control_panel
       return @control_panel unless block_given?
       yield(@control_panel)
@@ -158,5 +169,4 @@ module ControlPanel
   end
 end
 
-
 Processing::App.send :include, ControlPanel::InstanceMethods

data/library/file_chooser/file_chooser.rb

@@ -1,33 +1,32 @@
 # Here's a little library for using swing JFileChooser.
-# in ruby-processing, borrose heavily from control_panel
+# in ruby-processing, borrows heavily from control_panel
 
 module FileChooser
   ##
   # FileFilter is abstract, requires accept and getDescription
   ##
-  
+
   require 'pathname'
   JXChooser = Java::javax::swing::JFileChooser
-  JFile = Java::java::io::File  
+  JFile = Java::java::io::File
   System = Java::JavaLang::System
-  
+
   class Filter < Java::javax::swing::filechooser::FileFilter
     attr_reader :description, :extensions
     def define(description, extensions)
       @description, @extensions = description, extensions
     end
-    
+
     def accept(fobj)
-      return true if extensions.include?(File.extname(fobj.to_s).downcase)
+      return true if extensions.include? File.extname(fobj.to_s).downcase
       return true if fobj.isDirectory
     end
 
-    
     def getDescription
       description
     end
   end
-  
+
   class RXChooser
     java_import javax.swing.UIManager
     require 'rbconfig'
@@ -39,29 +38,25 @@ module FileChooser
     when /darwin/      then OS = :mac
     when /mswin|mingw/ then OS = :windows
     end
-    
+
     def initialize
+      javax.swing.UIManager.setLookAndFeel(
+        javax.swing.UIManager.getSystemLookAndFeelClassName)
       @chooser = JXChooser.new
     end
-    
-    def look_feel(lf = 'Metal')
-      lafs = javax.swing.UIManager::getInstalledLookAndFeels.select{ |info| 
-      info.getName.eql? lf }
-      javax.swing.UIManager::setLookAndFeel(lafs[0].getClassName) if lafs.size > 0
-    end
-    
+
     def set_filter(description, extensions)
       filter = FileChooser::Filter.new
       filter.define(description, extensions)
       @chooser.setFileFilter(filter)
     end
-    
+
     def display
       if :windows == OS
         @chooser.setCurrentDirectory(JFile.new(System.getProperty(UDIR)))
       else
         @chooser.setCurrentDirectory(JFile.new(System.getProperty(UHOME)))
-      end      
+      end
       success = @chooser.show_open_dialog($app)
       if success == JXChooser::APPROVE_OPTION
         return Pathname.new(@chooser.get_selected_file.get_absolute_path).to_s
@@ -73,9 +68,8 @@ module FileChooser
     def dispose
       @chooser = nil
     end
-
   end
-  
+
   module InstanceMethods
     def file_chooser
       @chooser = RXChooser.new

data/samples/external_library/java_processing/guido/slider.rb

@@ -0,0 +1,54 @@
+load_library :guido
+import 'de.bezier.guido'
+
+def setup
+  size 400, 400
+  Interactive.make self
+  @slider = Slider.new  10, height - 20, width - 20, 10
+end
+
+def draw
+  background 180
+  fill 255
+  v = 10 + @slider.value * (width - 30)
+  ellipse width / 2, height / 2, v, v
+end
+
+class Slider < ActiveElement
+  
+  attr_reader :value
+  
+  def initialize (x, y, w, h)
+    super x, y, w, h
+    @x = x
+    @y = y
+    @width = w
+    @height = h
+    @hover = false
+    @value = 0
+    @value_x = x
+  end
+  
+  def mouseEntered(mx, my)
+    @hover = true
+  end
+  
+  def mouseExited(mx, my)
+    @hover = false
+  end
+  
+  def mouseDragged(mx, my, dx, dy)
+    @value_x = mx - @height / 2    
+    @value_x = @x if (@value_x < @x) 
+    @value_x = @x + @width - @height if (@value_x > @x + @width - @height)    
+    @value = map(@value_x, @x, @x + @width - @height, 0, 1)
+  end
+  
+  def draw
+    no_stroke
+    fill @hover ? 220 : 150
+    rect @x, @y, @width, @height
+    fill 120
+    rect @value_x, @y, @height, @height
+  end
+end 

data/samples/processing_app/library/file_chooser/image_viewer.rb

@@ -11,7 +11,6 @@ attr_reader :img
 
 def setup
   file_chooser do |fc|
-    fc.look_feel "Metal"                           # optional, "Metal" might be best linux (Gtk+ theme)
     fc.set_filter "Image Files",  [".png", ".jpg"] # easily customizable chooser
     @img = load_image(fc.display)                  # fc.display returns a path String
     size(img.width, img.height)

data/samples/processing_app/library/vecmath/vec3d/note.txt

@@ -0,0 +1 @@
+retained menger requires compat.version=2.0 (jruby-1.7.xx)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,8 +130,11 @@ files:
 - lib/templates/application/lib/library/library.txt
 - lib/templates/application/run.erb
 - lib/templates/application/run.exe
-- lib/templates/create/blank_sketch.rb.erb
-- lib/templates/create/p3d_sketch.rb.erb
+- lib/templates/create/basic.rb.erb
+- lib/templates/create/basic_mode.rb.erb
+- lib/templates/create/basic_wrap.rb.erb
+- lib/templates/create/inner_class.rb.erb
+- lib/templates/create/mode_wrap.rb.erb
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
 - library/fastmath/fastmath.rb
@@ -195,6 +198,7 @@ files:
 - samples/external_library/java_processing/grafica/default_plot.rb
 - samples/external_library/java_processing/grafica/multiple_panels.rb
 - samples/external_library/java_processing/grafica/oktoberfest_example.rb
+- samples/external_library/java_processing/guido/slider.rb
 - samples/external_library/java_processing/hemesh/data/java_args.txt
 - samples/external_library/java_processing/hemesh/library/vbo/mesh_to_vbo.rb
 - samples/external_library/java_processing/hemesh/twin_iso.rb
@@ -464,6 +468,7 @@ files:
 - samples/processing_app/library/vecmath/vec3d/library/geometry/lib/mat4.rb
 - samples/processing_app/library/vecmath/vec3d/library/geometry/lib/plane.rb
 - samples/processing_app/library/vecmath/vec3d/library/hilbert/hilbert.rb
+- samples/processing_app/library/vecmath/vec3d/note.txt
 - samples/processing_app/library/vecmath/vec3d/retained_menger.rb
 - samples/processing_app/topics/advanced_data/README
 - samples/processing_app/topics/advanced_data/Rakefile

data/lib/templates/create/blank_sketch.rb.erb

@@ -1,7 +0,0 @@
-def setup
-  <%= "size #{@width}, #{@height}" if @with_size %>
-end
-
-def draw
-  
-end

data/lib/templates/create/p3d_sketch.rb.erb

@@ -1,7 +0,0 @@
-def setup
-  <%= "size #{@width}, #{@height}, P3D" if @with_size %>
-end
-
-def draw
-  
-end