mainly replace constrain with 'clip to range method'

Author: monkstone

samples/processing_app/basics/image/sprite.rb

@@ -1,32 +1,29 @@
-
 # Sprite (Teddy)
-# by James Patterson. 
-# 
-# Demonstrates loading and displaying a transparent GIF image. 
-
+# by James Patterson.
+#
+# Demonstrates loading and displaying a transparent GIF image.
+# Also ruby-processings clip to range method (cf processing constrain)
+attr_reader :drag, :teddy, :xpos, :ypos
 
 def setup
   size 200, 200
-  @teddy = load_image "teddy.gif"
-  @xpos, @ypos = width/2, height/2
-  @drag = 30.0    
+  @teddy = load_image 'teddy.gif'
+  @xpos, @ypos = width / 2, height / 2
+  @drag = 30.0
   frame_rate 60
 end
 
 def draw
-  background 102    
-  difx = mouse_x - @xpos - @teddy.width/2
+  background 102
+  difx = mouse_x - xpos - teddy.width / 2
   if difx.abs > 1.0
-    @xpos += difx/@drag
-    @xpos = constrain( @xpos, 0, width-@teddy.width/2 )
+    @xpos += difx / drag
+    @xpos = (0..width - teddy.width / 2).clip(xpos)
   end
-  
-  dify = mouse_y - @ypos - @teddy.height/2
+  dify = mouse_y - ypos - teddy.height / 2
   if dify.abs > 1.0
-    @ypos += dify/@drag
-    @ypos = constrain( @ypos, 0, height-@teddy.height/2 )
+    @ypos += dify / drag
+    @ypos = (0..height - teddy.height / 2).clip(ypos)
   end
-  
-  image @teddy, @xpos, @ypos
+  image teddy, xpos, ypos
 end
-

samples/processing_app/basics/image/zoom.rb

@@ -1,59 +1,59 @@
-# Zoom. 
-# 
+# Zoom.
+#
 # Move the cursor over the image to alter its position. Click and press
 # 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. 
+# This program displays a series of lines with their heights corresponding to
+# a color value read from an image.
+# Uses ruby-processings clip to range method (cf processing constrain)
+attr_reader :sval, :img, :img_pixels, :nmx, :nmy, :res
 
-def setup    
-    size 640, 360, P3D    
-    no_fill
-    stroke 255    
-    @nmx = 0.0
-    @nmy = 0.0
-    @sval = 1.0
-    @res = 5    
-    @img = load_image "ystone08.jpg"
-    @img_pixels = []
-    (0...@img.height).each do |y|
-      @img_pixels << []
-      (0...@img.width).each do |x|
-        @img_pixels.last << @img.get(y, x)
-      end
-    end    
+def setup
+  size 640, 360, P3D
+  no_fill
+  stroke 255
+  @nmx = 0.0
+  @nmy = 0.0
+  @sval = 1.0
+  @res = 5
+  @img = load_image 'ystone08.jpg'
+  @img_pixels = []
+  (0...img.height).each do |y|
+    img_pixels << []
+    (0...@img.width).each do |x|
+      img_pixels.last << img.get(y, x)
+    end
+  end
 end
 
-def draw    
-    background 0    
-    @nmx += (mouse_x - @nmx) / 20
-    @nmy += (mouse_y - @nmy) / 20   
-    if mouse_pressed?
-      @sval += 0.005
-    else
-      @sval -= 0.01
-    end   
-    @sval = constrain @sval, 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
+def draw
+  background 0
+  @nmx += (mouse_x - nmx) / 20
+  @nmy += (mouse_y - nmy) / 20
+  if mouse_pressed?
+    @sval += 0.005
+  else
+    @sval -= 0.01
+  end
+  @sval = (1.0..2.5).clip sval
+  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
-    
+  end
 end
 
-def key_pressed    
-    k = key.to_i    
-    @res = k if k > 0 && k < 6    
+def key_pressed
+  k = key.to_i
+  @res = k if (1..6).include? k
 end
-

samples/processing_app/basics/input/constrain.rb

@@ -1,7 +1,9 @@
-
-# Move the mouse across the screen to move the circle. 
-# The program constrains the circle to its box. 
-
+# Move the mouse across the screen to move the circle.
+# The program constrains the circle to its box.
+# You can still use processing constrain if you wish, but
+# since it is implemented using ruby-processing 'clip to range'
+# method we prefer that here...
+attr_reader :inner, :easing, :edge, :ellipse_size, :mx, :my
 
 def setup
   size 640, 360
@@ -12,22 +14,17 @@ def setup
   @easing = 0.05
   @ellipse_size = 24.0
   @edge = 100
-  @inner = @edge + @ellipse_size
+  @inner = edge + ellipse_size
 end
 
 def draw
   background 51
-  
-  @mx += (mouse_x - @mx) * @easing if (mouse_x - @mx).abs > 0.1
-  @my += (mouse_y - @my) * @easing if (mouse_y - @my).abs > 0.1
-  
-  distance = @ellipse_size * 2
-  @mx = constrain @mx, @inner, (width  - @inner)
-  @my = constrain @my, @inner, (height - @inner)
-  
+  @mx += (mouse_x - mx) * easing if (mouse_x - mx).abs > 0.1
+  @my += (mouse_y - my) * easing if (mouse_y - my).abs > 0.1
+  @mx = (inner..(width - inner)).clip mx
+  @my = (inner..(height - inner)).clip my
   fill 76
-  rect @edge, @edge, width - @edge, height - @edge 
-  
+  rect edge, edge, width - edge, height - edge
   fill 255
-  ellipse @mx, @my, @ellipse_size, @ellipse_size 
+  ellipse mx, my, ellipse_size, ellipse_size
 end

samples/processing_app/topics/advanced_data/counting_words.rb

@@ -47,31 +47,25 @@ def draw
     # the Hash using the word String as the key
     concordance[s] = Word.new(s)
   end
-
   # x and y will be used to locate each word
   x = 0
   y = height - 10
-
   # Look at each word
   concordance.values.each do |w|
     # 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 = (0..100).clip w.count
       text_size(fsize)
       text(w.word, x, y)
       # Move along the x-axis
       x += text_width(w.word) + 1
     end
     # If x gets to the end, move y
     # If y == 0 we are done
-    if y == 0
-      no_loop
-    else
-      if x > width
-        x = 0
-        y = (y < 0) ? 0 : y - 100
-      end
-    end
+    no_loop if y == 0
+    next unless x >= width
+    x = 0
+    y = (y < 0) ? 0 : y - 100
   end
 end

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

@@ -39,7 +39,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 = (0..10.0).clip speed
     @position[Y] += speed
     @position[Y] = -height if position[Y] > height * 2
   end
@@ -53,7 +53,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 = (2..48).clip fs
     text_size(fs)
     text_align(CENTER)
     text(word, position[X], position[Y])

samples/processing_app/topics/cellular_automata/game_of_life.rb

@@ -55,9 +55,9 @@ def draw
   if pause && mouse_pressed?
     # # Map and avoid out of bound errors
     over_x = (map1d(mouse_x, (0..width), (0..row))).to_i
-    over_x = constrain(over_x, 0, row - 1)
+    over_x = (0..row - 1).clip over_x
     over_y = (map1d(mouse_y, (0..height), (0..column))).to_i
-    over_y = constrain(over_y, 0, column - 1)
+    over_y = (0..column - 1).clip over_y
     # Check against cells in buffer
     if cells_buffer[over_x][over_y]  # Cell is alive
       cells[over_x][over_y] = DEAD # Kill