still doing tidy up

Author: monkstone

samples/contributed/drawolver.rb

@@ -9,7 +9,6 @@
 # with a 'one_of_each' method
 
 load_library :vecmath
-import 'vecmath'
 attr_reader :drawing_mode, :points, :rot_x, :rot_y, :vertices
 
 def setup

samples/contributed/gravity.rb

@@ -5,7 +5,7 @@
 def setup
   size 600, 500
   @particles  = []
-  @grabbed    = nil  
+  @grabbed    = nil
   background 0
   smooth 4
   stroke_weight 4
@@ -17,7 +17,7 @@ def draw
   no_stroke
   fill 0, 60
   rect 0, 0, width, height
-  particles.each { |p| p.collect_force; p.move; p.render }
+  particles.each(&:run)
 end
 
 def mouse_pressed
@@ -35,17 +35,17 @@ def particle_grab
 end
 
 class Particle
-  GRAVITY = 1.0  
+  GRAVITY = 1.0
   attr_reader :x0, :y0, :x1, :y1, :diameter, :mass_amount
-  
+
   def initialize(x, y, mass)
     @x0, @y0, @x1, @y1  = x, y, x, y
     @x_speed, @y_speed  = 0, 0
     @x_accel, @y_accel  = 0, 0
     @mass_amount        = mass
     @diameter           = sqrt(mass_amount) * 20
   end
-  
+
   def collect_force
     @x_accel, @y_accel = 0, 0
     @min_dist = 1000
@@ -61,23 +61,29 @@ def collect_force
       end
     end
   end
-  
+
   def move
     @x_speed, @y_speed = 0, 0 if grabbed?
     @x_speed += @x_accel
     @y_speed += @y_accel
     @x1, @y1 = x0 + @x_speed, y0 + @y_speed
   end
-  
+
   def grabbed?
     $app.grabbed == self
   end
-  
+
+  def run
+    collect_force
+    move
+    render
+  end
+
   def render
     no_stroke
     grabbed? ? render_grabbed : render_free
   end
-  
+
   def render_free
     charge_col  = 1000.0 / @min_dist / 50.0
     tot_col_1   = 100 + charge_col * 6
@@ -90,7 +96,7 @@ def render_free
     ellipse x1, y1, diameter, diameter
     @x0, @y0 = x1, y1
   end
-  
+
   def render_grabbed
     fill 150, 150, 255, 100
     ellipse mouse_x, mouse_y, diameter + 8, diameter + 8
@@ -99,8 +105,8 @@ def render_grabbed
     ellipse mouse_x, mouse_y, diameter, diameter
     @x0, @y0 = mouse_x, mouse_y
   end
-  
+
   def angle_of(x1, y1, x2, y2)
     Math::PI - atan2(y1 - y2, x1 - x2)
-  end  
+  end
 end

samples/contributed/mandelbrot.rb

@@ -1,6 +1,6 @@
 # Mandelbrot Set example
 # by Jordan Scales (http://jordanscales.com)
-# Modified to use map1d (instead of map), and somewhat 
+# Modified to use map1d (instead of map), and somewhat
 # optimized (update_pixels instead of set, and hypot for abs)
 # default size 900x600
 # no need to loop
@@ -15,7 +15,7 @@ def setup
 def draw
   (0...900).each do |x|
     (0...600).each do |y|
-      c = Complex.new(map1d(x, (0...900), (-3..1.5)), map1d(y, (0...600), (-1.5..1.5)))  
+      c = Complex.new(map1d(x, (0...900), (-3..1.5)), map1d(y, (0...600), (-1.5..1.5)))
       # mandel will return 0 to 20 (20 is strong)
       #   map this to 0, 255 (and flip it)
       pixels[x + y * 900] = color(255 - map1d(mandel(c, 20), (0..20), (0..255)).to_i)
@@ -29,7 +29,7 @@ def draw
 def mandel(z, max = 10)
   score = 0
   c = z.clone
-  while score < max do
+  while score < max
     # z = z^2 + c
     z.square
     z.add c
@@ -40,12 +40,11 @@ def mandel(z, max = 10)
 end
 
 # rolled my own Complex class
-#   stripped of all functionality, except for what I needed (abs, square, add, to_s)
-#   
-#   Using this class, runs in ~12.5s on my MacBook Air
-#     compared to ~22s using ruby's Complex struct
+# including only the functionality I need (abs, square, add, to_s)
+#
+# Using this class, runs in ~12.5s on my MacBook Air
+# compared to ~22s using ruby's Complex struct
 class Complex
-
   attr_accessor :real, :imag
 
   def initialize(real, imag)
@@ -73,6 +72,6 @@ def abs
   end
 
   def to_s
-    format("(%d+%di)", real, imag)
+    format('(%d+%di)', real, imag)
   end
 end

samples/contributed/polyhedrons.rb

@@ -1,7 +1,6 @@
 ###
 # Polyhedrons after sketch by Chinchbug on openprocessing.org
 ###
-
 Vert = Struct.new(:x, :y, :z) do
   def dist_sq(v)
     (x - v.x) * (x - v.x) + (y - v.y) * (y - v.y) + (z - v.z) * (z - v.z)
@@ -16,7 +15,7 @@ def self.permutations(x, y, z)
 PHI_SQ = PHI * PHI
 PHI_CU = PHI * PHI * PHI
 ROOT2 = sqrt(2)
-TYPE = "Type Archimedian\nFaces: %d " 
+TYPE = "Type Archimedian\nFaces: "
 
 attr_reader :verts, :curr_id, :scayl, :ang, :spd, :name, :notes, :off_x, :off_y
 attr_reader :off_z, :len_edge
@@ -164,70 +163,70 @@ def create_poly(id)
     @scayl = 46
   when 6
     @name = 'Cuboctahedron:'
-    @notes = "#{TYPE}triangles, 6 squares\nVertices 12\nEdges 24" % 8
+    @notes = format("%s %d triangles, 6 squares\nVertices 12\nEdges 24", TYPE, 8)
     permutations(1, 0, 1)
     @len_edge = ROOT2
     @scayl = 170
   when 7
     @name = 'Truncated Cube:'
-    @notes = "#{TYPE}triangles, 6 octogons\nVertices 24\nEdges 36" % 8
+    @notes = format("%s %d triangles, 6 octogons\nVertices 24\nEdges 36", TYPE, 8)
     permutations(ROOT2 - 1, 1, 1)
     @len_edge = 2 * (ROOT2 - 1)
     @scayl = 155
   when 8
     @name = 'Truncated Octahedron:'
-    @notes = "#{TYPE}squares, 8 hexagons\nVertices 24\nEdges 36" % 6
+    @notes = format("%s %d squares, 8 hexagons\nVertices 24\nEdges 36", TYPE, 6)
     permutations(0, 1, 2)
     permutations(2, 1, 0)
     @len_edge = ROOT2
     @scayl = 100
   when 9
     @name = 'Rhombicuboctahedron:'
-    @notes = "#{TYPE}triangles, 18 squares\nVertices 24\nEdges 48" % 8
+    @notes = format("%s %d triangles, 18 squares\nVertices 24\nEdges 48", TYPE, 8)
     permutations(ROOT2 + 1, 1, 1)
     @len_edge = 2
     @scayl = 80
   when 10
     @name = 'Truncated Cuboctahedron:'
-    @notes = "#{TYPE}squares, 8 hexagons, 6 octogons\nVertices 48\nEdges 72" % 12
+    @notes = format("%s %d squares, 8 hexagons, 6 octogons\nVertices 48\nEdges 72", TYPE, 12)
     permutations(ROOT2 + 1, 2 * ROOT2 + 1, 1)
     permutations(ROOT2 + 1, 1, 2 * ROOT2 + 1)
     @len_edge = 2
     @scayl = 50
   when 11
     @name = 'Icosidodecahedron:'
-    @notes = "#{TYPE}triangles, 12 pentagons\nVertices 30\nEdges 60" % 20
+    @notes = format("%s %d triangles, 12 pentagons\nVertices 30\nEdges 60", TYPE, 20)
     permutations(0, 0, 2 * PHI)
     permutations(1, PHI, PHI_SQ)
     @len_edge = 2
     @scayl = 70
   when 12
     @name = 'Truncated Dodecahedron:'
-    @notes = "#{TYPE}triangles, 12 decagons\nVertices 60\nEdges 90" % 20
+    @notes = format("%s %d triangles, 12 decagons\nVertices 60\nEdges 90", TYPE, 20)
     permutations(0, 1 / PHI, PHI + 2)
     permutations(1 / PHI, PHI, 2 * PHI)
     permutations(PHI, 2, PHI_SQ)
     @len_edge = 2 * (PHI - 1)
     @scayl = 60
   when 13
     @name = 'Truncated Icosahedron:'
-    @notes = "#{TYPE}pentagons, 20 hexagons\nVertices 60\nEdges 90" % 12
+    @notes = format("%s %d pentagons, 20 hexagons\nVertices 60\nEdges 90", TYPE, 12)
     permutations(0, 1, 3 * PHI)
     permutations(2, 2 * PHI + 1, PHI)
     permutations(1, PHI + 2, 2 * PHI)
     @len_edge = 2
     @scayl = 45
   when 14
     @name = 'Small Rhombicosidodecahedron:'
-    @notes = "#{TYPE}triangles, 30 squares, 12 pentagons\nVertices 60\nEdges 120" %20
+    @notes = format("%s %d triangles, 30 squares, 12 pentagons\nVertices 60\nEdges 120", TYPE, 20)
     permutations(1, 1, PHI_CU)
     permutations(PHI_SQ, PHI, 2 * PHI)
     permutations(PHI + 2, 0, PHI_SQ)
     @len_edge = 2
     @scayl = 50
   when 15
     @name = 'Great Rhombicosidodecahedron:'
-    @notes = "#{TYPE}squares, 20 hexagons, 12 decagons\nVertices 120\nEdges 180" %30
+    @notes = format("%s %d squares, 20 hexagons, 12 decagons\nVertices 120\nEdges 180", TYPE, 30)
     permutations(1 / PHI, 1 / PHI, PHI + 3)
     permutations(2 / PHI, PHI, 2 * PHI + 1)
     permutations(1 / PHI, PHI_SQ, 3 * PHI - 1)