color stuff on reader

2 files changed, 12 insertions, 5 deletions

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()