From 4263bc016e828f7407b446e27bdf64d898758627 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:54:14 -0400
Subject: refactor layout-parsing calls into Rooms.rebuild

---
 public/assets/javascripts/rectangles/engine/rooms/builder.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/builder.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 6a89158..4619eb1 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -32,19 +32,16 @@
 		var els = []
 
 		base.init = function(){
-			base.bind()
+			// base.bind()
 		}
 
 		base.bind = function(){
-			app.on("clip", base.rebuild.bind(base))
 		}
 
 		base.rebuild = function(){
 			if (window.scene) {
 				base.clear()
 				base.build()
-				Rooms.grouper.build()
-				app.tube("rooms-built")
 			}
 		}
 
-- 
cgit v1.2.3-70-g09d2


From f73f5c517d08581d8d1c687a42e9ef9e5598662a Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Sun, 12 Oct 2014 11:43:41 -0400
Subject: undo button on toolbar

---
 public/assets/javascripts/rectangles/engine/rooms/builder.js |  2 +-
 public/assets/javascripts/ui/editor/EditorToolbar.js         | 12 ++++++++++++
 public/assets/stylesheets/app.css                            |  2 +-
 views/controls/editor/toolbar.ejs                            |  6 +++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/builder.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 4619eb1..33333fb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -293,7 +293,7 @@
         this.el = this.rect = this.face = null
 			}
 
-			// possible if walls are opaque
+			// preferable if walls are opaque
 			// el.el.classList.add("backface-hidden")
 
 			return el
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 8a707ec..0b1da0b 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -4,6 +4,7 @@ var EditorToolbar = View.extend({
 
 	events: {
 	  "mousedown": 'stopPropagation',
+		"click [data-role='undo']": 'undo',
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -18,6 +19,17 @@ var EditorToolbar = View.extend({
 		this.parent = opt.parent
 	},
 
+	undo: function(e){
+		if (e.shiftKey) {
+			var canRedo = UndoStack.redo()
+			console.log("can redo", canRedo)
+		}
+		else {
+			var canUndo = UndoStack.undo()
+			console.log("can undo", canUndo)
+		}
+	},
+	
 	toggleMap: function(){
 		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
 		this.resetControls()
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 271f13a..849c994 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1647,7 +1647,7 @@ input[type="range"]::-webkit-slider-thumb {
   border-bottom: 1px transparent solid;
 }
 .presets span.active {
-  border-bottom: 1px dotted;
+	text-decoration: underline;
 }
 .color-swatches span {
 	display: inline-block;
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 47d7c3c..57a98b9 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,10 +1,14 @@
 
 <div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left">
+	<span
+		data-role='undo'
+		data-info="undo"
+		class="ion-reply"></span>
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
-  <span
+	<span
     data-role='toggle-presets'
     data-info="preset styles"
     class="ion-ios7-briefcase-outline"></span>
-- 
cgit v1.2.3-70-g09d2


From 9ae4f45f24e3e79aeb32e0a128ee798381b80569 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 15 Oct 2014 22:35:48 -0400
Subject: more help text

---
 public/assets/javascripts/defaults.js                        | 2 +-
 public/assets/javascripts/rectangles/engine/rooms/builder.js | 2 +-
 public/assets/javascripts/ui/editor/HelpCursor.js            | 8 +++++---
 public/assets/javascripts/ui/editor/MediaViewer.js           | 5 ++++-
 public/assets/javascripts/ui/editor/Presets.js               | 4 ++--
 public/assets/stylesheets/app.css                            | 2 ++
 6 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/builder.js')

diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 9ba0b4d..12aed62 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -3,7 +3,7 @@ app.defaults = {
 	units: app.units = "ft",
 	footResolution: 36,
 	meterResolution: 100,
-	wallOpacity: 0.95,
+	wallOpacity: 0.98,
 	outlineWidth: 2,
 	colors: {
     wall: [255,255,255],
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 33333fb..c95734b 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -280,7 +280,7 @@
 			return el
 		}
 		this.make_wall = function (klass) {
-		  // klass += ".backface-hidden"
+		  klass += ".backface-hidden"
 			var el = new MX.Object3D(".face" + (klass || ""))
 			el.width = el.height = el.scaleX = el.scaleY = el.scaleZ = 1
 			el.z = el.y = el.x = 0
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 8bfaef8..9b6807e 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -5,9 +5,11 @@ var HelpCursor = View.extend({
 	active: false,
 	
 	messages: {
-	  start: "Welcome to Vvalls!  Click one of the tools at right to learn how it works.",
-	  media: "This is where you pick media to go on the walls.  You can upload media, paste links, or use some of the found media.",
-	  presets: "These presets will affect on all the walls.  Click some of them to see the walls change.",
+	  start: "Welcome to Vvalls!  Click one of the tools at right to learn about it.",
+	  media: "This is where you pick media to go on the walls.  You can upload media and paste links.",
+	  addmedia: "Great, now click a wall to place this image.",
+	  resize: "Drag the image to position it, or use the dots to resize.",
+	  presets: "These are some basic presets to get you started. Click em! :-)",
 	  wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.",
 	  colors: "Use these colors to change the color of the walls, floor, and ceiling.",
 	  settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.",
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index e196e41..8cae4a4 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -77,6 +77,7 @@ var MediaViewer = ModalView.extend({
 		this.__super__.hide.call(this)
 		this.deleteArmed(false)
 		this.parent.mediaUpload.hide()
+		this.parent.cursor.message('start')
 	},
 
 	load: function(){
@@ -232,7 +233,8 @@ var MediaViewer = ModalView.extend({
 		}
 
 		this.hide()
-		
+		this.parent.cursor.message('addmedia')
+
 		var $ants = $('.ants');
 		var $floatingImg = $('.floatingImg');
 		
@@ -267,6 +269,7 @@ var MediaViewer = ModalView.extend({
 			$(window).off('mousedown', _hideCursor)
       app.off('cancel-scenery', _hideCursor)
 			$floatingImg.parent().removeClass('edit')
+			app.controller.cursor.message('resize')
 		}
 		$(window).on('mousemove', _followCursor)
 		$(window).on('mousedown', _hideCursor)
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 35b5b58..4edc957 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -39,11 +39,11 @@ var Presets = View.extend({
   },
 
   toggle: function(state){
-    this.$el.toggleClass("active", state);
+    this.$el.toggleClass("active", state)
+    this.parent.cursor.message(state ? "presets" : "start")
   },
   
   show: function(){
-    this.parent.cursor.message("presets")
     this.toggle(true)
   },
   
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 250ae67..1ab1198 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1676,6 +1676,7 @@ input[type="range"]::-webkit-slider-thumb {
 	cursor:pointer;
   border-bottom: 1px transparent solid;
 }
+.presets span:hover,
 .presets span.active {
 	text-decoration: underline;
 }
@@ -1728,6 +1729,7 @@ input[type="range"]::-webkit-slider-thumb {
   padding: 4px;
   font-weight: 500;
   z-index: 22;
+  display: none;
 }
 
 .settings.info {
-- 
cgit v1.2.3-70-g09d2


From 87ce2f24887f20cf34165f92b43bbfd33435f30a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 13:59:42 -0500
Subject: hiding floor/ceiling in ff

---
 public/assets/javascripts/rectangles/engine/rooms/builder.js | 6 ++++++
 public/assets/javascripts/ui/editor/ColorControl.js          | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'public/assets/javascripts/rectangles/engine/rooms/builder.js')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index c95734b..5e09fab 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -261,6 +261,9 @@
 			el.rotationX = PI/2
 			el.rect = region
 			el.side = FLOOR
+			if ($.browser.mozilla) {
+			  el.el.style.display = "none"
+			}
 			return el
 		}
 		this.make_ceiling = function (room, region) {
@@ -277,6 +280,9 @@
 			el.rotationX = -PI/2
 			el.rect = region
 			el.side = CEILING
+			if ($.browser.mozilla) {
+			  el.el.style.display = "none"
+			}
 			return el
 		}
 		this.make_wall = function (klass) {
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 9ab2623..54a6a2e 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -47,7 +47,12 @@ var ColorControl = View.extend({
     	$swatch.css("background-color","rgb(" + color + ")")
     	$swatch.data('color', color)
     	this.$colors.append($swatch)
-    }.bind(this))    
+    }.bind(this))
+    
+    if ($.browser.mozilla) {
+      $("#floor-color").parent().hide()
+      $("#ceiling-color").parent().hide()
+    }
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
-- 
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/rooms/builder.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