jruby_art 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8110714e9ebc0e3b329af7eeedfa5136b9f86fe9
-  data.tar.gz: e8e9b3c8c7ef22aefba1cd3d7cbb05c45499db5d
+  metadata.gz: 0d4599fd8c0c7d899d61ea1e1ecca52d32121e98
+  data.tar.gz: fe74a65d0f2eea372b0e21c3b907a36277dcec67
 SHA512:
-  metadata.gz: 11225c5809bebc9aa2089cbac81e2a78cf2bf87c3d159a68c1cbc2bf97e3d2bdb436be4657695f89e7709446a63d91814476ff56001e5fff98ea4a61376c6327
-  data.tar.gz: a5f955b334e4e6d1c1277bb26be820557e94a9686af2e965c1fe89d756ad054b8e4a645162caf4094847f8ca33ec460d5e1e98c9e8d3c3befe1df4838aa3da80
+  metadata.gz: 09f2e4a8f740b67d5b044cd7e9c4a22399c24aa58a974752c9f2f7acaabfbfe387cc7b7bcda901416492301c5306ca70f6d937dc359c39bbae1266925c1aca23
+  data.tar.gz: e0dde3f5d1cc6ea6bcb24874df72ad5c4c7537c6c051c9821d543c77942742c1863c6e3078af1b58d278d5cd9cb8c709463b99a7724095158f7067e077d01c32

data/lib/jruby_art/app.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: false
 
 require 'java'
+# require 'jruby/core_ext'
 require_relative '../rpextras'
 require_relative '../jruby_art/helper_methods'
 require_relative '../jruby_art/helpers/aabb'
@@ -89,16 +90,15 @@ module Processing
     def library_loaded?(library_name)
       self.class.library_loaded?(library_name)
     end
-
+   
     # Since processing-3.0 you should prefer setting the sketch width and
     # height and renderer using the size method in the settings loop of the
     # sketch (as with vanilla processing) but is hidden see created java.
     # Options are no longer relevant, define post_initialize method to use
     # custom options (see Sandi Metz POODR)
 
-    def initialize(options = {})
+    def initialize
       super()
-      post_initialize(options) # for anyone wishing to pass options
       $app = self
       proxy_java_fields
       mix_proxy_into_inner_classes
@@ -111,7 +111,7 @@ module Processing
       # NB: this is the processing runSketch() method as used by processing.py
       run_sketch
     end
-
+    
     def size(*args)
       w, h, mode = *args
       @width ||= w
@@ -125,6 +125,11 @@ module Processing
       surface.set_title(title)
     end
 
+    def sketchPath(spath = nil)
+      return super() if spath.nil?
+      super(spath)
+    end
+
     def sketch_size(x, y)
       surface.set_size(x, y)
     end
@@ -177,6 +182,7 @@ module Processing
         java_import format('processing.opengl.%s', klass)
       end
     end
+    # become_java!
   end # Processing::App
 
   # @HACK purists may prefer 'forwardable' to the use of Proxy

data/lib/jruby_art/helper_methods.rb

@@ -25,6 +25,14 @@ module Processing
       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
+    
+    def perspektiv(
+      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))
+      perspective(fov, aspect_ratio, near_z, far_z)
+    end
 
     # A nice method to run a given block for a grid.
     # Lifted from action_coding/Nodebox.
@@ -41,6 +49,11 @@ module Processing
     def lerp_color(*args)
       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
@@ -106,7 +119,7 @@ module Processing
     # 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 mousePressed keyPressed)
+      fields = %w(key frameRate mousePressed keyPressed)
       methods  = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end

data/lib/jruby_art/runner.rb

@@ -201,7 +201,6 @@ module Processing
     def discover_java_args(sketch)
       arg_file = "#{File.dirname(sketch)}/data/java_args.txt"
       args = []
-      args += dock_icon
       if FileTest.exist?(arg_file)
         args += File.read(arg_file).split(/\s+/)
       elsif Processing::RP_CONFIG['java_args']
@@ -260,16 +259,5 @@ module Processing
       data['JRUBY'] = 'true'
       open(path, 'w:UTF-8') { |f| f.write(data.to_yaml) }
     end
-
-    # On the Mac, we can display a fat, shiny ruby in the Dock.
-    def dock_icon
-      @os ||= host_os
-      icon = []
-      if os == :mac
-        icon << '-Xdock:name=JRubyArt'
-        icon << "-Xdock:icon=#{K9_ROOT}/lib/templates/application/Contents/Resources/sketch.icns"
-      end
-      icon
-    end
   end # class Runner
 end # module Processing

data/lib/jruby_art/runners/base.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: false
 SKETCH_PATH ||= ARGV.shift
-SKETCH_ROOT ||= File.dirname(SKETCH_PATH)
+SKETCH_ROOT ||= File.absolute_path(File.dirname(SKETCH_PATH))
 
 # we can safely require app.rb as we are using a jruby runtime
 require_relative '../app'
@@ -41,7 +41,7 @@ module Processing
     end
     code = no_methods ? format(NAKED_WRAP, source) : format(BARE_WRAP, source)
     Object.class_eval code, SKETCH_PATH, -1
-    Processing::App.sketch_class.new
+    Processing::App.sketch_class.new unless $app
   end
 
   # Read in the sketch source code. Needs to work both online and offline.

data/lib/jruby_art/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION     = '9.1.0.0'
-EXAMPLES           = '1.6'
+EXAMPLES           = '1.7'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.8'
 description: "  JRubyArt is a ruby wrapper for the processing art framework.\n  This
-  version supports processing-3.0.2, and uses jruby-9.1.0.0  as the glue \n  between
+  version supports processing-3.1.1, and uses jruby-9.1.0.0  as the glue \n  between
   ruby and java. You can use both processing libraries and ruby gems \n  in your sketches.
   Features create/run/watch/live modes. The \"watch\" mode,\n  provides a nice REPL-ish
   way to work on your processing sketches. Includes:-\n  A \"Control Panel\" library,