Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 13 insertions, 10 deletions

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index fe5913d..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)
       })
 		}
 		
@@ -181,16 +180,18 @@
 					wall.wallpaper("none")
 				})
 			},
+			outline: function(){
+			},
 			floor: function(){
 				Walls.floors.forEach(function(floor){
 					if (floor.ceiling) return
-					wall.wallpaper("none")
+					floor.wallpaper("none")
 				})
 			},
 			ceiling: function(){
 				Walls.floors.forEach(function(floor){
 					if (! floor.ceiling) return
-					wall.wallpaper("none")
+					floor.wallpaper("none")
 				})
 			},
 		}
@@ -223,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)
         })
       },
     }