Mainly convert map to map1d

Author: monkstone

samples/contributed/quadraticvertex.rb

@@ -36,7 +36,7 @@ def draw
   @step_angle = TAU / (detail.to_i - 1)
   fill color('#ffffff')
   no_stroke
-  @cr = map(mouse_x, 0, width, 20, 200)
+  @cr = map1d(mouse_x, (0..width) , (20..200))
   begin_shape
   detail.to_i.times do |i|
     if (i == 0)

samples/external_library/java_processing/guido/slider.rb

@@ -1,4 +1,4 @@
-load_library :guido
+load_library :Guido # warning should be lowercase lib author may correct this
 import 'de.bezier.guido'
 
 def setup
@@ -41,7 +41,7 @@ def mouseDragged(mx, my, dx, dy)
     @value_x = mx - @height / 2    
     @value_x = @x if (@value_x < @x) 
     @value_x = @x + @width - @height if (@value_x > @x + @width - @height)    
-    @value = map(@value_x, @x, @x + @width - @height, 0, 1)
+    @value = map1d(@value_x, (@x..@x + @width - @height), (0..1))
   end
 
   def draw

samples/processing_app/basics/arrays/array.rb

@@ -10,7 +10,7 @@ def setup
   size 640, 360
   coswave = []
   0.upto(width) do |i|
-    amount = map i, 0, width, 0, PI
+    amount = map1d(i, (0..width), (0..PI))
     coswave[i] = cos(amount).abs
   end
   0.upto(width) do |i|

samples/processing_app/basics/color/linear_gradient.rb

@@ -1,42 +1,40 @@
-# Simple Linear Gradient 
-# 
+# Simple Linear Gradient
+#
 # The lerp_color function is useful for interpolating
 # between two colors.
 #
- 
+
 Y_AXIS = 1
 X_AXIS = 2
 
 def setup
-  size 640, 360  
+  size 640, 360
   # Define colors
   b1 = color(255)
   b2 = color(0)
   c1 = color(204, 102, 0)
   c2 = color(0, 102, 153)
-
   # Background
-  set_gradient(0, 0, width/2, height, b1, b2, X_AXIS)
-  set_gradient(width/2, 0, width/2, height, b2, b1, X_AXIS)
+  set_gradient(0, 0, width / 2, height, b1, b2, X_AXIS)
+  set_gradient(width / 2, 0, width / 2, height, b2, b1, X_AXIS)
   # Foreground
   set_gradient(50, 90, 540, 80, c1, c2, Y_AXIS)
   set_gradient(50, 190, 540, 80, c2, c1, X_AXIS)
 end
 
-def set_gradient(x, y, w, h, c1, c2, axis )
+def set_gradient(x, y, w, h, c1, c2, axis)
   no_fill
   if (axis == Y_AXIS) # Top to bottom gradient
-    (y ... y + h).each do |i|
-      inter = map(i, y, y + h, 0, 1)      
+    (y...y + h).each do |i|
+      inter = map1d(i, (y..y + h), (0..1.0))
       stroke lerp_color(c1, c2, inter)
       line(x, i, x + w, i)
     end
   elsif (axis == X_AXIS) # Left to right gradient
-    (x ... x + w).each do |i|
-      inter = map(i, x, x + w, 0, 1)
+    (x...x + w).each do |i|
+      inter = map1d(i, (x..x + w), (0..1))
       stroke lerp_color(c1, c2, inter)
       line(i, y, i, y + h)
     end
   end
 end
-

samples/processing_app/basics/form/triangle_strip.rb

@@ -10,28 +10,26 @@
 attr_reader :x, :y, :outer_radius, :inner_radius
 
 def setup
-  size 640, 360  
-  @x = width/2
-  @y = height/2
+  size 640, 360
+  @x = width / 2
+  @y = height / 2
   @outer_radius = [width, height].min * 0.4
   @inner_radius = outer_radius * 0.6
 end
 
 def draw
   background 204
-  pts = map(mouse_x, 0, width, 6, 60).to_i
-  angle = 0.0      # degrees
-  step = 180.0/pts # degrees
-  
+  pts = map1d(mouse_x, (0..width), (6..60)).to_i
+  angle = 0.0        # degrees
+  step = 180.0 / pts # degrees
   begin_shape TRIANGLE_STRIP
-  (0..pts).each do 
-    px = x + cos(angle.radians)*outer_radius
-    py = y + sin(angle.radians)*outer_radius
+  (0..pts).each do
+    px = x + cos(angle.radians) * outer_radius
+    py = y + sin(angle.radians) * outer_radius
     angle += step
     vertex px, py
-    
-    px = x + cos(angle.radians)*inner_radius
-    py = y + sin(angle.radians)*inner_radius
+    px = x + cos(angle.radians) * inner_radius
+    py = y + sin(angle.radians) * inner_radius
     angle += step
     vertex px, py
   end

samples/processing_app/basics/image/pointillism.rb

@@ -1,22 +1,20 @@
-
 # Pointillism
-# by Daniel Shiffman. 
-# 
-# Mouse horizontal location controls size of dots. 
+# by Daniel Shiffman.
+#
+# Mouse horizontal location controls size of dots.
 # Creates a simple pointillist effect using ellipses colored
-# according to pixels in an image. 
-
+# according to pixels in an image.
 
 def setup
   size 400, 400
-  @a = load_image "eames.jpg"  
+  @a = load_image 'eames.jpg'
   no_stroke
   background 255
   smooth
 end
 
 def draw
-  pointillize = map(mouse_x, 0, width, 2, 18)
+  pointillize = map1d(mouse_x, (0..width), (2..18))
   x, y = rand(@a.width), rand(@a.height)
   pixel = @a.get(x, y)
   fill pixel, 126

samples/processing_app/basics/image/transparency.rb

@@ -1,21 +1,18 @@
 #  Move the pointer left and right across the image to change
-#  its position. This program overlays one image over another 
-#  by modifying the alpha value of the image with the tint() function. 
-
-
+#  its position. This program overlays one image over another
+#  by modifying the alpha value of the image with the tint() function.
 
 def setup
   size 200, 200
-  @a = load_image "construct.jpg"
-  @b = load_image "wash.jpg"
-  @offset = 0.0  
+  @a = load_image 'construct.jpg'
+  @b = load_image 'wash.jpg'
+  @offset = 0.0
 end
 
 def draw
   image @a, 0, 0
-  offset_target = map(mouse_x, 0, width, -@b.width/2 - width/2, 0)
+  offset_target = map1d(mouse_x, (0..width), (-@b.width / 2 - width / 2..0))
   @offset += (offset_target - @offset) * 0.05
   tint 255, 153
   image @b, @offset, 20
 end
-

samples/processing_app/basics/input/keyboard.rb

@@ -1,24 +1,21 @@
-# Click into the window to give it focus and press the letter keys 
-# to create forms in time and space. Each key has a unique identifying 
-# number called it's ASCII value. These numbers can be used to position 
-# shapes in space. 
-
+# Click into the window to give it focus and press the letter keys
+# to create forms in time and space. Each key has a unique identifying
+# number called it's ASCII value. These numbers can be used to position
+# shapes in space.
 
 def setup
   size 640, 360
   @num_chars = 26
-  @key_scale = 200.0 / @num_chars-1.0
-  @rect_width = width/4    
+  @key_scale = 200.0 / @num_chars - 1.0
+  @rect_width = width / 4
   no_stroke
   background 0
 end
 
 def draw
-  if key_pressed? && ('A'..'z').include?(key)
-    @key_index = key.ord - (key <= 'Z' ? 'A'.ord : 'a'.ord)
-    fill millis % 255
-    begin_rect = map(@key_index, 0, 25, 0, width - @rect_width)
-    rect begin_rect, 0, @rect_width, height
-  end
+  return unless key_pressed? && ('A'..'z').include?(key)
+  @key_index = key.ord - (key <= 'Z' ? 'A'.ord : 'a'.ord)
+  fill millis % 255
+  begin_rect = map1d(@key_index, (0..25), (0..width - @rect_width))
+  rect begin_rect, 0, @rect_width, height
 end
-	

samples/processing_app/basics/input/mouse_1d.rb

@@ -1,6 +1,6 @@
-# Move the mouse left and right to shift the balance. 
-# The "mouseX" variable is used to control both the 
-# size and color of the rectangles. 
+# Move the mouse left and right to shift the balance.
+# The "mouseX" variable is used to control both the
+# size and color of the rectangles.
 
 def setup
   size 640, 360
@@ -11,17 +11,13 @@ def setup
 
 def draw
   background 0
-  
-  x_dist_blocks = width/2
-  block_size = map(mouse_x, 0, width, 10, x_dist_blocks - 10)
-  
+  x_dist_blocks = width / 2
+  block_size = map1d(mouse_x, (0..width), (10..x_dist_blocks - 10))
   left_color = -0.002 * mouse_x / 2 + 0.06
   fill 0.0, left_color + 0.4, left_color + 0.6
-  rect(width/4, height / 2, block_size * 2, block_size * 2)
-  
+  rect(width / 4, height / 2, block_size * 2, block_size * 2)
   block_size = x_dist_blocks - block_size
-  
-  right_color = 0.002 * mouse_x/2 + 0.06
+  right_color = 0.002 * mouse_x / 2 + 0.06
   fill(0.0, right_color + 0.2, right_color + 0.4)
   rect((width / 4) * 3, height / 2, block_size * 2, block_size * 2)
 end

samples/processing_app/basics/lights/lights2.rb

@@ -1,38 +1,27 @@
-# Lights 2 
-# by Simon Greenwold. 
-# 
-# Display a box with three different kinds of lights. 
-
-
+# Lights 2
+# by Simon Greenwold.
+#
+# Display a box with three different kinds of lights.
 
 def setup
-  
   size 640, 360, P3D
-  
   no_stroke
-  
 end
 
 def draw
-  
   background 0
-  
-  translate width/2, height/2
-  
-  point_light 150,  100, 0, #color
-  200, -150, 0  #position
-  
-  directional_light 0, 102, 255, #color
-  1,   0,   0  #x-,y-,z-axis direction
-  
-  spot_light 255, 255, 109, #color
-  0,  40, 200, #position
-  0,-0.5,-0.5, #direction
-  PI/2, 2      #angle, concentration
-  
-  rotate_y map( mouse_x, 0, width, 0, PI )
-  rotate_x map( mouse_y, 0, height, 0, PI )
-  
+  translate width / 2, height / 2
+  point_light 150,  100, 0,      # color
+              200, -150, 0       # position
+  directional_light 0, 102, 255, # color
+                    1,   0,   0  # x-,y-,z-axis direction
+
+  spot_light 255, 255, 109, # color
+             0,  40, 200,   # position
+             0, -0.5, -0.5, # direction
+             PI / 2,        # angle
+             2              # concentration
+  rotate_y map1d(mouse_x, (0..width), (0..PI))
+  rotate_x map1d(mouse_y, (0..height), (0..PI))
   box 150
-  
 end