propane 0.8.0-java → 0.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e44d0b96666b6c45b686f6ae303be7283a795a
-  data.tar.gz: e5f305b7cffdc904312fe7ad21f47017d5ca7db0
+  metadata.gz: d55e929fe62c064db2482e12276e11c9af804a2f
+  data.tar.gz: d4e5eb42b58d0facb55478ab69d6fd86ee351e44
 SHA512:
-  metadata.gz: ac4bf37b116eed1296a1023cff3ae9c6eb8b59db426085801e30e696e6592057d4f7d8f24c75536e0e61f8b82d29c7096f599a44b36b04fb199f276110923fca
-  data.tar.gz: c5a4797c0d6b96ff95083f840d9e3805437581c7beb0983473cfdd0a9ebe76d9b08a62a37824fbb850c15b7c16f325885e42118aa9f7119ca1e992c6dd739f3c
+  metadata.gz: c618476e0aed79e32708d33d942f3b107c0278f48b7a645868eac68e7de756bb74caf53f25fd2dd3533040e16382d29d2bcc58ad003e7dfbe71e124fd6dbc492
+  data.tar.gz: 24be94385e35ad5d7ffdcd985890df606b3cf66d5afb65727f89924d2f3e4526e2752cdace3ad5b428624a318007fa1b0a6d0f395e193f34b33ac584c57bbca1

data/CHANGELOG.md

@@ -1,5 +1,7 @@
-**v0.8.0** Complete samples refactored to `data_path` folder, no longer require jruby-complete to run because we provide an absolute path to `data` folder, but it still probably requires that you run the sketch from the directory. Future direction might be to create a `~/.propane` folder, which would support additionalvanilla processing libraries, also integration with `atom` editor.
 
+**v0.9.0** Implements `data_path` in ruby, you should use this method to return the absolute path to the `data` folder (read and write).  Prefer JRubyArt methods, in the main. Moved samples to own repo (under ruby-processing group), samplesget installed with jruby-complete on `propane --install`.
+
+**v0.8.0** Complete samples refactored to `data_path` folder, no longer require jruby-complete to run because we provide an absolute path to `data` folder, but it still probably requires that you run the sketch from the directory. Future direction might be to create a `~/.propane` folder, which would support additionalvanilla processing libraries, also integration with `atom` editor.
 **v0.7.0** Update to JRuby-Complete-9.1.2.0. 
 
 **v0.6.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy), includes slider in sketch library, change to requiring jdk8. Update to JRuby-Complete-9.1.0.0, request updated arcball (to run samples). 

data/README.md

@@ -58,7 +58,7 @@ end
 FlashingLightsSketch.new title: "Flashing Lights"
 ```
 
-Many sketches will run just using an installed jruby, but shader sketches must be run using jruby-complete, but don't worry we make it easy, to install jruby-complete:
+To install the samples and jruby-complete. The samples get copied to `~/propane_samples`.
 ```bash
 propane --install
 ```

data/lib/propane/app.rb

@@ -1,9 +1,8 @@
-# encoding: utf-8
 # frozen_string_literal: false
-require_relative 'underscorer'
 require_relative 'helper_methods'
 require_relative 'library_loader'
 
+# A wrapper module for the processing App
 module Propane
   include_package 'processing.core' # imports the processing jar.
   # Load vecmath, fastmath and mathtool modules
@@ -14,6 +13,8 @@ module Propane
     java_import 'monkstone.vecmath.ShapeRender'
   end
 
+  SKETCH_ROOT = File.absolute_path('.')
+
   # This class is the base class the user should inherit from when making
   # their own sketch.
   #
@@ -26,8 +27,28 @@ module Propane
   #   end
   #
   # end
+
+  # Watch the definition of these methods, to make sure
+  # that Processing is able to call them during events.
+  METHODS_TO_ALIAS ||= {
+    mouse_pressed: :mousePressed,
+    mouse_dragged: :mouseDragged,
+    mouse_clicked: :mouseClicked,
+    mouse_moved: :mouseMoved,
+    mouse_released: :mouseReleased,
+    key_pressed: :keyPressed,
+    key_released: :keyReleased,
+    key_typed: :keyTyped
+  }.freeze
+
+  # All sketches extend this class
   class App < PApplet
     include Math, MathTool, HelperMethods
+    # Alias some methods for familiarity for Shoes coders.
+    alias oval ellipse
+    alias stroke_width stroke_weight
+    alias rgb color
+    alias gray color
     attr_reader :title, :arguments, :options
     # App should be instantiated with an optional list of options
     # and array of arguments.
@@ -42,7 +63,7 @@ module Propane
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
       end
-      alias_method :load_library, :load_libraries
+      alias load_library load_libraries
 
       def library_loaded?(library_name)
         library_loader.library_loaded?(library_name)
@@ -55,17 +76,23 @@ module Propane
       def load_java_library(*args)
         library_loader.load_java_library(*args)
       end
+
+      # When certain special methods get added to the sketch, we need to let
+      # 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
 
     def library_loaded?(library_name)
       self.class.library_loaded?(library_name)
     end
-    
-    
+
     def initialize(options = {}, arguments = [])
       # Guard against invalid input.
       proxy_java_fields
-      raise TypeError unless options.is_a?   Hash
+      raise TypeError unless options.is_a? Hash
       raise TypeError unless arguments.is_a? Array
       # Set up the sketch.
       super()
@@ -77,39 +104,28 @@ module Propane
     end
 
     def size(*args)
-      w, h, mode       = *args
-      @width           ||= w
-      @height          ||= h
-      @render_mode     ||= mode
+      w, h, mode = *args
+      @width ||= w
+      @height ||= h
+      @render_mode ||= mode
       import_opengl if /opengl/ =~ mode
       super(*args)
     end
 
+    def data_path(dat)
+      dat_root = File.join(SKETCH_ROOT, 'data')
+      Dir.mkdir(dat_root) unless File.exist?(dat_root)
+      File.join(dat_root, dat)
+    end
+
     # This method runs the processing sketch.
     #
     def run_sketch
       PApplet.run_sketch(arguments, self)
     end
-    
-    # Is the mouse pressed for this frame?
-    def mouse_pressed?
-      @declared_fields['mousePressed'].value(java_self)
-    end
 
-    # Is a key pressed for this frame?
-    def key_pressed?
-      @declared_fields['keyPressed'].value(java_self)
-    end
-    
-    # Fix java conversion problems getting the last key
-    # If it's ASCII, return the character, otherwise the integer
-    def key
-      int = @declared_fields['key'].value(java_self)
-      int < 256 ? int.chr : int
-    end
+    private
 
-    private    
-    
     def import_opengl
       # Include processing opengl classes that we'd like to use:
       %w(FontTexture FrameBuffer LinePath LineStroker PGL
@@ -139,37 +155,18 @@ module Propane
       arguments.concat [title_string]
     end
 
-    %w(displayHeight displayWidth frameCount keyCode
-       mouseButton mouseX mouseY pmouseX pmouseY).each do |name|
-      sc_name = name.split(/(?![a-z])(?=[A-Z])/).map(&:downcase).join('_')
-      alias_method sc_name, name
-    end
-
-    def self.method_added(name)
-      name = name.to_s
-      if name.include?('_')
-        lcc_name = name.split('_').map(&:capitalize).join('')
-        lcc_name[0] = lcc_name[0].downcase
-        alias_method lcc_name, name if lcc_name != name
-      end
-    end
-
-    def method_missing(name, *args)
-      self.class.__send__(name, *args) if PApplet.public_methods.include?(name)
-    end
-    
     def proxy_java_fields
       fields = %w(sketchPath key frameRate mousePressed keyPressed)
-      methods  = fields.map { |field| java_class.declared_field(field) }
+      methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
-    
-    # Fix java conversion problems getting the last key
-    # If it's ASCII, return the character, otherwise the integer
-   # def self.key
-   #   int = @declared_fields['key'].value(java_self)
-   #   int < 256 ? int.chr : int
-   # end
+
+    # When certain special methods get added to the sketch, we need to let
+    # 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
 
   # Importing PConstants to access to processing constants,
@@ -181,6 +178,10 @@ module Propane
   module Proxy
     java_import 'processing.core.PConstants'
 
+    def respond_to_missing?(name, include_private = false)
+      $app.respond_to?(name) || super
+    end
+
     def method_missing(name, *args)
       return $app.send(name, *args) if $app && $app.respond_to?(name)
       super

data/lib/propane/creators/sketch_writer.rb

@@ -11,9 +11,8 @@ class SketchParameters
     name.split('_').collect(&:capitalize).join
   end
 
-  def sketch_title
-    human = name.split('_').collect(&:capitalize).join(' ')
-    format("sketch_title '%s'", human)
+  def title
+    name.split('_').collect(&:capitalize).join(' ')
   end
 
   def sketch_size
@@ -51,6 +50,7 @@ class ClassSketch
     lines.concat method_lines('setup', param.sketch_size)
     lines.concat method_lines('draw', '')
     lines << 'end'
+    lines.concat new(param)
   end
   
   private
@@ -62,5 +62,9 @@ class ClassSketch
     return [one, two, three] if /draw/ =~ name
     [one, two, three, '']
   end
+
+  def new(param)
+    ['', format("%s.new title: '%s'", param.class_name, param.title)]
+  end
 end
 

data/lib/propane/helper_methods.rb

@@ -1,9 +1,12 @@
-# encoding: utf-8
 # frozen_string_literal: false
+# processing module wrapper
+require_relative '../propane'
+
 module Propane
+  # Provides some convenience methods
   module HelperMethods
     # processings epsilon may not be defined yet
-    EPSILON ||= 1.0e-04
+    EPSILON ||= 9.999999747378752e-05
     # Nice block method to draw to a buffer.
     # You can optionally pass it a width, a height, and a renderer.
     # Takes care of starting and ending the draw for you.
@@ -18,7 +21,8 @@ module Propane
     def kamera(
       eye: Vec3D.new(width / 2.0, height / 2.0, (height / 2.0) / tan(PI * 30.0 / 180.0)),
       center: Vec3D.new(width / 2.0, height / 2.0, 0),
-      up: Vec3D.new(0, 1.0, 0))
+      up: Vec3D.new(0, 1.0, 0)
+    )
       camera(eye.x, eye.y, eye.z, center.x, center.y, center.z, up.x, up.y, up.z)
     end
 
@@ -26,7 +30,8 @@ module Propane
       fov: Math::PI / 3.0,
       aspect_ratio: width.to_f / height,
       near_z: (height / 20.0) / tan(fov / 2.0),
-      far_z: (height * 5) / tan(fov / 2.0))
+      far_z: (height * 5) / tan(fov / 2.0)
+    )
       perspective(fov, aspect_ratio, near_z, far_z)
     end
 
@@ -46,6 +51,11 @@ module Propane
       args.length > 3 ? self.class.lerp_color(*args) : super(*args)
     end
 
+    # hue, sat, brightness in range 0..1.0 returns RGB color int
+    def hsb_color(hue, sat, brightness)
+      Java::Monkstone::ColorUtil.hsbToRgB(hue, sat, brightness)
+    end
+
     def color(*args)
       return super(*args) unless args.length == 1
       super(hex_color(args[0]))
@@ -59,7 +69,6 @@ module Propane
       Java::Monkstone::ColorUtil.rubyString(hex)
     end
 
-
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
@@ -86,10 +95,14 @@ module Propane
 
     # explicitly provide 'processing.org' dist instance method
     def dist(*args)
-      len = args.length
-      return dist2d(*args) if len == 4
-      return dist3d(*args) if len == 6
-      raise ArgumentError, 'takes 4 or 6 parameters'
+      case args.length
+      when 4
+        return dist2d(*args)
+      when 6
+        return dist3d(*args)
+      else
+        raise ArgumentError, 'takes 4 or 6 parameters'
+      end
     end
 
     # Uses PImage class method under hood
@@ -107,23 +120,16 @@ module Propane
     # 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(sketchPath key frameRate frame mousePressed keyPressed)
+      fields = %w(key frameRate mousePressed keyPressed)
       methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
 
-    class VersionError < StandardError
-    end
-
-    # By default, your sketch path is the folder that your sketch is in.
-    # If you'd like to do something fancy, feel free.
-    def set_sketch_path(spath = nil)
-      field = @declared_fields['sketchPath']
-      begin
-        field.set_value(java_self, spath || SKETCH_ROOT)
-      rescue TypeError
-        raise VersionError, 'Use JRubyArt for processing-3.0'
-      end
+    # Fix java conversion problems getting the last key
+    # If it's ASCII, return the character, otherwise the integer
+    def key
+      int = @declared_fields['key'].value(java_self)
+      int < 256 ? int.chr : int
     end
 
     # Provide a convenient handle for the Java-space version of self.
@@ -131,11 +137,6 @@ module Propane
       @java_self ||= to_java(Java::ProcessingCore::PApplet)
     end
 
-    # Get the sketch path
-    def sketch_path
-      @declared_fields['sketchPath'].value(java_self)
-    end
-
     # Fields that should be made accessible as under_scored.
     define_method(:mouse_x) { mouseX }
 
@@ -168,6 +169,16 @@ module Propane
       super(fps)
     end
 
+    # Is the mouse pressed for this frame?
+    def mouse_pressed?
+      @declared_fields['mousePressed'].value(java_self)
+    end
+
+    # Is a key pressed for this frame?
+    def key_pressed?
+      @declared_fields['keyPressed'].value(java_self)
+    end
+
     private
 
     FIXNUM_COL = -> (x) { x.is_a?(Fixnum) }
@@ -180,11 +191,11 @@ module Propane
         Java::Monkstone::ColorUtil.colorLong(a)
       when STRING_COL
         return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        fail StandardError, 'Dodgy Hexstring'
+        raise StandardError, 'Dodgy Hexstring'
       when FLOAT_COL
         Java::Monkstone::ColorUtil.colorDouble(a)
       else
-        fail StandardError, 'Dodgy Color Conversion'
+        raise StandardError, 'Dodgy Color Conversion'
       end
     end
 

data/lib/propane/runner.rb

@@ -94,8 +94,9 @@ module Propane
     end
 
     def run_sketch
-      root = File.absolute_path(File.dirname(filename))
-      sketch = File.join(root, filename)
+      # root = File.absolute_path(File.dirname(filename))
+      # sketch = File.join(root, filename)
+      sketch = File.join(SKETCH_ROOT, filename)
       warn_format = 'File %s does not not Exist!'
       return warn(format(warn_format, sketch)) unless File.exist?(sketch)
       command = [

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 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.8.0'
+  id 'propane:rp5extras', '0.9.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.8.0</version>
+  <version>0.9.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>

data/vendors/Rakefile

@@ -8,12 +8,15 @@ WARNING = <<-EOS
    re-run
 EOS
 
+EXAMPLES = '0.1'.freeze
 JRUBYC_VERSION = '9.1.2.0'.freeze
+HOME_DIR = ENV['HOME']
+MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 
 CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar")
 
 desc 'download, and copy to propane'
-task default: [:download, :copy_ruby]
+task default: [:download, :copy_ruby, :download_examples, :copy_examples]
 
 desc 'download JRuby upstream sources'
 task download: ["jruby-complete-#{JRUBYC_VERSION}.jar"]
@@ -46,3 +49,30 @@ def check_sha256(filename, expected_hash)
     raise "bad sha256 checksum for #{filename} (expected #{expected_hash} got #{sha256.hexdigest})"
   end
 end
+
+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?
+      sh "wget https://github.com/ruby-processing/propane-examples/archive/#{EXAMPLES}.zip"
+    else
+      sh "wget https://github.com/ruby-processing/propane-examples/archive/#{EXAMPLES}.tar.gz"
+    end
+  rescue
+    warn(WARNING)
+  end
+end
+
+desc "copy examples"
+task :copy_examples => file_name do
+  if MAC_OR_LINUX.nil?
+    sh "unzip #{EXAMPLES},zip"
+  else
+    sh "tar xzvf #{EXAMPLES}.tar.gz" 
+  end
+  sh "rm -r #{HOME_DIR}/k9_samples" if File.exist? "#{HOME_DIR}/propane_samples"
+  sh "cp -r propane-examples-#{EXAMPLES} #{HOME_DIR}/propane_samples"  
+  sh "rm -r propane-examples-#{EXAMPLES}"
+end