outline walls on builder

8 files changed, 30 insertions, 3 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 9a557b9..f9334e6 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -38,7 +38,6 @@ Map.UI.Editor = function(map){
 			cursor.quantize(1/map.zoom)
 			map.center.a = cursor.x.a
 			map.center.b = -cursor.y.a
-			console.log(map.center+"")
 			cursor.x.b = cursor.x.a
 			cursor.y.b = cursor.y.a
 			base.mouse.down = false
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f9eb9b7..82ccb87 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -88,6 +88,20 @@
 			})
     },
 		
+		base.paint = function(){
+      var wallColor = rgba_string(Walls.colors.wall, app.defaults.wallOpacity)
+      var outlineColor = rgb_string(Walls.colors.outline)
+      var floorColor = rgb_string(Walls.colors.floor)
+      var ceilingColor = rgb_string(Walls.colors.ceiling)
+      Walls.forEach(function(wall){
+        wall.outline(wallColor, outlineColor)
+      })
+      Rooms.forEach(function(room){
+        room.setFloorColor(floorColor)
+        room.setCeilingColor(ceilingColor)
+      })
+		}
+		
     base.setColor = {
     
       wall: function(rgb){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index f0935d4..6a89158 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -44,9 +44,10 @@
 				base.clear()
 				base.build()
 				Rooms.grouper.build()
+				app.tube("rooms-built")
 			}
 		}
-		
+
 		base.build = function (){
 			Rooms.regions.forEach(function(region){
 				this.build_walls(region).forEach(function(el){
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 2fffdba..e6b7e97 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -55,6 +55,7 @@ var BuilderInfo = View.extend({
 		this.$height.unitVal( room.height )
 		this.$x.unitVal( room.rect.x.a )
 		this.$y.unitVal( room.rect.y.a )
+	  this.show()
 	},
 
 	destroy: function(room){
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 796c398..94eed29 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -9,7 +9,7 @@ var BuilderSettings = FormView.extend({
 	events: {
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
-		"click [data-role='save-layout']": 'save',
+		"click [data-role='save-layout']": 'clickSave',
 		"click [data-role='clone-layout']": 'clone',
 		"click [data-role='clear-layout']": 'clear',
 		"click [data-role='destroy-layout']": 'destroy',
@@ -118,6 +118,11 @@ var BuilderSettings = FormView.extend({
 		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
 		return fd
 	},
+
+	clickSave: function(){
+    this.toggle(false)
+    this.save()
+	},
 	
 	success: function(data){
 		this.$id.val(data._id)
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index a89111f..81dce52 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,6 +12,11 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
+
+		app.on("rooms-built", function(){
+		  Walls.paint()
+		})
+
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 1bfc6cb..2449465 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,6 +29,7 @@ var LayoutsIndex = View.extend({
 			
 			this.$templates.append($span)
 		}.bind(this))
+		console.log(this.$templates.html())
 		this.show()
 	}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 39f9f1a..ebc21a8 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,7 @@ iframe.embed {
 .templates {
 	overflow: auto;
 	max-height: 80%;
+	width: 100%;
 }
 .no-templates {
 	display: none;