simplify rect

Author: monkstone

contributed/lenny_explorer.rb

@@ -23,7 +23,13 @@ def setup
 def draw
   background(255)
   50.times { path.grow }
-  path.render(g, renderer)
+  draw_path(path.points)
+end
+
+def draw_path(points)
+  begin_shape
+  points.map { |vec| vec.to_curve_vertex(renderer) }
+  end_shape
 end
 
 def mouse_pressed

contributed/library/lenny/lib/path.rb

@@ -1,15 +1,15 @@
-# Stores and manipulates the path
+# Stores and manipulates the points
 class Path
-  attr_reader :path, :last, :bounds, :cut, :theta, :delta, :speed, :searches
+  attr_reader :points, :last, :bounds, :cut, :theta, :delta, :speed, :searches
 
   def initialize(bounds, speed, delta, history)
     @bounds = bounds
     @speed = speed
     @delta = delta
     @theta = 0
-    @path = (0..history).map { bounds.centroid.copy }
+    @points = (0..history).map { bounds.centroid.copy }
     @searches = 0
-    @last = Vec2D.new(path.first)
+    @last = Vec2D.new(points.first)
   end
 
   def grow
@@ -22,33 +22,27 @@ def grow
   end
 
   def move
-    @last = path.first
-    path.pop
+    @last = points.first
+    points.pop
     @theta += delta
-    path.unshift last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
+    points.unshift last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
     @searches = 0
   end
 
   def search
     @theta += delta
-    path[0] = last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
+    points[0] = last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
     @searches += 1
   end
 
-  def render(gfx, renderer)
-    gfx.begin_shape
-    path.map { |vec| vec.to_curve_vertex(renderer) }
-    gfx.end_shape
-  end
-
   def intersecting?
-    return true unless bounds.contains?(path.first)
+    return true unless bounds.contains?(points.first)
 
     if searches < 100
-      a = Line2D.new(path[0], path[1])
-      (3...path.length).each do |i|
-        b = Line2D.new(path[i], path[i - 1])
-        return true if a.intersecting?(b)
+      one = Line2D.new(points[0], points[1])
+      (3...points.length).each do |idx|
+        two = Line2D.new(points[idx], points[idx - 1])
+        return true if one.intersecting?(two)
       end
     end
     false

processing_app/library/vecmath/vec2d/lenny_explorer.rb

@@ -34,7 +34,13 @@ def setup
 def draw
   background(255)
   50.times { path.grow }
-  path.render(g, renderer)
+  draw_path path.points
+end
+
+def draw_path(points)
+  begin_shape
+  points.map { |vec| vec.to_curve_vertex(renderer) }
+  end_shape
 end
 
 def mouse_pressed

processing_app/library/vecmath/vec2d/library/lenny/lib/path.rb

@@ -1,15 +1,15 @@
 # Stores and manipulates the path
 class Path
-  attr_reader :path, :last, :bounds, :cut, :theta, :delta, :speed, :searches
+  attr_reader :points, :last, :bounds, :cut, :theta, :delta, :speed, :searches
 
   def initialize(bounds, speed, delta, history)
     @bounds = bounds
     @speed = speed
     @delta = delta
     @theta = 0
-    @path = (0..history).map { bounds.centroid.copy }
+    @points = (0..history).map { bounds.centroid.copy }
     @searches = 0
-    @last = Vec2D.new(path.first)
+    @last = Vec2D.new(points.first)
   end
 
   def grow
@@ -22,32 +22,26 @@ def grow
   end
 
   def move
-    @last = path.first
-    path.pop
+    @last = points.first
+    points.pop
     @theta += delta
-    path.unshift last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
+    points.unshift last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
     @searches = 0
   end
 
   def search
     @theta += delta
-    path[0] = last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
+    points[0] = last + Vec2D.new(speed * Math.cos(theta), speed * Math.sin(theta))
     @searches += 1
   end
 
-  def render(gfx, renderer)
-    gfx.begin_shape
-    path.map { |vec| vec.to_curve_vertex(renderer) }
-    gfx.end_shape
-  end
-
   def intersecting?
-    return true unless bounds.contains?(path.first)
+    return true unless bounds.contains?(points.first)
 
     if searches < 100
-      a = Line2D.new(path[0], path[1])
-      (3...path.length).each do |i|
-        b = Line2D.new(path[i], path[i - 1])
+      a = Line2D.new(points[0], points[1])
+      (3...points.length).each do |i|
+        b = Line2D.new(points[i], points[i - 1])
         return true if a.intersecting?(b)
       end
     end

processing_app/library/vecmath/vec2d/library/lenny/lib/rect.rb

@@ -1,22 +1,21 @@
 # For use with Boundary
 class Rect
-  attr_reader :vec1, :vec2
-  def initialize(vec1, vec2)
-    @vec1 = vec1
-    @vec2 = vec2
+  attr_reader :lbt, :rtp
+  def initialize(lbt, rtp)
+    @lbt = lbt
+    @rtp = rtp
   end
 
   def centroid
-    (vec1 + vec2) / 2
+    (lbt + rtp) / 2
   end
 
   def contains?(vec)
-    xminmax = [vec1.x, vec2.x].minmax
-    yminmax = [vec1.y, vec2.y].minmax
-    return false if vec.x < xminmax[0]
-    return false if vec.x > xminmax[1]
-    return false if vec.y < yminmax[0]
+    otherx = vec.x
+    othery = vec.y
+    return false if otherx < lbt.x || otherx > rtp.x
+    return false if othery < lbt.y
 
-    vec.y < yminmax[1]
+    othery < rtp.y
   end
 end