blueprint integration into project editor

6 files changed, 58 insertions, 28 deletions

diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index e5e46e5..61b1d1b 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -18,35 +18,36 @@ var SiteRouter = Router.extend({
 	},
 	
 	routes: {
-		"/":                    'home',
-		"/home":                'home',
-		"/login":               'signin',
-		"/signin":              'signin',
-		"/signup":              'signup',
+		"/":                             'home',
+		"/home":                         'home',
+		"/login":                        'signin',
+		"/signin":                       'signin',
+		"/signup":                       'signup',
 
-		"/auth/usernameTaken":  'usernameTaken',
-		"/auth/password":       'passwordReset',
-		"/auth/forgotPassword": 'passwordForgot',
+		"/auth/usernameTaken":           'usernameTaken',
+		"/auth/password":                'passwordReset',
+		"/auth/forgotPassword":          'passwordForgot',
 
-		"/profile":             'profile',
-		"/profile/edit":        'editProfile',
-		"/profile/billing":     'editSubscription',
-		"/profile/:name":       'profile',
-		"/about/:name/edit":    'editDocument',
-		"/about/new":           'newDocument',
+		"/profile":                      'profile',
+		"/profile/edit":                 'editProfile',
+		"/profile/billing":              'editSubscription',
+		"/profile/:name":                'profile',
+		"/about/:name/edit":             'editDocument',
+		"/about/new":                    'newDocument',
 
-		"/layout":              'layoutPicker',
-		"/layout/:name":        'layoutEditor',
+		"/layout":                       'layoutPicker',
+		"/layout/:name":                 'layoutEditor',
 
-		"/blueprint":           'blueprintEditor',
-		"/blueprint/:name":     'blueprintEditor',
+		"/blueprint":                    'blueprintEditor',
+		"/blueprint/:name":              'blueprintEditor',
 
-		"/project":             'projectPicker',
-		"/project/new":         'newProject',
-		"/project/new/:layout": 'projectNewWithLayout',
-		"/project/:name":       'projectViewer',
-		"/project/:name/edit":  'projectEditor',
-		"/project/:name/view":  'projectViewer',
+		"/project":                      'projectPicker',
+		"/project/new":                  'newProject',
+		"/project/blueprint/:blueprint": 'projectNewWithBlueprint',
+		"/project/new/:layout":          'projectNewWithLayout',
+		"/project/:name":                'projectViewer',
+		"/project/:name/edit":           'projectEditor',
+		"/project/:name/view":           'projectViewer',
 
 		"/test/blueprint":      'blueprintEditor',
 	},
@@ -123,6 +124,22 @@ var SiteRouter = Router.extend({
 		window.history.pushState(null, document.title, "/project/new")
 		this.newProjectModal.load()
 	},
+	
+	projectNewWithBlueprint: function(e, blueprint){
+		e && e.preventDefault()
+		
+		Rooms.shapesMode = true
+
+		app.mode.editor = true
+		app.launch()
+		if (app.unsupported) return
+
+		blueprint = slugify(blueprint)
+		
+		window.history.pushState(null, document.title, "/project/blueprint/" + blueprint)
+		this.editorView = app.controller = new EditorView()
+		this.editorView.loadBlueprint(blueprint)
+	},
 
 	projectNewWithLayout: function(e, layout){
 		e && e.preventDefault()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 9c8808a..0870a11 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -95,6 +95,9 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+    fd.append( "wallHeight", this.parent.info.$height.unitVal() )
+    fd.append( "units", this.parent.info.$units.val() )
+
 		return fd
 	},
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index e1d360f..3095cfe 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -48,8 +48,8 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
-		this.settings.load(data)
 		this.info.load(data)
+		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
 	},
 	
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 9a7dbf9..aa58d6e 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -40,8 +40,8 @@ var BuilderInfo = View.extend({
 	
 	load: function(data){
 		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
-		this.$units.val( "ft" )
-		this.$unitName.html( "ft" )
+		this.$units.val( data.units || "ft" )
+		this.$unitName.html( data.units || "ft" )
 
     if (Rooms.regions.length == 0) {
       this.changeHeightGlobal(true)
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 460863e..000852e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,12 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		data.rooms && Rooms.deserialize(data.rooms, data.walls)
+		if (data.rooms) {
+		  Rooms.deserialize(data.rooms, data.walls)
+		}
+		else if (data.shapes) {
+		  Rooms.deserializeFromShapes(data.shapes, data.walls)
+		}
 		if (data.startPosition) {
 		  scene.camera.move(data.startPosition)
 		  this.startPosition = data.startPosition
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index a2d84a6..879c963 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -2,6 +2,7 @@
 var EditorView = View.extend({
 	el: "#editorView",
 	
+	blueprintAction: "/api/blueprint/",
 	projectAction: "/api/project/",
 	layoutAction: "/api/layout/",
 
@@ -41,6 +42,10 @@ var EditorView = View.extend({
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
 	
+	loadBlueprint: function(blueprint){
+		$.get(this.blueprintAction + blueprint, this.readyLayout.bind(this))
+	},
+	
 	ready: function(data){
 		$("#map").hide()