color stuff on reader

4 files changed, 19 insertions, 9 deletions

diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 5573073..038a882 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -4,9 +4,11 @@ app.defaults = {
 	footResolution: 36,
 	meterResolution: 100,
 	wallOpacity: 0.95,
-	wallColor: [255,255,255],
 	outlineWidth: 2,
-	outlineColor: [0,0,0],
-	floorColor: [246,246,246],
-	ceilingColor: [255,255,255],
+	colors: {
+    wall: [255,255,255],
+    outline: [0,0,0],
+    floor: [246,246,246],
+    ceiling: [255,255,255],
+	},
 }
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 5ed7be8..cb3e980 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -98,6 +98,7 @@
 	
 		base.deserialize = function(rooms_data){
 			rooms_data.forEach(function(data){
+			  if (! data || ! data.rect) return
 				var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
 				var room = new Room({
 					id: data.id,
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index bd09dc2..661ceb2 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -29,7 +29,7 @@ var LightControl = View.extend({
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
-  
+
   load: function(data){
     this.modes.forEach(function(mode){
       Walls.setColor[mode](data[mode])
@@ -40,10 +40,10 @@ var LightControl = View.extend({
   
   loadDefaults: function(){
     var colors = {
-      wall: app.defaults.wallColor.slice(),
-      outline: app.defaults.outlineColor.slice(),
-      floor: app.defaults.floorColor.slice(),
-      ceiling: app.defaults.ceilingColor.slice(),
+      wall: app.defaults.colors.wall.slice(),
+      outline: app.defaults.colors.outline.slice(),
+      floor: app.defaults.colors.floor.slice(),
+      ceiling: app.defaults.colors.ceiling.slice(),
     }
     this.load(colors)
   },
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 9d38daa..d80f225 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -26,9 +26,16 @@ var ReaderView = View.extend({
 		$("#map").hide()
 
 		data.rooms && Rooms.deserialize(data.rooms)
+		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
 		data.startPosition && scene.camera.move(data.startPosition)
 		
+		var colors = data.colors || app.defaults.colors
+    var modes = [ "wall", "outline", "floor", "ceiling" ]
+    modes.forEach(function(mode){
+      Walls.setColor[mode](colors[mode])
+    })
+
 		editor.permissions.clear()
 		
 		this.listen()