merge

4 files changed, 16 insertions, 2 deletions

diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 58469bc..3f94740 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -39,6 +39,10 @@
 	Rect.prototype.clone = function(){
 		return new Rect( this.x.clone(), this.y.clone() )
 	}
+	Rect.prototype.assign = function(r) {
+	  this.x.assign(r.x)
+	  this.y.assign(r.y)
+	}
 	Rect.prototype.center = function(){
 		return new vec2(this.x.midpoint(), this.y.midpoint())
 	}
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index c2850ba..aa18f6d 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -40,6 +40,14 @@
 		this.focused = false
 	}
 	
+	Room.prototype.copy = function(){
+	  return {
+	    id: this.id,
+	    rect: this.rect.clone(),
+	    height: this.height,
+	  }
+	}
+	
 	Room.prototype.toString = function(){
 		return this.rect.toString()
 	}
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 104c6f7..214feb9 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -17,6 +17,10 @@
 	vec2.prototype.clone = function(){
 		return new vec2(this.a, this.b)
 	}
+	vec2.prototype.assign = function(v){
+		this.a = v.a
+		this.b = v.b
+	}
 	vec2.prototype.abs = function(){
 		if (this.b < this.a) {
 			this.invert()
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 027d5f5..91e7c18 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -146,8 +146,6 @@ window.Wall = (function(){
 		if (shouldFlip) {
 			sortedWalls = sortedWalls.reverse()
 		}
-		
-console.log(sortedWalls.map(function(z){return useX ? z.x : z.z}).join(" "))
 
 		var len = sortedWalls.length