blueprint scaler stuff

2 files changed, 34 insertions, 5 deletions

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index e11b61e..a81c89b 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -18,7 +18,7 @@ var BlueprintScaler = ModalView.extend({
     this.map = map = new Map ({
       type: "ortho",
       el: this.$blueprintMap.get(0),
-      width: window.innerWidth/2,
+      width: window.innerWidth,
       height: window.innerHeight,
       zoom: -2,
       zoom_min: -6.2,
@@ -27,10 +27,38 @@ var BlueprintScaler = ModalView.extend({
     map.ui.add_tool("arrow", new ArrowTool)
     map.ui.add_tool("position", new PositionTool)
     map.ui.set_tool("position")
+    
+    scene = scene || { camera: { x: 0, y: 0, z: 0 } }
+    
+    this.floorplan = new MX.Image ()
+    
+    this.animate()
 	},
 	
-	pick: function(){
-    
+	pick: function(media){
+    this.floorplan.load({ media: media, keepImage: true })
+	},
+	
+	animate: function(t){
+    requestAnimationFrame(this.animate.bind(this))
+
+    var dt = t - this.last_t
+    this.last_t = t
+
+    if (! t) return
+
+    this.map.update(t)
+
+    this.map.draw.ctx.save()
+    this.map.draw.translate()
+
+    this.floorplan.draw(this.map.draw.ctx, true)
+
+    this.map.draw.coords()
+
+    this.map.draw.mouse(this.map.ui.mouse.cursor)
+
+    this.map.draw.ctx.restore()
 	},
 
 	changeDimensions: function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
index deb1075..498575a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -36,8 +36,9 @@ var BlueprintUpload = UploadView.extend({
 		this.loaded = true
 		if (data && data.length) {
 		  this.$blueprints.show()
-		  data.forEach(this.append.bind(this))
-		  this.show()
+      data.forEach(this.append.bind(this))
+      this.hide()
+      this.parent.blueprintScaler.pick(data[0])
 		}
 		else {
 		  this.show()