jruby_art 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c07e2583ae91828f56b50199830ca327fe9eadeb
-  data.tar.gz: 4afbc2e0d2437a6bcb5a30507a45797b309af3e6
+  metadata.gz: e332b6721afc72be284cccd025b766e6be4e3708
+  data.tar.gz: 32c62377c9263fc52c0d67efcb88e831cd33a3b5
 SHA512:
-  metadata.gz: 5153f072f9d863a5660b35f00eb6442d8fbc40a57e54a543f1fdbcc40dfca331157a5146312aa39292845645b171f8ad37bc81d95a66ef2fd80e5578fb268bb4
-  data.tar.gz: 29cb4e2832285999382f91874cae603090aca811f4546b66370e31d92372ec13c973820d300894a7c7a68ba57cf843d0f79a2af499ce81736a938d18f9cfbfde
+  metadata.gz: b6933e91fc6f1d3dfc963ff792a0dc6b402b02e734c2d662127c890ef2478276b5c7a273321f05c3ed4654ba1d9fcc08484a33424c156cd17d8a82a3140d5b3f
+  data.tar.gz: f9d69826c96c98aef1f591abaff889dc76dd0e7dfa631ba208031a2a061878ce6f455eac14b79ceba33ea34613dccf7fa35122aa4bbf0adbdb7c541d76408c99

data/lib/jruby_art/app.rb

@@ -1,6 +1,7 @@
 require 'java'
 require_relative '../rpextras'
 require_relative '../jruby_art/helper_methods'
+require_relative '../jruby_art/helpers/aabb'
 require_relative '../jruby_art/helpers/string_extra'
 require_relative '../jruby_art/library_loader'
 require_relative '../jruby_art/config'
@@ -12,11 +13,12 @@ module Processing
   end
   # Include some core processing classes that we'd like to use:
   include_package 'processing.core'
-  # Load vecmath and fastmath modules
+  # Load vecmath, fastmath and mathtool modules
   Java::MonkstoneArcball::ArcballLibrary.new.load(JRuby.runtime, false)
   Java::MonkstoneVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
   Java::MonkstoneVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)
   Java::MonkstoneFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
+  Java::Monkstone::MathToolLibrary.new.load(JRuby.runtime, false)
   AppRender ||= Java::MonkstoneVecmath::AppRender
   ShapeRender ||= Java::MonkstoneVecmath::ShapeRender
 
@@ -34,7 +36,7 @@ module Processing
   }
   # All sketches extend this class
   class App < PApplet
-    include HelperMethods, Math
+    include HelperMethods, Math, MathTool
     # Alias some methods for familiarity for Shoes coders.
     # surface replaces :frame, but needs field_reader for access
     alias_method :oval, :ellipse

data/lib/jruby_art/creators/creator.rb

@@ -47,6 +47,30 @@ class %s < Processing::App
 end
 CODE
 
+EMACS_BASIC = <<-CODE
+require 'jruby_art'
+require 'jruby_art/app'
+
+Processing::App::SKETCH_PATH = __FILE__
+
+class %s < Processing::App
+  def setup
+    sketch_title '%s'
+  end
+
+  def draw
+
+  end
+
+  def settings
+    size %s, %s
+    # smooth # here
+  end
+end
+
+%s.new unless defined? $app
+CODE
+
 CLASS_MODE = <<-CODE
 class %s < Processing::App
   def setup
@@ -64,6 +88,30 @@ class %s < Processing::App
 end
 CODE
 
+EMACS_MODE = <<-CODE
+require 'jruby_art'
+require 'jruby_art/app'
+
+Processing::App::SKETCH_PATH = __FILE__
+
+class %s < Processing::App
+  def setup
+    sketch_title '%s'
+  end
+
+  def draw
+
+  end
+
+  def settings
+    size %s, %s, %s
+    # smooth # here
+  end
+end
+
+%s.new unless defined? $app
+CODE
+
 INNER = <<-CODE
 class %s
   include Processing::Proxy
@@ -168,6 +216,31 @@ module Processing
       writer.save(template)
     end
   end
+  
+    # This class creates class wrapped sketches, with an optional render mode
+  class EmacsSketch < Creator
+    def emacs_template
+      format(EMACS_BASIC, @name, @title, @width, @height, @name)
+    end
+
+    def emacs_template_mode
+      format(EMACS_MODE, @name, @title, @width, @height, @mode, @name)
+    end
+    # Create a class wrapped sketch, given a path.
+    def create!(path, args)
+      return usage if /\?/ =~ path || /--help/ =~ path
+      main_file = File.basename(path, '.rb') # allow uneeded extension input
+      # Check to make sure that the main file doesn't exist already
+      already_exist(path)
+      @name = CamelString.new(main_file).camelize
+      writer = SketchWriter.new(main_file)
+      @title = StringExtra.new(main_file).titleize
+      @width, @height = args[0], args[1]
+      @mode = args[2].upcase unless args[2].nil?
+      template = @mode.nil? ? emacs_template : emacs_template_mode
+      writer.save(template)
+    end
+  end
 
   # This class creates a pseudo 'java inner class' of the sketch
   class Inner < Creator

data/lib/jruby_art/helper_methods.rb

@@ -16,6 +16,13 @@ module Processing
       buf.end_draw
       buf
     end
+    
+    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))
+        camera(eye.x, eye.y, eye.z, center.x, center.y, center.z, up.x, up.y, up.z)
+    end
 
     # A nice method to run a given block for a grid.
     # Lifted from action_coding/Nodebox.
@@ -48,52 +55,6 @@ module Processing
       end
     end
 
-    # 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] start2, stop2
-    # @return [float] mapped value
-    def map(value, start1, stop1, start2, stop2)
-      start2 + (stop2 - start2) * ((value - start1).to_f / (stop1 - start1))
-    end
-
-    # ruby alternative implementation of map using range parameters
-    # (begin..end) and excluded end (begin...end) produce the same result
-    def map1d(val, r_in, r_out)
-      r_out.begin + (r_out.end - r_out.begin) *
-        ((val - r_in.begin).to_f / (r_in.end - r_in.begin))
-    end
-
-    # Explicitly provides 'processing.org' map instance method, where
-    # value is mapped from range 1 to range 2 where values are clamped to
-    # range 2.
-    # @param val input
-    # @param [r_in] start1, stop1
-    # @param [r_out] start2, stop2
-    # @return mapped value
-    def constrained_map(val, r_in, r_out)
-      unless r_in.include? val
-        return r_out.begin if (val < r_in.begin && r_in.begin < r_in.end) ||
-                              (val > r_in.begin && r_in.begin > r_in.end)
-        return r_out.end
-      end
-      r_out.begin + (r_out.end - r_out.begin) *
-        ((val - r_in.begin).to_f / (r_in.end - r_in.begin))
-    end
-
-    # explicitly provide 'processing.org' norm instance method
-    def norm(value, start, stop)
-      (value - start).to_f / (stop - start)
-    end
-
-    # explicitly provide 'processing.org' lerp instance method
-    def lerp(start, stop, amt)
-      start + (stop - start) * amt
-    end
-
     # explicitly provide 'processing.org' min instance method
     # to return a float:- a, b and c need to be floats
 
@@ -210,9 +171,9 @@ module Processing
     def hex_color(a)
       if a.is_a?(Fixnum)
         return Java::Monkstone::ColorUtil.colorLong(a)
-      elsif a.is_a?(String) 
+      elsif a.is_a?(String)
         return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        raise StandardError, 'Dodgy Hexstring'
+        fail StandardError, 'Dodgy Hexstring'
       end
       Java::Monkstone::ColorUtil.colorDouble(a)
     end

data/lib/jruby_art/helpers/aabb.rb

@@ -0,0 +1,28 @@
+# Axis aligned bounding box
+class AABB
+  attr_reader :center, :extent
+
+  def initialize(center:, extent:)
+    @center = center
+    @extent = extent
+  end
+
+  def self.from_min_max(min:, max:)
+    new(center: (min + max) * 0.5, extent: max - min)
+  end
+
+  def position(vec)
+    return @center = vec unless block_given?
+    @center = vec if yield
+  end
+
+  def scale(d)
+    @extent *= d
+  end
+
+  def contains?(vec)
+    rad = extent * 0.5
+    return false unless (center.x - rad.x..center.x + rad.x).cover? vec.x
+    (center.y - rad.y..center.y + rad.y).cover? vec.y
+  end
+end

data/lib/jruby_art/runner.rb

@@ -77,6 +77,7 @@ module Processing
     # Parse the command-line options. Keep it simple.
     def parse_options(args)
       @options = OpenStruct.new
+      @options.emacs = !args.delete('--emacs').nil?
       @options.wrap = !args.delete('--wrap').nil?
       @options.inner = !args.delete('--inner').nil?
       @options.jruby = !args.delete('--jruby').nil?
@@ -92,6 +93,7 @@ module Processing
       require_relative '../jruby_art/creators/creator'
       return Processing::Inner.new.create!(sketch, args) if @options.inner
       return Processing::ClassSketch.new.create!(sketch, args) if @options.wrap
+      return Processing::EmacsSketch.new.create!(sketch, args) if @options.emacs
       Processing::BasicSketch.new.create!(sketch, args)
     end
 

data/lib/jruby_art/version.rb

@@ -1,3 +1,3 @@
 module JRubyArt
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION     = '9.0.0.0'
-EXAMPLES           = '0.5'
+EXAMPLES           = '0.6'
 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: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,14 +10,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   name: bundler
   prerelease: false
   type: :development
@@ -25,13 +25,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   name: rake
   prerelease: false
   type: :development
@@ -39,7 +39,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
   name: minitest
   prerelease: false
   type: :development
@@ -67,10 +67,24 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  name: rspec
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: |2
     JRubyArt is a ruby wrapper for the processing art framework.
-    The current version supports processing-3.0b2, and uses jruby-9.0.0.0
+    The current version supports processing-3.0b4, and uses jruby-9.0.0.0
     as the glue between ruby and java. You can use both processing libraries and ruby
     gems in your sketches. Features create/run/watch/live modes. The "watch" mode,
     provides a nice REPL-ish way to work on your processing sketches. Includes:-
@@ -89,6 +103,7 @@ files:
 - lib/jruby_art/config.rb
 - lib/jruby_art/creators/creator.rb
 - lib/jruby_art/helper_methods.rb
+- lib/jruby_art/helpers/aabb.rb
 - lib/jruby_art/helpers/camel_string.rb
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/helpers/range.rb
@@ -128,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 1.8+
-- processing = 3.0a11+
+- processing = 3.0b4+
 rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: