replace processing constrain with clamp

Author: monkstone

advanced_data/counting_words.rb

@@ -56,7 +56,7 @@ def draw
       # Only display words that appear 3 times
       if w.count > 3 # access word count
         # The size is the count
-        fsize = constrain(w.count, 0, 100)
+        fsize = w.count.clamp(4, 100)
         text_size(fsize)
         text(w.word, x, y)
         # Move along the x-axis

advanced_data/library/word/word.rb

@@ -40,7 +40,7 @@ def increment_franken
   # The more often it appears, the faster it falls
   def move
     @speed = map1d(total_count, (5..25), (0.1..0.4))
-    @speed = constrain(speed, 0, 10.0)
+    @speed = speed.clamp(0, 10.0)
     @position[Y] += speed
     @position[Y] = -height if position[Y] > height * 2
   end
@@ -54,7 +54,7 @@ def display
     end
     # Its size is also tied to number of occurences
     fs = map1d(total_count, (5..25), (2..24.0))
-    fs = constrain(fs, 2, 48)
+    fs = fs.clamp(2, 48)
     text_size(fs)
     text_align(CENTER)
     text(word, position[X], position[Y])

basics/image/colored_extrusion.rb

@@ -5,7 +5,7 @@
 # the mouse to zoom and set the density of the matrix by typing numbers 1-5.
 # This program displays a series of lines with their heights corresponding to
 # a color value read from an image.
-ColoredExtrusion < Processing::App
+class ColoredExtrusion < Processing::App
   def setup
     sketch_title 'Colored Extrusion'
     no_fill
@@ -33,22 +33,20 @@ def draw
     else
       @sval -= 0.01
     end
-    @sval = constrain @sval, 1.0, 2.5
+    @sval = @sval.clamp(1.0, 2.5)
     translate width / 2 + @nmx * @sval - 100, height / 2 + @nmy * @sval - 200, -50
     scale @sval
     rotate_z PI / 9 - @sval + 1
     rotate_x PI / @sval / 8 - 0.125
     rotate_y @sval / 8 - 0.125
     translate -width / 2, -height / 2
-    (0...@img.height).step(@res) do |y|
-      (0...@img.width).step(@res) do |x|
-        rr = red @img_pixels[y][x]
-        gg = green @img_pixels[y][x]
-        bb = blue @img_pixels[y][x]
-        tt = rr + gg + bb
-        stroke rr, gg, gg
-        line y, x, tt / 10 - 20, y, x, tt / 10
-      end
+    grid(@img.width, @img.height, @res, @res) do |x, y|
+      rr = red @img_pixels[y][x]
+      gg = green @img_pixels[y][x]
+      bb = blue @img_pixels[y][x]
+      tt = rr + gg + bb
+      stroke rr, gg, gg
+      line y, x, tt / 10 - 20, y, x, tt / 10
     end
   end
 

basics/image/sprite.rb

@@ -17,12 +17,12 @@ def draw
     difx = mouse_x - @xpos - @teddy.width / 2
     if difx.abs > 1.0
       @xpos += difx / @drag
-      @xpos = constrain(@xpos, 0, width - @teddy.width / 2)
+      @xpos = @xpos.clamp(0, width - @teddy.width / 2)
     end
     dify = mouse_y - @ypos - @teddy.height / 2
     if dify.abs > 1.0
       @ypos += dify/@drag
-      @ypos = constrain(@ypos, 0, height - @teddy.height / 2)
+      @ypos = @ypos.clamp(0, height - @teddy.height / 2)
     end
     image @teddy, @xpos, @ypos
   end

basics/modules/library/euler_ball/euler_ball.rb

@@ -38,9 +38,8 @@ def bounds_collision
   end
 end
 
-# Convenient boundary class, we only include MathTool module for constrain
+# Convenient boundary class
 class Bounds
-  include MathTool
   attr_reader :low, :high, :inside
   def initialize(lower:, upper:)
     @low = lower
@@ -51,6 +50,6 @@ def initialize(lower:, upper:)
   # Returns the current position or the limit, sets the `inside` flag
   def position(val)
     @inside = (low..high).cover? val
-    constrain(val, low, high)
+    val.clamp(low, high)
   end
 end

basics/objects/polymorphism.rb

@@ -1,8 +1,5 @@
 require 'picrate'
-require_relative 'shapes/square'
-require_relative 'shapes/circle.rb'
 
-class Polymorphism < Processing::App
 # Learning Processing
 # Daniel Shiffman
 # http://www.learningprocessing.com
@@ -13,30 +10,31 @@ class Polymorphism < Processing::App
 # this is a PiCrate port. Introducing the hook method, keyword args and the
 # post_initialization hook for flexible inheritance. Important we only
 # really need to know 'run' method. Note initialization of color can be
-# specified for Circle,defaults to color(rand(255), 100) see shapes/circle.rb.
-
-attr_reader :shps
-
-def setup
-sketch_title 'Polymorphism'
-@shps = []
-30.times do
-if rand < 0.5
-shps << Circle.new(x: 320, y: 180, r: 32, c: color(rand(255), 100))
-else
-shps << Square.new(x: 320, y: 180, r: 32)
-end
-end
-end
-
-def draw
-background(255)
-shps.each(&:run)
-end
-
-def settings
-size(480, 270)
-end
+# specified for Circle,defaults to color(rand(255), 100) see shapes library.
+class Polymorphism < Processing::App
+  load_library :shapes  
+  attr_reader :shps
+
+  def setup
+    sketch_title 'Polymorphism'
+    @shps = []
+    30.times do
+      if rand < 0.5
+        shps << Circle.new(x: 320, y: 180, r: 32, c: color(rand(255), 100))
+      else
+        shps << Square.new(x: 320, y: 180, r: 32)
+      end
+    end
+  end
+
+  def draw
+    background(255)
+    shps.each(&:run)
+  end
+
+  def settings
+    size(480, 270)
+  end
 end
 
 Polymorphism.new

basics/objects/polymorphism2.rb

@@ -1,8 +1,5 @@
 require 'picrate'
-require_relative 'shapes/square'
-require_relative 'shapes/circle2.rb'
 
-class Polymorphism2 < Processing::App
 # Learning Processing
 # Daniel Shiffman
 # http://www.learningprocessing.com
@@ -13,30 +10,32 @@ class Polymorphism2 < Processing::App
 # this is a PiCrate port. Introducing the hook method,
 # keyword args and the post_initialization hook for flexible inheritance.
 # Important change we only really need to know run method initialization of
-# color is also really irrelevant save showing how to use hook.
-
-attr_reader :shps
-
-def setup
-sketch_title 'Polymorphism'
-@shps = []
-30.times do
-if rand < 0.5
-shps << Circle.new(x: 320, y: 180, r: 32)
-else
-shps << Square.new(x: 320, y: 180, r: 32)
-end
-end
-end
-
-def draw
-background(255)
-shps.each(&:run)
-end
-
-def settings
-size(480, 270)
-end
+# color is also really irrelevant save showing how to use hook
+class Polymorphism2 < Processing::App
+  load_library :shapes
+
+  attr_reader :shps
+
+  def setup
+    sketch_title 'Polymorphism'
+    @shps = []
+    30.times do
+      if rand < 0.5
+        shps << Circle2.new(x: 320, y: 180, r: 32)
+      else
+        shps << Square.new(x: 320, y: 180, r: 32)
+      end
+    end
+  end
+
+  def draw
+    background(255)
+    shps.each(&:run)
+  end
+
+  def settings
+    size(480, 270)
+  end
 end
 
 Polymorphism2.new