From 3022e063a4b501cd581f1cb70c2dc709e4a3294c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 12:28:54 -0500
Subject: making random placement api more general

---
 .../rectangles/engine/scenery/randomize.js         | 51 ++++++++++++++--------
 1 file changed, 34 insertions(+), 17 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
index 82b6bf9..1c8ec4f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -1,13 +1,17 @@
 /*
   // get the list of media we want to place
-  var media_data = $(".mediaContainer").toArray().map(function(el){
+  var media_objs = $(".mediaContainer").toArray().map(function(el){
     return $(el).data("media")
   })
-  Scenery.randomize( media_data )
+  var walls = []
+  Scenery.randomize.add( media_objs, walls )
 */
 
-Scenery.randomize = function (media_data) {
-  var media_list = media_data.map(function(media){
+Scenery.randomize = {};
+
+// Given a list of media objects, generate their ideal dimensions
+Scenery.randomize.get_dimensions = function (media_objs){
+  var media_list = media_objs.map(function(media){
     var width, height
     if (media.width > media.height) {
       width = Math.min(DEFAULT_PICTURE_WIDTH, media.width)
@@ -22,37 +26,50 @@ Scenery.randomize = function (media_data) {
       media: media,
     }
   })
+  return media_list
+}
 
+// Build the lookup of empty walls.
+// Takes a list of walls to use, or undefined to use all empty walls.
+// Returns a lookup of walls to use, keyed by wall ID.
+Scenery.randomize.get_empty_walls = function(wall_list){
   // get a list of all walls
   var walls = {}
-  Walls.forEach(function(wall){
+  (wall_list || Walls).forEach(function(wall){
     walls[wall.id] = wall
   })
 
   // remove the walls that already have stuff on them
-  Scenery.forEach(function(scenery){
-    delete walls[scenery.wall.id] 
-  })
+  if (! wall_list) {
+    Scenery.forEach(function(scenery){
+      delete walls[scenery.wall.id] 
+    })
+  }
+  
+  return walls
+}
 
+// Randomly place a set of media objects on empty walls.
+// Only one object per wall will be added.
+Scenery.randomize.add = function (media_objs, wall_list) {
+  var media_list = Scenery.randomize.get_dimensions(media_objs)
+  var walls = Scenery.randomize.get_empty_walls(wall_list)
+  
   var wall_ids = _.keys(walls)
-  if (! wall_ids.length) {
-    return
-  }
+  if (! wall_ids.length) { return }
 
   // randomize walls
   shuffle(wall_ids)
 
   // assign each of the media to the walls, until we run out of either
-  media_list.some(function(media){
-    if (wall_ids.length == 0) {
-      return true
-    }
+  media_list.all(function(media){
+    // bail if we're out of walls
+    if (wall_ids.length == 0) { return false }
   
     var i, fits = -1
 
     for (i = 0; i < wall_ids.length; i++) {
       if (walls[wall_ids[i]].surface.fits(media.dimensions)) {
-        // walls[wall_ids[i]]
         fits = i
         break
       }
@@ -72,6 +89,6 @@ Scenery.randomize = function (media_data) {
       // artwork won't fit anywhere??
     }
   
-    return false
+    return true
   })
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 57ec98db0520b0cc6fe563b983959bf6cb33d1fd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 12:32:37 -0500
Subject: allow for calling random placement api multiple times

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

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
index 1c8ec4f..e6d662a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -42,7 +42,13 @@ Scenery.randomize.get_empty_walls = function(wall_list){
   // remove the walls that already have stuff on them
   if (! wall_list) {
     Scenery.forEach(function(scenery){
-      delete walls[scenery.wall.id] 
+      if (scenery.was_randomly_placed) {
+        // remove it and reuse this wall?
+        Scenery.remove( scenery.id )
+      }
+      else {
+        delete walls[scenery.wall.id] 
+      }
     })
   }
   
@@ -79,11 +85,12 @@ Scenery.randomize.add = function (media_objs, wall_list) {
       var wall = walls[wall_ids[fits]]
       wall_ids.splice(fits, 1)
     
-      Scenery.add({
+      var scenery = Scenery.add({
         media: media.media,
         wall: wall,
         index: 0,
       })
+      scenery.was_randomly_placed = true
     }
     else {
       // artwork won't fit anywhere??
-- 
cgit v1.2.3-70-g09d2


From a1860ea42334447f49649a3491bad605237a23d5 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 12:48:53 -0500
Subject: randomize button on media drawer (unstyled)

---
 .../javascripts/rectangles/engine/scenery/randomize.js   | 16 +++++++++-------
 public/assets/javascripts/ui/editor/MediaViewer.js       | 10 ++++++++--
 views/controls/editor/media-drawer.ejs                   |  1 +
 3 files changed, 18 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
index e6d662a..1c2eb56 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -3,8 +3,7 @@
   var media_objs = $(".mediaContainer").toArray().map(function(el){
     return $(el).data("media")
   })
-  var walls = []
-  Scenery.randomize.add( media_objs, walls )
+  Scenery.randomize.add( media_objs )
 */
 
 Scenery.randomize = {};
@@ -34,8 +33,9 @@ Scenery.randomize.get_dimensions = function (media_objs){
 // Returns a lookup of walls to use, keyed by wall ID.
 Scenery.randomize.get_empty_walls = function(wall_list){
   // get a list of all walls
-  var walls = {}
-  (wall_list || Walls).forEach(function(wall){
+  var walls = {};
+
+  (wall_list || Walls.list).forEach(function(wall){
     walls[wall.id] = wall
   })
 
@@ -57,6 +57,7 @@ Scenery.randomize.get_empty_walls = function(wall_list){
 
 // Randomly place a set of media objects on empty walls.
 // Only one object per wall will be added.
+// Optionally takes a list of walls to use.
 Scenery.randomize.add = function (media_objs, wall_list) {
   var media_list = Scenery.randomize.get_dimensions(media_objs)
   var walls = Scenery.randomize.get_empty_walls(wall_list)
@@ -66,11 +67,12 @@ Scenery.randomize.add = function (media_objs, wall_list) {
 
   // randomize walls
   shuffle(wall_ids)
+  shuffle(media_list)
 
   // assign each of the media to the walls, until we run out of either
-  media_list.all(function(media){
+  media_list.some(function(media){
     // bail if we're out of walls
-    if (wall_ids.length == 0) { return false }
+    if (wall_ids.length == 0) { return true }
   
     var i, fits = -1
 
@@ -96,6 +98,6 @@ Scenery.randomize.add = function (media_objs, wall_list) {
       // artwork won't fit anywhere??
     }
   
-    return true
+    return false
   })
 }
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index dd17613..9593ab7 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -13,6 +13,7 @@ var MediaViewer = ModalView.extend({
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
+		'click #randomize': "randomize",
 		'click .mediaContainer': "pick",
 		'click .viewMore': "load",
 	},
@@ -119,10 +120,15 @@ var MediaViewer = ModalView.extend({
 	},
 	
 	randomize: function(){
-    var media_data = $(".mediaContainer").toArray().map(function(el){
+	  var $divs = this.$myMediaContainer.find(".mediaContainer").toArray()
+	  if ($divs.length < 3) {
+	    $divs = $divs.concat( this.$foundMediaContainer.find(".mediaContainer").toArray() )
+	  }
+    var media_objs = $divs.map(function(el){
       return $(el).data("media")
     })
-    Scenery.randomize( media_data )
+    Scenery.randomize.add( media_objs )
+    this.hide()
   },
 
 	populate: function(data){
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 3e64cc3..5846bf4 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -14,6 +14,7 @@
  -->
 	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
+	<h3 class="editBtn" id="randomize">Randomize</h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
-- 
cgit v1.2.3-70-g09d2


From 2bdfa57b147f461d002865b6e7973033ca9987b7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 16:21:01 -0500
Subject: attempt to place something even if it’s “too big” for the wall
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rectangles/engine/scenery/types/_object.js     | 40 ++++++++++++++++++++++
 .../rectangles/engine/scenery/types/image.js       | 21 +-----------
 .../rectangles/engine/scenery/types/video.js       | 22 ++----------
 .../assets/javascripts/ui/builder/BuilderInfo.js   |  1 +
 4 files changed, 44 insertions(+), 40 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 10ba2b0..c3fd6f3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -28,6 +28,46 @@ Scenery.types.base = Fiber.extend(function(base){
 			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
 		},
 		
+		place: function(opt){
+		  console.log(opt)
+			if (opt.data) {
+        if (opt.wall) {
+        	var position = opt.wall.mxToPosition(opt.data.position)
+        	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
+        }
+      	this.set_wall(opt)
+        this.deserialize(opt.data)
+      }
+      else {
+      	this.set_wall(opt)
+      	if (this.wall && ! this.bounds) {
+          this.find_minimum_scale(opt)
+          if (! this.bounds) return
+      	}
+      	
+        this.recenter()
+        if (opt.position) {
+          this.translateTo(opt.position)
+        }
+        var mx_position = this.wall.positionToMx( this.position, this.dimensions )
+        this.mx.move(mx_position)
+      }
+		},
+		
+		find_minimum_scale: function(opt){
+      var bounds = this.wall.surface.bounds_at_index_with_dimensions(opt.index || 0, new vec2(50, 50))
+      var scale = 1
+      if (! bounds || bounds.width() < 50 || bounds.height < 50) return
+      if (this.naturalDimensions.a > bounds.width()) {
+        scale = bounds.width() / (this.naturalDimensions.a + 10)
+      }
+      if (this.naturalDimensions.b > bounds.height()) {
+        scale = Math.min(scale, bounds.height() / (this.naturalDimensions.b + 10))
+      }
+      this.set_scale(scale)
+      this.set_wall(opt)
+		},
+		
 		recenter: function () {
 			if (! this.bounds) return
 			var center = this.bounds.center()
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 848f8d4..0e5e77c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -13,26 +13,7 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 
 			this.build()
 			this.bind()
-			
-			if (opt.data) {
-        if (opt.wall) {
-        	var position = opt.wall.mxToPosition(opt.data.position)
-        	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
-        }
-      	this.set_wall(opt)
-        this.deserialize(opt.data)
-      }
-      else {
-      	this.set_wall(opt)
-      	if (this.bounds) {
-          this.recenter()
-          if (opt.position) {
-            this.translateTo(opt.position)
-          }
-          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
-          this.mx.move(mx_position)
-        }
-      }
+			this.place(opt)
 		},
 
 		build: function(){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index d83cc63..d1b1763 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -6,32 +6,14 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 	  type: 'video',
 	
 		init: function(opt){
+		
 			opt.scale = opt.scale || (opt.data && opt.data.scale) || DEFAULT_PICTURE_WIDTH / max(DEFAULT_PICTURE_WIDTH, opt.media.width)
 
 			base.init.call(this, opt)
 
 			this.build()
 			this.bind()
-
-			if (opt.data) {
-        if (opt.wall) {
-        	var position = opt.wall.mxToPosition(opt.data.position)
-        	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
-        }
-      	this.set_wall(opt)
-        this.deserialize(opt.data)
-      }
-      else {
-      	this.set_wall(opt)
-        if (this.bounds) {
-          this.recenter()
-          if (opt.position) {
-            this.translateTo(opt.position)
-          }
-          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
-          this.mx.move(mx_position)
-        }
-      }
+      this.place(opt)
     },
 
 		build: function(){
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index e1c90c8..7606361 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -47,6 +47,7 @@ var BuilderInfo = View.extend({
     this.$noSelection.toggle( ! this.room )
 		this.$el.toggleClass("active", state)
 		if (state) {
+      this.$viewHeight.unitVal( window.viewHeight )
       this.parent.cursor.message("builder")
 		}
 		else {
-- 
cgit v1.2.3-70-g09d2


From b9cf4175a3882415824f707a5431222e352658b2 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 16:42:30 -0500
Subject: cancel scenery for text

---
 public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 1 +
 public/assets/javascripts/ui/editor/TextEditor.js               | 5 +++++
 views/controls/editor/toolbar.ejs                               | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index f6cc8e4..8ca00d3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -5,6 +5,7 @@ var Scenery = new function(){
 
 	base.list = {}
 	base.nextMedia = null
+	base.nextWallpaper = null
 	
 	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
 	
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 51077af..33b5386 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -25,6 +25,11 @@ var TextEditor = FormView.extend({
     this.$fontSize = this.$("[name=font-size]")
     this.$textBody = this.$("[name=text-body]")
     this.$textAlign = this.$("[name=text-align]")
+    
+    app.on("cancel-scenery", function(){
+      this.createMode(true)
+      $("body").toggleClass("addText", false)
+    }.bind(this))
 	},
 
   toggle: function(state){
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 7b08db6..23d5eb4 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -32,11 +32,13 @@
 		data-role='toggle-color-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
-<!-- 
+[[ if (user.username == "asdf") { ]]
   <span
     data-role='toggle-text-editor'
     data-info="add text to wall"
     class="ion-ios7-compose-outline"></span>
+[[ } ]]
+<!-- 
 	<span
 		data-role='toggle-map-view'
 		data-info="toggle map view"
-- 
cgit v1.2.3-70-g09d2


From fc00dfa28faddff26778f2580d263526ca3b335e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 18:00:40 -0500
Subject: show/hide minimap as appropriate

---
 public/assets/javascripts/mx/extensions/mx.movements.js             | 6 +++++-
 public/assets/javascripts/rectangles/engine/map/_map.js             | 1 +
 .../assets/javascripts/rectangles/engine/scenery/types/_object.js   | 1 -
 public/assets/javascripts/ui/editor/MediaEditor.js                  | 2 +-
 public/assets/javascripts/ui/reader/MediaPlayer.js                  | 3 ++-
 public/assets/javascripts/ui/reader/ReaderView.js                   | 6 ++++--
 6 files changed, 13 insertions(+), 6 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 82db40d..9af2c8d 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -33,7 +33,11 @@ MX.Movements = function (cam) {
 	
 	var pos = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: 0 }
 
-  $(document).one("keydown", function(){ $("#keyhint").fadeOut(250); $('.reader #minimap').addClass('active'); })
+  $(document).one("keydown", function(){
+    $("#keyhint").fadeOut(250);
+    $('.reader #minimap').addClass('active');
+  })
+
 	function clampRotation( vr ) {
 		if (Rooms.mover.noclip) {
 			return clamp(vr, PI/-2, PI/2 )
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 64372c5..202803a 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -15,6 +15,7 @@ var Map = function(opt){
 	
 	var base = this
 	base.el = opt.el
+	base.$el = $(base.el)
 	
 	if (! base.el) return
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index c3fd6f3..51d1b88 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -29,7 +29,6 @@ Scenery.types.base = Fiber.extend(function(base){
 		},
 		
 		place: function(opt){
-		  console.log(opt)
 			if (opt.data) {
         if (opt.wall) {
         	var position = opt.wall.mxToPosition(opt.data.position)
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index db5878f..de93f6e 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -65,7 +65,7 @@ var MediaEditor = FormView.extend({
 		
 		var media = scenery.media
 		
-		console.log(media)
+		// console.log(media)
 		
 		this.$name.val(media.title || filenameFromUrl(media.url) )
 		this.$description.val(media.description)
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index e40c6ff..42e7596 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -46,7 +46,7 @@ var MediaPlayer = FormView.extend({
 		if (media.type == "image") {
 			if ( ! media.description && (! media.title || media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
-				return
+				return false
 			}
 		}
 
@@ -78,6 +78,7 @@ var MediaPlayer = FormView.extend({
 
 				break
 		}
+		return true
 	},
 	
 	hide: function(scenery){
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index aea681a..617a145 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -58,7 +58,7 @@ var ReaderView = View.extend({
 		  return
 		}
 		
-		// don't build anything until we're in landscape mode, otherwise ios might crash
+		// don't build anything until we're in landscape mode, otherwise ios might crash!!
 		var orientationFn = orientationchange.bind(this)
     window.addEventListener('orientationchange', orientationFn)
     function orientationchange (e) {
@@ -119,7 +119,8 @@ var ReaderView = View.extend({
 	},
 
 	pick: function(scenery){
-		this.mediaPlayer.pick(scenery)
+		var has_info = this.mediaPlayer.pick(scenery)
+    $("#minimap").toggleClass('active', ! has_info)
     app.tube("pick-scenery", { scenery: scenery })
 	},
 
@@ -128,6 +129,7 @@ var ReaderView = View.extend({
 	},
 
 	hideExtras: function(){
+		$("#minimap").addClass('active')
 		this.mediaPlayer.hide()
     app.tube("close-scenery")
 	}
-- 
cgit v1.2.3-70-g09d2


From 46bbbaf4be97fce3996207e75d09552096e61fa4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 18:08:52 -0500
Subject: click once to select, twice to drag

---
 public/assets/javascripts/rectangles/engine/scenery/move.js | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 12705d3..f57ddba 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -14,6 +14,7 @@ Scenery.move = function(base){
 	}
 
 	this.unbind = function(){
+	  base.focused = false
 		Scenery.mouse.unbind_el(base.mx.el)
 		Scenery.mouse.off("down", down)
 		Scenery.mouse.off("enter", switch_wall)
@@ -31,6 +32,11 @@ Scenery.move = function(base){
 		// load the modal
 		app.controller.pick(base)
 
+    if (! base.focused) {
+			e.clickAccepted = false
+			base.focused = true
+			return
+    }
 		if (! (editor.permissions.move || editor.permissions.resize) ) {
 			e.clickAccepted = false
 			return
-- 
cgit v1.2.3-70-g09d2


From 32c2630d6f384f3315b514ddf6d71dd4753dda66 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Nov 2014 15:34:48 -0500
Subject: resize text field without scaling

---
 .../rectangles/engine/scenery/_scenery.js          |  1 +
 .../rectangles/engine/scenery/resize.js            | 55 +++++++++++++++++-----
 .../rectangles/engine/scenery/types/text.js        | 21 +--------
 .../assets/javascripts/rectangles/models/vec3.js   |  3 ++
 public/assets/stylesheets/app.css                  |  2 +
 5 files changed, 49 insertions(+), 33 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 8ca00d3..436712a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -29,6 +29,7 @@ var Scenery = new function(){
 			
 			case 'text':
 			  scene_media = new Scenery.types.text (opt)
+			  scene_media.focused = true
 			  break
 		}
 		base.list[scene_media.id] = scene_media
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index e424829..5af7f3f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -6,7 +6,7 @@ Scenery.resize = new function(){
 	var obj
 	var x, y, z, bounds
 	var dragging = false
-	var naturalDimension, dimension, position, scale
+	var naturalDimension, naturalDimensionCopy, dimension, position, scale
 	var oldState
 
 	var dots = [], dot, selected_dot
@@ -143,6 +143,11 @@ Scenery.resize = new function(){
 		dimension = obj.dimensions
 		position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z)
 		oldState = obj.serialize()
+		
+		if (obj.type == "text") {
+		  naturalDimensionCopy = naturalDimension.clone()
+		  positionCopy = position.clone()
+		}
 
 		document.body.classList.add("dragging")
 	}
@@ -163,15 +168,23 @@ Scenery.resize = new function(){
 			mag = y_sign * mag * sign(height)
 		}
 
- 		obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
-
-		if (selected_dot.side & LEFT_RIGHT) {
-			obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
-			obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign)
-		}
-		if (selected_dot.side & TOP_BOTTOM) {
-			obj.mx.y = position.b - mag/2 * y_sign
-		}
+    if (obj.type == "text") {
+      obj.mx.width = obj.media.width = naturalDimension.a = naturalDimensionCopy.a + (mag * 2)
+      obj.mx.height = obj.media.height = naturalDimension.b = naturalDimensionCopy.b + (mag * 2)
+      dimension.a = naturalDimension.a * obj.scale
+      dimension.b = naturalDimension.b * obj.scale
+    }
+    else {
+      obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
+    }
+
+    if (selected_dot.side & LEFT_RIGHT) {
+      obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
+      obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign)
+    }
+    if (selected_dot.side & TOP_BOTTOM) {
+      obj.mx.y = position.b - mag/2 * y_sign
+    }
 
 		base.move_dots()
 		
@@ -181,11 +194,26 @@ Scenery.resize = new function(){
 	function up (e, cursor){
     if (! dragging) return
 		dragging = false
-		selected_dot = null
 		if (! editor.permissions.resize) { return }
-		obj.scale = obj.mx.ops.scale = obj.mx.scale
-		obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale)
 		
+		if (obj.type == "text") {
+      var newHeight = $(obj.mx.inner).height()
+      if (selected_dot.side & BOTTOM) {
+        obj.mx.y = position.b + (naturalDimensionCopy.b - newHeight) / 2 * obj.scale
+      }
+      else {
+        obj.mx.y = dots[0].y - newHeight/2*obj.scale
+      }
+      obj.mx.height = obj.media.height = naturalDimension.b = newHeight
+      dimension.a = naturalDimension.a * obj.scale
+      dimension.b = naturalDimension.b * obj.scale
+      base.move_dots()
+		}
+		else {
+      obj.scale = obj.mx.ops.scale = obj.mx.scale
+      obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale)
+    }
+    		
     UndoStack.push({
       type: 'update-scenery',
       undo: oldState,
@@ -196,6 +224,7 @@ Scenery.resize = new function(){
     Minotaur.watch( app.router.editorView.settings )
 
 		document.body.classList.remove("dragging")
+		selected_dot = null
 	}
 
 }
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
index dd1385f..6e11da2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/text.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -13,26 +13,7 @@ Scenery.types.text = Scenery.types.base.extend(function(base){
 
 			this.build()
 			this.bind()
-			
-			if (opt.data) {
-        if (opt.wall) {
-        	var position = opt.wall.mxToPosition(opt.data.position)
-        	opt.index = opt.wall.surface.index_for_x( position.a, 0 )
-        }
-      	this.set_wall(opt)
-        this.deserialize(opt.data)
-      }
-      else {
-      	this.set_wall(opt)
-      	if (this.bounds) {
-          this.recenter()
-          if (opt.position) {
-            this.translateTo(opt.position)
-          }
-          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
-          this.mx.move(mx_position)
-        }
-      }
+			this.place(opt)
 		},
 
 		build: function(){
diff --git a/public/assets/javascripts/rectangles/models/vec3.js b/public/assets/javascripts/rectangles/models/vec3.js
index 4e00b0c..c44dfe6 100644
--- a/public/assets/javascripts/rectangles/models/vec3.js
+++ b/public/assets/javascripts/rectangles/models/vec3.js
@@ -15,6 +15,9 @@ vec3.prototype.sub = function(v){
 	this.c -= v.c
 	return this
 }
+vec3.prototype.clone = function(){
+  return new vec3(this.a, this.b, this.c)
+}
 
 // input: mat4 projection matrix
 vec3.prototype.apply_projection = function (m) {
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e97ffa1..7b53cca 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -990,7 +990,9 @@ border-left: 1px solid black;
 	pointer-events: none;
 }
 .mx-text {
+/* 
   overflow: hidden;
+ */
 }
 .mx-text .inner {
   width: 100%;
-- 
cgit v1.2.3-70-g09d2


From 3ab0c6c24b95552feb111b647205cc92c3ca170c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 13 Nov 2014 11:46:43 -0500
Subject: delete text object if no text

---
 public/assets/javascripts/rectangles/engine/scenery/types/_object.js | 3 +++
 public/assets/javascripts/ui/editor/TextEditor.js                    | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 51d1b88..cd3f981 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -116,6 +116,9 @@ Scenery.types.base = Fiber.extend(function(base){
 		},
 		
 		remove: function(){
+		  if (this.removed) return
+		  this.removed = true
+		  
       UndoStack.push({
         type: 'destroy-scenery',
         undo: this.serialize(),
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 33b5386..2949943 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -75,11 +75,13 @@ var TextEditor = FormView.extend({
       if (this.tainted) {
         Minotaur.watch( app.router.editorView.settings )
       }
-
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
       }
+      if (! this.scenery.media || ! this.scenery.media.description || this.scenery.media.description == "") {
+        this.scenery.remove()
+      }
     }
     this.tainted = false
     this.scenery = null
@@ -143,6 +145,7 @@ var TextEditor = FormView.extend({
 	destroy: function(){
     this.tainted = false
     this.scenery.remove()
+    this.hide()
 	},
 
 })
-- 
cgit v1.2.3-70-g09d2