3 files changed, 22 insertions, 52 deletions

diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 33a94d0..0f09325 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -32,9 +32,6 @@
 		this.id = opt.id || Rooms.uid("room_")
 		this.rect = opt.rect
 		this.regions = []
-		this.walls = []
-		this.floor = []
-		this.ceiling = []
 
 		this.height = opt.height || 200
 		this.focused = false
@@ -69,30 +66,10 @@
 		this.intersects = []
 		this.constructed = false
 		
-		this.walls = []
-		
 		this.mx_walls = []
 		this.mx_floor = []
 		this.mx_ceiling = []
 	}
-	
-	Room.prototype.bind = function(){
-		var base = this
-		base.mx_walls.forEach(function(wall){
-			$(wall.el).bind({
-				mouseover: function(){
-				},
-				mousemove: function(e){
-					var color = choice(window.palettes.colors)
-					base.mx_walls.forEach(function(wall){
-						$(wall.el).css("background-color", color)
-					})
-				},
-				mousedown: function(){
-				}
-			})
-		})
-	}
 
 	Room.prototype.clipTo = function(r){
 		// for each of this rect's regions split the region if necessary
@@ -182,6 +159,18 @@
 		return collision
 	}
 
+  Room.prototype.setFloorColor = function(rgbColor) {
+    this.mx_floor.map(function(mx){
+      mx.el.style.backgroundColor = rgbColor
+    })
+  }
+  
+  Room.prototype.setCeilingColor = function(rgbColor) {
+    this.mx_ceiling.map(function(mx){
+      mx.el.style.backgroundColor = rgbColor
+    })
+  }
+
 	if ('window' in this) {
 		window.Room = Room
 	}
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index ce0efa5..53977c8 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -147,11 +147,6 @@
 	
 	Surface.prototype.index_for_x = function(x, min_i){
     min_i = min_i || 0
-/*
-    if (min_i >= this.faces.length-1) {
-    	return -1
-    }
-*/
 		for (var i = min_i; i < this.faces.length; i++) {
 			if (this.faces[i].x.contains(x)) {
 				return i
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 7aa5578..d606fac 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -13,7 +13,7 @@
 	}
 	
 	var Wall = function(opt){
-		this.id = opt.id
+		this.id = [ opt.side, opt.edge, opt.vec.a ].join("_")
 		this.vec = opt.vec
 		this.edge = opt.edge
 		this.side = opt.side
@@ -89,9 +89,7 @@
 			this.mx.reverse()
 		}
 
-    var wallColor = "rgba(255,255,255,0.95)"
-    var outlineColor = "rgba(0,0,0,1.0)"
-		this.outline(wallColor, outlineColor)
+		// this.outline(wallColor, outlineColor)
 	}
 
 
@@ -199,7 +197,7 @@
 	}
 	
 	Wall.prototype.color = function(color){
-		this.$walls && this.$walls.css("background-color", color)
+		this.$walls.css("background-color", color)
 	}
 	
 	Wall.prototype.wallpaper = function(){
@@ -254,33 +252,21 @@
 	
 	Wall.prototype.siblings = function(){
 		return this
-// 		var base = this
-// 		var match = base.side | base.half_side
-// 		var walls = Rooms.list[this.room].walls.filter(function(w){
-// 			return (w.side | w.half_side) & match && w.$walls
-// 		})
-// 		return walls
-	}
-
-	Wall.prototype.randomize_colors = function(){
-		var color = window.grayColors[ this.side | this.half_side ]
-		// this.color(color)
 	}
 
 	Wall.prototype.stroke_colors = function(){
 		var color = "#fff"
-		var siblings = this.siblings()
-		siblings.forEach(function(w, i){
-			if (! w.$walls) return
+		var len = this.mx.length-1
+		this.mx.forEach(function(mx, i){
 			w.color(color)
 			if (i == 0) {
-				w.$walls.css("border-left", "1px solid #000")
+				mx.el.css("border-left", "1px solid #000")
 			}
-			if (i == siblings.length-1) {
-				w.$walls.css("border-right", "1px solid #000")
+			if (i == len) {
+				mx.el.css("border-right", "1px solid #000")
 			}
-			w.$walls.css("border-top", "1px solid #000")
-			w.$walls.css("border-bottom", "1px solid #000")
+			mx.el.css("border-top", "1px solid #000")
+			mx.el.css("border-bottom", "1px solid #000")
 		})
 	}