yet more tidy up

Author: monkstone

samples/contributed/bezier_playground.rb

@@ -10,46 +10,47 @@ def self.overlaps(x, y, point_x, point_y)
 class Curve
   include Olap, Processing::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)
     oval x1, y1, 3, 3
     oval x2, y2, 3, 3
   end
-  
+
   def print_equation(id)
-    p = all_points.map { |pt| pt.to_i }
-    puts ""
-    puts "*** line ##{id} ***"
-    puts "x = (1-t)^3 #{p[0]} + 3(1-t)^2 t#{p[2]} + 3(1-t)t^2 #{p[4]} + t^3 #{p[6]}"
-    puts "y = -1 * ((1-t)^3 #{p[1]} + 3(1-t)^2 t#{p[3]} + 3(1-t)t^2 #{p[5]} + t^3 #{p[7]})"
-    puts ""
+    pt = all_points.map(&:to_i)
+    puts ''
+    puts format('*** line #%s ***', id)
+    xformat = 'x = (1-t)^3 %s + 3(1-t)^2 t%s + 3(1-t)t^2 %s + t^3 %s'
+    yformat = 'y = -1 * ((1-t)^3 %s + 3(1-t)^2 t%s + 3(1-t)t^2 %s + t^3 %s'
+    puts format(xformat, pt[0], pt[2], pt[4], pt[6])
+    puts format(yformat, pt[1], pt[3], pt[5], pt[7])
+    puts ''
   end
 end
 
-
 attr_accessor :curves, :c1x, :c1y, :c2x, :c2y
 attr_reader :panel, :hide
 
@@ -69,10 +70,21 @@ def setup
     c.button :new_curve
     c.button :print_equations
     @panel = c
-  end    
+  end
   generate_curve
 end
 
+def draw
+  unless hide
+    panel.visible = visible
+    @hide = true
+  end
+  background 50
+  draw_control_tangent_lines
+  draw_curves
+  draw_current_control_points
+end
+
 def print_equations
   curves.each_with_index { |c, i| c.print_equation(i + 1) }
 end
@@ -114,15 +126,14 @@ def mouse_pressed
   @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 { |o| o.abs }.max > 100
+  return if offs.map(&:abs).max > 100
   return move_control_point(*offs) if @control
   return move_end_point(*offs) && move_control_point(*offs) if @end_point
   move_current_curve(*offs)
@@ -136,7 +147,6 @@ def switch_curve_if_endpoint_clicked
   @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
@@ -145,7 +155,6 @@ def move_current_curve(x_off, y_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
@@ -154,7 +163,6 @@ def move_control_point(x_off, y_off)
   current_curve.set_control_points(*control_points)
 end
 
-
 def move_end_point(x_off, y_off)
   c = current_curve
   case @end_point
@@ -163,16 +171,15 @@ def move_end_point(x_off, y_off)
   end
 end
 
-
 def compute_offsets
   return mouse_x - pmouse_x, mouse_y - pmouse_y
 end
 
-def draw_curves    
+def draw_curves
   stroke 255
   no_fill
   stroke_width 2
-  curves.each { |curve| curve.draw }
+  curves.each(&:draw)
 end
 
 def draw_current_control_points
@@ -189,16 +196,3 @@ def draw_control_tangent_lines
   line c1x, c1y, c.x1, c.y1
   line c2x, c2y, c.x2, c.y2
 end
-
-def draw
-  if (!hide)
-    panel.visible = self.visible
-    @hide = true
-  end
-  background 50
-  draw_control_tangent_lines
-  draw_curves
-  draw_current_control_points
-end
-
-

samples/contributed/drawolver.rb

@@ -1,8 +1,8 @@
 # Drawolver: draw 2D & revolve 3D
 
 # Example to show how to use the VecMath library.
-# ruby replacement for PVector. Also features 
-# the use each_cons, possibly a rare use for this 
+# ruby replacement for PVector. Also features
+# the use each_cons, possibly a rare use for this
 # ruby Enumerable method?
 # 2010-03-22 - fjenett (last revised by monkstone 2014-03-21)
 # now uses 'zip' and 'each', in place of a custom Array object
@@ -12,43 +12,41 @@
 import 'vecmath'
 attr_reader :drawing_mode, :points, :rot_x, :rot_y, :vertices
 
-def setup 
+def setup
   size 1024, 768, P3D
-  frame_rate 30 
+  frame_rate 30
   reset_scene
 end
 
-def draw  
-  background 0    
-  if (!drawing_mode)      
-    translate(width/2, height/2)
+def draw
+  background 0
+  unless drawing_mode
+    translate(width / 2, height / 2)
     rotate_x rot_x
     rotate_y rot_y
     @rot_x += 0.01
     @rot_y += 0.02
-    translate(-width/2, -height/2)
-  end 
+    translate(-width / 2, -height / 2)
+  end
   no_fill
   stroke 255
-  points.each_cons(2) { |ps, pe| line ps.x, ps.y, pe.x, pe.y}
-
-  if (!drawing_mode)    
-    stroke 125
-    fill 120
-    lights 
-    ambient_light 120, 120, 120
-    vertices.each_cons(2) do |r1, r2|
-      begin_shape(TRIANGLE_STRIP)
-      r1.zip(r2).each do |v1, v2|
-        vertex v1.x, v1.y, v1.z
-        vertex v2.x, v2.y, v2.z
-      end
-      end_shape 
+  points.each_cons(2) { |ps, pe| line ps.x, ps.y, pe.x, pe.y }
+  return if drawing_mode
+  stroke 125
+  fill 120
+  lights
+  ambient_light 120, 120, 120
+  vertices.each_cons(2) do |r1, r2|
+    begin_shape(TRIANGLE_STRIP)
+    r1.zip(r2).each do |v1, v2|
+      vertex v1.x, v1.y, v1.z
+      vertex v2.x, v2.y, v2.z
     end
-  end 
+    end_shape
+  end
 end
 
-def reset_scene 
+def reset_scene
   @drawing_mode = true
   @points = []
   @rot_x = 0.0
@@ -69,28 +67,24 @@ def mouse_released
   recalculate_shape
 end
 
-def recalculate_shape  
+def recalculate_shape
   @vertices = []
-  points.each_cons(2) do |ps, pe|   
+  points.each_cons(2) do |ps, _pe|
     b = points.last - points.first
     # len = b.mag
-    b.normalize!   
-    a = ps - points.first   
-    dot = a.dot b   
-    b = b * dot   
-    normal = points.first + b    
+    b.normalize!
+    a = ps - points.first
+    dot = a.dot b
+    b *= dot
+    normal = points.first + b
     c = ps - normal
-    # nlen = c.mag    
-    vertices << []    
-    (0..TAU).step(PI/15) do |ang|     
+    # nlen = c.mag
+    vertices << []
+    (0..TAU).step(PI / 15) do |ang|
       e = normal + c * cos(ang)
-      e.z = c.mag * sin(ang)      
+      e.z = c.mag * sin(ang)
       vertices.last << e
     end
   end
   @drawing_mode = false
 end
-
-
-
-

samples/contributed/fern.rb

@@ -1,13 +1,13 @@
 # The Fern Fractal
 # by Luis Correia
 
-attr_reader :boundary
+attr_reader :bnds
 
 def setup
   size 500, 500
-  @boundary = Boundary.new(0, width )
+  @bnds = Boundary.new(0, width)
   no_loop
-  puts "Be patient. This takes about 10 seconds to render."
+  puts 'Be patient. This takes about 10 seconds to render.'
 end
 
 def draw
@@ -34,18 +34,18 @@ def draw
     end
     i = height - (y * 45).to_i
     j = width / 2 + (x * 45).to_i
-    pixels[i * height + j] += 2_560 if (boundary.include?(i) && boundary.include?(j))
+    pixels[i * height + j] += 2_560 if bnds.include?(i) && bnds.include?(j)
     x0, y0 = x, y
   end
   update_pixels
 end
 
-# Abstract boundary checking to this
+# Abstract bnds checking to this
 # lightweight class
 #
 
 Boundary = Struct.new(:lower, :upper) do
-  def include? x
+  def include?(x)
     (lower...upper).cover? x
   end
 end

samples/contributed/orbit.rb

@@ -15,27 +15,21 @@ def setup
 def draw
   background 255
   translate 225, 225
-
   text_font d_font
   ellipse 0, 0, 10, 10
   text 'sun', 10, 0
-
   3.times do |i|
     push_matrix
-
     rotate frame_count / -180.0 * PI + i * PI / -1.5
     line 0, 0, 120, 0
-
     translate 120, 0
     ellipse 0, 0, 10, 10
     text_font d_font, 22
     text 'planet', 10, 0
-
-    rotate frame_count / -30.0 * PI 
+    rotate frame_count / -30.0 * PI
     line 0, 0, 30, 0
     text_font d_font, 15
     text 'moon', 32, 0
-
     pop_matrix
   end
-end
+end