mod

Author: monkstone

samples/processing_app/basics/input/constrain.rb

@@ -1,8 +1,7 @@
 # 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...
+# Uses processing constrain implemented as a jruby extension
+
 attr_reader :inner, :easing, :edge, :ellipse_size, :mx, :my
 
 def setup
@@ -21,8 +20,8 @@ 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
-  @mx = (inner..(width - inner)).clip mx
-  @my = (inner..(height - inner)).clip my
+  @mx = constrain(mx, inner, width - inner) 
+  @my = constrain(my, inner, height - inner)
   fill 76
   rect edge, edge, width - edge, height - edge
   fill 255

samples/processing_app/basics/input/mouse_1d.rb

@@ -12,7 +12,8 @@ def setup
 def draw
   background 0
   x_dist_blocks = width / 2
-  block_size = map1d(mouse_x, (0..width), (10..x_dist_blocks - 10))
+  # block_size = map1d(mouse_x, (0..width), (10..x_dist_blocks - 10))
+  block_size = map(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)

samples/processing_app/topics/gui/scrollbar.rb

@@ -15,7 +15,7 @@
 def setup
   size(640, 360)
   @balls = []
-  (0 ... NUM_BALLS).each do |i|
+  (0...NUM_BALLS).each do |i|
     balls << Ball.new(rand(width), rand(height), rand(30..70), i, balls)
   end
   noStroke
@@ -24,17 +24,17 @@ def setup
 
 def draw
   background(0)
-  (0 ... NUM_BALLS).each do |i|
+  (0...NUM_BALLS).each do |i|
     balls[i].collide
-    balls[i].move
+    balls[i].move(width, height)
     balls[i].display
   end
 end
 
 class Ball
   attr_accessor :vx, :vy
-  attr_reader :x, :y, :diameter, :others, :id, :width, :height
-
+  attr_reader :x, :y, :diameter, :others, :id
+  
   def initialize(xin, yin, din, idin, oin)
     @x = xin
     @y = yin
@@ -43,54 +43,50 @@ def initialize(xin, yin, din, idin, oin)
     @vx = 0
     @vy = 0
     @others = oin
-    @width = $app.width
-    @height = $app.height
   end
-
+  
   def collide
-    ((id + 1) ... NUM_BALLS).each do |i|
+    ((id + 1)...NUM_BALLS).each do |i|
       dx = others[i].x - x
       dy = others[i].y - y
-      sq_dist = dx*dx + dy*dy
-      min_dist = (others[i].diameter/2 + diameter/2)
-      sq_min_dist = min_dist * min_dist
-      if (sq_dist < sq_min_dist)
-        angle = atan2(dy, dx)
-        target_x = x + cos(angle) * min_dist
-        target_y = y + sin(angle) * min_dist
-        ax = (target_x- others[i].x) * SPRING
-        ay = (target_y - others[i].y) * SPRING
-        @vx -= ax
-        @vy -= ay
-        others[i].vx += ax
-        others[i].vy += ay
-      end
-
+      distance = dist(others[i].x, others[i].y, x, y)
+      min_dist = (others[i].diameter / 2 + diameter / 2)
+      next unless distance < min_dist
+      angle = atan2(dy, dx)
+      target_x = x + cos(angle) * min_dist
+      target_y = y + sin(angle) * min_dist
+      ax = (target_x- others[i].x) * SPRING
+      ay = (target_y - others[i].y) * SPRING
+      @vx -= ax
+      @vy -= ay
+      others[i].vx += ax
+      others[i].vy += ay
     end
-
-    def move
-      @vy += GRAVITY
-      @x += vx
-      @y += vy
-      if (x + diameter/2 > width)
-        @x = width - diameter/2
-        @vx *= FRICTION
-      elsif (x - diameter/2 < 0)
-        @x = diameter/2
-        @vx *= FRICTION
-      end
-
-      if (y + diameter/2 > height)
-        @y = height - diameter/2
-        @vy *= FRICTION
-      elsif (y - diameter/2 < 0)
-        @y = diameter/2
-        @vy *= FRICTION
-      end
+  end
+  
+  def move(width, height)
+    @vy += GRAVITY
+    @x += vx
+    @y += vy
+    if x + diameter / 2 > width
+      @x = width - diameter / 2
+      @vx *= FRICTION
+    elsif x - diameter / 2 < 0
+      @x = diameter / 2
+      @vx *= FRICTION
     end
 
-    def display
-      ellipse(x, y, diameter, diameter)
+    if y + diameter / 2 > height
+      @y = height - diameter / 2
+      @vy *= FRICTION
+    elsif y - diameter / 2 < 0
+      @y = diameter / 2
+      @vy *= FRICTION
     end
   end
+  
+  def display
+    ellipse(x, y, diameter, diameter)
+  end
 end
+