From 4263bc016e828f7407b446e27bdf64d898758627 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 10 Oct 2014 20:54:14 -0400 Subject: refactor layout-parsing calls into Rooms.rebuild --- public/assets/javascripts/rectangles/engine/rooms/_walls.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js') diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js index 7ff472d..80d30c6 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -38,6 +38,15 @@ base.floors = [] base.lookup = {} base.colors = {} + + base.init = function(){ + base.colors = { + wall: app.defaults.colors.wall.slice(), + outline: app.defaults.colors.outline.slice(), + floor: app.defaults.colors.floor.slice(), + ceiling: app.defaults.colors.ceiling.slice(), + } + } base.first = function(){ for (var i in base.list) { @@ -90,7 +99,7 @@ base.values = function(){ return _.values(base.lookup) } - + base.serialize = function(){ var data = [] base.forEach(function(wall){ @@ -118,6 +127,7 @@ 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) -- cgit v1.2.3-70-g09d2 From bc63a639bbd224adfc8012b100c1b277e2774afb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 10 Oct 2014 21:07:50 -0400 Subject: z --- public/assets/javascripts/rectangles/engine/rooms/_walls.js | 1 - public/assets/stylesheets/app.css | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'public/assets/javascripts/rectangles/engine/rooms/_walls.js') diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js index 80d30c6..0da3b9a 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -113,7 +113,6 @@ if (! wall_data) { return } var wall = base.lookup[ wall_data.id ] if (! wall) { - console.log(wall_data); return } wall.deserialize( wall_data ) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 4bae1de..509deb5 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1505,7 +1505,7 @@ border-left: 1px solid black; .wallpaper .wallpaperRemove { cursor: pointer; border-top: 1px solid black; - padding: 4px 0 0 0; + padding: 0; } .wallpaper .wallpaperRemove img { width: 18px; -- cgit v1.2.3-70-g09d2