set wall height

11 files changed, 29 insertions, 33 deletions

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