mergefix

Author: monkstone

README.md

@@ -1,22 +1,21 @@
-# JRubyArt-examples for JRubyArt-1.2.4+
-JRubyArt-examples
+# JRubyArt-examples for JRubyArt-1.3.0+
+Description
 ================
 
-Rakefiles amended to use `-r` in place of `run`
-
-Many of the vanilla processing example sketches have been translated to ruby-processing, and they are mainly written as 'bare' sketches (ie not class wrapped) in keeping with the original processing.  At runtime these sketches the get wrapped into a Sketch class. Should you prefer you can still write class wrapped sketches, these will work equally well with jruby_art. You should also checkout the [Nature of Code Examples in ruby][] and for the beginner [Learning Processing with Ruby][] for even more examples.
-Includes autorun Rakefiles:-
+Like the original `ruby-processing`, `JRubyArt` is like a DSL for vanilla `processing`, so sketches can be written as **bare** sketches (ie they do not require a **class** wrapper, JRubyArt does that for you as does vanilla processing cf [propane][propane]). Here you will find many of the processing example sketches have been translated to ruby as **bare** sketches) but you can add a **class** wrapper if that suits you. You should also checkout the [Nature of Code Examples in ruby][] and for the beginner [Learning Processing with Ruby][] for even more examples. Many sketch folders includes autorun Rakefiles, and some of these can be run from the root directory as a demo:-
 
 1. in a console cd `k9_samples` directory
-2. and `rake` to run all the autorun examples (not all the examples)
-3. or eg `rake hype` to just run the hype library examples (depends on an installed hype library). 
+2. and `rake` to run all the core examples (excludes gem examples etc)
+3. `rake hype` to just run the hype library examples (depends on an installed hype library).
+4. `rake wordcram` to just run the wordcram gem examples (depends on an installed ruby_wordcram gem).
+5. `rake pbox2d` to just run the pbox2d gem examples (depends on an installed gem).
 
 ### Partial Catalogue (for the lazy)
 
 1. [Basic][]
 
     1. [structure][]
-    2. [objects][] 
+    2. [objects][]
     3. [arrays][]
     4. [input][]
     5. [shape][]
@@ -28,20 +27,30 @@ Includes autorun Rakefiles:-
     1. [shaders][]
     2. [lsystems][]
     3. [advanced data][]
-    
+
 3. [Libraries][]
     1. [fastmath][]
     2. [vecmath][]
     3. [control-panel][]
     4. [video][]
 
-4. [JBox2D][]
-5. [Hype-processing][hype]
-6. [Sunflow raytracing][joons]
+4. Gems
+   1. [PBox2D][pbox2d]
+   2. [Geomerative][geomerative]
+   3. [Toxiclibs][toxiclibs]
+   4. [Wordcram][wordcram]
+   5. [Sunflow raytracing][joons]
+
+5. Java Libraries
+   1. [Hype-processing][hype]
+   2. [Hemesh][hemesh]
+6. Others
+   1. [WOVNS patterns][wovns]
 
 ### User contributions are most welcome
 [Contributions][] add your [own][]
 
+[wovns]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/examples/WOVNS
 [Learning Processing with Ruby]:https://github.com/ruby-processing/learning-processing-with-ruby
 [Nature of Code Examples in ruby]:https://github.com/ruby-processing/The-Nature-of-Code-for-JRubyArt
 [Contributions]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/contributed
@@ -63,6 +72,11 @@ Includes autorun Rakefiles:-
 [vecmath]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/processing_app/library/vecmath
 [video]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/processing_app/library/video
 [control-panel]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/contributed/jwishy.rb
-[JBox2D]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/ruby_gem/jbox2d
+[PBox2D]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/ruby_gem/jbox2d
 [hype]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/java/hype
+[hemesh]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/java/hemesh
 [joons]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/gem/joonsrenderer
+[geomerative]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/gem/geomerative
+[toxiclibs]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/gem/toxiclibs
+[wordcram]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/external_library/gem/ruby_wordcram
+[propane]:https://ruby-processing.github.io/propane/

Rakefile

@@ -1,41 +1,60 @@
 # -*- encoding: utf-8 -*-
 
-root = File.expand_path(__dir__)
+K9WD = File.expand_path(__dir__)
 
-desc 'run contributed samples'    
+desc 'run contributed samples'
 task :default => [:all]
 
 desc 'run all autorun samples except hype'
 task :all do
   Rake::Task[:contributed].execute
-  Rake::Task[:vecmath].execute  
+  Rake::Task[:vecmath].execute
   Rake::Task[:shaders].execute
   Rake::Task[:slider].execute
 end
 
 desc 'run contributed samples'
 task :contributed do
-  sh "cd #{root}/contributed && rake"
+  sh "cd #{K9WD}/contributed && rake"
 end
 
 desc 'shaders'
 task :shaders do
-  sh "cd #{root}/processing_app/topics/shaders && rake"
+  sh "cd #{K9WD}/processing_app/topics/shaders && rake"
 end
 
 desc 'vecmath'
 task :vecmath do
-  sh "cd #{root}/processing_app/library/vecmath/vec2d && rake"
-  sh "cd #{root}/processing_app/library/vecmath/vec3d && rake"
-  sh "cd #{root}/processing_app/library/vecmath/arcball && rake"
+  sh "cd #{K9WD}/processing_app/library/vecmath/vec2d && rake"
+  sh "cd #{K9WD}/processing_app/library/vecmath/vec3d && rake"
+  sh "cd #{K9WD}/processing_app/library/vecmath/arcball && rake"
 end
 
 desc 'hype'
 task :hype do
-  sh "cd #{root}/external_library/java/hype && rake"
+  sh "cd #{K9WD}/external_library/java/hype && rake"
 end
 
 desc 'slider'
 task :slider do
-  sh "cd #{root}/processing_app/library/slider && rake"
+  sh "cd #{K9WD}/processing_app/library/slider && rake"
+end
+
+desc 'hemesh'
+task :hemesh do
+  sh "cd #{K9WD}/external_library/java/hemesh && rake"
+end
+
+desc 'pbox2d'
+task :pbox2d do
+  sh "cd #{K9WD}/external_library/gem/pbox2d && rake"
+  sh "cd #{K9WD}/external_library/gem/pbox2d/revolute_joint && k9 -r revolute_joint.rb"
+  sh "cd #{K9WD}/external_library/gem/pbox2d/test_contact && k9 -r test_contact.rb"
+  sh "cd #{K9WD}/external_library/gem/pbox2d/mouse_joint && k9 -r mouse_joint.rb"
+  sh "cd #{K9WD}/external_library/gem/pbox2d/distance_joint && k9 -r distance_joint.rb"
+end
+
+desc 'wordcram'
+task :wordcram do
+  sh "cd #{K9WD}/external_library/gem/ruby_wordcram && rake"
 end

contributed/25_squares.rb

@@ -3,8 +3,7 @@
 # Vera Molnar – 25 Squares
 # # # # #
 # Interpretation by Martin Vögeli
-# Converted to propane Martin Prout
-# features the :grid convenience method
+# Converted to JRubyArt Martin Prout
 # # # # #
 # Based on code by Indae Hwang and Jon McCormack
 def settings
@@ -25,10 +24,9 @@ def draw
   # calculate the size of each square for the given number of squares and gap between them
   cellsize = (width - (grid_size + 1) * gap) / grid_size
   position = -> (count) { gap * (count + 1) + cellsize * count + rand(-5..5) }
-  grid(grid_size, grid_size) do |i, j| # the grid convenience method takes a block
-    # Note how to create transparent fill with web color JRubyArt
+  grid(grid_size, grid_size) do |x, y|
     rand(0..5) > 4 ? fill(color('#a11220'), 180.0) : fill(color('#884444'), 180.0)
-    rect(position.call(i), position.call(j), cellsize, cellsize)
+    rect(position.call(x), position.call(y), cellsize, cellsize)
   end
   # save your drawings when you press keyboard 's' continually
   save_frame('######.jpg') if key_pressed? && key == 's'

contributed/animator.rb

@@ -13,7 +13,6 @@ def setup
   @draw           = false
   @back_color     = 204
   stroke_weight 4
-  smooth
   background @back_color
   FRAME_COUNT.times { @frames << get }
 end

contributed/full_screen.rb

@@ -1,32 +1,29 @@
 # Description:
-# This is a full-screen demo 
-# Since processing-3.0a10 set in settings
+# This is a full-screen demo
+# Using JRubyArt grid method
 
-class FullScreen < Processing::App
-  def setup
-  sketch_title 'Full Screen'
-    no_stroke
-  end
+GRID_SIZE = 100
+HALF = 50
 
-  def draw
-    lights
-    background 0
-    fill 120, 160, 220
-    (width/100).times do |x|
-      (height/100).times do |y|
-        new_x, new_y = x * 100, y * 100
-        push_matrix
-        translate new_x + 50, new_y + 50
-        rotate_y(((mouse_x.to_f + new_x) / width) * Math::PI)
-        rotate_x(((mouse_y.to_f + new_y) / height) * Math::PI)
-        box 90
-        pop_matrix
-      end
-    end
-  end  
+def setup
+  sketch_title 'Full Screen'
+  no_stroke
+end
 
-  def settings
-    full_screen P3D
+def draw
+  lights
+  background 0
+  fill 120, 160, 220
+  grid(width, height, GRID_SIZE, GRID_SIZE) do |x, y|
+    push_matrix
+    translate x + HALF, y + GRID_SIZE
+    rotate_y(((mouse_x.to_f + x) / width) * Math::PI)
+    rotate_x(((mouse_y.to_f + y) / height) * Math::PI)
+    box 90
+    pop_matrix
   end
 end
 
+def settings
+  full_screen(P3D)
+end

contributed/getting_started.rb

@@ -11,7 +11,7 @@ def setup
 
 def draw
   fill 0, 20
-  rect 0, 0, width, height  
+  rect 0, 0, width, height
   translate width / 2, height / 2
   rotate rotation
   fill 255
@@ -21,5 +21,4 @@ def draw
 
 def settings
   size 200, 200
-  smooth
 end

contributed/jwishy.rb

@@ -36,7 +36,6 @@ def setup
   @back_color = [0.06, 0.03, 0.18]
   color_mode RGB, 1
   ellipse_mode CORNER
-  smooth
 end
 
 def draw_background

contributed/orbit.rb

@@ -35,5 +35,4 @@ def draw
 
 def settings
   size 450, 450
-  smooth
 end

contributed/plain.rb

@@ -16,11 +16,14 @@ def draw
     background 0
     fill 120, 160, 220
     stroke 0
-    rect_mode(CENTER)
-    (dim..width - dim).step(dim) do |x|
-      (dim..height - dim).step(dim) do |y|
-        rect x, y, dim, dim, rnd, rnd, rnd, rnd
-      end
+    #rect_mode(CENTER)
+    # (dim..width - dim).step(dim) do |x|
+    #   (dim..height - dim).step(dim) do |y|
+    #     rect x, y, dim, dim, rnd, rnd, rnd, rnd
+    #   end
+    # end
+    grid(width, height, dim, dim) do |x, y|
+      rect x, y, dim, dim, rnd, rnd, rnd, rnd
     end
   end
 

contributed/tree.rb

@@ -66,5 +66,4 @@ def branch(h)
 
 def settings
   size 200, 200
-  smooth
 end