ruby-processing 2.4.2 → 2.4.3

data/samples/processing_app/topics/cellular_automata/library/ca/ca.rb

@@ -7,7 +7,7 @@ class CA
   def initialize(rules = [])
     @width = $app.width
     @height = $app.height
-    if rules.length > 0
+    if !rules.empty?
       @rules = rules
     else
       randomize
@@ -23,7 +23,7 @@ class CA
   
   # Return a random ruleset
   def randomize
-    @rules = Array.new(8) {(rand(100) > 50)? 1 : 0}
+    @rules = Array.new(8) {rand(0 .. 1)}
   end
   
   # Reset to generation 0
@@ -86,6 +86,6 @@ class CA
   
   # The CA is done if it reaches the bottom of the screen
   def finished?
-    return (generation > (height/SCL))
+    generation > (height/SCL)
   end
 end

data/samples/processing_app/topics/lsystems/Rakefile

@@ -0,0 +1,30 @@
+# Simple demo Rakefile to autorun samples in current directory
+# adjust path to rp5 executable, and or opts as required
+
+SAMPLES_DIR="./"
+
+desc 'run demo'
+task :default => [:demo]
+
+desc 'demo'
+task :demo do
+  samples_list.shuffle.each{|sample| run_sample sample}
+end
+
+def samples_list
+  files = []
+  Dir.chdir(SAMPLES_DIR)
+  Dir.glob("*.rb").each do |file|
+    files << File.join(SAMPLES_DIR, file)
+  end
+  return files
+end
+
+def run_sample(sample_name)
+  puts "Running #{sample_name}...quit to run next sample"
+  open("|rp5 run #{sample_name}", "r") do |io|
+    while l = io.gets
+      puts(l.chop) 
+    end      
+  end
+end

data/samples/processing_app/topics/motion/Rakefile

@@ -0,0 +1,30 @@
+# Simple demo Rakefile to autorun samples in current directory
+# adjust path to rp5 executable, and or opts as required
+
+SAMPLES_DIR="./"
+
+desc 'run demo'
+task :default => [:demo]
+
+desc 'demo'
+task :demo do
+  samples_list.shuffle.each{|sample| run_sample sample}
+end
+
+def samples_list
+  files = []
+  Dir.chdir(SAMPLES_DIR)
+  Dir.glob("*.rb").each do |file|
+    files << File.join(SAMPLES_DIR, file)
+  end
+  return files
+end
+
+def run_sample(sample_name)
+  puts "Running #{sample_name}...quit to run next sample"
+  open("|rp5 run #{sample_name}", "r") do |io|
+    while l = io.gets
+      puts(l.chop) 
+    end      
+  end
+end

data/samples/processing_app/topics/shaders/Rakefile

@@ -0,0 +1,30 @@
+# Simple demo Rakefile to autorun samples in current directory
+# adjust path to rp5 executable, and or opts as required
+
+SAMPLES_DIR="./"
+
+desc 'run demo'
+task :default => [:demo]
+
+desc 'demo'
+task :demo do
+  samples_list.shuffle.each{|sample| run_sample sample}
+end
+
+def samples_list
+  files = []
+  Dir.chdir(SAMPLES_DIR)
+  Dir.glob("*.rb").each do |file|
+    files << File.join(SAMPLES_DIR, file)
+  end
+  return files
+end
+
+def run_sample(sample_name)
+  puts "Running #{sample_name}...quit to run next sample"
+  open("|rp5 --nojruby run #{sample_name}", "r") do |io|
+    while l = io.gets
+      puts(l.chop) 
+    end      
+  end
+end

data/samples/processing_app/topics/shaders/data/FishEye.glsl

@@ -0,0 +1,59 @@
+// Inspired by the "Angular Fisheye à la Bourke" sketch from
+// Jonathan Cremieux, as shown in the OpenProcessing website:
+// http://openprocessing.org/visuals/?visualID=12140
+// Using the inverse transform of the angular fisheye as
+// explained in Paul Bourke's website:
+// http://paulbourke.net/miscellaneous/domefisheye/fisheye/
+
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
+#define PROCESSING_TEXTURE_SHADER
+
+uniform sampler2D texture;
+uniform mat4 texMatrix;
+
+varying vec4 vertColor;
+varying vec4 vertTexCoord;
+
+uniform float aperture;
+
+const float PI = 3.1415926535;
+
+void main(void) {    
+  float apertureHalf = 0.5 * aperture * (PI / 180.0);
+  
+  // This factor ajusts the coordinates in the case that
+  // the aperture angle is less than 180 degrees, in which
+  // case the area displayed is not the entire half-sphere.
+  float maxFactor = sin(apertureHalf);
+  
+  // The st factor takes into account the situation when non-pot
+  // textures are not supported, so that the maximum texture
+  // coordinate to cover the entire image might not be 1.
+  vec2 stFactor = vec2(1.0 / abs(texMatrix[0][0]), 1.0 / abs(texMatrix[1][1]));  
+  vec2 pos = (2.0 * vertTexCoord.st * stFactor - 1.0);
+  
+  float l = length(pos);
+  if (l > 1.0) {
+    gl_FragColor = vec4(0, 0, 0, 1);  
+  } else {
+    float x = maxFactor * pos.x;
+    float y = maxFactor * pos.y;
+    
+    float n = length(vec2(x, y));
+    
+    float z = sqrt(1.0 - n * n);
+  
+    float r = atan(n, z) / PI; 
+  
+    float phi = atan(y, x);
+
+    float u = r * cos(phi) + 0.5;
+    float v = r * sin(phi) + 0.5;
+
+    gl_FragColor = texture2D(texture, vec2(u, v) / stFactor) * vertColor;
+  }
+}

data/vendors/Rakefile

@@ -1,6 +1,6 @@
 require 'rake/clean'
 
-JRUBY_VERSION      = "1.7.10"
+JRUBY_VERSION      = "1.7.11"
 
 CLOBBER.include("jruby-complete-#{JRUBY_VERSION}.jar")
 
@@ -12,7 +12,7 @@ task :download => ["jruby-complete-#{JRUBY_VERSION}.jar"]
 
 file "jruby-complete-#{JRUBY_VERSION}.jar" do
   sh "wget http://jruby.org.s3.amazonaws.com/downloads/#{JRUBY_VERSION}/jruby-complete-#{JRUBY_VERSION}.jar"
-  check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "f74a8b29da11e2ea430a1d1d92b72d424f7ee311")
+  check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "cf627710faa842c9ea9f1e9955866703c653c5d9")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,8 +123,13 @@ files:
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
 - library/file_chooser/file_chooser.rb
+- library/vecmath/lib/arcball.rb
+- library/vecmath/lib/quaternion.rb
+- library/vecmath/lib/vec.rb
 - library/vecmath/vecmath.rb
 - ruby-processing.gemspec
+- samples/Rakefile
+- samples/contributed/Rakefile
 - samples/contributed/animator.rb
 - samples/contributed/bezier_playground.rb
 - samples/contributed/circle_collision.rb
@@ -400,6 +405,7 @@ files:
 - samples/processing_app/library/pdf/many_pdfs.rb
 - samples/processing_app/library/pdf/one_frame.rb
 - samples/processing_app/library/vecmath/README.txt
+- samples/processing_app/library/vecmath/Rakefile
 - samples/processing_app/library/vecmath/acceleration_with_vectors.rb
 - samples/processing_app/library/vecmath/bouncing_ball.rb
 - samples/processing_app/library/vecmath/circle_collision.rb
@@ -425,6 +431,7 @@ files:
 - samples/processing_app/library/vecmath/vector_math.rb
 - samples/processing_app/library/vecmath/wiggle_pshape.rb
 - samples/processing_app/topics/advanced_data/README
+- samples/processing_app/topics/advanced_data/Rakefile
 - samples/processing_app/topics/advanced_data/counting_words.rb
 - samples/processing_app/topics/advanced_data/data/Georgia.ttf
 - samples/processing_app/topics/advanced_data/data/Merriweather-Light.ttf
@@ -735,6 +742,7 @@ files:
 - samples/processing_app/topics/image_processing/linear_image.rb
 - samples/processing_app/topics/image_processing/pixel_array.rb
 - samples/processing_app/topics/image_processing/zoom.rb
+- samples/processing_app/topics/lsystems/Rakefile
 - samples/processing_app/topics/lsystems/chequer.rb
 - samples/processing_app/topics/lsystems/csplant.rb
 - samples/processing_app/topics/lsystems/cstest.rb
@@ -753,6 +761,7 @@ files:
 - samples/processing_app/topics/lsystems/snake_kolam.rb
 - samples/processing_app/topics/lsystems/stochastic_test.rb
 - samples/processing_app/topics/lsystems/three_d_tree.rb
+- samples/processing_app/topics/motion/Rakefile
 - samples/processing_app/topics/motion/bounce.rb
 - samples/processing_app/topics/motion/bouncy_bubbles.rb
 - samples/processing_app/topics/motion/brownian.rb
@@ -768,9 +777,11 @@ files:
 - samples/processing_app/topics/motion/reflection1.rb
 - samples/processing_app/topics/motion/reflection2.rb
 - samples/processing_app/topics/shaders/README
+- samples/processing_app/topics/shaders/Rakefile
 - samples/processing_app/topics/shaders/blur_filter.rb
 - samples/processing_app/topics/shaders/bw_shader.rb
 - samples/processing_app/topics/shaders/conway.rb
+- samples/processing_app/topics/shaders/data/FishEye.glsl
 - samples/processing_app/topics/shaders/data/GlossyFrag.glsl
 - samples/processing_app/topics/shaders/data/GlossyVert.glsl
 - samples/processing_app/topics/shaders/data/Texture01.jpg
@@ -796,7 +807,6 @@ files:
 - samples/processing_app/topics/shaders/data/sep_blur.glsl
 - samples/processing_app/topics/shaders/data/tex1.jpg
 - samples/processing_app/topics/shaders/deform.rb
-- samples/processing_app/topics/shaders/dome_projection.rb
 - samples/processing_app/topics/shaders/edge_detect.rb
 - samples/processing_app/topics/shaders/glossy_fish_eye.rb
 - samples/processing_app/topics/shaders/glsl_heightmap_noise.rb
@@ -853,7 +863,7 @@ requirements:
 - java runtime >= 1.6+
 - processing = 2.0.3+
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.

data/samples/processing_app/topics/shaders/dome_projection.rb

@@ -1,143 +0,0 @@
-#
-# DomeProjection
-# 
-# This sketch uses use environmental mapping to render the output 
-# on a full spherical dome.
-# 
-# Based on the FullDome_template code from Christopher Warnow: 
-# https://github.com/mphasize/FullDome
-# 
-#
-
-attr_reader :fbo, :cube_map_shader, :dome_sphere, :env_map_texture_id
-
-ENV_MAP_SIZE = 1024
-
-def setup
-  size(640, 640, P3D) 
-  init_cube_map  
-end
-
-def draw
-  background(0)
-  draw_cube_map 
-end
-
-def draw_scene   
-  background(0)
-  stroke(255, 0, 0)
-  stroke_weight(2)
-  
-  (-width ... 2 * width).step(50) do |i|	
-    line(i, -height, -100, i, 2 * height, -100)
-  end
-  (-height ... 2 * height).step(50) do |i|	
-    line(-width, i, -100, 2 * width, i, -100)
-  end
-  
-  lights
-  no_stroke
-  translate(mouse_x, mouse_y, 200)
-  rotate_x(frame_count * 0.01)
-  rotate_y(frame_count * 0.01) 
-  box(100) 
-end
-
-java_import "java.nio.IntBuffer"
-
-def init_cube_map
-  sphere_detail(50)
-  @dome_sphere = create_shape(SPHERE, height/2.0)
-  dome_sphere.rotate_x(HALF_PI)
-  dome_sphere.set_stroke(false)
-
-  pgl = beginPGL
-
-  @env_map_texture_id = IntBuffer.allocate(1)
-  pgl.gen_textures(1, env_map_texture_id)
-  pgl.bind_texture(PGL::TEXTURE_CUBE_MAP, env_map_texture_id.get(0))
-  pgl.texParameteri(PGL::TEXTURE_CUBE_MAP, PGL::TEXTURE_WRAP_S, PGL::CLAMP_TO_EDGE)
-  pgl.texParameteri(PGL::TEXTURE_CUBE_MAP, PGL::TEXTURE_WRAP_T, PGL::CLAMP_TO_EDGE)
-  pgl.texParameteri(PGL::TEXTURE_CUBE_MAP, PGL::TEXTURE_WRAP_R, PGL::CLAMP_TO_EDGE)
-  pgl.texParameteri(PGL::TEXTURE_CUBE_MAP, PGL::TEXTURE_MIN_FILTER, PGL::NEAREST)
-  pgl.texParameteri(PGL::TEXTURE_CUBE_MAP, PGL::TEXTURE_MAG_FILTER, PGL::NEAREST)
-  (PGL::TEXTURE_CUBE_MAP_POSITIVE_X ... PGL::TEXTURE_CUBE_MAP_POSITIVE_X + 6).each do |i|
-    pgl.texImage2D(i, 0, PGL::RGBA8, ENV_MAP_SIZE, ENV_MAP_SIZE, 0, PGL::RGBA, PGL::UNSIGNED_BYTE, nil)
-  end
-
-  # Init fbo, rbo
-  @fbo = IntBuffer.allocate(1)
-  rbo = IntBuffer.allocate(1)
-  pgl.genFramebuffers(1, fbo)
-  pgl.bindFramebuffer(PGL::FRAMEBUFFER, fbo.get(0))
-  pgl.framebufferTexture2D(PGL::FRAMEBUFFER, PGL::COLOR_ATTACHMENT0, PGL::TEXTURE_CUBE_MAP_POSITIVE_X, env_map_texture_id.get(0), 0)
-
-  pgl.genRenderbuffers(1, rbo)
-  pgl.bindRenderbuffer(PGL::RENDERBUFFER, rbo.get(0))
-  pgl.renderbufferStorage(PGL::RENDERBUFFER, PGL::DEPTH_COMPONENT24, ENV_MAP_SIZE, ENV_MAP_SIZE)
-
-  # Attach depth buffer to FBO
-  pgl.framebufferRenderbuffer(PGL::FRAMEBUFFER, PGL::DEPTH_ATTACHMENT, PGL::RENDERBUFFER, rbo.get(0))   
-
-  pgl.enable(PGL::TEXTURE_CUBE_MAP)
-  pgl.active_texture(PGL::TEXTURE1)
-  pgl.bind_texture(PGL::TEXTURE_CUBE_MAP, env_map_texture_id.get(0))    
-
-  endPGL
-
-  # Load cubemap shader.
-  @cube_map_shader = load_shader("cubemapfrag.glsl", "cubemapvert.glsl")
-  cube_map_shader.set("cubemap", 1)
-end
-
-def draw_cube_map
-  regenerateEnvMap
-  drawDomeMaster
-end
-
-def drawDomeMaster
-  ortho
-  reset_matrix
-  shader(cube_map_shader)
-  shape(dome_sphere)
-  reset_shader
-end
-
-# Called to regenerate the envmap
-def regenerateEnvMap     
-  pgl = beginPGL
-
-  # bind fbo
-  pgl.bindFramebuffer(PGL::FRAMEBUFFER, fbo.get(0))
-
-  # generate 6 views from origin(0, 0, 0)
-  pgl.viewport(0, 0, ENV_MAP_SIZE, ENV_MAP_SIZE)   
-  perspective(90.0 * DEG_TO_RAD, 1.0, 1.0, 1025.0) 
-  (PGL::TEXTURE_CUBE_MAP_POSITIVE_X ... PGL::TEXTURE_CUBE_MAP_NEGATIVE_Z).each do |face|
-    reset_matrix
-    case face
-    when PGL::TEXTURE_CUBE_MAP_POSITIVE_X
-      camera(0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, -1.0, 0.0)
-    when PGL::TEXTURE_CUBE_MAP_NEGATIVE_X
-      camera(0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 0.0, -1.0, 0.0)
-    when PGL::TEXTURE_CUBE_MAP_POSITIVE_Y
-      camera(0.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0.0, 0.0, -1.0) 
-    when PGL::TEXTURE_CUBE_MAP_NEGATIVE_Y
-      camera(0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0)
-    when PGL::TEXTURE_CUBE_MAP_POSITIVE_Z
-      camera(0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, -1.0, 0.0)   
-    end
-    
-    scale(-1, 1, -1)
-    translate(-width * 0.5, -height * 0.5, -500)
-    pgl.framebufferTexture2D(PGL::FRAMEBUFFER, PGL::COLOR_ATTACHMENT0, face, env_map_texture_id.get(0), 0)
-    draw_scene# Draw objects in the scene
-    flush# Make sure that the geometry in the scene is pushed to the GPU    
-    no_lights # Disabling lights to avoid adding many times
-    pgl.framebufferTexture2D(PGL::FRAMEBUFFER, PGL::COLOR_ATTACHMENT0, face, 0, 0)
-  end
-  
-  endPGL
-end
-
-