show start position

5 files changed, 17 insertions, 4 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 8498a46..fd05f86 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -252,7 +252,13 @@ Map.Draw = function(map, opt){
 
 	draw.x_at = function x_at (x, z, length){
 		ctx.save()
-		ctx.translate(x,z)
+	  if (x && 'x' in x) {
+	    length = z
+      ctx.translate(x.x,x.z)
+	  }
+	  else {
+      ctx.translate(x,z)
+	  }
 
 		var len = (length/2 || 4) / map.zoom
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 0f35ac5..bf55aae 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -109,7 +109,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     shapes.draw(map.draw.ctx, "rgba(255,255,0,0.1)", "#f80")
 
     map.draw.ctx.strokeStyle = "#f00";
-    map.draw.x_at(0,0)
+    map.draw.x_at( this.parent.startPosition )
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
     
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index e41962e..94672f6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,7 +93,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.getStartPosition() ) )
     fd.append( "wallHeight", this.parent.info.$height.unitVal() )
     fd.append( "units", this.parent.info.$units.val() )
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 88f1d0a..bd42374 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -85,6 +85,8 @@ var BlueprintToolbar = View.extend({
   startPositionMode: function(){
     this.setActiveMode( this.$startPositionMode )
     this.parent.map.ui.set_tool("start-position")
+    this.parent.settings.hide()
+    this.parent.notice.showStartPositionNotice()
   },
   
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 6f1d2f5..7819abd 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -28,6 +28,7 @@ var BlueprintView = View.extend({
 	},
 
   orbiting: true,
+	startPosition: {},
 	buildMap: function(){
 	  // i forget if this has to be global
     map = new Map ({
@@ -53,7 +54,11 @@ var BlueprintView = View.extend({
 		this.info.load(data)
 		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
-	  if (! data.isNew) {
+	  if (data.isNew) {
+	    this.startPosition = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: Math.PI/2 }
+	  }
+	  else {
+	    this.startPosition = data.startPosition
 	    this.notice.showCreateProjectNotice()
 	  }
 	},