colors work after editing layout

3 files changed, 12 insertions, 23 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 1a4ea3c..1ab9c73 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -220,7 +220,7 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height - deltaY * 2), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
 		  app.tube("builder-pick-room", intersects[0])
 			
 			clearTimeout(wheelTimeout)
@@ -235,7 +235,7 @@ Map.UI.Editor = function(map){
 			}, 250)
 		}
 		else {
-			map.set_zoom(map.zoom_exponent - deltaY/20)
+			map.set_zoom(map.zoom_exponent + deltaY/20)
 		}
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 69b9aa4..653278c 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -126,11 +126,10 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
-        // TODO: SET WALLPAPER HERE
       })
-      Rooms.forEach(function(room){
-        room.setFloorColor(floorColor)
-        room.setCeilingColor(ceilingColor)
+      Walls.floors.forEach(function(floor){
+        if (floor.ceiling) floor.color(ceilingColor)
+        else floor.color(floorColor)
       })
 		}
 		
@@ -225,16 +224,18 @@
       floor: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.floor = rgb
-        Rooms.forEach(function(room){
-          room.setFloorColor(rgbColor)
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+          floor.color(rgbColor)
         })
       },
 
       ceiling: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.ceiling = rgb
-        Rooms.forEach(function(room){
-          room.setCeilingColor(rgbColor)
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+          floor.color(rgbColor)
         })
       },
     }
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 1a4606c..b0344a1 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -158,19 +158,7 @@
 		})
 		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
 	}