merge

1 files changed, 12 insertions, 23 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
 	}