modified: contributed/library/curve/curve.rb

	deleted:    processing_app/library/vecmath/vec2d/README.txt
	modified:   processing_app/library/vecmath/vec2d/wiggle_pshape.rb
	deleted:    processing_app/topics/advanced_data/README
	modified:   processing_app/topics/advanced_data/counting_words.rb
	modified:   processing_app/topics/advanced_data/library/word/word.rb
	modified:   processing_app/topics/advanced_data/word_frequency.rb
	modified:   processing_app/topics/advanced_shader/blue_marble.rb

Author: monkstone

contributed/library/curve/curve.rb

@@ -1,11 +1,10 @@
-
+# frozen_string_literal: true
 module Olap
   def self.overlaps(x, y, point_x, point_y)
     Math.hypot(x - point_x, y - point_y) < RADIUS
   end
 end
 
-
 class Curve
   include Propane::Proxy
   include Olap

processing_app/library/vecmath/vec2d/README.txt

@@ -1,12 +1,11 @@
 require 'propane'
-java_import 'monkstone.vecmath.ShapeRender'
-#
 # WigglePShape. Demonstrates initialization and use of ShapeRender,
-# that allows us to send Vec2D to PShape vertex
+# that allows us to send Vec2D to PShape vertex see wiggler.rb
 #
 # How to move the individual vertices of a PShape
 #
 class Wiggling < Propane::App
+  load_library :wiggler
   attr_reader :wiggler
 
   def setup
@@ -23,54 +22,5 @@ def settings
     size(640, 360, P2D)
   end
 end
-Wiggling.new
-
-# An object that wraps the PShape
-class Wiggler
-  include Propane::Proxy, Math
-  attr_reader :original, :x, :y, :s, :yoff, :xoff
-
-  def initialize width, height
-    @x = width/2
-    @y = height/2
-    @yoff = 0
-
-    # The "original" locations of the vertices make up a circle
-
-    @original = (0...16).map{ |a| Vec2D.from_angle(PI * a / 8) * 100 }
-
-    # Now make the PShape with those vertices
-    @s = create_shape
-    renderer = ShapeRender.new(s) # Prefix with Sketch classname
-    s.begin_shape
-    s.fill(127)
-    s.stroke(0)
-    s.stroke_weight(2)
-    original.map{ |v| v.to_vertex(renderer) }
-    s.end_shape(CLOSE)
-  end
-
-  def wiggle
-    @xoff = 0
-    # Apply an offset to each vertex
-    rad = ->(pos){ (Vec2D.from_angle(2 * PI * noise(xoff, yoff)) * 4) + pos }
-
-    original.each_with_index do |pos, i|
-      # Calculate a new vertex location based on noise around "original" location
-      r = rad.call(pos)
-      # Set the location of each vertex to the new one
-      s.set_vertex(i, r.x, r.y)
-      # increment perlin noise x value
-      @xoff += 0.5
-    end
-    # Increment perlin noise y value
-    @yoff += 0.02
-  end
 
-  def display
-    push_matrix
-    translate(x, y)
-    shape(s)
-    pop_matrix
-  end
-end
+Wiggling.new

processing_app/library/vecmath/vec2d/wiggle_pshape.rb

@@ -38,12 +38,12 @@ def setup
   def draw
     background 51
     fill 255
-    s = (tokens[counter] == 'I') ? tokens[counter] : tokens[counter].downcase
+    s = tokens[counter] == 'I' ? tokens[counter] : tokens[counter].downcase
     @counter = (counter + 1) % tokens.length
     if concordance.key? s
       # Get the word object and increase the count
       # We access objects from a Hash via its key, the String
-      concordance[s].increment    # increment word count
+      concordance[s].increment # increment word count
     else
       # Otherwise make a new Word instance and add it to
       # the Hash using the word String as the key
@@ -55,7 +55,7 @@ def draw
     # Look at each word
     concordance.values.each do |w|
       # Only display words that appear 3 times
-      if w.count > 3  # access word count
+      if w.count > 3 # access word count
         # The size is the count
         fsize = constrain(w.count, 0, 100)
         text_size(fsize)
@@ -65,10 +65,10 @@ def draw
       end
       # If x gets to the end, move y
       # If y == 0 we are done
-      no_loop if y == 0
+      no_loop if y.zero?
       next unless x >= width
       x = 0
-      y = (y < 0) ? 0 : y - 100
+      y = y < 0 ? 0 : y - 100
     end
   end
 

processing_app/topics/advanced_data/README

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #######
 # word.rb
 # the word class stores data about words (text, source, frequency)

processing_app/topics/advanced_data/counting_words.rb

@@ -19,8 +19,8 @@
 class WordFrequency < Propane::App
   load_library 'word'
 
-  DRACULA = 'data/dracula.txt'
-  FRANKENSTEIN = 'data/frankenstein.txt'
+  DRACULA = 'data/dracula.txt'.freeze
+  FRANKENSTEIN = 'data/frankenstein.txt'.freeze
   DRAC = Regexp.new(DRACULA)
   FRANK = Regexp.new(FRANKENSTEIN)
 

processing_app/topics/advanced_data/library/word/word.rb

@@ -2,7 +2,7 @@
 require 'propane'
 # Earth model with bump mapping, specular texture and dynamic cloud layer.
 # Adapted from the THREE.js tutorial to processing by Andres Colubri,
-# translated to JRubyArt by Martin Prout:
+# translated to propane by Martin Prout:
 # http://learningthreejs.com/blog/2013/09/16/how-to-make-the-earth-in-webgl/
 class BlueMarble < Propane::App
   attr_reader :earth, :clouds, :earth_shader, :cloud_shader, :earth_rotation
@@ -30,11 +30,11 @@ def setup
     cloud_shader.set('texMap', textures[:cloud_tex])
     cloud_shader.set('alphaMap', textures[:alpha_tex])
     @earth = create_shape(SPHERE, 200)
-    earth.setStroke(false)
-    earth.setSpecular(color(125))
-    earth.setShininess(10)
+    earth.set_stroke(false)
+    earth.set_specular(color(125))
+    earth.set_shininess(10)
     @clouds = create_shape(SPHERE, 201)
-    clouds.setStroke(false)
+    clouds.set_stroke(false)
   end
 
   def draw