propane 0.7.0-java → 0.8.0-java

data/examples/regular/liquidy.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env jruby -v -W2
 require 'propane'
 require 'pbox2d'
 require_relative 'lib/particle_system'
@@ -7,7 +8,7 @@ Vect = Struct.new(:x, :y)
 
 class Liquidy < Propane::App
   attr_reader :box2d, :boundaries, :systems
-  
+
   def setup
     size(400, 300)
     @box2d = WorldBuilder.build(app: self, gravity: [0, -20])
@@ -17,7 +18,7 @@ class Liquidy < Propane::App
     Boundary.new(box2d, Vect.new(250, 175), Vect.new(300, 5), 0.5)
     ]
   end
-  
+
   def draw
     background(255)
     # Run all the particle systems
@@ -30,11 +31,11 @@ class Liquidy < Propane::App
     # Display all the boundaries
     boundaries.each(&:display)
   end
-  
+
   def mouse_pressed
     # Add a new Particle System whenever the mouse is clicked
     systems << ParticleSystem.new(box2d, 0, mouse_x, mouse_y)
-  end  
+  end
 end
 
 Liquidy.new title: 'Liquidy'

data/examples/regular/mouse_button_demo.rb

@@ -1,23 +1,21 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 
-#
-require_relative '../../lib/propane' # temporary local
-
+require_relative 'propane'
 # Demo of Mouse Button
 class MouseButtonDemo < Propane::App
   # Click within the image and press
-  # the left and right mouse buttons to 
+  # the left and right mouse buttons to
   # change the value of the rectangle
   def setup
     size 300, 200
   end
-  
+
   def draw
     rect(25, 25, 150, 80)
   end
 
-  def mouse_pressed    
+  def mouse_pressed
     case mouse_button
     when LEFT
       fill 0

data/examples/regular/polyhedrons.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env jruby -v -W2
 ###
 # Polyhedrons after sketch by Chinchbug on openprocessing.org
 ###

data/examples/regular/raining.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env jruby -v -W2
 require 'propane'
 require_relative 'lib/rain_drops'
 
@@ -15,12 +16,12 @@ class Raining < Propane::App
   #
   # License: Same as processing
   #
-  
+
   attr_reader :drops, :weight, :drops_size, :paused
-  
+
   def setup
     size 640, 480
-    frame_rate 30  
+    frame_rate 30
     @drops_size = 20
     @weight = 20
     @drops = RainDrops.new width, height
@@ -28,7 +29,7 @@ class Raining < Propane::App
     font = create_font('Georgia', 15)
     text_font(font)
   end
-  
+
   def draw
     return if paused
     # we fill up with new drops randomly
@@ -39,7 +40,7 @@ class Raining < Propane::App
     form = '%d of %d drops with a size of %d'
     text(format(form, drops.size, drops_size, weight), 10, 20)
   end
-  
+
   def key_pressed
     case key
     when '+'

data/examples/regular/ribbon_doodle.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 # Adapted to use Propane Vec2D and Vec3D classes by Martin Prout
 

data/examples/regular/select_file.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env jruby -v -W2
+
+############################
+# Use mouse drag to rotate
+# The arcball. Use mousewheel
+# to zoom. Hold down x, y, z
+# to constrain rotation axis.
+############################
+
+require 'propane'
+
+class SelectFile < Propane::App
+
+  load_library :file_chooser
+  ###########
+  # Example Native File Chooser using vanilla processing
+  # select_input, and file_selected
+  ###########
+
+  def setup
+    size 200, 100
+    # java_signature 'void selectInput(String, String)'
+    select_input('Select a File', 'file_selected')
+  end
+
+  #  signature 'void file_selected(java.io.File file)'
+  def file_selected(file)
+    puts file.get_absolute_path unless file.nil?
+  end
+end
+
+SelectFile.new

data/examples/regular/select_image.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env jruby -v -W2
+
+require 'propane'
+
+class SelectImage < Propane::App
+
+  load_library :file_chooser
+  ###########
+  # Example Native File Chooser using vanilla processing
+  # select_input, and file_selected
+  ###########
+  attr_reader :img
+
+  def setup
+    size(400, 200)
+    fill 0, 0, 200
+    text('Click Window to Load Image', 10, 100)
+  end
+
+  def draw
+    image(img, 0, 0) unless img.nil?
+  end
+
+  def file_selected(selection)
+    if selection.nil?
+      puts 'Nothing Chosen'
+    else
+      @img = load_image(selection.get_absolute_path)
+      img.resize(width, height)
+    end
+  end
+
+  def mouse_clicked
+    @img = nil
+    # java_signature 'void selectInput(String, String)'
+    select_input('Select Image File', 'file_selected')
+  end
+end
+
+SelectImage.new

data/examples/regular/slider_demo.rb

@@ -1,5 +1,6 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
+# example usage of experimental slider library
 require 'propane'
 
 class SliderDemo < Propane::App

data/examples/regular/slider_example.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 require 'propane'
 

data/examples/regular/slider_simple.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 require 'propane'
 

data/examples/regular/tree.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env jruby -v -W2
 require 'propane'
 
 class Tree < Propane::App
@@ -13,7 +14,7 @@ class Tree < Propane::App
     @start_time = Time.now
     @frame_time = nil
   end
-  
+
   def draw
     t = Time.now
     if @frame_time
@@ -21,7 +22,7 @@ class Tree < Propane::App
       # printf "%0.1f fps\n", fps
     end
     @frame_time = t
-    
+
     background 0
     stroke 1, 1, 1
     # Let's pick an angle 0 to 90 degrees based on the mouse position
@@ -37,7 +38,7 @@ class Tree < Propane::App
     translate(0, -h)
     # Start the recursive branching!
     branch(h)
-    
+
     @x += @dx
     if @x < 0
       puts "Time after this iteration: " + (Time.now - @start_time).to_s
@@ -47,7 +48,7 @@ class Tree < Propane::App
       @x += @dx * 2
     end
   end
-  
+
   def branch(h)
     # Each branch will be 2/3rds the size of the previous one
     h *= 0.66
@@ -60,7 +61,7 @@ class Tree < Propane::App
       translate(0, -h)  # Move to the end of the branch
       branch(h)        # Ok, now call myself to draw two new branches!!
       pop_matrix        # Whenever we get back here, we "pop" in order to restore the previous matrix state
-      
+
       # Repeat the same thing, only branch off to the "left" this time!
       push_matrix
       rotate(-@theta)
@@ -69,7 +70,7 @@ class Tree < Propane::App
       branch(h)
       pop_matrix
     end
-  end  
+  end
 end
 
 Tree.new title: 'Tree'

data/lib/propane/creators/sketch_writer.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: false
+# The SketchParameters class knows how to format, size, title & class name
+class SketchParameters
+  attr_reader :name, :args
+  def initialize(name:, args:)
+    @name = name
+    @args = args
+  end
+
+  def class_name
+    name.split('_').collect(&:capitalize).join
+  end
+
+  def sketch_title
+    human = name.split('_').collect(&:capitalize).join(' ')
+    format("sketch_title '%s'", human)
+  end
+
+  def sketch_size
+    mode = args.length == 3 ? format(', %s', args[2].upcase) : ''
+    return 'size 200, 200' if args.empty?
+    format('size %d, %d%s', args[0].to_i, args[1].to_i, mode)
+  end
+end
+
+# The file writer can write a sketch when given instance of Sketch type
+class SketchWriter
+  attr_reader :file, :param
+
+  def initialize(path, args)
+    @param = SketchParameters.new(name: path, args: args)
+    @file = format('%s/%s.rb', File.dirname(path), path)
+  end
+
+  def write(creator)
+    sketch = creator.code(param)
+    File.open(file, 'w+') { |f| f.write sketch.join("\n") }
+  end
+end
+
+# A simple class wrapped sketch
+class ClassSketch
+  INDENT ||= '  '
+  def code(param)
+    lines = [
+      '# frozen_string_literal: false',
+      "require 'propane'",
+      ''
+    ]
+    lines << format('class %s < Propane::App', param.class_name)
+    lines.concat method_lines('setup', param.sketch_size)
+    lines.concat method_lines('draw', '')
+    lines << 'end'
+  end
+  
+  private
+  
+  def method_lines(name, content)
+    one = format('%sdef %s', INDENT, name)
+    two = content.empty? ? '' : format('  %s%s', INDENT, content)
+    three = format('%send', INDENT)
+    return [one, two, three] if /draw/ =~ name
+    [one, two, three, '']
+  end
+end
+

data/lib/propane/library_loader.rb

@@ -1,8 +1,4 @@
-# encoding: utf-8
 # frozen_string_literal: false
-
-require "#{PROPANE_ROOT}/lib/propane"
-
 # The processing wrapper module
 module Propane
   # Encapsulate library loader functionality as a class
@@ -112,6 +108,6 @@ module Propane
         end
       end
       nil
-    end    
+    end
   end
 end

data/lib/propane/runner.rb

@@ -37,7 +37,7 @@ module Propane
       opt_parser = OptionParser.new do |opts|
         # Set a banner, displayed at the top
         # of the help screen.
-        opts.banner = 'Usage: propane [options] sketch.rb'
+        opts.banner = 'Usage: propane [options] [<sketch.rb>]'
 
         # Define the options, and what they do
         options[:version] = false
@@ -109,8 +109,9 @@ module Propane
     end
 
     def create
-      require_relative 'creators/creator'
-      Propane::BasicSketch.new.create!(filename, argc)
+      require_relative 'creators/sketch_writer'
+      sketch = ClassSketch.new
+      SketchWriter.new(File.basename(filename, '.rb'), argc).write(sketch)
     end
 
     def show_version

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/library/file_chooser/chooser.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+# Usage: :wq
+# load_library :chooser
+# 
+# def setup
+  # 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
+# end
+class Propane::App
+  include Java::MonkstoneFilechooser::Chooser
+  Chooser
+end

data/library/file_chooser/file_chooser.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+# Usage: 
+# load_library :file_chooser
+# class ...
+# def setup
+  # 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
+# end
+# ...
+class Propane::App
+  include Java::MonkstoneFilechooser::Chooser
+end

data/pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:rp5extras', '0.7.0'
+  id 'propane:rp5extras', '0.8.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>rp5extras</artifactId>
-  <version>0.7.0</version>
+  <version>0.8.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>