propane 0.7.0-java → 0.8.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7c8e44c6fbe975880869f4c5e8949c7292ab5b
-  data.tar.gz: 63dbc144992f49211386bcf673f24e3d72c9d9d4
+  metadata.gz: 25e44d0b96666b6c45b686f6ae303be7283a795a
+  data.tar.gz: e5f305b7cffdc904312fe7ad21f47017d5ca7db0
 SHA512:
-  metadata.gz: f8bc2eed2c1d79dae5a22c68af081955380070feb81ad96de689612d2d2f8037b6f613f5964268c523ffdc001890e98f17cb0a1b8897d4bbe53e727c9cce359e
-  data.tar.gz: 61c449de0ace22d8c04be925a6bb6354ccbe93a7b4f10f9fbb20b5e3d1a617e94a120959ab09fb7e870641a49633055c72b7411a410470d066e8bf8e25a652d5
+  metadata.gz: ac4bf37b116eed1296a1023cff3ae9c6eb8b59db426085801e30e696e6592057d4f7d8f24c75536e0e61f8b82d29c7096f599a44b36b04fb199f276110923fca
+  data.tar.gz: c5a4797c0d6b96ff95083f840d9e3805437581c7beb0983473cfdd0a9ebe76d9b08a62a37824fbb850c15b7c16f325885e42118aa9f7119ca1e992c6dd739f3c

data/.travis.yml

@@ -12,6 +12,4 @@ jdk:
 os:
   - linux
 
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**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

@@ -1,11 +1,11 @@
 # Propane
 [![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane)
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build, this started out as a non serious project by Phillip Cunningam called ribiprocessing.  It has now morphed into an experimental project for ruby-processing so we can now "Cook with Gas". We have created a configuration free version of ruby processing, albeit tied to processing-2.2.1, where we get processing core from maven central (and opengl currently testing on linux64/mac). These jars are small enough to include in the gem distribution, and hence we should not require configuration. This has created a mainly scriptable version, ie files get run direct from jruby.  However (as with ruby-processing/JRubyArt) certain sketches need to call jruby via jruby-complete, for this we have created an executable `propane` that can also be used to install `jruby-complete` as well as run sketches (maybe export?, possibly watch).
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build, this started out as a non serious project by Phillip Cunningam called ribiprocessing.  It has now morphed into an experimental project for ruby-processing so we can now "Cook with Gas". We have created a configuration free version of ruby processing, albeit tied to processing-2.2.1, where we get processing core from maven central (and opengl currently testing on linux64/mac). These jars are small enough to include in the gem distribution, and hence we should not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode).
 ## Requirements
 
 - jdk8+ since version 0.6.0
-- jruby-9.0.5.0+
+- jruby-9.1.2.0+
 - mvn-3.3.1+ (development only)
 
 ## Building and testing
@@ -19,7 +19,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane-{version}-java.gem # local install
-jgem install propane --pre # from rubygems.org, drop --pre once there is a regular released version
+jgem install propane # from rubygems.org
 ```
 
 ## Usage
@@ -67,8 +67,6 @@ There is a handy sketch creator tool
 propane -c my_sketch 200 200 # for default renderer
 propane -c my_sketch 200 200 p2d # for opengl 2D renderer
 propane -c my_sketch 200 200 p3d # for opengl 3D renderer
-```
-NB: will not overwrite existing sketch with the same name eg `my_sketch.rb` above
 
 To run sketches using the installed jruby-complete, you can also use shortform `-r`
 ```bash

data/examples/{complete → data_path}/Rakefile

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 # Simple demo Rakefile to autorun samples in current directory
-# adjust path to jruby-complete, and or opts as required
+# NB: If using atom install build and build-rake packages to run from atom
 
 SAMPLES_DIR = './'
 
@@ -24,7 +24,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|jruby -S propane --run #{sample_name}", 'r') do |io|
+  open("|jruby #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end

data/examples/{complete → data_path}/bw_shader.rb

@@ -1,19 +1,20 @@
+#!/usr/bin/env jruby -v -W2
 require 'propane'
 
 class BwShader < Propane::App
   # Texture from Jason Liebig's FLICKR collection of vintage labels and wrappers:
   # http://www.flickr.com/photos/jasonliebigstuff/3739263136/in/photostream/
-  
+
   attr_reader :label, :can, :angle, :bw_shader
-  
+
   def setup
     size(640, 360, P3D)
-    @label = load_image('lachoy.jpg')
+    @label = load_image(File.expand_path('./data/lachoy.jpg'))
     @can = create_can(100, 200, 32, label)
-    @bw_shader = load_shader('bwfrag.glsl')
+    @bw_shader = load_shader(File.expand_path('./data/bwfrag.glsl'))
     @angle = 0
   end
-  
+
   def draw
     background(0)
     shader(bw_shader)
@@ -22,7 +23,7 @@ class BwShader < Propane::App
     shape(can)
     @angle += 0.01
   end
-  
+
   def create_can(r, h, detail, tex)
     texture_mode(NORMAL)
     sh = create_shape

data/examples/{complete → data_path}/edge_detection.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 require 'propane'
 # Edge Detection.
@@ -12,7 +12,7 @@ class EdgeDetection < Propane::App
 
   def setup
     size(640, 360)
-    @img = load_image('moon.jpg') # Load the original image
+    @img = load_image(File.expand_path('./data/moon.jpg')) # Load the original image
     no_loop
   end
 

data/examples/{complete → data_path}/glsl_heightmap_noise.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 # Noise-Based GLSL Heightmap by Amnon Owed (May 2013)
 # https://github.com/AmnonOwed
@@ -8,14 +8,16 @@
 #
 # c = cycle through the color maps
 #
-# Tested with propane-0.3.0
+# Tested with propane-0.8.0
 #
 # Photographs by Folkert Gorter (@folkertgorter / http://superfamous.com/) made available under a CC Attribution 3.0 license.
 
-require 'propane' 
+require 'propane'
 
 class HeightMap < Propane::App
   include Propane::Render
+  SHADERS = %w(displaceFrag.glsl displaceVert.glsl).freeze
+  SHADER_NAME = %i(frag vert).freeze
   DIM = 300 # the grid dimensions of the heightmap
   attr_reader :blur_factor # the blur for the displacement map
   attr_reader :resize_factor # the resize factor for the displacement map
@@ -34,10 +36,12 @@ class HeightMap < Propane::App
     displace_strength = 0.25 # the displace strength of the GLSL shader displacement effect
     # load the images from the _Images folder (relative path from this sketch's folder)
     textures = %w(Texture01.jpg Texture02.jpg)
-    @images = textures.map { |texture| load_image(data_path(texture)) }
+    glsl_files = SHADERS.map { |shade| File.expand_path("./data/#{shade}") }
+    shaders = SHADER_NAME.zip(glsl_files.to_java(:string)).to_h
+    @images = textures.map { |texture| load_image(File.expand_path("./data/#{texture}")) }
     @color_map = 0
     # load the PShader with a fragment and a vertex shader
-    @displace = load_shader('displaceFrag.glsl', 'displaceVert.glsl')
+    @displace = load_shader(shaders[:frag], shaders[:vert])
     displace.set('displaceStrength', displace_strength) # set the displace_strength
     displace.set('colorMap', images[color_map]) # set the initial colorMap
     # create the heightmap PShape (see custom creation method) and put it in the global height_map reference

data/examples/{complete → data_path}/kinetic_type.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 # From the Processing Examples
 # by Zach Lieberman
@@ -11,18 +11,18 @@ WORDS = %w(sometimes\ it's\ like the\ lines\ of\ text are\ so\ happy
 require 'propane' # temporary local
 
 # dispay them 'words'
-class KineticType < Propane::App  
-  
+class KineticType < Propane::App
+
   def setup
     size(200, 200, P3D)
     frame_rate 30
     # Load the font from the sketch's data directory.
-    text_font load_font(data_path('Univers45.vlw')), 1.0
+    text_font load_font(File.expand_path('./data/Univers45.vlw')), 1.0
     fill 255
     # Creating the line objects
     @lines = WORDS.map.with_index { |word, i| Line.new(self, word, 0, i * 70) }
   end
-  
+
   def draw
     background 0
     translate(-240, -120, -450)

data/examples/{complete → data_path}/landscape.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env jruby -v -W2
+# frozen_string_literal: true
 require 'propane'
 
 class Landscape < Propane::App
@@ -7,26 +9,26 @@ class Landscape < Propane::App
   # Created by inigo quilez - iq/2013
   # License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
   # Processing port by Raphaël de Courville.
-  #  
-  attr_reader :landscape  
+  #
+  attr_reader :landscape
   java_alias :background_int, :background, [Java::int]
-  
+
   def setup
     size(640, 360, P2D)
-    no_stroke    
+    no_stroke
     # The code of this shader shows how to integrate shaders from shadertoy
     # into Processing with minimal changes.
-    @landscape = load_shader(data_path('landscape.glsl'))
+    @landscape = load_shader(File.expand_path('./data/landscape.glsl'))
     landscape.set('resolution', width.to_f, height.to_f)
   end
-  
+
   def draw
-    background_int 0    
+    background_int 0
     landscape.set('time', (millis/1000.0).to_f)
     shader(landscape)
-    rect(0, 0, width, height)    
+    rect(0, 0, width, height)
     frame.set_title("frame: #{frame_count} - fps: #{format('%0.2f', frame_rate)}")
-  end  
+  end
 end
 
 Landscape.new title: 'Landscape'

data/examples/{complete → data_path}/linear_image.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#!/usr/bin/env jruby -v -W2
 # frozen_string_literal: true
 require 'propane'
 # Linear Image.
@@ -15,7 +15,7 @@ class LinearImage < Propane::App
   def setup
     size(640, 360)
     stroke(255)
-    @img = loadImage('sea.jpg')
+    @img = load_image(File.expand_path('./data/sea.jpg'))
     @direction = 1
     @signal = 0
     img.load_pixels

data/examples/{complete → data_path}/monjori.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env jruby -v -W2
+# frozen_string_literal: true
 require 'propane'
 
 class Monjori < Propane::App
@@ -9,16 +11,16 @@ class Monjori < Propane::App
   # Ported from the webGL version available in ShaderToy:
   # http://www.iquilezles.org/apps/shadertoy/
   # (Look for Monjori under the Plane Deformations Presets)
-   
+
   attr_reader :monjori
-  
+
   def setup
     size(640, 360, P2D)
     no_stroke
-    @monjori = load_shader('monjori.glsl')
+    @monjori = load_shader(File.expand_path('./data/monjori.glsl'))
     monjori.set('resolution', width.to_f, height.to_f)
   end
-  
+
   def draw
     monjori.set('time', millis / 1000.0)
     shader(monjori)
@@ -27,7 +29,7 @@ class Monjori < Propane::App
     # entire view area so every pixel is pushed through the
     # shader.
     rect(0, 0, width, height)
-  end  
+  end
 end
 
 Monjori.new title: 'Monjori'

data/examples/regular/arcball_box.rb

@@ -1,6 +1,6 @@
-!#/usr/bin/env jruby
-
+#!/usr/bin/env jruby -v -w
 require 'arcball'
+require 'propane'
 
 ############################
 # Use mouse drag to rotate
@@ -9,13 +9,6 @@ require 'arcball'
 # to constrain rotation axis.
 ############################
 
-require 'propane' # temporary local
-
-# Include processing opengl classes that we'd like to use:
-%w(PGL PGraphics3D PGraphicsOpenGL PShapeOpenGL Texture).each do |klass|
-  java_import "processing.opengl.#{klass}"
-end
-
 class ArcballBox < Propane::App
 
 def setup
@@ -26,13 +19,10 @@ def setup
 end
 
 def draw
-  background(50)  
+  background(50)
   box(300, 300, 300)
 end
 
 end
 
 ArcballBox.new title: 'ArcBall Box'
-
-
-

data/examples/regular/arcball_constrain.rb

@@ -1,5 +1,6 @@
-!#/usr/bin/env jruby
+#!/usr/bin//env jruby -v -w
 
+require 'propane'
 require 'arcball'
 
 ############################
@@ -9,30 +10,20 @@ require 'arcball'
 # default is yaxis.
 ############################
 
-require 'propane' # temporary local
-
-# Include processing opengl classes that we'd like to use:
-%w(PGL PGraphics3D PGraphicsOpenGL PShapeOpenGL Texture).each do |klass|
-  java_import "processing.opengl.#{klass}"
-end
-
 class ArcballBox < Propane::App
 
-def setup
-  size(600, 600, P3D)
-  smooth(8)
-  Processing::ArcBall.constrain(self, :xaxis)
-  fill 180
-end
+  def setup
+    size(600, 600, P3D)
+    smooth(8)
+    Processing::ArcBall.constrain(self, :xaxis)
+    fill 180
+  end
 
-def draw
-  background(50)  
-  box(300, 300, 300)
-end
+  def draw
+    background(50)
+    box(300, 300, 300)
+  end
 
 end
 
 ArcballBox.new title: 'ArcBall Box'
-
-
-

data/examples/regular/bezier_playground.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env jruby -v -w
 require 'propane'
 
 X1, Y1, X2, Y2 = 50.0, 50.0, 250.0, 250.0
@@ -13,35 +14,35 @@ end
 class Curve
   include Olap, Propane::Proxy
   attr_accessor :x1, :y1, :c1x, :c1y, :c2x, :c2y, :x2, :y2
-  
+
   def initialize
     @x1, @y1, @x2, @y2 = X1, Y1, X2, Y2
     set_control_points(X1 + 30, Y1, X2 - 30, Y2)
   end
-  
+
   def contains(x, y)
     return :one if Olap.overlaps(x1, y1, x, y)
     return :two if Olap.overlaps(x2, y2, x, y)
   end
-  
+
   def all_points
     return x1, y1, c1x, c1y, c2x, c2y, x2, y2
   end
-  
+
   def control_points
     return c1x, c1y, c2x, c2y
   end
-  
+
   def set_control_points(*points)
     @c1x, @c1y, @c2x, @c2y = *points
   end
-  
+
   def draw
     bezier(*all_points)
     ellipse x1, y1, 3, 3
     ellipse x2, y2, 3, 3
   end
-  
+
   def print_equation(id)
     pt = all_points.map(&:to_i)
     puts ''
@@ -58,13 +59,13 @@ class BezierPlayground < Propane::App
   # A Bezier playground. Click to shape the curve. Drag to move it.
   # Arrows toggle between curves, delete removes them.
   # You can print out the parametric equations for t = 0..1
-  
+
   attr_accessor :curves, :c1x, :c1y, :c2x, :c2y
-  attr_reader :panel, :hide  
-  
+  attr_reader :panel, :hide
+
   load_library :control_panel
   include Olap
-  
+
   def setup
     size 300, 300
     @curves = []
@@ -77,7 +78,7 @@ class BezierPlayground < Propane::App
     end
     generate_curve
   end
-  
+
   def draw
     unless hide
       panel.visible = visible
@@ -88,40 +89,40 @@ class BezierPlayground < Propane::App
     draw_curves
     draw_current_control_points
   end
-  
+
   def print_equations
     curves.each_with_index { |c, i| c.print_equation(i + 1) }
   end
-  
+
   def control_points
     return c1x, c1y, c2x, c2y
   end
-  
+
   def set_control_points(*points)
     @c1x, @c1y, @c2x, @c2y = points.any? ? points : [X1, Y1, X2, Y2]
   end
-  
+
   def generate_curve
     curves << current_curve = Curve.new
     @current = curves.length - 1
     set_control_points(*current_curve.control_points)
   end
-  
+
   def current_curve
     curves[@current]
   end
-  
+
   def new_curve
     current_curve.set_control_points(c1x, c1y, c2x, c2y)
     generate_curve
   end
-  
+
   def clicked_control_point?
     x, y = mouse_x, mouse_y
     return :one if Olap.overlaps(c1x, c1y, x, y)
     return :two if Olap.overlaps(c2x, c2y, x, y)
   end
-  
+
   def mouse_pressed
     switch_curve_if_endpoint_clicked
     @control = clicked_control_point?
@@ -129,12 +130,12 @@ class BezierPlayground < Propane::App
     curve = curves.detect { |c| c.contains(mouse_x, mouse_y) }
     @end_point = curve.contains(mouse_x, mouse_y) if curve
   end
-  
+
   def mouse_released
     @control, @end_point = nil, nil
     @hide = false
   end
-  
+
   def mouse_dragged
     offs = compute_offsets
     return if offs.map(&:abs).max > 100
@@ -142,7 +143,7 @@ class BezierPlayground < Propane::App
     return move_end_point(*offs) && move_control_point(*offs) if @end_point
     move_current_curve(*offs)
   end
-  
+
   def switch_curve_if_endpoint_clicked
     become = curves.detect { |c| c.contains(mouse_x, mouse_y) }
     return unless become && become != current_curve
@@ -150,7 +151,7 @@ class BezierPlayground < Propane::App
     self.set_control_points(*become.control_points)
     @current = curves.index(become)
   end
-  
+
   def move_current_curve(x_off, y_off)
     @c1x += x_off; @c2x += x_off
     @c1y += y_off; @c2y += y_off
@@ -158,7 +159,7 @@ class BezierPlayground < Propane::App
     current_curve.x1 += x_off; current_curve.x2 += x_off
     current_curve.y1 += y_off; current_curve.y2 += y_off
   end
-  
+
   def move_control_point(x_off, y_off)
     case @control || @end_point
     when :one then @c1x += x_off and @c1y += y_off
@@ -166,7 +167,7 @@ class BezierPlayground < Propane::App
     end
     current_curve.set_control_points(*control_points)
   end
-  
+
   def move_end_point(x_off, y_off)
     c = current_curve
     case @end_point
@@ -174,32 +175,32 @@ class BezierPlayground < Propane::App
     when :two then c.x2 += x_off and c.y2 += y_off
     end
   end
-  
+
   def compute_offsets
     return mouse_x - pmouse_x, mouse_y - pmouse_y
   end
-  
+
   def draw_curves
     stroke 255
     no_fill
     stroke_width 2
     curves.each(&:draw)
   end
-  
+
   def draw_current_control_points
     fill color(*REDDISH)
     no_stroke
     ellipse c1x, c1y, 5, 5
     ellipse c2x, c2y, 5, 5
   end
-  
+
   def draw_control_tangent_lines
     c = current_curve
     stroke color(*REDDISH)
     stroke_width 1
     line c1x, c1y, c.x1, c.y1
     line c2x, c2y, c.x2, c.y2
-  end  
+  end
 end
 
 BezierPlayground.new title: 'Bezier Playground'