6 files changed, 26 insertions, 4 deletions

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