summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintEditor.js11
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintUploader.js2
2 files changed, 11 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 73f21c0..8fe66ca 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -93,7 +93,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
map.draw.ctx.save()
map.draw.translate()
- this.floorplan.draw(map.draw.ctx, true)
+ // this.floorplan.draw(map.draw.ctx, true)
map.draw.coords()
@@ -113,6 +113,15 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
map.draw.mouse(map.ui.mouse.cursor)
map.draw.camera(scene.camera)
+ var rooms = RegionList.build()
+ rooms.forEach(function(room,i){
+ map.draw.ctx.fillStyle = colors[i % colors.length]
+ map.draw.ctx.fillRect( room[0][0].a, room[0][1].b,
+ room[1][0].a - room[0][0].a,
+ room[0][0].b - room[0][1].b
+ )
+ })
+
map.draw.ctx.restore()
},
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index c7138e9..fbb71d5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -38,7 +38,7 @@ var BlueprintUploader = UploadView.extend({
this.$blueprints.show()
data.forEach(this.append.bind(this))
this.hide()
- if (this.nameToShow) {
+ if (this.nameToShow && this.nameToShow !== "new") {
data.some(function(el){
if (el.slug == this.nameToShow) {
this.parent.scaler.pick(el)