From 9261438f86b1faf22a0f8d9a366fb0daa3dd090d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 24 Jul 2014 14:45:22 -0400
Subject: iterative culling algorithm

---
 public/assets/javascripts/rectangles/models/rect.js |  3 +++
 public/assets/javascripts/rectangles/models/vec2.js | 13 +++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'public/assets/javascripts/rectangles/models')

diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 3341239..590440a 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -94,6 +94,9 @@
 	Rect.prototype.containsDisc = function(x,y,r){
 		return this.x.containsDisc(x,r) && this.y.containsDisc(y,r)
 	}
+	Rect.prototype.overlaps = function(rect){
+		return this.x.overlaps(rect.x) && this.y.overlaps(rect.y)
+	}
 	Rect.prototype.intersects = function(r){
 		var corner_intersect = (this.x.b === r.x.a && this.y.b === r.y.a)
 		return this.x.intersects(r.x) && this.y.intersects(r.y) && ! corner_intersect
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index b0c88c1..ee02088 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -93,6 +93,19 @@
 			return (this.a < v.b && v.b <= this.b) || (v.a < this.b && this.b <= v.b)
 		}
 	}
+	vec2.prototype.overlaps = function(v){
+		if (this.a == v.a || this.b == v.b) {
+			return true
+		}
+		if (this.a < v.a) {
+			return (v.a < this.b && this.b < v.b) || (this.a < v.b && v.b < this.b)
+		}
+		else if (v.a < this.a) {
+			return (this.a < v.b && v.b < this.b) || (v.a < this.b && this.b < v.b)
+		}
+	}
+
+
 	vec2.prototype.adjacent = function(v){
 		if (this.a == v.a || this.b == v.b || this.a == v.b || this.b == v.a) {
 			return true
-- 
cgit v1.2.3-70-g09d2