From dbaf1b362e775f0923e3910d06de510369811802 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Oct 2014 11:43:56 -0400
Subject: click background to deselect room in blueprint editor

---
 public/assets/javascripts/rectangles/engine/map/ui_editor.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'public/assets/javascripts/rectangles')

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 3c3347b..6dc6c90 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -167,12 +167,11 @@ Map.UI.Editor = function(map){
           redo: room.copy()
         })
         
+        Rooms.rebuild()
 				app.tube("builder-pick-room", room)
 			}
 		}
-		
     if (base.resizing || base.dragging) {
-
       var oldState = base.dragging.copy()
       
       if (base.resizing) {
@@ -187,7 +186,15 @@ Map.UI.Editor = function(map){
         undo: oldState,
         redo: base.dragging.copy()
       })
+      Rooms.rebuild()
     }
+		
+		var intersects = Rooms.filter(function(r){
+			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
+		})
+		if (! intersects.length) {
+      app.tube("builder-pick-nothing")
+		}
     
 		base.creating = base.dragging = base.resizing = false
 	}
-- 
cgit v1.2.3-70-g09d2


From 10a98d58fcba585dc13d251497c6028d04de0031 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Oct 2014 13:34:52 -0400
Subject: larger default size

---
 public/assets/javascripts/rectangles/engine/scenery/randomize.js   | 4 ++--
 public/assets/javascripts/rectangles/engine/scenery/types/image.js | 2 +-
 public/assets/javascripts/rectangles/engine/scenery/types/video.js | 2 +-
 public/assets/javascripts/rectangles/util/constants.js             | 3 ++-
 views/controls/builder/info.ejs                                    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'public/assets/javascripts/rectangles')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
index 4f1144a..82b6bf9 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -10,11 +10,11 @@ Scenery.randomize = function (media_data) {
   var media_list = media_data.map(function(media){
     var width, height
     if (media.width > media.height) {
-      width = Math.min(300, media.width)
+      width = Math.min(DEFAULT_PICTURE_WIDTH, media.width)
       height = media.height/media.width * width
     }
     else {
-      height = Math.min(300, media.height)
+      height = Math.min(DEFAULT_PICTURE_WIDTH, media.height)
       width = media.width/media.height * height
     }
     return {
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index bed847b..10fc917 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -7,7 +7,7 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 	
 		init: function(opt){
 
-			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
+			opt.scale = opt.scale || (opt.data && opt.data.scale) || DEFAULT_PICTURE_WIDTH / max(DEFAULT_PICTURE_WIDTH, opt.media.width)
 
 			base.init.call(this, opt)
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index b723f56..a669a90 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -6,7 +6,7 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 	  type: 'video',
 	
 		init: function(opt){
-			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
+			opt.scale = opt.scale || (opt.data && opt.data.scale) || DEFAULT_PICTURE_WIDTH / max(DEFAULT_PICTURE_WIDTH, opt.media.width)
 
 			base.init.call(this, opt)
 
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index 198cc41..a38325e 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -20,7 +20,8 @@ var height_min = 200,
 		side_min = 10,
 		side_max = 5000,
 		resize_margin = 8,
-		cursor_amp = 1.5
+		cursor_amp = 1.5,
+		DEFAULT_PICTURE_WIDTH = 400
 
 var painting_distance_from_wall = 10,
 		dot_distance_from_picture = 3
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 3c5d4b7..205938f 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -40,7 +40,7 @@
 	</div>
 
 	<div class="setting">
-		<a href="#" class="warn btn" data-role="destroy-room">delete this room</a>
+		<a href="#" class="warn btn" data-role="destroy-room">remove this room</a>
 	</div>
 
 </div>
-- 
cgit v1.2.3-70-g09d2