persisting wall colors in db

4 files changed, 16 insertions, 11 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 2d3201e..2a3929a 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -35,8 +35,8 @@ var EditorSettings = FormView.extend({
 		data.walls && Walls.deserialize(data.walls)
 		data.startPosition && scene.camera.move(data.startPosition)
 
-    if (data.colors) {
-      this.parent.lightControl.load()
+    if (data.colors && data.colors.wall) {
+      this.parent.lightControl.load(data.colors)
     }
     else {
 		  this.parent.lightControl.loadDefaults()
@@ -136,7 +136,8 @@ var EditorSettings = FormView.extend({
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
- 		fd.append( "walls", JSON.stringify( Rooms.serializeWalls() ) )
+ 		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
+ 		fd.append( "colors", JSON.stringify( Walls.colors ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 5133de2..84f2e58 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -29,19 +29,19 @@ var LightControl = View.extend({
 	},
 
   load: function(data){
-		this.setWallColor(data.wallColor, false)
-		this.setOutlineColor(data.outlineColor)
-		this.setFloorColor(data.floorColor)
-		this.setCeilingColor(data.ceilingColor)
+		this.setWallColor(data.wall, false)
+		this.setOutlineColor(data.outline)
+		this.setFloorColor(data.floor)
+		this.setCeilingColor(data.ceiling)
 		this.setMode("wall")
   },
   
   loadDefaults: function(){
     var colors = {
-      wallColor: app.defaults.wallColor.slice(),
-      outlineColor: app.defaults.outlineColor.slice(),
-      floorColor: app.defaults.floorColor.slice(),
-      ceilingColor: app.defaults.ceilingColor.slice(),
+      wall: app.defaults.wallColor.slice(),
+      outline: app.defaults.outlineColor.slice(),
+      floor: app.defaults.floorColor.slice(),
+      ceiling: app.defaults.ceilingColor.slice(),
     }
     this.load(colors)
   },
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index bd3cb81..2a5beff 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -39,6 +39,7 @@ var projects = {
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
+		data.colors = JSON.parse(data.colors)
 		data.startPosition = JSON.parse(data.startPosition)
 
 		upload.put("projects", req.files.thumbnail, {
@@ -91,8 +92,10 @@ var projects = {
 			Project.findOne({ _id: _id }, function(err, doc){
 				if (err || ! doc) { return res.json({ error: err }) }
 				_.extend(doc, data)
+				
 				doc.rooms = JSON.parse(data.rooms)
 				doc.walls = JSON.parse(data.walls)
+				doc.colors = JSON.parse(data.colors)
 				doc.media = JSON.parse(data.media)
 				doc.startPosition = JSON.parse(data.startPosition)
 
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index 0f54eaa..abf34fb 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -30,6 +30,7 @@ var ProjectSchema = new mongoose.Schema({
 	rooms: [mongoose.Schema.Types.Mixed],
 	walls: [mongoose.Schema.Types.Mixed],
 	media: [mongoose.Schema.Types.Mixed],
+	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },