From a4a001668f9f05272a4fbc28567b259ee45ada97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 13:21:44 -0400
Subject: RegionList

---
 .../rectangles/engine/shapes/regionlist.js         | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 public/assets/javascripts/rectangles/engine/shapes/regionlist.js

(limited to 'public/assets/javascripts/rectangles/engine/shapes/regionlist.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
new file mode 100644
index 0000000..1f2810f
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -0,0 +1,37 @@
+var RegionList = (function(){
+
+  var RegionList = {}
+  var regions = RegionList.regions
+  
+  RegionList.init = function(){
+  }
+  
+  RegionList.build = function(){
+    var segments = shapes.getAllSegments()
+    segments.forEach(function(segment){
+      if (segment[0][0] == segment[1][0]) {
+        if (segment[0][1] > segment[1][1]) {
+          segment.push(segment.shift())
+        }
+      }
+      else if (segment[0][1] == segment[1][1]) {
+        if (segment[0][0] > segment[1][0]) {
+          segment.push(segment.shift())
+        }
+      }
+    })
+    segments = segments.sort(function(a,b){
+      return a[0][0] < b[0][0]
+    })
+    
+    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 RegionList
+  
+})()
\ No newline at end of file
-- 
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/rectangles/engine/shapes/regionlist.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/rectangles/engine/shapes/regionlist.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/rectangles/engine/shapes/regionlist.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/rectangles/engine/shapes/regionlist.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/rectangles/engine/shapes/regionlist.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/rectangles/engine/shapes/regionlist.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 73fdf8d46f10793d210f4369adb8c31afa536d20 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 16:59:48 -0400
Subject: thinking

---
 .../rectangles/engine/shapes/regionlist.js         | 33 +++++++++++++---------
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/shapes/regionlist.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index fb2c8e5..b2672ad 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -106,22 +106,27 @@ var RegionList = (function(){
             }
           }
 /*
-          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
+          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, LEFT, 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]
+                if (segment.x.containsVec( 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++
             }
           }
 */
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index d37bc12..226e56f 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -114,6 +114,9 @@
 	vec2.prototype.containsVec = function(v){
 		return this.a <= v.a && v.b <= this.b
 	}
+	vec2.prototype.containsCenterVec = function(v){
+		return this.a < v.a && v.b < this.b
+	}
 	vec2.prototype.clamp = function(n){
 		return clamp(n, this.a, this.b)
 	}
-- 
cgit v1.2.3-70-g09d2


From 0d2ff65db2cf26c993245dae752dfb52b8cb2819 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 10:46:29 -0400
Subject: generating all room sides

---
 .../assets/javascripts/rectangles/engine/shapes/regionlist.js  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/shapes/regionlist.js')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index b2672ad..71f19d8 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -105,18 +105,18 @@ 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, LEFT, RIGHT)
+              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]
-                if (segment.x.containsVec( splitter[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
                   }
@@ -129,7 +129,7 @@ var RegionList = (function(){
               }
             }
           }
-*/
+
         }
       }
     }
-- 
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/rectangles/engine/shapes/regionlist.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/rectangles/engine/shapes/regionlist.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 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/rectangles/engine/shapes/regionlist.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


From ee110d4725943bbc2b783323ec5087324531ca33 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 18:17:14 -0400
Subject: get rooms api working with shapes

---
 .../javascripts/rectangles/engine/map/_map.js      |   3 +
 .../javascripts/rectangles/engine/map/draw.js      |  19 +--
 .../javascripts/rectangles/engine/shapes/ortho.js  |   9 ++
 .../rectangles/engine/shapes/polyline.js           |   9 ++
 .../rectangles/engine/shapes/regionlist.js         |  11 ++
 .../rectangles/engine/shapes/shapelist.js          |  13 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |   2 +-
 public/assets/javascripts/ui/reader/ReaderView.js  |   7 +-
 server/lib/api/rooms.js                            | 139 +++++++++++++++------
 9 files changed, 161 insertions(+), 51 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/shapes/regionlist.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index e27346d..6492db6 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -50,6 +50,7 @@ var Map = function(opt){
 	switch (opt.type) {
 		case "ortho":
 			base.draw = new Map.Draw (base, { ortho: true })
+			base.draw.grid_size = MAP_GRID_SIZE
 			base.ui = new Map.UI.Ortho (base)
 			base.sides = base.sides_for_center
 			$(window).resize(base.resize)
@@ -57,6 +58,7 @@ var Map = function(opt){
 		
 		case "editor":
 			base.draw = new Map.Draw (base)
+			base.draw.grid_size = MAP_GRID_SIZE
 			base.ui = new Map.UI.Editor (base)
 			base.sides = base.sides_for_center
 			$(window).resize(base.resize)
@@ -64,6 +66,7 @@ var Map = function(opt){
 		
 		case "minimap":
 			base.draw = new Map.Draw (base, { center: scene.camera, minimap: true })
+			base.draw.grid_size = MAP_GRID_SIZE * 10
 			base.ui = new Map.UI.Minimap (base)
 			base.sides = base.sides_for_camera
 			break
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index fd05f86..4f4759f 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -179,8 +179,8 @@ Map.Draw = function(map, opt){
 		ctx.lineWidth = 1/map.zoom
 		
 		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) {
+		var quant = sides.clone().quantize(draw.grid_size)
+		for (var x = quant.x.a - draw.grid_size; x <= quant.x.b; x += draw.grid_size) {
 		  if (Math.round(x) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
@@ -191,17 +191,18 @@ 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) % 360 == 0) {
+
+    for (var y = quant.y.a - draw.grid_size; y <= quant.y.b; y += draw.grid_size) {
+      if (Math.round(y) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
-		  }
-		  else {
+      }
+      else {
         ctx.strokeStyle = "rgba(0,0,0,0.05)"
         ctx.lineWidth = 1/map.zoom
-		  }
-			line(sides.x.a, y, sides.x.b, y)
-		}
+      }
+      line(sides.x.a, y, sides.x.b, y)
+    }
 	}
 
 	//
diff --git a/public/assets/javascripts/rectangles/engine/shapes/ortho.js b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
index c1acae5..163f646 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
@@ -1,5 +1,9 @@
 // An OrthoPolyline is a Polyline where all angles are 90 degrees.
 
+if (! ('window' in this) ) {
+  var Polyline = require("./polyline.js")
+}
+
 var OrthoPolyline = Polyline.extend(function(base){
 	var exports = {}
 	exports.type = function(){
@@ -55,3 +59,8 @@ var OrthoPolyline = Polyline.extend(function(base){
   }
   return exports
 })
+
+
+if (! ('window' in this) ) {
+  module.exports = OrthoPolyline
+}
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 579d0ea..b2cd92f 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -2,6 +2,11 @@
 // 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.
 
+if (! ('window' in this) ) {
+  var Fiber = require("../../../vendor/bower_components/fiber/src/fiber.js")
+  var vec2 = require("../../models/vec2")
+}
+
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
 	exports.init = function(){
@@ -201,3 +206,7 @@ var Polyline = Fiber.extend(function(base){
 	}
   return exports
 })
+
+if (! ('window' in this) ) {
+  module.exports = Polyline
+}
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 0dd4a1e..8c9e732 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -5,6 +5,13 @@
 // 1) all angles are orthogonal
 // 2) all polylines are closed
 
+if (! ('window' in this) ) {
+  var Fiber = require("../../../vendor/bower_components/fiber/src/fiber.js")
+  var vec2 = require("../../models/vec2")
+  var Rect = require("../../models/rect")
+  var sort = require("../../util/sort")
+}
+
 var RegionList = (function(){
 
   var RegionList = {}
@@ -223,6 +230,10 @@ var RegionList = (function(){
     }
     return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
   }
+  
+  if (! ('window' in this) ) {
+		module.exports = RegionList
+	}
 
   return RegionList
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 2d33af2..21beb76 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -1,5 +1,11 @@
 // The ShapeList manages the list of polylines which form a V2 layout.
 
+if (! ('window' in this) ) {
+  var Fiber = require("../../../vendor/bower_components/fiber/src/fiber.js")
+  var Polyline = require("./polyline.js")
+  var OrthoPolyline = require("./ortho.js")
+}
+
 var ShapeList = Fiber.extend(function(base){
   var exports = {}
   exports.init = function(){
@@ -110,4 +116,9 @@ var ShapeList = Fiber.extend(function(base){
     })
   }
   return exports
-})
\ No newline at end of file
+})
+
+if (! ('window' in this) ) {
+  shapes = new ShapeList
+  module.exports = shapes
+}
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 83bc8b7..d8cfca6 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		if (data.shapes) {
+		if (data.shapes.length) {
 		  Rooms.deserializeFromShapes(data, data.walls)
 		}
 		else if (data.rooms) {
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 1ba97cf..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -76,7 +76,12 @@ var ReaderView = View.extend({
   },
   
   build: function(data){
-		data.rooms && Rooms.deserialize(data.rooms)
+		if (data.shapes.length) {
+		  Rooms.deserializeFromShapes(data)
+		}
+		else {
+		  Rooms.deserialize(data.rooms)
+		}
 		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
     data.sculpture && Sculpture.deserialize(data.sculpture)
diff --git a/server/lib/api/rooms.js b/server/lib/api/rooms.js
index c044309..2a1d2fe 100644
--- a/server/lib/api/rooms.js
+++ b/server/lib/api/rooms.js
@@ -6,6 +6,8 @@ var Clipper = require("../../../public/assets/javascripts/rectangles/engine/room
 var Builder = require("../../../public/assets/javascripts/rectangles/engine/rooms/builder.js")
 var Grouper = require("../../../public/assets/javascripts/rectangles/engine/rooms/grouper.js")
 var Walls = require("../../../public/assets/javascripts/rectangles/engine/rooms/_walls.js")
+var shapes = require("../../../public/assets/javascripts/rectangles/engine/shapes/shapelist.js")
+var RegionList = require("../../../public/assets/javascripts/rectangles/engine/shapes/regionlist.js")
 
 /* jshint node: true */
 
@@ -21,47 +23,106 @@ var rooms = module.exports = {
 			if (! doc) { res.json({ status: 404 }); return }
 			doc = doc.toObject()
 
-      doc.rooms.forEach(function(data){
-				var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
-				var room = new Room({
-					id: data.id,
-					rect: rect,
-					height: data.height
-				})
-				Rooms.add(room)
-			})
-			Rooms.clipper.solve_rects()
-      Rooms.builder.build()
-
-			var walls = [], mx_walls = [], mx_floor = [], mx_ceiling = []
-			var collections = Rooms.grouper.collect()
-			Rooms.grouper.cull(collections)
-			Rooms.grouper.group(walls, collections, FRONT)
-			Rooms.grouper.group(walls, collections, BACK)
-			Rooms.grouper.group(walls, collections, LEFT)
-			Rooms.grouper.group(walls, collections, RIGHT)
-			walls.forEach(function(wall){
-			  wall.mx.forEach(function(mx){
-			    var data = mx.report()
-			    data.id = wall.id
-          mx_walls.push(data)
-			  })
-			})
-
-      doc.mx_walls = mx_walls
-      doc.mx_floor = mx_floor
-      doc.mx_ceiling = mx_ceiling
-      
-      Rooms.forEach(function(room){
-        room.mx_floor.forEach(function(mx){
-          mx_floor.push( mx.report() )
-        })
-        room.mx_ceiling.forEach(function(mx){
-          mx_ceiling.push( mx.report() )
-        })
-      })
+      if (doc.shapes.length) {
+        parseMxShapes(doc)
+      }
+      else {
+        parseMxRooms(doc)
+      }
 
       res.json(doc)
 		})
 	}
 }
+
+function parseMxShapes (doc) {
+  var viewHeight = doc.viewHeight
+  var wallHeight = doc.wallHeight
+
+  shapes.deserialize( doc.shapes )
+
+  var walls = [], mx_walls = [], mx_floor = [], mx_ceiling = []
+  var regions = RegionList.build()
+  
+  regions.forEach(function(region){
+    var room = new Room({
+      rect: region,
+      regions: [region],
+      height: wallHeight,
+    })
+
+    room.sides = region.sides
+    region.id = Rooms.uid("room_")
+    Rooms.list[ region.id ] = room
+    Rooms.builder.build_walls(region)
+    mx_floor.push( Rooms.builder.make_floor(room, region) )
+    mx_ceiling.push( Rooms.builder.make_ceiling(room, region) )
+  })
+
+  var collections = Rooms.grouper.collect()
+  Rooms.grouper.cull(collections)
+  Rooms.grouper.group(walls, collections, FRONT)
+  Rooms.grouper.group(walls, collections, BACK)
+  Rooms.grouper.group(walls, collections, LEFT)
+  Rooms.grouper.group(walls, collections, RIGHT)
+  walls.forEach(function(wall){
+    wall.mx.forEach(function(mx){
+      var data = mx.report()
+      data.id = wall.id
+      mx_walls.push(data)
+    })
+  })
+
+  doc.mx_walls = mx_walls
+  doc.mx_floor = mx_floor
+  doc.mx_ceiling = mx_ceiling
+
+  Rooms.forEach(function(room){
+    mx_floor.push( room.mx_floor )
+    room.mx_ceiling.forEach(function(mx){
+      mx_ceiling.push( mx.report() )
+    })
+  })
+}
+
+function parseMxRooms (doc) {
+  doc.rooms.forEach(function(data){
+    var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
+    var room = new Room({
+      id: data.id,
+      rect: rect,
+      height: data.height
+    })
+    Rooms.add(room)
+  })
+  Rooms.clipper.solve_rects()
+  Rooms.builder.build()
+
+  var walls = [], mx_walls = [], mx_floor = [], mx_ceiling = []
+  var collections = Rooms.grouper.collect()
+  Rooms.grouper.cull(collections)
+  Rooms.grouper.group(walls, collections, FRONT)
+  Rooms.grouper.group(walls, collections, BACK)
+  Rooms.grouper.group(walls, collections, LEFT)
+  Rooms.grouper.group(walls, collections, RIGHT)
+  walls.forEach(function(wall){
+    wall.mx.forEach(function(mx){
+      var data = mx.report()
+      data.id = wall.id
+      mx_walls.push(data)
+    })
+  })
+
+  doc.mx_walls = mx_walls
+  doc.mx_floor = mx_floor
+  doc.mx_ceiling = mx_ceiling
+  
+  Rooms.forEach(function(room){
+    room.mx_floor.forEach(function(mx){
+      mx_floor.push( mx.report() )
+    })
+    room.mx_ceiling.forEach(function(mx){
+      mx_ceiling.push( mx.report() )
+    })
+  })
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2