From 4024085b09261c23cd89227e340037e0238072c7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Aug 2015 14:15:31 -0400
Subject: uploader functioning

---
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintEditor.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
new file mode 100644
index 0000000..227c1c8
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -0,0 +1,30 @@
+
+var BlueprintEditor = ModalView.extend({
+	el: ".blueprintEditor",
+	
+	events: {
+    "change [name=blueprint-dimensions]": "changeDimensions",
+    "change [name=blueprint-units]": "changeUnits",
+    "click #saveBlueprint": "save",
+	},
+	
+	initialize: function(){
+    this.$blueprintMap = this.$("#blueprintMap")
+    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+    this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$units = this.$("[name=blueprint-units]")
+    this.$save = this.$("#saveBlueprint")
+
+    this.map = new Map ({ type: 'ortho' })
+
+    this.$blueprintMap.append(this.map.el)
+	},
+
+	changeDimensions: function(){
+	},
+	changeUnits: function(){
+	},
+	save: function(){
+	},
+
+})
-- 
cgit v1.2.3-70-g09d2


From d84c89a8dd770ea174a7d2ac90927046a5f4b5f6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Aug 2015 16:50:31 -0400
Subject: blueprint upload styling

---
 .../javascripts/rectangles/engine/map/ui/ortho.js  |   4 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  30 -----
 .../javascripts/ui/blueprint/BlueprintScaler.js    |  43 ++++++++
 .../javascripts/ui/blueprint/BlueprintUpload.js    |  36 ++++--
 .../javascripts/ui/blueprint/BlueprintView.js      |   2 +-
 views/controls/blueprint/editor.ejs                | 122 +++++++++++++++++----
 views/partials/scripts.ejs                         |   2 +-
 7 files changed, 178 insertions(+), 61 deletions(-)
 delete mode 100644 public/assets/javascripts/ui/blueprint/BlueprintEditor.js
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintScaler.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
index 52f7339..5be7446 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
@@ -81,7 +81,9 @@ Map.UI.Ortho = function(map){
 	}
 	base.set_tool = function(s){
 	  console.log("set tool to", s)
-	  base.tools[currentTool].cancel()
+	  if (base.tools[currentTool]) {
+	    base.tools[currentTool].cancel()
+	  }
 	  currentTool = s
 	  tool = base.tools[currentTool]
 	}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
deleted file mode 100644
index 227c1c8..0000000
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-var BlueprintEditor = ModalView.extend({
-	el: ".blueprintEditor",
-	
-	events: {
-    "change [name=blueprint-dimensions]": "changeDimensions",
-    "change [name=blueprint-units]": "changeUnits",
-    "click #saveBlueprint": "save",
-	},
-	
-	initialize: function(){
-    this.$blueprintMap = this.$("#blueprintMap")
-    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
-    this.$dimensions = this.$("[name=blueprint-dimensions]")
-    this.$units = this.$("[name=blueprint-units]")
-    this.$save = this.$("#saveBlueprint")
-
-    this.map = new Map ({ type: 'ortho' })
-
-    this.$blueprintMap.append(this.map.el)
-	},
-
-	changeDimensions: function(){
-	},
-	changeUnits: function(){
-	},
-	save: function(){
-	},
-
-})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
new file mode 100644
index 0000000..e11b61e
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -0,0 +1,43 @@
+
+var BlueprintScaler = ModalView.extend({
+	el: ".blueprintScaler",
+	
+	events: {
+    "change [name=blueprint-dimensions]": "changeDimensions",
+    "change [name=blueprint-units]": "changeUnits",
+    "click #saveBlueprint": "save",
+	},
+	
+	initialize: function(){
+    this.$blueprintMap = this.$("#blueprintMap")
+    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+    this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$units = this.$("[name=blueprint-units]")
+    this.$save = this.$("#saveBlueprint")
+
+    this.map = map = new Map ({
+      type: "ortho",
+      el: this.$blueprintMap.get(0),
+      width: window.innerWidth/2,
+      height: window.innerHeight,
+      zoom: -2,
+      zoom_min: -6.2,
+      zoom_max: 1,
+    })
+    map.ui.add_tool("arrow", new ArrowTool)
+    map.ui.add_tool("position", new PositionTool)
+    map.ui.set_tool("position")
+	},
+	
+	pick: function(){
+    
+	},
+
+	changeDimensions: function(){
+	},
+	changeUnits: function(){
+	},
+	save: function(){
+	},
+
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
index 9467715..deb1075 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -13,7 +13,8 @@ var BlueprintUpload = UploadView.extend({
     "change .url": "enterUrl",
     "keydown .url": "enterSetUrl",
     
-    "click .blueprint": "choose",
+    "click .blueprint": "pick",
+    "click .remove": "destroy",
   },
 	
 	initialize: function(opt){
@@ -34,25 +35,33 @@ var BlueprintUpload = UploadView.extend({
 	populate: function(data){
 		this.loaded = true
 		if (data && data.length) {
+		  this.$blueprints.show()
 		  data.forEach(this.append.bind(this))
-		  this.$(".txt").hide()
+		  this.show()
 		}
 		else {
-		  this.$(".txt").show()
+		  this.show()
 		}
 	},
 	
 	pick: function(e){
 	  var $el = $(e.currentTarget)
-	  // load map with it
+	  var media = $el.data("media")
+	  this.hide()
+	  this.parent.blueprintScaler.pick(media)
 	},
   
-	destroy: function(_id, cb){
+	destroy: function(e){
+	  e.stopPropagation()
+	  var $el = $(e.currentTarget)
+	  var _id = $el.closest(".blueprint").data("id")
+    $el.remove()
 		$.ajax({
 			type: "delete",
 			url: this.destroyAction,
 			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
-		}).complete(cb || function(){})
+		}).complete(function(){
+		})
 	},
 	
 	show: function(){
@@ -93,13 +102,24 @@ var BlueprintUpload = UploadView.extend({
 	},
 	
 	add: function(media){
+    this.$blueprints.show()
 	  this.append(media)
+	  this.hide()
+	  this.parent.blueprintScaler.pick(media)
 	},
 
 	append: function(media){
-	  var $el = $("<img>")
-	  $el.attr("src", media.url)
+	  var $el = $("<span>")
+	  var img = new Image ()
+	  img.src = media.url
+	  var remove = document.createElement("span")
+	  remove.className = "remove"
+	  remove.innerHTML = "<span>x</span>"
+	  
 	  $el.data("id", media._id)
+	  $el.data("media", media)
+	  $el.append(img)
+	  $el.append(remove)
 	  $el.addClass("blueprint")
 	  this.$blueprints.append($el)
 	},
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 40c61d7..a803f12 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -12,7 +12,7 @@ var BlueprintView = View.extend({
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
     this.blueprintUpload = new BlueprintUpload ({ parent: this })
-    this.blueprintEditor = new BlueprintEditor ({ parent: this })
+    this.blueprintScaler = new BlueprintScaler ({ parent: this })
 	},
 
 	load: function(name){
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index 6b80287..aec5e25 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -33,13 +33,88 @@ body {
 .hud span.active { color: #000; }
 
 .blueprintUpload {
-  width: 240px;
+  -webkit-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+  width: 340px;
+  position: absolute;
+  top: 50%; left: 50%;
+  background: white;
+  padding: 10px;
+  border: 1px solid black;
+  box-shadow: -3px 3px #000;
+  -webkit-transform: translate3D(0%,-200%,0);
+  transform: translate3D(0%,-200%,0);
+  margin-left: -175px;
+  margin-top: -200px;
+  opacity: 0;
+}
+.blueprintUpload.active {
+  -webkit-transform: translate3D(0,0,0);
+  transform: translate3D(0,0,0);
+  opacity: 1;
+}
+.blueprintUpload .toolButton {
+  float: none;
+  width: 108px;
+  display: inline-block;
+}
+.blueprintUpload .url {
+  font-size: 15px;
+  border: 1px solid #888;
+  padding: 2px;
+  font-weight: 300;
+  position: relative;
+  top: 3px;
+  margin-right: 10px;
+  width: 190px;
+}
+.blueprintUpload p {
+  font-weight: 300;
+  font-size: 13px;
+}
+.blueprintUpload .blueprints {
+  display: none;
+}
+.blueprintUpload .blueprints h5 {
+  width: 250px;
+  margin: 10px auto;
+  padding-top: 9px;
 }
 .blueprints .blueprint {
   border: 1px solid black;
-  padding: 5px;
+  background: white;
+  padding: 0px;
+  position: relative;
+  display: inline-block;
+}
+.blueprints .blueprint img {
   height: 100px;
   max-width: 200px;
+  display: block;
+  cursor: pointer;
+}
+.blueprints .blueprint .remove {
+  box-shadow: 0 1px 2px #888;
+  cursor: pointer;
+  position: absolute;
+  color: red;
+  top: 7px;
+  right: 7px;
+  width: 20px; height: 20px;
+  text-align: center;
+  background: #fff;
+  border-radius: 50%;
+}
+.blueprints .blueprint .remove span {
+  position: relative;
+  top: -2px;
+}
+.blueprintUpload .wallpaperUpload .upload-icon {
+  margin: 0 4px;
+}
+.uploadNewBlueprint {
+  color: #333;
+  border-bottom: 1px solid;
   cursor: pointer;
 }
 </style>
@@ -63,42 +138,49 @@ body {
 </div>
 
 <div class="mediaDrawer fixed animate active blueprintEditor">
-  <span class="close">X</span>
   <div class="box">
   
-    <h2>Upload your Blueprint</h2>
-  
     <div class="blueprintUpload">
+      <h2>Upload your Blueprint</h2>
+      <p>
+        Upload an image which you will trace to make a floor plan.
+        Images should be at least 1000x1000.
+      </p>
       <input type="hidden" name="_csrf" value="[[- token ]]">
+      <input type="text" class="url" placeholder="Enter an image URL or...">
       <div class="wallpaperUpload toolButton">
         <form>
           <span class="ion-ios-upload-outline upload-icon"></span>
-          <label>Upload</label>
+          <label>Upload a File</label>
           <input type="file" accept="image/*" multiple>
         </form>
       </div>
-      <input type="text" class="url" placeholder="Enter an image URL or...">
       <div class="blueprints">
         <h5>Your uploaded blueprints</h5>
       </div>
     </div>
     
-    Please tell us the scale of your blueprint.
-    Click both corners of a wall, and then enter how long the wall is.
-    https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg
+    <div class="blueprintScaler">
+      <div class="blueprintInfo">
+        Please tell us the scale of your blueprint.
+        Click both corners of a wall, and then enter how long the wall is.
+        <br><br>
+        Do you want to <span class="uploadNewBlueprint">upload a blueprint?</span>
+      </div>
 
-    <div id="blueprintMap">
-    </div>
+      <div id="blueprintMap">
+      </div>
   
-    <div id="blueprintDimensions">
-      <input type="text" name="blueprint-dimensions">
-      <select id="blueprint-units" name="blueprint-units">
-        <option value="ft">foot</option>
-        <option value="m">meter</option>
-      </select>
+      <div id="blueprintDimensions">
+        <input type="text" name="blueprint-dimensions">
+        <select id="blueprint-units" name="blueprint-units">
+          <option value="ft">foot</option>
+          <option value="m">meter</option>
+        </select>
   
-      <button id="saveBlueprint">Save</button>
+        <button id="saveBlueprint">Save</button>
+      </div>
     </div>
-
+    
   </div>
 </div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2a93e9b..136bd4d 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -128,7 +128,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 599b43df07f092b35d25e7adac11db3c3b3d9c76 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 17 Aug 2015 12:23:39 -0400
Subject: BlueprintEditor

---
 public/assets/javascripts/ui/_router.js            |   7 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 155 +++++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintView.js      |  18 +--
 server/index.js                                    |   3 +
 server/lib/views/index.js                          |   4 +
 views/blueprint.ejs                                |   1 +
 views/controls/blueprint/editor.ejs                |  53 -------
 views/controls/blueprint/scaler.ejs                |  48 +++++++
 views/partials/scripts.ejs                         |   1 +
 9 files changed, 227 insertions(+), 63 deletions(-)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintEditor.js
 create mode 100644 views/controls/blueprint/scaler.ejs

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 857377c..177e86f 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -38,6 +38,9 @@ var SiteRouter = Router.extend({
 		"/layout":              'layoutPicker',
 		"/layout/:name":        'layoutEditor',
 
+		"/blueprint":           'blueprintEditor',
+		"/blueprint/:name":     'blueprintEditor',
+
 		"/project":             'projectPicker',
 		"/project/new":         'newProject',
 		"/project/new/:layout": 'projectNewWithLayout',
@@ -160,13 +163,13 @@ var SiteRouter = Router.extend({
 		this.readerView.load(name)
 	},
 	
-	blueprintEditor: function(e){
+	blueprintEditor: function(e, name){
 	  environment.init = environment.minimal
 	  app.launch()
 	  if (app.unsupported) return
 
 	  this.blueprintView = app.controller = new BlueprintView ()
-	  this.blueprintView.load()
+	  this.blueprintView.load(name)
 	},
 
 	signup: function(e){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
new file mode 100644
index 0000000..c781495
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -0,0 +1,155 @@
+
+var wall_height = 180
+var shapes = new ShapeList
+var last_point = new vec2 (0,0)
+
+var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
+
+  initialize: function(opt){
+    this.parent = opt.parent
+  
+    map = new Map ({
+      type: "ortho",
+      el: document.querySelector("#orthographic"),
+      width: window.innerWidth/2,
+      height: window.innerHeight,
+      zoom: -2,
+      zoom_min: -6.2,
+      zoom_max: 1,
+    })
+    map.ui.add_tool("arrow", new ArrowTool)
+    map.ui.add_tool("polyline", new PolylineTool)
+    map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
+    map.ui.add_tool("eraser", new EraserTool)
+    map.ui.add_tool("position", new PositionTool)
+    map.ui.placing = false
+
+/*
+    $(window).resize(function(){
+      scene.width = window.innerWidth/2
+      scene.height = window.innerHeight
+      map.canvas.width = map.dimensions.a = window.innerWidth/2
+      map.canvas.height = map.dimensions.b = window.innerHeight/2
+    })
+*/
+
+    var PerspectiveToolbar = new Toolbar (".persp-hud")
+    PerspectiveToolbar.add("orbit-mode", function(){
+      controls.toggle(true)
+      movements.lock()
+    })
+    PerspectiveToolbar.add("keyboard-mode", function(){
+      controls.toggle(false)
+      movements.unlock()
+      movements.gravity(true)
+      cam.rotationX = 0
+      cam.rotationY = -cam.rotationY
+      cam.x = 0
+      cam.y = viewHeight + 100
+      cam.z = 0
+    })
+
+    var OrthographicToolbar = new Toolbar (".ortho-hud")
+    OrthographicToolbar.add("arrow-mode", function(){
+      map.ui.set_tool("arrow")
+    })
+    OrthographicToolbar.add("polyline-mode", function(){
+      map.ui.set_tool("polyline")
+    })
+    OrthographicToolbar.add("ortho-polyline-mode", function(){
+      map.ui.set_tool("ortho-polyline")
+    })
+    OrthographicToolbar.add("eraser-mode", function(){
+      map.ui.set_tool("eraser")
+    })
+    OrthographicToolbar.pick("ortho-polyline-mode")
+  },
+  
+  animate: function(t, dt){
+    map.update(t)
+
+    movements.update(dt)
+    controls.update()
+    scene.update()
+
+    map.draw.ctx.save()
+    map.draw.translate()
+
+    floorplan.draw(map.draw.ctx, true)
+
+    map.draw.coords()
+
+    if (shapes.workline) {
+      shapes.workline.draw(map.draw.ctx)
+      if (map.ui.placing && last_point) {
+        shapes.workline.draw_line( map.draw.ctx, last_point )
+      }
+    }
+
+    shapes.forEach(function(shape){
+      shape.draw(map.draw.ctx)
+    })
+
+    map.draw.ctx.strokeStyle = "#f00";
+    map.draw.x_at(0,0)
+    map.draw.mouse(map.ui.mouse.cursor)
+    map.draw.camera(scene.camera)
+
+    map.draw.ctx.restore()
+  },
+
+})
+
+function build () {
+	scene = new MX.Scene().addTo("#perspective")
+	scene.camera.radius = 20
+
+  viewHeight = 100
+
+	scene.width = window.innerWidth/2
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+	
+	cam = scene.camera
+	movements = new MX.Movements(cam, viewHeight)
+	movements.init()
+	movements.lock()
+	movements.velocity(8)
+	app.on("move", function(pos){
+	  cam.x = pos.x
+	  cam.y = pos.y
+	  cam.z = pos.z
+	})
+
+  floorplan = new MX.Image({
+    src: "https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg",
+    keepImage: true,
+    rotationX: -PI/2,
+    rotationY: PI,
+  })
+  scene.add(floorplan)
+  
+  // recenter perspective view by rightclicking map
+  floorplan.el.addEventListener("contextmenu", function(e){
+    e.preventDefault()
+    var offset = offsetFromPoint(e, this)
+    var x = (offset.left - 0.5) * floorplan.width * floorplan.scale
+    var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
+    controls.opt.center.x = -x
+    controls.opt.center.y = 0
+    controls.opt.center.z = -z
+  }, true)
+
+	scene.update()
+
+	controls = new MX.OrbitCamera({
+	  el: scene.el,
+	  radius: 3000,
+	  radiusRange: [ 10, 10000 ],
+	  rotationX: PI/4,
+	  rotationY: PI/2,
+	})
+	controls.init()
+
+	animate(0)
+}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 6b204e5..0a06fda 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -1,7 +1,9 @@
 
 var BlueprintView = View.extend({
 	el: "#blueprintView",
-	
+
+	action: "/api/layout/",
+
 	events: {
 	},
 	
@@ -16,14 +18,14 @@ var BlueprintView = View.extend({
 	},
 
 	load: function(name){
-// 		if (! name || name == "new") {
+		if (! name || name == "new") {
 // 			this.ready({ isNew: true, _id: "new", name: "" })
-// 			return
-// 		}
-// 		
-// 		name = sanitize(name)
-// 		
-// 		$.get(this.action + name, this.ready.bind(this))
+			return
+		}
+		
+		name = sanitize(name)
+		
+		$.get(this.action + name, this.ready.bind(this))
 	},
 	
 	ready: function(data){
diff --git a/server/index.js b/server/index.js
index 0028888..078db8e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -127,6 +127,9 @@ site.route = function () {
 	app.get('/layout', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.modal)
 	app.get('/layout/:name', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.builder)
 
+	app.get('/blueprint', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.blueprint)
+	app.get('/blueprint/:name', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.blueprint)
+
 	app.get('/join/:nonce', middleware.ensureAuthenticated, api.collaborator.join)
 	app.get('/api/collaborator/:slug/index', middleware.ensureAuthenticated, middleware.ensureProject, api.collaborator.index)
 	app.post('/api/collaborator/:slug/create', middleware.ensureAuthenticated, middleware.ensureProject, api.collaborator.create)
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 5241ddb..523f628 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -84,6 +84,10 @@ var views = module.exports = {
 		res.render('builder')
 	},
 
+	blueprint: function (req, res) {
+		res.render('blueprint')
+	},
+
 	modal: function (req, res) {
 		res.render('modal');
 	},
diff --git a/views/blueprint.ejs b/views/blueprint.ejs
index 371d66f..7e13318 100644
--- a/views/blueprint.ejs
+++ b/views/blueprint.ejs
@@ -16,6 +16,7 @@
 			[[ include controls/builder/toolbar ]]
 			[[ include controls/builder/settings ]]
       [[ include controls/blueprint/editor ]]
+      [[ include controls/blueprint/scaler ]]
 		</div>
 
 		<div id="hud">
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index e18f501..5334f85 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -1,8 +1,4 @@
 <style type="text/css">
-html,body{width:100%;height:100%;margin:0;padding:0;}
-body {
-	overflow: hidden;
-}
 #perspective,
 #perspective .mx-scene {
 	position: absolute;
@@ -11,7 +7,6 @@ body {
 	-webkit-transform: translateZ(0);
 	transform: translateZ(0);
 }
-
 #orthographic {
 	position: absolute;
 	left:50%;
@@ -67,51 +62,3 @@ body {
   </div>
 </div>
 
-<div class="mediaDrawer fixed animate active blueprintScaler">
-  <div class="box">
-
-    <div class="blueprintUpload">
-      <h2>Upload your Blueprint</h2>
-      <p>
-        Upload an image which you will trace to make a floor plan.
-        Images should be at least 1000x1000.
-      </p>
-      <input type="hidden" name="_csrf" value="[[- token ]]">
-      <input type="text" class="url" placeholder="Enter an image URL or...">
-      <div class="wallpaperUpload toolButton">
-        <form>
-          <span class="ion-ios-upload-outline upload-icon"></span>
-          <label>Upload a File</label>
-          <input type="file" accept="image/*" multiple>
-        </form>
-      </div>
-      <div class="blueprints">
-        <h5>Your uploaded blueprints</h5>
-      </div>
-    </div>
-    
-    <div class="blueprintInfo vvbox">
-      Please tell us the scale of your blueprint.
-      Click two corners of a wall, and then enter how long the wall is.
-      <br><br>
-      You can also <span class="uploadNewBlueprint">upload another blueprint</span>.
-      <br><br>
-
-      <form>
-        <div class="setting number">
-          <label for="blueprint-dimensions">length</label>
-          <input type="text" class="units" name="blueprint-dimensions" id="blueprint-dimensions">
-          <select id="blueprint-units" name="blueprint-units">
-            <option value="ft">feet</option>
-            <option value="m">meters</option>
-          </select>
-        </div>
-        <button id="saveBlueprint">Save</button>
-      </form>
-    </div>
-
-    <div id="blueprintMap">
-    </div>
-    
-  </div>
-</div>
diff --git a/views/controls/blueprint/scaler.ejs b/views/controls/blueprint/scaler.ejs
new file mode 100644
index 0000000..972b82a
--- /dev/null
+++ b/views/controls/blueprint/scaler.ejs
@@ -0,0 +1,48 @@
+<div class="mediaDrawer fixed animate active blueprintScaler">
+  <div class="box">
+
+    <div class="blueprintUpload">
+      <h2>Upload your Blueprint</h2>
+      <p>
+        Upload an image which you will trace to make a floor plan.
+        Images should be at least 1000x1000.
+      </p>
+      <input type="hidden" name="_csrf" value="[[- token ]]">
+      <input type="text" class="url" placeholder="Enter an image URL or...">
+      <div class="wallpaperUpload toolButton">
+        <form>
+          <span class="ion-ios-upload-outline upload-icon"></span>
+          <label>Upload a File</label>
+          <input type="file" accept="image/*" multiple>
+        </form>
+      </div>
+      <div class="blueprints">
+        <h5>Your uploaded blueprints</h5>
+      </div>
+    </div>
+    
+    <div class="blueprintInfo vvbox">
+      Please tell us the scale of your blueprint.
+      Click two corners of a wall, and then enter how long the wall is.
+      <br><br>
+      You can also <span class="uploadNewBlueprint">upload another blueprint</span>.
+      <br><br>
+
+      <form>
+        <div class="setting number">
+          <label for="blueprint-dimensions">length</label>
+          <input type="text" class="units" name="blueprint-dimensions" id="blueprint-dimensions">
+          <select id="blueprint-units" name="blueprint-units">
+            <option value="ft">feet</option>
+            <option value="m">meters</option>
+          </select>
+        </div>
+        <button id="saveBlueprint">Save</button>
+      </form>
+    </div>
+
+    <div id="blueprintMap">
+    </div>
+    
+  </div>
+</div>
\ No newline at end of file
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index e0024a4..2c3d5ac 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -130,6 +130,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>
 
-- 
cgit v1.2.3-70-g09d2


From 3c36de54b57422f34c367934fdf62873b881fa20 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 17 Aug 2015 16:27:40 -0400
Subject: integrate ortho3 stuff into blueprint views

---
 .../assets/javascripts/mx/primitives/mx.image.js   |  14 +-
 public/assets/javascripts/ui/_router.js            |   4 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 148 ++++++++-------------
 .../javascripts/ui/blueprint/BlueprintScaler.js    |   6 +-
 .../javascripts/ui/blueprint/BlueprintToolbar.js   |  69 ++++++++++
 .../javascripts/ui/blueprint/BlueprintUpload.js    | 128 ------------------
 .../javascripts/ui/blueprint/BlueprintUploader.js  | 126 ++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintView.js      |  30 ++++-
 public/assets/stylesheets/app.css                  |  29 ++--
 views/blueprint.ejs                                |   2 +-
 views/controls/blueprint/editor.ejs                |  28 ----
 views/controls/blueprint/scaler.ejs                |   2 +-
 views/controls/blueprint/toolbar.ejs               |  35 +++++
 views/partials/scripts.ejs                         |   7 +-
 14 files changed, 349 insertions(+), 279 deletions(-)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
 delete mode 100644 public/assets/javascripts/ui/blueprint/BlueprintUpload.js
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintUploader.js
 create mode 100644 views/controls/blueprint/toolbar.ejs

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index 33b1373..ce99592 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -48,10 +48,16 @@ MX.Image = MX.Object3D.extend({
         layer.image = image
       }
     }
-    
-    if (ops.src) image.src = ops.src
-    else if (ops.media) image.src = ops.media.url
-    else if (ops.url) image.src = ops.url
+
+    if (ops.src) {
+      image.src = ops.src
+    }
+    else if (ops.media) {
+      image.src = ops.media.url
+    }
+    else if (ops.url) {
+      image.src = ops.url
+    }
   },
 
   draw: function(ctx, recenter){
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 177e86f..e5e46e5 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -92,7 +92,9 @@ var SiteRouter = Router.extend({
       })
 		}
 		
-		$("body").removeClass("loading")
+		setTimeout(function(){
+		  $("body").removeClass("loading")
+		}, 200)
 	},
 
 	layoutEditor: function(e, name){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index c781495..545de7b 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -7,22 +7,6 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 
   initialize: function(opt){
     this.parent = opt.parent
-  
-    map = new Map ({
-      type: "ortho",
-      el: document.querySelector("#orthographic"),
-      width: window.innerWidth/2,
-      height: window.innerHeight,
-      zoom: -2,
-      zoom_min: -6.2,
-      zoom_max: 1,
-    })
-    map.ui.add_tool("arrow", new ArrowTool)
-    map.ui.add_tool("polyline", new PolylineTool)
-    map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
-    map.ui.add_tool("eraser", new EraserTool)
-    map.ui.add_tool("position", new PositionTool)
-    map.ui.placing = false
 
 /*
     $(window).resize(function(){
@@ -33,36 +17,62 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     })
 */
 
-    var PerspectiveToolbar = new Toolbar (".persp-hud")
-    PerspectiveToolbar.add("orbit-mode", function(){
-      controls.toggle(true)
-      movements.lock()
-    })
-    PerspectiveToolbar.add("keyboard-mode", function(){
-      controls.toggle(false)
-      movements.unlock()
-      movements.gravity(true)
-      cam.rotationX = 0
-      cam.rotationY = -cam.rotationY
-      cam.x = 0
-      cam.y = viewHeight + 100
-      cam.z = 0
-    })
+    scene = new MX.Scene().addTo("#perspective")
+    scene.camera.radius = 20
+    cam = scene.camera
 
-    var OrthographicToolbar = new Toolbar (".ortho-hud")
-    OrthographicToolbar.add("arrow-mode", function(){
-      map.ui.set_tool("arrow")
+    scene.width = window.innerWidth/2
+    scene.height = window.innerHeight
+    scene.perspective = window.innerHeight
+  
+    movements = new MX.Movements(cam, viewHeight)
+    movements.init()
+    movements.lock()
+
+    app.on("move", function(pos){
+      cam.x = pos.x
+      cam.y = pos.y
+      cam.z = pos.z
     })
-    OrthographicToolbar.add("polyline-mode", function(){
-      map.ui.set_tool("polyline")
+
+    var floorplan = this.floorplan = new MX.Image({
+      backface: true,
     })
-    OrthographicToolbar.add("ortho-polyline-mode", function(){
-      map.ui.set_tool("ortho-polyline")
+    scene.add(this.floorplan)
+  
+    // recenter perspective view by rightclicking map
+    this.floorplan.el.addEventListener("contextmenu", function(e){
+      e.preventDefault()
+      var offset = offsetFromPoint(e, this)
+      var x = (offset.left - 0.5) * floorplan.width * floorplan.scale
+      var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
+      controls.opt.center.x = -x
+      controls.opt.center.y = 0
+      controls.opt.center.z = -z
+    }, true)
+
+    scene.update()
+
+    controls = new MX.OrbitCamera({
+      el: scene.el,
+      radius: 3000,
+      radiusRange: [ 10, 10000 ],
+      rotationX: PI/4,
+      rotationY: PI/2,
     })
-    OrthographicToolbar.add("eraser-mode", function(){
-      map.ui.set_tool("eraser")
+    controls.init()
+  },
+  
+  loadFloorplan: function(media){
+    console.log(media)
+    this.floorplan.load({
+      media: media,
+      keepImage: true,
+      rotationX: -PI/2,
+      rotationY: PI,
+      scale: media.scale,
     })
-    OrthographicToolbar.pick("ortho-polyline-mode")
+    this.startAnimating()
   },
   
   animate: function(t, dt){
@@ -75,7 +85,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-    floorplan.draw(map.draw.ctx, true)
+    this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
@@ -99,57 +109,3 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
   },
 
 })
-
-function build () {
-	scene = new MX.Scene().addTo("#perspective")
-	scene.camera.radius = 20
-
-  viewHeight = 100
-
-	scene.width = window.innerWidth/2
-	scene.height = window.innerHeight
-	scene.perspective = window.innerHeight
-	
-	cam = scene.camera
-	movements = new MX.Movements(cam, viewHeight)
-	movements.init()
-	movements.lock()
-	movements.velocity(8)
-	app.on("move", function(pos){
-	  cam.x = pos.x
-	  cam.y = pos.y
-	  cam.z = pos.z
-	})
-
-  floorplan = new MX.Image({
-    src: "https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg",
-    keepImage: true,
-    rotationX: -PI/2,
-    rotationY: PI,
-  })
-  scene.add(floorplan)
-  
-  // recenter perspective view by rightclicking map
-  floorplan.el.addEventListener("contextmenu", function(e){
-    e.preventDefault()
-    var offset = offsetFromPoint(e, this)
-    var x = (offset.left - 0.5) * floorplan.width * floorplan.scale
-    var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
-    controls.opt.center.x = -x
-    controls.opt.center.y = 0
-    controls.opt.center.z = -z
-  }, true)
-
-	scene.update()
-
-	controls = new MX.OrbitCamera({
-	  el: scene.el,
-	  radius: 3000,
-	  radiusRange: [ 10, 10000 ],
-	  rotationX: PI/4,
-	  rotationY: PI/2,
-	})
-	controls.init()
-
-	animate(0)
-}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index 741f4fb..ff26c8e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -7,7 +7,7 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 	events: {
     "change [name=blueprint-dimensions]": "changeDimensions",
     "change [name=blueprint-units]": "changeUnits",
-    "click .uploadNewBlueprint": "showBlueprintUpload",
+    "click .uploadNewBlueprint": "showUploader",
 	},
 	
 	initialize: function(opt){
@@ -38,8 +38,8 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
     this.floorplan = new MX.Image ()
 	},
 	
-	showBlueprintUpload: function(){
-	  this.parent.blueprintUpload.show()
+	showUploader: function(){
+	  this.parent.uploader.show()
 	},
 	
 	pick: function(media){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
new file mode 100644
index 0000000..69288f6
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -0,0 +1,69 @@
+var BlueprintToolbar = View.extend({
+
+  el: "#blueprintToolbar",
+
+  events: {
+    "click [data-role=toggle-orbit-mode]": 'toggleOrbitMode',
+    "click [data-role=arrow-mode]": 'arrowMode',
+    "click [data-role=polyline-mode]": 'polylineMode',
+    "click [data-role=ortho-polyline-mode]": 'orthoPolylineMode',
+    "click [data-role=eraser-mode]": 'eraserMode',
+  },
+
+  initialize: function(opt){
+    this.parent = opt.parent
+    
+    this.$modes = this.$('.mode')
+    this.$arrowMode = this.$('[data-role=arrow-mode]')
+    this.$polylineMode = this.$('[data-role=polyline-mode]')
+    this.$orthoPolylineMode = this.$('[data-role=ortho-polyline-mode]')
+    this.$eraserMode = this.$('[data-role=eraser-mode]')
+    
+    this.orthoPolylineMode()
+  },
+  
+  orbiting: true,
+  toggleOrbitMode: function(){
+    this.orbiting = ! this.orbiting
+    if (this.orbiting) {
+      controls.toggle(true)
+      movements.lock()
+    }
+    else {
+      controls.toggle(false)
+      movements.unlock()
+      movements.gravity(true)
+      cam.rotationX = 0
+      cam.rotationY = -cam.rotationY
+      cam.x = 0
+      cam.y = viewHeight
+      cam.z = 0
+    }
+  },
+  
+  setActiveMode: function( $el ) {
+    this.$modes.removeClass('active')
+    $el.addClass('active')
+  },
+  
+  arrowMode: function(){
+    this.setActiveMode( this.$arrowMode )
+    this.parent.map.ui.set_tool("arrow")
+  },
+  
+  polylineMode: function(){
+    this.setActiveMode( this.$polylineMode )
+    this.parent.map.ui.set_tool("polyline")
+  },
+  
+  orthoPolylineMode: function(){
+    this.setActiveMode( this.$orthoPolylineMode )
+    this.parent.map.ui.set_tool("ortho-polyline")
+  },
+  
+  eraserMode: function(){
+    this.setActiveMode( this.$eraserMode )
+    this.parent.map.ui.set_tool("eraser")
+  },
+
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
deleted file mode 100644
index 498575a..0000000
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ /dev/null
@@ -1,128 +0,0 @@
-
-var BlueprintUpload = UploadView.extend({
-	el: ".blueprintUpload",
-	
-	mediaTag: "blueprint",
-	createAction: "/api/media/new",
-	uploadAction: "/api/media/upload",
-	listAction: "/api/media/user",
-	destroyAction: "/api/media/destroy",
-
-	events: {
-		"mousedown": 'stopPropagation',
-    "change .url": "enterUrl",
-    "keydown .url": "enterSetUrl",
-    
-    "click .blueprint": "pick",
-    "click .remove": "destroy",
-  },
-	
-	initialize: function(opt){
-	  this.parent = opt.parent
-	  this.__super__.initialize.call(this)
-
-    this.$url = this.$(".url")
-    this.$blueprints = this.$(".blueprints")
-
-    this.load()
-	},
-	
-  loaded: false,
-	load: function(){
-		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
-	},
-
-	populate: function(data){
-		this.loaded = true
-		if (data && data.length) {
-		  this.$blueprints.show()
-      data.forEach(this.append.bind(this))
-      this.hide()
-      this.parent.blueprintScaler.pick(data[0])
-		}
-		else {
-		  this.show()
-		}
-	},
-	
-	pick: function(e){
-	  var $el = $(e.currentTarget)
-	  var media = $el.data("media")
-	  this.hide()
-	  this.parent.blueprintScaler.pick(media)
-	},
-  
-	destroy: function(e){
-	  e.stopPropagation()
-	  var $el = $(e.currentTarget)
-	  var _id = $el.closest(".blueprint").data("id")
-    $el.remove()
-		$.ajax({
-			type: "delete",
-			url: this.destroyAction,
-			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
-		}).complete(function(){
-		})
-	},
-	
-	show: function(){
-    this.toggle(true)
-	},
-	hide: function(){
-		this.toggle(false)
-	},
-	toggle: function (state) {
-    this.$el.toggleClass("active", state)
-	},
-
-	addUrl: function (url){
-		Parser.loadImage(url, function(media){
-			if (! media) return
-			media._csrf = $("[name=_csrf]").val()
-			media.tag = this.mediaTag
-			
-			var request = $.ajax({
-				type: "post",
-				url: this.createAction,
-				data: media,
-			})
-			request.done(this.add.bind(this))
-			
-		}.bind(this))
-	},
-  enterUrl: function(){
-  	var url = this.$url.sanitize()
-  	this.addUrl(url)
-  	this.$url.val("")
-  },
-	enterSetUrl: function (e) {
-		e.stopPropagation()
-		if (e.keyCode == 13) {
-			setTimeout(this.enterUrl.bind(this), 100)
-		}
-	},
-	
-	add: function(media){
-    this.$blueprints.show()
-	  this.append(media)
-	  this.hide()
-	  this.parent.blueprintScaler.pick(media)
-	},
-
-	append: function(media){
-	  var $el = $("<span>")
-	  var img = new Image ()
-	  img.src = media.url
-	  var remove = document.createElement("span")
-	  remove.className = "remove"
-	  remove.innerHTML = "<span>x</span>"
-	  
-	  $el.data("id", media._id)
-	  $el.data("media", media)
-	  $el.append(img)
-	  $el.append(remove)
-	  $el.addClass("blueprint")
-	  this.$blueprints.append($el)
-	},
-	
-})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
new file mode 100644
index 0000000..aeb7d9c
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -0,0 +1,126 @@
+
+var BlueprintUploader = UploadView.extend({
+	el: ".blueprintUploader",
+	
+	mediaTag: "blueprint",
+	createAction: "/api/media/new",
+	uploadAction: "/api/media/upload",
+	listAction: "/api/media/user",
+	destroyAction: "/api/media/destroy",
+
+	events: {
+		"mousedown": 'stopPropagation',
+    "change .url": "enterUrl",
+    "keydown .url": "enterSetUrl",
+    
+    "click .blueprint": "pick",
+    "click .remove": "destroy",
+  },
+	
+	initialize: function(opt){
+	  this.parent = opt.parent
+	  this.__super__.initialize.call(this)
+
+    this.$url = this.$(".url")
+    this.$blueprints = this.$(".blueprints")
+	},
+	
+  loaded: false,
+	load: function(){
+		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
+	},
+
+	populate: function(data){
+		this.loaded = true
+		if (data && data.length) {
+		  this.$blueprints.show()
+      data.forEach(this.append.bind(this))
+      this.hide()
+      this.parent.scaler.pick(data[0])
+		}
+		else {
+		  this.show()
+		}
+	},
+	
+	pick: function(e){
+	  var $el = $(e.currentTarget)
+	  var media = $el.data("media")
+	  this.hide()
+	  this.parent.scaler.pick(media)
+	},
+  
+	destroy: function(e){
+	  e.stopPropagation()
+	  var $el = $(e.currentTarget)
+	  var _id = $el.closest(".blueprint").data("id")
+    $el.remove()
+		$.ajax({
+			type: "delete",
+			url: this.destroyAction,
+			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
+		}).complete(function(){
+		})
+	},
+	
+	show: function(){
+    this.toggle(true)
+	},
+	hide: function(){
+		this.toggle(false)
+	},
+	toggle: function (state) {
+    this.$el.toggleClass("active", state)
+	},
+
+	addUrl: function (url){
+		Parser.loadImage(url, function(media){
+			if (! media) return
+			media._csrf = $("[name=_csrf]").val()
+			media.tag = this.mediaTag
+			
+			var request = $.ajax({
+				type: "post",
+				url: this.createAction,
+				data: media,
+			})
+			request.done(this.add.bind(this))
+			
+		}.bind(this))
+	},
+  enterUrl: function(){
+  	var url = this.$url.sanitize()
+  	this.addUrl(url)
+  	this.$url.val("")
+  },
+	enterSetUrl: function (e) {
+		e.stopPropagation()
+		if (e.keyCode == 13) {
+			setTimeout(this.enterUrl.bind(this), 100)
+		}
+	},
+	
+	add: function(media){
+    this.$blueprints.show()
+	  this.append(media)
+	  this.hide()
+	  this.parent.scaler.pick(media)
+	},
+
+	append: function(media){
+	  var $el = $("<span>")
+	  var img = new Image ()
+	  img.src = media.url
+	  var remove = document.createElement("span")
+	  remove.className = "remove"
+	  remove.innerHTML = "<span>x</span>"
+	  
+	  $el.data("id", media._id)
+	  $el.data("media", media)
+	  $el.append(img)
+	  $el.append(remove)
+	  $el.addClass("blueprint")
+	  this.$blueprints.append($el)
+	},
+	
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 0a06fda..cf627d9 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -9,17 +9,20 @@ var BlueprintView = View.extend({
 	
 	initialize: function(){
 // 		this.info = new BuilderInfo ({ parent: this })
-// 		this.toolbar = new BuilderToolbar ({ parent: this })
 // 		this.settings = new BuilderSettings ({ parent: this })
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
-    this.blueprintUpload = new BlueprintUpload ({ parent: this })
-    this.blueprintScaler = new BlueprintScaler ({ parent: this })
+    this.map = this.buildMap()
+		this.editor = new BlueprintEditor ({ parent: this })
+		this.toolbar = new BlueprintToolbar ({ parent: this })
+    this.uploader = new BlueprintUploader ({ parent: this })
+    this.scaler = new BlueprintScaler ({ parent: this })
 	},
 
 	load: function(name){
 		if (! name || name == "new") {
 // 			this.ready({ isNew: true, _id: "new", name: "" })
+      this.uploader.load()
 			return
 		}
 		
@@ -28,6 +31,26 @@ var BlueprintView = View.extend({
 		$.get(this.action + name, this.ready.bind(this))
 	},
 	
+	buildMap: function(){
+	  // i forget if this has to be global
+    map = new Map ({
+      type: "ortho",
+      el: document.querySelector("#orthographic"),
+      width: window.innerWidth/2,
+      height: window.innerHeight,
+      zoom: -2,
+      zoom_min: -6.2,
+      zoom_max: 1,
+    })
+    map.ui.add_tool("arrow", new ArrowTool)
+    map.ui.add_tool("polyline", new PolylineTool)
+    map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
+    map.ui.add_tool("eraser", new EraserTool)
+    map.ui.add_tool("position", new PositionTool)
+    map.ui.placing = false
+    return map
+	},
+	
 	ready: function(data){
 // 		this.settings.load(data)
 // 		this.info.load(data)
@@ -37,6 +60,7 @@ var BlueprintView = View.extend({
 	},
 	
 	useFloorplan: function(media){
+	  this.editor.loadFloorplan(media)
 	},
 
 	pickWall: function(wall, pos){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6507cc1..2fef578 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -53,9 +53,11 @@ body.noOverflow{
   overflow:hidden;
 }
 
-body.loading * {
-	-webkit-transition: all 0 ease 0 !important;
-	transition: all 0 ease 0 !important;
+body.loading *,
+body.loading .animate {
+  opacity: 0.2;
+	-webkit-transition: none !important;
+	transition: none !important;
 }
 
 html, body {
@@ -72,7 +74,7 @@ body.pastePaper .wallpaper.active span:hover{
   cursor:url(../img/paintbucket.png), auto;
 }
 
-a{
+a {
   color:black;
 	text-decoration: none;
 }
@@ -1502,7 +1504,8 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
   cursor:pointer;
 }
 
-.menu span.inuse {
+.menu span.inuse,
+.menu span.active {
   color:white;
   background:black;
   cursor:pointer;
@@ -3255,7 +3258,7 @@ a[data-role="forgot-password"] {
 
 /* blueprint upload box */
 
-.blueprintUpload {
+.blueprintUploader {
   -webkit-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
   width: 340px;
@@ -3271,17 +3274,17 @@ a[data-role="forgot-password"] {
   margin-top: -200px;
   opacity: 0;
 }
-.blueprintUpload.active {
+.blueprintUploader.active {
   -webkit-transform: translate3D(0,0,0);
   transform: translate3D(0,0,0);
   opacity: 1;
 }
-.blueprintUpload .toolButton {
+.blueprintUploader .toolButton {
   float: none;
   width: 108px;
   display: inline-block;
 }
-.blueprintUpload .url {
+.blueprintUploader .url {
   font-size: 15px;
   border: 1px solid #888;
   padding: 2px;
@@ -3291,14 +3294,14 @@ a[data-role="forgot-password"] {
   margin-right: 10px;
   width: 190px;
 }
-.blueprintUpload p {
+.blueprintUploader p {
   font-weight: 300;
   font-size: 13px;
 }
-.blueprintUpload .blueprints {
+.blueprintUploader .blueprints {
   display: none;
 }
-.blueprintUpload .blueprints h5 {
+.blueprintUploader .blueprints h5 {
   width: 250px;
   margin: 10px auto;
   padding-top: 9px;
@@ -3332,7 +3335,7 @@ a[data-role="forgot-password"] {
   position: relative;
   top: -2px;
 }
-.blueprintUpload .wallpaperUpload .upload-icon {
+.blueprintUploader .wallpaperUpload .upload-icon {
   margin: 0 4px;
 }
 .uploadNewBlueprint {
diff --git a/views/blueprint.ejs b/views/blueprint.ejs
index 7e13318..e68e106 100644
--- a/views/blueprint.ejs
+++ b/views/blueprint.ejs
@@ -13,7 +13,7 @@
 		
 		<div id="builderView">
 			[[ include controls/builder/info ]]
-			[[ include controls/builder/toolbar ]]
+			[[ include controls/blueprint/toolbar ]]
 			[[ include controls/builder/settings ]]
       [[ include controls/blueprint/editor ]]
       [[ include controls/blueprint/scaler ]]
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index 5334f85..0dbac8e 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -12,21 +12,6 @@
 	left:50%;
 	top:0px
 }
-.hud {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 10px;
-  background: white;
-}
-.ortho-hud {
-  left: 50%;
-  border-left: 1px solid black;
-}
-#url { width: 300px }
-.hud span { color: #888; cursor: pointer; }
-.hud span.active { color: #000; }
-
 .blueprintInfo {
   bottom: 14px;
   left: 10px;
@@ -47,18 +32,5 @@
 <div id="blueprintView">
   <div id="perspective"></div>
   <div id="orthographic"></div>
-
-  <div class="hud persp-hud">
-    <input type="text" id="url" placeholder="paste an image URL here!">
-    <span class="ion-ionic active" data-role="orbit-mode"></span>
-    <span class="ion-archive" data-role="keyboard-mode"></span>
-  </div>
-
-  <div class="hud ortho-hud">
-    <span class="ion-navigate" data-role="arrow-mode"></span>
-    <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
-    <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
-    <span class="ion-scissors" data-role="eraser-mode"></span>
-  </div>
 </div>
 
diff --git a/views/controls/blueprint/scaler.ejs b/views/controls/blueprint/scaler.ejs
index 972b82a..82fd2b2 100644
--- a/views/controls/blueprint/scaler.ejs
+++ b/views/controls/blueprint/scaler.ejs
@@ -1,7 +1,7 @@
 <div class="mediaDrawer fixed animate active blueprintScaler">
   <div class="box">
 
-    <div class="blueprintUpload">
+    <div class="blueprintUploader">
       <h2>Upload your Blueprint</h2>
       <p>
         Upload an image which you will trace to make a floor plan.
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
new file mode 100644
index 0000000..13e99ec
--- /dev/null
+++ b/views/controls/blueprint/toolbar.ejs
@@ -0,0 +1,35 @@
+<div class="edit menu vvbox" id="blueprintToolbar">
+	<span
+		data-role='toggle-orbit-mode'
+		data-info="toggle 3D mode"
+		class="ion-ios-photos-outline"></span>
+
+  <span
+    data-role="arrow-mode"
+		data-info="move endpoints"
+    class="ion-navigate mode"></span>
+
+  <span
+    data-role="polyline-mode"
+		data-info="draw walls"
+    class="ion-ios-pulse mode"></span>
+
+  <span
+    data-role="ortho-polyline-mode"
+		data-info="draw right-angled walls"
+    class="ion-ios-grid-view-outline mode"></span>
+
+  <span
+    data-role="eraser-mode"
+		data-info="remove walls"
+    class="ion-scissors mode"></span>
+
+	<span
+		data-role='toggle-layout-settings'
+		data-info="save layout"
+		class="ion-ios-compose-outline"></span>
+</div>
+<!-- 
+    <span class="ion-ionic active" data-role="orbit-mode"></span>
+    <span class="ion-archive" data-role="keyboard-mode"></span>
+ -->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2c3d5ac..909309e 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -19,9 +19,12 @@
 <script type="text/javascript" src="/assets/javascripts/util.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/mx/mx.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movementsMobile.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script>
@@ -29,6 +32,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.soundcloud.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.point.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.polyline.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
@@ -132,7 +136,8 @@
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUploader.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 1807ea009f23ac446cb103005045942b733ffc61 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 15:56:15 -0400
Subject: edit scale

---
 .../javascripts/ui/blueprint/BlueprintEditor.js    |   2 +-
 .../javascripts/ui/blueprint/BlueprintScaler.js    |  32 +++++--
 .../javascripts/ui/blueprint/BlueprintToolbar.js   |   8 ++
 .../javascripts/ui/blueprint/BlueprintUploader.js  |  12 +--
 .../javascripts/ui/blueprint/BlueprintView.js      |   2 +-
 server/index.js                                    |   7 +-
 server/lib/api/blueprint.js                        | 105 +++++++++++++++++++++
 server/lib/api/index.js                            |   1 +
 server/lib/api/media.js                            |  16 ----
 server/lib/schemas/Blueprint.js                    |  53 +++++++++++
 views/controls/blueprint/toolbar.ejs               |   6 ++
 11 files changed, 210 insertions(+), 34 deletions(-)
 create mode 100644 server/lib/api/blueprint.js
 create mode 100644 server/lib/schemas/Blueprint.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 545de7b..cc469b6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -64,7 +64,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
   },
   
   loadFloorplan: function(media){
-    console.log(media)
+    // console.log(media)
     this.floorplan.load({
       media: media,
       keepImage: true,
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index ff26c8e..0f2fdcd 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -2,7 +2,7 @@
 var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 	el: ".blueprintScaler",
 	
-	action: "/api/media/scale",
+	action: "/api/blueprint/scale",
 	
 	events: {
     "change [name=blueprint-dimensions]": "changeDimensions",
@@ -26,8 +26,8 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
       width: window.innerWidth,
       height: window.innerHeight,
       zoom: -2,
-      zoom_min: -6.2,
-      zoom_max: 1,
+      zoom_min: -7.0,
+      zoom_max: 2,
     })
     this.lineTool = new LineTool
     this.map.ui.add_tool("line", this.lineTool)
@@ -42,17 +42,27 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 	  this.parent.uploader.show()
 	},
 	
-	pick: function(media){
+	pick: function(media, shouldEdit){
 	  this.media = media
-    
-    if (!! media.units) {
+
+    this.floorplan.load({ media: media, scale: 1, keepImage: true })
+
+    if (!! media.units && ! shouldEdit) {
       this.parent.useFloorplan(media)
       this.hide()
       this.stopAnimating()
       return
     }
 
-    this.floorplan.load({ media: media, keepImage: true })
+    if (media.units && media.line && media.scale) {
+      var points = media.line.split(",")
+      this.lineTool.line[0] = new vec2( +points[0], +points[1] )
+      this.lineTool.line[1] = new vec2( +points[2], +points[3] )
+
+      app.units = media.units
+      this.$units.val( media.units )
+      this.$dimensions.unitVal( media.scale * this.lineLength() )
+    }
 
     this.startAnimating()
 	},
@@ -65,8 +75,9 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 
     this.floorplan.draw(this.map.draw.ctx, true)
     
+    this.map.draw.ctx.save()
     this.map.draw.ctx.strokeStyle = "#f00"
-    this.map.draw.ctx.lineWidth = 2/map.zoom
+    this.map.draw.ctx.lineWidth = 1/map.zoom
     switch (this.lineTool.line.length) {
       case 1:
         this.map.draw.line(
@@ -85,6 +96,7 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
         )
         break
     }
+    this.map.draw.ctx.restore()
 
     this.map.draw.coords()
 
@@ -125,15 +137,17 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 	showErrors: function(){},
 	
 	serialize: function(){
-    var fd = new FormData()
+    var fd = new FormData(), line = this.lineTool.line
     fd.append( "_id", this.media._id)
     fd.append( "units", this.$units.val() )
     fd.append( "scale", this.$dimensions.unitVal() / this.lineLength() )
+    fd.append( "line", [line[0].a,line[0].b,line[1].a,line[1].b].join(",") )
     fd.append( "_csrf", $("[name=_csrf]").val())
     return fd
 	},
 	
 	success: function(){
+	  this.media.scale = this.$dimensions.unitVal() / this.lineLength()
     this.stopAnimating()
     this.parent.useFloorplan(this.media)
     this.hide()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 69288f6..a21a0ef 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -3,6 +3,7 @@ var BlueprintToolbar = View.extend({
   el: "#blueprintToolbar",
 
   events: {
+    "click [data-role=upload-floorplan]": 'showUploader',
     "click [data-role=toggle-orbit-mode]": 'toggleOrbitMode',
     "click [data-role=arrow-mode]": 'arrowMode',
     "click [data-role=polyline-mode]": 'polylineMode',
@@ -14,6 +15,7 @@ var BlueprintToolbar = View.extend({
     this.parent = opt.parent
     
     this.$modes = this.$('.mode')
+    this.$toggleOrbitMode = this.$('[data-role=toggle-orbit-mode]')
     this.$arrowMode = this.$('[data-role=arrow-mode]')
     this.$polylineMode = this.$('[data-role=polyline-mode]')
     this.$orthoPolylineMode = this.$('[data-role=ortho-polyline-mode]')
@@ -22,9 +24,15 @@ var BlueprintToolbar = View.extend({
     this.orthoPolylineMode()
   },
   
+  showUploader: function(){
+    this.parent.scaler.show()
+    this.parent.uploader.show()
+  },
+  
   orbiting: true,
   toggleOrbitMode: function(){
     this.orbiting = ! this.orbiting
+    this.$toggleOrbitMode.toggleClass("inuse", ! this.orbiting)
     if (this.orbiting) {
       controls.toggle(true)
       movements.lock()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index aeb7d9c..676976f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -3,10 +3,10 @@ var BlueprintUploader = UploadView.extend({
 	el: ".blueprintUploader",
 	
 	mediaTag: "blueprint",
-	createAction: "/api/media/new",
-	uploadAction: "/api/media/upload",
-	listAction: "/api/media/user",
-	destroyAction: "/api/media/destroy",
+	createAction: "/api/blueprint/new",
+	uploadAction: "/api/blueprint/upload",
+	listAction: "/api/blueprint/user",
+	destroyAction: "/api/blueprint/destroy",
 
 	events: {
 		"mousedown": 'stopPropagation',
@@ -47,7 +47,7 @@ var BlueprintUploader = UploadView.extend({
 	  var $el = $(e.currentTarget)
 	  var media = $el.data("media")
 	  this.hide()
-	  this.parent.scaler.pick(media)
+	  this.parent.scaler.pick(media, true)
 	},
   
 	destroy: function(e){
@@ -104,7 +104,7 @@ var BlueprintUploader = UploadView.extend({
     this.$blueprints.show()
 	  this.append(media)
 	  this.hide()
-	  this.parent.scaler.pick(media)
+	  this.parent.scaler.pick(media, true)
 	},
 
 	append: function(media){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index cf627d9..4cb9138 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -2,7 +2,7 @@
 var BlueprintView = View.extend({
 	el: "#blueprintView",
 
-	action: "/api/layout/",
+	action: "/api/blueprint/",
 
 	events: {
 	},
diff --git a/server/index.js b/server/index.js
index 078db8e..421a6a7 100644
--- a/server/index.js
+++ b/server/index.js
@@ -159,9 +159,14 @@ site.route = function () {
 	app.get('/api/media/user', middleware.ensureAuthenticated, api.media.user)
 	app.post('/api/media/new', middleware.ensureAuthenticated, api.media.create)
 	app.post('/api/media/upload', middleware.ensureAuthenticated, api.media.upload)
-	app.post('/api/media/scale',  middleware.ensureAuthenticated, api.media.scale)
 	app.delete('/api/media/destroy', middleware.ensureAuthenticated, api.media.destroy)
 
+	app.post('/api/blueprint/new', middleware.ensureAuthenticated, api.blueprint.create)
+	app.post('/api/blueprint/upload', middleware.ensureAuthenticated, api.blueprint.upload)
+	app.get('/api/blueprint/user', middleware.ensureAuthenticated, api.blueprint.user)
+	app.post('/api/blueprint/scale',  middleware.ensureAuthenticated, api.blueprint.scale)
+	app.delete('/api/blueprint/destroy', middleware.ensureAuthenticated, api.blueprint.destroy)
+
 	app.get('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensurePlans, api.subscription.middleware.ensureSubscription, api.subscription.show)
 	app.put('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensureSubscription, api.subscription.update)
 	app.put('/api/subscription/sync', middleware.ensureAuthenticated, api.subscription.middleware.ensurePlans, api.subscription.middleware.ensureSubscription, api.subscription.sync)
diff --git a/server/lib/api/blueprint.js b/server/lib/api/blueprint.js
new file mode 100644
index 0000000..a932383
--- /dev/null
+++ b/server/lib/api/blueprint.js
@@ -0,0 +1,105 @@
+/* jshint node: true */
+
+var _ = require('lodash'),
+	crypto = require('crypto'),
+	util = require('../util'),
+	upload = require('../upload'),
+	config = require('../../../config.json'),
+	Blueprint = require('../schemas/Blueprint');
+
+var blueprint = {
+
+	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
+	  var query = { user_id: req.user._id }
+	  if (req.query.tag) {
+	    query.tag = req.query.tag
+	  }
+		Blueprint.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
+	},
+	
+	create: function(req, res){
+		var data = util.cleanQuery(req.body)
+		data.user_id = req.user._id
+		data.created_at = new Date ()
+		
+		if (data.tag) {
+		  data.tag = util.sanitize(data.tag)
+		}
+
+		new Blueprint(data).save(function(err, rec){
+			if (err || ! rec) { return res.json({ error: err }) }
+			return res.json(rec)
+		})
+	},
+	
+	upload: function(req, res){
+		var data = util.cleanQuery(req.body)
+		data.user_id = req.user._id
+		data.created_at = new Date ()
+		data.type = "image"
+		
+		upload.put("media", req.files.image, {
+			username: req.user.username,
+			unacceptable: function(err){
+				res.json({ error: { errors: { media: { message: "Problem saving image: " + err } } } })
+			},
+			success: function(url){
+				data.url = url
+				done()
+			}
+		})
+		
+		function done () {
+			new Blueprint(data).save(function(err, rec) {
+				if (err || ! rec) { return res.json({ error: err }) }
+				res.json(rec)
+			})
+		}
+	},
+	
+	scale: function(req, res){
+	  var _id = req.body._id
+		var data = util.cleanQuery(req.body)
+    if (! _id) { return res.json({ error: 404 }) }
+	  Blueprint.findOne({ _id: _id }, function(err, doc){
+			if (! doc) { return res.json({ error: 404 }) }
+			if (String(doc.user_id) !== String(req.user._id)) { return res.json({ error: 404 }) }
+			doc.scale = data.scale
+			doc.units = data.units
+			doc.line = data.line
+			console.log(doc)
+			doc.save(function(err, rec){
+				if (err || ! rec) { return res.json({ error: err }) }
+				res.json(rec)
+			})
+		})
+	},
+	
+	destroy: function(req, res){
+		var _id = util.sanitize(req.body._id)
+		if (! _id || ! _id.length) {
+			res.json({ error: 404 })
+			return
+		}
+		Blueprint.findOne({ _id: _id }, function(err, doc){
+			if (! doc) { return res.json({ error: 404 }) }
+			if (String(doc.user_id) !== String(req.user._id)) {
+				 return res.json({ error: "access denied" })
+			}
+			Blueprint.remove({ _id: _id }, function(err){
+				res.json({ status: "OK" })
+			})
+		})
+	}
+
+}
+
+module.exports = blueprint
diff --git a/server/lib/api/index.js b/server/lib/api/index.js
index 9478d9b..8254232 100644
--- a/server/lib/api/index.js
+++ b/server/lib/api/index.js
@@ -1,6 +1,7 @@
 /* jshint node: true */
 
 var api = {
+	blueprint: require('./blueprint'),
 	docs: require('./docs'),
 	layouts: require('./layouts'),
 	media: require('./media'),
diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 68e012c..85cbdd6 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -65,22 +65,6 @@ var media = {
 		}
 	},
 	
-	scale: function(req, res){
-	  var _id = req.body._id
-		var data = util.cleanQuery(req.body)
-    if (! _id) { return res.json({ error: 404 }) }
-	  Media.findOne({ _id: _id }, function(err, doc){
-			if (! doc) { return res.json({ error: 404 }) }
-			if (String(doc.user_id) !== String(req.user._id)) { return res.json({ error: 404 }) }
-			doc.scale = data.scale
-			doc.units = data.units
-			doc.save(function(err, rec){
-				if (err || ! rec) { return res.json({ error: err }) }
-				res.json(rec)
-			})
-		})
-	},
-	
 	destroy: function(req, res){
 		var _id = util.sanitize(req.body._id)
 		if (! _id || ! _id.length) {
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
new file mode 100644
index 0000000..40e67d8
--- /dev/null
+++ b/server/lib/schemas/Blueprint.js
@@ -0,0 +1,53 @@
+/* jshint node: true */
+
+var mongoose = require('mongoose'),
+	_ = require('lodash'),
+	util = require('../util');
+
+var BlueprintSchema = new mongoose.Schema({
+	type: {
+		type: String,
+		required: true
+	},
+	url: {
+		type: String,
+		required: true,
+	},
+	token: {
+		type: String,
+		default: ""
+	},
+	thumbnail: {
+		type: String,
+		default: ""
+	},
+	width: {
+		type: Number,
+		default: 0
+	},
+	height: {
+		type: Number,
+		default: 0
+	},
+	title: {
+		type: String,
+		default: ""
+	},
+	description: {
+		type: String,
+		default: ""
+	},
+	tag: { type: String, default: "" },
+	scale: { type: Number, default: 1.0 },
+	
+	widthDimension: { type: Number },
+	heightDimension: { type: Number },
+	units: { type: String },
+	line: { type: String },
+	
+	user_id: { type: mongoose.Schema.ObjectId, index: true },
+	created_at: { type: Date },
+});
+
+module.exports = exports = mongoose.model('blueprint', BlueprintSchema)
+exports.schema = BlueprintSchema;
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
index 13e99ec..82cbcba 100644
--- a/views/controls/blueprint/toolbar.ejs
+++ b/views/controls/blueprint/toolbar.ejs
@@ -1,4 +1,10 @@
 <div class="edit menu vvbox" id="blueprintToolbar">
+
+  <span
+		data-role='upload-floorplan'
+		data-info="upload a new floorplan"
+		class="ion-ios-upload-outline"></span>
+
 	<span
 		data-role='toggle-orbit-mode'
 		data-info="toggle 3D mode"
-- 
cgit v1.2.3-70-g09d2


From 46980b02b80ea94a9df57dc304d204e6feec0476 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 16:35:04 -0400
Subject: resizing stuff and orbitcamera fix

---
 .../javascripts/mx/extensions/mx.orbitCamera.js    |  4 ++--
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 26 ++++++++++++++--------
 .../javascripts/ui/blueprint/BlueprintToolbar.js   |  8 +++----
 .../javascripts/ui/blueprint/BlueprintView.js      |  3 ++-
 4 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
index f4759fb..a936cef 100644
--- a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
+++ b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
@@ -88,8 +88,8 @@ MX.OrbitCamera = function(opt){
 	    radius = opt.radius
 	  }
 		opt.camera.x = opt.center.x + radius * sin(rx) * cos(ry)
-		opt.camera.z = opt.center.y + radius * sin(rx) * sin(ry)
-		opt.camera.y = opt.center.z + radius * cos(rx)
+		opt.camera.y = opt.center.y + radius * cos(rx)
+		opt.camera.z = opt.center.z + radius * sin(rx) * sin(ry)
  		opt.camera.rotationX = PI/2 - rx
  		opt.camera.rotationY = ry + PI/2
 	}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index cc469b6..72c129a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -8,14 +8,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
   initialize: function(opt){
     this.parent = opt.parent
 
-/*
-    $(window).resize(function(){
-      scene.width = window.innerWidth/2
-      scene.height = window.innerHeight
-      map.canvas.width = map.dimensions.a = window.innerWidth/2
-      map.canvas.height = map.dimensions.b = window.innerHeight/2
-    })
-*/
+    $(window).resize(this.resize.bind(this))
 
     scene = new MX.Scene().addTo("#perspective")
     scene.camera.radius = 20
@@ -48,7 +41,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
       controls.opt.center.x = -x
       controls.opt.center.y = 0
-      controls.opt.center.z = -z
+      controls.opt.center.z = z
     }, true)
 
     scene.update()
@@ -63,6 +56,21 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     controls.init()
   },
   
+  resize: function(){
+    if (this.parent.orbiting) {
+      scene.width = window.innerWidth/2
+      scene.height = window.innerHeight
+      this.parent.map.canvas.width = this.parent.map.dimensions.a = window.innerWidth/2
+      this.parent.map.canvas.height = this.parent.map.dimensions.b = window.innerHeight
+      this.parent.map.canvas.style.display = "block"
+    }
+    else {
+      scene.width = window.innerWidth
+      scene.height = window.innerHeight
+      this.parent.map.canvas.style.display = "none"
+    }
+  },
+  
   loadFloorplan: function(media){
     // console.log(media)
     this.floorplan.load({
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index a21a0ef..5f313fd 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -29,11 +29,11 @@ var BlueprintToolbar = View.extend({
     this.parent.uploader.show()
   },
   
-  orbiting: true,
   toggleOrbitMode: function(){
-    this.orbiting = ! this.orbiting
-    this.$toggleOrbitMode.toggleClass("inuse", ! this.orbiting)
-    if (this.orbiting) {
+    this.parent.orbiting = ! this.parent.orbiting
+    this.$toggleOrbitMode.toggleClass("inuse", ! this.parent.orbiting)
+    this.parent.editor.resize()
+    if (this.parent.orbiting) {
       controls.toggle(true)
       movements.lock()
     }
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 4cb9138..e84fc30 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -30,7 +30,8 @@ var BlueprintView = View.extend({
 		
 		$.get(this.action + name, this.ready.bind(this))
 	},
-	
+
+  orbiting: true,
 	buildMap: function(){
 	  // i forget if this has to be global
     map = new Map ({
-- 
cgit v1.2.3-70-g09d2


From 72afc148b11ac57c991d699c205675b4b0f1cf70 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 19:35:02 -0400
Subject: set wall height

---
 public/assets/javascripts/defaults.js              |  1 +
 .../javascripts/mx/primitives/mx.polyline.js       | 11 +++++++++--
 .../javascripts/rectangles/engine/map/_map.js      |  2 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  2 +-
 .../javascripts/ui/blueprint/BlueprintInfo.js      | 23 ++++++++--------------
 .../javascripts/ui/blueprint/BlueprintScaler.js    |  4 ++--
 .../javascripts/ui/blueprint/BlueprintView.js      |  7 ++-----
 public/assets/test/ortho2.html                     |  6 +++---
 public/assets/test/ortho3.html                     |  2 +-
 public/assets/test/ortho4.html                     |  2 +-
 views/controls/blueprint/info.ejs                  |  2 --
 11 files changed, 29 insertions(+), 33 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 413bb13..1e1ac5b 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -1,6 +1,7 @@
 app = window.app || {}
 app.defaults = {
 	viewHeight: window.viewHeight = 186,
+	wallHeight: 397,
 	units: app.units = "ft",
 	footResolution: 36,
 	meterResolution: 100,
diff --git a/public/assets/javascripts/mx/primitives/mx.polyline.js b/public/assets/javascripts/mx/primitives/mx.polyline.js
index 555b3c6..63c0ef8 100644
--- a/public/assets/javascripts/mx/primitives/mx.polyline.js
+++ b/public/assets/javascripts/mx/primitives/mx.polyline.js
@@ -28,16 +28,23 @@ MX.Polyline = MX.Object3D.extend({
     var angle = atan2( head.b - tail.b, head.a - tail.a )
     mx.move({
       x: mid_x / 2,
-      y: wall_height/2 + 1,
+      y: wallHeight/2 + 1,
       z: mid_z / 2,
       width: ceil(len),
-      height: wall_height,
+      height: wallHeight,
       rotationY: angle
     })
     var hue = abs(round( angle / PI * 90 + 300))
     mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
   },
   
+  set_height: function(height){
+    for (var i = 0; i < this.faces.length; i++) {
+      this.faces[i].height = height
+      this.faces[i].y = height / 2 + 1
+    }
+  },
+  
   destroy: function(){
     this.faces.forEach(function(mx){
       scene.remove(mx)
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index e3d7621..2aee962 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -51,7 +51,7 @@ var Map = function(opt){
 		case "ortho":
 			base.draw = new Map.Draw (base, { ortho: true })
 			base.ui = new Map.UI.Ortho (base)
-			base.sides = base.sides_for_camera
+			base.sides = base.sides_for_center
 			$(window).resize(base.resize)
 			break
 		
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 72c129a..73f21c0 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -1,5 +1,5 @@
 
-var wall_height = 180
+var wallHeight = 180
 var shapes = new ShapeList
 var last_point = new vec2 (0,0)
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintInfo.js b/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
index ad462ae..6dd6a7d 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
@@ -5,15 +5,16 @@ var BlueprintInfo = View.extend({
 	events: {
 	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
+		"change [name=height]": 'changeHeight',
 		"keydown [name=height]": 'enterHeight',
 		"change [name=units]": 'changeUnits',
 		"keydown [name=viewHeight]": 'enterViewHeight',
 		"change [name=viewHeight]": 'changeViewHeight',
-		"click [data-role=destroy-room]": 'destroy',
 	},
 	
 	initialize: function(opt){
 		this.parent = opt.parent
+		this.$height = this.$("[name=height]")
 		this.$units = this.$("[name=units]")
 		this.$viewHeight = this.$("[name=viewHeight]")
 		this.$unitName = this.$(".unitName")
@@ -21,8 +22,10 @@ var BlueprintInfo = View.extend({
 	
 	load: function(data){
 		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
+		this.$height.unitVal( window.wallHeight = data.wallHeight || app.defaults.wallHeight )
 		this.$units.val( data.units )
 		this.$unitName.html( data.units )
+		this.show()
 	},
 
 	toggle: function(state){
@@ -35,17 +38,10 @@ var BlueprintInfo = View.extend({
 	},
 	
 	hide: function(){
-	  this.room = null
 		this.toggle(false)
 	},
-
-	room: null,
-	
-	pick: function(room){
-	},
 	
 	deselect: function(){
-	  this.room = null
 	  this.toggle(true)
 	},
 
@@ -54,13 +50,10 @@ var BlueprintInfo = View.extend({
 	},
 	changeHeight: function(e){
 		e.stopPropagation()
-		var height = this.room.height = this.$height.unitVal()
-		if (window.heightIsGlobal) {
-		  Rooms.forEach(function(room){
-		    room.height = height
-		  })
-		}
-    Rooms.rebuild()
+		window.wallHeight = this.$height.unitVal()
+		shapes.forEach(function(line){
+      line.mx.set_height( window.wallHeight )
+    })
 	},
 	changeUnits: function(){
 		app.units = this.$units.val()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index 0f2fdcd..5bd2229 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -48,7 +48,7 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
     this.floorplan.load({ media: media, scale: 1, keepImage: true })
 
     if (!! media.units && ! shouldEdit) {
-      this.parent.useFloorplan(media)
+      this.parent.ready(media)
       this.hide()
       this.stopAnimating()
       return
@@ -149,7 +149,7 @@ var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 	success: function(){
 	  this.media.scale = this.$dimensions.unitVal() / this.lineLength()
     this.stopAnimating()
-    this.parent.useFloorplan(this.media)
+    this.parent.ready(this.media)
     this.hide()
 	},
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index a59f44f..f919cc7 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -54,16 +54,13 @@ var BlueprintView = View.extend({
 	
 	ready: function(data){
 // 		this.settings.load(data)
-// 		this.info.load(data)
+		this.info.load(data)
+	  this.editor.loadFloorplan(data)
 	},
 	
 	hideExtras: function(){
 	},
 	
-	useFloorplan: function(media){
-	  this.editor.loadFloorplan(media)
-	},
-
 	pickWall: function(wall, pos){
 	},
 
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 013c75b..448f029 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -167,7 +167,7 @@ $(window).resize(function(){
   map.canvas.width = map.dimensions.a = window.innerWidth/2
 })
 
-var wall_height = 180
+var wallHeight = 180
 var placing = false
 var points, mx_points = []
 var shapes = []
@@ -219,10 +219,10 @@ function add_mx_polyline_face(head, tail){
   var angle = atan2( head.b - tail.b, head.a - tail.a )
   mx.move({
     x: mid_x / 2,
-    y: wall_height/2 + 1,
+    y: wallHeight/2 + 1,
     z: mid_z / 2,
     width: ceil(len),
-    height: wall_height,
+    height: wallHeight,
     rotationY: angle
   })
   var hue = abs(round( angle / PI * 90 + 300))
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index f41a0ba..71e43f1 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -112,7 +112,7 @@ $(window).resize(function(){
   map.canvas.width = map.dimensions.a = window.innerWidth/2
 })
 
-var wall_height = 180
+var wallHeight = 180
 var shapes = new ShapeList
 var ctx = map.draw.ctx
 var last_point = new vec2 (0,0)
diff --git a/public/assets/test/ortho4.html b/public/assets/test/ortho4.html
index d704e0e..8db7ead 100644
--- a/public/assets/test/ortho4.html
+++ b/public/assets/test/ortho4.html
@@ -165,7 +165,7 @@ $(window).resize(function(){
   map.canvas.height = map.dimensions.b = window.innerHeight/2
 })
 
-var wall_height = 180
+var wallHeight = 180
 var shapes = new ShapeList
 var ctx = map.draw.ctx
 var last_point = new vec2 (0,0)
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index f994629..9f7d708 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -4,8 +4,6 @@
 	<div class="setting number twoline">
 		<label for="room-height">ceiling height</label>
 		<input type="text" class="units" name="height" id="room-height">
-		<label for="room-height-global" id="room-height-global-label">global?</label>
-		<input type="checkbox" name="heightGlobal" id="room-height-global">
 	</div>
 
 	<div class="setting number twoline">
-- 
cgit v1.2.3-70-g09d2


From 618ccc76b96fa5d070484ce2d0ec8d509153da69 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 19:14:32 -0400
Subject: starting to convert polylines into regions

---
 .../rectangles/engine/shapes/regionlist.js         | 83 ++++++++++++++++++----
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 11 ++-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |  2 +-
 3 files changed, 80 insertions(+), 16 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 1f2810f..94b902a 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -2,36 +2,91 @@ var RegionList = (function(){
 
   var RegionList = {}
   var regions = RegionList.regions
-  
-  RegionList.init = function(){
+
+  RegionList.build = function(){
+    var segments = RegionList.getSortedSegments()
+
+    // loop over them from left to right
+//    console.log(segments.map(function(s){ return s.toString() }).join("\n"))
+
+    var rooms = []
+    var open_segments = []
+    
+    var segment, open_segment, vertical, other_side
+
+    for (var i = 0; i < segments.length; i++) {
+      segment = segments[i]
+      if (! isVertical(segment)) {
+        continue
+      }
+      for (var j = 0; j < open_segments.length; j++) {
+        open_segment = open_segments[j]
+        if (overlaps(segment, open_segment)) {
+          // if we have overlap, it means we have made a full room
+          other_side = clone_segment(open_segment)
+          other_side[0].a = segment[0].a
+          other_side[1].a = segment[1].a
+          rooms.push([open_segment, other_side])
+          open_segments.splice(j, 1)
+          j--
+        }
+      }
+      open_segments.push(segment) 
+    }
+    
+//    console.log(rooms.map(function(s){ return s[0][0].toString() + " " + s[0][1].toString() + " " + s[1][0].toString() + " " + s[1][1].toString() }).join("\n"))
+    
+    return rooms
   }
   
-  RegionList.build = function(){
+  RegionList.getSortedSegments = function(){
+    // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
+
+    // re-orientate them so they're either facing up or right
     segments.forEach(function(segment){
-      if (segment[0][0] == segment[1][0]) {
-        if (segment[0][1] > segment[1][1]) {
+      // vertical
+      if (segment[0].a == segment[1].a) {
+        if (segment[0].b > segment[1].b) {
           segment.push(segment.shift())
         }
       }
-      else if (segment[0][1] == segment[1][1]) {
-        if (segment[0][0] > segment[1][0]) {
+      // horizontal
+      else if (segment[0].b == segment[1].b) {
+        if (segment[0].a > segment[1].a) {
           segment.push(segment.shift())
         }
       }
     })
+    
+    // sort them from top to bottom, left to right
     segments = segments.sort(function(a,b){
-      return a[0][0] < b[0][0]
+      if (a[0].a < b[0].a) {
+        return -1
+      }
+      else if (a[0].a == b[0].a) {
+        if (a[0].b < b[0].b) {
+          return -1
+        }
+        else if (a[0].b == b[0].b) {
+          return 0
+        }
+        else {
+          return 1
+        }
+      }
+      else {
+        return 1
+      }
     })
     
-    console.log(segments)
-    
-    // get a list of all segments from these polylines
-    // re-orientate them so they're either facing up or right
-    // loop over them from left to right
-    // 
+    return segments
   }
   
+  function isVertical (segment) { return segment[0].a == segment[1].a }
+  function isHorizontal (segment) { return segment[0].b == segment[1].b }
+  function overlaps (a,b) { return (a[0].b > b[0].b || a[1].b < b[1].b) }
+  function clone_segment(a){ return [a[0].clone(), a[1].clone()] }
   return RegionList
   
 })()
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 73f21c0..8fe66ca 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -93,7 +93,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-    this.floorplan.draw(map.draw.ctx, true)
+   // this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
@@ -113,6 +113,15 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
 
+    var rooms = RegionList.build()
+    rooms.forEach(function(room,i){
+      map.draw.ctx.fillStyle = colors[i % colors.length]
+      map.draw.ctx.fillRect( room[0][0].a, room[0][1].b,
+        room[1][0].a - room[0][0].a,
+        room[0][0].b - room[0][1].b
+      )
+    })
+
     map.draw.ctx.restore()
   },
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index c7138e9..fbb71d5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -38,7 +38,7 @@ var BlueprintUploader = UploadView.extend({
 		  this.$blueprints.show()
       data.forEach(this.append.bind(this))
       this.hide()
-      if (this.nameToShow) {
+      if (this.nameToShow && this.nameToShow !== "new") {
         data.some(function(el){
           if (el.slug == this.nameToShow) {
             this.parent.scaler.pick(el)
-- 
cgit v1.2.3-70-g09d2


From 272474767b6ed1f419843c7a205c16f934eeb84f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 23:33:36 -0400
Subject: turn segments into rects

---
 .../rectangles/engine/shapes/regionlist.js         | 54 ++++++++--------------
 .../assets/javascripts/rectangles/models/rect.js   |  6 +++
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  2 +-
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 16 ++++---
 public/assets/javascripts/ui/lib/ToggleableView.js | 19 ++++++++
 views/controls/blueprint/info.ejs                  |  4 +-
 views/controls/builder/info.ejs                    |  4 +-
 views/controls/editor/media-editor.ejs             |  4 +-
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 65 insertions(+), 48 deletions(-)
 create mode 100644 public/assets/javascripts/ui/lib/ToggleableView.js

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 94b902a..42519cf 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -12,7 +12,7 @@ var RegionList = (function(){
     var rooms = []
     var open_segments = []
     
-    var segment, open_segment, vertical, other_side
+    var segment, open_segment, y_segments
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
@@ -21,12 +21,20 @@ var RegionList = (function(){
       }
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
-        if (overlaps(segment, open_segment)) {
+        if (segment.y.overlaps(open_segment.y)) {
           // if we have overlap, it means we have made a full room
-          other_side = clone_segment(open_segment)
-          other_side[0].a = segment[0].a
-          other_side[1].a = segment[1].a
-          rooms.push([open_segment, other_side])
+          
+          y_segments = open_segment.y.split(segment.y)
+          
+          if (y_segments.length == 1) {
+            open_segment.x.b = segment.x.b
+            rooms.push(open_segment)
+          }
+          
+//           other_side = clone_segment(open_segment)
+//           other_side[0].a = segment[0].a
+//           other_side[1].a = segment[1].a
+//           rooms.push([open_segment, other_side])
           open_segments.splice(j, 1)
           j--
         }
@@ -43,8 +51,8 @@ var RegionList = (function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
 
-    // re-orientate them so they're either facing up or right
-    segments.forEach(function(segment){
+    // re-orient them so they're either facing up or right and make them into rects
+    segments = segments.map(function(segment){
       // vertical
       if (segment[0].a == segment[1].a) {
         if (segment[0].b > segment[1].b) {
@@ -57,36 +65,12 @@ var RegionList = (function(){
           segment.push(segment.shift())
         }
       }
+      return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
     })
     
-    // sort them from top to bottom, left to right
-    segments = segments.sort(function(a,b){
-      if (a[0].a < b[0].a) {
-        return -1
-      }
-      else if (a[0].a == b[0].a) {
-        if (a[0].b < b[0].b) {
-          return -1
-        }
-        else if (a[0].b == b[0].b) {
-          return 0
-        }
-        else {
-          return 1
-        }
-      }
-      else {
-        return 1
-      }
-    })
-    
-    return segments
+    return sort.rects_by_position(segments)
   }
-  
-  function isVertical (segment) { return segment[0].a == segment[1].a }
-  function isHorizontal (segment) { return segment[0].b == segment[1].b }
-  function overlaps (a,b) { return (a[0].b > b[0].b || a[1].b < b[1].b) }
-  function clone_segment(a){ return [a[0].clone(), a[1].clone()] }
+
   return RegionList
   
 })()
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 92c8c9e..a4756ed 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -62,6 +62,12 @@
 	Rect.prototype.maxDimension = function(){
 		return abs(this.width) > abs(this.height) ? this.width : this.height
 	}
+	Rect.prototype.isVertical = function(){
+	  return this.x.isPoint()
+	}
+	Rect.prototype.isHorizontal = function(){
+	  return this.y.isPoint()
+	}
 
 	Rect.prototype.mul = function(n){
 		this.x.mul(n)
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 290e45e..90a56c6 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -43,6 +43,9 @@
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
+	vec2.prototype.isPoint = function(){
+		return this.a == this.b
+	}
 	vec2.prototype.add = function(n){
 		this.a += n
 		this.b += n
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 8fe66ca..18ecf5f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -93,7 +93,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-   // this.floorplan.draw(map.draw.ctx, true)
+   this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index acd8dcc..252e3f1 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -1,5 +1,5 @@
 
-var BlueprintSettings = FormView.extend({
+var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 	el: "#blueprintSettings",
 	
 	action: "/api/blueprint/edit",
@@ -25,7 +25,13 @@ var BlueprintSettings = FormView.extend({
 	
 	load: function(data){
 		this.$id.val(data._id)
-		this.$name.val(data.name)
+		if (data.name) {
+		  this.$name.val(data.name)
+      this.hide()
+		}
+		else {
+		  this.$name.val("")
+		}
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
@@ -51,10 +57,6 @@ var BlueprintSettings = FormView.extend({
 		}.bind(this))
 	},
 
-	toggle: function(state){
-		this.$el.toggleClass("active", state)
-	},
-
 	enterSubmit: function (e) {
 		e.stopPropagation()
 		var base = this
@@ -105,6 +107,8 @@ var BlueprintSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		this.hide()
+		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 
diff --git a/public/assets/javascripts/ui/lib/ToggleableView.js b/public/assets/javascripts/ui/lib/ToggleableView.js
new file mode 100644
index 0000000..371629f
--- /dev/null
+++ b/public/assets/javascripts/ui/lib/ToggleableView.js
@@ -0,0 +1,19 @@
+var ToggleableView = View.extend({
+
+	toggle: function(state){
+		this.$el.toggleClass("active", state)
+	},
+	
+	show: function(){
+	  this.toggle(true)
+	},
+
+	hide: function(){
+	  this.toggle(false)
+	},
+	
+	visible: function(){
+	  return this.$el.hasClass("active")
+	}
+
+})
\ No newline at end of file
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index 9f7d708..4e2316f 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -15,8 +15,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 8a0e0d5..11e995a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -34,8 +34,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 2a3d4f3..225bdc8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -49,8 +49,8 @@
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 	-->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bc8dacb..865c0f1 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -108,6 +108,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AnimatedView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ToggleableView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script>
-- 
cgit v1.2.3-70-g09d2


From ca76295998fb75e9ab9c83ee9a1a694b9e0656c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 11:23:46 -0400
Subject: making rooms from segments

---
 .../javascripts/rectangles/engine/map/draw.js      | 18 ++++++++-
 .../rectangles/engine/shapes/regionlist.js         | 46 ++++++++++++----------
 .../javascripts/rectangles/util/constants.js       |  2 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 18 +++++----
 4 files changed, 55 insertions(+), 29 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index cc2f4d8..5824cc8 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -189,9 +189,25 @@ Map.Draw = function(map, opt){
 		var sides = map.sides()
 		var quant = sides.clone().quantize(MAP_GRID_SIZE)
 		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
-			line(x, sides.y.a, x, sides.y.b)
+		  if (Math.round(x) % 10 == 0) {
+        ctx.strokeStyle = "rgba(0,0,0,0.3)"
+        ctx.lineWidth = 1/map.zoom
+		  }
+		  else {
+        ctx.strokeStyle = "rgba(0,0,0,0.05)"
+        ctx.lineWidth = 1/map.zoom
+		  }
+      line(x, sides.y.a, x, sides.y.b)
 		}
 		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
+		  if (Math.round(y) % 10 == 0) {
+        ctx.strokeStyle = "rgba(0,0,0,0.3)"
+        ctx.lineWidth = 1/map.zoom
+		  }
+		  else {
+        ctx.strokeStyle = "rgba(0,0,0,0.05)"
+        ctx.lineWidth = 1/map.zoom
+		  }
 			line(sides.x.a, y, sides.x.b, y)
 		}
 	}
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 42519cf..acb4ead 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -6,45 +6,51 @@ var RegionList = (function(){
   RegionList.build = function(){
     var segments = RegionList.getSortedSegments()
 
+//     var xx = t % (segments[0].x.a - segments[segments.length-1].x.b)
+
     // loop over them from left to right
-//    console.log(segments.map(function(s){ return s.toString() }).join("\n"))
+//   console.log(segments.map(function(s){ return s.toString() }).join("\n"))
 
     var rooms = []
     var open_segments = []
     
-    var segment, open_segment, y_segments
+    var segment, open_segment, x_segment, y_segments, overlapped
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
-      if (! isVertical(segment)) {
+      if (! segment.isVertical()) {
         continue
       }
+      overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
         if (segment.y.overlaps(open_segment.y)) {
           // if we have overlap, it means we have made a full room
-          
-          y_segments = open_segment.y.split(segment.y)
-          
-          if (y_segments.length == 1) {
-            open_segment.x.b = segment.x.b
-            rooms.push(open_segment)
-          }
-          
-//           other_side = clone_segment(open_segment)
-//           other_side[0].a = segment[0].a
-//           other_side[1].a = segment[1].a
-//           rooms.push([open_segment, other_side])
-          open_segments.splice(j, 1)
-          j--
+          console.log(segment.y+"", "overlaps", open_segment.y+"")
+          overlapped = true
+          open_segments.splice(j--, 1)
+
+          x_segment = new vec2( open_segment.x.a, segment.x.b )
+          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          console.log(y_segments.map(function(s){ return s+"" }).join("\n"))
+          y_segments.forEach(function(seg){
+
+            rooms.push(new Rect( x_segment, seg[0] ))
+
+            var new_seg = new Rect( segment.x, seg[0] )
+            open_segments.shift(new_seg)
+            j++
+          })
         }
       }
-      open_segments.push(segment) 
+      if (! overlapped) {
+        open_segments.push(segment)
+      }
     }
     
-//    console.log(rooms.map(function(s){ return s[0][0].toString() + " " + s[0][1].toString() + " " + s[1][0].toString() + " " + s[1][1].toString() }).join("\n"))
+//   console.log(rooms.map(function(s){ return s.toString() }).join("\n"))
     
-    return rooms
+    return { rooms: rooms, open_segments: open_segments, segments: segments }
   }
   
   RegionList.getSortedSegments = function(){
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index a70cacd..522689b 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -22,7 +22,7 @@ var height_min = 200,
 		resize_margin = 8,
 		cursor_amp = 1.5,
 		DEFAULT_PICTURE_WIDTH = 350,
-		MAP_GRID_SIZE = 360          // 10 feet
+		MAP_GRID_SIZE = 36          // 10 feet
 
 var painting_distance_from_wall = 10,
 		dot_distance_from_picture = 3,
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 18ecf5f..7ec1352 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -5,6 +5,8 @@ var last_point = new vec2 (0,0)
 
 var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 
+  rooms: [],
+
   initialize: function(opt){
     this.parent = opt.parent
 
@@ -81,6 +83,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
+    this.rooms = RegionList.build()
   },
   
   animate: function(t, dt){
@@ -93,7 +96,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-   this.floorplan.draw(map.draw.ctx, true)
+    // this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
@@ -113,13 +116,14 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
 
-    var rooms = RegionList.build()
-    rooms.forEach(function(room,i){
+    this.rooms.segments.forEach(function(seg,i){
+      map.draw.ctx.fillStyle = "#f00"
+      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+1, seg.height()+1 )
+    })
+
+    this.rooms.rooms.forEach(function(room,i){
       map.draw.ctx.fillStyle = colors[i % colors.length]
-      map.draw.ctx.fillRect( room[0][0].a, room[0][1].b,
-        room[1][0].a - room[0][0].a,
-        room[0][0].b - room[0][1].b
-      )
+      map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
     })
 
     map.draw.ctx.restore()
-- 
cgit v1.2.3-70-g09d2


From 62c899384b0cf4aab6288f662e12f11321de95df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 12:55:44 -0400
Subject: getting full coverage with rooms

---
 .../assets/javascripts/rectangles/engine/shapes/polyline.js  |  2 +-
 .../javascripts/rectangles/engine/shapes/regionlist.js       | 12 +++++++-----
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js    | 11 ++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 99c8fda..6c64128 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -47,7 +47,7 @@ var Polyline = Fiber.extend(function(base){
     return null
 	}
 	exports.hasEndPointNear = function(p){
-	  if (this.closed) return null
+	  if (this.closed || ! this.points.length) return null
     if (this.firstPoint().distanceTo( p ) < 10/map.zoom) {
       return this.firstPoint()
     }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index acb4ead..f86968f 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -13,6 +13,7 @@ var RegionList = (function(){
 
     var rooms = []
     var open_segments = []
+    var closed_segments = []
     
     var segment, open_segment, x_segment, y_segments, overlapped
 
@@ -21,6 +22,7 @@ var RegionList = (function(){
       if (! segment.isVertical()) {
         continue
       }
+      console.log(segment+"")
       overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
@@ -28,17 +30,17 @@ var RegionList = (function(){
           // if we have overlap, it means we have made a full room
           console.log(segment.y+"", "overlaps", open_segment.y+"")
           overlapped = true
+          closed_segments.push(open_segments[j])
           open_segments.splice(j--, 1)
 
           x_segment = new vec2( open_segment.x.a, segment.x.b )
-          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          y_segments = open_segment.y.split(segment.y, TOP, BOTTOM)
           console.log(y_segments.map(function(s){ return s+"" }).join("\n"))
           y_segments.forEach(function(seg){
-
             rooms.push(new Rect( x_segment, seg[0] ))
 
             var new_seg = new Rect( segment.x, seg[0] )
-            open_segments.shift(new_seg)
+            open_segments.unshift(new_seg)
             j++
           })
         }
@@ -49,8 +51,8 @@ var RegionList = (function(){
     }
     
 //   console.log(rooms.map(function(s){ return s.toString() }).join("\n"))
-    
-    return { rooms: rooms, open_segments: open_segments, segments: segments }
+    console.log({ rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments })
+    return { rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments }
   }
   
   RegionList.getSortedSegments = function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 7ec1352..cf9dea6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -116,9 +116,14 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
 
-    this.rooms.segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "#f00"
-      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+1, seg.height()+1 )
+    this.rooms.open_segments.forEach(function(seg,i){
+      map.draw.ctx.fillStyle = "#00f"
+      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
+    })
+
+    this.rooms.closed_segments.forEach(function(seg,i){
+      map.draw.ctx.fillStyle = "#0ff"
+      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
     })
 
     this.rooms.rooms.forEach(function(room,i){
-- 
cgit v1.2.3-70-g09d2


From 0c1864a114a2efe1a3bb8b2b4951e8655712757a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 15:19:05 -0400
Subject: dedupe new rooms

---
 .../javascripts/rectangles/engine/map/draw.js      |  4 +-
 .../rectangles/engine/shapes/regionlist.js         | 62 +++++++++++++++++-----
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  8 +--
 4 files changed, 58 insertions(+), 19 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 5824cc8..f47f10c 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -189,7 +189,7 @@ Map.Draw = function(map, opt){
 		var sides = map.sides()
 		var quant = sides.clone().quantize(MAP_GRID_SIZE)
 		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
-		  if (Math.round(x) % 10 == 0) {
+		  if (Math.round(x) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
 		  }
@@ -200,7 +200,7 @@ Map.Draw = function(map, opt){
       line(x, sides.y.a, x, sides.y.b)
 		}
 		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
-		  if (Math.round(y) % 10 == 0) {
+		  if (Math.round(y) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
 		  }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index f86968f..93a0df7 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -6,52 +6,86 @@ var RegionList = (function(){
   RegionList.build = function(){
     var segments = RegionList.getSortedSegments()
 
-//     var xx = t % (segments[0].x.a - segments[segments.length-1].x.b)
-
-    // loop over them from left to right
-//   console.log(segments.map(function(s){ return s.toString() }).join("\n"))
-
     var rooms = []
+    var seen_rooms = {}
     var open_segments = []
     var closed_segments = []
     
-    var segment, open_segment, x_segment, y_segments, overlapped
+    var segment, open_segment, x_segment, y_segments, overlapped, seen_segments
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
       if (! segment.isVertical()) {
         continue
       }
-      console.log(segment+"")
       overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
         if (segment.y.overlaps(open_segment.y)) {
-          // if we have overlap, it means we have made a full room
-          console.log(segment.y+"", "overlaps", open_segment.y+"")
           overlapped = true
           closed_segments.push(open_segments[j])
           open_segments.splice(j--, 1)
 
           x_segment = new vec2( open_segment.x.a, segment.x.b )
           y_segments = open_segment.y.split(segment.y, TOP, BOTTOM)
-          console.log(y_segments.map(function(s){ return s+"" }).join("\n"))
+          
+          seen_segments = {}
+
           y_segments.forEach(function(seg){
-            rooms.push(new Rect( x_segment, seg[0] ))
+            seen_segments[ seg[0]+"" ] = true
+            var room = new Rect( x_segment, seg[0] )
+
+            if (seen_rooms[ room+"" ]) return;
+
+            seen_rooms[ room+"" ] = true
+            rooms.push(room)
+            var new_seg = new Rect( segment.x, seg[0] )
+            open_segments.unshift(new_seg)
+            j++
+          })
 
+          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          y_segments.forEach(function(seg){
+            if (seen_segments[ seg[0]+"" ]) return;
             var new_seg = new Rect( segment.x, seg[0] )
             open_segments.unshift(new_seg)
             j++
           })
         }
       }
-      if (! overlapped) {
+      if (overlapped) {
+        // sort open segments?
+        open_segments = open_segments.sort(function(a,b){
+          if (a.y.a < b.y.a) { return -1 }
+          if (a.y.a == b.y.a) { return 0 }
+          if (a.y.a > b.y.a) { return 1 }
+        })
+        
+        if (open_segments.length < 2) { continue }
+        
+        for (var k = 1; k < open_segments.length; k++) {
+          if (open_segments[k-1].y.containsVec(open_segments[k].y)) {
+            open_segments.splice(k--, 1)
+          }
+          else if (open_segments[k-1].y.overlaps(open_segments[k].y)) {
+            open_segments[k].y = open_segments[k].y.clone()
+            console.log(open_segments[k-1].y+"", open_segments[k].y+"")
+            open_segments[k].y.a = open_segments[k-1].y.b
+          }
+        }
+      }
+      else {
         open_segments.push(segment)
       }
     }
     
-//   console.log(rooms.map(function(s){ return s.toString() }).join("\n"))
-    console.log({ rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments })
+    for (var i = 0; i < segments.length; i++) {
+      segment = segments[i]
+      if (! segment.isHorizontal()) {
+        continue
+      }
+    }
+
     return { rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments }
   }
   
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 90a56c6..d37bc12 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -111,6 +111,9 @@
 	vec2.prototype.containsDisc = function(n,r){
 		return this.a <= n-r && n+r <= this.b
 	}
+	vec2.prototype.containsVec = function(v){
+		return this.a <= v.a && v.b <= this.b
+	}
 	vec2.prototype.clamp = function(n){
 		return clamp(n, this.a, this.b)
 	}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index cf9dea6..0b27d0c 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -108,7 +108,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     }
 
     shapes.forEach(function(shape){
-      shape.draw(map.draw.ctx)
+//      shape.draw(map.draw.ctx)
     })
 
     map.draw.ctx.strokeStyle = "#f00";
@@ -117,14 +117,16 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.camera(scene.camera)
 
     this.rooms.open_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "#00f"
+      map.draw.ctx.fillStyle = "rgba(0,0,255,0.2)"
       map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
     })
 
     this.rooms.closed_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "#0ff"
+      map.draw.ctx.fillStyle = "rgba(0,255,0,0.2)"
       map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
     })
+    
+    var colors = ["rgba(0,0,0,0.1)"]
 
     this.rooms.rooms.forEach(function(room,i){
       map.draw.ctx.fillStyle = colors[i % colors.length]
-- 
cgit v1.2.3-70-g09d2


From 3e87dcb3de9ad29f7c021792cbafc32d4c758d3f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 16:05:55 -0400
Subject: assigning sides

---
 .../javascripts/rectangles/engine/map/draw.js      | 14 -----
 .../rectangles/engine/shapes/regionlist.js         | 59 +++++++++++++++++++---
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 24 +++------
 3 files changed, 59 insertions(+), 38 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index f47f10c..c97603b 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -169,20 +169,6 @@ Map.Draw = function(map, opt){
 	}
 
 	draw.coords = function(){
-		/*
-		ctx.fillStyle = "#888";
-		dot_at(0,0)
-		ctx.fillStyle = "#bbb";
-		dot_at(100,0)
-		dot_at(0,100)
-		ctx.fillStyle = "#ddd";
-		dot_at(200,0)
-		dot_at(0,200)
-		ctx.fillStyle = "#eee";
-		dot_at(300,0)
-		dot_at(0,300)
-		*/
-		
 		ctx.strokeStyle = "rgba(0,0,0,0.1)"
 		ctx.lineWidth = 1/map.zoom
 		
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 93a0df7..fb2c8e5 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -27,7 +27,7 @@ var RegionList = (function(){
           open_segments.splice(j--, 1)
 
           x_segment = new vec2( open_segment.x.a, segment.x.b )
-          y_segments = open_segment.y.split(segment.y, TOP, BOTTOM)
+          y_segments = open_segment.y.split(segment.y, 0, 0)
           
           seen_segments = {}
 
@@ -35,9 +35,11 @@ var RegionList = (function(){
             seen_segments[ seg[0]+"" ] = true
             var room = new Rect( x_segment, seg[0] )
 
-            if (seen_rooms[ room+"" ]) return;
-
+            if (seen_rooms[ room+"" ]) return
             seen_rooms[ room+"" ] = true
+            
+            room.sides = 0
+            
             rooms.push(room)
             var new_seg = new Rect( segment.x, seg[0] )
             open_segments.unshift(new_seg)
@@ -54,7 +56,6 @@ var RegionList = (function(){
         }
       }
       if (overlapped) {
-        // sort open segments?
         open_segments = open_segments.sort(function(a,b){
           if (a.y.a < b.y.a) { return -1 }
           if (a.y.a == b.y.a) { return 0 }
@@ -69,7 +70,6 @@ var RegionList = (function(){
           }
           else if (open_segments[k-1].y.overlaps(open_segments[k].y)) {
             open_segments[k].y = open_segments[k].y.clone()
-            console.log(open_segments[k-1].y+"", open_segments[k].y+"")
             open_segments[k].y.a = open_segments[k-1].y.b
           }
         }
@@ -79,14 +79,57 @@ var RegionList = (function(){
       }
     }
     
+    var splits, splitter
+    
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
-      if (! segment.isHorizontal()) {
-        continue
+      var horizontal = segment.isHorizontal(), vertical = segment.isVertical()
+      for (var r = 0; r < rooms.length; r++){
+        room = rooms[r]
+        if (vertical) {
+          if (segment.y.containsVec(room.y)) {
+            if (segment.x.a == room.x.a) {
+              room.sides |= LEFT
+            }
+            if (segment.x.a == room.x.b) {
+              room.sides |= RIGHT
+            }
+          }
+        }
+        if (horizontal) {
+          if (segment.x.containsVec(room.x)) {
+            if (segment.y.a == room.y.a) {
+              room.sides |= FRONT
+            }
+            if (segment.y.a == room.y.b) {
+              room.sides |= BACK
+            }
+          }
+/*
+          else if ((segment.y.a == room.y.a || segment.y.a == room.y.b) && room.x.containsVec(segment.x)) {
+            splits = room.x.split(segment.x, LEFT, RIGHT)
+            for (var k = 0; k < splits.length; k++) {
+              splitter = splits[k]
+              var new_room = new Rect( splitter[0], room.y )
+              new_room.sides |= splitter[1]
+              if (segment.x.containsVec(splitter[0])) {
+                if (segment.y.a == room.y.a) {
+                  room.sides |= FRONT
+                }
+                if (segment.y.a == room.y.b) {
+                  room.sides |= BACK
+                }
+              }
+              rooms.unshift(new_room)
+              r++
+            }
+          }
+*/
+        }
       }
     }
 
-    return { rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments }
+    return { rooms: rooms }
   }
   
   RegionList.getSortedSegments = function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 0b27d0c..c7aa219 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -108,30 +108,22 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     }
 
     shapes.forEach(function(shape){
-//      shape.draw(map.draw.ctx)
+      shape.draw(map.draw.ctx)
     })
 
     map.draw.ctx.strokeStyle = "#f00";
     map.draw.x_at(0,0)
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
-
-    this.rooms.open_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "rgba(0,0,255,0.2)"
-      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
-    })
-
-    this.rooms.closed_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "rgba(0,255,0,0.2)"
-      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
-    })
     
-    var colors = ["rgba(0,0,0,0.1)"]
+//    var colors = ["rgba(0,0,0,0.1)"]
 
-    this.rooms.rooms.forEach(function(room,i){
-      map.draw.ctx.fillStyle = colors[i % colors.length]
-      map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
-    })
+    map.draw.regions(this.rooms.rooms, colors, "#000")
+
+//     this.rooms.rooms.forEach(function(room,i){
+//       map.draw.ctx.fillStyle = colors[i % colors.length]
+//       map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
+//     })
 
     map.draw.ctx.restore()
   },
-- 
cgit v1.2.3-70-g09d2


From 5947464ce7c72133304539ba805d7958572874fb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 17:37:43 -0400
Subject: hide regions for now

---
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index c7aa219..e003d77 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -117,8 +117,9 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.camera(scene.camera)
     
 //    var colors = ["rgba(0,0,0,0.1)"]
-
-    map.draw.regions(this.rooms.rooms, colors, "#000")
+//     var colors = ["rgba(255,255,255,1)"]
+// 
+//     map.draw.regions(this.rooms.rooms, colors, "#000")
 
 //     this.rooms.rooms.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
-- 
cgit v1.2.3-70-g09d2


From be25c03148c3cb4813bc42e3c238a618201174e6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 17:39:32 -0400
Subject: and paint floorplan..

---
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index e003d77..39cf62e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -96,7 +96,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-    // this.floorplan.draw(map.draw.ctx, true)
+    this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
-- 
cgit v1.2.3-70-g09d2


From 48fc9b27a77126da649959c8f74ad8faffcd6e2c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 11:15:50 -0400
Subject: comment the regionlist algorithm

---
 .../javascripts/rectangles/engine/map/_map.js      |  6 +-
 .../javascripts/rectangles/engine/rooms/builder.js |  1 +
 .../rectangles/engine/shapes/polyline.js           |  4 ++
 .../rectangles/engine/shapes/regionlist.js         | 83 ++++++++++++++++------
 .../rectangles/engine/shapes/shapelist.js          |  2 +
 .../assets/javascripts/rectangles/models/vec2.js   |  4 +-
 .../assets/javascripts/rectangles/models/wall.js   |  5 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  5 +-
 8 files changed, 79 insertions(+), 31 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 2aee962..e27346d 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -69,9 +69,9 @@ var Map = function(opt){
 			break
 	}
 	
-	base.resize = function(){
-		canvas.width = base.dimensions.a = window.innerWidth
-		canvas.height = base.dimensions.b = window.innerHeight
+	base.resize = function(w, h){
+		canvas.width = base.dimensions.a = w || window.innerWidth
+		canvas.height = base.dimensions.b = h || window.innerHeight
 		// resize here - esp if 2d-hires
 	}
 		
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 5e09fab..f78fb91 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -14,6 +14,7 @@
 		PI = Math.PI
 		HALF_PI = PI/2
 		TOP = CEILING, BOTTOM = FLOOR
+		$ = { browser: { mozilla: false } }
 		function sidesToString(sides){
 			var s = ""
 			if (sides & FRONT) s += "front "
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 6c64128..609a2c8 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -1,3 +1,7 @@
+// A Polyline is a set of points inputted by the user using the V2 editor to trace a blueprint.
+// Additionally, it manages a set of MX objects which correspond to the walls in 3D.
+// In this way, it attempts to bridge the 2D (canvas, imperative) and 3D (css, declarative) views.
+
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
 	exports.init = function(){
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 71f19d8..663f3fd 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -1,36 +1,58 @@
+// This algorithm takes the polylines from ShapeList as input and produces
+// a set of Rooms which can be used by the existing V1 mover and editor.
+
+// The algorithm assumes that
+// 1) all angles are orthogonal
+// 2) all polylines are closed
+
 var RegionList = (function(){
 
   var RegionList = {}
   var regions = RegionList.regions
 
   RegionList.build = function(){
+  
+    // first, get the segments sorted right to left & top to bottom
     var segments = RegionList.getSortedSegments()
 
     var rooms = []
     var seen_rooms = {}
     var open_segments = []
-    var closed_segments = []
     
     var segment, open_segment, x_segment, y_segments, overlapped, seen_segments
 
+    // first pass: generate rooms from the vertical segments only
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
       if (! segment.isVertical()) {
         continue
       }
+
+      // check all the "open segments" we know about, i.e. rooms where we've only found
+      // the right wall.
       overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
+        
+        // if these two segments overlap each other, then there is a room between them.
         if (segment.y.overlaps(open_segment.y)) {
           overlapped = true
-          closed_segments.push(open_segments[j])
           open_segments.splice(j--, 1)
 
+          // the X part of the room will be the span between these two vertical segments'
+          // X components.  the Y part of the room is the "split" or subdivision between
+          // the two horizontal vectors.
+          
+          // the split function is non-commutative,
+          // so we need to call A split B and B split A,
+          // then dedupe the segments we got back..
           x_segment = new vec2( open_segment.x.a, segment.x.b )
           y_segments = open_segment.y.split(segment.y, 0, 0)
           
           seen_segments = {}
 
+          // check each of the splits.. if the two segments overlap, then we definitely
+          // have a room here.
           y_segments.forEach(function(seg){
             seen_segments[ seg[0]+"" ] = true
             var room = new Rect( x_segment, seg[0] )
@@ -46,7 +68,8 @@ var RegionList = (function(){
             j++
           })
 
-          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          // splitting the other way..
+          y_segments = segment.y.split(open_segment.y, 0, 0)
           y_segments.forEach(function(seg){
             if (seen_segments[ seg[0]+"" ]) return;
             var new_seg = new Rect( segment.x, seg[0] )
@@ -55,6 +78,9 @@ var RegionList = (function(){
           })
         }
       }
+      
+      // if we have overlap, then re-sort the open segments Y-wise
+      // and (again) dedupe..
       if (overlapped) {
         open_segments = open_segments.sort(function(a,b){
           if (a.y.a < b.y.a) { return -1 }
@@ -74,6 +100,7 @@ var RegionList = (function(){
           }
         }
       }
+      // if we don't have any overlap, then this is a new open segment.
       else {
         open_segments.push(segment)
       }
@@ -81,11 +108,15 @@ var RegionList = (function(){
     
     var splits, splitter
     
+    // second pass: now that we have a bunch of rooms, assign sides to all of them.
+    // sides are used in the "mover" script to do bounds checking.
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
       var horizontal = segment.isHorizontal(), vertical = segment.isVertical()
       for (var r = 0; r < rooms.length; r++){
         room = rooms[r]
+
+        // vertical segments determine the left and right edges of the room, fairly simply.
         if (vertical) {
           if (segment.y.containsVec(room.y)) {
             if (segment.x.a == room.x.a) {
@@ -96,6 +127,8 @@ var RegionList = (function(){
             }
           }
         }
+        
+        // horizontal segments determine the front and back edges of the room.
         if (horizontal) {
           if (segment.x.containsVec(room.x)) {
             if (segment.y.a == room.y.a) {
@@ -105,28 +138,30 @@ var RegionList = (function(){
               room.sides |= BACK
             }
           }
-
-          else if (segment.y.a == room.y.a || segment.y.a == room.y.b)  {
-            if (room.x.overlaps(segment.x)) {
-              splits = room.x.split(segment.x, room.sides & LEFT, room.sides & RIGHT)
-              rooms.splice(r--, 1)
-              console.log(splits)
-              for (var k = 0; k < splits.length; k++) {
-                splitter = splits[k]
-                var new_room = new Rect( splitter[0], room.y )
-                new_room.sides = 0
-                new_room.sides |= splitter[1] | ( room.sides & FRONT_BACK )
-                if (segment.x.overlaps( splitter[0] )) {
-                  if (segment.y.a == new_room.y.a) {
-                    new_room.sides |= FRONT
-                  }
-                  if (segment.y.a == new_room.y.b) {
-                    new_room.sides |= BACK
-                  }
+          
+          // however, since we did not split on horizontal segments, our rooms may
+          // only have partial overlap with these segments, in which case we need to
+          // split the rooms apart.
+          else if ((segment.y.a == room.y.a || segment.y.a == room.y.b) && room.x.overlaps(segment.x)) {
+            
+            // split the room across the segment. preserve whether or not we know the
+            // room borders a segment on the left or right.
+            splits = room.x.split(segment.x, room.sides & LEFT, room.sides & RIGHT)
+            rooms.splice(r--, 1)
+            for (var k = 0; k < splits.length; k++) {
+              splitter = splits[k]
+              var new_room = new Rect( splitter[0], room.y )
+              new_room.sides = splitter[1] | ( room.sides & FRONT_BACK )
+              if (segment.x.overlaps( splitter[0] )) {
+                if (segment.y.a == new_room.y.a) {
+                  new_room.sides |= FRONT
+                }
+                if (segment.y.a == new_room.y.b) {
+                  new_room.sides |= BACK
                 }
-                rooms.unshift(new_room)
-                r++
               }
+              rooms.unshift(new_room)
+              r++
             }
           }
 
@@ -137,6 +172,8 @@ var RegionList = (function(){
     return { rooms: rooms }
   }
   
+  
+  // Gets a list of polylines from the ShapeList and sorts the segments.
   RegionList.getSortedSegments = function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 4373caf..90714c2 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -1,3 +1,5 @@
+// The ShapeList manages the list of polylines which form a V2 layout.
+
 var ShapeList = Fiber.extend(function(base){
   var exports = {}
   exports.init = function(){
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 226e56f..8942d92 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -214,13 +214,13 @@
 	}
 
 	vec2.prototype.toString = function(){
-		return "[" + round(this.a) + " " + round(this.b) + "]"
+		return "[" + Math.round(this.a) + " " + Math.round(this.b) + "]"
 	}
 	vec2.prototype.exactString = function(){
 		return "[" + this.a + " " + this.b + "]"
 	}
 	vec2.prototype.serialize = function(){
-		return [ round(this.a), round(this.b) ]
+		return [ Math.round(this.a), Math.round(this.b) ]
 	}
 	vec2.prototype.deserialize = function(data){
 		this.a = data[0]
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 13f5cd7..9d4650b 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -10,6 +10,11 @@
 		vec2 = require('./vec2')
 		Rect = require('./rect')
 		UidGenerator = require('../util/uid')
+		wall_rotation = {}
+    wall_rotation[FRONT] = PI
+    wall_rotation[BACK] = 0
+    wall_rotation[LEFT] = HALF_PI
+    wall_rotation[RIGHT] = -HALF_PI
 	}
 	
 	var Wall = function(opt){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 39cf62e..a341a24 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -62,8 +62,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     if (this.parent.orbiting) {
       scene.width = window.innerWidth/2
       scene.height = window.innerHeight
-      this.parent.map.canvas.width = this.parent.map.dimensions.a = window.innerWidth/2
-      this.parent.map.canvas.height = this.parent.map.dimensions.b = window.innerHeight
+      this.parent.map.resize( window.innerWidth/2, window.innerHeight )
       this.parent.map.canvas.style.display = "block"
     }
     else {
@@ -119,7 +118,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 //    var colors = ["rgba(0,0,0,0.1)"]
 //     var colors = ["rgba(255,255,255,1)"]
 // 
-//     map.draw.regions(this.rooms.rooms, colors, "#000")
+    map.draw.regions(this.rooms.rooms, colors, "#000")
 
 //     this.rooms.rooms.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
-- 
cgit v1.2.3-70-g09d2


From a9bf197a6e8f91cc91d772238168d9be1beb3c4d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 12:15:14 -0400
Subject: makin sure tests work

---
 .../javascripts/rectangles/engine/map/tools/line.js      | 16 +++++++++++++++-
 .../javascripts/rectangles/engine/map/tools/ortho.js     |  2 ++
 .../javascripts/rectangles/engine/map/tools/polyline.js  |  2 ++
 .../javascripts/rectangles/engine/shapes/polyline.js     |  1 -
 .../javascripts/rectangles/engine/shapes/regionlist.js   |  2 +-
 .../javascripts/rectangles/engine/shapes/shapelist.js    |  7 ++++++-
 .../assets/javascripts/ui/blueprint/BlueprintEditor.js   |  8 ++++----
 .../assets/javascripts/ui/blueprint/BlueprintSettings.js |  1 +
 public/assets/test/ortho2.html                           |  9 ++++++++-
 9 files changed, 39 insertions(+), 9 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index 8f409a8..8fe4fff 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,3 +1,6 @@
+// This tool lets you define a very simple line between two points.
+// It is used by the BlueprintScaler to specify a sample distance to scale.
+
 var LineTool = MapTool.extend(function(base){
 	var exports = {}
 	
@@ -8,6 +11,17 @@ var LineTool = MapTool.extend(function(base){
 	var can_drag, dragging
 	
 	exports.down = function(e, cursor){
+
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      cursor.quantize(1/map.zoom)
+      app.router.blueprintView.map.center.a = cursor.x.a
+      app.router.blueprintView.map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      return
+    }
+    
 	  this.cursor = cursor
 	  switch (line.length) {
 	    case 0:
@@ -44,6 +58,6 @@ var LineTool = MapTool.extend(function(base){
 	exports.up = function(e, cursor){
 	  can_drag = dragging = false
 	}
-	
+
 	return exports
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index ef41096..918ac0d 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -14,6 +14,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
         map.ui.placing = false
         if (shapes.workline.points.length > 2) {
           shapes.workline.build()
+          shapes.add(shapes.workline)
         }
         else {
           shapes.workline.reset()
@@ -35,6 +36,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
       else if (shapes.workline.canCloseWith(p)) {
         shapes.workline.close()
         shapes.workline.build()
+        shapes.add(shapes.workline)
         map.ui.placing = false
       }
       else {
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
index 1ab86f6..6716180 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -11,6 +11,7 @@ var PolylineTool = MapTool.extend(function (base) {
         map.ui.placing = false
         if (shapes.workline.points.length > 2) {
           shapes.workline.build()
+          shapes.add(shapes.workline)
         }
         else {
           shapes.workline.reset()
@@ -27,6 +28,7 @@ var PolylineTool = MapTool.extend(function (base) {
       if (shapes.workline.canCloseWith(p)) {
         shapes.workline.close()
         shapes.workline.build()
+        shapes.add(shapes.workline)
         map.ui.placing = false
       }
       else {
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 609a2c8..54e11c6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -133,7 +133,6 @@ var Polyline = Fiber.extend(function(base){
   exports.build = function(){
     this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
     this.mx = new MX.Polyline(this)
-    shapes.add(this)
   }
   exports.rebuild = function(){
     this.mx.rebuild()
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 663f3fd..86269a6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -169,7 +169,7 @@ var RegionList = (function(){
       }
     }
 
-    return { rooms: rooms }
+    return rooms
   }
   
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 90714c2..9cbf165 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -85,8 +85,13 @@ var ShapeList = Fiber.extend(function(base){
     data && data.forEach(function(points){
       var line = new Polyline()
       line.deserialize(points)
-      line.build()
+      shapes.add(line)
     }.bind(this))
   }
+  exports.build = function(){
+    this.shapes.forEach(function(shape){
+      shape.build()
+    })
+  }
   return exports
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index a341a24..547cdca 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -5,7 +5,7 @@ var last_point = new vec2 (0,0)
 
 var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 
-  rooms: [],
+  regions: [],
 
   initialize: function(opt){
     this.parent = opt.parent
@@ -82,7 +82,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
-    this.rooms = RegionList.build()
+    this.regions = RegionList.build()
   },
   
   animate: function(t, dt){
@@ -118,9 +118,9 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 //    var colors = ["rgba(0,0,0,0.1)"]
 //     var colors = ["rgba(255,255,255,1)"]
 // 
-    map.draw.regions(this.rooms.rooms, colors, "#000")
+    map.draw.regions(this.regions, colors, "#000")
 
-//     this.rooms.rooms.forEach(function(room,i){
+//     this.regions.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
 //       map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
 //     })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 252e3f1..9c8808a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -35,6 +35,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
+      shapes.build()
 		}
 		this.data = data
 	},
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 448f029..ef77256 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -58,7 +58,9 @@ body {
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-<script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 
 <script>
@@ -73,6 +75,7 @@ var MapTool = Fiber.extend(function(base){
 	  move: function(e, cursor){},
 	  drag: function(e, cursor){},
 	  up: function(e, cursor, new_cursor){},
+	  cancel: function(){},
   }
   return exports
 })
@@ -150,6 +153,7 @@ var PolylineTool = MapTool.extend(function (base) {
 })
 
 var scene, map, controls
+var last_point = new vec2(0,0)
 
 map = new Map ({
 	type: "ortho",
@@ -161,6 +165,7 @@ map = new Map ({
 map.ui.add_tool("arrow", new ArrowTool)
 map.ui.add_tool("polyline", new PolylineTool)
 map.ui.add_tool("position", new PositionTool)
+map.ui.set_tool("arrow")
 
 $(window).resize(function(){
   scene.width = window.innerWidth/2
@@ -174,6 +179,8 @@ var shapes = []
 var ctx = map.draw.ctx
 var last_point
 
+shapes.findClosestPoint = function(){}
+
 function polyline (points, finished) {
   if (! points) return
   if (points.length == 1) {
-- 
cgit v1.2.3-70-g09d2


From a9bee350c2bb468c9abc46321b46f5c5dcbbe10d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 12:28:44 -0400
Subject: grayscale buildings

---
 public/assets/javascripts/mx/primitives/mx.polyline.js    | 6 ++++--
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/mx/primitives/mx.polyline.js b/public/assets/javascripts/mx/primitives/mx.polyline.js
index 63c0ef8..e549150 100644
--- a/public/assets/javascripts/mx/primitives/mx.polyline.js
+++ b/public/assets/javascripts/mx/primitives/mx.polyline.js
@@ -34,8 +34,10 @@ MX.Polyline = MX.Object3D.extend({
       height: wallHeight,
       rotationY: angle
     })
-    var hue = abs(round( angle / PI * 90 + 300))
-    mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
+    // var hue = abs(round( angle / PI * 90 + 300))
+    // mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
+    var lum = abs(round( angle / PI * 20 + 70))
+    mx.el.style.backgroundColor = 'hsla(' + ["0", "0%", lum + "%", "0.99"] + ')'
   },
   
   set_height: function(height){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 547cdca..4b80b2c 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -118,7 +118,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 //    var colors = ["rgba(0,0,0,0.1)"]
 //     var colors = ["rgba(255,255,255,1)"]
 // 
-    map.draw.regions(this.regions, colors, "#000")
+//    map.draw.regions(this.regions, colors, "#000")
 
 //     this.regions.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
-- 
cgit v1.2.3-70-g09d2


From e350f13c3772d0f1f4053ce3c1a1dbc43713e4d0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 14:32:59 -0400
Subject: map stuff for shapes mode

---
 public/assets/javascripts/mx/extensions/mx.movements.js        |  2 +-
 public/assets/javascripts/rectangles/engine/map/draw.js        |  8 +++++++-
 public/assets/javascripts/rectangles/engine/shapes/polyline.js | 10 +++++-----
 .../assets/javascripts/rectangles/engine/shapes/shapelist.js   |  5 +++++
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js      |  4 +---
 5 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 9ed8790..cecba7a 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -155,7 +155,7 @@ MX.Movements = function (cam) {
 						app.controller.presets.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else {
+					else if (! Rooms.shapesMode) {
 						app.controller.toolbar.toggleMap()
 					}
 					break
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index c97603b..8498a46 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -22,7 +22,13 @@ Map.Draw = function(map, opt){
 			ctx.scale( -1, 1 )
 
 			draw.coords()
-			draw.regions(Rooms.regions, [ "#fff" ], "#000")
+			if (Rooms.shapesMode) {
+        shapes.draw(draw.ctx, "#fff", null)
+        shapes.draw(draw.ctx, null, "#000")
+			}
+			else {
+        draw.regions(Rooms.regions, [ "#fff" ], "#000")
+			}
 			draw.camera(scene.camera)
 		}
 		else {
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 54e11c6..fc6cad7 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -95,7 +95,7 @@ var Polyline = Fiber.extend(function(base){
       tail: closest_i,
     }
 	}
-  exports.draw = function(ctx){
+  exports.draw = function(ctx, fillStyle, strokeStyle){
     var points = this.points
     if (! points.length) return
     if (points.length == 1) {
@@ -103,17 +103,17 @@ var Polyline = Fiber.extend(function(base){
       map.draw.dot_at(this.points[0].a, points[0].b, 5)
     }
     if (points.length > 1) {
-      ctx.fillStyle = "rgba(255,255,0,0.1)"
-      ctx.strokeStyle = "#f80"
+      ctx.fillStyle = fillStyle
+      ctx.strokeStyle = strokeStyle
       ctx.lineWidth = 2 / map.zoom
       ctx.beginPath()
       ctx.moveTo(points[0].a, points[0].b)
       points.forEach(function(point, i){
         i && ctx.lineTo(point.a, point.b)
       })
-      ctx.stroke()
+      strokeStyle && ctx.stroke()
       if (! map.ui.placing || this.closed) {
-        ctx.fill()
+        fillStyle && ctx.fill()
       }
     }
   }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 9cbf165..75ecae6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -76,6 +76,11 @@ var ShapeList = Fiber.extend(function(base){
     })
     return segments
   }
+  exports.draw = function(ctx, fillStyle, strokeStyle) {
+    this.shapes.forEach(function(shape){
+      shape.draw(ctx, fillStyle, strokeStyle)
+    })
+  }
   exports.serialize = function(){
     return this.shapes.map(function(shape){
       return shape.serialize()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 4b80b2c..0f35ac5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -106,9 +106,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       }
     }
 
-    shapes.forEach(function(shape){
-      shape.draw(map.draw.ctx)
-    })
+    shapes.draw(map.draw.ctx, "rgba(255,255,0,0.1)", "#f80")
 
     map.draw.ctx.strokeStyle = "#f00";
     map.draw.x_at(0,0)
-- 
cgit v1.2.3-70-g09d2


From 8ce3e6347b75a653ed3b7e4e3b2be5f23c841e97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 16:24:31 -0400
Subject: show start position

---
 public/assets/javascripts/rectangles/engine/map/draw.js     | 8 +++++++-
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js   | 2 +-
 public/assets/javascripts/ui/blueprint/BlueprintSettings.js | 2 +-
 public/assets/javascripts/ui/blueprint/BlueprintToolbar.js  | 2 ++
 public/assets/javascripts/ui/blueprint/BlueprintView.js     | 7 ++++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

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()
 	  }
 	},
-- 
cgit v1.2.3-70-g09d2


From a95cd473c3d6a3f98effcba03519d36a64ccac0f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 17:33:03 -0400
Subject: fix draw bug

---
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index bf55aae..7a1c064 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -100,7 +100,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.coords()
 
     if (shapes.workline) {
-      shapes.workline.draw(map.draw.ctx)
+      shapes.workline.draw(map.draw.ctx, "rgba(255,255,0,0.1)", "#f80")
       if (map.ui.placing && last_point) {
         shapes.workline.draw_line( map.draw.ctx, last_point )
       }
-- 
cgit v1.2.3-70-g09d2


From ebb9226fd5d37e8033e87e41b8ac0355d68f954c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 18:00:57 -0400
Subject: staff area for blueprints

---
 .../rectangles/engine/shapes/regionlist.js         | 64 +++++++++++++++-------
 .../rectangles/engine/shapes/shapelist.js          |  3 +
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  8 +--
 .../javascripts/ui/blueprint/BlueprintInfo.js      | 23 ++++++++
 public/assets/stylesheets/app.css                  |  9 +++
 server/lib/middleware.js                           | 23 ++++++++
 server/lib/views/staff/fields.js                   |  3 +-
 server/lib/views/staff/helpers.js                  |  7 +++
 server/lib/views/staff/index.js                    | 53 ++++++++++++++++--
 server/lib/views/staff/middleware.js               | 55 +++++++++++++++++++
 views/controls/blueprint/info.ejs                  |  7 +++
 views/staff/_blueprints.ejs                        | 21 +++++++
 views/staff/_nav.ejs                               |  1 +
 views/staff/blueprints/index.ejs                   | 13 +++++
 views/staff/blueprints/show.ejs                    | 59 ++++++++++++++++++++
 views/staff/blueprints/show_404.ejs                |  9 +++
 views/staff/layouts/show.ejs                       |  2 +-
 17 files changed, 331 insertions(+), 29 deletions(-)
 create mode 100644 views/staff/_blueprints.ejs
 create mode 100644 views/staff/blueprints/index.ejs
 create mode 100644 views/staff/blueprints/show.ejs
 create mode 100644 views/staff/blueprints/show_404.ejs

(limited to 'public/assets/javascripts/ui/blueprint/BlueprintEditor.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 86269a6..0dd4a1e 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -10,10 +10,25 @@ var RegionList = (function(){
   var RegionList = {}
   var regions = RegionList.regions
 
+  // Build a list of regions from the existing shapes.
+  // Operates on all the shapes at once.
   RegionList.build = function(){
-  
-    // first, get the segments sorted right to left & top to bottom
     var segments = RegionList.getSortedSegments()
+    return RegionList.buildRoomsFromSegments(segments)
+  }
+  
+  // Build a list of regions from the individual shapes.
+  // Same, but operates on the shapes individually
+  RegionList.buildByShape = function(){
+    var shapes = RegionList.getSortedSegmentsByShape()
+    var region_lists = shapes.map(function(shape){
+      return RegionList.buildRoomsFromSegments(shape.segments)
+    })
+    var regions = []
+    return regions.concat.apply(regions, region_lists);
+  }
+  
+  RegionList.buildRoomsFromSegments = function(segments){
 
     var rooms = []
     var seen_rooms = {}
@@ -172,31 +187,42 @@ var RegionList = (function(){
     return rooms
   }
   
-  
   // Gets a list of polylines from the ShapeList and sorts the segments.
   RegionList.getSortedSegments = function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
 
-    // re-orient them so they're either facing up or right and make them into rects
-    segments = segments.map(function(segment){
-      // vertical
-      if (segment[0].a == segment[1].a) {
-        if (segment[0].b > segment[1].b) {
-          segment.push(segment.shift())
-        }
-      }
-      // horizontal
-      else if (segment[0].b == segment[1].b) {
-        if (segment[0].a > segment[1].a) {
-          segment.push(segment.shift())
-        }
-      }
-      return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
-    })
+    segments = segments.map(RegionList.segmentsToRects)
     
     return sort.rects_by_position(segments)
   }
+  
+  RegionList.getSortedSegmentsByShape = function(){
+    return shapes.getAllShapeSegments().map(function(shape){
+      var segments = shape.map(RegionList.segmentsToRects)
+      return {
+        shape: shape,
+        segments: sort.rects_by_position(segments)
+      }
+    })
+  }
+
+  // re-orient a segment so it's either facing up or right and make it into a rect
+  RegionList.segmentsToRects = function(segment){
+    // vertical
+    if (segment[0].a == segment[1].a) {
+      if (segment[0].b > segment[1].b) {
+        segment.push(segment.shift())
+      }
+    }
+    // horizontal
+    else if (segment[0].b == segment[1].b) {
+      if (segment[0].a > segment[1].a) {
+        segment.push(segment.shift())
+      }
+    }
+    return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
+  }
 
   return RegionList
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index e5a70fb..2d33af2 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -69,6 +69,9 @@ var ShapeList = Fiber.extend(function(base){
   exports.forEach = function(fn){
     this.shapes.forEach(fn)
   }
+  exports.getAllShapeSegments = function(){
+    return this.shapes.map(function(shape){ return shape.getSegments() })
+  }
   exports.getAllSegments = function(){
     var segments = []
     this.shapes.forEach(function(shape){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 7a1c064..7704689 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -82,7 +82,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
-    this.regions = RegionList.build()
+    this.regions = RegionList.buildByShape()
   },
   
   animate: function(t, dt){
@@ -114,9 +114,9 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.camera(scene.camera)
     
 //    var colors = ["rgba(0,0,0,0.1)"]
-//     var colors = ["rgba(255,255,255,1)"]
-// 
-//    map.draw.regions(this.regions, colors, "#000")
+//    var colors = ["rgba(255,255,255,1)"]
+
+//     map.draw.regions(this.regions, colors, "#000")
 
 //     this.regions.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintInfo.js b/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
index 6dd6a7d..51b310e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
@@ -10,6 +10,7 @@ var BlueprintInfo = View.extend({
 		"change [name=units]": 'changeUnits',
 		"keydown [name=viewHeight]": 'enterViewHeight',
 		"change [name=viewHeight]": 'changeViewHeight',
+		"click .openScaler": 'openScaler',
 	},
 	
 	initialize: function(opt){
@@ -18,13 +19,30 @@ var BlueprintInfo = View.extend({
 		this.$units = this.$("[name=units]")
 		this.$viewHeight = this.$("[name=viewHeight]")
 		this.$unitName = this.$(".unitName")
+		this.$blueprintScaleDisplay = this.$("#blueprintScaleDisplay")
 	},
 	
 	load: function(data){
 		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
 		this.$height.unitVal( window.wallHeight = data.wallHeight || app.defaults.wallHeight )
 		this.$units.val( data.units )
+		this.$('span.units').html( data.units )
 		this.$unitName.html( data.units )
+
+		var resolution
+		switch (data.units) {
+		  case 'ft':
+		    resolution = app.defaults.footResolution
+		    break
+		  case 'm':
+		    resolution = app.defaults.meterResolution
+		    break
+		  case 'px':
+		  default:
+		    resolution = 1
+		    break
+		}
+    this.$blueprintScaleDisplay.html( ((1/data.scale) * resolution).toFixed(1) )
 		this.show()
 	},
 
@@ -33,6 +51,11 @@ var BlueprintInfo = View.extend({
     this.$viewHeight.unitVal( window.viewHeight )
 	},
 	
+	openScaler: function(){
+	  this.parent.scaler.pick( this.parent.data, true )
+	  this.parent.scaler.show()
+	},
+	
 	show: function(){	
 		this.toggle(true)
 	},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e4f1b27..1154fde 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2505,6 +2505,9 @@ input[type="range"]::-webkit-slider-thumb {
 	top: 5px;
 	font-weight:600;
 }
+.setting.number.scale label {
+	top: 0;
+}
 .setting.number label:after {
 	content:":";
 }
@@ -3328,6 +3331,7 @@ a[data-role="forgot-password"] {
   padding: 0px;
   position: relative;
   display: inline-block;
+  margin: 0 2px;
 }
 .blueprints .blueprint img {
   height: 100px;
@@ -3364,6 +3368,11 @@ a[data-role="forgot-password"] {
 [data-role="create-new-blueprint"] {
   margin-bottom: 10px;
 }
+.openScaler {
+  margin-left: 10px;
+  border-bottom: 1px solid;
+  cursor: pointer;
+}
 
 /* KEYBOARD SHORTCUTS */
 
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 04cb330..0a0a9ce 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -8,6 +8,7 @@ var passport = require('passport'),
 	Collaborator = require('./schemas/Collaborator'),
 	Project = require('./schemas/Project'),
 	Layout = require('./schemas/Layout'),
+	Blueprint = require('./schemas/Blueprint'),
 	Plan = require('./schemas/Plan');
 
 
@@ -129,6 +130,28 @@ var middleware = {
 		}
 	},
 
+	ensureBlueprint: function (req, res, next) {
+		if (req.params.slug) {
+			Blueprint.findOne({ slug: req.params.slug }, function(err, blueprint){
+				if (err) {
+					console.error(err)
+					req.blueprint = null
+				}
+				else if (! blueprint) {
+					req.blueprint = null
+				}
+				else {
+					req.blueprint = blueprint
+				}
+				next()
+			})
+		}
+		else {
+			req.blueprint = null
+			next()
+		}
+	},
+	
   ensureIsCollaborator: function(req, res, next) {
     req.isCollaborator = false
     req.isOwner = false
diff --git a/server/lib/views/staff/fields.js b/server/lib/views/staff/fields.js
index 57eea7e..84c1efa 100644
--- a/server/lib/views/staff/fields.js
+++ b/server/lib/views/staff/fields.js
@@ -1,7 +1,8 @@
 module.exports = {
   user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip",
   project: "_id name slug user_id privacy layout_type created_at updated_at",
-  layout: "_id name slug user_id layout_type created_at updated_at",
+  layout: "_id name slug user_id layout_type is_stock created_at updated_at",
+  blueprint: "_id name slug user_id created_at updated_at",
   plans: "monthly_price yearly_price basic_layout_monthly_price basic_layout_yearly_price " +
          "pro_layout_monthly_price pro_layout_yearly_price " +
          "basic_layout_limit pro_layout_limit stock_project_limit basic_project_limit pro_project_limit",
diff --git a/server/lib/views/staff/helpers.js b/server/lib/views/staff/helpers.js
index 57383f4..ff4065a 100644
--- a/server/lib/views/staff/helpers.js
+++ b/server/lib/views/staff/helpers.js
@@ -27,6 +27,13 @@ module.exports = {
     layout.user = {}
     return layout
   },
+
+  blueprint: function(blueprint){
+    blueprint = blueprint.toObject()
+    blueprint.date = moment( blueprint.updated_at || blueprint.created_at ).format("M/DD/YYYY hh:mm a")
+    blueprint.user = {}
+    return blueprint
+  },
   
   media: function(media){
     media = media.toObject()
diff --git a/server/lib/views/staff/index.js b/server/lib/views/staff/index.js
index 033fc88..49a0384 100644
--- a/server/lib/views/staff/index.js
+++ b/server/lib/views/staff/index.js
@@ -7,6 +7,7 @@ var User = require('../../schemas/User'),
 	Plan = require('../../schemas/Plan'),
 	Subscription = require('../../schemas/Subscription'),
 	Layout = require('../../schemas/Layout'),
+	Blueprint = require('../../schemas/Blueprint'),
 	config = require('../../../../config'),
 	middleware = require('../../middleware'),
 	util = require('../../util'),
@@ -159,7 +160,32 @@ var staff = module.exports = {
 
       staff.layouts.make_stock
     );
-    
+
+    //
+    // blueprints
+
+    app.get('/staff/blueprints',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+      
+      staff.middleware.ensureBlueprintsCount,
+
+      staff.middleware.ensureBlueprints,
+      staff.middleware.ensureBlueprintsUsers,
+
+      staff.blueprints.index
+    );
+    app.get('/staff/blueprints/:slug',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+
+      middleware.ensureBlueprint,
+      staff.middleware.ensureBlueprint,
+      staff.middleware.ensureBlueprintUser,
+
+      staff.blueprints.show
+    );
+
     //
     // media
     
@@ -321,7 +347,7 @@ var staff = module.exports = {
   },
   
   // /staff/projects/
-  // /staff/projects/:name
+  // /staff/projects/:slug
   projects: {
     index: function(req, res){
       res.locals.pagination.count = res.locals.projects.length
@@ -350,7 +376,7 @@ var staff = module.exports = {
   },
 
   // /staff/layouts/
-  // /staff/layouts/:name
+  // /staff/layouts/:slug
   layouts: {
     index: function(req, res){
       res.locals.pagination.count = res.locals.layouts.length
@@ -374,7 +400,26 @@ var staff = module.exports = {
       })
     },
   },
-  
+
+  // /staff/blueprints/
+  // /staff/blueprints/:slug
+  blueprints: {
+    index: function(req, res){
+      res.locals.pagination.count = res.locals.blueprints.length
+      res.locals.pagination.max = res.locals.blueprintCount
+      staff.paginate(req, res)
+      res.render('staff/blueprints/index')
+    },
+    show: function(req, res){
+      if (res.locals.blueprint) {
+        res.render('staff/blueprints/show', {
+        })
+      }
+      else {
+        res.render('staff/blueprints/show_404')
+      }
+    },
+  },
 
   media: {
     index: function(req, res){
diff --git a/server/lib/views/staff/middleware.js b/server/lib/views/staff/middleware.js
index 1ea98e9..03fda2e 100644
--- a/server/lib/views/staff/middleware.js
+++ b/server/lib/views/staff/middleware.js
@@ -6,6 +6,7 @@ var User = require('../../schemas/User'),
 	Plan = require('../../schemas/Plan'),
 	Subscription = require('../../schemas/Subscription'),
 	Layout = require('../../schemas/Layout'),
+	Blueprint = require('../../schemas/Blueprint'),
 	util = require('../../util'),
 	fields = require('./fields'),
 	helpers = require('./helpers'),
@@ -128,6 +129,35 @@ var middleware = module.exports = {
     })
   },
 
+  ensureBlueprints: function(req, res, next){
+    var paginationInfo = res.locals.pagination = {}
+    var criteria = req.criteria || {}
+    var limit = paginationInfo.limit = Math.min( Number(req.query.limit) || 50, 200 )
+    var offset = paginationInfo.offset = Number(req.query.offset) || 0
+    var sort
+    paginationInfo.sort = req.query.sort
+    paginationInfo.sortOptions = ["date", "name"]
+    switch (req.query.sort) {
+      default:
+      case 'date':
+        sort = {'updated_at': -1}
+        break
+      case 'name':
+        paginationInfo.sort = "name"
+        sort = {'slug': 1}
+        break
+    }
+    Blueprint.find(criteria)
+        .select(fields.blueprint)
+        .sort(sort)
+        .skip(offset)
+        .limit(limit)
+        .exec(function (err, blueprints) {
+      res.locals.blueprints = blueprints.map(helpers.blueprint)
+      next()
+    })
+  },
+
   ensureMedia: function(req, res, next){
     var paginationInfo = res.locals.pagination = {}
     var criteria = req.criteria || {}
@@ -240,6 +270,11 @@ var middleware = module.exports = {
     middleware.ensureObjectsUsers(res.locals.layouts, next)
   },
 
+  ensureBlueprintsUsers: function(req, res, next){
+    if (! res.locals.blueprints || ! res.locals.blueprints.length) { return next() }
+    middleware.ensureObjectsUsers(res.locals.blueprints, next)
+  },
+  
   ensureSubscriptionsUsers: function(req, res, next){
     if (! res.locals.subscriptions || ! res.locals.subscriptions.length) { return next() }
     middleware.ensureObjectsUsers(res.locals.subscriptions, next)
@@ -345,6 +380,13 @@ var middleware = module.exports = {
     })
   },
 
+  ensureBlueprintsCount: function(req, res, next){
+    Blueprint.count({}, function(err, count){
+      res.locals.blueprintCount = count || 0
+      next()
+    })
+  },
+  
   ensureMediaCount: function(req, res, next){
     Media.count({}, function(err, count){
       res.locals.mediaCount = count || 0
@@ -418,4 +460,17 @@ var middleware = module.exports = {
     })
   },
 
+  ensureBlueprint: function(req, res, next){
+    res.locals.blueprint = req.blueprint
+    next()
+  },
+  ensureBlueprintUser: function(req, res, next){
+    if (! res.locals.blueprint) { return next() }
+    User.findOne({ _id: res.locals.blueprint.user_id }, fields.user, function(err, user){
+      res.locals.blueprintUser = helpers.user(user) || defaults.user
+      next()
+    })
+  },
+
+
 }
\ No newline at end of file
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index 4e2316f..a86481b 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -20,4 +20,11 @@
 		</select>
 	</div>
 
+	<div class="setting number scale">
+		<label>scale</label>
+    <span id="blueprintScaleDisplay"></span>
+    px/<span class="units"></span>
+    <span class="openScaler">[edit scale]</span>
+	</div>
+
 </div>
diff --git a/views/staff/_blueprints.ejs b/views/staff/_blueprints.ejs
new file mode 100644
index 0000000..58fe2a3
--- /dev/null
+++ b/views/staff/_blueprints.ejs
@@ -0,0 +1,21 @@
+<table id="users">
+[[ blueprints.forEach(function(blueprint){ ]]
+  <tr>
+    <td>
+      <a href="/staff/blueprints/[[- blueprint.slug ]]">[[- blueprint.name ]]</a>
+    </td>
+    <td class="editLinks">
+      <a href="/blueprint/[[- blueprint.slug ]]">[view]</a>
+<!-- 
+      <a href="/api/rooms/[[- blueprint.slug ]]">[api]</a>
+ -->
+    </td>
+    <td>
+      <a href="/staff/users/[[- blueprint.user.username ]]">[[- blueprint.user.username ]]</a>
+    </td>
+    <td>
+      [[- blueprint.date ]]
+    </td>
+  </tr>
+[[ }) ]]
+</table>
diff --git a/views/staff/_nav.ejs b/views/staff/_nav.ejs
index 3bb3b08..702a374 100644
--- a/views/staff/_nav.ejs
+++ b/views/staff/_nav.ejs
@@ -3,6 +3,7 @@
   <a href="/staff/users">users</a>
   <a href="/staff/projects">projects</a>
   <a href="/staff/layouts">layouts</a>
+  <a href="/staff/blueprints">blueprints</a>
   <a href="/staff/media">media</a>
   <a href="/staff/plans">plans</a>
 <!-- <a href="/staff/subscriptions">subscriptions</a> -->
diff --git a/views/staff/blueprints/index.ejs b/views/staff/blueprints/index.ejs
new file mode 100644
index 0000000..2206a1c
--- /dev/null
+++ b/views/staff/blueprints/index.ejs
@@ -0,0 +1,13 @@
+[[ include ../_header ]]
+
+	<h1>Blueprints</h1>
+
+[[ include ../_nav ]]
+  
+  <hr>
+
+[[ include ../_pagination ]]
+[[ include ../_blueprints ]]
+[[ include ../_pagination ]]
+
+[[ include ../_footer ]]
diff --git a/views/staff/blueprints/show.ejs b/views/staff/blueprints/show.ejs
new file mode 100644
index 0000000..5fd9db6
--- /dev/null
+++ b/views/staff/blueprints/show.ejs
@@ -0,0 +1,59 @@
+[[ include ../_header ]]
+
+	<h1>[[- blueprint.name ]]</h1>
+
+[[ include ../_nav ]]
+
+  <hr>
+
+  <table>
+    <tr>
+      <td>
+        <a href="/staff/blueprints/[[- blueprint.slug ]]">[[- blueprint.name ]]</a>
+      </td>
+      <td class="editLinks">
+        <a href="/blueprint/[[- blueprint.slug ]]">[view]</a>
+        <a href="/blueprint/[[- blueprint.slug ]]/edit">[edit]</a>
+<!-- 
+        <a href="/api/rooms/[[- blueprint.slug ]]">[api]</a>
+ -->
+      </td>
+      <td>
+        [[- blueprint.date ]]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        [[ if (blueprintUser.photo) { ]]
+          <a href="/staff/users/[[- blueprintUser.username ]]"><div style="background-image:url([[- blueprintUser.photo ]])" class="avatar"></div></a>
+        [[ } ]]
+        <a href="/staff/users/[[- blueprintUser.username ]]">[[- blueprintUser.username ]]</a>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="999">
+        <img src="[[- blueprint.url ]]" style="max-width: 400px">
+      </td>
+    </tr>
+    <tr>
+      <td>Width</td>
+      <td>[[- blueprint.width ]]</td>
+    </tr>
+    <tr>
+      <td>Height</td>
+      <td>[[- blueprint.height ]]</td>
+    </tr>
+    <tr>
+      <td>Scale</td>
+      <td>[[- blueprint.scale ]]</td>
+    </tr>
+  </table>
+
+  <br><br>
+  <div id="actions">
+  </div>
+  
+  <br>
+  <br>
+
+[[ include ../_footer ]]
diff --git a/views/staff/blueprints/show_404.ejs b/views/staff/blueprints/show_404.ejs
new file mode 100644
index 0000000..0ffca86
--- /dev/null
+++ b/views/staff/blueprints/show_404.ejs
@@ -0,0 +1,9 @@
+[[ include ../_header ]]
+
+	<h1>Blueprint not found</h1>
+
+[[ include ../_nav ]]
+  
+  <hr>
+
+[[ include ../_footer ]]
diff --git a/views/staff/layouts/show.ejs b/views/staff/layouts/show.ejs
index b66449f..2742c1f 100644
--- a/views/staff/layouts/show.ejs
+++ b/views/staff/layouts/show.ejs
@@ -42,7 +42,7 @@
     </tr>
     <tr>
       <th>
-        featured?
+        stock layout?
       </th>
       <td id="isStockLayout">
         [[- layout.is_stock ? "yes" : "no" ]]
-- 
cgit v1.2.3-70-g09d2