From b6aa758e4a760c244594dd5bc17004347a66913d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 11:59:53 -0400
Subject: keep showing resize dots after you click

---
 .../javascripts/rectangles/engine/scenery/resize.js      |  4 ++--
 .../rectangles/engine/scenery/types/_object.js           | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index e26c0a7..532ca4e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -124,8 +124,8 @@ Scenery.resize = new function(){
 					Scenery.resize.hovering = true 
 				},
 				mouseleave: function(e){
-					Scenery.resize.hovering = false
-					base.defer_hide()
+// 					Scenery.resize.hovering = false
+// 					base.defer_hide()
 				}
 			})
 		})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 2dbae48..5eed53e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -70,17 +70,17 @@ Scenery.types.base = Fiber.extend(function(base){
 		},
 
 		enter: function(e){
-			if (editor.permissions.resize) {
-				Scenery.resize.show(this)
-				Scenery.hovering = true
-			}
+// 			if (editor.permissions.resize) {
+// 				Scenery.resize.show(this)
+// 				Scenery.hovering = true
+// 			}
 		},
 	
 		leave: function(e){
-			if (editor.permissions.resize) {
-				Scenery.resize.defer_hide(this)
-				Scenery.hovering = false
-			}
+// 			if (editor.permissions.resize) {
+// 				Scenery.resize.defer_hide(this)
+// 				Scenery.hovering = false
+// 			}
 		},
 
 		serialize: function(){
-- 
cgit v1.2.3-70-g09d2


From 742f4cc410bb04421800d7462f81fc64c59aa0bc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 12:36:42 -0400
Subject: tracing menu appearing/disappearing logic ; set title from filename

---
 .../javascripts/rectangles/engine/scenery/move.js  |  2 +-
 .../rectangles/engine/scenery/resize.js            |  1 +
 .../assets/javascripts/rectangles/models/wall.js   |  5 ++++-
 .../assets/javascripts/ui/editor/EditorToolbar.js  |  5 ++++-
 public/assets/javascripts/ui/editor/MediaEditor.js | 23 ++++++++++++++++++----
 public/assets/javascripts/util.js                  |  4 ++++
 6 files changed, 33 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 93bccb0..55d6ef1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -142,7 +142,7 @@ Scenery.move = function(base){
 
 		if (editor.permissions.resize) {
 			Scenery.resize.rotate_dots()
-// 			Scenery.resize.move_dots()
+ 			Scenery.resize.move_dots()
 		}
 
 		cursor.x.a = cursor.x.b
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 532ca4e..dc1a39a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -195,6 +195,7 @@ Scenery.resize = new function(){
 	}
 
 	function up (e, cursor){
+    if (! dragging) return
 		dragging = false
 		selected_dot = null
 		if (! editor.permissions.resize) { return }
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 1a3ef7c..5513a9b 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -64,7 +64,10 @@
             	e.stopPropagation()
             	return
             }
-					  
+
+            Scenery.resize.show(scenery)
+            Scenery.hovering = true
+
   					UndoStack.push({
   					  type: 'create-scenery',
   					  undo: { id: scenery.id },
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index bc56d88..9c74c7c 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -37,15 +37,18 @@ var EditorToolbar = View.extend({
 		this.resetMode()
 		this.resetControls()
 	},
-	
+
 	resetMode: function(){
 		this.resizeMedia(true)
 		this.destroyMedia(false)
+		app.controller.hideExtras()
 	},
 	
 	resetControls: function(){
+	  $(".inuse").removeClass("inuse")
 		this.parent.wallpaperPicker.hide()
 		this.parent.lightControl.hide()
+		this.parent.settings.hide()
 	},
 	
 	resizeMedia: function(e, state){
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index cb57b69..eaa3134 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -3,7 +3,7 @@ var MediaEditor = FormView.extend({
 	el: "#mediaEditor",
 		
 	events: {
-		"keydown": 'stopPropagation',
+		"keydown": 'taint',
 		"focus [name]": "clearMinotaur",
 		"click [data-role=play-media]": "togglePaused",
 		"mousedown [name=keyframe]": "stopPropagation",
@@ -58,12 +58,16 @@ var MediaEditor = FormView.extend({
 		this.bind(scenery)
 		this.$el.addClass("active")
 		
+//     app.controller.toolbar.resetMode()
+    app.controller.toolbar.resetControls()
 		Scenery.resize.show(scenery)
 		Scenery.hovering = true
 		
 		var media = scenery.media
 		
-		this.$name.val(media.title)
+		console.log(media)
+		
+		this.$name.val(media.title || filenameFromUrl(media.url) )
 		this.$description.val(media.description)
 		this.setDimensions()
 		this.$units.val( "ft" )
@@ -101,12 +105,14 @@ var MediaEditor = FormView.extend({
 	seek: function(){
 		var n = parseFloat( this.$keyframe.val() )
 		this.scenery.seek(n)
+		this.tainted = true
 		
 		this.scenery.media.keyframe = n
 	},
 	setAutoplay: function(){
 		var checked = this.$autoplay.prop('checked')
 		this.scenery.media.autoplay = checked
+		this.tainted = true
 		if (checked && this.scenery.paused()) {
 			this.togglePaused()
 		}
@@ -114,17 +120,20 @@ var MediaEditor = FormView.extend({
 	setLoop: function(){
 		var checked = this.$loop.prop('checked')
 		this.scenery.setLoop(checked)
+		this.tainted = true
 	},
 	setMute: function(){
 		var checked = this.$mute.prop('checked')
 		this.scenery.media.mute = checked
 		this.scenery.mute(checked)
+		this.tainted = true
 	},
 
 	setDimensions: function(){
 	  if (! this.scenery) return
 		this.$width.unitVal( Number(this.scenery.naturalDimensions.a * this.scenery.scale) || "" )
 		this.$height.unitVal( Number(this.scenery.naturalDimensions.b * this.scenery.scale) || "" )
+		this.tainted = true
 	},
 	changeWidth: function(e){
 		e.stopPropagation()
@@ -140,6 +149,11 @@ var MediaEditor = FormView.extend({
 		app.units = this.$units.val()
 		this.$('.units').resetUnitVal()
 	},
+	
+	taint: function(e){
+	  e.stopPropagation()
+		this.tainted = true
+	},
 
 	bind: function(scenery){
 		this.scenery = scenery
@@ -148,7 +162,7 @@ var MediaEditor = FormView.extend({
 	},
 	
 	unbind: function(){
-	  if (this.scenery) {
+	  if (this.scenery && this.tainted) {
       this.scenery.media.title = this.$name.val()
       this.scenery.media.description = this.$description.val()
       Minotaur.watch( app.router.editorView.settings )
@@ -158,11 +172,12 @@ var MediaEditor = FormView.extend({
         this.scenery.mx.el.classList.remove("picked")
       }
     }
+    this.tainted = false
     this.scenery = null
 	},
 	
 	destroy: function(){
-		ConfirmModal.confirm("Are you sure you want delete to this media?", function(){
+		ConfirmModal.confirm("Are you sure you want delete this object?", function(){
 			var scenery = this.scenery
 			this.hide()
 			Scenery.remove(scenery.id)
diff --git a/public/assets/javascripts/util.js b/public/assets/javascripts/util.js
index 7812a4d..5a89c48 100644
--- a/public/assets/javascripts/util.js
+++ b/public/assets/javascripts/util.js
@@ -173,6 +173,10 @@ function invert_hash (h) {
 	for (var i in h) { if (h.hasOwnProperty(i)) k[h[i]] = i }
 	return k
 }
+function filenameFromUrl (url) {
+  var partz = url.split( "/" )
+  return partz[partz.length-1].split(".")[0]
+}
 
 function bitcount(v) {
   v = v - ((v >>> 1) & 0x55555555);
-- 
cgit v1.2.3-70-g09d2


From 70efc8490ed885317f757eb5252bc14cdcb51a31 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 12:44:42 -0400
Subject: crisper dots

---
 public/assets/javascripts/rectangles/engine/scenery/resize.js | 3 ++-
 public/assets/javascripts/ui/editor/EditorSettings.js         | 4 ++++
 public/assets/javascripts/ui/editor/EditorView.js             | 2 +-
 public/assets/stylesheets/app.css                             | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index dc1a39a..ca77525 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -31,7 +31,8 @@ Scenery.resize = new function(){
 	// generate a dot element
 	base.build_dot = function(side) {
 		var dot = new MX.Object3D('.dot')
-		dot.width = dot.height = dot_side
+		dot.width = dot.height = dot_side * 2
+		dot.scale = 0.5
 		dot.side = side
 		$(dot.el).on({
 			mouseenter: function(){ base.hovering = true },
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 8a88f7a..f47eb81 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -65,6 +65,10 @@ var EditorSettings = FormView.extend({
 			
 			data.media && Scenery.deserialize(data.media)
 		}
+
+    app.on("rooms-built", function(){
+		  Walls.paint()
+		})
 	},
 	
 	showCollaborators: function(e){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index f200d0f..6636a8c 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -31,7 +31,7 @@ var EditorView = View.extend({
 	
 	ready: function(data){
 		$("#map").hide()
-		
+
 		this.settings.load(data)
 	},
 	
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6929cef..a2db961 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -673,8 +673,8 @@ iframe.embed {
 
 .dot {
 	background:white;
-	border-radius:20px;
-	border: 1px solid black;
+	border-radius: 50%;
+	border: 2px solid black;
 }
 
 .image {
-- 
cgit v1.2.3-70-g09d2


From 385dc017b65cbd7cd94b16e86a8368320d4274ea Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 13:10:08 -0400
Subject: adding prefixfree, bower install

---
 bower.json                                         |  3 +-
 .../rectangles/engine/scenery/resize.js            |  2 +-
 .../assets/javascripts/rectangles/models/wall.js   |  5 +-
 .../assets/javascripts/rectangles/util/minotaur.js |  2 +-
 .../assets/javascripts/ui/editor/EditorToolbar.js  | 59 +++++++++++++---------
 views/partials/scripts.ejs                         |  1 +
 6 files changed, 44 insertions(+), 28 deletions(-)

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

diff --git a/bower.json b/bower.json
index ee8f9ba..faffbfb 100644
--- a/bower.json
+++ b/bower.json
@@ -7,6 +7,7 @@
     "momentjs": "~2.5.1",
     "lodash": "",
     "fiber": "",
-    "jquery-jsonview": "1.2.0"
+    "jquery-jsonview": "1.2.0",
+    "prefixfree": ""
   }
 }
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index ca77525..96817c2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -122,7 +122,7 @@ Scenery.resize = new function(){
 			Scenery.mouse.bind_el(dot.el)
 			$(dot.el).bind({
 				mouseenter: function(e){
-					Scenery.resize.hovering = true 
+// 					Scenery.resize.hovering = true 
 				},
 				mouseleave: function(e){
 // 					Scenery.resize.hovering = false
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 5513a9b..2bfb258 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -64,9 +64,10 @@
             	e.stopPropagation()
             	return
             }
-
+            
+            app.controller.toolbar.resetPermissions()
             Scenery.resize.show(scenery)
-            Scenery.hovering = true
+            Scenery.hovering = true 
 
   					UndoStack.push({
   					  type: 'create-scenery',
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 0fcc766..4d9a795 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -4,7 +4,7 @@
     var base = this
     base.$el = $("#minotaur")
     base.timeout = null
-    base.delay = 1000
+    base.delay = 5000
     base.objects = {}
     
     base.init = function () {
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 9c74c7c..ec6bb46 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -6,7 +6,7 @@ var EditorToolbar = View.extend({
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
-		"click [data-role='resize-media']": 'resizeMedia',
+// 		"click [data-role='resize-media']": 'resizeMedia',
 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
@@ -39,9 +39,10 @@ var EditorToolbar = View.extend({
 	},
 
 	resetMode: function(){
-		this.resizeMedia(true)
+		// this.resizeMedia(true)
 		this.destroyMedia(false)
 		app.controller.hideExtras()
+		base.resetPermissions()
 	},
 	
 	resetControls: function(){
@@ -51,27 +52,34 @@ var EditorToolbar = View.extend({
 		this.parent.settings.hide()
 	},
 	
-	resizeMedia: function(e, state){
-		this.resetControls()
-		if (! state && typeof e == "boolean") {
-			state = e
-			editor.permissions.assign("resize", state)
-		}
-		else {
-			state = editor.permissions.toggle("resize")
-		}
-		! state && editor.permissions.assign("move", true)
-		$(".inuse").removeClass("inuse")
-		$("[data-role='resize-media']").toggleClass("inuse", state)
-		if (state) {
-			if (this.parent.mediaEditor.scenery) {
-        Scenery.resize.show( this.parent.mediaEditor.scenery )
-      }
-		}
-		else {
-			Scenery.resize.hide()
-		}
+	resetPermissions: function(){
+    editor.permissions.assign("pick", true)
+    editor.permissions.assign("move", true)
+    editor.permissions.assign("resize", true)
+    editor.permissions.assign("destroy", false)
 	},
+
+// 	resizeMedia: function(e, state){
+// 		this.resetControls()
+// 		if (! state && typeof e == "boolean") {
+// 			state = e
+// 			editor.permissions.assign("resize", state)
+// 		}
+// 		else {
+// 			state = editor.permissions.toggle("resize")
+// 		}
+// 		! state && editor.permissions.assign("move", true)
+// 		$(".inuse").removeClass("inuse")
+// 		$("[data-role='resize-media']").toggleClass("inuse", state)
+// 		if (state) {
+// 			if (this.parent.mediaEditor.scenery) {
+//         Scenery.resize.show( this.parent.mediaEditor.scenery )
+//       }
+// 		}
+// 		else {
+// 			Scenery.resize.hide()
+// 		}
+// 	},
 	
 	destroyMedia: function(e, state){
 		this.resetControls()
@@ -82,7 +90,12 @@ var EditorToolbar = View.extend({
 		else {
 			state = editor.permissions.toggle("destroy")
 		}
-		! state && editor.permissions.assign("move", true)
+		if (! state) {
+      this.resetPermissions()
+    }
+    else {
+      app.controller.hideExtras()
+		}
 		$(".inuse").removeClass("inuse")
 		$("[data-role='destroy-media']").toggleClass("inuse", state)
 		$("body").toggleClass("destroyActive", state)
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 7d56b2e..e0dd0f5 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -2,6 +2,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
-- 
cgit v1.2.3-70-g09d2


From c32a6ff52628fbe0a530b4f72fc907a2ef651127 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 13:18:45 -0400
Subject: fixing points not moving bug

---
 .../assets/javascripts/rectangles/engine/scenery/resize.js   |  2 +-
 public/assets/javascripts/rectangles/models/wall.js          |  2 +-
 public/assets/javascripts/rectangles/util/permissions.js     |  2 +-
 public/assets/javascripts/ui/editor/EditorToolbar.js         | 12 ++++++------
 public/assets/javascripts/ui/site/LayoutsModal.js            |  1 -
 5 files changed, 9 insertions(+), 10 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 96817c2..2ba84a1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -147,7 +147,7 @@ Scenery.resize = new function(){
 	function down (e, cursor){
 		var selection = dots.filter(function(dot){return e.target == dot.el})
 		if (! selection.length) return
-		
+
 		selected_dot = selection[0]
 		dragging = true
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 2bfb258..1b37aa0 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -64,7 +64,7 @@
             	e.stopPropagation()
             	return
             }
-            
+
             app.controller.toolbar.resetPermissions()
             Scenery.resize.show(scenery)
             Scenery.hovering = true 
diff --git a/public/assets/javascripts/rectangles/util/permissions.js b/public/assets/javascripts/rectangles/util/permissions.js
index 1b5a1b5..9e3ef4d 100644
--- a/public/assets/javascripts/rectangles/util/permissions.js
+++ b/public/assets/javascripts/rectangles/util/permissions.js
@@ -31,7 +31,7 @@ Permissions.prototype.add = function (key) {
 
 Permissions.prototype.remove = function (key) {	
 	var base = this
-	base[key] = true
+	base[key] = false
 }
 
 Permissions.prototype.clear = function () {	
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index ec6bb46..9f439c8 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -41,8 +41,8 @@ var EditorToolbar = View.extend({
 	resetMode: function(){
 		// this.resizeMedia(true)
 		this.destroyMedia(false)
-		app.controller.hideExtras()
-		base.resetPermissions()
+		this.parent.hideExtras()
+		this.resetPermissions()
 	},
 	
 	resetControls: function(){
@@ -53,10 +53,10 @@ var EditorToolbar = View.extend({
 	},
 	
 	resetPermissions: function(){
-    editor.permissions.assign("pick", true)
-    editor.permissions.assign("move", true)
-    editor.permissions.assign("resize", true)
-    editor.permissions.assign("destroy", false)
+    editor.permissions.add("pick")
+    editor.permissions.add("move")
+    editor.permissions.add("resize")
+    editor.permissions.remove("destroy")
 	},
 
 // 	resizeMedia: function(e, state){
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 2449465..1bfc6cb 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,7 +29,6 @@ var LayoutsIndex = View.extend({
 			
 			this.$templates.append($span)
 		}.bind(this))
-		console.log(this.$templates.html())
 		this.show()
 	}
 
-- 
cgit v1.2.3-70-g09d2


From e3b1885a05f78a41ffc51f60324976c2330a0d20 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 14:11:05 -0400
Subject: fix video resize

---
 public/assets/javascripts/rectangles/engine/scenery/types/video.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index ef25d8d..76f32ac 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -4,8 +4,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 	var exports = {
 	
 		init: function(opt){
-			opt.scale = opt.scale || 300 / max(300, opt.media.width)
-			
+			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
+
 			base.init.call(this, opt)
 
 			this.build()
@@ -106,6 +106,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 	
 		deserialize: function(data){
 			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
 		},
 	}
 	
-- 
cgit v1.2.3-70-g09d2


From 5d567454d7d2f4f7e885720d310d42063eeba4dd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 18:12:39 -0400
Subject: undo fix

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 4 ++++
 public/assets/javascripts/rectangles/engine/scenery/undo.js | 3 +++
 2 files changed, 7 insertions(+)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 82ccb87..f0cd558 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -46,6 +46,10 @@
 		  }
 		}
 		
+		base.find = function(id){
+		  return base.lookup[id]
+		}
+		
 		base.assign = function(list){
 		  base.list = list
 		  base.lookup = {}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index e5624a0..57a0886 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -10,6 +10,7 @@
       },
       redo: function(state){
         Scenery.deserialize([ state ])
+        Scenery.resize.show( scenery )
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
@@ -19,6 +20,7 @@
       type: "update-scenery",
       undo: function(state){
         var scenery = Scenery.find(state.id)
+        
         scenery.deserialize(state)
         scenery.set_wall(Walls.find( state.wall_id ))
         
@@ -48,6 +50,7 @@
       type: "destroy-scenery",
       undo: function(state){
         Scenery.deserialize([ state ])
+        Scenery.resize.show( scenery )
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
-- 
cgit v1.2.3-70-g09d2


From a4eb980bcb2cce616abfb6300e1b80d8323899e4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 18:34:58 -0400
Subject: trackin stuff

---
 .../javascripts/rectangles/engine/rooms/mover.js   |  4 +--
 public/assets/javascripts/ui/reader/ReaderView.js  |  2 ++
 public/assets/javascripts/ui/reader/Tracker.js     | 41 +++++++++++++++-------
 3 files changed, 31 insertions(+), 16 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 7195fcc..5c7b4af 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -65,9 +65,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
-			base.room.mx_floor.forEach(function(w){ $(w.el).addClass("active") })
- 			base.room.mx_ceiling.forEach(function(w){ $(w.el).addClass("active") })
-			base.room.mx_walls.forEach(function(w){ $(w.el).addClass("active") })
+      app.tube("change-room", { room: base.room })
 		}
 
 	}
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index c43dc9c..82db048 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -75,10 +75,12 @@ var ReaderView = View.extend({
 
 	pick: function(scenery){
 		this.mediaPlayer.pick(scenery)
+    app.tube("pick-scenery", { scenery: scenery })
 	},
 
 	hideExtras: function(){
 		this.mediaPlayer.hide()
+    app.tube("close-scenery")
 	}
 
 })
diff --git a/public/assets/javascripts/ui/reader/Tracker.js b/public/assets/javascripts/ui/reader/Tracker.js
index 7d9d936..beef071 100644
--- a/public/assets/javascripts/ui/reader/Tracker.js
+++ b/public/assets/javascripts/ui/reader/Tracker.js
@@ -17,21 +17,28 @@ var Tracker = Fiber.extend(function(base){
 		},
 		
 		bind: function () {
-		  //
 		  window.addEventListener("click", this.trackClick.bind(this), true)
+		  app.on("change-wall", this.changeWall.bind(this))
+		  app.on("pick-scenery", this.pickScenery.bind(this))
+		  app.on("close-scenery", this.trackScenery.bind(this))
+		  app.on("change-room", this.changeRoom.bind(this))
+		},
+
+		pushEvent: function(event){
+		  this.events.push(event)
 		},
 		
 		trackPageview: function(opt){
-      this.events.push([ "view" ])
+      this.pushEvent([ "view" ])
 		},
 
     //
     // how long they spend in front of each wall
 
-		trackChangeWall: function(opt){
+		changeWall: function(opt){
 		  var duration = this.wallTimer.currentTime()
 		  if (this.wall_id && duration > 5000) {
-        this.events.push([ "wall", this.wall_id, duration ])
+        this.pushEvent([ "wall", this.wall_id, duration ])
 		  }
       this.wall_id = opt.wall.id
       this.wallTimer.start()
@@ -41,14 +48,19 @@ var Tracker = Fiber.extend(function(base){
     // how long the user spends on each item they click
     
 		pickScenery: function(opt){
-		  this.sceneryTimer.start()
+		  if (this.scenery_id && opt.scenery.id !== this.scenery_id) {
+		    this.trackScenery()
+		  }
+		  else {
+        this.sceneryTimer.start()
+		  }
 		  this.scenery_id = opt.scenery.id
 		},
 		
 		trackScenery: function(){
 		  var duration = this.sceneryTimer.currentTime()
 		  if (this.scenery_id && duration > 5000) {
-        this.events.push([ "scenery", this.scenery_id, duration ])
+        this.pushEvent([ "scenery", this.scenery_id, duration ])
 		  }
       this.scenery_id = null
       this.sceneryTimer.reset()
@@ -57,24 +69,26 @@ var Tracker = Fiber.extend(function(base){
 		//
     // how long they spend in the room
 
-		trackChangeRoom: function(opt){
+		changeRoom: function(opt){
 		  var duration = this.roomTimer.currentTime()
-		  if (this.room_id && duration > 5000) {
-        this.events.push([ "room", this.room_id, duration ])
+		  if (this.room_id !== opt.room.id) {
+		    if (this.room_id && duration > 5000) {
+          this.pushEvent([ "room", this.room_id, duration ])
+        }
+        this.roomTimer.start()
+        this.room_id = opt.room.id
 		  }
-      this.room_id = opt.room.id
-      this.roomTimer.start()
 		},
 		
     //
     // how many clicks per room
 
 		trackClick: function(opt){
-		  console.log("track click")
       this.clicks += 1
 		},
 		
 		save: function () {
+		  // possibly just push to google analytics
 		},
 		
   }
@@ -101,8 +115,9 @@ var Timer = Fiber.extend(function(base){
     currentTime: function(){
       return this.time ? Date.now() - this.time : 0
     },
-
   }
+  
+  return exports
 })
 
 
-- 
cgit v1.2.3-70-g09d2


From 7afac43f11d1ccae6f3b8d1febcd293db11bd2b7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 1 Oct 2014 15:42:21 -0400
Subject: randomly place images on the walls

---
 .../rectangles/engine/scenery/randomize.js         | 77 ++++++++++++++++++++++
 .../javascripts/rectangles/models/surface.js       |  4 +-
 public/assets/javascripts/ui/editor/MediaViewer.js | 21 ++++--
 public/assets/javascripts/util.js                  |  5 +-
 views/partials/scripts.ejs                         |  1 +
 5 files changed, 97 insertions(+), 11 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/scenery/randomize.js

(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
new file mode 100644
index 0000000..4f1144a
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -0,0 +1,77 @@
+/*
+  // get the list of media we want to place
+  var media_data = $(".mediaContainer").toArray().map(function(el){
+    return $(el).data("media")
+  })
+  Scenery.randomize( media_data )
+*/
+
+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)
+      height = media.height/media.width * width
+    }
+    else {
+      height = Math.min(300, media.height)
+      width = media.width/media.height * height
+    }
+    return {
+      dimensions: new vec2( width, height ),
+      media: media,
+    }
+  })
+
+  // get a list of all walls
+  var walls = {}
+  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] 
+  })
+
+  var wall_ids = _.keys(walls)
+  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
+    }
+  
+    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
+      }
+    }
+
+    if (fits != -1) {
+      var wall = walls[wall_ids[fits]]
+      wall_ids.splice(fits, 1)
+    
+      Scenery.add({
+        media: media.media,
+        wall: wall,
+        index: 0,
+      })
+    }
+    else {
+      // artwork won't fit anywhere??
+    }
+  
+    return false
+  })
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index 53977c8..c85682a 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -36,7 +36,7 @@
 	Surface.prototype.fits = function(v){
 		var faces = this.faces
 		var scratch
-		if (this.bounds.x.b < v.a || this.bounds.y.b < v.b) {
+		if (this.bounds.width() < v.a || this.bounds.height() < v.b) {
 			return null
 		}
 		for (var i = 0; i < faces.length; i++) {
@@ -46,7 +46,7 @@
 		}
 		scratch = new Rect (0,0,0,0)
 		for (var i = 0; i < faces.length; i++) {
-			if (faces[i].y.length() < v.b) {
+			if (faces[i].height() < v.b) {
 				continue
 			}
 			scratch.x.a = faces[i].x.a
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index e2ed341..b51d8f2 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -3,6 +3,7 @@ var MediaViewer = ModalView.extend({
 	el: ".mediaDrawer.mediaViewer",
 	destroyAction: "/api/media/destroy",
 	usesFileUpload: true,
+	loaded: false,
 	
 	events: {
 		'click .foundToggle': "foundToggle",
@@ -19,7 +20,7 @@ var MediaViewer = ModalView.extend({
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
-	},
+  },
 
 	foundToggle: function(){
     this.$foundMedia.addClass("active");
@@ -52,9 +53,7 @@ var MediaViewer = ModalView.extend({
 	},
 
 	load: function(){
-		$.get("/api/media/user", function(data){
-		  this.populate()
-		}.bind(this))
+		$.get("/api/media/user", this.populate.bind(this))
 	},
 	
 	loadTrending: function(){
@@ -90,11 +89,20 @@ var MediaViewer = ModalView.extend({
 		  if (img.complete && ! loaded) { img.onload() }
 		}.bind(this))
 	},
+	
+	randomize: function(){
+    var media_data = $(".mediaContainer").toArray().map(function(el){
+      return $(el).data("media")
+    })
+    Scenery.randomize( media_data )
+  },
 
 	populate: function(data){
 		this.loaded = true
 		if (data && data.length) {
-		  data.forEach(this.add.bind(this))
+		  data.forEach(function(media){
+		    this.add(media, this.$myMedia)
+		  }.bind(this))
       this.$deleteMedia.show()
 		}
 		else {
@@ -104,7 +112,6 @@ var MediaViewer = ModalView.extend({
 	},
 	
 	add: function(media, $container){
-	  $container = $container || this.$myMedia
 		var image = new Image ()
 		var $span = $("<span>")
 		$span.addClass("mediaContainer")
@@ -131,7 +138,7 @@ var MediaViewer = ModalView.extend({
 		$span.data("media", media)
 		$span.append(image)
 
-		$container.prepend($span)		
+		$container.prepend($span)
 	},
 
 	deleteIsArmed: false,
diff --git a/public/assets/javascripts/util.js b/public/assets/javascripts/util.js
index 5a89c48..76c5c7b 100644
--- a/public/assets/javascripts/util.js
+++ b/public/assets/javascripts/util.js
@@ -92,9 +92,10 @@ function smoothstep(min,max,n){
 }
 
 function shuffle(a){
+  var r, swap
   for (var i = a.length; i > 0; i--){
-    var r = randint(i)
-    var swap = a[i-1]
+    r = randint(i)
+    swap = a[i-1]
     a[i-1] = a[r]
     a[r] = swap
   }
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 11512b9..349d0d0 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -51,6 +51,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/_scenery.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/resize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/randomize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 6e5dbdeb78b72bf9775ed2ea233db0b2ad8b5e41 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 13:03:24 -0400
Subject: get coordinates for point

---
 .../assets/javascripts/rectangles/models/wall.js   |  8 ++++++
 .../assets/javascripts/rectangles/util/coords.js   | 33 ++++++++++++++++++++++
 views/partials/scripts.ejs                         |  3 ++
 3 files changed, 44 insertions(+)
 create mode 100644 public/assets/javascripts/rectangles/util/coords.js

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 1b37aa0..07c3971 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -51,6 +51,14 @@
 					})
 				},
 				mousemove: function(e){
+          var offset = offsetFromPoint(e, mx.el)
+          if (offset) {
+            console.log([offset.left * mx.width + mx.face.x.a, (1-offset.top) * mx.height + mx.face.y.a].map(Math.round))
+//             console.log(mx)
+          }
+          else {
+            console.log("NONE")
+          }
 				},
 				mousedown: function(e){
 					if (Scenery.nextMedia) {
diff --git a/public/assets/javascripts/rectangles/util/coords.js b/public/assets/javascripts/rectangles/util/coords.js
new file mode 100644
index 0000000..74b7fda
--- /dev/null
+++ b/public/assets/javascripts/rectangles/util/coords.js
@@ -0,0 +1,33 @@
+function offsetFromPoint(event, element) {
+  function a(width) {
+    var l = 0, r = 200;
+    while (r - l > 0.0001) {
+      var mid = (r + l) / 2;
+      var a = document.createElement('div');
+      a.style.cssText = 'position: absolute;left:0;top:0;background: red;z-index: 1000;';
+      a.style[width ? 'width' : 'height'] = mid.toFixed(3) + '%';
+      a.style[width ? 'height' : 'width'] = '100%';
+      element.appendChild(a);
+      var x = document.elementFromPoint(event.clientX, event.clientY);
+      element.removeChild(a);
+      if (x === a) {
+        r = mid;
+      } else {
+        if (r === 200) {
+          return null;
+        }
+        l = mid;
+      }
+    }
+    return mid;
+  }
+  var l = a(1), 
+      t = a(0);
+  return l && t ? {
+    left: l / 100,
+    top: t / 100,
+    toString: function () {
+      return 'left: ' + l + '%, top: ' + t + '%';
+    }
+  } : null;
+}
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 1ce180a..5ddab2a 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -21,8 +21,10 @@
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script>
@@ -33,6 +35,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
-- 
cgit v1.2.3-70-g09d2


From b512bcdfe49e0bce336f848dcf620c3c533e1f8c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 13:12:40 -0400
Subject: saving icon

---
 public/assets/javascripts/rectangles/engine/scenery/move.js | 1 +
 public/assets/javascripts/rectangles/util/minotaur.js       | 2 +-
 public/assets/stylesheets/app.css                           | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 55d6ef1..e7ca4ef 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -88,6 +88,7 @@ Scenery.move = function(base){
 	}
 
 	function up (e, cursor){
+	console.log(dragging, oldState)
     if (! dragging || ! oldState) return
     
 		dragging = false
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 4d9a795..d165ccc 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -4,7 +4,7 @@
     var base = this
     base.$el = $("#minotaur")
     base.timeout = null
-    base.delay = 5000
+    base.delay = 2500
     base.objects = {}
     
     base.init = function () {
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e278fab..57ca3c6 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -757,8 +757,8 @@ iframe.embed {
 
 #minotaur {
 	position: absolute;
-	top: 0;
-	right: 230px;
+	top: 0px;
+	right: 0px;
 	opacity: 0;
 }
 #minotaur .label:after {
@@ -771,9 +771,9 @@ iframe.embed {
 	color: white;
 	background: black;
 	font-weight: 300;
-	float: right;
 	text-decoration: none;
 	z-index: 33;
+  opacity: 1;
 }
 #minotaur.saving .label:after {
   content: 'SAVING';
-- 
cgit v1.2.3-70-g09d2


From fa81420e382366ffd0d2262f1af6143399f7a91d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 14:32:03 -0400
Subject: transform screen coordinates into a 3d point

---
 .../javascripts/rectangles/engine/scenery/move.js  |  2 +-
 .../assets/javascripts/rectangles/models/vec2.js   |  7 ++++++
 .../assets/javascripts/rectangles/models/wall.js   | 29 +++++++++++++++++-----
 3 files changed, 31 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index e7ca4ef..981eb68 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -102,7 +102,7 @@ Scenery.move = function(base){
 
     // TODO: watch individual scenery object here
     Minotaur.watch( app.router.editorView.settings )
-
+  
     oldState = null
 	}
 	
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 0040435..a5a832e 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -37,6 +37,9 @@
 	vec2.prototype.midpoint = function(){
 		return lerp(0.5, this.a, this.b)
 	}
+	vec2.prototype.lerp = function(n){
+	  return lerp(n, this.a, this.b)
+	}
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
@@ -63,6 +66,10 @@
 	vec2.prototype.zero = function(){
 		this.a = this.b = 0
 	}
+	vec2.prototype.round = function(){
+	  this.a = Math.round(this.a)
+	  this.b = Math.round(this.b)
+	}
 	vec2.prototype.setPosition = function(n){
 		var len = this.length()
 		this.a = n
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 07c3971..fdf54f0 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -50,16 +50,24 @@
 						index: index,
 					})
 				},
+/*
 				mousemove: function(e){
           var offset = offsetFromPoint(e, mx.el)
+          var shouldFlip = base.side & (RIGHT | FRONT)
           if (offset) {
-            console.log([offset.left * mx.width + mx.face.x.a, (1-offset.top) * mx.height + mx.face.y.a].map(Math.round))
-//             console.log(mx)
-          }
-          else {
-            console.log("NONE")
+            var pos = base.mxOffsetToPosition( offset, index )
+            
+            var mx_pos = base.positionToMx(pos, new vec2(5,5))
+            var mx_dot = new MX.Object3D
+            mx_dot.move(mx_pos)
+            mx_dot.width = 5
+            mx_dot.height = 5
+            mx_dot.rotationY = wall_rotation[base.side]
+            mx_dot.el.style.backgroundColor = "red"
+            scene.add(mx_dot)
           }
 				},
+*/
 				mousedown: function(e){
 					if (Scenery.nextMedia) {
             var scenery = Scenery.addNextToWall({
@@ -184,7 +192,16 @@
 	  }
 	  return position
 	}
-	
+  Wall.prototype.mxOffsetToPosition = function( offset, index ) {
+    var face = this.surface.faces[index]
+    var shouldFlip = this.side & (RIGHT | FRONT)
+    var position = new vec2(0,0)
+    position.a = face.x.lerp(shouldFlip ? 1-offset.left : offset.left)
+    position.b = face.y.lerp(1-offset.top)
+    position.round()
+    return position
+  }
+
 	Wall.prototype.color = function(color){
 		this.$walls.css("background-color", color)
 	}
-- 
cgit v1.2.3-70-g09d2


From 55639122a00e77aaca1c6ac2faa5bc9f61ce7124 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 15:17:28 -0400
Subject: fix intro animation

---
 public/assets/javascripts/rectangles/models/wall.js   | 4 +++-
 public/assets/javascripts/ui/site/EditProfileModal.js | 1 -
 public/assets/stylesheets/app.css                     | 2 ++
 server/lib/api/profile.js                             | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fdf54f0..ce958db 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -69,7 +69,9 @@
 				},
 */
 				mousedown: function(e){
-					if (Scenery.nextMedia) {
+					if (Scenery.nextText) {
+					}
+					else if (Scenery.nextMedia) {
             var scenery = Scenery.addNextToWall({
             	wall: base,
             	index: index
diff --git a/public/assets/javascripts/ui/site/EditProfileModal.js b/public/assets/javascripts/ui/site/EditProfileModal.js
index e4e1e10..d0e5d05 100644
--- a/public/assets/javascripts/ui/site/EditProfileModal.js
+++ b/public/assets/javascripts/ui/site/EditProfileModal.js
@@ -11,7 +11,6 @@ var EditProfileModal = ModalFormView.extend({
 	load: function(){
 		this.reset()
 		$.get("/api/profile", function(data){
-			console.log(data)
 			
 			for (var i in data) {
 				this.$("[name='" + i + "']").val(data[i])
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3edad4f..32da0be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1908,6 +1908,8 @@ form li textarea {
 	-webkit-transition:0.2s all;
 	-moz-transition:0.2s all;
 	transition:0.2s all;
+  -webkit-transform: translate3d(0,-999px,0);
+          transform: translate3d(0,-999px,0);
 }
 
 .desktop .hero .circle:hover {
diff --git a/server/lib/api/profile.js b/server/lib/api/profile.js
index fdd1bde..996505f 100644
--- a/server/lib/api/profile.js
+++ b/server/lib/api/profile.js
@@ -10,6 +10,8 @@ var _ = require('lodash'),
 var profile = {
 	show: function(req, res){
 		User.findOne({ _id: req.user._id }, function(err, user){
+		  user = user.toObject()
+		  delete user.password
 			res.json(err || user)
 		})
 	},
-- 
cgit v1.2.3-70-g09d2


From f7c36f7a3394caa90937c5687f3ac7aeeed82e82 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 16:18:12 -0400
Subject: add media closer to where you clicked

---
 .../javascripts/rectangles/engine/scenery/move.js  |  1 -
 .../rectangles/engine/scenery/types/_object.js     | 26 ++++++++++++++++++++--
 .../rectangles/engine/scenery/types/image.js       |  9 +++++++-
 .../rectangles/engine/scenery/types/video.js       |  9 +++++++-
 .../assets/javascripts/rectangles/models/vec2.js   | 10 +++++++++
 .../assets/javascripts/rectangles/models/wall.js   |  9 ++++++--
 views/projects/list-projects.ejs                   |  7 +++---
 7 files changed, 61 insertions(+), 10 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 981eb68..7d148cf 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -88,7 +88,6 @@ Scenery.move = function(base){
 	}
 
 	function up (e, cursor){
-	console.log(dragging, oldState)
     if (! dragging || ! oldState) return
     
 		dragging = false
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 5eed53e..4e5e2c5 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -33,11 +33,33 @@ Scenery.types.base = Fiber.extend(function(base){
 			var center = this.bounds.center()
 			center.a -= this.dimensions.a / 2
 			center.b -= this.dimensions.b / 2
-			var mx_position = this.wall.positionToMx( center, this.dimensions )
-			this.mx.move(mx_position)
 			this.position.assign(center)
 		},
 		
+		translateTo: function (position){
+      var flipX = this.wall.side & (FRONT | RIGHT)
+      var delta = position.clone().subVec(this.position)
+      delta.a -= this.dimensions.a/2
+      delta.b -= this.dimensions.b/2
+      
+      if (flipX) { delta.a *= -1 }
+
+      var new_bounds = this.wall.surface.translate( this.bounds, this.dimensions, this.position, delta )
+
+      this.position.b += delta.b
+
+      switch (this.wall.side) {
+        case FRONT:
+        case BACK:
+          this.position.a += delta.a * cos(wall_rotation[this.wall.side])
+          break
+        case LEFT:
+        case RIGHT:
+          this.position.a += delta.a * sin(wall_rotation[this.wall.side])
+          break
+      }
+		},
+		
 		bind: function(){
 			this.move.bind()
 			$(this.mx.el).bind({
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index d2fa3ab..aa43341 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -22,7 +22,14 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
       }
       else {
       	this.set_wall(opt)
-        this.bounds && this.recenter()
+      	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)
+        }
       }
 		},
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index 76f32ac..2ef6ec3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -21,7 +21,14 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
       }
       else {
       	this.set_wall(opt)
-        this.bounds && this.recenter()
+        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)
+        }
       }
     },
 
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index a5a832e..49613c3 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -63,6 +63,16 @@
 		this.b /= n
 		return this
 	}
+	vec2.prototype.addVec = function(v){
+	  this.a += v.a
+	  this.b += v.b
+	  return this
+	}
+  vec2.prototype.subVec = function(v){
+	  this.a -= v.a
+	  this.b -= v.b
+	  return this
+	}
 	vec2.prototype.zero = function(){
 		this.a = this.b = 0
 	}
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index ce958db..fdc8d8c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -53,7 +53,6 @@
 /*
 				mousemove: function(e){
           var offset = offsetFromPoint(e, mx.el)
-          var shouldFlip = base.side & (RIGHT | FRONT)
           if (offset) {
             var pos = base.mxOffsetToPosition( offset, index )
             
@@ -72,9 +71,15 @@
 					if (Scenery.nextText) {
 					}
 					else if (Scenery.nextMedia) {
+            var offset = offsetFromPoint(e, mx.el)
+            if (! offset) { return }
+
+            var pos = base.mxOffsetToPosition( offset, index )
+
             var scenery = Scenery.addNextToWall({
             	wall: base,
-            	index: index
+            	index: index,
+            	position: pos,
             })
             
             // scenery was not placed
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 5694648..f3332b2 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -14,11 +14,12 @@
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
-				[[ if (String(user._id) == String(project.user_id)) { ]]
-				<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
-				[[ } ]]
 				<div class="holder">
+				[[ if (String(user._id) == String(project.user_id)) { ]]
+        <a href="/project/[[- project.slug ]]/edit">
+				[[ } else { ]]
 				<a href="/project/[[- project.slug ]]" class="roomName">
+				[[ } ]]
 					[[- project.name ]]<br>
 					[[- project.date ]]
 				</a>
-- 
cgit v1.2.3-70-g09d2


From 0a060fc9c9c3b4f93a79e7ee350cbaeac14ba589 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 16:26:04 -0400
Subject: fix clear button

---
 public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 2 +-
 public/assets/javascripts/ui/editor/EditorSettings.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index d34e299..69e9ba7 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -48,7 +48,7 @@ var Scenery = new function(){
 	base.find = function(id){
 		return base.list[id] || null
 	}
-		
+	
 	base.remove = function(id){
 		var scene_media = base.list[id]
 		delete base.list[id]
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index eb0d044..fd251b7 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -93,7 +93,7 @@ var EditorSettings = FormView.extend({
 	},
 	
 	clear: function(){
-		Rooms.removeAll()
+		Scenery.removeAll()
 	},
 	
 	destroy: function(){
-- 
cgit v1.2.3-70-g09d2


From c996ec3c93316b7a28b6707c9f7f595488d05cb9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 16:30:53 -0400
Subject: fix dot positioning

---
 .../rectangles/engine/scenery/resize.js            | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 2ba84a1..893237c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -57,35 +57,32 @@ Scenery.resize = new function(){
 	
 	// move all the dots to the object's current position
 	base.move_dots = function(){
-		x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
-		y = obj.mx.y
-		z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
+		var x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
+		var y = obj.mx.y
+		var z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
 
 		dots.forEach(function(dot){
-			base.move_dot(dot)
+			base.move_dot(dot, { x: x, y: y, z: z })
 		})
 	}
 		
 	// move a dot .. to the initial position of the image
-	base.move_dot = function(dot){
-		dot.x = x
-		dot.y = y
-		dot.z = z
-		
+	base.move_dot = function(dot, pos){
 		if (dot.side & TOP) {
-			dot.y += obj.mx.height * obj.mx.scale / 2
+			pos.y += obj.dimensions.b / 2
 		}
 		if (dot.side & BOTTOM) {
-			dot.y -= obj.mx.height * obj.mx.scale / 2
+			pos.y -= obj.dimensions.b / 2
 		}
 		if (dot.side & LEFT) {
-			dot.x -= cos(rotationY) * (obj.mx.width * obj.mx.scale) / 2
-			dot.z -= sin(rotationY) * (obj.mx.width * obj.mx.scale) / 2
+			pos.x -= cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z -= sin(rotationY) * (obj.dimensions.a) / 2
 		}
 		if (dot.side & RIGHT) {
-			dot.x += cos(rotationY) * (obj.mx.width * obj.mx.scale) / 2
-			dot.z += sin(rotationY) * (obj.mx.width * obj.mx.scale) / 2
+			pos.x += cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z += sin(rotationY) * (obj.dimensions.a) / 2
 		}
+		dot.move(pos)
 	}
 
 	// pick a new object to focus on and show the dots
-- 
cgit v1.2.3-70-g09d2


From c19fbc87676404636a2f5df304ddd7875fc98e66 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 6 Oct 2014 16:01:13 -0400
Subject: new scenery type: text

---
 public/assets/img/text-cursor.png                  | Bin 0 -> 1622 bytes
 public/assets/javascripts/mx/primitives/mx.text.js |  67 +++++++++-------
 .../rectangles/engine/rooms/projector.js           |  30 --------
 .../rectangles/engine/scenery/_scenery.js          |   4 +
 .../rectangles/engine/scenery/resize.js            |  16 +---
 .../rectangles/engine/scenery/types/image.js       |   2 +
 .../rectangles/engine/scenery/types/text.js        |  66 ++++++++++++++++
 .../rectangles/engine/scenery/types/video.js       |   2 +
 .../assets/javascripts/rectangles/models/mat4.js   |  78 -------------------
 .../assets/javascripts/rectangles/models/wall.js   |   8 +-
 .../assets/javascripts/ui/editor/EditorToolbar.js  |   3 +
 public/assets/javascripts/ui/editor/EditorView.js  |  10 ++-
 public/assets/javascripts/ui/editor/MediaEditor.js |   5 --
 public/assets/javascripts/ui/editor/TextEditor.js  |  85 ++++++++++++++++++++-
 public/assets/stylesheets/app.css                  |   5 +-
 views/controls/editor/text-editor.ejs              |   4 +
 views/controls/editor/toolbar.ejs                  |   2 +-
 views/partials/scripts.ejs                         |  13 ++--
 18 files changed, 230 insertions(+), 170 deletions(-)
 create mode 100644 public/assets/img/text-cursor.png
 delete mode 100644 public/assets/javascripts/rectangles/engine/rooms/projector.js
 create mode 100644 public/assets/javascripts/rectangles/engine/scenery/types/text.js
 delete mode 100644 public/assets/javascripts/rectangles/models/mat4.js

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

diff --git a/public/assets/img/text-cursor.png b/public/assets/img/text-cursor.png
new file mode 100644
index 0000000..66e9e0d
Binary files /dev/null and b/public/assets/img/text-cursor.png differ
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index 9c7af5c..7b8e595 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -3,34 +3,49 @@ MX.Text = MX.Object3D.extend({
   init: function (ops) {
 
 		this.type = "Text"
-		
-    var layer = new MX.Object3D('text')
-    layer.width = ops.width || 100
-    layer.height = ops.height || 50
-    layer.x = ops.x || 0
-    layer.y = ops.y || 0
-    layer.z = ops.z || 0
-    layer.scale = ops.scale || 1
-    layer.el.innerHTML = ops.value || ""
-    if (ops.id) layer.el.id = ops.id;
-    if (ops.background) layer.el.style.background = ops.background;
-    if (ops.color) layer.el.style.color = ops.color;
-    if (ops.fontSize) layer.el.style.fontSize = ops.fontSize + "px";
 
-    this.add(layer)
+  	this.type = "Image"
+		this.media = ops.media
+    this.width = 0
+    this.height = 0
+		this.x = ops.x || 0
+		this.y = ops.y || 0
+		this.z = ops.z || 0
+		this.scale = ops.scale || 1
+		this.backface = ops.backface || false
 
-    this.children.forEach(function (c, i) {
-      if (ops.classname) {
-        c.el.classList.add(ops.classname)
-      }
-      else {
-      }
-      c.el.style.backgroundRepeat = 'no-repeat'
-    })
+    this.scale = ops.scale || 1
+    this.width = ops.media.width
+    this.height = ops.media.height
+    this.x = ops.x || 0
+    this.y = ops.y || 0
+    this.z = ops.z || 0
+    this.rotationX = ops.rotationX || 0
+    this.rotationY = ops.rotationY || 0
+    this.rotationZ = ops.rotationZ || 0
+		
+		ops.className && this.el.classList.add(ops.className)
+		this.backface && this.el.classList.add("backface-visible")
+		this.el.classList.add("text")
+		this.el.classList.add("mx-scenery")
+		
+		this.inner = document.createElement("div")
+		this.inner.style.width = "100%"
+		this.el.appendChild(this.inner)
+		
+		this.load(ops)
+  },
+  
+  load: function(ops){
+    if (ops.color) this.el.style.color = ops.color;
+    if (ops.fontFamily) this.el.style.fontFamily = "'" + ops.fontFamily + "',sans-serif";
+    if (ops.fontSize) this.el.style.fontSize = ops.fontSize + "px";
 
-    this.dirty = true
-    this.updateChildren = true
-    this.update()
-  }
+    this.inner.innerHTML = ops.media.description || ""
+  },
+  
+  setText: function(text){
+    this.inner.innerHTML = text
+  },
 
 })
diff --git a/public/assets/javascripts/rectangles/engine/rooms/projector.js b/public/assets/javascripts/rectangles/engine/rooms/projector.js
deleted file mode 100644
index 2eac314..0000000
--- a/public/assets/javascripts/rectangles/engine/rooms/projector.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-rooms.projector = new function(){
-
-  projector = new THREE.Projector();
-  vector = new THREE.Vector3( mouse.x, mouse.y, 0.5 );
-  projector.unprojectVector( vector, camera );
-
-  raycaster = new THREE.Raycaster( camera.position, vector.sub( camera.position ).normalize() );
-  intersects = raycaster.intersectObjects( scene.children, true );
-
-}
-
-
-
-THREE.Projector = function () {
-
-	_viewProjectionMatrix = new THREE.Matrix4(),
-
-	this.unprojectVector = function ( vector, camera ) {
-		camera.projectionMatrixInverse.getInverse( camera.projectionMatrix );
-		
-		_viewProjectionMatrix.multiplyMatrices(
-			camera.matrixWorld,
-			camera.projectionMatrixInverse
-		);
-
-		return vector.applyProjection( _viewProjectionMatrix );
-	};
-
-}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 69e9ba7..3d3067f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -24,6 +24,10 @@ var Scenery = new function(){
 			case 'vimeo':
 				scene_media = new Scenery.types.video (opt)
 				break
+			
+			case 'text':
+			  scene_media = new Scenery.types.text (opt)
+			  break
 		}
 		base.list[scene_media.id] = scene_media
 		return scene_media
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 893237c..0ce976e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -117,22 +117,13 @@ Scenery.resize = new function(){
 	base.bind = function(){
 		dots.forEach(function(dot){
 			Scenery.mouse.bind_el(dot.el)
-			$(dot.el).bind({
-				mouseenter: function(e){
-// 					Scenery.resize.hovering = true 
-				},
-				mouseleave: function(e){
-// 					Scenery.resize.hovering = false
-// 					base.defer_hide()
-				}
-			})
 		})
 		Scenery.mouse.on("down", down)
 		Scenery.mouse.on("drag", drag)
 		Scenery.mouse.on("up", up)
 	}
 
-	this.unbind = function(){
+	base.unbind = function(){
 		dots.forEach(function(dot){
 			Scenery.mouse.unbind_el(dot.el)
 		})
@@ -151,7 +142,6 @@ Scenery.resize = new function(){
 		naturalDimension = obj.naturalDimensions
 		dimension = obj.dimensions
 		position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z)
-		scale = obj.mx.scale
 		oldState = obj.serialize()
 
 		document.body.classList.add("dragging")
@@ -165,7 +155,6 @@ Scenery.resize = new function(){
 		var width = cursor.x.magnitude()
 		var height = cursor.y.magnitude()
 		var mag = cursor.magnitude()
-		var old_width = dimension.a * scale
 
 		if (abs(width) > abs(height)) {
 			mag = x_sign * mag * sign(width)
@@ -175,9 +164,6 @@ Scenery.resize = new function(){
 		}
 
  		obj.set_scale( ( dimension.a + mag ) / naturalDimension.a )
- 		// dimension.a // scale * (old_width + mag) / old_width
-
-// console.log(scale, obj.mx.scale, dimension.a + mag, naturalDimension.a)
 
 		if (selected_dot.side & LEFT_RIGHT) {
 			obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index aa43341..bed847b 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -3,6 +3,8 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 
 	var exports = {
 	
+	  type: 'image',
+	
 		init: function(opt){
 
 			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
new file mode 100644
index 0000000..16c7a5c
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -0,0 +1,66 @@
+
+Scenery.types.text = Scenery.types.base.extend(function(base){
+
+	var exports = {
+
+	  type: 'text',
+	
+		init: function(opt){
+
+			opt.scale = 1
+
+			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)
+        }
+      }
+		},
+
+		build: function(){
+			this.mx = new MX.Text({
+				scale: this.scale,
+				media: this.media,
+				y: this.scale * this.media.height/2,
+				backface: false,
+			})
+			scene.add( this.mx )
+		},
+		
+		setText: function(text){
+      this.media.description = text
+      this.mx.setText(text)
+		},
+
+		serialize: function(){
+			var data = base.serialize.call(this)
+			return data
+		},
+	  
+		deserialize: function(data){
+			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
+		},
+	}
+	
+	return exports
+})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index 2ef6ec3..b723f56 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -2,6 +2,8 @@
 Scenery.types.video = Scenery.types.base.extend(function(base){
 
 	var exports = {
+	  
+	  type: 'video',
 	
 		init: function(opt){
 			opt.scale = opt.scale || (opt.data && opt.data.scale) || 300 / max(300, opt.media.width)
diff --git a/public/assets/javascripts/rectangles/models/mat4.js b/public/assets/javascripts/rectangles/models/mat4.js
deleted file mode 100644
index b061199..0000000
--- a/public/assets/javascripts/rectangles/models/mat4.js
+++ /dev/null
@@ -1,78 +0,0 @@
-function mat4(e){
-	this.elements = [ 1, 0, 0, 0,
-	                  0, 1, 0, 0,
-	                  0, 0, 1, 0,
-	                  0, 0, 0, 1 ]
-	return this
-}
-mat4.prototype.set = function (a) {
-	var els = this.elements
-	a.forEach(function(n,i){ els[i] = n })
-	return this
-}
-mat4.prototype.clone = function(){
-	return (new mat4).set(this.els)
-}
-mat4.prototype.identity = function () {
-	this.set([
-		1, 0, 0, 0,
-		0, 1, 0, 0,
-		0, 0, 1, 0,
-		0, 0, 0, 1
-	]);
-	return this;
-}
-mat4.prototype.getInverse = function (m, throwOnInvertible) {
-
-	// based on http://www.euclideanspace.com/maths/algebra/matrix/functions/inverse/fourD/index.htm
-	var te = this.elements;
-	var me = m.elements;
-
-	var n11 = me[0], n12 = me[4], n13 = me[8], n14 = me[12];
-	var n21 = me[1], n22 = me[5], n23 = me[9], n24 = me[13];
-	var n31 = me[2], n32 = me[6], n33 = me[10], n34 = me[14];
-	var n41 = me[3], n42 = me[7], n43 = me[11], n44 = me[15];
-
-	te[0] = n23*n34*n42 - n24*n33*n42 + n24*n32*n43 - n22*n34*n43 - n23*n32*n44 + n22*n33*n44;
-	te[4] = n14*n33*n42 - n13*n34*n42 - n14*n32*n43 + n12*n34*n43 + n13*n32*n44 - n12*n33*n44;
-	te[8] = n13*n24*n42 - n14*n23*n42 + n14*n22*n43 - n12*n24*n43 - n13*n22*n44 + n12*n23*n44;
-	te[12] = n14*n23*n32 - n13*n24*n32 - n14*n22*n33 + n12*n24*n33 + n13*n22*n34 - n12*n23*n34;
-	te[1] = n24*n33*n41 - n23*n34*n41 - n24*n31*n43 + n21*n34*n43 + n23*n31*n44 - n21*n33*n44;
-	te[5] = n13*n34*n41 - n14*n33*n41 + n14*n31*n43 - n11*n34*n43 - n13*n31*n44 + n11*n33*n44;
-	te[9] = n14*n23*n41 - n13*n24*n41 - n14*n21*n43 + n11*n24*n43 + n13*n21*n44 - n11*n23*n44;
-	te[13] = n13*n24*n31 - n14*n23*n31 + n14*n21*n33 - n11*n24*n33 - n13*n21*n34 + n11*n23*n34;
-	te[2] = n22*n34*n41 - n24*n32*n41 + n24*n31*n42 - n21*n34*n42 - n22*n31*n44 + n21*n32*n44;
-	te[6] = n14*n32*n41 - n12*n34*n41 - n14*n31*n42 + n11*n34*n42 + n12*n31*n44 - n11*n32*n44;
-	te[10] = n12*n24*n41 - n14*n22*n41 + n14*n21*n42 - n11*n24*n42 - n12*n21*n44 + n11*n22*n44;
-	te[14] = n14*n22*n31 - n12*n24*n31 - n14*n21*n32 + n11*n24*n32 + n12*n21*n34 - n11*n22*n34;
-	te[3] = n23*n32*n41 - n22*n33*n41 - n23*n31*n42 + n21*n33*n42 + n22*n31*n43 - n21*n32*n43;
-	te[7] = n12*n33*n41 - n13*n32*n41 + n13*n31*n42 - n11*n33*n42 - n12*n31*n43 + n11*n32*n43;
-	te[11] = n13*n22*n41 - n12*n23*n41 - n13*n21*n42 + n11*n23*n42 + n12*n21*n43 - n11*n22*n43;
-	te[15] = n12*n23*n31 - n13*n22*n31 + n13*n21*n32 - n11*n23*n32 - n12*n21*n33 + n11*n22*n33;
-
-	var det = n11 * te[ 0 ] + n21 * te[ 4 ] + n31 * te[ 8 ] + n41 * te[ 12 ];
-
-	if ( det == 0 ) {
-		var msg = "Matrix4.getInverse(): can't invert matrix, determinant is 0";
-
-		if ( throwOnInvertible || false ) {
-			throw new Error( msg )
-		}
-		else {
-			console.warn( msg )
-		}
-		this.identity();
-		return this
-	}
-	this.multiplyScalar( 1 / det );
-	return this
-}
-mat4.prototype.multiplyScalar = function (n) {
-	var els = this.elements
-	els[0] *= n; els[4] *= n; els[8]  *= n; els[12] *= n
-	els[1] *= n; els[5] *= n; els[9]  *= n; els[13] *= n
-	els[2] *= n; els[6] *= n; els[10] *= n; els[14] *= n
-	els[3] *= n; els[7] *= n; els[11] *= n; els[15] *= n
-	return this
-}
-
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fdc8d8c..dc38183 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -68,9 +68,7 @@
 				},
 */
 				mousedown: function(e){
-					if (Scenery.nextText) {
-					}
-					else if (Scenery.nextMedia) {
+					if (Scenery.nextMedia) {
             var offset = offsetFromPoint(e, mx.el)
             if (! offset) { return }
 
@@ -91,13 +89,15 @@
             app.controller.toolbar.resetPermissions()
             Scenery.resize.show(scenery)
             Scenery.hovering = true 
+            
+            app.controller.pick(scenery)
 
   					UndoStack.push({
   					  type: 'create-scenery',
   					  undo: { id: scenery.id },
               redo: scenery.serialize(),
   					})
-
+  					
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
           }
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 513306d..49decc2 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -3,6 +3,7 @@ var EditorToolbar = View.extend({
 	el: "#editorToolbar",
 
 	events: {
+	  "mousedown": 'stopPropagation',
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -42,6 +43,7 @@ var EditorToolbar = View.extend({
 		// this.resizeMedia(true)
 		// this.destroyMedia(false)
  	  $(".inuse").removeClass("inuse")
+    $("body").removeClass("addText")
 		this.parent.hideExtras()
 		this.resetPermissions()
 	},
@@ -131,6 +133,7 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-text-editor']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
+		this.parent.lightControl.hide()
 		this.parent.settings.hide()
 		this.parent.textEditor.toggle(state)
   },
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 83db532..67687fe 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -42,11 +42,19 @@ var EditorView = View.extend({
 	},
 	
 	pick: function(scenery){
-		this.mediaEditor.pick(scenery)
+	  if (scenery.type == "text") {
+      this.mediaEditor.hide()
+      this.textEditor.pick(scenery)
+	  }
+	  else {
+      this.textEditor.hide()
+      this.mediaEditor.pick(scenery)
+	  }
 	},
 	
 	hideExtras: function(){
 		this.mediaEditor.hide()
+		this.textEditor.hide()
     Scenery.resize.hide()
 		Scenery.hovering = false
   }
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index e4f93df..0a4d894 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -76,7 +76,6 @@ var MediaEditor = FormView.extend({
 			case "image":
 				this.$(".image").show()
 				this.$(".video").hide()
-								
 				break
 
 			case "youtube":
@@ -90,7 +89,6 @@ var MediaEditor = FormView.extend({
 				this.$loop.prop('checked', !! media.loop)
 				this.$mute.prop('checked', !! media.mute)
 				this.$keyframe.val( Number(media.keyframe || 0) )
-
 				break
 		}
 	},
@@ -166,7 +164,6 @@ var MediaEditor = FormView.extend({
       this.scenery.media.title = this.$name.val()
       this.scenery.media.description = this.$description.val()
       Minotaur.watch( app.router.editorView.settings )
-
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
@@ -177,8 +174,6 @@ var MediaEditor = FormView.extend({
 	},
 	
 	destroy: function(){
-// 		ConfirmModal.confirm("Are you sure you want delete this object?", function(){
-// 		}.bind(this))
     var scenery = this.scenery
     this.hide()
     Scenery.remove(scenery.id)
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0319a31..0d082ca 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -1,6 +1,8 @@
 
 var TextEditor = FormView.extend({
 	el: "#textEditor",
+	tainted: false,
+	scenery: null,
 		
 	events: {
 		"keydown": 'taint',
@@ -9,20 +11,87 @@ var TextEditor = FormView.extend({
 		"change [name=font-family]": 'changeFontFamily',
 		"change [name=font-size]": 'changeFontSize',
 		"input [name=text-body]": 'changeText',
-		"click [data-role=destroy-media]": "destroy",
+		"click [data-role=destroy-text]": "destroy",
 	},
 	
 	initialize: function(opt){
 		this.parent = opt.parent
 		this.__super__.initialize.call(this)
     
+    this.$settings = this.$(".setting")
+    this.$noTextMessage = this.$(".no-text")
     this.$fontFamily = this.$("[name=font-family]")
     this.$fontSize = this.$("[name=font-size]")
     this.$textBody = this.$("[name=text-body]")
 	},
 
   toggle: function(state){
-    this.$el.toggleClass("active", state);
+    $("#keyhint").fadeOut(200)
+    
+    this.$el.toggleClass("active", state)
+    if (state) {
+      Scenery.nextMedia = { type: 'text', width: 300, height: 150 }
+      this.createMode(true)
+    }
+  },
+
+	hide: function(scenery){
+		if (this.scenery) {
+			this.unbind()
+		}
+		this.toggle(false)
+	},
+
+	taint: function(e){
+	  e.stopPropagation()
+		this.tainted = true
+	},
+
+	bind: function(scenery){
+    this.tainted = false
+		this.scenery = scenery
+		this.scenery.mx.bound = true
+		this.scenery.mx.el.classList.add("picked")
+	},
+	
+	unbind: function(){
+	  if (this.scenery && this.tainted) {
+      Minotaur.watch( app.router.editorView.settings )
+
+	    if (this.scenery.mx) {
+        this.scenery.mx.bound = false
+        this.scenery.mx.el.classList.remove("picked")
+      }
+    }
+    this.tainted = false
+    this.scenery = null
+	},
+  
+  createMode: function(state){
+    this.$settings.toggle(! state)
+    this.$noTextMessage.toggle(!! state)
+    $("body").toggleClass("addText", !! state)
+  },
+  
+  pick: function(scenery){
+		if (this.scenery) {
+			this.unbind()
+		}
+
+		Scenery.resize.show(scenery)
+		Scenery.hovering = true
+		
+		this.bind(scenery)
+		this.$el.toggleClass("active", true)
+		this.$textBody.val( this.scenery.media.description )
+
+    this.createMode(false)
+
+    if (! this.scenery.media.description) {
+      setTimeout(function(){
+        this.$textBody.focus()
+      }.bind(this), 100)
+    }
   },
   
   taint: function(e){
@@ -35,7 +104,17 @@ var TextEditor = FormView.extend({
   changeFontSize: function(){
   },
   
-  changeText: function(){
+  changeText: function(e){
+    e.stopPropagation()
+    var text = this.$textBody.val()
+    this.scenery.setText(text)
   },
+  
+	destroy: function(){
+    var scenery = this.scenery
+    this.hide()
+    Scenery.remove(scenery.id)
+    Scenery.resize.hide()
+	},
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e626d39..e746cad 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -667,9 +667,12 @@ iframe.embed {
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
 }
-.destroyActive .mx-scene, .destroyActive .mx-object3d.image, .menu span.inuse[data-role="destroy-media"] {
+.destroyActive .mx-scene, .destroyActive .mx-object3d.image {
 	cursor:url(/assets/img/delete-cursor.png), auto;
 }
+.addText .mx-scene, .menu span.inuse[data-role="toggle-text-editor"] {
+	cursor:url(/assets/img/text-cursor.png), auto;
+}
 
 .mx-scenery:active {
   cursor: pointer;
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
index 205fbdf..a14c469 100644
--- a/views/controls/editor/text-editor.ejs
+++ b/views/controls/editor/text-editor.ejs
@@ -1,6 +1,10 @@
 <div class="vvbox settings" id="textEditor">
 	<h4>Edit Text</h4>
   
+  <div class="no-text">
+    Click a wall to add text.
+  </div>
+  
 	<div class="setting">
     <select name="font-family">
       <option>Helvetica</option>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 586194b..f9d91af 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -30,7 +30,7 @@
 [[ if (user.username == "test12343") { ]]
 	<span
 		data-role='toggle-text-editor'
-		data-info="edit wall text"
+		data-info="add text to wall"
 		class="icon-ios7-compose-outline"></span>
 [[ } ]]
 		
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 4af9938..35dd782 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -17,6 +17,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movementsMobile.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
@@ -27,19 +28,18 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/uid.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
@@ -60,6 +60,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 1dae6e5dfce901cdadeebd2e191927dbc5a326f6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 6 Oct 2014 16:07:21 -0400
Subject: bower: adding marked

---
 bower.json                                                   |  3 ++-
 public/assets/javascripts/defaults.js                        |  7 +++++++
 public/assets/javascripts/mx/primitives/mx.text.js           |  8 ++++----
 .../javascripts/rectangles/engine/scenery/types/text.js      |  2 +-
 public/assets/javascripts/ui/editor/MediaEditor.js           | 10 ++++++----
 public/assets/javascripts/ui/editor/TextEditor.js            |  6 ++++--
 public/assets/stylesheets/app.css                            | 12 +++++++++++-
 views/partials/scripts.ejs                                   |  1 +
 8 files changed, 36 insertions(+), 13 deletions(-)

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

diff --git a/bower.json b/bower.json
index faffbfb..5f35d6c 100644
--- a/bower.json
+++ b/bower.json
@@ -8,6 +8,7 @@
     "lodash": "",
     "fiber": "",
     "jquery-jsonview": "1.2.0",
-    "prefixfree": ""
+    "prefixfree": "",
+    "marked": "0.3.2"
   }
 }
diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 038a882..c779233 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -12,3 +12,10 @@ app.defaults = {
     ceiling: [255,255,255],
 	},
 }
+
+marked.setOptions({
+  gfm: true,
+  breaks: true,
+  sanitize: true,
+  smartypants: true,
+})
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index 7b8e595..b4089f3 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -26,11 +26,11 @@ MX.Text = MX.Object3D.extend({
 		
 		ops.className && this.el.classList.add(ops.className)
 		this.backface && this.el.classList.add("backface-visible")
-		this.el.classList.add("text")
+		this.el.classList.add("mx-text")
 		this.el.classList.add("mx-scenery")
 		
 		this.inner = document.createElement("div")
-		this.inner.style.width = "100%"
+		this.inner.classList.add("inner")
 		this.el.appendChild(this.inner)
 		
 		this.load(ops)
@@ -41,11 +41,11 @@ MX.Text = MX.Object3D.extend({
     if (ops.fontFamily) this.el.style.fontFamily = "'" + ops.fontFamily + "',sans-serif";
     if (ops.fontSize) this.el.style.fontSize = ops.fontSize + "px";
 
-    this.inner.innerHTML = ops.media.description || ""
+    this.inner.innerHTML = marked( ops.media.description || "" )
   },
   
   setText: function(text){
-    this.inner.innerHTML = text
+    this.inner.innerHTML = marked( text || "" )
   },
 
 })
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
index 16c7a5c..20e9883 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/text.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -47,7 +47,7 @@ Scenery.types.text = Scenery.types.base.extend(function(base){
 		
 		setText: function(text){
       this.media.description = text
-      this.mx.setText(text)
+      this.mx.setText( text )
 		},
 
 		serialize: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 0a4d894..9b81db1 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -160,10 +160,12 @@ var MediaEditor = FormView.extend({
 	},
 	
 	unbind: function(){
-	  if (this.scenery && this.tainted) {
-      this.scenery.media.title = this.$name.val()
-      this.scenery.media.description = this.$description.val()
-      Minotaur.watch( app.router.editorView.settings )
+	  if (this.scenery) {
+	    if (this.tainted) {
+        this.scenery.media.title = this.$name.val()
+        this.scenery.media.description = this.$description.val()
+        Minotaur.watch( app.router.editorView.settings )
+      }
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0d082ca..3d3124b 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -55,8 +55,10 @@ var TextEditor = FormView.extend({
 	},
 	
 	unbind: function(){
-	  if (this.scenery && this.tainted) {
-      Minotaur.watch( app.router.editorView.settings )
+	  if (this.scenery) {
+      if (this.tainted) {
+        Minotaur.watch( app.router.editorView.settings )
+      }
 
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e746cad..02bbe6a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -698,6 +698,16 @@ iframe.embed {
 .mx-object3d video {
 	pointer-events: none;
 }
+.mx-text {
+  overflow: hidden;
+}
+.mx-text .inner {
+  width: 100%;
+  pointer-events: none;
+}
+.mx-text p {
+  margin-bottom: 1em;
+}
 #keyhint {
 	position: fixed;
 	bottom:0;
@@ -2117,7 +2127,7 @@ a[data-role="forgot-password"] {
   background: white;
   padding: 10px;
   margin: 20px auto;
-position: relative;
+  position: relative;
 }
 
 .collaborators button {
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 35dd782..f768160 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -3,6 +3,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 4d78b32ce840bb804221f0208ee7cb0c8ffa8e02 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 6 Oct 2014 18:13:58 -0400
Subject: setting font family & size

---
 public/assets/javascripts/defaults.js                 |  2 --
 public/assets/javascripts/mx/primitives/mx.text.js    | 19 +++++++++++++++----
 .../rectangles/engine/scenery/types/text.js           | 11 ++++++++++-
 public/assets/javascripts/ui/editor/TextEditor.js     | 13 ++++++++++++-
 public/assets/stylesheets/app.css                     |  9 +++++++--
 5 files changed, 44 insertions(+), 10 deletions(-)

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

diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index c779233..9ba0b4d 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -14,8 +14,6 @@ app.defaults = {
 }
 
 marked.setOptions({
-  gfm: true,
-  breaks: true,
   sanitize: true,
   smartypants: true,
 })
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index b4089f3..8db28d0 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -37,11 +37,22 @@ MX.Text = MX.Object3D.extend({
   },
   
   load: function(ops){
-    if (ops.color) this.el.style.color = ops.color;
-    if (ops.fontFamily) this.el.style.fontFamily = "'" + ops.fontFamily + "',sans-serif";
-    if (ops.fontSize) this.el.style.fontSize = ops.fontSize + "px";
+    var media = ops.media
+    if (media.color) this.el.style.color = media.color;
+    if (media.font) this.setFont(media.font)
+    if (media.align) this.setAlign(media.align)
 
-    this.inner.innerHTML = marked( ops.media.description || "" )
+    this.setText( media.description )
+  },
+  
+  setAlign: function(align) {
+    this.el.style.textAlign = "align"
+  },
+    
+  setFont: function(font){
+    console.log(font)
+    this.inner.style.fontFamily = "'" + font.family + "',sans-serif"
+    this.el.style.fontSize = (2 * font.size) + "pt"
   },
   
   setText: function(text){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
index 20e9883..a10a332 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/text.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -7,7 +7,7 @@ Scenery.types.text = Scenery.types.base.extend(function(base){
 	
 		init: function(opt){
 
-			opt.scale = 1
+			opt.scale = 0.5
 
 			base.init.call(this, opt)
 
@@ -49,6 +49,15 @@ Scenery.types.text = Scenery.types.base.extend(function(base){
       this.media.description = text
       this.mx.setText( text )
 		},
+		
+		setFont: function(style){
+		  for (var i in style) {
+		    if (style.hasOwnProperty(i)) {
+          this.media.font[i] = style[i]
+		    }
+		  }
+		  this.mx.setFont(this.media.font)
+		},
 
 		serialize: function(){
 			var data = base.serialize.call(this)
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 3d3124b..c867d94 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -30,7 +30,15 @@ var TextEditor = FormView.extend({
     
     this.$el.toggleClass("active", state)
     if (state) {
-      Scenery.nextMedia = { type: 'text', width: 300, height: 150 }
+      Scenery.nextMedia = {
+        type: 'text',
+        width: 600,
+        height: 450,
+        scale: 0.5,
+        font: { family: 'Lato', size: 12 },
+        align: 'left',
+      }
+      
       this.createMode(true)
     }
   },
@@ -101,9 +109,12 @@ var TextEditor = FormView.extend({
   },
   
   changeFontFamily: function(){
+    this.scenery.setFont({ family: this.$fontFamily.val() })
   },
   
   changeFontSize: function(){
+    var size = parseInt( this.$fontSize.val() )
+    size && this.scenery.setFont({ size: size })
   },
   
   changeText: function(e){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 02bbe6a..1c20493 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -4,9 +4,11 @@
 	margin:0;
 	padding:0;
 	outline:0;
-	font-family: 'Lato', sans-serif;
 	-webkit-font-smoothing: subpixel-antialiased;
 }
+body,textarea,input {
+	font-family: 'Lato', sans-serif;
+}
 
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -1597,7 +1599,10 @@ input[type="range"]::-webkit-slider-thumb {
   font-size: 12px;
   width: 100%;
   max-height: 200px;
-  max-width: 180px;
+}
+#textEditor.settings textarea {
+  max-height: none;
+  height: 290px;
 }
 
 .settings input[type="text"]:focus{
-- 
cgit v1.2.3-70-g09d2


From d8637f78753af20022c9b6cd55717a5f905dd0ee Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 12:11:43 -0400
Subject: splitting wallpaper url / position

---
 .../assets/javascripts/rectangles/models/wall.js   | 24 ++++++++++++++--------
 public/assets/javascripts/ui/editor/EditorView.js  |  4 ++++
 public/assets/javascripts/ui/reader/ReaderView.js  |  4 ++++
 3 files changed, 23 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index dc38183..dedae8b 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -68,12 +68,12 @@
 				},
 */
 				mousedown: function(e){
-					if (Scenery.nextMedia) {
-            var offset = offsetFromPoint(e, mx.el)
-            if (! offset) { return }
+          var offset = offsetFromPoint(e, mx.el)
+          if (! offset) { return }
 
-            var pos = base.mxOffsetToPosition( offset, index )
+          var pos = base.mxOffsetToPosition( offset, index )
 
+					if (Scenery.nextMedia) {
             var scenery = Scenery.addNextToWall({
             	wall: base,
             	index: index,
@@ -116,7 +116,7 @@
             Minotaur.watch( app.router.editorView.settings )
           }
 					else {
-						app.controller.hideExtras()
+						app.controller.pickWall(base, pos)
 					}
 				}
 			})
@@ -140,6 +140,7 @@
 	
 	Wall.prototype.deserialize = function(data){
 	  this.wallpaper( data.background )
+	  this.wallpaperPosition( data.background_x, data.background_y, data.background_scale )
 	}
 
 
@@ -214,22 +215,27 @@
 	}
 	
 	Wall.prototype.wallpaper = function(background){
+		this.background = background || "none"
+		this.mx.forEach(function(mx){
+      mx.el.style.backgroundImage = background
+    })
+	}
+
+	Wall.prototype.wallpaperPosition = function(x, y, scale){
 		var useX = this.side & FRONT_BACK
 		var shouldFlip = this.side & (LEFT | BACK)
-		
-		this.background = background || "none"
-		
+
 		this.mx.forEach(function(mx){
       var partitionOffset = useX ? mx.x : mx.z
       if (shouldFlip) partitionOffset *= -1
       partitionOffset += mx.width/2
       var floorOffset = mx.y + mx.height/2
 
-      mx.el.style.backgroundImage = background
       mx.el.style.backgroundPosition = (~~partitionOffset) + "px " + (~~floorOffset) + "px"
     })
 	}
 	
+
 	Wall.prototype.outline = function(wallColor, outlineColor){
 		var useX = this.side & FRONT_BACK
 		var mx = this.mx
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 67687fe..f95d909 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -52,6 +52,10 @@ var EditorView = View.extend({
 	  }
 	},
 	
+	pickWall: function(wall, pos){
+		this.hideExtras()
+	},
+	
 	hideExtras: function(){
 		this.mediaEditor.hide()
 		this.textEditor.hide()
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 82db048..5f2db0f 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -78,6 +78,10 @@ var ReaderView = View.extend({
     app.tube("pick-scenery", { scenery: scenery })
 	},
 
+	pickWall: function(wall, pos){
+		this.hideExtras()
+	},
+
 	hideExtras: function(){
 		this.mediaPlayer.hide()
     app.tube("close-scenery")
-- 
cgit v1.2.3-70-g09d2


From 42420ebed566dffd680998d5b2fb46764164e540 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 13:04:41 -0400
Subject: wallpaperPosition

---
 .../assets/javascripts/rectangles/models/wall.js   | 75 ++++++++++++++++++----
 1 file changed, 64 insertions(+), 11 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index dedae8b..93e1f42 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -140,7 +140,6 @@
 	
 	Wall.prototype.deserialize = function(data){
 	  this.wallpaper( data.background )
-	  this.wallpaperPosition( data.background_x, data.background_y, data.background_scale )
 	}
 
 
@@ -215,24 +214,78 @@
 	}
 	
 	Wall.prototype.wallpaper = function(background){
-		this.background = background || "none"
+	  if (! background) {
+	    background = { src: "none" }
+	  }
+	  else if (typeof background == "string") {
+	    background = { src: background }
+	  }
+	  else if (! background.src) {
+	    background = { src: "none" }
+	  }
+    background.x = background.x || 0
+    background.y = background.y || 0
+    background.scale = background.scale || 1
+
+		this.background = background
+		this.background.src = this.background.src.replace("url(","").replace(")","")
+
+		console.log(background)
+
+		if (this.background.src == "none") {
+		  this.wallpaperLoad(this.background.src)
+		  return
+		}
+		
+		var img = new Image ()
+		img.onload = function(){
+		  this.backgroundImage = img
+		  this.wallpaperLoad(this.background.src)
+		  this.wallpaperPosition(background)
+		}.bind(this)
+		img.src = this.background.src
+		img.complete && img.onload()
+	}
+	
+	Wall.prototype.wallpaperLoad = function(url){
+	  if (url !== "none") {
+	    url = "url(" + url + ")"
+	  }
 		this.mx.forEach(function(mx){
-      mx.el.style.backgroundImage = background
+      mx.el.style.backgroundImage = url
     })
 	}
 
-	Wall.prototype.wallpaperPosition = function(x, y, scale){
+	Wall.prototype.wallpaperPosition = function(background){
+	  if (this.background.src == "none") { return }
+	  this.background.x = background.x || this.background.x
+	  this.background.y = background.y || this.background.y
+	  this.background.scale = background.scale || this.background.scale || 1
+	  
 		var useX = this.side & FRONT_BACK
 		var shouldFlip = this.side & (LEFT | BACK)
 
-		this.mx.forEach(function(mx){
-      var partitionOffset = useX ? mx.x : mx.z
-      if (shouldFlip) partitionOffset *= -1
-      partitionOffset += mx.width/2
-      var floorOffset = mx.y + mx.height/2
+		var mx, dx, dy
+		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
+		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
 
-      mx.el.style.backgroundPosition = (~~partitionOffset) + "px " + (~~floorOffset) + "px"
-    })
+		this.surface.faces.forEach(function(face, i){
+      
+      if (shouldFlip) {
+        mx = this.mx[this.mx.length-1-i]
+        dx = Math.round( this.background.x + face.x.a )
+        dy = Math.round( this.background.y + face.y.b )
+      }
+      else {
+        mx = this.mx[i]
+        dx = Math.round( this.background.x - face.x.b )
+        dy = Math.round( this.background.y + face.y.b )
+      }
+      
+      mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
+      mx.el.style.backgroundSize = w + 'px ' + h + 'px'
+    }.bind(this))
+    bbb = this
 	}
 	
 
-- 
cgit v1.2.3-70-g09d2


From f5ab61241bf9519325a36b86ee74ab2df13a4331 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 14:43:45 -0400
Subject: colorpicker presets

---
 .../assets/javascripts/rectangles/models/wall.js   |  2 --
 .../assets/javascripts/ui/editor/LightControl.js   | 33 ++++++++++++++++++++++
 public/assets/javascripts/ui/reader/MediaPlayer.js |  4 +--
 public/assets/stylesheets/app.css                  |  8 ++++--
 views/controls/editor/light-control.ejs            | 10 +++----
 5 files changed, 46 insertions(+), 11 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 93e1f42..820fb5f 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -230,8 +230,6 @@
 		this.background = background
 		this.background.src = this.background.src.replace("url(","").replace(")","")
 
-		console.log(background)
-
 		if (this.background.src == "none") {
 		  this.wallpaperLoad(this.background.src)
 		  return
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 3eb2861..2b7cfaa 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -10,6 +10,7 @@ var LightControl = View.extend({
     "input #brightness-control": "updateBrightness",
     "input #outline-hue": "updateShadow",
     "input #wall-hue": "updateShadow",
+    "click .presets span": "selectPreset",
   },
   
   initialize: function(){
@@ -114,6 +115,38 @@ var LightControl = View.extend({
     this.setMode(mode)
   },
   
+  presets: {
+    wireframe: {
+      wall: [255,255,255],
+      outline: [0,0,0],
+      floor: [246,246,246],
+      ceiling: [255,255,255],
+    },
+    shaded: {
+      wall: [205,205,204],
+      outline: [0,0,0],
+      floor: [109,116,106],
+      ceiling: [159,163,157],
+    },
+    pfunk: {
+      wall: [255,63,78],
+      outline: [255,246,0],
+      floor: [255,255,0],
+      ceiling: [225,118,252],
+    },
+    seapunk: {
+      wall: [110,255,255],
+      outline: [146,133,255],
+      floor: [89,221,255],
+      ceiling: [139,255,173],
+    },
+  },
+  selectPreset: function(e){
+    var preset = $(e.currentTarget).data('preset')
+    if (! this.presets[preset]) return
+    this.load(this.presets[preset])
+  },
+  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index df2d075..6195ab6 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -53,8 +53,8 @@ var MediaPlayer = FormView.extend({
 		this.bind(scenery)
 		this.$el.addClass("active")
 		
-		this.$name.html(media.title)
-		this.$description.html(media.description)
+		this.$name.html( sanitize(media.title) )
+		this.$description.html( marked(media.description) )
 		
 		switch (media.type) {
 			case "image":
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index eb3bd87..15f29c3 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1475,13 +1475,17 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
-.color-swatches.defaults {
+.presets {
 	margin-top: 10px;
 }
 
-.color-swatches.defaults span{
+.presets span {
 	font-size:12px;
 	font-weight:500;
+	display: inline-block;
+	width: 50%;
+	float:left;
+	cursor:pointer;
 }
 .color-swatches span {
 	display: inline-block;
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index fdf95a7..1fc4484 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -23,17 +23,17 @@
   </div>
 
   <h4>Preset Styles</h4>
-  <div class="color-swatches defaults">
-    <span>
+  <div class="presets">
+    <span data-preset="wireframe">
       Wireframe
     </span>
-    <span>
+    <span data-preset="shaded">
       Shaded
     </span>
-    <span>
+    <span data-preset="pfunk">
       P.Funk
     </span>
-    <span>
+    <span data-preset="seapunk">
       SeaPunk
     </span>
   </div>
-- 
cgit v1.2.3-70-g09d2


From 816c603b03f037fecde9168daccaa5bd344d4c0d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 16:37:26 -0400
Subject: nomenclature for addressing floors, ceilings

---
 .../javascripts/rectangles/engine/rooms/_walls.js  |  11 ++
 .../javascripts/rectangles/engine/rooms/clipper.js |   2 +-
 .../javascripts/rectangles/engine/rooms/grouper.js |  19 +++
 .../assets/javascripts/rectangles/models/floor.js  | 146 +++++++++++++++++++++
 .../assets/javascripts/rectangles/models/room.js   |   2 +-
 .../assets/javascripts/rectangles/models/wall.js   |   6 +-
 .../javascripts/rectangles/util/constants.js       |   3 +-
 public/assets/javascripts/ui/editor/TextEditor.js  |   5 +-
 views/partials/scripts.ejs                         |   1 +
 9 files changed, 186 insertions(+), 9 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/models/floor.js

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f0cd558..b3611c8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -35,6 +35,7 @@
 		var base = this
 		
 		base.list = []
+		base.floors = []
 		base.lookup = {}
 		base.colors = {}
 
@@ -57,11 +58,21 @@
 		    base.lookup[wall.id] = wall
 		  })
 		}
+
+		base.assignFloors = function(floors){
+		  base.floors = floors
+		  floors.forEach(function(floor){
+		    base.lookup[floor.id] = floor
+		  })
+		}
 		
 		base.bind = function(){
 			base.list.forEach(function(wall){
 				wall.bind()
 			})
+			base.floors.forEach(function(floor){
+			  floor.bind()
+			})
 		}
 
 		base.count = function(){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
index 33e3a84..0382758 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
@@ -49,7 +49,7 @@
 				Rooms.regions = regions = []
 				return
 			}
-		
+		  
 			base.reset_rects()
 			base.clip_rects()
 			var culled = base.cull_rects_iterative()
diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index 663d29d..ec776a2 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -48,13 +48,16 @@
 		
 		base.build = function (){
 			var walls = []
+			var floors = []
 			var collections = base.collect()
 			base.cull(collections)
 			base.group(walls, collections, FRONT)
 			base.group(walls, collections, BACK)
 			base.group(walls, collections, LEFT)
 			base.group(walls, collections, RIGHT)
+			base.groupFloors(floors, collections)
 			Walls.assign( walls )
+			Walls.assignFloors( floors )
 			Walls.bind()
 		}
 		base.collect = function(){			
@@ -63,12 +66,16 @@
 			collections[BACK] = []
 			collections[LEFT] = []
 			collections[RIGHT] = []
+			collections[FLOOR] = []
+			collections[CEILING] = []
 			
 			Rooms.forEach(function(room){
 				room.mx_walls.forEach(function(mx){
 					var side = mx.side || mx.half_side
 					collections[side].push(mx)
 				})
+				collections[FLOOR] = collections[FLOOR].concat( room.mx_floor )
+				collections[CEILING] = collections[CEILING].concat( room.mx_ceiling )
 			})
 			
 			base.cull(collections)
@@ -161,6 +168,18 @@
       
 			return walls
 		}
+		base.groupFloors = function(floors, collections){
+		  var floor = new Floor ({
+		    id: 'floor',
+		    mx: collections[FLOOR]
+		  })
+		  var ceiling = new Floor ({
+		    id: 'ceiling',
+		    mx: collections[CEILING]
+		  })
+		  floors.push(floor)
+		  floors.push(ceiling)
+		}
 
 	}
 
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
new file mode 100644
index 0000000..ee264c7
--- /dev/null
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -0,0 +1,146 @@
+(function(){
+
+	var vec2, Rect, sort
+	if ('window' in this) {
+		vec2 = window.vec2
+		Rect = window.Rect
+		sort = window.sort
+	}
+	else {
+		vec2 = require('./vec2')
+		Rect = require('./rect')
+		UidGenerator = require('../util/uid')
+	}
+	
+	var Floor = function(opt){
+		this.id = opt.id
+		this.side = opt.side
+		this.mx = opt.mx
+	}
+	
+	Floor.prototype.serialize = function(){
+	  return {
+	    id: this.id,
+	    background: this.background,
+	  }
+	}
+	
+	Floor.prototype.deserialize = function(data){
+	  this.wallpaper( data.background )
+	}
+
+	Floor.prototype.bind = function(){
+		var base = this
+		base.$els = $( this.mx.map(function(mx){ return mx.el }) )
+		console.log("HELLO")
+		this.mx.forEach(function(mx, index){
+			$(mx.el).bind({
+				mousedown: function(e){
+				  console.log("clicked on", base.id)
+					if (Scenery.nextWallpaper) {
+					  var oldState = base.serialize()
+						base.wallpaper(Scenery.nextWallpaper)
+						Scenery.nextWallpaper = null
+
+  					UndoStack.push({
+  					  type: 'update-wallpaper',
+  					  undo: oldState,
+              redo: base.serialize(),
+  					})
+
+            // TODO: watch individual scenery object here
+            Minotaur.watch( app.router.editorView.settings )
+          }
+				}
+			})
+		})
+
+    // flip the mx order
+		var shouldFlip = this.side & (CEILING)
+		if (! shouldFlip) {
+			this.mx.reverse()
+		}
+	}
+
+	Floor.prototype.color = function(color){
+		this.$els.css("background-color", color)
+	}
+	
+	Floor.prototype.wallpaper = function(background){
+	  if (! background) {
+	    background = { src: "none" }
+	  }
+	  else if (typeof background == "string") {
+	    background = { src: background }
+	  }
+	  else if (! background.src) {
+	    background = { src: "none" }
+	  }
+    background.x = background.x || 0
+    background.y = background.y || 0
+    background.scale = background.scale || 1
+
+		this.background = background
+		this.background.src = this.background.src.replace("url(","").replace(")","")
+
+		if (this.background.src == "none") {
+		  this.wallpaperLoad(this.background.src)
+		  return
+		}
+		
+		var img = new Image ()
+		img.onload = function(){
+		  this.backgroundImage = img
+		  this.wallpaperLoad(this.background.src)
+		  this.wallpaperPosition(background)
+		}.bind(this)
+		img.src = this.background.src
+		img.complete && img.onload()
+	}
+	
+	Floor.prototype.wallpaperLoad = function(url){
+	  if (url !== "none") {
+	    url = "url(" + url + ")"
+	  }
+		this.mx.forEach(function(mx){
+      mx.el.style.backgroundImage = url
+    })
+	}
+
+	Floor.prototype.wallpaperPosition = function(background){
+	  if (this.background.src == "none") { return }
+	  this.background.x = background.x || this.background.x
+	  this.background.y = background.y || this.background.y
+	  this.background.scale = background.scale || this.background.scale || 1
+	  
+		var shouldFlip = this.side & (CEILING)
+
+		var mx, dx, dy
+		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
+		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
+
+		this.surface.faces.forEach(function(face, i){
+      
+      if (shouldFlip) {
+        mx = this.mx[this.mx.length-1-i]
+        dx = Math.round( this.background.x + face.x.a )
+        dy = Math.round( this.background.y + face.y.b )
+      }
+      else {
+        mx = this.mx[i]
+        dx = Math.round( this.background.x - face.x.b )
+        dy = Math.round( this.background.y + face.y.b )
+      }
+      
+      mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
+      mx.el.style.backgroundSize = w + 'px ' + h + 'px'
+    }.bind(this))
+	}
+
+	if ('window' in this) {
+		window.Floor = Floor
+	}
+	else {
+		module.exports = Floor
+	}
+})()
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 0f09325..1a4606c 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -154,7 +154,7 @@
 			}
 //    if (bitcount(wall_collision) > 1) {
 //  				collision |= wall_collision
-// 			}
+// 		}
 		})
 		return collision
 	}
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 820fb5f..8174de7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -19,7 +19,7 @@
 		this.side = opt.side
 		this.surface = opt.surface
 		this.mx = opt.mx
-		this.background = ""
+		this.background = { src: "none" }
 	}
 	
 	Wall.prototype.toString = function(){
@@ -127,8 +127,6 @@
 		if (! shouldFlip) {
 			this.mx.reverse()
 		}
-
-		// this.outline(wallColor, outlineColor)
 	}
 	
 	Wall.prototype.serialize = function(){
@@ -283,10 +281,8 @@
       mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
       mx.el.style.backgroundSize = w + 'px ' + h + 'px'
     }.bind(this))
-    bbb = this
 	}
 	
-
 	Wall.prototype.outline = function(wallColor, outlineColor){
 		var useX = this.side & FRONT_BACK
 		var mx = this.mx
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index 4c6b3cc..198cc41 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -1,5 +1,6 @@
 var FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
-		FRONT_BACK = FRONT | BACK, LEFT_RIGHT = LEFT | RIGHT, FLOOR_CEILING = FLOOR | CEILING
+var FRONT_BACK = FRONT | BACK, LEFT_RIGHT = LEFT | RIGHT, FLOOR_CEILING = FLOOR | CEILING
+var WALL_SIDES = FRONT | BACK | LEFT | RIGHT
 
 var TOP = CEILING, BOTTOM = FLOOR,
 		TOP_LEFT = TOP | LEFT,
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 1e35c12..0aa5aad 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -39,12 +39,15 @@ var TextEditor = FormView.extend({
         scale: 0.5,
         font: { family: 'Lato', size: 12, align: 'left' },
       }
-      
       this.createMode(true)
     }
+    else {
+      $("[data-role='toggle-text-editor']").removeClass("inuse")
+    }
   },
 
 	hide: function(scenery){
+	  Scenery.nextMedia = null
 		if (this.scenery) {
 			this.unbind()
 		}
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index f768160..21bed03 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -46,6 +46,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/room.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/models/floor.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 646b9a935b4fbcc7b0108a66fe7309a61c55d3c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 16:52:43 -0400
Subject: tiling wallpaper on ceiling / floor

---
 .../javascripts/rectangles/engine/rooms/grouper.js     |  2 ++
 public/assets/javascripts/rectangles/models/floor.js   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index ec776a2..890a476 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -171,10 +171,12 @@
 		base.groupFloors = function(floors, collections){
 		  var floor = new Floor ({
 		    id: 'floor',
+		    side: FLOOR,
 		    mx: collections[FLOOR]
 		  })
 		  var ceiling = new Floor ({
 		    id: 'ceiling',
+		    side: CEILING,
 		    mx: collections[CEILING]
 		  })
 		  floors.push(floor)
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index ee264c7..78e9019 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -32,11 +32,10 @@
 	Floor.prototype.bind = function(){
 		var base = this
 		base.$els = $( this.mx.map(function(mx){ return mx.el }) )
-		console.log("HELLO")
+
 		this.mx.forEach(function(mx, index){
 			$(mx.el).bind({
 				mousedown: function(e){
-				  console.log("clicked on", base.id)
 					if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
@@ -119,22 +118,23 @@
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
 		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
 
-		this.surface.faces.forEach(function(face, i){
+		this.mx.forEach(function(mx, i){
+      
+      var region = mx.rect
       
       if (shouldFlip) {
-        mx = this.mx[this.mx.length-1-i]
-        dx = Math.round( this.background.x + face.x.a )
-        dy = Math.round( this.background.y + face.y.b )
+        dx = Math.round( this.background.x - region.x.a )
+        dy = Math.round( this.background.y - region.y.a )
       }
       else {
-        mx = this.mx[i]
-        dx = Math.round( this.background.x - face.x.b )
-        dy = Math.round( this.background.y + face.y.b )
+        dx = Math.round( this.background.x - region.x.a )
+        dy = Math.round( this.background.y + region.y.b )
       }
       
       mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
       mx.el.style.backgroundSize = w + 'px ' + h + 'px'
     }.bind(this))
+    bbb = this
 	}
 
 	if ('window' in this) {
-- 
cgit v1.2.3-70-g09d2


From 8a0f5258f0d03cf121d6fde49c5c7731c2212154 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 17:03:37 -0400
Subject: storing floor/ceiling wallpaper

---
 .../assets/javascripts/rectangles/engine/rooms/_walls.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index b3611c8..7438cd4 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -80,16 +80,20 @@
 		}
 	
 		base.forEach = function(f){
-			return base.list.forEach(f)
+			return base.values().forEach(f)
 		}
 	
 		base.map = function(f){
-			return base.list.map(f)
+			return base.values().map(f)
+		}
+	
+		base.values = function(){
+			return _.values(base.lookup)
 		}
 		
 		base.serialize = function(){
 		  var data = []
-			base.list.forEach(function(wall){
+			base.forEach(function(wall){
 			  data.push(wall.serialize())
 			})
 			return data
@@ -108,7 +112,7 @@
       var outlineColor = rgb_string(Walls.colors.outline)
       var floorColor = rgb_string(Walls.colors.floor)
       var ceilingColor = rgb_string(Walls.colors.ceiling)
-      Walls.forEach(function(wall){
+      Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
       })
       Rooms.forEach(function(room){
@@ -122,7 +126,7 @@
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
         Walls.colors.wall = rgb
-        Walls.forEach(function(wall){
+        Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
         })
       },
@@ -130,7 +134,7 @@
       outline: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.outline = rgb
-        Walls.forEach(function(wall){
+        Walls.list.forEach(function(wall){
           wall.outline(null, rgbColor)
         })
       },
-- 
cgit v1.2.3-70-g09d2


From c60434bc4655d0e020ca75fc7c5fddf53ac58ede Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 18:29:08 -0400
Subject: invert logo if background is dark, match body bg to wall color

---
 .../rectangles/engine/map/ui_minimap.js            |  2 ++
 .../javascripts/rectangles/engine/rooms/_walls.js  |  9 +++++++++
 public/assets/stylesheets/app.css                  | 23 +++++++++++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index fabbdb9..d7280b9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -7,6 +7,7 @@ Map.UI.Minimap = function(map){
 
 	base.creating = base.dragging = base.resizing = false
 
+/*
 	base.mouse = new mouse({
 		el: map.el,
 		down: down,
@@ -15,6 +16,7 @@ Map.UI.Minimap = function(map){
 		up: up,
 		rightclick: rightclick,
 	})
+*/
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 7438cd4..5ff53fe 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -125,6 +125,15 @@
     
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
+        var rgbColor = rgb_string(rgb)
+        
+        var rgb_max = Math.max.apply(0, rgb)
+        var rgb_min = Math.min.apply(255, rgb)
+        var luminance = (rgb_max + rgb_min ) / 2
+
+        $("#header").toggleClass("black", luminance < 128)
+        $("body").css("background-color", rgbColor)
+        
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index cef90a9..b4d176f 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -71,6 +71,27 @@ a{
 	left: 0;
 	z-index: 6;
 }
+#header.black .logo:hover {
+  background: white;
+}
+#header.black .logo:hover path {
+  fill: black;
+}
+#header.black path {
+  fill: white;
+}
+#header.black .topLinks a {
+  color: white;
+}
+#header.black .topLinks a:hover {
+  color: black;
+  background-color: white;
+}
+#header.black a#help-button:hover {
+  background-color: transparent;
+  text-shadow: 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff;
+}
+
 #help-button {
   display: none;
 	border-right:0px!important;
@@ -1566,7 +1587,7 @@ input[type="range"]::-webkit-slider-thumb {
   bottom: 10px;
   right: 10px;
   font-size: 12px;
-  -webkit-transform: translateY(450px);
+  -webkit-transform: translateY(500px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateY(450px);
   transition: -webkit-transform 0.2s ease-in-out;
-- 
cgit v1.2.3-70-g09d2


From c2e2334328256fa0409341692284f25f3167ab30 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 7 Oct 2014 19:03:56 -0400
Subject: scale cil/floor wallapper

---
 public/assets/javascripts/rectangles/models/floor.js | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 78e9019..7ed52a1 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -49,6 +49,9 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+          }
+          else {
+            app.controller.pickWall(base, null)
           }
 				}
 			})
-- 
cgit v1.2.3-70-g09d2


From 1f66850f5ec5a2e664ee8eaafbe25c46dad34102 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 12:11:18 -0400
Subject: generate masks for thumbnails

---
 .../javascripts/rectangles/engine/map/draw.js      | 64 ++++++++++++++--------
 .../javascripts/rectangles/engine/rooms/_walls.js  |  4 ++
 .../assets/javascripts/rectangles/models/wall.js   |  2 +-
 .../javascripts/ui/builder/BuilderSettings.js      |  4 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  4 +-
 .../javascripts/ui/editor/WallpaperPicker.js       |  7 +--
 6 files changed, 54 insertions(+), 31 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 3e185d2..07e2d9f 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -10,7 +10,7 @@ Map.Draw = function(map, opt){
 	draw.animate = function(){
 		ctx.save()
 		draw.clear()
-		// draw.ruler()
+		draw.fill("rgba(255,255,255,0.98)")
 
 		if (opt.minimap) {
 			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
@@ -19,7 +19,7 @@ Map.Draw = function(map, opt){
 			ctx.scale( -1, 1 )
 
 			draw.coords()
-			draw.regions(Rooms.regions, [ "#fff" ])
+			draw.regions(Rooms.regions, [ "#fff" ], "#000")
 			draw.camera(scene.camera)
 		}
 		
@@ -29,7 +29,7 @@ Map.Draw = function(map, opt){
 			ctx.translate( map.center.a,  map.center.b )
 			ctx.scale( -1, 1 )
 
-			draw.regions(Rooms.regions, [ "#f8f8f8" ])
+			draw.regions(Rooms.regions, [ "#f8f8f8" ], "#000")
 			draw.mouse(map.ui.mouse.cursor)
 			draw.coords()
 			scene && draw.camera(scene.camera)
@@ -39,7 +39,12 @@ Map.Draw = function(map, opt){
 	}
 
 	draw.render = function(){
-		ctx.save()
+		// change the ctx temporarily
+		var canvas = document.createElement("canvas")
+		ctx = canvas.getContext('2d')
+		canvas.width = map.canvas.width
+		canvas.height = map.canvas.height
+		
 		draw.clear()
 
 		ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
@@ -47,37 +52,52 @@ Map.Draw = function(map, opt){
 		ctx.translate( map.center.a,  map.center.b )
 		ctx.scale( -1, 1 )
 
-		draw.regions(Rooms.regions, ["#fff"])
-		draw.mouse(map.ui.mouse.cursor)
-		scene && draw.camera(scene.camera)
-
+		draw.regions(Rooms.regions, ["#fff"], null)
+		
 		ctx.restore()
+		
+		// invert opacity
+		var pixelData = ctx.getImageData(0, 0, canvas.width, canvas.height)
+		var pixels = pixelData.data
+		for (var i = 0, k, _len = pixels.length; i < _len; i++) {
+		  k = i*4
+		  if (pixels[k+3] == 0) {
+		    pixels[k] = pixels[k+1] = pixels[k+2] = pixels[k+3] = 255
+		  }
+		  else {
+		    pixels[k] = pixels[k+1] = pixels[k+2] = 255
+		    pixels[k+3] = 0
+		  }
+		}
+		ctx.putImageData(pixelData, 0, 0)
+
+		// reset the ctx
+		ctx = map.canvas.getContext("2d")
+		
+		return canvas
 	}
 
 	draw.clear = function(){
-		ctx.fillStyle = "rgba(255,255,255,0.98)"
 		ctx.clearRect(0, 0, map.dimensions.a, map.dimensions.b)
-		ctx.fillRect(0, 0, map.dimensions.a, map.dimensions.b)
 	}
 
-	draw.ruler = function (){
-		ctx.strokeStyle = "rgba(80,80,80,0.5)"
-		ctx.lineWidth = 1
-		var len = 5
-		for (var i = 0.5; i < map.dimensions.a; i += 10) {
-			line(i, 0, i, len)
-			line(0, i, len, i)
-		}
+	draw.fill = function(fillStyle){
+		ctx.fillStyle = fillStyle
+		ctx.fillRect(0, 0, map.dimensions.a, map.dimensions.b)
 	}
 
-	draw.regions = function(regions, colors){
+	draw.regions = function(regions, colors, stroke){
+	  if (stroke) {
+			ctx.strokeStyle = "#000"
+			ctx.lineWidth = (1 / map.zoom)
+		}
 		for (var i = 0; i < regions.length; i++) {
 			if (regions[i].dupe) continue
 			ctx.fillStyle = colors[i % colors.length]
-			ctx.strokeStyle = "#000"
-			ctx.lineWidth = (1 / map.zoom)
 			fill_region(regions[i])
-			stroke_sides(regions[i])
+      if (stroke) {
+        stroke_sides(regions[i])
+      }
 		}
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 5ff53fe..71ddde9 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -103,6 +103,10 @@
 			walls_data.forEach(function(wall_data){
 			  if (! wall_data) { return }
 			  var wall = base.lookup[ wall_data.id ]
+			  if (! wall) {
+			    console.log(wall_data);
+			    return
+			  }
 			  wall.deserialize( wall_data )
 			})
     },
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 8174de7..fcb2f5e 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -13,7 +13,7 @@
 	}
 	
 	var Wall = function(opt){
-		this.id = [ opt.side, opt.edge, opt.vec.a ].join("_")
+		this.id = [ opt.side|0, opt.edge|0, opt.vec.a|0 ].join("_")
 		this.vec = opt.vec
 		this.edge = opt.edge
 		this.side = opt.side
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 94eed29..99bceed 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -107,7 +107,7 @@ var BuilderSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		map.draw.render()
+		var thumbnail = map.canvas.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
@@ -115,7 +115,7 @@ var BuilderSettings = FormView.extend({
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
-		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
 		return fd
 	},
 
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index fd251b7..0c08369 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -146,7 +146,6 @@ var EditorSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		map.draw.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
@@ -160,7 +159,8 @@ var EditorSettings = FormView.extend({
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		
 		if (this.thumbnailIsStale()) {
-      fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
+      var thumbnail = map.draw.render()
+      fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
     }
 		return fd
 	},
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 140076d..6bf2542 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -133,7 +133,7 @@ var WallpaperPicker = UploadView.extend({
 	
 	wall: null,
 	pickWall: function(wall){
-    if (wall.background.src == "none") {
+    if (! wall.background || wall.background.src == "none") {
       return;
     }
     this.wall = wall
@@ -148,16 +148,16 @@ var WallpaperPicker = UploadView.extend({
 	
 	initializePositionCursor: function(){
 	  var base = this
-	  var dx = 0, dy = 0, dragging = false
+	  var dx = 0, dy = 0, dragging = false, delta
 	  var x = 0, y = 0, s = 1
     var mymouse = new mouse({
       el: this.$position[0],
       down: function(e, cursor){
         if (! base.wall) return
+        dragging = true
         s = parseFloat( base.$scale.val() )
         x = base.wall.background.x
         y = base.wall.background.y
-        dragging = true
       },
       drag: function(e, cursor){
         if (! dragging) return
@@ -172,7 +172,6 @@ var WallpaperPicker = UploadView.extend({
         })
       },
       up: function(e, cursor, new_cursor){
-        delta.zero()
         dragging = false
       },
     })
-- 
cgit v1.2.3-70-g09d2


From 6f4cd32fa13efe3b0e8b26183589f66889dd3738 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 13:26:08 -0400
Subject: render thumbnails as masks

---
 .../javascripts/rectangles/engine/map/draw.js      | 20 ++++++++++++-------
 .../javascripts/rectangles/engine/rooms/_rooms.js  | 10 ++++++++++
 .../assets/javascripts/rectangles/models/rect.js   | 23 ++++++++++++++++++++++
 .../javascripts/ui/builder/BuilderSettings.js      |  2 +-
 public/assets/stylesheets/app.css                  | 11 +++++------
 5 files changed, 52 insertions(+), 14 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 07e2d9f..6c27ff1 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -38,18 +38,24 @@ Map.Draw = function(map, opt){
 		ctx.restore()
 	}
 
+  // changes the ctx temporarily
 	draw.render = function(){
-		// change the ctx temporarily
+		var thumbnail_side = 1000
+		
+		var extent = Rooms.extent()
+		var center = extent.center()
+		var zoom = thumbnail_side / Math.max( extent.width(), extent.height() ) * 0.99
+
 		var canvas = document.createElement("canvas")
 		ctx = canvas.getContext('2d')
-		canvas.width = map.canvas.width
-		canvas.height = map.canvas.height
+		canvas.width = thumbnail_side
+		canvas.height = thumbnail_side
 		
 		draw.clear()
 
-		ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
-		ctx.scale( map.zoom, map.zoom )
-		ctx.translate( map.center.a,  map.center.b )
+		ctx.translate( thumbnail_side * 1/2, thumbnail_side * 1/2)
+		ctx.scale( zoom, zoom )
+		ctx.translate( center.a, -center.b )
 		ctx.scale( -1, 1 )
 
 		draw.regions(Rooms.regions, ["#fff"], null)
@@ -73,7 +79,7 @@ Map.Draw = function(map, opt){
 
 		// reset the ctx
 		ctx = map.canvas.getContext("2d")
-		
+
 		return canvas
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 6f96275..0c3cfd4 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -118,6 +118,16 @@
       return data
 		}
 
+    base.extent = function(){
+      var extent = new Rect ( new vec2(Infinity, -Infinity), new vec2(Infinity, -Infinity) )
+
+      base.forEach(function(room){
+        extent.expand(room.rect)
+      })
+    
+      return extent
+    }
+
 		base.sorted_by_position = function(){
 			return sort.rooms_by_position( base.values() )
 		}
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index a08176a..00f2c55 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -141,6 +141,29 @@
 	Rect.prototype.width = function(){ return this.x.length() }
 	Rect.prototype.height = function(){ return this.y.length() }
 	Rect.prototype.delta = function(){ return new vec2( this.x.magnitude(), this.y.magnitude() ) }
+	Rect.prototype.expand = function(rect){
+	  this.x.a = Math.min( this.x.a, rect.x.a )
+	  this.x.b = Math.max( this.x.b, rect.x.b )
+	  this.y.a = Math.min( this.y.a, rect.y.a )
+	  this.y.b = Math.max( this.y.b, rect.y.b )
+	  return this
+	}
+	Rect.prototype.square = function(){
+	  var width = this.x.length()
+	  var height = this.y.length()
+	  var diff
+	  if (width < height) {
+	    diff = (height - width) / 2
+	    this.x.a -= diff
+	    this.x.b += diff
+	  }
+	  else {
+	    diff = (width - height) / 2
+	    this.y.a -= diff
+	    this.y.b += diff
+	  }
+	  return this
+	}
 	Rect.prototype.toString = function(){
 		var sides = sidesToString(this.sides)
 		var s = "[" + this.x.toString() + " " + this.y.toString() + "] " + sides
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 99bceed..7ae6294 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -107,7 +107,7 @@ var BuilderSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		var thumbnail = map.canvas.render()
+		var thumbnail = map.draw.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6e23962..d47b5a7 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -619,16 +619,16 @@ iframe.embed {
 	display: none;
 }
 
-.templates span{
+.templates span {
   background-position: center;
   background-size: contain;
   background-repeat: no-repeat;
   background-color: #fff;
   width: 20vw;
-  height: 20vh;
+  height: 20vw;
   display: inline-block;
   margin: 4vw;
-  border:1px solid black;
+  background-color: #ddd;
   position: relative;
 }
 
@@ -640,17 +640,16 @@ iframe.embed {
 	left: 0;
 	background: #fff;
 	padding: 5px;
-	border-top: 1px solid black;
 	font-weight: 300;
 }
 
 .templates span:hover {
-  border:1px solid blue;
+  background-color: #f00;
   cursor:pointer;
 }
 
 .templates span:hover:after {
-	border-top: 1px solid blue;
+  color: #f00;
 }
 
 .templates h1 {
-- 
cgit v1.2.3-70-g09d2


From 583d213f22be93a1363c24ac2cdf9f083833703f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 14:47:47 -0400
Subject: projectList item formatting

---
 .../javascripts/rectangles/engine/map/draw.js      | 19 ++++--
 .../javascripts/rectangles/engine/rooms/_rooms.js  |  2 -
 public/assets/stylesheets/app.css                  | 77 +++++++++++++++-------
 server/lib/views/index.js                          |  5 ++
 views/projects/list-projects.ejs                   | 34 +++++-----
 5 files changed, 88 insertions(+), 49 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 6c27ff1..7eb6e7c 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -40,20 +40,29 @@ Map.Draw = function(map, opt){
 
   // changes the ctx temporarily
 	draw.render = function(){
-		var thumbnail_side = 1000
+		var thumbnail_width = 1000
+		var thumbnail_height = 750
 		
 		var extent = Rooms.extent()
 		var center = extent.center()
-		var zoom = thumbnail_side / Math.max( extent.width(), extent.height() ) * 0.99
+		var extent_width = extent.width()
+		var extent_height = extent.height() 
+		var zoom
+		if (extent_width > extent_height) {
+      zoom = thumbnail_width / extent.width() * 0.9
+		}
+		else {
+      zoom = thumbnail_height / extent.height() * 0.9
+		}
 
 		var canvas = document.createElement("canvas")
 		ctx = canvas.getContext('2d')
-		canvas.width = thumbnail_side
-		canvas.height = thumbnail_side
+		canvas.width = thumbnail_width
+		canvas.height = thumbnail_height
 		
 		draw.clear()
 
-		ctx.translate( thumbnail_side * 1/2, thumbnail_side * 1/2)
+		ctx.translate( thumbnail_width * 1/2, thumbnail_height * 1/2)
 		ctx.scale( zoom, zoom )
 		ctx.translate( center.a, -center.b )
 		ctx.scale( -1, 1 )
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 0c3cfd4..3603f0c 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -120,11 +120,9 @@
 
     base.extent = function(){
       var extent = new Rect ( new vec2(Infinity, -Infinity), new vec2(Infinity, -Infinity) )
-
       base.forEach(function(room){
         extent.expand(room.rect)
       })
-    
       return extent
     }
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d47b5a7..24ca772 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -327,27 +327,42 @@ iframe.embed {
 .projectList {
 	display: inline-block;
 	float: left;
-	width: 100%;
+	width: 98vw;
+	margin: 2vw;
 }
 
+.projectList a {
+	width: 32vw;
+	float:left;
+	clear: right;
+	padding-bottom: 2vw;
+}
 .projectList .room {
-  width: 50%;
-	height:40vh;
+	width: 30vw;
+	height: 23vw;
+	margin: 1vw;
+	border: 1vw solid white;
 	display:table;
 	position: relative;
-	float:left;
-	border-top:1px solid;
+  z-index: 1;
 }
-
-.projectList .room:nth-child(3n+2) {
-	border-right:1px solid black;
+.projectList .holder {
+  position: absolute;
+  top: 50%;
+  z-index: 2;
 }
 
-.projectList .room:nth-child(3n+1) {
-	width: 100%;
-	height: 50vh;
+.room .mask {
+  position: absolute;
+  top: 0; left: 0;
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  overflow: hidden;
+  background-size: cover;
+  background-repeat: no-repeat;
 }
-
 .room .images {
   position: absolute;
   top: 0; left: 0;
@@ -358,15 +373,28 @@ iframe.embed {
   overflow: hidden;
 }
 .room .images img {
-  max-height: 100%;
-  max-width: 100%;
+  width: 50%;
+  position: absolute;
 }
 
+.room .images[data-mediacount='1'] img:nth-child(1) { left: 20%; top: 20%; }
+
+.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 100%; }
+.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 0%; width: auto; height: 100%; }
+
+.room .images[data-mediacount='3'] img:nth-child(1) { right: 51%; bottom: 41%; }
+.room .images[data-mediacount='3'] img:nth-child(2) { left: 51%; bottom: 0%; width:auto; height:100%;}
+.room .images[data-mediacount='3'] img:nth-child(3) { right: 51%; top: 61%; }
+
+.room .images[data-mediacount='4'] img:nth-child(1) { right: 51%; bottom: 41%; }
+.room .images[data-mediacount='4'] img:nth-child(2) { left: 51%; bottom: 61%; }
+.room .images[data-mediacount='4'] img:nth-child(3) { right: 51%; top: 61%; }
+.room .images[data-mediacount='4'] img:nth-child(4) { left: 51%; top: 41%; }
+
 .page .btn {
 	clear: both;
 	padding: 30px 0;
 	border: 0;
-
 }
 
 .page .viewMore {
@@ -385,22 +413,21 @@ iframe.embed {
 	vertical-align: middle;
 }
 
-.page .room .holder a {
-  font-weight: 300;
-  font-size: 20px;
-  letter-spacing: 1px;
+.page label {
+  font-weight: 500;
+  font-size: 15px;
   color: black;
-  background: white;
-  border: 1px solid;
   padding: 5px;
-  box-shadow: -3px 3px black;
   text-decoration:none;
-  max-width: 180px;
   display: inline-block;
+  cursor: pointer;
 }
 
-.page .room .holder a:hover {
-  background:black;
+.projectList a:hover {
+  background: linear-gradient( 0deg, blue, red );
+}
+
+.projectList a:hover label {
   color:white;
 }
 
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index ca48159..3f3880f 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -139,6 +139,11 @@ views.profile = function (req, res) {
 			projects = projects.map(function(project){
 				project = project.toObject()
 				project.date = moment(project.updated_at).format("M/DD/YYYY")
+				if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+				  project.color = [238,238,238]
+				} else {
+				  project.color = project.colors.wall
+				}
 				return project
 			})
 			done(err, user, projects)
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index a12f237..f469f5c 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -4,31 +4,31 @@
 
 		[[ projects.forEach(function(project, i) { ]]
 
-			<span class="room">
-        <span class="images">
-          <img src="[[- project.photo ]]">
+      [[ if (String(user._id) == String(project.user_id)) { ]]
+      <a href="/project/[[- project.slug ]]/edit">
+      [[ } else { ]]
+      <a href="/project/[[- project.slug ]]" class="roomName">
+      [[ } ]]
+
+			<span class="room" style="background-color: rgb([[- project.color ]]);">
+        <span class="images" data-mediaCount="[[- Math.min(project.media.length, 1) ]]">
           [[ mediaCount = 0 ]]
           [[ project.media.some(function(media){ ]]
             [[ if (media.media.type != "image") { return false } ]]
-            [[ if (++mediaCount > 3) { return true } ]]
+            [[ if (++mediaCount > 1) { return true } ]]
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
-
-				<div class="holder">
-			 	 [[ if (String(user._id) == String(project.user_id)) { ]]
-         <a href="/project/[[- project.slug ]]/edit">
-					 [[- project.name ]]<br>
-				 	 [[- project.date ]]
-				 </a>
-				 [[ } else  { ]]
-					<a href="/project/[[- project.slug ]]" class="roomName">
-						[[- project.name ]]<br>
-						[[- project.date ]]
-					[[ } ]]
-				</div>
+        <span class="mask" style="background-image: url([[- project.photo ]]);">
+        </span>
 			</span>
 
+      <label>
+        [[- project.name ]]<br>
+        Created &ndash; [[- project.date ]]
+      </label>
+
+      </a>
 		[[ }) ]]
 	</div>
 
-- 
cgit v1.2.3-70-g09d2


From 68d5c2cb1097ddd74eee9e20d5fe3aeb42802697 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 16:25:52 -0400
Subject: alt-click in builder to remove regions

---
 public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 f9334e6..02218ed 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -50,7 +50,7 @@ Map.UI.Editor = function(map){
 			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
 
-		if (intersects.length && base.permissions.destroy) {
+		if (intersects.length && (base.permissions.destroy || e.altKey)) {
 			base.mouse.down = false
 			
 			room = intersects[0]
-- 
cgit v1.2.3-70-g09d2


From 0ec3787487db41dd5f5b904b70f61fac3b7da491 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 9 Oct 2014 23:16:50 -0400
Subject: some css, set bg to white when noclipping into void

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js |  2 +-
 public/assets/javascripts/rectangles/engine/rooms/mover.js  | 13 ++++---------
 public/assets/stylesheets/app.css                           |  3 +++
 public/assets/stylesheets/staff.css                         |  9 ++++++---
 server/lib/views/index.js                                   |  4 ++--
 views/docs.ejs                                              |  2 --
 views/home.ejs                                              |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 71ddde9..7ff472d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -137,7 +137,7 @@
 
         $("#header").toggleClass("black", luminance < 128)
         $("body").css("background-color", rgbColor)
-        
+                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5c7b4af..98f80c5 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -21,13 +21,6 @@ Rooms.mover = new function(){
 	base.update = function(pos){
 		var radius = scene.camera.radius
 		
-		if (base.noclip) {
-			cam.x = pos.x
-			cam.y = pos.y
-			cam.z = pos.z
-			return
-		}
-		
 		cam.y = pos.y
 
 		// if we were in a room already..
@@ -42,14 +35,15 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
 
-			if (collision) {
+			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
 
 			// in this case, we appear to have left the room..
-			$(".face.active").removeClass("active")
+			// $(".face.active").removeClass("active")
+			$("body").css("background-color", "transparent")
 			base.room = null
 		}
 
@@ -65,6 +59,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6aab60c..a15ea39 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,9 @@ iframe.embed {
 	width: 100%;
 	border-top: 1px solid;
 }
+.page h1:nth-child(2) {
+	margin-top: 40px;
+}
 
 .page p {
 	margin: 20px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index aa21f9b..c75a9b1 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -28,15 +28,16 @@ nav {
   text-align: left;
 }
 nav a {
-  padding-left: 20px;
+  margin-left: 20px;
 }
 hr {
   border: 1px solid #bbb;
-  margin: 5px auto 10px;
+  margin: 10px auto 10px;
+  background: transparent;
 }
 .body {
   width: 80%;
-  margin: 0 auto;
+  margin: 40px auto;
 }
 .json {
   display: none;
@@ -63,6 +64,8 @@ hr {
 .staff {
   font-size: 15px;
 }
+.staff .body a {
+}
 .staff .editLinks a {
   color: #00f;
 }
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 1b547ef..fe2c988 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -86,7 +86,7 @@ views.home = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
@@ -151,7 +151,7 @@ views.profile = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
diff --git a/views/docs.ejs b/views/docs.ejs
index 5662133..665190d 100644
--- a/views/docs.ejs
+++ b/views/docs.ejs
@@ -8,8 +8,6 @@
 <div class="rapper page docs">
 	[[ include partials/header ]]
 
-	<br clear="all">
-	
 	[[ if (! isNew) { ]]
 		<h1>[[- doc.displayName ]]</h1>
 
diff --git a/views/home.ejs b/views/home.ejs
index e02ab0c..16b00e7 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -10,7 +10,7 @@
 	</script>
 </head>
 <body class="loading">
-	<div class="rapper page">
+	<div class="rapper page home">
 	[[ include partials/header ]]
 
 	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
-- 
cgit v1.2.3-70-g09d2


From 43b34606dcdc7996e8069998b2ff7d9f40c4dc25 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 19:18:48 -0400
Subject: disable room movement when clicking in things with .vvbox class

---
 public/assets/javascripts/rectangles/models/surface.js  | 2 +-
 public/assets/javascripts/ui/builder/BuilderInfo.js     | 1 +
 public/assets/javascripts/ui/builder/BuilderSettings.js | 1 +
 public/assets/javascripts/ui/builder/BuilderToolbar.js  | 1 +
 public/assets/javascripts/ui/editor/Collaborators.js    | 1 +
 public/assets/javascripts/ui/editor/EditorSettings.js   | 1 +
 public/assets/javascripts/ui/editor/MediaUpload.js      | 1 +
 public/assets/javascripts/ui/editor/MediaViewer.js      | 1 +
 public/assets/javascripts/ui/editor/TextEditor.js       | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index c85682a..3a6c449 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -108,7 +108,7 @@
 		this.clamp_delta( this.bounds, dimension, position, delta )
 
 		var new_delta = delta.clone()
-		if (this.clamp_delta(old_bounds, dimension, position, new_delta).eq(delta)) {
+		if (old_bounds && this.clamp_delta(old_bounds, dimension, position, new_delta).eq(delta)) {
 			return old_bounds
 		}
 
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index e6b7e97..f7753a3 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -3,6 +3,7 @@ var BuilderInfo = View.extend({
 	el: "#builderInfo",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"change [name=x]": 'changeX',
 		"change [name=y]": 'changeY',
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 7ae6294..fe67e9b 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -7,6 +7,7 @@ var BuilderSettings = FormView.extend({
 	destroyAction: "/api/layout/destroy",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'clickSave',
diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js
index 2eb7590..6c218be 100644
--- a/public/assets/javascripts/ui/builder/BuilderToolbar.js
+++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js
@@ -3,6 +3,7 @@ var BuilderToolbar = View.extend({
 	el: "#builderToolbar",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-layout-settings']": 'toggleSettings',
 		"click [data-role='undo']": 'undo',
diff --git a/public/assets/javascripts/ui/editor/Collaborators.js b/public/assets/javascripts/ui/editor/Collaborators.js
index 452ad15..b57510d 100644
--- a/public/assets/javascripts/ui/editor/Collaborators.js
+++ b/public/assets/javascripts/ui/editor/Collaborators.js
@@ -9,6 +9,7 @@ var Collaborators = ModalFormView.extend({
 	destroyAction: function(){ return "/api/collaborator/" + this.parent.data.slug + "/destroy" },
 	
 	events: {
+	  "mousedown": "stopPropagation",
 	  "keydown [name=email]": "enterSubmit",
 	  "click [data-role=destroy-collaborator]": "destroy",
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 0c08369..45a2e43 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -7,6 +7,7 @@ var EditorSettings = FormView.extend({
 	destroyAction: "/api/project/destroy",
   
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='show-collaborators']": 'showCollaborators',
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index bab4679..fddfefc 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -6,6 +6,7 @@ var MediaUpload = UploadView.extend({
 	uploadAction: "/api/media/upload",
 	
 	events: {
+    'mousedown': "stopPropagation",
 		"keydown .url": "enterSubmit",
 	},
 	
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 1414e16..c18fb49 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -6,6 +6,7 @@ var MediaViewer = ModalView.extend({
 	loaded: false,
 	
 	events: {
+	  'mousedown': "stopPropagation",
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0aa5aad..c8879b3 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -92,6 +92,7 @@ var TextEditor = FormView.extend({
 			this.unbind()
 		}
 
+    this.parent.settings.hide()
 		Scenery.resize.show(scenery)
 		Scenery.hovering = true
 		
-- 
cgit v1.2.3-70-g09d2


From 86153d1221e38615d0a7dea8a8029a184fb25ece Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:32:31 -0400
Subject: rooms editor in builder

---
 .../javascripts/mx/extensions/mx.movements.js      |  2 +-
 .../rectangles/engine/map/ui_minimap.js            |  2 --
 .../assets/javascripts/rectangles/models/wall.js   |  2 ++
 .../assets/javascripts/ui/editor/EditorToolbar.js  |  8 ++++++--
 public/assets/javascripts/ui/editor/EditorView.js  |  6 ++++++
 public/assets/javascripts/ui/site/LayoutsModal.js  |  5 +++++
 views/controls/builder/info.ejs                    |  2 +-
 views/controls/editor/toolbar.ejs                  | 23 +++++++++++-----------
 views/editor.ejs                                   |  1 +
 9 files changed, 34 insertions(+), 17 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 065c93b..0ce03db 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -113,7 +113,7 @@ MX.Movements = function (cam) {
 						  app.controller.mediaViewer.hide()
 						}
 						else {
-              map && map.toggle && map.toggle()
+              app.controller.toolbar.toggleMap()
 						}
 						break
 				}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index d7280b9..fabbdb9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -7,7 +7,6 @@ Map.UI.Minimap = function(map){
 
 	base.creating = base.dragging = base.resizing = false
 
-/*
 	base.mouse = new mouse({
 		el: map.el,
 		down: down,
@@ -16,7 +15,6 @@ Map.UI.Minimap = function(map){
 		up: up,
 		rightclick: rightclick,
 	})
-*/
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fcb2f5e..7ff9015 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -114,6 +114,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, pos)
           }
 					else {
 						app.controller.pickWall(base, pos)
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 4f12a7b..8a707ec 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -19,8 +19,12 @@ var EditorToolbar = View.extend({
 	},
 
 	toggleMap: function(){
-		map.toggle()
-		// $("#minimap").toggleClass("hide");
+		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+		this.resetControls()
+    $("[data-role='toggle-map-view']").toggleClass("inuse", state)
+		map.toggle(state)
+		$("#minimap").toggleClass("hide", state)
+		this.parent.info.toggle(state)
 	},
 	
 	toggleSettings: function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index b35c872..6aff601 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -11,6 +11,7 @@ var EditorView = View.extend({
 	initialize: function(){
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
+		this.info = new BuilderInfo ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
@@ -27,6 +28,11 @@ var EditorView = View.extend({
 	},
 	
 	loadLayout: function(layout){
+	  if (layout == "empty") {
+	    this.readyLayout({})
+	    this.toolbar.toggleMap()
+      return
+	  }
 		layout = sanitize(layout)
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 99db2a3..73c63e8 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -48,6 +48,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 
 	events: {
 		"click .templates span": 'toggleActive',
+		"click [data-role='create-new-layout']": 'createNewLayout',
 		"submit form": 'newProject',
 	},
 	
@@ -70,6 +71,10 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
 	},
 	
+	createNewLayout: function(){
+	  window.location.pathname = "/layout/new"
+	},
+	
 	newProject: function(e){
 		e && e.preventDefault()
 		window.location.pathname = "/project/new"
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index d92d34c..7ef0b6a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox active settings info active" id="builderInfo">
+<div class="vvbox settings info" id="builderInfo">
 	<div class="setting number">
 		<label for="room-width">width</label>
 		<input type="text" class="units" name="width" id="room-width">
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 85800f8..47d7c3c 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -4,10 +4,10 @@
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
-		<span
-			data-role='toggle-presets'
-			data-info="preset styles"
-			class="ion-ios7-briefcase-outline"></span>
+  <span
+    data-role='toggle-presets'
+    data-info="preset styles"
+    class="ion-ios7-briefcase-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
@@ -26,13 +26,14 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
-
-		<span
-			data-role='toggle-text-editor'
-			data-info="add text to wall"
-			class="ion-ios7-compose-outline"></span>
-			
-
+  <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"
+		class="ion-ios7-world-outline"></span>
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/editor.ejs b/views/editor.ejs
index 330e69b..c0562e9 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -13,6 +13,7 @@
 
 		<div id="editorView">
 			[[ include controls/editor/toolbar ]]
+			[[ include controls/builder/info ]]
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
-- 
cgit v1.2.3-70-g09d2


From 4263bc016e828f7407b446e27bdf64d898758627 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:54:14 -0400
Subject: refactor layout-parsing calls into Rooms.rebuild

---
 public/assets/javascripts/rectangles/_env.js          |  5 +++--
 .../javascripts/rectangles/engine/map/ui_editor.js    |  2 +-
 .../javascripts/rectangles/engine/rooms/_rooms.js     | 19 +++++++++++++++----
 .../javascripts/rectangles/engine/rooms/_walls.js     | 12 +++++++++++-
 .../javascripts/rectangles/engine/rooms/builder.js    |  5 +----
 .../javascripts/rectangles/engine/rooms/clipper.js    |  1 -
 .../javascripts/rectangles/engine/scenery/undo.js     | 12 ++++++------
 public/assets/javascripts/ui/builder/BuilderInfo.js   | 10 +++++-----
 public/assets/javascripts/ui/builder/BuilderView.js   |  5 -----
 public/assets/javascripts/ui/editor/EditorSettings.js |  7 +------
 10 files changed, 43 insertions(+), 35 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 4b14a21..ecde3ca 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -17,14 +17,15 @@ environment.init = function(){
 		scene.camera.radius = 20
 	}
 	
-	app.movements.gravity(true)
-	
 	Rooms.init()
+	Walls.init()
 	Scenery.init()
 	
 	scene.update()
 	environment.update()
 	
+	app.movements.gravity(true)
+
 	var minimap_el = document.querySelector("#minimap .el")
 	if (minimap_el) {
 		window.minimap = new Map ({
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 02218ed..3c3347b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -213,7 +213,7 @@ Map.UI.Editor = function(map){
           undo: wheelState,
           redo: intersects[0].copy()
         })
-        Rooms.clipper.update()
+        Rooms.rebuild()
         wheelState = null
 			}, 500)
 		}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 3603f0c..b901a25 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -59,18 +59,19 @@
 				height: 500
 			})
 			base.add(room)
+			Rooms.rebuild()
 			return room
 		}
 	
 		base.remove = function(room){
 			delete base.list[room.id]
-			Rooms.clipper.update()
+      Rooms.rebuild()
 		}
 	
 		base.removeAll = function(){
 			base.list = {}
 			base.regions = []
-			Rooms.clipper.update()
+      Rooms.rebuild()
 		}
 	
 		base.count = function(){
@@ -88,6 +89,16 @@
 		base.values = function(){
 			return _.values(base.list)
 		}
+		
+		base.rebuild = function(walls_data){
+      walls_data = walls_data || Walls.serialize()
+      Rooms.clipper.update()
+      Rooms.builder.rebuild()
+      Rooms.grouper.build()
+      Walls.paint()
+      Walls.deserialize(walls_data)
+      app.tube("rooms-built")
+		}
 	
 		base.serialize = function(){
 			var rooms = base.map(function(room){
@@ -96,7 +107,7 @@
 			return rooms
 		}
 	
-		base.deserialize = function(rooms_data){
+		base.deserialize = function(rooms_data, walls_data){
 			rooms_data.forEach(function(data){
 			  if (! data || ! data.rect) return
 				var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
@@ -107,7 +118,7 @@
 				})
 				base.add(room)
 			})
-			Rooms.clipper.update()
+      Rooms.rebuild(walls_data)
 		}
 		
 		base.report = function(){
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 7ff472d..80d30c6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -38,6 +38,15 @@
 		base.floors = []
 		base.lookup = {}
 		base.colors = {}
+		
+		base.init = function(){
+      base.colors = {
+        wall: app.defaults.colors.wall.slice(),
+        outline: app.defaults.colors.outline.slice(),
+        floor: app.defaults.colors.floor.slice(),
+        ceiling: app.defaults.colors.ceiling.slice(),
+      }
+    }
 
 		base.first = function(){
 		  for (var i in base.list) {
@@ -90,7 +99,7 @@
 		base.values = function(){
 			return _.values(base.lookup)
 		}
-		
+
 		base.serialize = function(){
 		  var data = []
 			base.forEach(function(wall){
@@ -118,6 +127,7 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
+        // TODO: SET WALLPAPER HERE
       })
       Rooms.forEach(function(room){
         room.setFloorColor(floorColor)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 6a89158..4619eb1 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -32,19 +32,16 @@
 		var els = []
 
 		base.init = function(){
-			base.bind()
+			// base.bind()
 		}
 
 		base.bind = function(){
-			app.on("clip", base.rebuild.bind(base))
 		}
 
 		base.rebuild = function(){
 			if (window.scene) {
 				base.clear()
 				base.build()
-				Rooms.grouper.build()
-				app.tube("rooms-built")
 			}
 		}
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/clipper.js b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
index 0382758..df83cc8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/clipper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/clipper.js
@@ -38,7 +38,6 @@
 
 		base.update = function(){
 			base.solve_rects()
-			app.tube("clip")
 		}
 	
 		var regions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 57a0886..bee8c49 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -69,11 +69,11 @@
       type: "create-room",
       undo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
       redo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -83,14 +83,14 @@
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(state){
         var room = Rooms.list[state.id]
         room.rect.assign( state.rect )
         room.height = state.height
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
     },
@@ -98,12 +98,12 @@
       type: "destroy-room",
       undo: function(room){
         Rooms.add(new Room(room))
-        Rooms.clipper.update()
+        Rooms.rebuild()
         app.tube("builder-pick-room", room)
       },
       redo: function(room){
         Rooms.remove(room)
-        Rooms.clipper.update()
+        Rooms.rebuild()
       },
     },
     
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index f7753a3..0bf2338 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -67,27 +67,27 @@ var BuilderInfo = View.extend({
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setLength( this.$width.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeDepth: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setLength( this.$depth.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.room.height = this.$height.unitVal()
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeX: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setPosition( this.$x.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeY: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setPosition( this.$y.unitVal() )
-		Rooms.clipper.update()
+    Rooms.rebuild()
 	},
 	changeUnits: function(){
 		app.units = this.$units.val()
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index 81dce52..a89111f 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,11 +12,6 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
-
-		app.on("rooms-built", function(){
-		  Walls.paint()
-		})
-
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 45a2e43..89040e1 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -32,8 +32,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		data.rooms && Rooms.deserialize(data.rooms)
-		data.walls && Walls.deserialize(data.walls)
+		data.rooms && Rooms.deserialize(data.rooms, data.walls)
 		data.startPosition && scene.camera.move(data.startPosition)
 
     if (data.colors && data.colors.wall) {
@@ -66,10 +65,6 @@ var EditorSettings = FormView.extend({
 			
 			data.media && Scenery.deserialize(data.media)
 		}
-
-    app.on("rooms-built", function(){
-		  Walls.paint()
-		})
 	},
 	
 	showCollaborators: function(e){
-- 
cgit v1.2.3-70-g09d2


From bc63a639bbd224adfc8012b100c1b277e2774afb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 21:07:50 -0400
Subject: z

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 1 -
 public/assets/stylesheets/app.css                           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 80d30c6..0da3b9a 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -113,7 +113,6 @@
 			  if (! wall_data) { return }
 			  var wall = base.lookup[ wall_data.id ]
 			  if (! wall) {
-			    console.log(wall_data);
 			    return
 			  }
 			  wall.deserialize( wall_data )
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 4bae1de..509deb5 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1505,7 +1505,7 @@ border-left: 1px solid black;
 .wallpaper .wallpaperRemove {
   cursor: pointer;
   border-top: 1px solid black;
-  padding: 4px 0 0 0;
+  padding: 0;
 }
 .wallpaper .wallpaperRemove img {
   width: 18px;
-- 
cgit v1.2.3-70-g09d2


From f73f5c517d08581d8d1c687a42e9ef9e5598662a Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Sun, 12 Oct 2014 11:43:41 -0400
Subject: undo button on toolbar

---
 public/assets/javascripts/rectangles/engine/rooms/builder.js |  2 +-
 public/assets/javascripts/ui/editor/EditorToolbar.js         | 12 ++++++++++++
 public/assets/stylesheets/app.css                            |  2 +-
 views/controls/editor/toolbar.ejs                            |  6 +++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 4619eb1..33333fb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -293,7 +293,7 @@
         this.el = this.rect = this.face = null
 			}
 
-			// possible if walls are opaque
+			// preferable if walls are opaque
 			// el.el.classList.add("backface-hidden")
 
 			return el
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 8a707ec..0b1da0b 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -4,6 +4,7 @@ var EditorToolbar = View.extend({
 
 	events: {
 	  "mousedown": 'stopPropagation',
+		"click [data-role='undo']": 'undo',
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -18,6 +19,17 @@ var EditorToolbar = View.extend({
 		this.parent = opt.parent
 	},
 
+	undo: function(e){
+		if (e.shiftKey) {
+			var canRedo = UndoStack.redo()
+			console.log("can redo", canRedo)
+		}
+		else {
+			var canUndo = UndoStack.undo()
+			console.log("can undo", canUndo)
+		}
+	},
+	
 	toggleMap: function(){
 		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
 		this.resetControls()
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 271f13a..849c994 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1647,7 +1647,7 @@ input[type="range"]::-webkit-slider-thumb {
   border-bottom: 1px transparent solid;
 }
 .presets span.active {
-  border-bottom: 1px dotted;
+	text-decoration: underline;
 }
 .color-swatches span {
 	display: inline-block;
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 47d7c3c..57a98b9 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,10 +1,14 @@
 
 <div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left">
+	<span
+		data-role='undo'
+		data-info="undo"
+		class="ion-reply"></span>
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
-  <span
+	<span
     data-role='toggle-presets'
     data-info="preset styles"
     class="ion-ios7-briefcase-outline"></span>
-- 
cgit v1.2.3-70-g09d2


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

---
 .../javascripts/rectangles/engine/map/ui_editor.js | 11 +++++++--
 .../assets/javascripts/ui/builder/BuilderInfo.js   | 27 +++++++++++++++++++---
 views/controls/builder/info.ejs                    | 11 +++++++++
 3 files changed, 44 insertions(+), 5 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
 	}
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 0bf2338..196eca6 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -13,6 +13,7 @@ var BuilderInfo = View.extend({
 		"change [name=units]": 'changeUnits',
 		"change [name=resolution]": 'changeResolution',
 		"change [name=viewHeight]": 'changeViewHeight',
+		"click [data-role=destroy-room]": 'destroy',
 	},
 	
 	initialize: function(opt){
@@ -25,8 +26,11 @@ var BuilderInfo = View.extend({
 		this.$units = this.$("[name=units]")
 		this.$viewHeight = this.$("[name=viewHeight]")
 		this.$unitName = this.$(".unitName")
+		this.$noSelection = this.$(".no-selection")
+		this.$settings = this.$(".setting")
 		app.on("builder-pick-room", this.pick.bind(this))
-		app.on("builder-destroy-room", this.destroy.bind(this))
+		app.on("builder-destroy-room", this.hide.bind(this))
+		app.on("builder-pick-nothing", this.deselect.bind(this))
 	},
 	
 	load: function(data){
@@ -36,6 +40,8 @@ var BuilderInfo = View.extend({
 	},
 
 	toggle: function(state){
+    this.$settings.toggle( !! this.room )
+    this.$noSelection.toggle( ! this.room )
 		this.$el.toggleClass("active", state)
 	},
 	
@@ -43,7 +49,8 @@ var BuilderInfo = View.extend({
 		this.toggle(true)
 	},
 	
-	hide: function(){	
+	hide: function(){
+	  this.room = null
 		this.toggle(false)
 	},
 
@@ -58,8 +65,22 @@ var BuilderInfo = View.extend({
 		this.$y.unitVal( room.rect.y.a )
 	  this.show()
 	},
+	
+	deselect: function(){
+	  this.room = null
+	  this.toggle(true)
+	},
+
+	destroy: function(){
+    UndoStack.push({
+      type: "destroy-room",
+      undo: this.room.copy(),
+      redo: { id: this.room.id },
+    })
+
+    Rooms.remove(this.room)
+    app.tube("builder-destroy-room", this.room)
 
-	destroy: function(room){
 		this.room = null
 		this.hide()
 	},
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 7ef0b6a..3c5d4b7 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -1,4 +1,11 @@
 <div class="vvbox settings info" id="builderInfo">
+	<h4>Map Editor</h4>
+
+  <div class="no-selection">
+    Click a room to select it, or click and drag to make a new room.
+  </div>
+  
+	
 	<div class="setting number">
 		<label for="room-width">width</label>
 		<input type="text" class="units" name="width" id="room-width">
@@ -32,4 +39,8 @@
 		<input type="text" class="units" name="viewHeight" id="viewHeight">
 	</div>
 
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-room">delete this room</a>
+	</div>
+
 </div>
-- 
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


From 32f5f24b8b09998a03c88f786507ba4d58397fc7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Oct 2014 18:16:35 -0400
Subject: toggling map

---
 public/assets/javascripts/rectangles/engine/map/_map.js |  4 ++--
 public/assets/javascripts/ui/editor/EditorToolbar.js    | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 99ede82..3a47dab 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -66,8 +66,8 @@ var Map = function(opt){
 		canvas.height = base.dimensions.b = window.innerHeight
 	}
 		
-	base.toggle = function(){
-		$(base.el).toggle()
+	base.toggle = function(state){
+		$(base.el).toggle(state)
 	}
 
 }
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 0b1da0b..9837304 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -30,9 +30,11 @@ var EditorToolbar = View.extend({
 		}
 	},
 	
-	toggleMap: function(){
-		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
-		this.resetControls()
+	toggleMap: function(state){
+		if (typeof state != "boolean") {
+		  state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+      this.resetControls()
+		}
     $("[data-role='toggle-map-view']").toggleClass("inuse", state)
 		map.toggle(state)
 		$("#minimap").toggleClass("hide", state)
@@ -41,6 +43,7 @@ var EditorToolbar = View.extend({
 	
 	toggleSettings: function(){
 // 	  this.resetMode()
+    this.toggleMap(false)
     this.parent.textEditor.hide()
 		this.parent.presets.hide()
 		this.parent.lightControl.hide()
@@ -54,6 +57,7 @@ var EditorToolbar = View.extend({
 		this.parent.mediaUpload.show()
 		this.resetMode()
 		this.resetControls()
+		this.toggleMap(false)
 	},
 
 	resetMode: function(){
@@ -67,6 +71,7 @@ var EditorToolbar = View.extend({
 	
 	resetControls: function(){
 	  $(".inuse").removeClass("inuse")
+    this.toggleMap(false)
     this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.presets.hide()
@@ -110,6 +115,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
+		this.toggleMap(false)
 		this.parent.wallpaperPicker.toggle(state)
 	},
 	
@@ -122,6 +128,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
+		this.toggleMap(false)
 		this.parent.lightControl.toggle(state)
 	},
 	
@@ -134,6 +141,7 @@ var EditorToolbar = View.extend({
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
+		this.toggleMap(false)
 		this.parent.textEditor.toggle(state)
   },
 
@@ -146,6 +154,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.lightControl.hide()
+		this.toggleMap(false)
 		this.parent.presets.toggle(state)
 	},
 })
-- 
cgit v1.2.3-70-g09d2


From 40c85ef5f19139ae5b2cf3e3c0f4878f7acaeae4 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 14 Oct 2014 10:44:33 -0400
Subject: fixing tests

---
 public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 ++
 public/assets/javascripts/rectangles/engine/rooms/_rooms.js  | 2 +-
 public/assets/javascripts/ui/editor/EditorToolbar.js         | 1 -
 3 files changed, 3 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..8f4f594 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -161,6 +161,8 @@ Map.UI.Editor = function(map){
 				cursor.y.abs().quantize(1)
 				var room = Rooms.add_with_rect( cursor )
 
+				Rooms.rebuild()
+
         UndoStack.push({
           type: "create-room",
           undo: { id: room.id },
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index b901a25..5686aba 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -13,6 +13,7 @@
 		vec2 = require('../../models/vec2')
 		Rect = require('../../models/rect')
 		Room = require('../../models/room')
+		Walls = require('./_walls')
 		UidGenerator = require('../../util/uid')
 		sort = require('../../util/sort')
 		_ = require('lodash')
@@ -59,7 +60,6 @@
 				height: 500
 			})
 			base.add(room)
-			Rooms.rebuild()
 			return room
 		}
 	
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 0b1da0b..93cc998 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -9,7 +9,6 @@ var EditorToolbar = View.extend({
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
     "click [data-role='toggle-presets']": 'togglePresets',
-// 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
 		"click [data-role='toggle-text-editor']": 'toggleTextEditor',
-- 
cgit v1.2.3-70-g09d2


From 39bd4b9dca66403783e5b0fab48e3cdbf4882269 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 14 Oct 2014 12:27:48 -0400
Subject: wheel tests; scroll up-down to move forward/back

---
 .../javascripts/mx/extensions/mx.movements.js      | 355 +++++++++++----------
 .../javascripts/rectangles/engine/map/ui_editor.js |   6 +-
 .../rectangles/engine/map/ui_minimap.js            |   4 +-
 public/assets/javascripts/rectangles/util/wheel.js |  19 +-
 public/assets/test/wheel.html                      |  29 ++
 5 files changed, 235 insertions(+), 178 deletions(-)
 create mode 100644 public/assets/test/wheel.html

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 0ce03db..2b7e671 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -25,193 +25,216 @@ MX.Movements = function (cam) {
 			vx = vy = vz = 0,
 			creepFactor = 0.3
 
+	var mouseX, mouseY, dx, dy, rotX, rotY, dragging = false
+
+	var trackpad
+
 	var DEFAULT_SCALE = 1.0, scale = DEFAULT_SCALE
 	
 	var pos = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: 0 }
 
   $(document).one("keydown", function(){ $("#keyhint").fadeOut(250) })
 
-	return {
+	var exports = {
 
 		init: function () {
-
-			document.addEventListener('keydown', function (e) {
-        // console.log(e.keyCode)
-				if (locked || e.altKey || e.metaKey || e.ctrlKey) {
-				  return
-				}
-				switch ( e.keyCode ) {
-				
-					case 16: // shift
-						creeping = true
-						break
-
-					case 38: // up
-					case 87: // w
-						moveForward = true
-						break
-
-					case 65: // a
-						moveLeft = true
-						break
-
-					case 40: // down
-					case 83: // s
-						moveBackward = true
-						break
-
-					case 68: // d
-						moveRight = true
-						break
-
-					case 37: // left
-					case 81: // q
-						turnLeft = true
-						break
-							
-					case 39: // right
-					case 69: // e
-						turnRight = true
-						break
-				
-					case 82: // r
-						turnUp = true
-						break
-
-					case 70: // f
-						turnDown = true
-						break
-
-					case 32: // space
-						if (gravity) {
-							jumping = true
-							vy = abs(vy) + jumpV * scale
-							if (e.shiftKey) {
-								vy *= -1
-							}
-						}
-						else {
-							if (e.shiftKey) {
-								moveDown = true
-							}
-							else {
-								moveUp = true
-							}
+		
+		  trackpad = new wheel ({
+		  	el: scene.el,
+		  	update: exports.mousewheel,
+		  })
+		  
+			document.addEventListener('keydown', exports.keydown)
+			document.addEventListener('keyup', exports.keyup)
+			document.addEventListener('mousedown', exports.mousedown)
+			document.addEventListener('mousemove', exports.mousemove)
+			document.addEventListener('mouseup', exports.mouseup)
+			window.addEventListener('blur', exports.reset)
+			window.addEventListener('focus', exports.reset)
+		},
+		
+		keydown: function (e) {
+			// console.log(e.keyCode)
+			if (locked || e.altKey || e.metaKey || e.ctrlKey) {
+				return
+			}
+			switch ( e.keyCode ) {
+			
+				case 16: // shift
+					creeping = true
+					break
+
+				case 38: // up
+				case 87: // w
+					moveForward = true
+					break
+
+				case 65: // a
+					moveLeft = true
+					break
+
+				case 40: // down
+				case 83: // s
+					moveBackward = true
+					break
+
+				case 68: // d
+					moveRight = true
+					break
+
+				case 37: // left
+				case 81: // q
+					turnLeft = true
+					break
+						
+				case 39: // right
+				case 69: // e
+					turnRight = true
+					break
+			
+				case 82: // r
+					turnUp = true
+					break
+
+				case 70: // f
+					turnDown = true
+					break
+
+				case 32: // space
+					if (gravity) {
+						jumping = true
+						vy = abs(vy) + jumpV * scale
+						if (e.shiftKey) {
+							vy *= -1
 						}
-						break
-
-					case 27:  // esc
-					  if (Scenery.nextMedia) {
-					    Scenery.nextMedia = null
-              app.tube('cancel-scenery')
-					  }
-					  else if (Scenery.nextWallpaper) {
-					    Scenery.nextWallpaper = null
-              app.tube('cancel-wallpaper')
-					  }
-						else if (app.controller && app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) {
-						  app.controller.mediaViewer.hide()
+					}
+					else {
+						if (e.shiftKey) {
+							moveDown = true
 						}
 						else {
-              app.controller.toolbar.toggleMap()
+							moveUp = true
 						}
-						break
-				}
-			})
+					}
+					break
+
+				case 27:  // esc
+					if (Scenery.nextMedia) {
+						Scenery.nextMedia = null
+						app.tube('cancel-scenery')
+					}
+					else if (Scenery.nextWallpaper) {
+						Scenery.nextWallpaper = null
+						app.tube('cancel-wallpaper')
+					}
+					else if (app.controller && app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) {
+						app.controller.mediaViewer.hide()
+					}
+					else {
+						app.controller.toolbar.toggleMap()
+					}
+					break
+			}
+		},
 
-			document.addEventListener('keyup', function (e) {
-				if (locked) return;
-				switch ( e.keyCode ) {
-			
-					case 16: // shift
-						creeping = false
-						break
-
-					case 38: // up
-					case 87: // w
-						moveForward = false
-						break
-
-					case 65: // a
-						moveLeft = false
-						break
-
-					case 40: // down
-					case 83: // s
-						moveBackward = false
-						break
-
-					case 68: // d
-						moveRight = false
-						break
-
-					case 37: // left
-					case 81: // q
-						turnLeft = false
-						break
-							
-					case 39: // right
-					case 69: // e
-						turnRight = false
-						break
-
-					case 82: // r
-						turnUp = false
-						break
-
-					case 70: // f
-						turnDown = false
-						break
-
-					case 32: // space
-						moveUp = moveDown = false
-						break
+		keyup: function (e) {
+			if (locked) return;
+			switch ( e.keyCode ) {
+		
+				case 16: // shift
+					creeping = false
+					break
+
+				case 38: // up
+				case 87: // w
+					moveForward = false
+					break
+
+				case 65: // a
+					moveLeft = false
+					break
+
+				case 40: // down
+				case 83: // s
+					moveBackward = false
+					break
+
+				case 68: // d
+					moveRight = false
+					break
+
+				case 37: // left
+				case 81: // q
+					turnLeft = false
+					break
+						
+				case 39: // right
+				case 69: // e
+					turnRight = false
+					break
+
+				case 82: // r
+					turnUp = false
+					break
+
+				case 70: // f
+					turnDown = false
+					break
+
+				case 32: // space
+					moveUp = moveDown = false
+					break
 
 /*					
-					case 48: // 0
-						cam.rotationX = 0
-						cam.rotationY = 0
-						cam.x = 0
-						cam.y = viewHeight
-						cam.z = 0
-						break
+				case 48: // 0
+					cam.rotationX = 0
+					cam.rotationY = 0
+					cam.x = 0
+					cam.y = viewHeight
+					cam.z = 0
+					break
 */
-				}
-			})
-			
-			var mouseX, mouseY, dx, dy, rotX, rotY, dragging = false
-			document.addEventListener('mousedown', function (e) {
-				if (locked) return;
-				mouseX = e.pageX
-				mouseY = e.pageY
-				rotX = cam.rotationX
-				rotY = cam.rotationY
-				dragging = true
-			})
-			
-			document.addEventListener('mousemove', function (e) {
-				if (locked || ! dragging) return
-				var dx = (e.pageX - mouseX) / window.innerWidth * Math.PI/3
-				var dy = (e.pageY - mouseY) / window.innerHeight * Math.PI/3
-				cam.rotationY = rotY + dx
-				cam.rotationX = clamp( rotX - dy, rotationX_min, rotationX_max )
-			})
-			
-			document.addEventListener('mouseup', function (e) {
-				dragging = false
-			})
-			
-			window.addEventListener('blur', reset)
-			window.addEventListener('focus', reset)
-			function reset(){
-				moveForward = moveLeft = moveBackward = moveRight = moveUp = moveDown = turnLeft = turnRight = jumping = dragging = creeping = false
 			}
+		},
 
+		mousedown: function (e) {
+			if (locked) return;
+			mouseX = e.pageX
+			mouseY = e.pageY
+			rotX = cam.rotationX
+			rotY = cam.rotationY
+			dragging = true
+		},
+			
+		mousemove: function (e) {
+			if (locked || ! dragging) return
+			var dx = (e.pageX - mouseX) / window.innerWidth * Math.PI/3
+			var dy = (e.pageY - mouseY) / window.innerHeight * Math.PI/3
+			cam.rotationY = rotY + dx
+			cam.rotationX = clamp( rotX - dy, rotationX_min, rotationX_max )
+		},
+		
+		mouseup: function (e) {
+			dragging = false
+		},
+		
+		reset: function(){
+			moveForward = moveLeft = moveBackward = moveRight = moveUp = moveDown = turnLeft = turnRight = jumping = dragging = creeping = false
+		},
+		
+		mousewheel: function (e, deltaY, deltaX) {
+			console.log(deltaX != 0 && deltaY != 0)
+			cam.rotationY += -deltaX / 20
+
+			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
+			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
+
+			app.tube("move", pos)
 		},
 
 		update: function () {
 
-			if (locked) return;
+			if (locked) { return }
 			
 			var ry = cam.rotationY
 			var s = creeping ? scale * creepFactor : scale
@@ -301,4 +324,6 @@ MX.Movements = function (cam) {
 		velocity: function(n){ v = clamp(n, 1, 50) },
 		jumpVelocity: function(n){ jumpV = clamp(n, 1, 50) },
 	}
+	
+	return exports
 }
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 60c745e..072ff7e 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -203,7 +203,7 @@ Map.UI.Editor = function(map){
 
   var wheelState, wheelTimeout
 
-	function mousewheel (e, val, delta){
+	function mousewheel (e, deltaY, deltaX){
 		var cursor = base.mouse.cursor
 
 		var intersects = Rooms.filter(function(r){
@@ -213,7 +213,7 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height - delta), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height - deltaY), height_min, height_max )
 			
 			clearTimeout(wheelTimeout)
 			wheelTimeout = setTimeout(function(){
@@ -227,7 +227,7 @@ Map.UI.Editor = function(map){
 			}, 500)
 		}
 		else {
-			map.set_zoom(map.zoom_exponent - delta/20)
+			map.set_zoom(map.zoom_exponent - deltaY/20)
 		}
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index fabbdb9..0fdd336 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -72,8 +72,8 @@ Map.UI.Minimap = function(map){
 		base.dragging = false
 	}
 
-	function mousewheel (e, val, delta){
-		map.set_zoom(map.zoom_exponent - delta/20)
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
 	}
 	
 	function rightclick (e){
diff --git a/public/assets/javascripts/rectangles/util/wheel.js b/public/assets/javascripts/rectangles/util/wheel.js
index 6836772..64aaa64 100644
--- a/public/assets/javascripts/rectangles/util/wheel.js
+++ b/public/assets/javascripts/rectangles/util/wheel.js
@@ -21,37 +21,40 @@ function wheel (opt) {
 		val: 0,
 	})
 
-	opt.el.addEventListener('mousewheel', onMouseWheel, false);
+	opt.el.addEventListener('wheel', onMouseWheel, false);
+// 	opt.el.addEventListener('mousewheel', onMouseWheel, false);
 	opt.el.addEventListener('DOMMouseScroll', onMouseWheel, false);
 
 	function onMouseWheel (e) {
 		if (opt.locked) {
 			return
 		}
+
 		if (! opt.propagate) {
 			e.stopPropagation()
 			e.preventDefault()
 		}
 		
-		var delta = 0;
+		var deltaX = 0, deltaY = 0;
 		
 		// WebKit
 		if ( event.wheelDeltaY ) {
-			delta -= event.wheelDeltaY * opt.ratio
+			deltaY -= event.wheelDeltaY * opt.ratio
+			deltaX -= event.wheelDeltaX * opt.ratio
 		}
 		// Opera / Explorer 9
 		else if ( event.wheelDelta ) {
-			delta -= event.wheelDelta * opt.ratio
+			deltaY -= event.wheelDelta * opt.ratio
 		}
 		// Firefox
 		else if ( event.detail ) {
-			delta += event.detail * 2
+			deltaY += event.detail * 2
 		}
-		if (! opt.reversible && delta < 0) return;
+		if (! opt.reversible && (deltaY < 0 && deltaX < 0)) return;
 		
-		opt.val = clamp(opt.val + delta, opt.min, opt.max)
+		// opt.val = clamp(opt.val + delta, opt.min, opt.max)
 		
-		opt.update(e, opt.val, delta)
+		opt.update(e, deltaY, deltaX)
 	}
 
 	opt.lock = function(){ opt.locked = true }
diff --git a/public/assets/test/wheel.html b/public/assets/test/wheel.html
new file mode 100644
index 0000000..054945e
--- /dev/null
+++ b/public/assets/test/wheel.html
@@ -0,0 +1,29 @@
+<style>
+#cursor {
+	position:absolute;margin-top:-5px;margin-left:-5px;
+	width:10px;height:10px;border-radius:50%;
+	background:red;
+}
+</style>
+<div id="cursor"></div>
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/rectangles/util/wheel.js"></script>
+
+<script>
+x = window.innerWidth/2
+y = window.innerHeight/2
+function draw(){
+	cursor.style.top = y + 'px'
+	cursor.style.left = x + 'px'
+}
+new wheel({
+	el: document,
+	propagate: false,
+	update: function(e,dy,dx){
+		y = mod(y + dy, window.innerHeight)
+		x = mod(x + dx, window.innerWidth)
+		draw()
+	},
+})
+draw()
+</script>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 527a65ca570891ff473dbdac36d41b1be60196f1 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 14 Oct 2014 19:16:45 -0400
Subject: load more on media drawer and some other stuff

---
 .../javascripts/mx/extensions/mx.movements.js      |  3 +-
 .../javascripts/rectangles/engine/map/draw.js      |  6 +--
 .../javascripts/rectangles/engine/rooms/_walls.js  | 19 +++++----
 .../javascripts/rectangles/engine/rooms/mover.js   |  2 +
 .../javascripts/rectangles/util/constants.js       |  3 +-
 public/assets/javascripts/rectangles/util/wheel.js |  6 ++-
 .../assets/javascripts/ui/builder/BuilderInfo.js   |  2 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  1 +
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/MediaUpload.js |  4 +-
 public/assets/javascripts/ui/editor/MediaViewer.js | 33 +++++++++++----
 public/assets/javascripts/ui/editor/TextEditor.js  |  5 +--
 public/assets/stylesheets/app.css                  | 49 +++++++++++++---------
 server/lib/api/media.js                            | 13 ++++--
 server/lib/api/projects.js                         |  2 +
 server/lib/schemas/Project.js                      |  1 +
 views/controls/editor/media-drawer.ejs             | 28 +++++++------
 17 files changed, 116 insertions(+), 62 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 2b7e671..268a1c7 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -223,8 +223,7 @@ MX.Movements = function (cam) {
 		},
 		
 		mousewheel: function (e, deltaY, deltaX) {
-			console.log(deltaX != 0 && deltaY != 0)
-			cam.rotationY += -deltaX / 20
+			cam.rotationY += deltaX / 20
 
 			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
 			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 7eb6e7c..eceda3c 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -177,11 +177,11 @@ Map.Draw = function(map, opt){
 		ctx.lineWidth = 1/map.zoom
 		
 		var sides = map.sides()
-		var quant = sides.clone().quantize(200)
-		for (var x = quant.x.a - 200; x <= quant.x.b; x += 200) {
+		var quant = sides.clone().quantize(MAP_GRID_SIZE)
+		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
 			line(x, sides.y.a, x, sides.y.b)
 		}
-		for (var y = quant.y.a - 200; y <= quant.y.b; y += 200) {
+		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
 			line(sides.x.a, y, sides.x.b, y)
 		}
 	}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 0da3b9a..119a659 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -134,19 +134,24 @@
       })
 		}
 		
+		base.luminance = function(rgb){
+			rgb = rgb || Walls.colors.wall
+			var rgb_max = Math.max.apply(0, rgb)
+			var rgb_min = Math.min.apply(255, rgb)
+			return (rgb_max + rgb_min ) / 2
+		}
+		
     base.setColor = {
     
       wall: function(rgb){
         var rgbaColor = rgba_string(rgb, app.defaults.wallOpacity)
         var rgbColor = rgb_string(rgb)
+        				
+				if (Rooms.mover.room) {
+					$("#header").toggleClass("black", base.luminance() < 100)
+					$("body").css("background-color", rgbColor)
+				}
         
-        var rgb_max = Math.max.apply(0, rgb)
-        var rgb_min = Math.min.apply(255, rgb)
-        var luminance = (rgb_max + rgb_min ) / 2
-
-        $("#header").toggleClass("black", luminance < 128)
-        $("body").css("background-color", rgbColor)
-                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 98f80c5..a2d2223 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -43,6 +43,7 @@ Rooms.mover = new function(){
 
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
+			$("#header").removeClass("black")
 			$("body").css("background-color", "transparent")
 			base.room = null
 		}
@@ -59,6 +60,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("#header").toggleClass("black", Walls.luminance() < 100)
 			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index a38325e..3bc314c 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -21,7 +21,8 @@ var height_min = 200,
 		side_max = 5000,
 		resize_margin = 8,
 		cursor_amp = 1.5,
-		DEFAULT_PICTURE_WIDTH = 400
+		DEFAULT_PICTURE_WIDTH = 350,
+		MAP_GRID_SIZE = 360          // 10 feet
 
 var painting_distance_from_wall = 10,
 		dot_distance_from_picture = 3
diff --git a/public/assets/javascripts/rectangles/util/wheel.js b/public/assets/javascripts/rectangles/util/wheel.js
index 64aaa64..712d470 100644
--- a/public/assets/javascripts/rectangles/util/wheel.js
+++ b/public/assets/javascripts/rectangles/util/wheel.js
@@ -38,7 +38,11 @@ function wheel (opt) {
 		var deltaX = 0, deltaY = 0;
 		
 		// WebKit
-		if ( event.wheelDeltaY ) {
+		if ( event.deltaY ) {
+			deltaY -= event.deltaY * opt.ratio
+			deltaX -= event.deltaX * opt.ratio
+		}
+		else if ( event.wheelDeltaY ) {
 			deltaY -= event.wheelDeltaY * opt.ratio
 			deltaX -= event.wheelDeltaX * opt.ratio
 		}
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 196eca6..67834e7 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -34,7 +34,7 @@ var BuilderInfo = View.extend({
 	},
 	
 	load: function(data){
-		this.$viewHeight.unitVal( data.viewHeight || app.defaults.viewHeight )
+		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
 		this.$units.val( "ft" )
 		this.$unitName.html( "ft" )
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 89040e1..e2cb53c 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -148,6 +148,7 @@ var EditorSettings = FormView.extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
+		fd.append( "viewHeight", window.viewHeight )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 6aff601..ccd6c63 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -41,6 +41,7 @@ var EditorView = View.extend({
 		$("#map").hide()
 
 		this.settings.load(data)
+		this.info.load(data)
 	},
 	
 	readyLayout: function(data){
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index fddfefc..9799f99 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -55,9 +55,7 @@ var MediaUpload = UploadView.extend({
 	
 	add: function(media){
 		console.log(media)
-		this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
-    this.parent.mediaViewer.$deleteMedia.show()
-    this.parent.mediaViewer.$noMedia.hide()
+		this.parent.mediaViewer.addUploadedMedia(media)
 	},
 	
 	beforeUpload: function(){
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index c18fb49..2e76bec 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -4,23 +4,29 @@ var MediaViewer = ModalView.extend({
 	destroyAction: "/api/media/destroy",
 	usesFileUpload: true,
 	loaded: false,
-	
+	perPage: 12,
+	offset: 0,
+
 	events: {
 	  'mousedown': "stopPropagation",
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
 		'click .mediaContainer': "pick",
+		'click .viewMore': "load",
 	},
 	
 	initialize: function(opt){
 		this.__super__.initialize.call(this)
 		this.parent = opt.parent
 		this.$myMedia = this.$(".myMedia")
+		this.$myMediaContainer = this.$(".myMedia > .container")
 		this.$userToggle = this.$(".userToggle")
 		this.$foundMedia = this.$(".foundMedia")
+		this.$foundMediaContainer = this.$(".foundMedia > .container")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
+		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
   },
 
@@ -55,7 +61,7 @@ var MediaViewer = ModalView.extend({
 	},
 
 	load: function(){
-		$.get("/api/media/user", this.populate.bind(this))
+		$.get("/api/media/user", { offset: this.offset, limit: this.perPage }, this.populate.bind(this))
 	},
 	
 	loadTrending: function(){
@@ -85,7 +91,7 @@ var MediaViewer = ModalView.extend({
           width: img.naturalWidth,
           height: img.naturalHeight,
         }
-        this.add(media, this.$foundMedia)
+        this.add(media, this.$foundMediaContainer)
 		  }.bind(this)
 		  img.src = url
 		  if (img.complete && ! loaded) { img.onload() }
@@ -100,22 +106,34 @@ var MediaViewer = ModalView.extend({
   },
 
 	populate: function(data){
-		this.loaded = true
 		if (data && data.length) {
+			if (data.length < this.perPage) {
+				this.$viewMore.hide()
+			}
 		  data.forEach(function(media){
-		    this.add(media, this.$myMedia)
+		    this.add(media, this.$myMediaContainer)
+		    this.offset += 1
 		  }.bind(this))
 		  this.$noMedia.hide()
       this.$deleteMedia.show()
 		}
 		else {
+			this.$viewMore.hide()
 		  this.$noMedia.show()
 		  this.$deleteMedia.hide()
 		}
+		this.loaded = true
 		this.__super__.show.call(this)
 	},
 	
-	add: function(media, $container){
+	addUploadedMedia: function(media){
+    this.parent.mediaViewer.$deleteMedia.show()
+    this.parent.mediaViewer.$noMedia.hide()
+    this.add(media, this.$myMedia, true) // prepend
+		this.offset += 1
+	},
+	
+	add: function(media, $container, prepend){
 		var image = new Image ()
 		var $span = $("<span>")
 		$span.addClass("mediaContainer")
@@ -142,7 +160,8 @@ var MediaViewer = ModalView.extend({
 		$span.data("media", media)
 		$span.append(image)
 
-		$container.prepend($span)
+		if (prepend) $container.prepend($span)
+		else $container.append($span)
 	},
 
 	deleteIsArmed: false,
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index c8879b3..b559ba5 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -28,16 +28,15 @@ var TextEditor = FormView.extend({
 	},
 
   toggle: function(state){
-    $("#keyhint").fadeOut(200)
-    
     this.$el.toggleClass("active", state)
     if (state) {
+			$("#keyhint").fadeOut(200)
       Scenery.nextMedia = {
         type: 'text',
         width: 600,
         height: 450,
         scale: 0.5,
-        font: { family: 'Lato', size: 12, align: 'left' },
+        font: { family: 'Lato', size: 24, align: 'left', color: "#000" },
       }
       this.createMode(true)
     }
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 849c994..eec671a 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -414,6 +414,17 @@ iframe.embed {
 	border-top: 1px solid black;
 }
 
+.mediaDrawer .viewMore {
+	clear: both;
+	float: none;
+	text-decoration: none;
+	font-size: 22px;
+	display: block;
+	text-align: center;
+	padding: 40px;
+	border: 0;
+	border-top: 1px solid black;
+}
 
 .holder {
 	display: table-cell;
@@ -2152,7 +2163,7 @@ form li textarea {
 	right: 20px;
 	top: 20px;
 	z-index: 20;
-	background: #f9f9f9;
+	background: white;
 	width: 75px;
 	color: black;
 	border: 1px solid black;
@@ -2511,22 +2522,22 @@ a[data-role="forgot-password"] {
 	padding: 50px 0;
 	}
 	.page .viewMore.btn {
-	text-decoration: none;
-	font-size: 18px;
-	padding: 18px 0;
-}
-.footer a, .footer span {
-margin: 9px;
-}
-#keyhint {
-	display:none;
-}
-.projectList .projectItem {
-	width:100%;
-	margin: 20px 0;
-}
-.projectList .room {
-width: 100%;
-height: 260px;
-}
+		text-decoration: none;
+		font-size: 18px;
+		padding: 18px 0;
+	}
+	.footer a, .footer span {
+	margin: 9px;
+	}
+	#keyhint {
+		display:none;
+	}
+	.projectList .projectItem {
+		width:100%;
+		margin: 20px 0;
+	}
+	.projectList .room {
+	width: 100%;
+	height: 260px;
+	}
 }
\ No newline at end of file
diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 1eb08c1..643ba92 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -10,13 +10,20 @@ var _ = require('lodash'),
 var media = {
 
 	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
 	  var query = { user_id: req.user._id }
 	  if (req.query.tag) {
 	    query.tag = req.query.tag
 	  }
-		Media.find(query, function(err, media){
-			res.json(media || [])
-		})
+	  console.log(offset, limit)
+		Media.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
 	},
 	
 	create: function(req, res){
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 47e0458..e357285 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -36,6 +36,7 @@ var projects = {
 		data.name = util.sanitize(data.name)
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
+		data.viewHeight = Number(data.viewHeight || 0)
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
@@ -94,6 +95,7 @@ var projects = {
           data.slug = util.slugify(data.name) + "-" + (+new Date)
         }
         data.description = util.sanitize(data.description)
+        data.viewHeight = Number(data.viewHeight || 0)
         data.updated_at = new Date ()
 
 				_.extend(doc, data)
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index dd50da6..f7b8de0 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -32,6 +32,7 @@ var ProjectSchema = new mongoose.Schema({
 	media: [mongoose.Schema.Types.Mixed],
 	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
+	viewHeight: { type: Number },
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d800426..5cc659e 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -1,14 +1,3 @@
-<span class="fileUpload">
-	<input type="hidden" name="_csrf" value="[[- token ]]">
-	<form>
-		<span class="ion-ios7-upload-outline upload-icon"></span><br>
-		Upload File
-		<input type="file" accept="image/*" class="file" multiple>
-	</form>
-	<small>~ or ~</small><br>
-	<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
-</span>
-
 <div class="ants">
 	<div class="leftborder"></div>
 	<img class="floatingImg">
@@ -16,13 +5,28 @@
 
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
+
 	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
+	  <span class="container"></span>
+		<a href="#" class="viewMore btn">view more</a>
 	</div>
+
+	<span class="fileUpload">
+		<input type="hidden" name="_csrf" value="[[- token ]]">
+		<form>
+			<span class="ion-ios7-upload-outline upload-icon"></span><br>
+			Upload File
+			<input type="file" accept="image/*" class="file" multiple>
+		</form>
+		<small>~ or ~</small><br>
+		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
+	</span>
 	
 	<div class="foundMedia">
-	</div>
+	  <span class="container"></span>
+ 	</div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d50fa94e9b758270b15dfeb5100063c6d876d64c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 15 Oct 2014 12:04:00 -0400
Subject: cursor that follows mouse

---
 .../javascripts/mx/extensions/mx.movements.js      | 14 ++++----
 .../javascripts/rectangles/engine/rooms/_walls.js  |  2 +-
 .../javascripts/rectangles/engine/rooms/mover.js   |  3 +-
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/HelpCursor.js  | 38 ++++++++++++++++++++++
 public/assets/javascripts/ui/editor/MediaViewer.js | 33 ++++++++++++++-----
 public/assets/stylesheets/app.css                  | 18 +++++++---
 views/controls/editor/media-drawer.ejs             | 13 +++++++-
 views/controls/editor/settings.ejs                 |  2 ++
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/HelpCursor.js

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 5ba5d69..b158625 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -226,12 +226,14 @@ MX.Movements = function (cam) {
 		},
 		
 		mousewheel: function (e, deltaY, deltaX) {
-			cam.rotationY += deltaX / 20
-
-			pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
-			pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
-
-			app.tube("move", pos)
+		  if (e.shiftKey) {
+        cam.rotationY -= deltaY / 150
+      }
+      else {
+        pos.x += deltaY * Math.cos(cam.rotationY + Math.PI / 2) * 10
+        pos.z += deltaY * Math.sin(cam.rotationY + Math.PI / 2) * 10
+        app.tube("move", pos)
+      }
 		},
 
 		update: function () {
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 119a659..f2348f0 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -135,7 +135,7 @@
 		}
 		
 		base.luminance = function(rgb){
-			rgb = rgb || Walls.colors.wall
+			rgb = rgb || Walls.colors.ceiling
 			var rgb_max = Math.max.apply(0, rgb)
 			var rgb_min = Math.min.apply(255, rgb)
 			return (rgb_max + rgb_min ) / 2
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index a2d2223..dd63db2 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -11,7 +11,8 @@ Rooms.mover = new function(){
 	
 	base.bind = function(){
 		app.on("move", base.update)
-		keys.on("backslash", function(){
+		keys.on("backslash", function(e){
+		  if ( ! (e.ctrlKey || e.metaKey) ) return
 			base.noclip = ! base.noclip
 			base.room = null
 			app.movements.gravity( ! base.noclip )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index ccd6c63..05d1bec 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -9,6 +9,7 @@ var EditorView = View.extend({
 	},
 	
 	initialize: function(){
+	  this.cursor = new HelpCursor ({ parent: this })
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
 		this.info = new BuilderInfo ({ parent: this })
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
new file mode 100644
index 0000000..842e871
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -0,0 +1,38 @@
+
+var HelpCursor = View.extend({
+	el: "#helpCursor",
+	
+	messages: {
+	  start: "Welcome to Vvalls!",
+	  move: "Use the up and down keys to move around. Use left and right to pivot. WASD works too.",
+	},
+	shown: {},
+
+  initialize: function(){
+    $(window).mousemove(function(e){
+      this.el.style.left = e.pageX + "px"
+      this.el.style.top = e.pageY + "px"
+    }.bind(this))
+    this.show("start")
+  },
+
+  show: function(name){
+    if (name) this.showMessage(name)
+    this.$el.show()
+  },
+
+  hide: function(){
+    this.$el.hide()
+  },
+
+  showMessage: function(name){
+    if (+(this.shown[name] || 0) < 2) {
+      this.$el.html(this.messages[name])
+      this.shown[name] = (+this.shown[name] || 0) + 1
+    }
+    else {
+      this.$el.html("")
+    }
+  },
+
+})
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 10819af..b270be5 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -20,29 +20,46 @@ var MediaViewer = ModalView.extend({
 	initialize: function(opt){
 		this.__super__.initialize.call(this)
 		this.parent = opt.parent
+
 		this.$myMedia = this.$(".myMedia")
 		this.$myMediaContainer = this.$(".myMedia > .container")
 		this.$userToggle = this.$(".userToggle")
+
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundMediaContainer = this.$(".foundMedia > .container")
 		this.$foundToggle = this.$(".foundToggle")
+
+		this.$wallpaperMedia = this.$(".wallpaperMedia")
+		this.$wallpaperMediaContainer = this.$(".wallpaperMedia > .container")
+		this.$wallpaperToggle = this.$(".wallpaperToggle")
+
 		this.$deleteMedia = this.$("#deleteMedia")
 		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
   },
 
+	wallpaperToggle: function(){
+    this.$wallpaperMedia.addClass("active")
+    this.$foundMedia.addClass("inactive")
+    this.$myMedia.addClass("inactive")
+    this.$("a").removeClass("active")
+    this.$foundToggle.addClass("active")
+	},
+	
 	foundToggle: function(){
-    this.$foundMedia.addClass("active");
-    this.$myMedia.addClass("inactive");
-    this.$("a").removeClass("active");
-    this.$foundToggle.addClass("active");
+    this.$wallpaperMedia.removeClass("active")
+    this.$foundMedia.addClass("active")
+    this.$myMedia.addClass("inactive")
+    this.$("a").removeClass("active")
+    this.$foundToggle.addClass("active")
 	},
 	
 	userToggle: function(){
-    this.$foundMedia.removeClass("active");
-    this.$myMedia.removeClass("inactive");
-    this.$("a").removeClass("active");
-    this.$userToggle.addClass("active");
+    this.$wallpaperMedia.removeClass("active")
+    this.$foundMedia.removeClass("active")
+    this.$myMedia.removeClass("inactive")
+    this.$("a").removeClass("active")
+    this.$userToggle.addClass("active")
 	},
 
 	show: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index cf98170..0140dc6 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -901,7 +901,7 @@ border-left: 1px solid black;
 
 .face {
 	background-color: #fff;
-	transition: 0.1s background-color ease;
+	transition: 0.1s background-color ease, 0.05s background-color ease;
 }
 .front { background-color: #fff; }
 .back  { background-color: #fff; }
@@ -1271,7 +1271,7 @@ border-left: 1px solid black;
 .noMedia {
   margin: 40px;
 }
-.foundMedia {
+.foundMedia, .wallpaperMedia {
   position:absolute;
   top:0;
   left:0;
@@ -1282,8 +1282,7 @@ border-left: 1px solid black;
   padding-top:40px;
   width: 100%;
 }
-
-.foundMedia.active {
+.foundMedia.active, .wallpaperMedia.active {
   -webkit-transform: translateX(0%);
   transform: translateX(0%);
 }
@@ -1718,6 +1717,17 @@ input[type="range"]::-webkit-slider-thumb {
 	cursor: pointer;
 }
 
+#helpCursor {
+  position: fixed;
+  max-width: 200px;
+  font-size: 13px;
+  color: black;
+  background: #fff;
+  margin: 8px 0 0 8px;
+  padding: 4px;
+  font-weight: 500;
+  z-index: 22;
+}
 
 .settings.info {
   right: auto;
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 7996f84..d1e2c99 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -6,7 +6,13 @@
 <span class="close" id="fixed_close">X</span>
 
 <div class="mediaDrawer fixed animate mediaViewer">
-	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+	<h2>
+	  <a href="#" class="userToggle active">Your Media</a>
+	  – <a href="#" class="foundToggle">Found Media</a>
+<!--
+	  – <a href="#" class="wallpaperToggle">Wallpaper</a>
+ -->
+	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
@@ -29,4 +35,9 @@
 	<div class="foundMedia">
 	  <span class="container"></span>
  	</div>
+ 	
+ 	<div class="wallpaperMedia">
+	  <span class="container"></span>
+ 	</div>
+ 	
 </div>
\ No newline at end of file
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 7c40a75..8443abb 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,3 +1,5 @@
+<span id="helpCursor"></span>
+
 <div class="vvbox settings" id="editorSettings">
 	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 07ee7a5..05f4b58 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -102,6 +102,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/HelpCursor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
-- 
cgit v1.2.3-70-g09d2


From dd6b2cc2cdd97b6163d115e5415736bccbffa831 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 15 Oct 2014 12:36:52 -0400
Subject: get rid of menu options

---
 public/assets/javascripts/rectangles/engine/map/ui_editor.js |  5 +++--
 public/assets/javascripts/ui/editor/EditorToolbar.js         | 10 +++++-----
 public/assets/javascripts/ui/editor/HelpCursor.js            |  8 ++++++--
 views/controls/builder/info.ejs                              |  5 ++++-
 views/controls/editor/light-control.ejs                      |  7 ++++++-
 views/controls/editor/presets.ejs                            | 12 ++++--------
 views/controls/editor/toolbar.ejs                            |  4 ++++
 views/controls/editor/wallpaper.ejs                          |  3 +++
 8 files changed, 35 insertions(+), 19 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 072ff7e..44e416d 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -213,7 +213,8 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height - deltaY), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
+		  app.tube("builder-pick-room", intersects[0])
 			
 			clearTimeout(wheelTimeout)
 			wheelTimeout = setTimeout(function(){
@@ -224,7 +225,7 @@ Map.UI.Editor = function(map){
         })
         Rooms.rebuild()
         wheelState = null
-			}, 500)
+			}, 250)
 		}
 		else {
 			map.set_zoom(map.zoom_exponent - deltaY/20)
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 4f07d1f..9c2f3d3 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -30,11 +30,11 @@ var EditorToolbar = View.extend({
 	},
 	
 	toggleMap: function(state){
-		if (typeof state != "boolean") {
-		  state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
-      this.resetControls()
-		}
-    $("[data-role='toggle-map-view']").toggleClass("inuse", state)
+// 		if (typeof state != "boolean") {
+// 		  state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+//       this.resetControls()
+// 		}
+//     $("[data-role='toggle-map-view']").toggleClass("inuse", state)
 		map.toggle(state)
 		$("#minimap").toggleClass("hide", state)
 		this.parent.info.toggle(state)
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 842e871..b2f411d 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -3,8 +3,12 @@ var HelpCursor = View.extend({
 	el: "#helpCursor",
 	
 	messages: {
-	  start: "Welcome to Vvalls!",
-	  move: "Use the up and down keys to move around. Use left and right to pivot. WASD works too.",
+	  start: "Welcome to Vvalls!  Click one of the tools at right to learn how it works.",
+	  media: "This is where you pick media to go on the walls.  You can upload media, paste links, or use some of the found media.",
+	  presets: "These presets will affect on all the walls.  Click some of them to see the walls change.",
+	  wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.",
+	  colors: "",
+	  settings: "This is where you publish your project.",
 	},
 	shown: {},
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 205938f..54bb38e 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -2,7 +2,10 @@
 	<h4>Map Editor</h4>
 
   <div class="no-selection">
-    Click a room to select it, or click and drag to make a new room.
+    Click and drag to make a new room.
+    Click a room to select it.
+    <br><br>
+    Press ESC to toggle the map.
   </div>
   
 	
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8b20464..4604a7a 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,6 +1,11 @@
 <div class="vvbox lightcontrol">
 	<h4>Edit Room Colors</h4>
-  <div id="color-picker">
+
+  <h4>Preset Colors</h4>
+  <div class="colors">
+  </div>
+
+  <div id="color-picker" style="display: none">
   </div>
   
 	<div class="slider">
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 70e48e3..8dd1986 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,18 +1,14 @@
 <div class="vvbox" id="presets">
-  <h4>Preset Colors</h4>
-  <div class="colors">
-  </div>
-
   <h4>Preset Styles</h4>
   <div class="presets">
-    <span data-preset="wireframe">
-      Wireframe
+    <span data-preset="inverse">
+      Inverse
     </span>
     <span data-preset="shaded">
       Shaded
     </span>
-    <span data-preset="inverse">
-      Inverse
+    <span data-preset="wireframe">
+      Wireframe
     </span>
     <span data-preset="pfunk">
       P.Funk
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 57a98b9..1bb31b8 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,9 +1,11 @@
 
 <div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left">
+<!-- 
 	<span
 		data-role='undo'
 		data-info="undo"
 		class="ion-reply"></span>
+ -->
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
@@ -30,6 +32,7 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
+<!-- 
   <span
     data-role='toggle-text-editor'
     data-info="add text to wall"
@@ -38,6 +41,7 @@
 		data-role='toggle-map-view'
 		data-info="toggle map view"
 		class="ion-ios7-world-outline"></span>
+ -->
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 5ca0390..accafa1 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -21,15 +21,18 @@
     <input type="text" placeholder="Enter Image URL" class="url">
  -->
   </div>
+  
   <div class="wallpaperRemove toolButton">
     <span class="ion-scissors"></span>
     <label>Remove Wallpaper</label>
   </div>
 
+<!--
   <div class="wallpaperResize toolButton">
     <span class="ion-arrow-resize"></span>
     <label>Resize Wallpaper</label>
   </div>
+-->
 
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
-- 
cgit v1.2.3-70-g09d2


From 9ae4f45f24e3e79aeb32e0a128ee798381b80569 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 15 Oct 2014 22:35:48 -0400
Subject: more help text

---
 public/assets/javascripts/defaults.js                        | 2 +-
 public/assets/javascripts/rectangles/engine/rooms/builder.js | 2 +-
 public/assets/javascripts/ui/editor/HelpCursor.js            | 8 +++++---
 public/assets/javascripts/ui/editor/MediaViewer.js           | 5 ++++-
 public/assets/javascripts/ui/editor/Presets.js               | 4 ++--
 public/assets/stylesheets/app.css                            | 2 ++
 6 files changed, 15 insertions(+), 8 deletions(-)

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

diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 9ba0b4d..12aed62 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -3,7 +3,7 @@ app.defaults = {
 	units: app.units = "ft",
 	footResolution: 36,
 	meterResolution: 100,
-	wallOpacity: 0.95,
+	wallOpacity: 0.98,
 	outlineWidth: 2,
 	colors: {
     wall: [255,255,255],
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 33333fb..c95734b 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -280,7 +280,7 @@
 			return el
 		}
 		this.make_wall = function (klass) {
-		  // klass += ".backface-hidden"
+		  klass += ".backface-hidden"
 			var el = new MX.Object3D(".face" + (klass || ""))
 			el.width = el.height = el.scaleX = el.scaleY = el.scaleZ = 1
 			el.z = el.y = el.x = 0
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 8bfaef8..9b6807e 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -5,9 +5,11 @@ var HelpCursor = View.extend({
 	active: false,
 	
 	messages: {
-	  start: "Welcome to Vvalls!  Click one of the tools at right to learn how it works.",
-	  media: "This is where you pick media to go on the walls.  You can upload media, paste links, or use some of the found media.",
-	  presets: "These presets will affect on all the walls.  Click some of them to see the walls change.",
+	  start: "Welcome to Vvalls!  Click one of the tools at right to learn about it.",
+	  media: "This is where you pick media to go on the walls.  You can upload media and paste links.",
+	  addmedia: "Great, now click a wall to place this image.",
+	  resize: "Drag the image to position it, or use the dots to resize.",
+	  presets: "These are some basic presets to get you started. Click em! :-)",
 	  wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.",
 	  colors: "Use these colors to change the color of the walls, floor, and ceiling.",
 	  settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.",
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index e196e41..8cae4a4 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -77,6 +77,7 @@ var MediaViewer = ModalView.extend({
 		this.__super__.hide.call(this)
 		this.deleteArmed(false)
 		this.parent.mediaUpload.hide()
+		this.parent.cursor.message('start')
 	},
 
 	load: function(){
@@ -232,7 +233,8 @@ var MediaViewer = ModalView.extend({
 		}
 
 		this.hide()
-		
+		this.parent.cursor.message('addmedia')
+
 		var $ants = $('.ants');
 		var $floatingImg = $('.floatingImg');
 		
@@ -267,6 +269,7 @@ var MediaViewer = ModalView.extend({
 			$(window).off('mousedown', _hideCursor)
       app.off('cancel-scenery', _hideCursor)
 			$floatingImg.parent().removeClass('edit')
+			app.controller.cursor.message('resize')
 		}
 		$(window).on('mousemove', _followCursor)
 		$(window).on('mousedown', _hideCursor)
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 35b5b58..4edc957 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -39,11 +39,11 @@ var Presets = View.extend({
   },
 
   toggle: function(state){
-    this.$el.toggleClass("active", state);
+    this.$el.toggleClass("active", state)
+    this.parent.cursor.message(state ? "presets" : "start")
   },
   
   show: function(){
-    this.parent.cursor.message("presets")
     this.toggle(true)
   },
   
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 250ae67..1ab1198 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1676,6 +1676,7 @@ input[type="range"]::-webkit-slider-thumb {
 	cursor:pointer;
   border-bottom: 1px transparent solid;
 }
+.presets span:hover,
 .presets span.active {
 	text-decoration: underline;
 }
@@ -1728,6 +1729,7 @@ input[type="range"]::-webkit-slider-thumb {
   padding: 4px;
   font-weight: 500;
   z-index: 22;
+  display: none;
 }
 
 .settings.info {
-- 
cgit v1.2.3-70-g09d2


From f885f2caca46af82ae49149e361a25e3419fedc0 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 15 Oct 2014 23:40:12 -0400
Subject: fix wallpaper tiling bug

---
 .../assets/javascripts/rectangles/models/wall.js   | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 7ff9015..2ee88d9 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -260,24 +260,34 @@
 	  this.background.y = background.y || this.background.y
 	  this.background.scale = background.scale || this.background.scale || 1
 	  
-		var useX = this.side & FRONT_BACK
-		var shouldFlip = this.side & (LEFT | BACK)
-
 		var mx, dx, dy
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
 		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
 
 		this.surface.faces.forEach(function(face, i){
-      
-      if (shouldFlip) {
-        mx = this.mx[this.mx.length-1-i]
-        dx = Math.round( this.background.x + face.x.a )
-        dy = Math.round( this.background.y + face.y.b )
-      }
-      else {
-        mx = this.mx[i]
-        dx = Math.round( this.background.x - face.x.b )
-        dy = Math.round( this.background.y + face.y.b )
+      // this.mx[i].el.innerHTML = sidesToString(this.side)
+
+      switch (this.side) {
+      	case LEFT:
+					mx = this.mx[this.mx.length-1-i]
+					dx = Math.round( this.background.x + face.x.a )
+					dy = Math.round( this.background.y + face.y.b )
+					break
+				case RIGHT:
+					mx = this.mx[this.mx.length-1-i]
+					dx = Math.round( this.background.x + face.x.b )
+					dy = Math.round( this.background.y + face.y.b )
+					break
+				case FRONT:
+					mx = this.mx[this.mx.length-1-i]
+					dx = Math.round( this.background.x + face.x.b )
+					dy = Math.round( this.background.y + face.y.b )
+					break
+				case BACK:
+					mx = this.mx[i]
+					dx = Math.round( this.background.x - face.x.a )
+					dy = Math.round( this.background.y + face.y.b )
+					break
       }
       
       mx.el.style.backgroundPosition = dx + 'px ' + dy + 'px'
@@ -286,7 +296,6 @@
 	}
 	
 	Wall.prototype.outline = function(wallColor, outlineColor){
-		var useX = this.side & FRONT_BACK
 		var mx = this.mx
 
 		var len = this.mx.length
-- 
cgit v1.2.3-70-g09d2


From a7fe78b6059e3568d38876ba68e650b841912125 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 00:48:22 -0400
Subject: unfocus ui on esc

---
 public/assets/javascripts/rectangles/engine/map/_map.js      |  2 +-
 public/assets/javascripts/rectangles/engine/map/ui_editor.js | 12 ++++++++++--
 public/assets/javascripts/ui/editor/EditorToolbar.js         |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 3a47dab..64372c5 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -67,7 +67,7 @@ var Map = function(opt){
 	}
 		
 	base.toggle = function(state){
-		$(base.el).toggle(state)
+		return $(base.el).toggle(state).is(':visible')
 	}
 
 }
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 44e416d..9d69990 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -26,6 +26,13 @@ Map.UI.Editor = function(map){
 		resize: true,
 		destroy: false,
 	})
+
+	base.blur = function(){
+		Rooms.forEach(function(r){
+			return r.focused = false
+		})
+		app.tube("builder-pick-nothing")
+	}
 	
 	//
 	
@@ -190,7 +197,7 @@ Map.UI.Editor = function(map){
       })
       Rooms.rebuild()
     }
-		
+
 		var intersects = Rooms.filter(function(r){
 			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
@@ -207,7 +214,7 @@ Map.UI.Editor = function(map){
 		var cursor = base.mouse.cursor
 
 		var intersects = Rooms.filter(function(r){
-			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
+			return r.focused // = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
 		
 		if (intersects.length) {
@@ -234,4 +241,5 @@ Map.UI.Editor = function(map){
 	
 	function rightclick (e){
 	}
+
 }
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 9c2f3d3..a460bbf 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -35,7 +35,8 @@ var EditorToolbar = View.extend({
 //       this.resetControls()
 // 		}
 //     $("[data-role='toggle-map-view']").toggleClass("inuse", state)
-		map.toggle(state)
+		var state = map.toggle(state)
+		if (state) { map.ui.blur() }
 		$("#minimap").toggleClass("hide", state)
 		this.parent.info.toggle(state)
 	},
-- 
cgit v1.2.3-70-g09d2


From 513a272520222784d67dc22c1ac833aa47a9c844 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 00:58:28 -0400
Subject: rename light control to color control

---
 .../javascripts/mx/extensions/mx.movements.js      |   4 +-
 .../javascripts/rectangles/engine/scenery/undo.js  |   2 +-
 .../javascripts/ui/builder/BuilderSettings.js      |   2 +-
 .../assets/javascripts/ui/builder/BuilderView.js   |   2 +-
 .../assets/javascripts/ui/editor/ColorControl.js   | 305 +++++++++++++++++++++
 .../assets/javascripts/ui/editor/EditorSettings.js |   4 +-
 .../assets/javascripts/ui/editor/EditorToolbar.js  |  20 +-
 public/assets/javascripts/ui/editor/EditorView.js  |   2 +-
 .../assets/javascripts/ui/editor/LightControl.js   | 305 ---------------------
 public/assets/javascripts/ui/editor/Presets.js     |   2 +-
 public/assets/stylesheets/app.css                  |   6 +-
 views/controls/editor/color-control.ejs            |  28 ++
 views/controls/editor/light-control.ejs            |  28 --
 views/controls/editor/toolbar.ejs                  |   2 +-
 views/editor.ejs                                   |   2 +-
 views/partials/scripts.ejs                         |   2 +-
 16 files changed, 358 insertions(+), 358 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/ColorControl.js
 delete mode 100644 public/assets/javascripts/ui/editor/LightControl.js
 create mode 100644 views/controls/editor/color-control.ejs
 delete mode 100644 views/controls/editor/light-control.ejs

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 40e786d..c2a2473 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -131,8 +131,8 @@ MX.Movements = function (cam) {
 						app.controller.mediaViewer.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.lightControl.$el.hasClass('active')) {
-						app.controller.lightControl.hide()
+					else if (app.controller.colorControl.$el.hasClass('active')) {
+						app.controller.colorControl.hide()
 						$(".inuse").removeClass("inuse")
 					}
 					else if (app.controller.wallpaperPicker.$el.hasClass('active')) {
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index bee8c49..ff4f911 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -122,7 +122,7 @@
       type: "update-colors",
       undo: function(state){
         Walls.setColor[ state.mode ]( state.rgb )
-        app.router.editorView.lightControl.setSwatchColor( state.mode, state.rgb )
+        app.router.editorView.colorControl.setSwatchColor( state.mode, state.rgb )
 
         Minotaur.watch( app.router.editorView.settings )
       },
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index fe67e9b..c8c8880 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -30,7 +30,7 @@ var BuilderSettings = FormView.extend({
 		this.$id.val(data._id)
 		this.$name.val(data.name)
 
-		this.parent.lightControl.loadDefaults()
+		this.parent.colorControl.loadDefaults()
 
 		data.rooms && Rooms.deserialize(data.rooms)
 		data.startPosition && scene.camera.move(data.startPosition)
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index a89111f..735274e 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -11,7 +11,7 @@ var BuilderView = View.extend({
 		this.info = new BuilderInfo ({ parent: this })
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
-		this.lightControl = new LightControl ({ parent: this })
+		this.colorControl = new ColorControl ({ parent: this })
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
new file mode 100644
index 0000000..26358f1
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -0,0 +1,305 @@
+
+var ColorControl = View.extend({
+  el: ".colorcontrol",
+  
+  events: {
+    "mousedown": "stopPropagation",
+    "click .color-swatches span": "select",
+    "mousedown #brightness-control": "beginBrightness",
+    "input #brightness-control": "updateBrightness",
+  },
+
+	colors: [
+		[255,94,58],
+		[255,149,0],
+		[255,219,76],
+		[76,217,100],
+		[52,170,220],
+		[29,98,240],
+		[198,68,252],
+		[0,0,0],
+		[74,74,74],
+		[125,126,127],
+		[209,211,212],
+		[235,235,235],
+		[255,255,255],
+	],
+  
+  initialize: function(opt){
+    this.parent = opt.parent
+
+    this.colorPicker = new LabColorPicker(this, 180, 180)
+    this.$("#color-picker").append( this.colorPicker.canvas )
+    this.$("#color-picker").append( this.colorPicker.cursor )
+    
+    this.$swatches = this.$(".swatch")
+    this.$labels = this.$(".swatch + label")
+    this.$swatch = {
+      wall: this.$("#wall-color"),
+      outline: this.$("#outline-color"),
+      floor: this.$("#floor-color"),
+      ceiling: this.$("#ceiling-color"),
+    }
+    this.$brightnessControl = this.$("#brightness-control")
+
+    this.$colors = this.$(".colors")
+    this.colors.forEach(function(color){
+    	var $swatch = $("<span>")
+    	$swatch.css("background-color","rgb(" + color + ")")
+    	$swatch.data('color', color)
+    	this.$colors.append($swatch)
+    }.bind(this))
+    
+  },
+
+  modes: [ "wall", "outline", "floor", "ceiling" ],
+
+  load: function(data){
+    this.modes.forEach(function(mode){
+      Walls.setColor[mode](data[mode])
+      this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
+    }.bind(this))
+    this.setMode("wall")
+  },
+  
+  loadDefaults: function(){
+    var colors = {
+      wall: app.defaults.colors.wall.slice(),
+      outline: app.defaults.colors.outline.slice(),
+      floor: app.defaults.colors.floor.slice(),
+      ceiling: app.defaults.colors.ceiling.slice(),
+    }
+    this.load(colors)
+  },
+  
+  toggle: function(state){
+    this.$el.toggleClass("active", state);
+  },
+  
+  show: function(){
+    this.parent.cursor.message("colors")
+    this.toggle(true)
+  },
+  
+  hide: function(){
+    this.toggle(false)
+  },
+  
+  pick: function(rgb, Lab){
+    this.labColor = Lab
+    this.setSwatchColor(this.mode, rgb)
+    // console.log(rgb)
+    Walls.setColor[ this.mode ](rgb)
+  },
+  
+  setSwatchColor: function(mode, rgb) {
+    this.$swatch[ mode ].css("background-color", rgb_string(rgb))
+  },
+  
+  initialState: null,
+  
+  begin: function(){
+    this.initialState = this.serialize()
+  },
+  
+  serialize: function(){
+    return {
+      mode: this.mode,
+      rgb: Walls.colors[ this.mode ]
+    }
+  },
+  
+  finalize: function(){
+    if (! this.initialState) { return }
+    UndoStack.push({
+      type: 'update-colors',
+      undo: this.initialState,
+      redo: this.serialize(),
+    })
+
+    this.initialState = null
+
+    // TODO: watch individual wall object here
+    Minotaur.watch( app.router.editorView.settings )
+  },
+  
+  setMode: function (mode) {
+    var color, brightness
+    this.mode = mode
+    this.$(".active").removeClass("active")
+    this.$swatch[ mode ].parent().addClass("active")
+    color = Walls.colors[ mode ]
+    
+    this.labColor = this.colorPicker.load(color)
+    this.$brightnessControl.val( this.labColor[0] )
+  },
+  
+  select: function(e){
+    var mode = $('.swatch', e.currentTarget).data('mode')
+    this.setMode(mode)
+  },
+  
+  beginBrightness: function(){
+    this.begin()
+    $(window).one("mouseup", this.finalize.bind(this))
+  },
+  
+  updateBrightness: function(){
+    this.labColor[0] = parseFloat( this.$brightnessControl.val() )
+    var rgb = this.colorPicker.setLab( this.labColor )
+    this.pick(rgb, this.labColor)
+  },
+
+})
+
+var LabColorPicker = function (parent, w, h) {
+  var base = this
+  var canvas = this.canvas = document.createElement('canvas')
+  var ctx = this.ctx = canvas.getContext('2d')
+  var imageData = ctx.createImageData(w,h)
+  var data = imageData.data
+
+  var cursor = this.cursor = document.createElement("div")
+  cursor.className = "colorPickerCursor"
+
+  canvas.width = w
+  canvas.height = h
+  canvas.className = "colorPicker"
+
+  var ww = w-1
+  var hh = h-1
+  
+  var L_range = [0, 110]
+  var a_range = [-86.185, 98.254]
+  var b_range = [-107.863, 94.482]
+
+  var rgb = [0,0,0]
+  
+  var val = 80
+  
+  this.mouse = new mouse({
+    el: canvas,
+    down: function(e, cursor){
+      parent.begin()
+      cursor.x.a = -cursor.x.a
+      base.pick(cursor.x.a, cursor.y.a)
+    },
+    drag: function(e, cursor){
+      cursor.x.b = -cursor.x.b
+      base.pick(cursor.x.b, cursor.y.b)
+    },
+    up: function(){
+      parent.finalize()
+    }
+  })
+  
+  this.setLab = function(Lab) {
+    val = Lab[0]
+    this.paint()
+    var rgb = xyz2rgb(hunterlab2xyz(Lab[0], Lab[1], Lab[2])).map(Math.round)
+    return rgb
+  }
+  this.pick = function(i, j){
+    i = clamp(i, 0, w)
+    j = clamp(j, 0, h)
+    var x = mix( i/ww, a_range[0], a_range[1] )
+    var y = mix( j/hh, b_range[0], b_range[1] )
+    var rgb = xyz2rgb(hunterlab2xyz(val, x, y)).map(Math.round)
+    this.moveCursor(i, j)
+    parent.pick( rgb, [val,x,y] )
+  }
+  this.load = function(rgba){
+    var Lab = xyz2hunterlab(rgb2xyz(rgba))
+    var val = clamp( Lab[0], L_range[0], L_range[1] )
+    var x = mix( norm(Lab[1], a_range[0], a_range[1]), 0, ww )
+    var y = mix( norm(Lab[2], b_range[0], b_range[1]), 0, hh )
+    
+    this.moveCursor(x,y)
+    this.setLab(Lab)
+    return Lab
+  }
+  this.moveCursor = function(x,y){
+    cursor.style.left = x + "px"
+    cursor.style.top = y + "px"
+  }
+  this.paint = function() {
+    val = clamp(val, L_range[0], L_range[1])
+    var x, y, t
+    for (var i = 0; i < w; i++) {
+      for (var j = 0; j < h; j++) {
+        x = mix( i/ww, a_range[0], a_range[1] )
+        y = mix( j/hh, b_range[0], b_range[1] )
+        t = (j*w + i) * 4
+        rgb = xyz2rgb(hunterlab2xyz(val, x, y))
+        data[t] = Math.round( rgb[0] )
+        data[t+1] = Math.round( rgb[1] )
+        data[t+2] = Math.round( rgb[2] )
+        data[t+3] = 255
+      }
+    }
+    ctx.putImageData(imageData,0,0)
+  }
+  
+  function hunterlab2xyz (L,a,b) {
+    var_Y = L / 10
+    var_X = a / 17.5 * L / 10
+    var_Z = b / 7 * L / 10
+
+    Y = Math.pow(var_Y, 2)
+    X = ( var_X + Y ) / 1.02
+    Z = -( var_Z - Y ) / 0.847
+    xyz = [X,Y,Z]
+  }
+  function xyz2rgb(){
+    var var_X = xyz[0] / 100        //X from 0 to  95.047      (Observer = 2°, Illuminant = D65)
+    var var_Y = xyz[1] / 100        //Y from 0 to 100.000
+    var var_Z = xyz[2] / 100        //Z from 0 to 108.883
+
+    var_R = var_X *  3.2406 + var_Y * -1.5372 + var_Z * -0.4986
+    var_G = var_X * -0.9689 + var_Y *  1.8758 + var_Z *  0.0415
+    var_B = var_X *  0.0557 + var_Y * -0.2040 + var_Z *  1.0570
+
+    if ( var_R > 0.0031308 ) var_R = 1.055 * Math.pow( var_R, 1 / 2.4 ) - 0.055
+    else                     var_R = 12.92 * var_R
+    if ( var_G > 0.0031308 ) var_G = 1.055 * Math.pow( var_G, 1 / 2.4 ) - 0.055
+    else                     var_G = 12.92 * var_G
+    if ( var_B > 0.0031308 ) var_B = 1.055 * Math.pow( var_B, 1 / 2.4 ) - 0.055
+    else                     var_B = 12.92 * var_B
+
+    rgb[0] = clamp(var_R * 255, 0, 255)
+    rgb[1] = clamp(var_G * 255, 0, 255)
+    rgb[2] = clamp(var_B * 255, 0, 255)
+    return rgb
+  }
+  function rgb2xyz(RGB){
+    var var_R = ( RGB[0] / 255 )        // R from 0 to 255
+    var var_G = ( RGB[1] / 255 )        // G from 0 to 255
+    var var_B = ( RGB[2] / 255 )        // B from 0 to 255
+
+    if ( var_R > 0.04045 ) var_R = Math.pow( ( var_R + 0.055 ) / 1.055, 2.4)
+    else                   var_R = var_R / 12.92
+    if ( var_G > 0.04045 ) var_G = Math.pow( ( var_G + 0.055 ) / 1.055, 2.4)
+    else                   var_G = var_G / 12.92
+    if ( var_B > 0.04045 ) var_B = Math.pow( ( var_B + 0.055 ) / 1.055, 2.4)
+    else                   var_B = var_B / 12.92
+
+    var_R = var_R * 100
+    var_G = var_G * 100
+    var_B = var_B * 100
+
+    //Observer. = 2°, Illuminant = D65
+    var x = var_R * 0.4124 + var_G * 0.3576 + var_B * 0.1805
+    var y = var_R * 0.2126 + var_G * 0.7152 + var_B * 0.0722
+    var z = var_R * 0.0193 + var_G * 0.1192 + var_B * 0.9505
+    return [x,y,z]
+  }
+  function xyz2hunterlab (XYZ) {
+    var X = XYZ[0]
+    var Y = XYZ[1] || 1e-6  // otherwise divide-by-zero error when converting rgb(0,0,0)
+    var Z = XYZ[2]
+    var L = 10 * sqrt( Y )
+    var a = 17.5 * ( ( ( 1.02 * X ) - Y ) / sqrt( Y ) )
+    var b = 7 * ( ( Y - ( 0.847 * Z ) ) / sqrt( Y ) )
+    return [L,a,b]
+  }
+}
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index c0c140f..664b102 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -45,10 +45,10 @@ var EditorSettings = FormView.extend({
 		}
 
     if (data.colors && data.colors.wall) {
-      this.parent.lightControl.load(data.colors)
+      this.parent.colorControl.load(data.colors)
     }
     else {
-		  this.parent.lightControl.loadDefaults()
+		  this.parent.colorControl.loadDefaults()
     }
     
     if (data.walls) {
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index a460bbf..dceae3c 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -10,7 +10,7 @@ var EditorToolbar = View.extend({
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
     "click [data-role='toggle-presets']": 'togglePresets',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
-		"click [data-role='toggle-light-control']": 'toggleLightControl',
+		"click [data-role='toggle-color-control']": 'toggleColorControl',
 		"click [data-role='toggle-text-editor']": 'toggleTextEditor',
 	},
 	
@@ -46,7 +46,7 @@ var EditorToolbar = View.extend({
     this.toggleMap(false)
     this.parent.textEditor.hide()
 		this.parent.presets.hide()
-		this.parent.lightControl.hide()
+		this.parent.colorControl.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.mediaEditor.hide()
 		this.parent.settings.toggle()
@@ -75,7 +75,7 @@ var EditorToolbar = View.extend({
     this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.presets.hide()
-		this.parent.lightControl.hide()
+		this.parent.colorControl.hide()
 		this.parent.settings.hide()
 	},
 	
@@ -111,7 +111,7 @@ var EditorToolbar = View.extend({
 		this.resetMode()
 		$("[data-role='toggle-wallpaper-panel']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
-		this.parent.lightControl.hide()
+		this.parent.colorControl.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
@@ -119,17 +119,17 @@ var EditorToolbar = View.extend({
 		this.parent.wallpaperPicker.toggle(state)
 	},
 	
-	toggleLightControl: function(){
-		var state = ! $("[data-role='toggle-light-control']").hasClass("inuse")
+	toggleColorControl: function(){
+		var state = ! $("[data-role='toggle-color-control']").hasClass("inuse")
 		this.resetMode()
-		$("[data-role='toggle-light-control']").toggleClass("inuse", state)
+		$("[data-role='toggle-color-control']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
 		this.toggleMap(false)
-		this.parent.lightControl.toggle(state)
+		this.parent.colorControl.toggle(state)
 	},
 	
 	toggleTextEditor: function(){
@@ -138,7 +138,7 @@ var EditorToolbar = View.extend({
 		$("[data-role='toggle-text-editor']").toggleClass("inuse", state)
 		this.parent.mediaEditor.hide()
 		this.parent.wallpaperPicker.hide()
-		this.parent.lightControl.hide()
+		this.parent.colorControl.hide()
 		this.parent.settings.hide()
 		this.parent.presets.hide()
 		this.toggleMap(false)
@@ -153,7 +153,7 @@ var EditorToolbar = View.extend({
 		this.parent.wallpaperPicker.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
-		this.parent.lightControl.hide()
+		this.parent.colorControl.hide()
 		this.toggleMap(false)
 		this.parent.presets.toggle(state)
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 05d1bec..9946feb 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -17,7 +17,7 @@ var EditorView = View.extend({
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
-		this.lightControl = new LightControl ({ parent: this })
+		this.colorControl = new ColorControl ({ parent: this })
 		this.textEditor = new TextEditor ({ parent: this })
 		this.collaborators = new Collaborators ({ parent: this })
 		this.presets = new Presets ({ parent: this })
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
deleted file mode 100644
index 10f8d2c..0000000
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ /dev/null
@@ -1,305 +0,0 @@
-
-var LightControl = View.extend({
-  el: ".lightcontrol",
-  
-  events: {
-    "mousedown": "stopPropagation",
-    "click .color-swatches span": "select",
-    "mousedown #brightness-control": "beginBrightness",
-    "input #brightness-control": "updateBrightness",
-  },
-
-	colors: [
-		[255,94,58],
-		[255,149,0],
-		[255,219,76],
-		[76,217,100],
-		[52,170,220],
-		[29,98,240],
-		[198,68,252],
-		[0,0,0],
-		[74,74,74],
-		[125,126,127],
-		[209,211,212],
-		[235,235,235],
-		[255,255,255],
-	],
-  
-  initialize: function(opt){
-    this.parent = opt.parent
-
-    this.colorPicker = new LabColorPicker(this, 180, 180)
-    this.$("#color-picker").append( this.colorPicker.canvas )
-    this.$("#color-picker").append( this.colorPicker.cursor )
-    
-    this.$swatches = this.$(".swatch")
-    this.$labels = this.$(".swatch + label")
-    this.$swatch = {
-      wall: this.$("#wall-color"),
-      outline: this.$("#outline-color"),
-      floor: this.$("#floor-color"),
-      ceiling: this.$("#ceiling-color"),
-    }
-    this.$brightnessControl = this.$("#brightness-control")
-
-    this.$colors = this.$(".colors")
-    this.colors.forEach(function(color){
-    	var $swatch = $("<span>")
-    	$swatch.css("background-color","rgb(" + color + ")")
-    	$swatch.data('color', color)
-    	this.$colors.append($swatch)
-    }.bind(this))
-    
-  },
-
-  modes: [ "wall", "outline", "floor", "ceiling" ],
-
-  load: function(data){
-    this.modes.forEach(function(mode){
-      Walls.setColor[mode](data[mode])
-      this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
-    }.bind(this))
-    this.setMode("wall")
-  },
-  
-  loadDefaults: function(){
-    var colors = {
-      wall: app.defaults.colors.wall.slice(),
-      outline: app.defaults.colors.outline.slice(),
-      floor: app.defaults.colors.floor.slice(),
-      ceiling: app.defaults.colors.ceiling.slice(),
-    }
-    this.load(colors)
-  },
-  
-  toggle: function(state){
-    this.$el.toggleClass("active", state);
-  },
-  
-  show: function(){
-    this.parent.cursor.message("colors")
-    this.toggle(true)
-  },
-  
-  hide: function(){
-    this.toggle(false)
-  },
-  
-  pick: function(rgb, Lab){
-    this.labColor = Lab
-    this.setSwatchColor(this.mode, rgb)
-    // console.log(rgb)
-    Walls.setColor[ this.mode ](rgb)
-  },
-  
-  setSwatchColor: function(mode, rgb) {
-    this.$swatch[ mode ].css("background-color", rgb_string(rgb))
-  },
-  
-  initialState: null,
-  
-  begin: function(){
-    this.initialState = this.serialize()
-  },
-  
-  serialize: function(){
-    return {
-      mode: this.mode,
-      rgb: Walls.colors[ this.mode ]
-    }
-  },
-  
-  finalize: function(){
-    if (! this.initialState) { return }
-    UndoStack.push({
-      type: 'update-colors',
-      undo: this.initialState,
-      redo: this.serialize(),
-    })
-
-    this.initialState = null
-
-    // TODO: watch individual wall object here
-    Minotaur.watch( app.router.editorView.settings )
-  },
-  
-  setMode: function (mode) {
-    var color, brightness
-    this.mode = mode
-    this.$(".active").removeClass("active")
-    this.$swatch[ mode ].parent().addClass("active")
-    color = Walls.colors[ mode ]
-    
-    this.labColor = this.colorPicker.load(color)
-    this.$brightnessControl.val( this.labColor[0] )
-  },
-  
-  select: function(e){
-    var mode = $('.swatch', e.currentTarget).data('mode')
-    this.setMode(mode)
-  },
-  
-  beginBrightness: function(){
-    this.begin()
-    $(window).one("mouseup", this.finalize.bind(this))
-  },
-  
-  updateBrightness: function(){
-    this.labColor[0] = parseFloat( this.$brightnessControl.val() )
-    var rgb = this.colorPicker.setLab( this.labColor )
-    this.pick(rgb, this.labColor)
-  },
-
-})
-
-var LabColorPicker = function (parent, w, h) {
-  var base = this
-  var canvas = this.canvas = document.createElement('canvas')
-  var ctx = this.ctx = canvas.getContext('2d')
-  var imageData = ctx.createImageData(w,h)
-  var data = imageData.data
-
-  var cursor = this.cursor = document.createElement("div")
-  cursor.className = "colorPickerCursor"
-
-  canvas.width = w
-  canvas.height = h
-  canvas.className = "colorPicker"
-
-  var ww = w-1
-  var hh = h-1
-  
-  var L_range = [0, 110]
-  var a_range = [-86.185, 98.254]
-  var b_range = [-107.863, 94.482]
-
-  var rgb = [0,0,0]
-  
-  var val = 80
-  
-  this.mouse = new mouse({
-    el: canvas,
-    down: function(e, cursor){
-      parent.begin()
-      cursor.x.a = -cursor.x.a
-      base.pick(cursor.x.a, cursor.y.a)
-    },
-    drag: function(e, cursor){
-      cursor.x.b = -cursor.x.b
-      base.pick(cursor.x.b, cursor.y.b)
-    },
-    up: function(){
-      parent.finalize()
-    }
-  })
-  
-  this.setLab = function(Lab) {
-    val = Lab[0]
-    this.paint()
-    var rgb = xyz2rgb(hunterlab2xyz(Lab[0], Lab[1], Lab[2])).map(Math.round)
-    return rgb
-  }
-  this.pick = function(i, j){
-    i = clamp(i, 0, w)
-    j = clamp(j, 0, h)
-    var x = mix( i/ww, a_range[0], a_range[1] )
-    var y = mix( j/hh, b_range[0], b_range[1] )
-    var rgb = xyz2rgb(hunterlab2xyz(val, x, y)).map(Math.round)
-    this.moveCursor(i, j)
-    parent.pick( rgb, [val,x,y] )
-  }
-  this.load = function(rgba){
-    var Lab = xyz2hunterlab(rgb2xyz(rgba))
-    var val = clamp( Lab[0], L_range[0], L_range[1] )
-    var x = mix( norm(Lab[1], a_range[0], a_range[1]), 0, ww )
-    var y = mix( norm(Lab[2], b_range[0], b_range[1]), 0, hh )
-    
-    this.moveCursor(x,y)
-    this.setLab(Lab)
-    return Lab
-  }
-  this.moveCursor = function(x,y){
-    cursor.style.left = x + "px"
-    cursor.style.top = y + "px"
-  }
-  this.paint = function() {
-    val = clamp(val, L_range[0], L_range[1])
-    var x, y, t
-    for (var i = 0; i < w; i++) {
-      for (var j = 0; j < h; j++) {
-        x = mix( i/ww, a_range[0], a_range[1] )
-        y = mix( j/hh, b_range[0], b_range[1] )
-        t = (j*w + i) * 4
-        rgb = xyz2rgb(hunterlab2xyz(val, x, y))
-        data[t] = Math.round( rgb[0] )
-        data[t+1] = Math.round( rgb[1] )
-        data[t+2] = Math.round( rgb[2] )
-        data[t+3] = 255
-      }
-    }
-    ctx.putImageData(imageData,0,0)
-  }
-  
-  function hunterlab2xyz (L,a,b) {
-    var_Y = L / 10
-    var_X = a / 17.5 * L / 10
-    var_Z = b / 7 * L / 10
-
-    Y = Math.pow(var_Y, 2)
-    X = ( var_X + Y ) / 1.02
-    Z = -( var_Z - Y ) / 0.847
-    xyz = [X,Y,Z]
-  }
-  function xyz2rgb(){
-    var var_X = xyz[0] / 100        //X from 0 to  95.047      (Observer = 2°, Illuminant = D65)
-    var var_Y = xyz[1] / 100        //Y from 0 to 100.000
-    var var_Z = xyz[2] / 100        //Z from 0 to 108.883
-
-    var_R = var_X *  3.2406 + var_Y * -1.5372 + var_Z * -0.4986
-    var_G = var_X * -0.9689 + var_Y *  1.8758 + var_Z *  0.0415
-    var_B = var_X *  0.0557 + var_Y * -0.2040 + var_Z *  1.0570
-
-    if ( var_R > 0.0031308 ) var_R = 1.055 * Math.pow( var_R, 1 / 2.4 ) - 0.055
-    else                     var_R = 12.92 * var_R
-    if ( var_G > 0.0031308 ) var_G = 1.055 * Math.pow( var_G, 1 / 2.4 ) - 0.055
-    else                     var_G = 12.92 * var_G
-    if ( var_B > 0.0031308 ) var_B = 1.055 * Math.pow( var_B, 1 / 2.4 ) - 0.055
-    else                     var_B = 12.92 * var_B
-
-    rgb[0] = clamp(var_R * 255, 0, 255)
-    rgb[1] = clamp(var_G * 255, 0, 255)
-    rgb[2] = clamp(var_B * 255, 0, 255)
-    return rgb
-  }
-  function rgb2xyz(RGB){
-    var var_R = ( RGB[0] / 255 )        // R from 0 to 255
-    var var_G = ( RGB[1] / 255 )        // G from 0 to 255
-    var var_B = ( RGB[2] / 255 )        // B from 0 to 255
-
-    if ( var_R > 0.04045 ) var_R = Math.pow( ( var_R + 0.055 ) / 1.055, 2.4)
-    else                   var_R = var_R / 12.92
-    if ( var_G > 0.04045 ) var_G = Math.pow( ( var_G + 0.055 ) / 1.055, 2.4)
-    else                   var_G = var_G / 12.92
-    if ( var_B > 0.04045 ) var_B = Math.pow( ( var_B + 0.055 ) / 1.055, 2.4)
-    else                   var_B = var_B / 12.92
-
-    var_R = var_R * 100
-    var_G = var_G * 100
-    var_B = var_B * 100
-
-    //Observer. = 2°, Illuminant = D65
-    var x = var_R * 0.4124 + var_G * 0.3576 + var_B * 0.1805
-    var y = var_R * 0.2126 + var_G * 0.7152 + var_B * 0.0722
-    var z = var_R * 0.0193 + var_G * 0.1192 + var_B * 0.9505
-    return [x,y,z]
-  }
-  function xyz2hunterlab (XYZ) {
-    var X = XYZ[0]
-    var Y = XYZ[1] || 1e-6  // otherwise divide-by-zero error when converting rgb(0,0,0)
-    var Z = XYZ[2]
-    var L = 10 * sqrt( Y )
-    var a = 17.5 * ( ( ( 1.02 * X ) - Y ) / sqrt( Y ) )
-    var b = 7 * ( ( Y - ( 0.847 * Z ) ) / sqrt( Y ) )
-    return [L,a,b]
-  }
-}
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 4edc957..a3dc610 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -54,7 +54,7 @@ var Presets = View.extend({
   selectPreset: function(e){
     var preset = $(e.currentTarget).data('preset')
     if (! this.presets[preset]) return
-    this.parent.lightControl.load(this.presets[preset])
+    this.parent.colorControl.load(this.presets[preset])
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
   },
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 1ab1198..d7999b9 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1582,7 +1582,7 @@ border-left: 1px solid black;
 
 /* COLOR PICKER */
 
-.lightcontrol {
+.colorcontrol {
   margin-top: 8%;
   right: 80px;
   padding: 13px 20px 20px 20px;
@@ -1592,11 +1592,11 @@ border-left: 1px solid black;
   transition: -webkit-transform 0.2s ease-in-out;
 }
 
-.lightcontrol.active {
+.colorcontrol.active {
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
 }
-.lightcontrol .slider {  
+.colorcontrol .slider {  
 }
 h4 {
   font-weight:300;
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
new file mode 100644
index 0000000..040808e
--- /dev/null
+++ b/views/controls/editor/color-control.ejs
@@ -0,0 +1,28 @@
+<div class="vvbox colorcontrol">
+	<h4>Edit Room Colors</h4>
+
+  <div class="colors">
+  </div>
+
+  <div id="color-picker" style="display: none">
+  </div>
+  
+	<div class="slider">
+		<input type="range" min="0" max="110" value="0" id="brightness-control" />
+	</div>
+
+  <div class="color-swatches">
+    <span>
+      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+    </span>
+    <span class="active">
+      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+    </span>
+    <span>
+      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
+    </span>
+    <span>
+      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+    </span>
+  </div>
+</div>
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
deleted file mode 100644
index 99d68f5..0000000
--- a/views/controls/editor/light-control.ejs
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="vvbox lightcontrol">
-	<h4>Edit Room Colors</h4>
-
-  <div class="colors">
-  </div>
-
-  <div id="color-picker" style="display: none">
-  </div>
-  
-	<div class="slider">
-		<input type="range" min="0" max="110" value="0" id="brightness-control" />
-	</div>
-
-  <div class="color-swatches">
-    <span>
-      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
-    </span>
-    <span class="active">
-      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
-    </span>
-    <span>
-      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
-    </span>
-    <span>
-      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
-    </span>
-  </div>
-</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 1bb31b8..7b08db6 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -29,7 +29,7 @@
 		data-info="add wallpaper"
 		class="ion-ios7-keypad-outline"></span>
 	<span
-		data-role='toggle-light-control'
+		data-role='toggle-color-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
 <!-- 
diff --git a/views/editor.ejs b/views/editor.ejs
index c0562e9..29db917 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -17,7 +17,7 @@
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
-			[[ include controls/editor/light-control ]]
+			[[ include controls/editor/color-control ]]
 			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/settings ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 05f4b58..c9b4c95 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -103,7 +103,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/HelpCursor.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/ColorControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
-- 
cgit v1.2.3-70-g09d2


From c13532ec95c2d410354f7d342df70fd68dd78272 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 02:21:46 -0400
Subject: matrix mode

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 31 ++++++++++++++++-
 .../javascripts/rectangles/engine/rooms/mover.js   |  8 ++---
 .../assets/javascripts/rectangles/models/wall.js   |  4 +--
 .../assets/javascripts/ui/editor/ColorControl.js   | 21 ++++++++----
 public/assets/javascripts/ui/editor/Presets.js     | 39 ++++++++++++++++++++--
 public/assets/stylesheets/app.css                  | 22 +++++++-----
 views/controls/editor/presets.ejs                  | 12 -------
 7 files changed, 101 insertions(+), 36 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index f2348f0..5c16ce6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -140,6 +140,36 @@
 			var rgb_min = Math.min.apply(255, rgb)
 			return (rgb_max + rgb_min ) / 2
 		}
+    
+    base.setBodyColor = function(){
+  		$("#header").toggleClass("black", Walls.luminance() < 100)
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
+		}
+		base.clearBodyColor = function(){
+			$("#header").removeClass("black")
+			$("body").css("background-color", "transparent")
+		}
+		
+		base.setWallpaper = {
+			wall: function(background){
+				var img = new Image ()
+				img.onload = function(){
+					Walls.list.forEach(function(wall){
+						wall.wallpaper(background, img)
+					})
+				}.bind(this)
+				img.src = background.src
+				img.complete && img.onload()
+			}
+		}
+		
+		base.clearWallpaper = {
+			wall: function(){
+				Walls.list.forEach(function(wall){
+					wall.wallpaper("none")
+				})
+			}
+		}
 		
     base.setColor = {
     
@@ -181,7 +211,6 @@
           room.setCeilingColor(rgbColor)
         })
       },
-  
     }
   }
 
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index dd63db2..fae2ce6 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -44,8 +44,7 @@ Rooms.mover = new function(){
 
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
-			$("#header").removeClass("black")
-			$("body").css("background-color", "transparent")
+			Walls.clearBodyColor()
 			base.room = null
 		}
 
@@ -61,8 +60,9 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
-			$("#header").toggleClass("black", Walls.luminance() < 100)
-			$("body").css("background-color", rgb_string( Walls.colors.wall ))
+			if (! base.noclip) {
+				Walls.setBodyColor()
+			}
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 2ee88d9..542c99a 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -213,7 +213,7 @@
 		this.$walls.css("background-color", color)
 	}
 	
-	Wall.prototype.wallpaper = function(background){
+	Wall.prototype.wallpaper = function(background, img){
 	  if (! background) {
 	    background = { src: "none" }
 	  }
@@ -235,7 +235,7 @@
 		  return
 		}
 		
-		var img = new Image ()
+		img = img || new Image ()
 		img.onload = function(){
 		  this.backgroundImage = img
 		  this.wallpaperLoad(this.background.src)
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 26358f1..61a7ef6 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -4,9 +4,10 @@ var ColorControl = View.extend({
   
   events: {
     "mousedown": "stopPropagation",
-    "click .color-swatches span": "select",
     "mousedown #brightness-control": "beginBrightness",
     "input #brightness-control": "updateBrightness",
+    "click .color-swatches span": "setSurface",
+    "click .colors span": "setHue",
   },
 
 	colors: [
@@ -48,16 +49,15 @@ var ColorControl = View.extend({
     	$swatch.css("background-color","rgb(" + color + ")")
     	$swatch.data('color', color)
     	this.$colors.append($swatch)
-    }.bind(this))
-    
+    }.bind(this))    
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
 
   load: function(data){
     this.modes.forEach(function(mode){
-      Walls.setColor[mode](data[mode])
-      this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
+			Walls.setColor[mode](data[mode])
+			this.$swatch[ mode ].css("background-color", rgb_string(data[mode]))
     }.bind(this))
     this.setMode("wall")
   },
@@ -134,11 +134,20 @@ var ColorControl = View.extend({
     this.$brightnessControl.val( this.labColor[0] )
   },
   
-  select: function(e){
+  setSurface: function(e){
     var mode = $('.swatch', e.currentTarget).data('mode')
     this.setMode(mode)
   },
   
+  setHue: function(e){
+  	var color = $(e.currentTarget).data('color')
+
+    this.labColor = this.colorPicker.load(color)
+    this.$brightnessControl.val( this.labColor[0] )
+
+    this.pick(color, this.labColor)
+  },
+  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index a3dc610..c34c826 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -19,8 +19,9 @@ var Presets = View.extend({
       outline: [0,0,0],
       floor: [109,116,106],
       ceiling: [159,163,157],
+      background: [109,116,106],
     },
-    pfunk: {
+    "p.funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
@@ -32,10 +33,24 @@ var Presets = View.extend({
       floor: [0,0,0],
       ceiling: [0,0,0],
     },
+    matrix: {
+    	wall: { src: "http://bibleway.biz/images/Matrix1.gif", scale: 4.0, color: [0,0,0] },
+    	outline: [0,0,0],
+      floor: [10,15,10],
+      ceiling: [0,0,0],
+    },
   },
   
   initialize: function(opt){
     this.parent = opt.parent
+
+		this.$presets = this.$(".presets")
+  	_.keys(this.presets).forEach(function(name){
+			var $swatch = $("<span>")
+			$swatch.html(capitalize(name))
+			$swatch.data('preset', name)
+			this.$presets.append($swatch)
+  	}.bind(this))
   },
 
   toggle: function(state){
@@ -54,9 +69,9 @@ var Presets = View.extend({
   selectPreset: function(e){
     var preset = $(e.currentTarget).data('preset')
     if (! this.presets[preset]) return
-    this.parent.colorControl.load(this.presets[preset])
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
+    this.load(this.presets[preset])
   },
   
   selectColor: function(e){
@@ -64,4 +79,24 @@ var Presets = View.extend({
     console.log(preset)
   },
   
+  lastPreset: {wall:[1],outline:[1],floor:[1],ceiling:[1]},
+  load: function(preset){
+    this.parent.colorControl.modes.forEach(function(mode){
+    	if (! preset[mode].length) {
+    		Walls.setWallpaper[mode](preset[mode])
+				Walls.setColor[mode](preset[mode].color)
+			}
+			else {
+				if (! this.lastPreset[mode].length) {
+					Walls.clearWallpaper[mode]()
+				}
+				Walls.setColor[mode](preset[mode])
+				this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode]))
+    	}
+    }.bind(this))
+    this.parent.colorControl.setMode(preset.wall.color ? "wall" : "floor")
+    Walls.setBodyColor()
+    this.lastPreset = preset
+  },
+  
 })
\ No newline at end of file
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d7999b9..bd2d42c 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1445,12 +1445,12 @@ border-left: 1px solid black;
 .wallpaper, #presets {
   right: 80px;
   margin-top: 77px;
-  width: 172px;
+  width: 202px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
   transform: translateX(400px);
-	padding: 5px 5px 9px 5px;
+	padding: 10px 12px 12px 12px;
 }
 
 #presets {
@@ -1467,6 +1467,7 @@ border-left: 1px solid black;
   display: inline-block;
   border: 1px solid;
   background-size: contain;
+  margin: 0 2px 4px 2px;
   -webkit-transition: -webkit-transform 0.1s ease-in-out;
   line-height: 0;
   vertical-align: text-bottom;
@@ -1486,7 +1487,7 @@ border-left: 1px solid black;
 }
 
 .vvbox .colors {
-  max-width: 170px;
+  max-width: 155px;
 	margin-bottom: 5px;
 }
 .vvbox .colors span {
@@ -1585,7 +1586,7 @@ border-left: 1px solid black;
 .colorcontrol {
   margin-top: 8%;
   right: 80px;
-  padding: 13px 20px 20px 20px;
+  padding: 10px 12px 12px 12px;
   -webkit-transform: translateX(400px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateX(400px);
@@ -1607,8 +1608,8 @@ input[type=range] {
   -moz-appearance: none;
   cursor: pointer;
   background-color: black;
-  width: 180px;
-  height:3px;
+  width: 155px;
+  height: 3px;
 }
 input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
@@ -1702,8 +1703,7 @@ input[type="range"]::-webkit-slider-thumb {
 	margin-bottom:5px;
 }
 .color-swatches span.active, .color-swatches span.active:hover{
-	background:#000;
-	color:white;
+	background: #fff;
 }
 .color-swatches span:nth-child(3){
 	clear:left;
@@ -1711,10 +1711,14 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches span:hover {
 	background:#eee;
 }
+.color-swatches span.active label,
+.color-swatches span:hover label {
+	border-bottom: 1px solid;
+}
 
 .color-swatches label {
 	position: relative;
-	padding-left: 5px;
+	margin-left: 5px;
 	display: inline-block;
 	cursor: pointer;
 }
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 8dd1986..04b1cf1 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,17 +1,5 @@
 <div class="vvbox" id="presets">
   <h4>Preset Styles</h4>
   <div class="presets">
-    <span data-preset="inverse">
-      Inverse
-    </span>
-    <span data-preset="shaded">
-      Shaded
-    </span>
-    <span data-preset="wireframe">
-      Wireframe
-    </span>
-    <span data-preset="pfunk">
-      P.Funk
-    </span>
   </div>
 </div>
-- 
cgit v1.2.3-70-g09d2


From 37851cbd12dcb17be77265164876184019d34602 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 03:09:22 -0400
Subject: .. and floor and ceiling

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 28 ++++++++++++++++++++--
 .../assets/javascripts/rectangles/models/floor.js  |  5 ++--
 public/assets/javascripts/ui/editor/Presets.js     | 25 ++++++++++++++++---
 public/assets/javascripts/util.js                  |  3 ++-
 public/assets/stylesheets/app.css                  |  7 ++++++
 views/controls/editor/presets.ejs                  |  1 +
 6 files changed, 60 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 5c16ce6..fe5913d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -160,7 +160,19 @@
 				}.bind(this)
 				img.src = background.src
 				img.complete && img.onload()
-			}
+			},
+			floor: function(background){
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+					floor.wallpaper(background)
+				})
+			},
+			ceiling: function(background){
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+					floor.wallpaper(background)
+				})
+			},
 		}
 		
 		base.clearWallpaper = {
@@ -168,7 +180,19 @@
 				Walls.list.forEach(function(wall){
 					wall.wallpaper("none")
 				})
-			}
+			},
+			floor: function(){
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+					wall.wallpaper("none")
+				})
+			},
+			ceiling: function(){
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+					wall.wallpaper("none")
+				})
+			},
 		}
 		
     base.setColor = {
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 7ed52a1..9838232 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -15,6 +15,7 @@
 	var Floor = function(opt){
 		this.id = opt.id
 		this.side = opt.side
+		this.ceiling = opt.side & CEILING
 		this.mx = opt.mx
 	}
 	
@@ -114,8 +115,6 @@
 	  this.background.x = background.x || this.background.x
 	  this.background.y = background.y || this.background.y
 	  this.background.scale = background.scale || this.background.scale || 1
-	  
-		var shouldFlip = this.side & (CEILING)
 
 		var mx, dx, dy
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
@@ -125,7 +124,7 @@
       
       var region = mx.rect
       
-      if (shouldFlip) {
+      if (this.ceiling) {
         dx = Math.round( this.background.x - region.x.a )
         dy = Math.round( this.background.y - region.y.a )
       }
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index c34c826..cde2fdf 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -5,6 +5,8 @@ var Presets = View.extend({
 		"mousedown": "stopPropagation",
     "click .presets span": "selectPreset",
     "click .swatches span": "selectColor",
+    "change .url": "tileWalls",
+    "keydown .url": "enterSetUrl",
 	},
 	
   presets: {
@@ -21,7 +23,7 @@ var Presets = View.extend({
       ceiling: [159,163,157],
       background: [109,116,106],
     },
-    "p.funk": {
+    "p.Funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
@@ -34,7 +36,7 @@ var Presets = View.extend({
       ceiling: [0,0,0],
     },
     matrix: {
-    	wall: { src: "http://bibleway.biz/images/Matrix1.gif", scale: 4.0, color: [0,0,0] },
+    	wall: { src: "http://dump.fm/images/20130225/1361818675427-dumpfm-melipone-matrixremixtransfast.gif", scale: 4.0, color: [0,0,0] },
     	outline: [0,0,0],
       floor: [10,15,10],
       ceiling: [0,0,0],
@@ -43,7 +45,9 @@ var Presets = View.extend({
   
   initialize: function(opt){
     this.parent = opt.parent
-
+    
+    this.$url = this.$(".url")
+    
 		this.$presets = this.$(".presets")
   	_.keys(this.presets).forEach(function(name){
 			var $swatch = $("<span>")
@@ -99,4 +103,19 @@ var Presets = View.extend({
     this.lastPreset = preset
   },
   
+  tileWalls: function(){
+  	var url = this.$url.sanitize()
+  	if (url.length && url.indexOf("http://") == 0) {
+			Walls.setWallpaper.wall({ src: url })
+			Walls.setWallpaper.floor({ src: url })
+			Walls.setWallpaper.ceiling({ src: url })
+  	}
+  },
+	enterSetUrl: function (e) {
+		e.stopPropagation()
+		if (e.keyCode == 13) {
+			setTimeout(this.tileWalls.bind(this), 100)
+		}
+	},
+
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/util.js b/public/assets/javascripts/util.js
index 76c5c7b..367e20e 100644
--- a/public/assets/javascripts/util.js
+++ b/public/assets/javascripts/util.js
@@ -4,10 +4,11 @@ if (window.$) {
   $.fn.string = function() { return trim($(this).val()) }
   $.fn.enable = function() { return $(this).attr("disabled",null) }
   $.fn.disable = function() { return $(this).attr("disabled","disabled") }
+  $.fn.sanitize = function(s) { return trim(sanitize($(this).val())) }
   $.fn.htmlSafe = function(s) { return $(this).html(sanitize(s)) }
 }
 
-function trim(s){ return s.replace(/^\s+/,"").replace(/\s+$/,"") }
+function trim (s){ return s.replace(/^\s+/,"").replace(/\s+$/,"") }
 function sanitize (s){ return (s || "").replace(new RegExp("[<>&]", 'g'), "") }
 function capitalize (s){ return s.split(" ").map(capitalizeWord).join(" ") }
 function capitalizeWord (s){ return s.charAt(0).toUpperCase() + s.slice(1) }
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index bd2d42c..a711baa 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1698,6 +1698,13 @@ input[type="range"]::-webkit-slider-thumb {
 	width: 100%;
 	color: #555;
 }
+#presets .url {
+	margin: 4px 0;
+	padding: 2px;
+	font-size: 12px;
+	border: 1px black solid;
+	width: 100%;
+}
 
 .color-swatches span:nth-child(1),.color-swatches span:nth-child(2){
 	margin-bottom:5px;
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 04b1cf1..02e9d42 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -2,4 +2,5 @@
   <h4>Preset Styles</h4>
   <div class="presets">
   </div>
+  <input type="text" class="url" placeholder="enter a url">
 </div>
-- 
cgit v1.2.3-70-g09d2


From d02bf26b1a25923197dc85dbf0dc999f29bf13d1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 16 Oct 2014 13:50:14 -0400
Subject: show color picker

---
 public/assets/javascripts/rectangles/_env.js        | 4 ++--
 public/assets/javascripts/ui/editor/ColorControl.js | 2 +-
 public/assets/stylesheets/app.css                   | 1 +
 views/controls/editor/color-control.ejs             | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index ecde3ca..3221bac 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -10,8 +10,8 @@ environment.init = function(){
 			"z": 0,
 			"rotationX": 0, // PI/2,
 			"rotationY": PI/2, // PI
-// 			"rotationX": 0,
-// 			"rotationY": PI
+      // "rotationX": 0,
+      // "rotationY": PI
 		})
 		
 		scene.camera.radius = 20
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 61a7ef6..4d8a7bb 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -29,7 +29,7 @@ var ColorControl = View.extend({
   initialize: function(opt){
     this.parent = opt.parent
 
-    this.colorPicker = new LabColorPicker(this, 180, 180)
+    this.colorPicker = new LabColorPicker(this, 155, 155)
     this.$("#color-picker").append( this.colorPicker.canvas )
     this.$("#color-picker").append( this.colorPicker.cursor )
     
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 1cc8fd6..209a3ad 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1725,6 +1725,7 @@ input[type="range"]::-webkit-slider-thumb {
 
 .color-swatches label {
 	position: relative;
+  font-size: 13px;
 	margin-left: 5px;
 	display: inline-block;
 	cursor: pointer;
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index 040808e..8ce6e85 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -4,7 +4,7 @@
   <div class="colors">
   </div>
 
-  <div id="color-picker" style="display: none">
+  <div id="color-picker">
   </div>
   
 	<div class="slider">
-- 
cgit v1.2.3-70-g09d2


From f8a4bb4609511393c92c618962f990673328d2f0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 16 Oct 2014 14:31:13 -0400
Subject: cursor stuff, hit esc to exit wallpaper mode

---
 .../assets/javascripts/rectangles/models/floor.js  |  2 +-
 .../assets/javascripts/rectangles/models/wall.js   |  2 +-
 .../assets/javascripts/ui/editor/ColorControl.js   |  4 +-
 public/assets/javascripts/ui/editor/HelpCursor.js  | 15 ++++++-
 .../javascripts/ui/editor/WallpaperPicker.js       | 46 ++++++++++------------
 5 files changed, 39 insertions(+), 30 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 9838232..a144ecd 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -40,7 +40,7 @@
 					if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
-						Scenery.nextWallpaper = null
+						// Scenery.nextWallpaper = null
 
   					UndoStack.push({
   					  type: 'update-wallpaper',
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 542c99a..eb445a7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -104,7 +104,7 @@
 					else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
-						Scenery.nextWallpaper = null
+						// Scenery.nextWallpaper = null
 
   					UndoStack.push({
   					  type: 'update-wallpaper',
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 4d8a7bb..459ac1e 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -73,11 +73,13 @@ var ColorControl = View.extend({
   },
   
   toggle: function(state){
+    if (state) {
+      this.parent.cursor.message("colors")
+    }
     this.$el.toggleClass("active", state);
   },
   
   show: function(){
-    this.parent.cursor.message("colors")
     this.toggle(true)
   },
   
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 9b6807e..06f6ab2 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -43,9 +43,12 @@ var HelpCursor = View.extend({
     document.removeEventListener("mousemove", this.moveFn)
   },
   
+  offset: 100,
+  lastPosition: { pageX: 0, pageY: 0 },
   move: function(e){
-    this.el.style.left = e.pageX + "px"
+    this.el.style.right = clamp(window.innerWidth - e.pageX, this.offset, window.innerWidth) + "px"
     this.el.style.top = e.pageY + "px"
+    this.lastPosition = e
   },
 
   show: function(name){
@@ -54,6 +57,16 @@ var HelpCursor = View.extend({
 
   message: function(name){
     if (! this.active) return
+    if (name == "start" || name == "media" || name == "settings") {
+      this.offset = 100
+    }
+    else if (name == "colors") {
+      this.offset = 270
+    }
+    else {
+      this.offset = 290
+    }
+    this.move(this.lastPosition)
     this.$el.html(this.messages[name])
   },
 
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 6bcd859..afdfca7 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -28,19 +28,28 @@ var WallpaperPicker = UploadView.extend({
 	
   loaded: false,
 	show: function(){
-		if (! this.loaded) {
-      this.parent.cursor.message("wallpaper")
-			this.load()
-		}
-		else {
-      this.toggle(true)
-		}
+    this.toggle(true)
 	},
-	
 	hide: function(){
-		this.__super__.hide.call(this)
+		this.toggle(false)
 	},
-
+// 	hide: function(){
+// 		this.__super__.hide.call(this)
+// 	},
+  
+	toggle: function (state) {
+    app.tube('cancel-wallpaper')
+    this.$el.toggleClass("active", state)
+	  if (state) {
+      this.parent.cursor.message("wallpaper")
+	    if (! this.loaded) {
+        this.load()
+      }
+	  }
+    // toggle the class that makes the cursor a paintbucket
+    // $("body").removeClass("pastePaper")
+	},
+		
 	load: function(){
 		$.get("/api/media/user", { tag: this.mediaTag }, this.populate.bind(this))
 	},
@@ -86,21 +95,6 @@ var WallpaperPicker = UploadView.extend({
 		}.bind(this))
 	},
 
-	toggle: function (state) {
-	  if (state && ! this.loaded) {
-	    this.show()
-	  }
-	  else {
-      this.$el.toggleClass("active", state)
-	  }
-    // toggle the class that makes the cursor a paintbucket
-    // $("body").removeClass("pastePaper")
-	},
-	
-	hide: function(){
-		this.toggle(false)
-	},
-	
 	beforeUpload: function(){
 	},
 	
@@ -145,7 +139,7 @@ var WallpaperPicker = UploadView.extend({
 				$floatingSwatch.removeClass("scissors").hide()
 			}
 			$(window).on('mousemove', _followCursor)
-			$(window).one('click', _hideCursor);
+			// $(window).one('click', _hideCursor);
       app.on('cancel-wallpaper', _hideCursor)
 			$floatingSwatch.show()
 			_followCursor(e);
-- 
cgit v1.2.3-70-g09d2


From f974fbc68dcfb91adb022809ace9e3e1c1afb413 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 16 Oct 2014 17:53:27 -0400
Subject: tweak rightclick behavior

---
 .../assets/javascripts/rectangles/models/wall.js   | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index eb445a7..cead2e4 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -67,7 +67,39 @@
           }
 				},
 */
+        contextmenu: function(e){
+          if (! (e.ctrlKey || e.metaKey || e.shiftKey) ) {
+            e.preventDefault()
+          }
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            Scenery.nextMedia = null
+            app.tube('cancel-scenery')
+          }
+          else if (Scenery.nextWallpaper) {
+            e.preventDefault()
+            Scenery.nextWallpaper = null
+            app.tube('cancel-wallpaper')
+          }
+        },
+
 				mousedown: function(e){
+				  
+				  // right-click
+				  if (e.which == 3) {
+				    if (Scenery.nextMedia) {
+				      e.preventDefault()
+              Scenery.nextMedia = null
+              app.tube('cancel-scenery')
+				    }
+				    else if (Scenery.nextWallpaper) {
+				      e.preventDefault()
+              Scenery.nextWallpaper = null
+              app.tube('cancel-wallpaper')
+				    }
+				    return
+				  }
+          
           var offset = offsetFromPoint(e, mx.el)
           if (! offset) { return }
 
@@ -120,7 +152,7 @@
 					else {
 						app.controller.pickWall(base, pos)
 					}
-				}
+				},
 			})
 		})
 
-- 
cgit v1.2.3-70-g09d2


From 27e6f068a626239f47041b800f33676769ce9591 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 11:40:20 -0400
Subject: coupla things

---
 public/assets/javascripts/mx/extensions/mx.movements.js     | 6 +++---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 386819a..5b1e2de 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -139,15 +139,15 @@ MX.Movements = function (cam) {
 						app.controller.mediaViewer.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.colorControl.$el.hasClass('active')) {
+					else if (app.controller.colorControl && app.controller.colorControl.$el.hasClass('active')) {
 						app.controller.colorControl.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.wallpaperPicker.$el.hasClass('active')) {
+					else if (app.controller.wallpaperPicker && app.controller.wallpaperPicker.$el.hasClass('active')) {
 						app.controller.wallpaperPicker.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.presets.$el.hasClass('active')) {
+					else if (app.controller.presets && app.controller.presets.$el.hasClass('active')) {
 						app.controller.presets.hide()
 						$(".inuse").removeClass("inuse")
 					}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index fe5913d..29338cb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -181,6 +181,8 @@
 					wall.wallpaper("none")
 				})
 			},
+			outline: function(){
+			},
 			floor: function(){
 				Walls.floors.forEach(function(floor){
 					if (floor.ceiling) return
-- 
cgit v1.2.3-70-g09d2


From 8ad9d0afa5175c4f54606e419319916e2f2a7667 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 11:41:08 -0400
Subject: etc

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 29338cb..69b9aa4 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -186,13 +186,13 @@
 			floor: function(){
 				Walls.floors.forEach(function(floor){
 					if (floor.ceiling) return
-					wall.wallpaper("none")
+					floor.wallpaper("none")
 				})
 			},
 			ceiling: function(){
 				Walls.floors.forEach(function(floor){
 					if (! floor.ceiling) return
-					wall.wallpaper("none")
+					floor.wallpaper("none")
 				})
 			},
 		}
-- 
cgit v1.2.3-70-g09d2


From 9661f1ae85ca9df7e35b09b8f982c155c0b21208 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 11:51:20 -0400
Subject: builder fixes

---
 public/assets/javascripts/rectangles/models/wall.js | 2 +-
 public/assets/javascripts/ui/builder/BuilderView.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index cead2e4..75814dc 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -282,7 +282,7 @@
 	    url = "url(" + url + ")"
 	  }
 		this.mx.forEach(function(mx){
-      mx.el.style.backgroundImage = url
+      if (mx.el) mx.el.style.backgroundImage = url
     })
 	}
 
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index 735274e..9b7e1a2 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -31,6 +31,9 @@ var BuilderView = View.extend({
 	},
 	
 	hideExtras: function(){
-	}
+	},
+
+	pickWall: function(wall, pos){
+	},
 
 })
-- 
cgit v1.2.3-70-g09d2


From bd1c6c4855db62c59576d593375c3b1b566c36d4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 11:56:08 -0400
Subject: ceiling height wheel

---
 public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 9d69990..1a4ea3c 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -220,7 +220,7 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height - deltaY * 2), height_min, height_max )
 		  app.tube("builder-pick-room", intersects[0])
 			
 			clearTimeout(wheelTimeout)
-- 
cgit v1.2.3-70-g09d2


From 38a948be224d704589fa203520f224615a81c7d9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 12:09:21 -0400
Subject: colors work after editing layout

---
 .../javascripts/rectangles/engine/map/ui_editor.js      |  4 ++--
 .../javascripts/rectangles/engine/rooms/_walls.js       | 17 +++++++++--------
 public/assets/javascripts/rectangles/models/room.js     | 14 +-------------
 3 files changed, 12 insertions(+), 23 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 1a4ea3c..1ab9c73 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -220,7 +220,7 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height - deltaY * 2), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
 		  app.tube("builder-pick-room", intersects[0])
 			
 			clearTimeout(wheelTimeout)
@@ -235,7 +235,7 @@ Map.UI.Editor = function(map){
 			}, 250)
 		}
 		else {
-			map.set_zoom(map.zoom_exponent - deltaY/20)
+			map.set_zoom(map.zoom_exponent + deltaY/20)
 		}
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 69b9aa4..653278c 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -126,11 +126,10 @@
       var ceilingColor = rgb_string(Walls.colors.ceiling)
       Walls.list.forEach(function(wall){
         wall.outline(wallColor, outlineColor)
-        // TODO: SET WALLPAPER HERE
       })
-      Rooms.forEach(function(room){
-        room.setFloorColor(floorColor)
-        room.setCeilingColor(ceilingColor)
+      Walls.floors.forEach(function(floor){
+        if (floor.ceiling) floor.color(ceilingColor)
+        else floor.color(floorColor)
       })
 		}
 		
@@ -225,16 +224,18 @@
       floor: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.floor = rgb
-        Rooms.forEach(function(room){
-          room.setFloorColor(rgbColor)
+				Walls.floors.forEach(function(floor){
+					if (floor.ceiling) return
+          floor.color(rgbColor)
         })
       },
 
       ceiling: function(rgb){
         var rgbColor = rgb_string(rgb)
         Walls.colors.ceiling = rgb
-        Rooms.forEach(function(room){
-          room.setCeilingColor(rgbColor)
+				Walls.floors.forEach(function(floor){
+					if (! floor.ceiling) return
+          floor.color(rgbColor)
         })
       },
     }
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 1a4606c..b0344a1 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -158,19 +158,7 @@
 		})
 		return collision
 	}
-
-  Room.prototype.setFloorColor = function(rgbColor) {
-    this.mx_floor.map(function(mx){
-      mx.el.style.backgroundColor = rgbColor
-    })
-  }
-  
-  Room.prototype.setCeilingColor = function(rgbColor) {
-    this.mx_ceiling.map(function(mx){
-      mx.el.style.backgroundColor = rgbColor
-    })
-  }
-
+	
 	if ('window' in this) {
 		window.Room = Room
 	}
-- 
cgit v1.2.3-70-g09d2


From d9a6199f75d324c7b644beb1c732680a67ab8047 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 13:37:23 -0400
Subject: layout editor stuff

---
 .../assets/javascripts/rectangles/models/floor.js  | 34 ++++++++++++-
 public/assets/javascripts/ui/_router.js            |  1 -
 .../assets/javascripts/ui/builder/BuilderInfo.js   | 13 ++++-
 public/assets/javascripts/ui/editor/Presets.js     | 11 ++---
 public/assets/javascripts/ui/lib/UploadView.js     |  4 +-
 public/assets/javascripts/util.js                  | 55 ++++++++++++++++++++++
 public/assets/stylesheets/app.css                  | 22 ++++++---
 views/controls/editor/media-drawer.ejs             |  2 +-
 views/controls/editor/wallpaper.ejs                | 17 ++-----
 9 files changed, 125 insertions(+), 34 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index a144ecd..3f452e1 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -36,8 +36,40 @@
 
 		this.mx.forEach(function(mx, index){
 			$(mx.el).bind({
+        contextmenu: function(e){
+          if (! (e.ctrlKey || e.metaKey || e.shiftKey) ) {
+            e.preventDefault()
+          }
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            Scenery.nextMedia = null
+            app.tube('cancel-scenery')
+          }
+          else if (Scenery.nextWallpaper) {
+            e.preventDefault()
+            Scenery.nextWallpaper = null
+            app.tube('cancel-wallpaper')
+          }
+        },
+
 				mousedown: function(e){
-					if (Scenery.nextWallpaper) {
+				  
+				  // right-click
+				  if (e.which == 3) {
+				    if (Scenery.nextMedia) {
+				      e.preventDefault()
+              Scenery.nextMedia = null
+              app.tube('cancel-scenery')
+				    }
+				    else if (Scenery.nextWallpaper) {
+				      e.preventDefault()
+              Scenery.nextWallpaper = null
+              app.tube('cancel-wallpaper')
+				    }
+				    return
+				  }
+
+          if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
 						// Scenery.nextWallpaper = null
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 794079e..bda0960 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -212,7 +212,6 @@ var SiteRouter = Router.extend({
 		// this.documentModal.destroy(name)
 	},
 
-
 	testWallpaper: function(e){
 		var content = document.getElementById("content")
 		content.style.width = "680px"
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 67834e7..c708275 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -10,8 +10,10 @@ var BuilderInfo = View.extend({
 		"change [name=width]": 'changeWidth',
 		"change [name=depth]": 'changeDepth',
 		"change [name=height]": 'changeHeight',
+		"keydown [name=width]": 'enterWidth',
+		"keydown [name=depth]": 'enterDepth',
+		"keydown [name=height]": 'enterHeight',
 		"change [name=units]": 'changeUnits',
-		"change [name=resolution]": 'changeResolution',
 		"change [name=viewHeight]": 'changeViewHeight',
 		"click [data-role=destroy-room]": 'destroy',
 	},
@@ -85,16 +87,25 @@ var BuilderInfo = View.extend({
 		this.hide()
 	},
 
+	enterWidth: function(e){
+	  if (e.keyCode == 13) this.changeWidth(e)
+	},
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	enterDepth: function(e){
+	  if (e.keyCode == 13) this.changeDepth(e)
+	},
 	changeDepth: function(e){
 		e.stopPropagation()
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	enterHeight: function(e){
+	  if (e.keyCode == 13) this.changeHeight(e)
+	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.room.height = this.$height.unitVal()
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index be86af3..ab311ef 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -84,15 +84,12 @@ var Presets = View.extend({
     this.parent.colorControl.modes.forEach(function(mode){
     	if (! preset[mode].length) {
     		Walls.setWallpaper[mode](preset[mode])
-				Walls.setColor[mode](preset[mode].color)
 			}
 			else {
-				if (preset[mode].length) {
-					Walls.clearWallpaper[mode]()
-				}
-				Walls.setColor[mode](preset[mode])
-				this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode]))
-    	}
+        Walls.clearWallpaper[mode]()
+      }
+      Walls.setColor[mode](preset[mode])
+      this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode]))
     }.bind(this))
     this.parent.colorControl.setMode(preset.wall.color ? "wall" : "floor")
     Walls.setBodyColor()
diff --git a/public/assets/javascripts/ui/lib/UploadView.js b/public/assets/javascripts/ui/lib/UploadView.js
index efaa8c9..2d2c2c7 100644
--- a/public/assets/javascripts/ui/lib/UploadView.js
+++ b/public/assets/javascripts/ui/lib/UploadView.js
@@ -4,12 +4,12 @@ var UploadView = View.extend({
   // define uploadAction
 
 	events: {
-		"change .file": "handleFileSelect",
+		"change [type=file]": "handleFileSelect",
 		"submit form": "preventDefault",
 	},
 	
 	initialize: function(){
-		this.$file = this.$(".file")
+		this.$file = this.$("[type=file]")
 		this.$upload = this.$(".upload-icon")
   },
   
diff --git a/public/assets/javascripts/util.js b/public/assets/javascripts/util.js
index 367e20e..2fa994a 100644
--- a/public/assets/javascripts/util.js
+++ b/public/assets/javascripts/util.js
@@ -185,3 +185,58 @@ function bitcount(v) {
   v = (v & 0x33333333) + ((v >>> 2) & 0x33333333);
   return ((v + (v >>> 4) & 0xF0F0F0F) * 0x1010101) >>> 24;
 }
+
+// Function.bind polyfill
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function(oThis) {
+    if (typeof this !== 'function') {
+      // closest thing possible to the ECMAScript 5
+      // internal IsCallable function
+      throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
+    }
+
+    var aArgs   = Array.prototype.slice.call(arguments, 1),
+        fToBind = this,
+        fNOP    = function() {},
+        fBound  = function() {
+          return fToBind.apply(this instanceof fNOP && oThis
+                 ? this
+                 : oThis,
+                 aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}
+
+// rAF polyfill
+(function() {
+    var lastTime = 0;
+    var vendors = ['ms', 'moz', 'webkit', 'o'];
+    for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+        window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
+        window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] 
+                                   || window[vendors[x]+'CancelRequestAnimationFrame'];
+    }
+ 
+    if (!window.requestAnimationFrame)
+        window.requestAnimationFrame = function(callback, element) {
+            var currTime = new Date().getTime();
+            var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+            var id = window.setTimeout(function() { callback(currTime + timeToCall); }, 
+              timeToCall);
+            lastTime = currTime + timeToCall;
+            return id;
+        };
+ 
+    if (!window.cancelAnimationFrame)
+        window.cancelAnimationFrame = function(id) {
+            clearTimeout(id);
+        };
+}());
+
+
+
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 28eabd9..9df1573 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1507,9 +1507,12 @@ border-left: 1px solid black;
 
 .toolButton {
 	border: 1px solid;
-	display: inline-block;
-	width: 100%;
-	margin-top: 5px;
+	position: relative;
+	display: block;
+	float: right;
+	margin-left: 3px;
+  width: 35px;
+  height: 35px;
 	font-size: 14px;
 	font-weight: 300;
 }
@@ -1524,9 +1527,9 @@ border-left: 1px solid black;
 }
 .wallpaper form {
   position: relative;
-  padding: 2px 0 0 0;
   font-size: 14px;
   font-weight: 300;
+  overflow: hidden;
 }
 .toolButton:hover {
 	background:black;
@@ -1550,14 +1553,19 @@ border-left: 1px solid black;
 .wallpaper .wallpaperRemove:hover img {
   -webkit-filter:invert(100%);
 }
+.wallpaperUpload .upload-icon {
+  margin: 0 8px;
+}
 .wallpaperUpload .upload-icon.uploading {
 }
 .wallpaperUpload .upload-icon.uploading:before {
 	content: ' ' !important;
 	background-image: url("/assets/img/loader.gif");
 	background-repeat: no-repeat;
-	width: 40px;
-	height: 40px;
+	background-position: center;
+	width: 100%;
+	height: 100%;
+	position:absolute;top:0;left:0;
 }
 .wallpaperUpload input[type="text"]{
   border: 1px solid #ccc;
@@ -1575,7 +1583,7 @@ border-left: 1px solid black;
   top: 0;
   left: 0;
 	background: blue;
-	height: 28px;
+	height: 100%;
 	width: 100%;
 	opacity: 0;
 	cursor: pointer;
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d1e2c99..1404d86 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -26,7 +26,7 @@
 		<form>
 			<span class="ion-ios7-upload-outline upload-icon"></span><br>
 			Upload File
-			<input type="file" accept="image/*" class="file" multiple>
+			<input type="file" accept="image/*" multiple>
 		</form>
 		<small>~ or ~</small><br>
 		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index ed175ae..69a60ec 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -9,31 +9,20 @@
 			<span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span>
 			<span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span>
   </span>
+
+  <input type="text" class="url" placeholder="enter a url">
   
   <div class="wallpaperUpload toolButton">
     <form>
       <span class="ion-ios7-upload-outline upload-icon"></span>
-      <label>Upload Wallpaper</label>
-      <input type="file" accept="image/*" class="file" multiple>
+      <input type="file" accept="image/*" multiple>
     </form>
-<!-- 
-    <input type="text" placeholder="Enter Image URL" class="url">
- -->
   </div>
   
   <div class="wallpaperRemove toolButton">
     <span class="ion-scissors"></span>
-    <label>Remove Wallpaper</label>
   </div>
 
-<!--
-  <div class="wallpaperResize toolButton">
-    <span class="ion-arrow-resize"></span>
-    <label>Resize Wallpaper</label>
-  </div>
--->
-  <input type="text" class="url" placeholder="enter a url">
-
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
     <input data-role="wallpaper-scale" type="range" min="0.01" max="8.0" step="0.1" value="1.0">
-- 
cgit v1.2.3-70-g09d2


From a6d479579964014077502db5bc6e3af59c1f317e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Sat, 18 Oct 2014 09:34:46 -0400
Subject: reader adjustments

---
 public/assets/javascripts/rectangles/models/floor.js |  2 ++
 public/assets/javascripts/ui/builder/BuilderInfo.js  |  2 ++
 public/assets/javascripts/ui/reader/MediaPlayer.js   |  2 +-
 public/assets/stylesheets/app.css                    | 11 +++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 3f452e1..2fb870f 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -82,6 +82,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, null)
           }
           else {
             app.controller.pickWall(base, null)
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 4408511..4fd145d 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -96,6 +96,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterDepth: function(e){
 	  if (e.keyCode == 13) this.changeDepth(e)
 	},
@@ -104,6 +105,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterHeight: function(e){
 	  if (e.keyCode == 13) this.changeHeight(e)
 	},
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 6195ab6..7f73e1b 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length)) {
+			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9df1573..226fe98 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1930,8 +1930,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .playButton,.muteButton {
-	border-radius: 50px;
-	font-size: 22px;
+	border-radius: 50%;
+	font-size: 23px;
 	padding: 5px 0;
 	cursor: pointer;
 	margin-right: 5px;
@@ -1942,6 +1942,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 .playButton .on {
 	display: inline;
+  position: relative;
+  left: 1px;
 }
 .playButton.paused .on {
 	display: none;
@@ -1956,6 +1958,8 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton .on {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
 }
 .muteButton.muted .on {
 	display: none;
@@ -1966,6 +1970,9 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton.muted .off {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
+  top: -1px;
 }
 
 .btn, button {
-- 
cgit v1.2.3-70-g09d2


From b21cb665e3ca296b56d389d3a2f83434f4646f26 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Oct 2014 16:42:08 -0400
Subject: logarithmic wallpaper scale

---
 public/assets/javascripts/rectangles/models/floor.js   |  5 +++--
 public/assets/javascripts/rectangles/models/wall.js    |  7 ++++---
 public/assets/javascripts/ui/editor/WallpaperPicker.js | 10 +++++-----
 views/controls/editor/wallpaper.ejs                    |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 2fb870f..ac1f8c9 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -146,8 +146,9 @@
 
 	Floor.prototype.wallpaperPosition = function(background){
 	  if (this.background.src == "none") { return }
-	  this.background.x = background.x || this.background.x
-	  this.background.y = background.y || this.background.y
+
+	  this.background.x = background.x || this.background.x || 0
+	  this.background.y = background.y || this.background.y || 0
 	  this.background.scale = background.scale || this.background.scale || 1
 
 		var mx, dx, dy
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 75814dc..8590de7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -288,10 +288,11 @@
 
 	Wall.prototype.wallpaperPosition = function(background){
 	  if (this.background.src == "none") { return }
-	  this.background.x = background.x || this.background.x
-	  this.background.y = background.y || this.background.y
+
+	  this.background.x = background.x || this.background.x || 0
+	  this.background.y = background.y || this.background.y || 0
 	  this.background.scale = background.scale || this.background.scale || 1
-	  
+
 		var mx, dx, dy
 		var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale )
 		var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale )
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index b26a5dc..8f701b0 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -157,13 +157,13 @@ var WallpaperPicker = UploadView.extend({
       return;
     }
     this.wall = wall
-    this.$scale.val( this.wall.background.scale )
+    this.$scale.val( Math.log( this.wall.background.scale ) )
   },
   
   updateScale: function(){
     if (! this.wall) return;
-    s = parseFloat(this.$scale.val())
-    this.wall.wallpaperPosition({ scale: s })
+    var scale = Math.exp( parseFloat(this.$scale.val()) )
+    this.wall.wallpaperPosition({ scale: scale })
   },
 
   tileWalls: function(){
@@ -192,7 +192,7 @@ var WallpaperPicker = UploadView.extend({
       down: function(e, cursor){
         if (! base.wall) return
         dragging = true
-        s = parseFloat( base.$scale.val() )
+        // s = parseFloat( base.$scale.val() )
         x = base.wall.background.x
         y = base.wall.background.y
       },
@@ -203,7 +203,7 @@ var WallpaperPicker = UploadView.extend({
         dx = delta.a*s
         dy = delta.b*s
         base.wall.wallpaperPosition({
-          scale: s,
+          // scale: s,
           x: x+dx,
           y: y+dy,
         })
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 69a60ec..d2559cc 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -25,7 +25,7 @@
 
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
-    <input data-role="wallpaper-scale" type="range" min="0.01" max="8.0" step="0.1" value="1.0">
+    <input data-role="wallpaper-scale" type="range" min="-4" max="4" step="0.01" value="0.0">
   </div>
 
 </div>
-- 
cgit v1.2.3-70-g09d2


From 6fa1570122f2bae9abfaffc5ed90c8b6e36675ea Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 24 Oct 2014 16:57:50 -0400
Subject: hit enter to flood, floods room, badaboom

---
 .../javascripts/rectangles/engine/rooms/_walls.js  |  2 +-
 .../javascripts/ui/editor/WallpaperPicker.js       | 37 ++++++++++++++++------
 public/assets/stylesheets/app.css                  |  3 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 653278c..25b1c58 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -157,7 +157,7 @@
 						wall.wallpaper(background, img)
 					})
 				}.bind(this)
-				img.src = background.src
+				img.src = background.src.replace("url(","").replace(")","")
 				img.complete && img.onload()
 			},
 			floor: function(background){
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 3b6168e..20fdf85 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -7,12 +7,12 @@ var WallpaperPicker = UploadView.extend({
 	uploadAction: "/api/media/upload",
 
 	events: {
-	  "contextmenu": 'cancel',
+	  "contextmenu": 'contextmenu',
 		"mousedown": 'stopPropagation',
 		"click .swatch": 'pick',
 		"click .wallpaperRemove": 'remove',
     "input [data-role='wallpaper-scale']": 'updateScale',
-    "change .url": "tileWalls",
+    "change .url": "enterUrl",
     "keydown .url": "enterSetUrl",
   },
 	
@@ -122,15 +122,21 @@ var WallpaperPicker = UploadView.extend({
 	  }
 	},
 	
-	cancel: function(e){
+	contextmenu: function(e){
     if (Scenery.nextWallpaper) {
       e.preventDefault()
+      this.cancel()
+    }
+	},
+	cancel: function(){
+    if (Scenery.nextWallpaper) {
       Scenery.nextWallpaper = null
       app.tube('cancel-wallpaper')
     }
 	},
 
   follow: function(e, wallpaper, icon){
+    var base = this
     icon = icon || wallpaper
     
 		var $floatingSwatch = $(".floatingSwatch")
@@ -139,6 +145,8 @@ var WallpaperPicker = UploadView.extend({
 
 		Scenery.nextWallpaper = wallpaper
 
+    $(".floodMessage").show()
+
 		setTimeout(function(){
 			function _followCursor(e) {
 				$floatingSwatch.css({
@@ -151,7 +159,12 @@ var WallpaperPicker = UploadView.extend({
 				// $(window).off('click', _hideCursor)
 				app.off('cancel-wallpaper', _hideCursor)
 				$floatingSwatch.removeClass("scissors").hide()
+				$(".floodMessage").hide()
 			}
+			function _floodRoom (e) {
+        base.flood()
+			}
+			$(window).on('keydown', _floodRoom)
 			$(window).on('mousemove', _followCursor)
 			// $(window).one('click', _hideCursor);
       app.on('cancel-wallpaper', _hideCursor)
@@ -178,22 +191,26 @@ var WallpaperPicker = UploadView.extend({
     this.wall.wallpaperPosition({ scale: scale })
   },
 
-  tileWalls: function(){
+  enterUrl: function(){
   	var url = this.$url.sanitize()
-  	if (url.length && url.indexOf("http") == 0) {
-			Walls.setWallpaper.wall({ src: url })
-			Walls.setWallpaper.floor({ src: url })
-			Walls.setWallpaper.ceiling({ src: url })
-  	}
   	this.addUrl(url)
   	this.$url.val("")
   },
 	enterSetUrl: function (e) {
 		e.stopPropagation()
 		if (e.keyCode == 13) {
-			setTimeout(this.tileWalls.bind(this), 100)
+			setTimeout(this.enterUrl.bind(this), 100)
 		}
 	},
+	
+	flood: function(url){
+	  url = url || Scenery.nextWallpaper
+	  if (! url) return
+    Walls.setWallpaper.wall({ src: url })
+    Walls.setWallpaper.floor({ src: url })
+    Walls.setWallpaper.ceiling({ src: url })
+    this.cancel()
+	},
 
 	initializePositionCursor: function(){
 	  var base = this
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e5b10e3..8e259ef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1706,7 +1706,8 @@ input[type="range"]::-webkit-slider-thumb {
   display: none;
   animation: flicker 0.2s infinite;
   color: black;
-  margin: 5px 5px 49px 5px;
+  float: left;
+  margin: 10px 5px 5px 5px;
   font-size: 13px;
   font-weight: 300;
   text-align: center;
-- 
cgit v1.2.3-70-g09d2


From de6fa5bf0e7f0a55341d05f5a5b1dfb19330aeb0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Oct 2014 18:25:12 -0400
Subject: stub in fixes to mover

---
 .../javascripts/rectangles/engine/rooms/mover.js   | 38 +++++++++++++++++++++-
 .../assets/javascripts/rectangles/models/room.js   |  6 ++--
 public/assets/javascripts/ui/reader/MediaPlayer.js |  2 +-
 server/lib/views/index.js                          |  6 ++--
 4 files changed, 44 insertions(+), 8 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index fae2ce6..121ecec 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -34,7 +34,43 @@ Rooms.mover = new function(){
 			}
 
 			// check if we've breached one of the walls.. clamp position if so
-			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
+			var collision = base.room.collidesDisc(cam, pos, radius)
+
+/*
+      var dz = new vec2( cam.z, pos.z )
+      dz.normalize()
+
+      var dx = new vec2( cam.x, pos.x )
+      dx.normalize()
+
+			Walls.list.forEach(function(wall){
+			  switch (wall.side) {
+			    case FRONT:
+			      break
+			    case BACK:
+			      break
+			    case LEFT:
+			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && (wall.vec.intersects(dz) ) {
+			        // intersects the wall.. next check if it intersects any of the surface frames
+			        wall.surface.faces.some(function(face, i){
+			          // if we can pass through the wall at this point, we do not need to clamp
+			          if (face.y.a === 0 && face.x.intersects(dz)) {
+			            dz.a = pos.z = face.x.clamp(pos.z)
+			            dz.b = cam.z
+			            dz.normalize()
+			            return true
+			          }
+			        })
+			      }
+			      break
+			    case RIGHT:
+			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && (wall.vec.contains(cam.z) || wall.vec.contains(pos.z)) ) {
+			        // intersects
+			      }
+			      break
+			  }
+      })
+*/
 
 			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index b0344a1..26bf055 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -122,7 +122,8 @@
 		return collision
 	}
 
-	Room.prototype.collidesDisc = function(x,y,radius){
+	Room.prototype.collidesDisc = function(src, dest, radius){
+	  var x = dest.x, y = dest.z
 		var collision = 0, wall_collision, contains_x, contains_y
 		this.regions.forEach(function(r){
 			if (! r.sides) return
@@ -152,9 +153,6 @@
 			if (contains_y) {
 				collision |= wall_collision & LEFT_RIGHT
 			}
-//    if (bitcount(wall_collision) > 1) {
-//  				collision |= wall_collision
-// 		}
 		})
 		return collision
 	}
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 7f73e1b..e40c6ff 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
+			if ( ! media.description && (! media.title || media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 0b5a1fe..7ffadb9 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -38,10 +38,12 @@ var views = module.exports = {
 		}
 		else if (req.isOwner || req.isCollaborator || req.isStaff) {
 			res.locals.opt.editing = true
-			res.render('editor')
+			res.render('editor', {
+        ogUrl: "http://vvalls.com/project/" + req.project.slug + "/",
+			})
 		}
 		else {
-			views.reader(req, res)
+			res.redirect("/project/" + req.project.slug + "/")
 		}
 	},
 
-- 
cgit v1.2.3-70-g09d2


From c0fe6750cc0462adbc2165ac7f8c9cf1e0aea925 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 30 Oct 2014 17:59:44 -0400
Subject: intersection test

---
 .../javascripts/rectangles/engine/rooms/mover.js   |  95 ++++++++++----
 .../assets/javascripts/vendor/canvasutilities.js   | 145 +++++++++++++++++++++
 public/assets/test/intersect.html                  | 132 +++++++++++++++++++
 3 files changed, 348 insertions(+), 24 deletions(-)
 create mode 100644 public/assets/javascripts/vendor/canvasutilities.js
 create mode 100644 public/assets/test/intersect.html

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 121ecec..8ce00fe 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -36,6 +36,18 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(cam, pos, radius)
 
+			if (collision && ! base.noclip) {
+				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
+				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
+				return
+			}
+
+			// in this case, we appear to have left the room..
+			// $(".face.active").removeClass("active")
+			Walls.clearBodyColor()
+			base.room = null
+		}
+
 /*
       var dz = new vec2( cam.z, pos.z )
       dz.normalize()
@@ -43,47 +55,82 @@ Rooms.mover = new function(){
       var dx = new vec2( cam.x, pos.x )
       dx.normalize()
 
+      // first check if the cam-pos movement intersects the wall.
+      // next check if it intersects any of the surface frames
+      // if we can pass through the wall at this point, we do not need to clamp.
+      // otherwise, get the distance along the cam-pos vector where we would hit the wall and clamp to it.
 			Walls.list.forEach(function(wall){
+			  var t = -1
 			  switch (wall.side) {
 			    case FRONT:
+			      if (cam.z >= wall.edge + radius && wall.edge + radius >= pos.z && wall.vec.intersects(dx) ) {
+			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, radius )
+			      }
 			      break
 			    case BACK:
+			      // console.log(cam.z|0, wall.edge-radius, pos.z|0, wall.vec.intersects(dx))
+			      if (cam.z <= wall.edge - radius && wall.edge - radius <= pos.z && wall.vec.intersects(dx) ) {
+			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, -radius )
+			        console.log(t)
+			      }
 			      break
 			    case LEFT:
-			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && (wall.vec.intersects(dz) ) {
-			        // intersects the wall.. next check if it intersects any of the surface frames
-			        wall.surface.faces.some(function(face, i){
-			          // if we can pass through the wall at this point, we do not need to clamp
-			          if (face.y.a === 0 && face.x.intersects(dz)) {
-			            dz.a = pos.z = face.x.clamp(pos.z)
-			            dz.b = cam.z
-			            dz.normalize()
-			            return true
-			          }
-			        })
+			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && wall.vec.intersects(dz) ) {
+			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, radius )
 			      }
 			      break
 			    case RIGHT:
-			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && (wall.vec.contains(cam.z) || wall.vec.contains(pos.z)) ) {
-			        // intersects
+			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && wall.vec.intersects(dz) ) {
+			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, -radius )
 			      }
 			      break
 			  }
+        if (0 <= t && t <= 1) {
+          pos.x = cam.x + (pos.x - cam.x) * t
+          pos.z = cam.z + (pos.z - cam.z) * t
+
+          dz = new vec2( cam.z, pos.z )
+          dz.normalize()
+
+          dx = new vec2( cam.x, pos.x )
+          dx.normalize()
+        }
       })
-*/
 
-			if (collision && ! base.noclip) {
-				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
-				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
-				return
-			}
+    function check_intersection(intersection_function, cam, pos, cam_pos_vector, wall, radius) {
+      var t = -1
+      wall.surface.faces.some(function(face, i){
+        if (face.y.a == 0 && face.x.intersects(cam_pos_vector)) {
+          t = intersection_function( cam, pos, wall, face, radius )
+          console.log(">>", t)
+          if (0 <= t && t <= 1) {
+            return true
+          }
+          else {
+            t = -1
+          }
+        }
+        return false
+      })
+      return t
+    }
+		function left_right_intersection (cam, pos, wall, face, radius) {
+      var perp_n = (face.x.a - face.x.b) * (wall.edge - cam.z + radius)
+      var perp_d = (face.x.a - face.x.b) * (pos.z - cam.z)
+      if (perp_d == 0) return Infinity
+      return perp_n / perp_d
+    }
+		function front_back_intersection (cam, pos, wall, face, radius) {
+		  // va.vx*vb.vy - va.vy*vb.vx
+      var perp_n = (face.x.b - face.x.a) * (wall.edge - cam.x + radius)
+      var perp_d = (face.x.b - face.x.a) * (pos.x - cam.x)
 
-			// in this case, we appear to have left the room..
-			// $(".face.active").removeClass("active")
-			Walls.clearBodyColor()
-			base.room = null
-		}
+      console.log((pos.x - cam.x), wall.edge - cam.x, radius)
 
+      if (perp_d == 0) return Infinity
+      return perp_n / perp_d
+    }
+*/
 		// collision test failed, so update position
 		cam.x = pos.x
 		cam.z = pos.z
diff --git a/public/assets/javascripts/vendor/canvasutilities.js b/public/assets/javascripts/vendor/canvasutilities.js
new file mode 100644
index 0000000..011ebb0
--- /dev/null
+++ b/public/assets/javascripts/vendor/canvasutilities.js
@@ -0,0 +1,145 @@
+var drawArrow = function(ctx, x1, y1, x2, y2, style, which, angle, d) {
+  'use strict';
+  // Ceason pointed to a problem when x1 or y1 were a string, and concatenation
+  // would happen instead of addition
+  if (typeof(x1) == 'string') x1 = parseInt(x1);
+  if (typeof(y1) == 'string') y1 = parseInt(y1);
+  if (typeof(x2) == 'string') x2 = parseInt(x2);
+  if (typeof(y2) == 'string') y2 = parseInt(y2);
+  style = typeof(style) != 'undefined' ? style : 3;
+  which = typeof(which) != 'undefined' ? which : 1; // end point gets arrow
+  angle = typeof(angle) != 'undefined' ? angle : Math.PI / 8;
+  d = typeof(d) != 'undefined' ? d : 10;
+  // default to using drawHead to draw the head, but if the style
+  // argument is a function, use it instead
+  var toDrawHead = typeof(style) != 'function' ? drawHead : style;
+
+  // For ends with arrow we actually want to stop before we get to the arrow
+  // so that wide lines won't put a flat end on the arrow.
+  //
+  var dist = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
+  var ratio = (dist - d / 3) / dist;
+  var tox, toy, fromx, fromy;
+  if (which & 1) {
+    tox = Math.round(x1 + (x2 - x1) * ratio);
+    toy = Math.round(y1 + (y2 - y1) * ratio);
+  } else {
+    tox = x2;
+    toy = y2;
+  }
+  if (which & 2) {
+    fromx = x1 + (x2 - x1) * (1 - ratio);
+    fromy = y1 + (y2 - y1) * (1 - ratio);
+  } else {
+    fromx = x1;
+    fromy = y1;
+  }
+
+  // Draw the shaft of the arrow
+  ctx.beginPath();
+  ctx.moveTo(fromx, fromy);
+  ctx.lineTo(tox, toy);
+  ctx.stroke();
+
+  // calculate the angle of the line
+  var lineangle = Math.atan2(y2 - y1, x2 - x1);
+  // h is the line length of a side of the arrow head
+  var h = Math.abs(d / Math.cos(angle));
+
+  if (which & 1) { // handle far end arrow head
+    var angle1 = lineangle + Math.PI + angle;
+    var topx = x2 + Math.cos(angle1) * h;
+    var topy = y2 + Math.sin(angle1) * h;
+    var angle2 = lineangle + Math.PI - angle;
+    var botx = x2 + Math.cos(angle2) * h;
+    var boty = y2 + Math.sin(angle2) * h;
+    toDrawHead(ctx, topx, topy, x2, y2, botx, boty, style);
+  }
+  if (which & 2) { // handle near end arrow head
+    var angle1 = lineangle + angle;
+    var topx = x1 + Math.cos(angle1) * h;
+    var topy = y1 + Math.sin(angle1) * h;
+    var angle2 = lineangle - angle;
+    var botx = x1 + Math.cos(angle2) * h;
+    var boty = y1 + Math.sin(angle2) * h;
+    toDrawHead(ctx, topx, topy, x1, y1, botx, boty, style);
+  }
+}
+
+var drawHead = function(ctx, x0, y0, x1, y1, x2, y2, style) {
+  'use strict';
+  if (typeof(x0) == 'string') x0 = parseInt(x0);
+  if (typeof(y0) == 'string') y0 = parseInt(y0);
+  if (typeof(x1) == 'string') x1 = parseInt(x1);
+  if (typeof(y1) == 'string') y1 = parseInt(y1);
+  if (typeof(x2) == 'string') x2 = parseInt(x2);
+  if (typeof(y2) == 'string') y2 = parseInt(y2);
+  var radius = 3;
+  var twoPI = 2 * Math.PI;
+
+  // all cases do this.
+  ctx.save();
+  ctx.beginPath();
+  ctx.moveTo(x0, y0);
+  ctx.lineTo(x1, y1);
+  ctx.lineTo(x2, y2);
+  switch (style) {
+    case 0:
+      // curved filled, add the bottom as an arcTo curve and fill
+      var backdist = Math.sqrt(((x2 - x0) * (x2 - x0)) + ((y2 - y0) * (y2 - y0)));
+      ctx.arcTo(x1, y1, x0, y0, .55 * backdist);
+      ctx.fill();
+      break;
+    case 1:
+      // straight filled, add the bottom as a line and fill.
+      ctx.beginPath();
+      ctx.moveTo(x0, y0);
+      ctx.lineTo(x1, y1);
+      ctx.lineTo(x2, y2);
+      ctx.lineTo(x0, y0);
+      ctx.fill();
+      break;
+    case 2:
+      // unfilled head, just stroke.
+      ctx.stroke();
+      break;
+    case 3:
+      //filled head, add the bottom as a quadraticCurveTo curve and fill
+      var cpx = (x0 + x1 + x2) / 3;
+      var cpy = (y0 + y1 + y2) / 3;
+      ctx.quadraticCurveTo(cpx, cpy, x0, y0);
+      ctx.fill();
+      break;
+    case 4:
+      //filled head, add the bottom as a bezierCurveTo curve and fill
+      var cp1x, cp1y, cp2x, cp2y, backdist;
+      var shiftamt = 5;
+      if (x2 == x0) {
+        // Avoid a divide by zero if x2==x0
+        backdist = y2 - y0;
+        cp1x = (x1 + x0) / 2;
+        cp2x = (x1 + x0) / 2;
+        cp1y = y1 + backdist / shiftamt;
+        cp2y = y1 - backdist / shiftamt;
+      } else {
+        backdist = Math.sqrt(((x2 - x0) * (x2 - x0)) + ((y2 - y0) * (y2 - y0)));
+        var xback = (x0 + x2) / 2;
+        var yback = (y0 + y2) / 2;
+        var xmid = (xback + x1) / 2;
+        var ymid = (yback + y1) / 2;
+
+        var m = (y2 - y0) / (x2 - x0);
+        var dx = (backdist / (2 * Math.sqrt(m * m + 1))) / shiftamt;
+        var dy = m * dx;
+        cp1x = xmid - dx;
+        cp1y = ymid - dy;
+        cp2x = xmid + dx;
+        cp2y = ymid + dy;
+      }
+
+      ctx.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x0, y0);
+      ctx.fill();
+      break;
+  }
+  ctx.restore();
+}
diff --git a/public/assets/test/intersect.html b/public/assets/test/intersect.html
new file mode 100644
index 0000000..3f6d110
--- /dev/null
+++ b/public/assets/test/intersect.html
@@ -0,0 +1,132 @@
+<canvas id="canvas"></canvas>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/vendor/canvasutilities.js"></script>
+<script>
+
+var ctx = canvas.getContext('2d')
+
+var w = canvas.width = 600
+var h = canvas.height = 400
+
+var vec_a = new Rect( 100, 120, 50, 100 )
+var vec_b = new Rect( 20, 200, 120, 120 )
+var vecs = [ vec_a, vec_b ]
+var points = [ vec_a.x, vec_a.y, vec_b.x, vec_b.y ]
+var r = 4
+
+var vec_c = new Rect()
+vec_c.x = vec_a.x
+vec_c.y = vec_b.x
+
+var intersect = new vec2 ()
+
+var dragging = false, dragging_a, dragging_b
+var delta = new vec2( 0, 0 )
+
+var mymouse = new mouse({
+  el: canvas,
+  down: function(e, cursor){
+    points.some(function(p){
+      if (-cursor.x.a > p.a - r && -cursor.x.a < p.a + r &&
+           cursor.y.a > p.b - r &&  cursor.y.a < p.b + r) {
+        dragging_a = p.a
+        dragging_b = p.b
+        dragging = p
+        return true
+      }
+    })
+  },
+  drag: function(e, cursor){
+    if (! dragging) return
+    delta = cursor.delta()
+    delta.a = - delta.a
+    dragging.a = dragging_a + delta.a
+    dragging.b = dragging_b + delta.b
+  },
+  up: function(e, cursor, new_cursor){
+    delta.zero()
+    dragging.dragging = false
+    dragging = false
+  },
+})
+
+function draw () {
+  ctx.fillStyle = "#fff"
+  ctx.fillRect(0,0,w,h)
+  
+  ctx.fillStyle = "#bbb"
+  points.forEach(drawPoint)
+  
+  drawLine(vec_a.x, vec_a.y, "#f00")
+  drawLine(vec_b.x, vec_b.y, "#00f")
+  drawLine(vec_a.x, vec_b.x, "#080")
+
+  var t = perp(vec_c, vec_b) / ( perp(vec_a, vec_b) || 0.0000001 )
+  intersect.a = vec_a.x.a + ( vec_a.y.a - vec_a.x.a ) * t
+  intersect.b = vec_a.x.b + ( vec_a.y.b - vec_a.x.b ) * t
+  
+  var collinear = is_collinear( intersect.b, vec_b )
+  var long_enough_to_intersect = 0 <= t && t <= 1
+  
+  if (long_enough_to_intersect && collinear) {
+    ctx.fillStyle = "#f00"
+  }
+  else if (is_on_line) {
+    ctx.fillStyle = "#0f0"
+  }
+  else {
+    ctx.fillStyle = "#000"
+  }
+  
+  drawPoint(intersect)
+}
+function drawLine (pa, pb, color) {
+  ctx.fillStyle = color
+  ctx.strokeStyle = color
+  var x1 = pa.a
+  var y1 = pa.b
+  var x2 = pb.a
+  var y2 = pb.b
+  drawArrow(ctx, x1, y1, x2, y2)
+}
+function drawPoint (p) {
+  var x = p.a - r
+  var y = p.b - r
+  ctx.fillRect(x, y, r*2, r*2)
+}
+function perp (va, vb) {
+	return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
+}
+function is_collinear (n, vec) {
+  var on_x, on_y
+  
+  if (vec.x.a < vec.y.a) {
+    on_x = vec.x.a <= n && n <= vec.y.a
+  }
+  else {
+    on_x = vec.x.a >= n && n >= vec.y.a
+  }
+  
+  if (vec.x.b < vec.y.b) {
+    on_y = vec.x.b <= n && n <= vec.y.b
+  }
+  else {
+    on_y = vec.x.b >= n && n >= vec.y.b
+  }
+  
+  return !! (on_x && on_y)
+}
+
+function animate(){
+  requestAnimationFrame(animate)
+  draw()
+}
+animate()
+
+</script>
-- 
cgit v1.2.3-70-g09d2


From 2c2c70965efb50b500799ae7966a42e86bbac480 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 31 Oct 2014 10:18:39 -0400
Subject: fix floating point error :-P

---
 public/assets/javascripts/rectangles/models/rect.js |  6 ++++++
 public/assets/javascripts/rectangles/models/vec2.js |  5 ++++-
 public/assets/test/intersect.html                   | 15 +++++++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 00f2c55..c667cf5 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -169,6 +169,12 @@
 		var s = "[" + this.x.toString() + " " + this.y.toString() + "] " + sides
 		return s
 	}
+	Rect.prototype.exactString = function(){
+		var sides = sidesToString(this.sides)
+		var s = "[" + this.x.exactString() + " " + this.y.exactString() + "] " + sides
+		return s
+	}
+	
 	Rect.prototype.serialize = function(){
 		return { x: this.x.serialize(), y: this.y.serialize() }
 	}
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 49613c3..f28df54 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -200,7 +200,10 @@
 	}
 
 	vec2.prototype.toString = function(){
-		return "[" + ~~this.a + " " + ~~this.b + "]"
+		return "[" + round(this.a) + " " + round(this.b) + "]"
+	}
+	vec2.prototype.exactString = function(){
+		return "[" + this.a + " " + this.b + "]"
 	}
 	vec2.prototype.serialize = function(){
 		return [ ~~this.a, ~~this.b ]
diff --git a/public/assets/test/intersect.html b/public/assets/test/intersect.html
index 5e16f2e..4e5b0bb 100644
--- a/public/assets/test/intersect.html
+++ b/public/assets/test/intersect.html
@@ -1,4 +1,5 @@
 <canvas id="canvas"></canvas>
+<div id="hud"></div>
 
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
@@ -73,16 +74,21 @@ function draw () {
   
   var collinear = is_collinear( intersect, vec_b )
   var long_enough_to_intersect = 0 <= t && t <= 1
+  var msg
   
   if (long_enough_to_intersect && collinear) {
     ctx.fillStyle = "#f00"
+    msg = "through"
   }
   else if (collinear) {
     ctx.fillStyle = "#0f0"
+    msg = "to"
   }
   else {
     ctx.fillStyle = "#000"
+    msg = "off"
   }
+  hud.innerHTML = [intersect.exactString(), vec_b.exactString(), msg].join("<br>")
   
   drawPoint(intersect)
 }
@@ -105,19 +111,20 @@ function perp (va, vb) {
 }
 function is_collinear (p, vec) {
   var on_x, on_y
+  var pa = round(p.a), pb = round(p.b)
   
   if (vec.x.a < vec.y.a) {
-    on_x = vec.x.a <= p.a && p.a <= vec.y.a
+    on_x = vec.x.a <= pa && pa <= vec.y.a
   }
   else {
-    on_x = vec.x.a >= p.a && p.a >= vec.y.a
+    on_x = vec.x.a >= pa && pa >= vec.y.a
   }
   
   if (vec.x.b < vec.y.b) {
-    on_y = vec.x.b <= p.b && p.b <= vec.y.b
+    on_y = vec.x.b <= pb && pb <= vec.y.b
   }
   else {
-    on_y = vec.x.b >= p.b && p.b >= vec.y.b
+    on_y = vec.x.b >= pb && pb >= vec.y.b
   }
 
   return !! (on_x && on_y)
-- 
cgit v1.2.3-70-g09d2


From f599c7edf7e635241e839fc024e4016ae0dcc210 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 31 Oct 2014 16:03:12 -0400
Subject: intersection test 2 - hit-testing on wall structure

---
 .../javascripts/rectangles/models/surface.js       |   9 +
 public/assets/test/intersect2.html                 | 218 +++++++++++++++++++++
 2 files changed, 227 insertions(+)
 create mode 100644 public/assets/test/intersect2.html

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

diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index 3a6c449..fc4aae4 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -154,6 +154,15 @@
 		}
 		return -1
 	}
+	Surface.prototype.face_for_x = function(x, min_i){
+    min_i = min_i || 0
+		for (var i = min_i; i < this.faces.length; i++) {
+			if (this.faces[i].x.contains(x)) {
+				return this.faces[i]
+			}
+		}
+		return null
+	}
 
 	Surface.prototype.bounds_at_index_with_dimensions = function(index, dimensions){
     var faces = this.faces
diff --git a/public/assets/test/intersect2.html b/public/assets/test/intersect2.html
new file mode 100644
index 0000000..fade288
--- /dev/null
+++ b/public/assets/test/intersect2.html
@@ -0,0 +1,218 @@
+<style>
+body,html{margin:0;padding:0;}
+#hud { position: absolute; top: 0; left: 0; pointer-events: none; }
+</style>
+<canvas id="canvas"></canvas>
+<div id="hud"></div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/sort.js"></script>
+<script src="/assets/javascripts/rectangles/util/uid.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/models/room.js"></script>
+<script src="/assets/javascripts/rectangles/models/surface.js"></script>
+<script src="/assets/javascripts/rectangles/models/wall.js"></script>
+<script src="/assets/javascripts/rectangles/models/floor.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/clipper.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/builder.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/grouper.js"></script>
+<script src="/assets/javascripts/vendor/canvasutilities.js"></script>
+<script>
+
+var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
+var w = canvas.width = window.innerWidth
+var h = canvas.height = window.innerHeight
+
+var cursor = new Rect( 150, 250, 150, 250 )
+var wall_vec = new Rect ( 0, 0, 0, 0 )
+var points = [ cursor.x, cursor.y ]
+
+var origins = new Rect()
+origins.x = cursor.x
+origins.y = wall_vec.x
+
+var radius = 1
+
+var rect       = new Rect( new vec2(100,400), new vec2(100,400) )
+var east       = new Rect( new vec2(200,600), new vec2(100,400) )
+var corner     = new Rect( new vec2(300,700), new vec2(300,700) )
+var peninsula  = new Rect( new vec2(400,600), new vec2(600,800) )
+var peninsula2 = new Rect( new vec2(650,750), new vec2(350,450) )
+
+var rect_room       = new Room({ id: "rect", rect: rect, height: 2 })
+var east_room       = new Room({ id: "east", rect: east, height: 2 })
+var corner_room     = new Room({ id: "corner", rect: corner, height: 2 })
+var peninsula_room  = new Room({ id: "peninsula", rect: peninsula, height: 3 })
+var peninsula2_room = new Room({ id: "peninsula2", rect: peninsula2, height: 3 })
+
+Rooms.add( rect_room )
+Rooms.add( east_room )
+Rooms.add( corner_room )
+Rooms.add( peninsula_room )
+Rooms.add( peninsula2_room )
+
+Rooms.clipper.update()
+Rooms.builder.build()
+Rooms.grouper.build()
+
+var r = 4
+
+var intersect = new vec2 ()
+
+var dragging = false, dragging_a, dragging_b
+var delta = new vec2( 0, 0 )
+
+var mymouse = new mouse({
+  el: canvas,
+  down: function(e, cursor){
+    points.some(function(p){
+      if (-cursor.x.a > p.a - r && -cursor.x.a < p.a + r &&
+           cursor.y.a > p.b - r &&  cursor.y.a < p.b + r) {
+        dragging_a = p.a
+        dragging_b = p.b
+        dragging = p
+        return true
+      }
+    })
+  },
+  drag: function(e, cursor){
+    if (! dragging) return
+    delta = cursor.delta()
+    delta.a = - delta.a
+    dragging.a = dragging_a + delta.a
+    dragging.b = dragging_b + delta.b
+  },
+  up: function(e, cursor, new_cursor){
+    delta.zero()
+    dragging.dragging = false
+    dragging = false
+  },
+})
+
+function draw () {
+  ctx.fillStyle = "#fff"
+  ctx.fillRect(0,0,w,h)
+
+  Rooms.forEach(function(room, i){
+    ctx.fillStyle = "#eee"
+    ctx.fillRect(room.rect.x.a, room.rect.y.a, room.rect.width(), room.rect.height())
+  })
+  
+  ctx.fillStyle = "#333"
+  points.forEach(drawPoint)
+  
+  drawLine(cursor.x, cursor.y, "#f00")
+  hud.innerHTML = ""
+  Walls.list.forEach(function(wall, i){
+    if (wall.side & LEFT_RIGHT) {
+      wall_vec.x.a = wall.edge
+      wall_vec.x.b = wall.vec.a
+      wall_vec.y.a = wall.edge
+      wall_vec.y.b = wall.vec.b
+    }
+    else {
+      wall_vec.x.a = wall.vec.a
+      wall_vec.x.b = wall.edge
+      wall_vec.y.a = wall.vec.b
+      wall_vec.y.b = wall.edge
+    }
+    drawLine(wall_vec.x, wall_vec.y, "#888", true)
+    drawLine(origins.x, origins.y, "rgba(0,0,0,0.1)")
+
+    var t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+    intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * t
+    intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * t
+
+    var collinear = is_collinear( intersect, wall_vec )
+    var long_enough_to_intersect = 0 <= t && t <= 1
+    var actually_intersects = false
+    var intersecting_face
+    var msg
+  
+    if (long_enough_to_intersect && collinear) {
+      if (wall.side & LEFT_RIGHT) {
+        intersecting_face = wall.surface.face_for_x(intersect.b)
+      }
+      else {
+        intersecting_face = wall.surface.face_for_x(intersect.a)
+      }
+      actually_intersects = !! (intersecting_face && intersecting_face.y.a == 0)
+    }
+    
+    if (actually_intersects) {
+      ctx.fillStyle = "#f00"
+      msg = "through"
+    }
+    else if (collinear) {
+      ctx.fillStyle = "#0f0"
+      msg = "to"
+    }
+    else {
+      ctx.fillStyle = "rgba(0,0,0,0.1)"
+      msg = "off"
+    }
+    
+    drawPoint(intersect)
+    if (intersecting_face) {
+      hud.innerHTML += intersecting_face.y.a + "<br>"
+    }
+  })
+
+}
+function drawLine (pa, pb, color, headless) {
+  ctx.fillStyle = color
+  ctx.strokeStyle = color
+  var x1 = pa.a
+  var y1 = pa.b
+  var x2 = pb.a
+  var y2 = pb.b
+  drawArrow(ctx, x1, y1, x2, y2, 3, headless ? 0 : 1)
+}
+function drawPoint (p) {
+  var x = p.a - r
+  var y = p.b - r
+  ctx.fillRect(x, y, r*2, r*2)
+}
+function perp (va, vb) {
+  return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
+}
+function is_collinear (p, vec) {
+  var on_x, on_y
+  var pa = round(p.a), pb = round(p.b)
+  
+  if (vec.x.a < vec.y.a) {
+    on_x = vec.x.a <= pa && pa <= vec.y.a
+  }
+  else {
+    on_x = vec.x.a >= pa && pa >= vec.y.a
+  }
+  
+  if (vec.x.b < vec.y.b) {
+    on_y = vec.x.b <= pb && pb <= vec.y.b
+  }
+  else {
+    on_y = vec.x.b >= pb && pb >= vec.y.b
+  }
+
+  return !! (on_x && on_y)
+}
+
+function animate(){
+  requestAnimationFrame(animate)
+  draw()
+}
+animate()
+
+</script>
-- 
cgit v1.2.3-70-g09d2


From f08fd6f6910d6cc774051ef9f85307ac8557d740 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 31 Oct 2014 18:51:20 -0400
Subject: intersect3 putting this to rest

---
 .../javascripts/rectangles/models/surface.js       |   7 +
 public/assets/test/intersect3.html                 | 230 +++++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 public/assets/test/intersect3.html

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

diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index fc4aae4..f031665 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -12,6 +12,7 @@
 	
 	var Surface = function (face){
 		this.bounds = new Rect (new vec2(0, 0), new vec2(0, 0))
+		this.vec = new Rect (new vec2(0, 0), new vec2(0, 0))
 		this.faces = []
 		if (face) {
 			this.add(face)
@@ -161,6 +162,12 @@
 				return this.faces[i]
 			}
 		}
+		if (x < this.faces[0].x.a) {
+			return this.faces[0]
+		}
+		else {
+			return this.faces[this.faces.length-1]
+		}
 		return null
 	}
 
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
new file mode 100644
index 0000000..4fec891
--- /dev/null
+++ b/public/assets/test/intersect3.html
@@ -0,0 +1,230 @@
+<style>
+body,html{margin:0;padding:0;}
+#hud { position: absolute; top: 0; left: 0; pointer-events: none; }
+</style>
+<canvas id="canvas"></canvas>
+<div id="hud"></div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/sort.js"></script>
+<script src="/assets/javascripts/rectangles/util/uid.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/models/room.js"></script>
+<script src="/assets/javascripts/rectangles/models/surface.js"></script>
+<script src="/assets/javascripts/rectangles/models/wall.js"></script>
+<script src="/assets/javascripts/rectangles/models/floor.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/clipper.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/builder.js"></script>
+<script src="/assets/javascripts/rectangles/engine/rooms/grouper.js"></script>
+<script src="/assets/javascripts/vendor/canvasutilities.js"></script>
+<script>
+
+var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
+var w = canvas.width = window.innerWidth
+var h = canvas.height = window.innerHeight
+
+var cursor = new Rect( 150, 250, 150, 250 )
+var wall_vec = new Rect ( 0, 0, 0, 0 )
+var points = [ cursor.x, cursor.y ]
+
+var origins = new Rect()
+origins.x = cursor.x
+origins.y = wall_vec.x
+
+scene.camera.radius = 20
+
+var rect       = new Rect( new vec2(100,400), new vec2(100,400) )
+var east       = new Rect( new vec2(200,600), new vec2(100,400) )
+var corner     = new Rect( new vec2(300,700), new vec2(300,700) )
+var peninsula  = new Rect( new vec2(400,600), new vec2(600,800) )
+var peninsula2 = new Rect( new vec2(650,750), new vec2(350,450) )
+
+var rect_room       = new Room({ id: "rect", rect: rect, height: 2 })
+var east_room       = new Room({ id: "east", rect: east, height: 2 })
+var corner_room     = new Room({ id: "corner", rect: corner, height: 2 })
+var peninsula_room  = new Room({ id: "peninsula", rect: peninsula, height: 3 })
+var peninsula2_room = new Room({ id: "peninsula2", rect: peninsula2, height: 1 })
+
+Rooms.add( rect_room )
+Rooms.add( east_room )
+Rooms.add( corner_room )
+Rooms.add( peninsula_room )
+Rooms.add( peninsula2_room )
+
+Rooms.clipper.update()
+Rooms.builder.build()
+Rooms.grouper.build()
+
+var r = 4
+
+var intersect = new vec2 ()
+var intersects = []
+
+var dragging = false, dragging_a, dragging_b
+var delta = new vec2( 0, 0 )
+
+var mymouse = new mouse({
+  el: canvas,
+  down: function(e, cursor){
+    points.some(function(p){
+      if (-cursor.x.a > p.a - r && -cursor.x.a < p.a + r &&
+           cursor.y.a > p.b - r &&  cursor.y.a < p.b + r) {
+        dragging_a = p.a
+        dragging_b = p.b
+        dragging = p
+        return true
+      }
+    })
+  },
+  drag: function(e, cursor){
+    if (! dragging) return
+    delta = cursor.delta()
+    delta.a = - delta.a
+    dragging.a = dragging_a + delta.a
+    dragging.b = dragging_b + delta.b
+  },
+  up: function(e, cursor, new_cursor){
+    delta.zero()
+    dragging.dragging = false
+    dragging = false
+  },
+})
+
+function draw () {
+  ctx.fillStyle = "#fff"
+  ctx.fillRect(0,0,w,h)
+
+  Rooms.forEach(function(room, i){
+    ctx.fillStyle = "#eee"
+    ctx.fillRect(room.rect.x.a, room.rect.y.a, room.rect.width(), room.rect.height())
+  })
+  
+  ctx.fillStyle = "#333"
+  points.forEach(drawPoint)
+  
+  drawLine(cursor.x, cursor.y, "#f00")
+  hud.innerHTML = ""
+  intersects.length = 0
+  
+  Walls.list.forEach(function(wall, i){
+    if (wall.side & LEFT_RIGHT) {
+      wall_vec.x.a = wall.edge
+      wall_vec.x.b = wall.vec.a
+      wall_vec.y.a = wall.edge
+      wall_vec.y.b = wall.vec.b
+    }
+    else {
+      wall_vec.x.a = wall.vec.a
+      wall_vec.x.b = wall.edge
+      wall_vec.y.a = wall.vec.b
+      wall_vec.y.b = wall.edge
+    }
+    drawLine(wall_vec.x, wall_vec.y, "#888", true)
+    drawLine(origins.x, origins.y, "rgba(0,0,0,0.1)")
+
+    var t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+    intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * t
+    intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * t
+
+    var collinear = is_collinear( intersect, wall_vec )
+    var long_enough_to_intersect = 0 <= t && t <= 1
+    var actually_intersects = false
+    var intersecting_face
+    var msg
+  
+    if (long_enough_to_intersect && collinear) {
+      if (wall.side & LEFT_RIGHT) {
+        intersecting_face = wall.surface.face_for_x(intersect.b)
+      }
+      else {
+        intersecting_face = wall.surface.face_for_x(intersect.a)
+      }
+      actually_intersects = !! (intersecting_face && intersecting_face.y.a == 0)
+    }
+    
+    if (actually_intersects) {
+      ctx.fillStyle = "#f00"
+      msg = "through"
+    }
+    else if (collinear) {
+      ctx.fillStyle = "#0f0"
+      msg = "to"
+    }
+    else {
+      ctx.fillStyle = "rgba(0,0,0,0.1)"
+      msg = "off"
+    }
+    
+    drawPoint(intersect)
+    if (intersecting_face) {
+      hud.innerHTML += intersecting_face.y.a + "<br>"
+      var clone = intersect.clone()
+      clone.t = t
+      intersects.push( clone )
+    }
+  })
+
+  if (intersects.length) {
+    // get the intersect with smallest T value
+    // get the angle of the cam/pos vector
+    // move the desired position to pos - 20px
+    // display this point
+  }
+}
+function drawLine (pa, pb, color, headless) {
+  ctx.fillStyle = color
+  ctx.strokeStyle = color
+  var x1 = pa.a
+  var y1 = pa.b
+  var x2 = pb.a
+  var y2 = pb.b
+  drawArrow(ctx, x1, y1, x2, y2, 3, headless ? 0 : 1)
+}
+function drawPoint (p) {
+  var x = p.a - r
+  var y = p.b - r
+  ctx.fillRect(x, y, r*2, r*2)
+}
+function perp (va, vb) {
+  return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
+}
+function is_collinear (p, vec) {
+  var on_x, on_y
+  var pa = round(p.a), pb = round(p.b)
+  
+  if (vec.x.a < vec.y.a) {
+    on_x = vec.x.a <= pa && pa <= vec.y.a
+  }
+  else {
+    on_x = vec.x.a >= pa && pa >= vec.y.a
+  }
+  
+  if (vec.x.b < vec.y.b) {
+    on_y = vec.x.b <= pb && pb <= vec.y.b
+  }
+  else {
+    on_y = vec.x.b >= pb && pb >= vec.y.b
+  }
+
+  return !! (on_x && on_y)
+}
+
+function animate(){
+  requestAnimationFrame(animate)
+  draw()
+}
+animate()
+
+</script>
-- 
cgit v1.2.3-70-g09d2


From a61ad3cea5b7a76777d594d1a6d960943a0e776f Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 31 Oct 2014 22:38:27 -0400
Subject: correctly intercepting walls in mover

---
 .../javascripts/rectangles/engine/rooms/mover.js   | 188 +++++++++++----------
 public/assets/test/intersect3.html                 |  10 +-
 2 files changed, 105 insertions(+), 93 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 8ce00fe..69e821f 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -4,6 +4,14 @@ Rooms.mover = new function(){
 	base.room = null
 	base.noclip = false
 
+	var cursor = base.cursor = new Rect (0,0,0,0)
+	var wall_vec = new Rect (0,0,0,0)
+	var intersect = new vec2(0,0)
+
+	var origins = new Rect()
+	origins.x = cursor.x
+	origins.y = wall_vec.x
+
 	base.init = function(){
 		base.bind()
 		base.update(scene.camera)
@@ -33,6 +41,14 @@ Rooms.mover = new function(){
 				return
 			}
 
+			var intersect = base.intersect(pos)
+			
+			if (intersect && ! base.noclip) {
+				cam.x = intersect.a
+				cam.z = intersect.b
+				return
+			}
+/*
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(cam, pos, radius)
 
@@ -41,96 +57,13 @@ Rooms.mover = new function(){
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
-
+*/
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
 			Walls.clearBodyColor()
 			base.room = null
 		}
 
-/*
-      var dz = new vec2( cam.z, pos.z )
-      dz.normalize()
-
-      var dx = new vec2( cam.x, pos.x )
-      dx.normalize()
-
-      // first check if the cam-pos movement intersects the wall.
-      // next check if it intersects any of the surface frames
-      // if we can pass through the wall at this point, we do not need to clamp.
-      // otherwise, get the distance along the cam-pos vector where we would hit the wall and clamp to it.
-			Walls.list.forEach(function(wall){
-			  var t = -1
-			  switch (wall.side) {
-			    case FRONT:
-			      if (cam.z >= wall.edge + radius && wall.edge + radius >= pos.z && wall.vec.intersects(dx) ) {
-			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, radius )
-			      }
-			      break
-			    case BACK:
-			      // console.log(cam.z|0, wall.edge-radius, pos.z|0, wall.vec.intersects(dx))
-			      if (cam.z <= wall.edge - radius && wall.edge - radius <= pos.z && wall.vec.intersects(dx) ) {
-			        t = check_intersection( front_back_intersection, cam, pos, dx, wall, -radius )
-			        console.log(t)
-			      }
-			      break
-			    case LEFT:
-			      if (cam.x >= wall.edge + radius && wall.edge + radius >= pos.x && wall.vec.intersects(dz) ) {
-			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, radius )
-			      }
-			      break
-			    case RIGHT:
-			      if (cam.x <= wall.edge - radius && wall.edge - radius <= pos.x && wall.vec.intersects(dz) ) {
-			        t = check_intersection( left_right_intersection, cam, pos, dz, wall, -radius )
-			      }
-			      break
-			  }
-        if (0 <= t && t <= 1) {
-          pos.x = cam.x + (pos.x - cam.x) * t
-          pos.z = cam.z + (pos.z - cam.z) * t
-
-          dz = new vec2( cam.z, pos.z )
-          dz.normalize()
-
-          dx = new vec2( cam.x, pos.x )
-          dx.normalize()
-        }
-      })
-
-    function check_intersection(intersection_function, cam, pos, cam_pos_vector, wall, radius) {
-      var t = -1
-      wall.surface.faces.some(function(face, i){
-        if (face.y.a == 0 && face.x.intersects(cam_pos_vector)) {
-          t = intersection_function( cam, pos, wall, face, radius )
-          console.log(">>", t)
-          if (0 <= t && t <= 1) {
-            return true
-          }
-          else {
-            t = -1
-          }
-        }
-        return false
-      })
-      return t
-    }
-		function left_right_intersection (cam, pos, wall, face, radius) {
-      var perp_n = (face.x.a - face.x.b) * (wall.edge - cam.z + radius)
-      var perp_d = (face.x.a - face.x.b) * (pos.z - cam.z)
-      if (perp_d == 0) return Infinity
-      return perp_n / perp_d
-    }
-		function front_back_intersection (cam, pos, wall, face, radius) {
-		  // va.vx*vb.vy - va.vy*vb.vx
-      var perp_n = (face.x.b - face.x.a) * (wall.edge - cam.x + radius)
-      var perp_d = (face.x.b - face.x.a) * (pos.x - cam.x)
-
-      console.log((pos.x - cam.x), wall.edge - cam.x, radius)
-
-      if (perp_d == 0) return Infinity
-      return perp_n / perp_d
-    }
-*/
 		// collision test failed, so update position
 		cam.x = pos.x
 		cam.z = pos.z
@@ -148,7 +81,92 @@ Rooms.mover = new function(){
 			}
       app.tube("change-room", { room: base.room })
 		}
-
 	}
+	base.intersect = function(pos){
+		var closest_intersect, t, min_t = 1
+		
+		cursor.x.a = cam.x
+		cursor.x.b = cam.z
+		cursor.y.a = pos.x
+		cursor.y.b = pos.z
+
+		var a = angle(cursor)
+		cursor.y.a += scene.camera.radius * cos(a)
+		cursor.y.b += scene.camera.radius * sin(a)
+
+		Walls.list.forEach(function(wall, i){
+			var actually_intersects, intersecting_face
+
+			if (wall.side & LEFT_RIGHT) {
+				wall_vec.x.a = wall.edge
+				wall_vec.x.b = wall.vec.a
+				wall_vec.y.a = wall.edge
+				wall_vec.y.b = wall.vec.b
+			}
+			else {
+				wall_vec.x.a = wall.vec.a
+				wall_vec.x.b = wall.edge
+				wall_vec.y.a = wall.vec.b
+				wall_vec.y.b = wall.edge
+			}
 
+			t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+			
+			if ( min_t < t || t < 0 || 1 < t ) return
+
+			intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * t
+			intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * t
+
+			if ( ! is_collinear( intersect, wall_vec ) ) return
+
+			if (wall.side & LEFT_RIGHT) {
+				intersecting_face = wall.surface.face_for_x(intersect.b)
+			}
+			else {
+				intersecting_face = wall.surface.face_for_x(intersect.a)
+			}
+			
+			actually_intersects = !! (intersecting_face && intersecting_face.y.a == 0)
+			if (actually_intersects) {
+				closest_intersect = intersect.clone()
+				min_t = t
+			}
+		})
+
+		if (min_t < 1) {
+			var a = angle(cursor)
+			closest_intersect.a -= scene.camera.radius * cos(a)
+			closest_intersect.b -= scene.camera.radius * sin(a)
+		}
+		return closest_intersect
+	}
+	function angle (va) {
+		return atan2(va.y.b - va.x.b, va.y.a - va.x.a)
+	}
+	function dot (va, vb) {
+		return (va.y.a - va.x.a) * (vb.y.a - vb.x.a) + (va.y.b - va.x.b) * (vb.y.b - vb.x.b)
+	}
+	function perp (va, vb) {
+		return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
+	}
+	function is_collinear (p, vec) {
+		var on_x, on_y
+		var pa = round(p.a), pb = round(p.b)
+			
+		if (vec.x.a < vec.y.a) {
+			on_x = vec.x.a <= pa && pa <= vec.y.a
+		}
+		else {
+			on_x = vec.x.a >= pa && pa >= vec.y.a
+		}
+	
+		if (vec.x.b < vec.y.b) {
+			on_y = vec.x.b <= pb && pb <= vec.y.b
+		}
+		else {
+			on_y = vec.x.b >= pb && pb >= vec.y.b
+		}
+		
+		return !! (on_x && on_y)
+	}
 }
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index e897e8a..1e2a1a4 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -167,12 +167,12 @@ function draw () {
     }
     
     drawPoint(intersect)
-    if (actually_intersects && intersecting_face && t < min_t) {
+    if (actually_intersects && t < min_t) {
     	min_t = t
       hud.innerHTML += t + "<br>"
       var clone = intersect.clone()
       clone.t = t
-    	closest_face = intersecting_face
+    	closest_intersect = intersecting_face
     	closest_intersect = clone
     }
   })
@@ -185,12 +185,6 @@ function draw () {
 		ctx.fillStyle = "#00f"
 		drawPoint(closest_intersect)
 		drawLine(cursor.x, closest_intersect, "#00f")
-  	// closest_face.vec
-  	
-    // get the closest intersect, i.e. the one with smallest t value
-    // get the angle of the cursor
-    // move the desired position to pos - 20px
-
   }
 }
 function drawLine (pa, pb, color, headless) {
-- 
cgit v1.2.3-70-g09d2


From b5c6adb5fbc7225e7b655f02123d7f0995ae3b46 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Mon, 3 Nov 2014 01:20:37 -0500
Subject: extend vec in both directions

---
 .../assets/javascripts/rectangles/models/wall.js   | 28 ++++++++++++
 public/assets/test/intersect3.html                 | 53 ++++++++--------------
 2 files changed, 48 insertions(+), 33 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 8590de7..a026c3c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -25,6 +25,34 @@
 	Wall.prototype.toString = function(){
 		return this.vec.toString()
 	}
+	Wall.prototype.get_points = function(wall_vec){
+		wall_vec = wall_vec || new Rect ()
+		if (this.side & LEFT) {
+			wall_vec.x.a = this.edge
+			wall_vec.x.b = this.vec.b
+			wall_vec.y.a = this.edge
+			wall_vec.y.b = this.vec.a
+		}
+		else if (this.side & RIGHT) {
+			wall_vec.x.a = this.edge
+			wall_vec.x.b = this.vec.a
+			wall_vec.y.a = this.edge
+			wall_vec.y.b = this.vec.b
+		}
+    else if (this.side & FRONT) {
+      wall_vec.x.a = this.vec.a
+      wall_vec.x.b = this.edge
+      wall_vec.y.a = this.vec.b
+      wall_vec.y.b = this.edge
+    }
+    else if (this.side & BACK) {
+      wall_vec.x.a = this.vec.b
+      wall_vec.x.b = this.edge
+      wall_vec.y.a = this.vec.a
+      wall_vec.y.b = this.edge
+    }
+    return wall_vec
+	}
 
 	Wall.prototype.reset = function(){
 	}
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index 040dca4..13a8024 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -101,7 +101,7 @@ var mymouse = new mouse({
   },
 })
 
-function draw () {
+function draw (time) {
   ctx.fillStyle = "#fff"
   ctx.fillRect(0,0,w,h)
 
@@ -115,36 +115,16 @@ function draw () {
   
   drawLine(cursor.x, cursor.y, "#f00")
 //  hud.innerHTML = ""
-  var closest_intersect, cursor_copy = new Rect(0,0,0,0), t, min_t = 1
-  var cursor_copy = cursor.plus(scene.camera.radius)
+  var closest_intersect, t, min_t = 1
+  var cursor_copy = cursor.extend_ends(scene.camera.radius)
 
+hud.innerHTML = cursor_copy.x
+drawPoint(cursor_copy.x, "#ff0")
   Walls.list.forEach(function(wall, i){
-		if (wall.side & LEFT) {
-			wall_vec.x.a = wall.edge
-			wall_vec.x.b = wall.vec.b
-			wall_vec.y.a = wall.edge
-			wall_vec.y.b = wall.vec.a
-		}
-		else if (wall.side & RIGHT) {
-			wall_vec.x.a = wall.edge
-			wall_vec.x.b = wall.vec.a
-			wall_vec.y.a = wall.edge
-			wall_vec.y.b = wall.vec.b
-		}
-    else if (wall.side & FRONT) {
-      wall_vec.x.a = wall.vec.a
-      wall_vec.x.b = wall.edge
-      wall_vec.y.a = wall.vec.b
-      wall_vec.y.b = wall.edge
-    }
-    else if (wall.side & BACK) {
-      wall_vec.x.a = wall.vec.b
-      wall_vec.x.b = wall.edge
-      wall_vec.y.a = wall.vec.a
-      wall_vec.y.b = wall.edge
-    }
+		wall.get_points(wall_vec)
     drawLine(wall_vec.x, wall_vec.y, "#088")
 
+		origins.x = cursor_copy.x
     t = perp(origins, wall_vec) / ( perp(cursor_copy, wall_vec) || 0.0000001 )
     intersect.a = cursor_copy.x.a + ( cursor_copy.y.a - cursor_copy.x.a ) * t
     intersect.b = cursor_copy.x.b + ( cursor_copy.y.b - cursor_copy.x.b ) * t
@@ -196,6 +176,7 @@ function draw () {
 
 		drawLine(wall_vec.x, wall_vec.y, "rgba(0,255,255,1.0)")
 
+		origins.x = cursor.x
     var new_t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
     var wall_t = perp(origins, cursor) / ( perp(wall_vec, cursor) || 0.0000001 )
 		var closest_intersect2 = new vec2()
@@ -222,17 +203,21 @@ function draw () {
 		
 		len = clamp(len, 0, (1-min_t) * sqrt(dot(cursor, cursor)))
 
-		hud.innerHTML = [ aw ].map(function(n){ return round(deg(n)) })
-		hud.innerHTML = "&nbsp;" + (dd > 0 ? "gt": "lt") + " " + round(len) + " " + (1-min_t) + " " + round((1-min_t)*sqrt(dot2(diff(cursor), diff(cursor))))
+// 		hud.innerHTML = [ aw ].map(function(n){ return round(deg(n)) })
+// 		hud.innerHTML = "&nbsp;" + (dd > 0 ? "gt": "lt") + " " + round(len) + " " + (1-min_t) + " " + round((1-min_t)*sqrt(dot2(diff(cursor), diff(cursor))))
 
 		var end_of_ray = closest_intersect2.clone()
 		end_of_ray.a += len * cos(aw)
 		end_of_ray.b += len * sin(aw)
+		
+		end_of_ray.a = clamp(end_of_ray.a, wall_vec.x.a, wall_vec.y.a)
+		end_of_ray.b = clamp(end_of_ray.b, wall_vec.x.b, wall_vec.y.b)
+		
 		drawPoint(end_of_ray)
 		drawLine(closest_intersect2, end_of_ray, "#00f")
   }
 	else {
-		hud.innerHTML = [ (angle(cursor) + TWO_PI) % TWO_PI ].map(function(n){ return round(deg(n)) })
+//		hud.innerHTML = [ (angle(cursor) + TWO_PI) % TWO_PI ].map(function(n){ return round(deg(n)) })
 	}
 	
 }
@@ -294,17 +279,19 @@ function is_collinear (p, vec) {
 
   return !! (on_x && on_y)
 }
-cursor.plus = function(n){
+cursor.extend_ends = function(n){
 	var a = angle(this)
 	var clone = this.clone()
+	clone.x.a -= n*cos(a)
+	clone.x.b -= n*sin(a)
 	clone.y.a += n*cos(a)
 	clone.y.b += n*sin(a)
 	return clone
 }
 
-function animate(){
+function animate(time){
   requestAnimationFrame(animate)
-  draw()
+  draw(time)
 }
 animate()
 
-- 
cgit v1.2.3-70-g09d2


From 6b9cf0e41c4e0c09a715e59c162380b5fad42cba Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 12:44:23 -0500
Subject: different collision algo for mobile movement

---
 .../javascripts/rectangles/engine/rooms/mover.js   | 179 +++++++++++++++------
 public/assets/test/intersect3.html                 |  19 ++-
 2 files changed, 147 insertions(+), 51 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 69e821f..5682be8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -5,6 +5,7 @@ Rooms.mover = new function(){
 	base.noclip = false
 
 	var cursor = base.cursor = new Rect (0,0,0,0)
+	var cursor_copy = new Rect (0,0,0,0)
 	var wall_vec = new Rect (0,0,0,0)
 	var intersect = new vec2(0,0)
 
@@ -28,6 +29,7 @@ Rooms.mover = new function(){
 	}
 	
 	base.update = function(pos){
+    var intersect, collision, distance
 		var radius = scene.camera.radius
 		
 		cam.y = pos.y
@@ -41,23 +43,38 @@ Rooms.mover = new function(){
 				return
 			}
 
-			var intersect = base.intersect(pos)
+      distance = sqrt(pow(cam.x-pos.x, 2), pow(cam.z-pos.z, 2))
+      
+			// check if we've breached one of the walls.. clamp position if so.
+			// there are two algorithms for this now, ridiculously..
+			// - the first one is smoother, best for keyboard use
+			// but if the distance travelled is greater than the min. distance from the wall,
+			// then there is a possibility of ejection from the room. so is bad for phone/mousewheel.
 			
-			if (intersect && ! base.noclip) {
-				cam.x = intersect.a
-				cam.z = intersect.b
-				return
+			// - the second one determines fortuitously if we have breached any of the walls
+			// however it can get jumpy if you run into a wall.. thus it is best for devices like phone or mousewheel
+			// the benefit is you will never leave the room.
+			if (base.noclip) {
+			  // in no-clip mode we walk through walls.
 			}
-/*
-			// check if we've breached one of the walls.. clamp position if so
-			var collision = base.room.collidesDisc(cam, pos, radius)
+      else if (distance < radius) {
+        collision = base.room.collidesDisc(cam, pos, radius)
+
+        if (collision) {
+          cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
+          cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
+          return
+        }
+      }
+      else {
+        intersect = base.intersect(pos)
+        if (intersect) {
+          cam.x = intersect.a
+          cam.z = intersect.b
+          return
+        }
+      }
 
-			if (collision && ! base.noclip) {
-				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
-				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
-				return
-			}
-*/
 			// in this case, we appear to have left the room..
 			// $(".face.active").removeClass("active")
 			Walls.clearBodyColor()
@@ -83,39 +100,30 @@ Rooms.mover = new function(){
 		}
 	}
 	base.intersect = function(pos){
-		var closest_intersect, t, min_t = 1
-		
-		cursor.x.a = cam.x
-		cursor.x.b = cam.z
-		cursor.y.a = pos.x
-		cursor.y.b = pos.z
+		var closest_intersect, closest_wall, new_t, wall_t, t, min_t = 1
 
-		var a = angle(cursor)
-		cursor.y.a += scene.camera.radius * cos(a)
-		cursor.y.b += scene.camera.radius * sin(a)
+		cursor_copy.x.a = cursor.x.a = cam.x
+		cursor_copy.x.b = cursor.x.b = cam.z
+		cursor_copy.y.a = cursor.y.a = pos.x
+		cursor_copy.y.b = cursor.y.b = pos.z
+
+    cursor_copy.extend_ends(scene.camera.radius)
+
+		origins.x = cursor_copy.x
+    origins.y = wall_vec.x
 
 		Walls.list.forEach(function(wall, i){
-			var actually_intersects, intersecting_face
+			var actually_intersects = false, intersecting_face
+
+      wall.get_points(wall_vec)
 
-			if (wall.side & LEFT_RIGHT) {
-				wall_vec.x.a = wall.edge
-				wall_vec.x.b = wall.vec.a
-				wall_vec.y.a = wall.edge
-				wall_vec.y.b = wall.vec.b
-			}
-			else {
-				wall_vec.x.a = wall.vec.a
-				wall_vec.x.b = wall.edge
-				wall_vec.y.a = wall.vec.b
-				wall_vec.y.b = wall.edge
-			}
 
-			t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+      t = perp(origins, wall_vec) / ( perp(cursor_copy, wall_vec) || 0.0000001 )
 			
 			if ( min_t < t || t < 0 || 1 < t ) return
 
-			intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * t
-			intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * t
+      intersect.a = cursor_copy.x.a + ( cursor_copy.y.a - cursor_copy.x.a ) * t
+      intersect.b = cursor_copy.x.b + ( cursor_copy.y.b - cursor_copy.x.b ) * t
 
 			if ( ! is_collinear( intersect, wall_vec ) ) return
 
@@ -128,24 +136,76 @@ Rooms.mover = new function(){
 			
 			actually_intersects = !! (intersecting_face && intersecting_face.y.a == 0)
 			if (actually_intersects) {
-				closest_intersect = intersect.clone()
+        closest_intersect = intersect.clone()
+        closest_wall = wall_vec.clone()
 				min_t = t
 			}
 		})
 
-		if (min_t < 1) {
-			var a = angle(cursor)
-			closest_intersect.a -= scene.camera.radius * cos(a)
-			closest_intersect.b -= scene.camera.radius * sin(a)
+		if (closest_intersect) {
+
+      var aw, len, dd
+      aw = angle(closest_wall)
+      wall_vec.assign(closest_wall)
+      wall_vec.x.a -= scene.camera.radius * sin(aw)
+      wall_vec.x.b += scene.camera.radius * cos(aw)
+      wall_vec.y.a -= scene.camera.radius * sin(aw)
+      wall_vec.y.b += scene.camera.radius * cos(aw)
+
+      origins.x = cursor.x
+      origins.y = wall_vec.x
+
+      new_t = perp(origins, wall_vec) / ( perp(cursor, wall_vec) || 0.0000001 )
+      wall_t = perp(origins, cursor) / ( perp(wall_vec, cursor) || 0.0000001 )
+
+      intersect.a = cursor.x.a + ( cursor.y.a - cursor.x.a ) * new_t
+      intersect.b = cursor.x.b + ( cursor.y.b - cursor.x.b ) * new_t
+    
+      // here compare len to the length of the wall in the direction we are travelling		
+      dd = dot2(diff(closest_wall), diff(cursor))
+      len = sqrt(dot(wall_vec, wall_vec))
+
+      if (dd > 0) {
+        len *= 1-abs(wall_t)
+      }
+      else {
+        len *= abs(wall_t)
+        aw += PI
+      }
+    
+      len = clamp(len, 0, (1-min_t) * sqrt(dot(cursor, cursor)))
+
+      intersect.a += len * cos(aw)
+      intersect.b += len * sin(aw)
+
+      wall_vec.normalize()
+      intersect.a = clamp(intersect.a, wall_vec.x.a, wall_vec.y.a)
+      intersect.b = clamp(intersect.b, wall_vec.x.b, wall_vec.y.b)
+
+      return intersect
+		}
+		else {
+		  return cursor.y
 		}
-		return closest_intersect
 	}
+  function diff (v) {
+    return new vec2(v.y.a - v.x.a, v.y.b - v.x.b)
+  }
 	function angle (va) {
 		return atan2(va.y.b - va.x.b, va.y.a - va.x.a)
 	}
-	function dot (va, vb) {
-		return (va.y.a - va.x.a) * (vb.y.a - vb.x.a) + (va.y.b - va.x.b) * (vb.y.b - vb.x.b)
-	}
+  function angle2 (pa, pb) {
+    return atan2(pb.b - pa.b, pb.a - pa.a)
+  }
+  function normal (va) {
+    return atan2(va.x.a - va.y.a, va.y.b - va.x.b)
+  }
+  function dot (va, vb) {
+    return (va.y.a - va.x.a) * (vb.y.a - vb.x.a) + (va.y.b - va.x.b) * (vb.y.b - vb.x.b)
+  }
+  function dot2 (pa, pb) {
+    return pa.a * pb.a + pa.b * pb.b
+  }
 	function perp (va, vb) {
 		return (va.y.a - va.x.a) * (vb.y.b - vb.x.b) - (va.y.b - va.x.b) * (vb.y.a - vb.x.a)
 	}
@@ -169,4 +229,27 @@ Rooms.mover = new function(){
 		
 		return !! (on_x && on_y)
 	}
+  cursor_copy.extend_ends = function(n){
+    var a = angle(this)
+    this.x.a -= n*cos(a)
+    this.x.b -= n*sin(a)
+    this.y.a += n*cos(a)
+    this.y.b += n*sin(a)
+    return this
+  }
+  wall_vec.normalize = function(){
+    var carry
+    if (this.x.a > this.y.a) {
+      console.log("SWAP X")
+      carry = this.x.a
+      this.x.a = this.y.a
+      this.y.a = carry
+    }
+    if (this.x.b > this.y.b) {
+      console.log("SWAP Y")
+      carry = this.x.b
+      this.x.b = this.y.b
+      this.y.b = carry
+    }
+  }
 }
diff --git a/public/assets/test/intersect3.html b/public/assets/test/intersect3.html
index ed81346..5440a76 100644
--- a/public/assets/test/intersect3.html
+++ b/public/assets/test/intersect3.html
@@ -217,8 +217,9 @@ function draw (time) {
 		end_of_ray.a += len * cos(aw)
 		end_of_ray.b += len * sin(aw)
 		
-// 		end_of_ray.a = clamp(end_of_ray.a, wall_vec.x.a, wall_vec.y.a)
-// 		end_of_ray.b = clamp(end_of_ray.b, wall_vec.x.b, wall_vec.y.b)
+		wall_vec.normalize()
+		end_of_ray.a = clamp(end_of_ray.a, wall_vec.x.a, wall_vec.y.a)
+		end_of_ray.b = clamp(end_of_ray.b, wall_vec.x.b, wall_vec.y.b)
 		
 		drawPoint(end_of_ray)
 		drawLine(closest_intersect2, end_of_ray, "#00f")
@@ -295,7 +296,19 @@ cursor.extend_ends = function(n){
 	clone.y.b += n*sin(a)
 	return clone
 }
-
+wall_vec.normalize = function(){
+  var carry
+  if (this.x.a > this.y.a) {
+    carry = this.x.a
+    this.x.a = this.y.a
+    this.y.a = carry
+  }
+  if (this.x.b > this.y.b) {
+    carry = this.x.b
+    this.x.b = this.y.b
+    this.y.b = carry
+  }
+}
 function animate(time){
   requestAnimationFrame(animate)
   draw(time)
-- 
cgit v1.2.3-70-g09d2


From 7e20e81927b4d52de2f54c0923c65869f4c253ee Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 13:16:05 -0500
Subject: z

---
 public/assets/javascripts/rectangles/engine/rooms/mover.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5682be8..ac27aba 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -117,7 +117,6 @@ Rooms.mover = new function(){
 
       wall.get_points(wall_vec)
 
-
       t = perp(origins, wall_vec) / ( perp(cursor_copy, wall_vec) || 0.0000001 )
 			
 			if ( min_t < t || t < 0 || 1 < t ) return
@@ -240,13 +239,13 @@ Rooms.mover = new function(){
   wall_vec.normalize = function(){
     var carry
     if (this.x.a > this.y.a) {
-      console.log("SWAP X")
+//       console.log("SWAP X")
       carry = this.x.a
       this.x.a = this.y.a
       this.y.a = carry
     }
     if (this.x.b > this.y.b) {
-      console.log("SWAP Y")
+//       console.log("SWAP Y")
       carry = this.x.b
       this.x.b = this.y.b
       this.y.b = carry
-- 
cgit v1.2.3-70-g09d2


From 0df2cd6c000e593795c1de868a47666862d3ed96 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 14:54:12 -0500
Subject: undo presets

---
 .../javascripts/rectangles/engine/rooms/_walls.js  | 15 +++++++----
 .../javascripts/rectangles/engine/scenery/undo.js  | 28 +++++++++++++++++++--
 public/assets/javascripts/ui/editor/Presets.js     | 29 +++++++++++++++++-----
 3 files changed, 59 insertions(+), 13 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 25b1c58..04d0594 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -40,12 +40,17 @@
 		base.colors = {}
 		
 		base.init = function(){
-      base.colors = {
-        wall: app.defaults.colors.wall.slice(),
-        outline: app.defaults.colors.outline.slice(),
-        floor: app.defaults.colors.floor.slice(),
-        ceiling: app.defaults.colors.ceiling.slice(),
+      base.colors = base.copyColors( app.defaults.colors )
+    }
+    
+    base.copyColors = function(colors){
+      var copy = {
+        wall: colors.wall.slice(),
+        outline: colors.outline.slice(),
+        floor: colors.floor.slice(),
+        ceiling: colors.ceiling.slice(),
       }
+      return copy
     }
 
 		base.first = function(){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index ff4f911..52a57d9 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -114,7 +114,32 @@
       undo: function(state){
         var wall = Walls.lookup[state.id]
         wall.deserialize(state)
-
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "update-all-wallpaper",
+      undo: function(state){
+        Walls.deserialize(state)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "choose-preset",
+      undo: function(state){
+        app.controller.colorControl.load(state.colors)
+        Walls.deserialize(state.walls)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        app.controller.presets.loadByName(state)
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "choose-another-preset",
+      undo: function(state){
+        app.controller.presets.loadByName(state)
         Minotaur.watch( app.router.editorView.settings )
       },
     },
@@ -123,7 +148,6 @@
       undo: function(state){
         Walls.setColor[ state.mode ]( state.rgb )
         app.router.editorView.colorControl.setSwatchColor( state.mode, state.rgb )
-
         Minotaur.watch( app.router.editorView.settings )
       },
     },
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index ac77d6b..1327e03 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -4,7 +4,6 @@ var Presets = View.extend({
 	events: {
 		"mousedown": "stopPropagation",
     "click .presets span": "selectPreset",
-    "click .swatches span": "selectColor",
 	},
 	
   presets: {
@@ -53,7 +52,9 @@ var Presets = View.extend({
   	}.bind(this))
   },
 
-  modified: false,
+  modified: true,
+  lastPreset: "wireframe",
+  
   toggle: function(state){
     this.$el.toggleClass("active", state)
     this.parent.cursor.message(state ? "presets" : "start")
@@ -75,15 +76,31 @@ var Presets = View.extend({
     if (! this.presets[preset]) return
     this.$(".active").removeClass('active')
     $(e.currentTarget).addClass('active')
+    if (this.modified) {
+      UndoStack.push({
+        type: "choose-preset",
+        undo: { walls: Walls.serialize(), colors: Walls.copyColors(Walls.colors) },
+        redo: preset,
+      })
+      Minotaur.watch( app.router.editorView.settings )
+    }
+    else {
+      UndoStack.push({
+        type: "choose-another-preset",
+        undo: this.lastPreset,
+        redo: preset,
+      })
+      Minotaur.watch( app.router.editorView.settings )
+    }
+    this.lastPreset = preset
     this.load(this.presets[preset])
     this.modified = false
   },
   
-  selectColor: function(e){
-    var preset = $(e.currentTarget).data('color')
-    console.log(preset)
+  loadByName: function(name){
+    var preset = this.presets[name]
+    this.load(preset)
   },
-  
   load: function(preset){
     this.parent.colorControl.modes.forEach(function(mode){
       var color
-- 
cgit v1.2.3-70-g09d2


From 79a8caa17b05152533641cfd937925822f569fc1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 15:11:27 -0500
Subject: after you delete a room, user is redirected to profile

---
 public/assets/javascripts/mx/extensions/mx.movements.js     | 6 ++----
 public/assets/javascripts/rectangles/engine/scenery/undo.js | 2 +-
 public/assets/javascripts/ui/editor/EditorSettings.js       | 2 +-
 public/assets/javascripts/ui/editor/Presets.js              | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 2993fb6..dc9660b 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -326,15 +326,13 @@ MX.Movements = function (cam) {
 					pos.y = viewHeight
 					vy = 0
 					jumping = false
-					vz = vz || 1
 				}
 
 				var ceiling = (Rooms.mover.room ? Rooms.mover.room.height : 5000)
 				
-				if (pos.y >= ceiling) {
+				if (pos.y >= ceiling-5) {
 					vy = 0
-					pos.y = ceiling
-					vz = vz || 1
+					pos.y = ceiling-5
 				}
 			}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 52a57d9..3deb764 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -20,7 +20,7 @@
       type: "update-scenery",
       undo: function(state){
         var scenery = Scenery.find(state.id)
-        
+
         scenery.deserialize(state)
         scenery.set_wall(Walls.find( state.wall_id ))
         
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 430acc7..b96943e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -114,7 +114,7 @@ var EditorSettings = FormView.extend({
 				type: "delete",
 				data: { _id: this.$id.val(), _csrf: this.$csrf.val() },
 				success: function(data){
-					window.location.href = "/project"
+					window.location.href = "/profile"
 				}
 			})
 		}.bind(this))
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 1327e03..5f5ac35 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -20,7 +20,7 @@ var Presets = View.extend({
       ceiling: [159,163,157],
       background: [109,116,106],
     },
-    "p.Funk": {
+    "P.Funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
-- 
cgit v1.2.3-70-g09d2


From a49023a991c62595fc5c449729be4cc313ff66a7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 16:59:45 -0500
Subject: fix undo scenery create/destroy

---
 .../javascripts/rectangles/engine/scenery/move.js  | 31 +++++++++++++---------
 .../rectangles/engine/scenery/resize.js            |  2 +-
 .../javascripts/rectangles/engine/scenery/undo.js  |  6 +++--
 .../javascripts/rectangles/util/undostack.js       |  1 +
 public/assets/javascripts/ui/editor/MediaEditor.js | 14 +++++++++-
 5 files changed, 37 insertions(+), 17 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 7d148cf..3ae4993 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -2,7 +2,7 @@
 Scenery.move = function(base){
 
 	var x, y, z, position, dimension, bounds
-	var dragging = false
+	var dragging = false, moved = false
 	var oldState
 
 	this.bind = function(){
@@ -45,6 +45,7 @@ Scenery.move = function(base){
 			return
 		}
 		dragging = true
+		moved = false
 		x = base.mx.x
 		y = base.mx.y
 		z = base.mx.z
@@ -59,6 +60,8 @@ Scenery.move = function(base){
 	
 	function drag (e, cursor){
 		if (! dragging) return
+		
+		moved = true
 
 		var flipX = base.wall.side & (FRONT | RIGHT)
 
@@ -89,21 +92,23 @@ Scenery.move = function(base){
 
 	function up (e, cursor){
     if (! dragging || ! oldState) return
-    
-		dragging = false
-		document.body.classList.remove("dragging")
+        
+    if (moved) {
+      UndoStack.push({
+        type: 'update-scenery',
+        undo: oldState,
+        redo: base.serialize(),
+      })
 
-    UndoStack.push({
-      type: 'update-scenery',
-      undo: oldState,
-      redo: base.serialize(),
-    })
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+    }
 
-    // TODO: watch individual scenery object here
-    Minotaur.watch( app.router.editorView.settings )
-  
+		dragging = moved = false
     oldState = null
-	}
+		document.body.classList.remove("dragging")
+
+  }
 	
 	function switch_wall (e, target, cursor){
 		if (! dragging) return
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 0ce976e..e424829 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -88,8 +88,8 @@ Scenery.resize = new function(){
 	// pick a new object to focus on and show the dots
 	base.show = function(new_object) {
 		// if (obj === new_object) return
+    if (! new_object) return
 		obj = new_object
-		
 		base.add_dots()
 		base.rotate_dots()
 		base.move_dots()
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 3deb764..998f7c6 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -4,12 +4,13 @@
       type: "create-scenery",
       undo: function(state){
         Scenery.remove(state.id)
+        Scenery.resize.hide()
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
-        Scenery.deserialize([ state ])
+        var scenery = Scenery.deserialize([ state ])
         Scenery.resize.show( scenery )
 
         // TODO: watch individual scenery object here
@@ -49,13 +50,14 @@
     {
       type: "destroy-scenery",
       undo: function(state){
-        Scenery.deserialize([ state ])
+        var scenery = Scenery.deserialize([ state ])
         Scenery.resize.show( scenery )
 
         // TODO: watch individual scenery object here
         Minotaur.watch( app.router.editorView.settings )
       },
       redo: function(state){
+        Scenery.resize.hide()
         Scenery.remove(state.id)
 
         // TODO: watch individual scenery object here
diff --git a/public/assets/javascripts/rectangles/util/undostack.js b/public/assets/javascripts/rectangles/util/undostack.js
index 959e3d1..040a4eb 100644
--- a/public/assets/javascripts/rectangles/util/undostack.js
+++ b/public/assets/javascripts/rectangles/util/undostack.js
@@ -10,6 +10,7 @@
     this.pointer++
     this.stack[this.pointer] = action
     this.purge()
+    this.debug && console.log("push", action.type)
   }
   UndoStack.prototype.purge = function(){
     if (this.stack.length-1 == this.pointer) return
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9b81db1..9a3c355 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -161,7 +161,7 @@ var MediaEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
-	    if (this.tainted) {
+	    if (this.tainted && this.scenery.media) {
         this.scenery.media.title = this.$name.val()
         this.scenery.media.description = this.$description.val()
         Minotaur.watch( app.router.editorView.settings )
@@ -178,8 +178,20 @@ var MediaEditor = FormView.extend({
 	destroy: function(){
     var scenery = this.scenery
     this.hide()
+
+    UndoStack.push({
+      type: 'destroy-scenery',
+      undo: scenery.serialize(),
+      redo: { id: scenery.id },
+    })
+
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
     Scenery.remove(scenery.id)
     Scenery.resize.hide()
+    this.tainted = false
+    this.scenery = null
 	},
 
 })
-- 
cgit v1.2.3-70-g09d2


From 3f90aca295fc206f25b41e4c219a62171dbed650 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 13:48:48 -0500
Subject: fix weird click issue with youtube

---
 public/assets/javascripts/mx/primitives/mx.youtube.js       | 13 +++++++++++++
 .../javascripts/rectangles/engine/scenery/_scenery.js       |  2 +-
 public/assets/javascripts/rectangles/engine/scenery/move.js |  3 ++-
 public/assets/javascripts/ui/reader/ShareView.js            |  7 ++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 873348f..8511173 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -34,9 +34,22 @@ MX.Youtube = MX.Object3D.extend({
   	preload.style.width = this.media.width + "px"
   	preload.style.height = this.media.height + "px"
   	preload.style.pointerEvents = "none"
+  	preload.style.position = "absolute"
+  	preload.style.top = "0"
+  	preload.style.left = "0"
+  	preload.style.zIndex = "1"
   	preload.className = "preload"
   	this.el.appendChild(preload)
   	
+  	var overlay = this.overlay = document.createElement("div")
+  	overlay.style.width = "100%"
+  	overlay.style.height = "100%"
+  	overlay.style.position = "absolute"
+  	overlay.style.top = "0"
+  	overlay.style.left = "0"
+  	overlay.style.zIndex = "2"
+  	overlay.className = "overlay"
+  	this.el.appendChild(overlay)
   	this.defer(uid)
   },
   
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 3d3067f..24c2602 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -6,7 +6,7 @@ var Scenery = new function(){
 	base.list = {}
 	base.nextMedia = null
 	
-	base.mouse = new mouse ({ use_offset: false })
+	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
 	
 	base.init = function(){
 		base.resize.init()
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 3ae4993..13580a8 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -22,7 +22,8 @@ Scenery.move = function(base){
 	}
 	
 	function down (e, cursor){
-		if (e.target != base.mx.el) return;
+	console.log(e.target, base.mx.overlay)
+		if (e.target != base.mx.el && (e.target != base.mx.overlay)) return;
 		if (editor.permissions.destroy) {
       UndoStack.push({
         type: 'destroy-scenery',
diff --git a/public/assets/javascripts/ui/reader/ShareView.js b/public/assets/javascripts/ui/reader/ShareView.js
index 35c23ca..4e5f832 100644
--- a/public/assets/javascripts/ui/reader/ShareView.js
+++ b/public/assets/javascripts/ui/reader/ShareView.js
@@ -22,6 +22,11 @@ var ShareView = View.extend({
 	  var msg = $(".roomName").html() + " on VValls"
 		var url = "https://twitter.com/home?status=" + encodeURIComponent(window.location.origin + window.location.pathname + " " + msg);
 		window.open(url, "_blank")
-	}
+	},
+	
+	embed: function (e) {
+	  e.preventDefault()
+	  
+	},
 
 })
-- 
cgit v1.2.3-70-g09d2


From 94f25dc59aa1066321a23a5c2f00521dea87fbc0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 14:05:10 -0500
Subject: backspace shortcut to delete scenery

---
 .../javascripts/mx/extensions/mx.movements.js      | 11 +++++-
 .../javascripts/rectangles/engine/scenery/move.js  | 12 +------
 .../rectangles/engine/scenery/types/_object.js     | 39 +++++++++++++++++-----
 public/assets/javascripts/ui/editor/MediaEditor.js | 13 ++------
 public/assets/javascripts/ui/editor/TextEditor.js  |  6 ++--
 5 files changed, 46 insertions(+), 35 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index dc9660b..1ba33c9 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -62,7 +62,7 @@ MX.Movements = function (cam) {
 		},
 		
 		keydown: function (e) {
-			// console.log(e.keyCode)
+			console.log(e.keyCode)
 			if (locked || e.altKey || e.metaKey || e.ctrlKey) {
 				return
 			}
@@ -155,6 +155,15 @@ MX.Movements = function (cam) {
 						app.controller.toolbar.toggleMap()
 					}
 					break
+				
+				case 8: // backspace
+				  e.preventDefault()
+          if (app.controller.mediaEditor.scenery) {
+            app.controller.mediaEditor.scenery.remove()
+          }
+          else if (app.controller.textEditor.scenery) {
+            app.controller.textEditor.scenery.remove()
+          }
 			}
 		},
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 13580a8..12705d3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -22,19 +22,9 @@ Scenery.move = function(base){
 	}
 	
 	function down (e, cursor){
-	console.log(e.target, base.mx.overlay)
 		if (e.target != base.mx.el && (e.target != base.mx.overlay)) return;
 		if (editor.permissions.destroy) {
-      UndoStack.push({
-        type: 'destroy-scenery',
-        undo: base.serialize(),
-        redo: { id: base.id },
-      })
-
-      // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
-
-			Scenery.remove(base.id)
+		  base.remove()
 			return
 		}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 4e5e2c5..10ba2b0 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -62,20 +62,43 @@ Scenery.types.base = Fiber.extend(function(base){
 		
 		bind: function(){
 			this.move.bind()
-			$(this.mx.el).bind({
-				mouseenter: this.enter,
-				mouseleave: this.leave,
-			})
+// 			$(this.mx.el).bind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
 		},
 	
 		unbind: function(){
 			this.move.unbind()
-			$(this.mx.el).unbind({
-				mouseenter: this.enter,
-				mouseleave: this.leave,
-			})
+// 			$(this.mx.el).unbind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
 		},
 		
+		remove: function(){
+      UndoStack.push({
+        type: 'destroy-scenery',
+        undo: this.serialize(),
+        redo: { id: this.id },
+      })
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
+			Scenery.remove(this.id)
+
+      Scenery.resize.hide()
+      if (app.controller.mediaEditor) {
+        app.controller.mediaEditor.tainted = false
+        app.controller.mediaEditor.hide()
+      }
+      if (app.controller.textEditor) {
+        app.controller.textEditor.tainted = false
+        app.controller.textEditor.hide()
+      }
+		},
+
 		destroy: function(){
 			this.unbind()
 			scene.remove(this.mx)
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9a3c355..db5878f 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -179,17 +179,8 @@ var MediaEditor = FormView.extend({
     var scenery = this.scenery
     this.hide()
 
-    UndoStack.push({
-      type: 'destroy-scenery',
-      undo: scenery.serialize(),
-      redo: { id: scenery.id },
-    })
-
-    // TODO: watch individual scenery object here
-    Minotaur.watch( app.router.editorView.settings )
-
-    Scenery.remove(scenery.id)
-    Scenery.resize.hide()
+    scenery.remove()
+    
     this.tainted = false
     this.scenery = null
 	},
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index b559ba5..51077af 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -136,10 +136,8 @@ var TextEditor = FormView.extend({
   },
   
 	destroy: function(){
-    var scenery = this.scenery
-    this.hide()
-    Scenery.remove(scenery.id)
-    Scenery.resize.hide()
+    this.tainted = false
+    this.scenery.remove()
 	},
 
 })
-- 
cgit v1.2.3-70-g09d2


From 00778a168b7314039e95e856f6d41e05d0dbc4e4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 14:44:02 -0500
Subject: fix resize undo

---
 public/assets/javascripts/app.js                                 | 5 -----
 .../assets/javascripts/rectangles/engine/scenery/types/image.js  | 1 +
 .../assets/javascripts/rectangles/engine/scenery/types/text.js   | 2 ++
 .../assets/javascripts/rectangles/engine/scenery/types/video.js  | 1 +
 public/assets/javascripts/rectangles/engine/scenery/undo.js      | 9 ++++++---
 public/assets/javascripts/rectangles/models/vec2.js              | 6 +++++-
 public/assets/javascripts/vendor/polyfill.js                     | 5 +++++
 7 files changed, 20 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 5e339ea..0488f11 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -1,9 +1,4 @@
 
-var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i));
-var is_ipad = (navigator.userAgent.match(/iPad/i));
-var is_android = (navigator.userAgent.match(/Android/i))
-var is_mobile = is_iphone || is_ipad || is_android;
-
 if (is_mobile) {
 	// window.location.href = "mobile.html"
 	$("html").addClass("mobile");
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 10fc917..848f8d4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -55,6 +55,7 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 			this.mx.move(data.position)
 			this.mx.ops.width = data.dimensions.a
 			this.mx.ops.height = data.dimensions.b
+      this.dimensions.deserialize(data.dimensions)
 		},
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
index a10a332..dd1385f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/text.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js
@@ -68,7 +68,9 @@ Scenery.types.text = Scenery.types.base.extend(function(base){
 			this.mx.move(data.position)
 			this.mx.ops.width = data.dimensions.a
 			this.mx.ops.height = data.dimensions.b
+      this.dimensions.deserialize(data.dimensions)
 		},
+
 	}
 	
 	return exports
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index a669a90..d83cc63 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -117,6 +117,7 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			this.mx.move(data.position)
 			this.mx.ops.width = data.dimensions.a
 			this.mx.ops.height = data.dimensions.b
+      this.dimensions.deserialize(data.dimensions)
 		},
 	}
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 998f7c6..6ad9e0d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -21,9 +21,10 @@
       type: "update-scenery",
       undo: function(state){
         var scenery = Scenery.find(state.id)
+        var wall = Walls.find( state.wall_id )
 
         scenery.deserialize(state)
-        scenery.set_wall(Walls.find( state.wall_id ))
+        scenery.set_wall({ wall: wall })
         
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
@@ -34,13 +35,15 @@
       },
       redo: function(state){
         var scenery = Scenery.find(state.id)
+        var wall = Walls.find( state.wall_id )
+
         scenery.deserialize(state)
-        scenery.set_wall(Walls.find( state.wall_id ))
+        scenery.set_wall({ wall: wall })
 
         if (editor.permissions.resize) {
           Scenery.resize.show(scenery)
-          Scenery.resize.rotate_dots()
           Scenery.resize.move_dots()
+          Scenery.resize.rotate_dots()
         }
 
         // TODO: watch individual scenery object here
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index f28df54..14d0e6b 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -206,7 +206,11 @@
 		return "[" + this.a + " " + this.b + "]"
 	}
 	vec2.prototype.serialize = function(){
-		return [ ~~this.a, ~~this.b ]
+		return [ round(this.a), round(this.b) ]
+	}
+	vec2.prototype.deserialize = function(data){
+		this.a = data[0]
+		this.b = data[1]
 	}
 	vec2.prototype.quantize = function(n){
 		n = n || 10
diff --git a/public/assets/javascripts/vendor/polyfill.js b/public/assets/javascripts/vendor/polyfill.js
index f97e438..8e4b9dc 100644
--- a/public/assets/javascripts/vendor/polyfill.js
+++ b/public/assets/javascripts/vendor/polyfill.js
@@ -52,6 +52,11 @@ function has3d(){
   return browser;
 })( navigator.userAgent );
 
+// Naive useragent detection pattern
+var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i));
+var is_ipad = (navigator.userAgent.match(/iPad/i));
+var is_android = (navigator.userAgent.match(/Android/i))
+var is_mobile = is_iphone || is_ipad || is_android;
 
 // rAF shim
 (function() {
-- 
cgit v1.2.3-70-g09d2


From 91019438dab626c2760fb2e7b5e2203e88785caf Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 17:02:01 -0500
Subject: layout editor autosaves

---
 .../assets/javascripts/rectangles/engine/map/ui_editor.js   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(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 1ab9c73..c838b8b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -70,6 +70,9 @@ Map.UI.Editor = function(map){
 
 			Rooms.remove(room)
 			app.tube("builder-destroy-room", room)
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
 			return
 		}
 		else if (intersects.length) {
@@ -178,6 +181,9 @@ Map.UI.Editor = function(map){
         
         Rooms.rebuild()
 				app.tube("builder-pick-room", room)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
 			}
 		}
     if (base.resizing || base.dragging) {
@@ -196,6 +202,9 @@ Map.UI.Editor = function(map){
         redo: base.dragging.copy()
       })
       Rooms.rebuild()
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
     }
 
 		var intersects = Rooms.filter(function(r){
@@ -231,6 +240,10 @@ Map.UI.Editor = function(map){
           redo: intersects[0].copy()
         })
         Rooms.rebuild()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+
         wheelState = null
 			}, 250)
 		}
-- 
cgit v1.2.3-70-g09d2


From f9b5dc7e63eb2c189f7a2ec65b4c4e05bf964036 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 17:52:25 -0500
Subject: don't put videos/iframes in the dom at all

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

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 24c2602..f6cc8e4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -22,6 +22,7 @@ var Scenery = new function(){
 			case 'video':
 			case 'youtube':
 			case 'vimeo':
+			  if (is_mobile) return
 				scene_media = new Scenery.types.video (opt)
 				break
 			
@@ -39,7 +40,10 @@ var Scenery = new function(){
 		var scene_media = base.add(opt)
 		
 		// test if scenery was placed here
-		if (! scene_media.bounds) {
+		if (! scene_media) {
+		  return null
+		}
+		else if (! scene_media.bounds) {
 			base.remove( scene_media.id )
 			return null
 		}
-- 
cgit v1.2.3-70-g09d2


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')

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')

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')

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')

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')

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')

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')

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')

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')

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


From bc4517c6b09e03f52161dc38ca591ed0cc227d5d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 13 Nov 2014 18:33:39 -0500
Subject: toggle global height

---
 .../javascripts/rectangles/engine/map/ui_editor.js |  1 +
 .../javascripts/rectangles/engine/rooms/_rooms.js  |  4 ++++
 .../assets/javascripts/ui/builder/BuilderInfo.js   | 22 ++++++++++++++++++++++
 public/assets/stylesheets/app.css                  | 14 +++++++++++++-
 views/controls/builder/info.ejs                    |  2 ++
 5 files changed, 42 insertions(+), 1 deletion(-)

(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 c838b8b..44ca91d 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -42,6 +42,7 @@ Map.UI.Editor = function(map){
 		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
 
 		if (e.ctrlKey || e.which === 3) {
+		  if (Rooms.regions.length == 0) return
 			cursor.quantize(1/map.zoom)
 			map.center.a = cursor.x.a
 			map.center.b = -cursor.y.a
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 5686aba..46c1d7f 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -81,6 +81,10 @@
 		base.forEach = function(f){
 			return base.values().forEach(f)
 		}
+
+		base.some = function(f){
+			return base.values().some(f)
+		}
 	
 		base.map = function(f){
 			return base.values().map(f)
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 7606361..c25f03c 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -16,6 +16,7 @@ var BuilderInfo = View.extend({
 		"change [name=units]": 'changeUnits',
 		"keydown [name=viewHeight]": 'enterViewHeight',
 		"change [name=viewHeight]": 'changeViewHeight',
+		"change [name=heightGlobal]": 'changeHeightGlobal',
 		"click [data-role=destroy-room]": 'destroy',
 	},
 	
@@ -31,6 +32,7 @@ var BuilderInfo = View.extend({
 		this.$unitName = this.$(".unitName")
 		this.$noSelection = this.$(".no-selection")
 		this.$settings = this.$(".setting")
+		this.$heightGlobalCheckbox = this.$("[name=heightGlobal]")
 		app.on("builder-pick-room", this.pick.bind(this))
 		app.on("builder-destroy-room", this.hide.bind(this))
 		app.on("builder-pick-nothing", this.deselect.bind(this))
@@ -40,6 +42,18 @@ var BuilderInfo = View.extend({
 		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
 		this.$units.val( "ft" )
 		this.$unitName.html( "ft" )
+
+    if (Rooms.regions.length == 0) {
+      this.changeHeightGlobal(true)
+    }
+    else {
+      var rooms = Rooms.values()
+      var height = rooms[0].height
+      var differentHeights = Rooms.some(function(room){
+        return room.height != height
+      })
+      this.changeHeightGlobal( ! differentHeights )
+    }
 	},
 
 	toggle: function(state){
@@ -141,5 +155,13 @@ var BuilderInfo = View.extend({
   changeViewHeight: function(){
  		window.viewHeight = this.$viewHeight.unitVal( )
 	},
+	changeHeightGlobal: function(state){
+	  if (typeof state == "boolean") {
+      this.$heightGlobalCheckbox.prop("checked", state)
+      window.heightIsGlobal = state
+      return
+	  }
+	  window.heightIsGlobal = this.$heightGlobalCheckbox.prop("checked")
+	},
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 814df90..55f3219 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1582,7 +1582,8 @@ border-left: 1px solid black;
 	transition:opacity 0.3s ease-in-out;
 }
 .reader #minimap {
-	right: 20px;
+	right: 10px;
+	bottom: 10px;
 	left: auto;
 	-webkit-transform:translateX(180px);
 	-moz-transform:translateX(180px);
@@ -2141,6 +2142,17 @@ input[type="range"]::-webkit-slider-thumb {
 	top: 0px;
 }
 
+.setting.number #room-height {
+  width: 60px;
+}
+.setting.number #room-height-global-label {
+  float: none;
+  margin-left: 6px;
+}
+.setting.number #room-height-global-label:after {
+  content: '';
+}
+
 #mediaEditor .setting.number label {
 	width: 40px;
 }
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 2762207..8a0e0d5 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -20,6 +20,8 @@
 	<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 halflines">
 		<label for="room-x">x</label>
-- 
cgit v1.2.3-70-g09d2


From af2673a3fd976327e9a92fd6b497f5f5cd82d7b3 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 13 Nov 2014 18:40:50 -0500
Subject: global room height toggle

---
 .../javascripts/rectangles/engine/map/ui_editor.js | 27 +++++++++++++++++++++-
 .../javascripts/rectangles/engine/scenery/undo.js  | 12 +++++++++-
 2 files changed, 37 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 44ca91d..d1b0b89 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -227,7 +227,32 @@ Map.UI.Editor = function(map){
 			return r.focused // = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
 		
-		if (intersects.length) {
+		if (intersects.length && window.heightIsGlobal) {
+		  var rooms = Rooms.values()
+		  wheelState = wheelState || rooms[0].height
+		  var height = clamp( ~~(rooms[0].height + deltaY * 2), height_min, height_max )
+		  rooms.forEach(function(room){
+		    room.height = height
+		  })
+		  
+		  app.tube("builder-pick-room", intersects[0])
+
+      clearTimeout(wheelTimeout)
+			wheelTimeout = setTimeout(function(){
+        UndoStack.push({
+          type: "update-rooms-height",
+          undo: wheelState,
+          redo: height
+        })
+        Rooms.rebuild()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+
+        wheelState = null
+			}, 250)
+		}
+		else if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
 			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 6ad9e0d..8b85d02 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -111,7 +111,17 @@
         Rooms.rebuild()
       },
     },
-    
+   
+    {
+      type: "update-rooms-height",
+      undo: function(state){
+        var rooms = Rooms.values()
+        rooms.forEach(function(room){
+          room.height = state
+        })
+      },
+    },
+     
     //
 
     {
-- 
cgit v1.2.3-70-g09d2


From d729d5f58fa4a4a30e252ab063bcf636559945b0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 14 Nov 2014 16:43:26 -0500
Subject: soundcloud support

---
 Gruntfile.js                                       |   2 +
 .../assets/javascripts/mx/primitives/mx.image.js   |   2 +-
 .../javascripts/mx/primitives/mx.soundcloud.js     | 122 +++++++++++++++++++++
 .../rectangles/engine/scenery/_scenery.js          |   5 +
 .../rectangles/engine/scenery/types/audio.js       |  73 ++++++++++++
 public/assets/javascripts/ui/editor/MediaViewer.js |   5 +
 public/assets/javascripts/ui/lib/Parser.js         |  17 +--
 public/assets/javascripts/ui/reader/MediaPlayer.js |   3 +
 views/partials/scripts.ejs                         |   3 +
 9 files changed, 224 insertions(+), 8 deletions(-)
 create mode 100644 public/assets/javascripts/mx/primitives/mx.soundcloud.js
 create mode 100644 public/assets/javascripts/rectangles/engine/scenery/types/audio.js

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

diff --git a/Gruntfile.js b/Gruntfile.js
index bba8f22..c99976d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -32,6 +32,7 @@ module.exports = function(grunt) {
           "public/assets/javascripts/mx/primitives/mx.video.js",
           "public/assets/javascripts/mx/primitives/mx.youtube.js",
           "public/assets/javascripts/mx/primitives/mx.vimeo.js",
+          "public/assets/javascripts/mx/primitives/mx.soundcloud.js",
 
           "public/assets/javascripts/rectangles/_env.js",
 
@@ -74,6 +75,7 @@ module.exports = function(grunt) {
           "public/assets/javascripts/rectangles/engine/scenery/types/image.js",
           "public/assets/javascripts/rectangles/engine/scenery/types/text.js",
           "public/assets/javascripts/rectangles/engine/scenery/types/video.js",
+          "public/assets/javascripts/rectangles/engine/scenery/types/audio.js",
 
           "public/assets/javascripts/rectangles/engine/map/_map.js",
           "public/assets/javascripts/rectangles/engine/map/ui_editor.js",
diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index 575e9c0..b8557bf 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -12,7 +12,7 @@ MX.Image = MX.Object3D.extend({
 		this.backface = ops.backface || false
 			
 		ops.className && this.el.classList.add(ops.className)
-		this.backface && this.el.classList.add("backface-visible")		
+		this.backface && this.el.classList.add("backface-visible")
 		this.el.classList.add("image")
 		this.el.classList.add("mx-scenery")
 
diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
new file mode 100644
index 0000000..6ac64bb
--- /dev/null
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -0,0 +1,122 @@
+MX.Soundcloud = MX.Object3D.extend({
+  init: function (ops) {
+  
+  	this.type = "Soundcloud"
+		this.media = ops.media
+    this.width = 0
+    this.height = 0
+		this.x = ops.x || 0
+		this.y = ops.y || 0
+		this.z = ops.z || 0
+		this.scale = ops.scale || 1
+		this.backface = ops.backface || false
+			
+		ops.className && this.el.classList.add(ops.className)
+		this.backface && this.el.classList.add("backface-visible")
+		this.el.classList.add("audio")
+		this.el.classList.add("mx-scenery")
+
+		this.el.style.backgroundRepeat = 'no-repeat'
+
+  	this.ops = ops
+  },
+
+  load: function(ops){
+    if (ops) {
+      ops = this.ops = defaults(ops, this.ops)
+    }
+    else {
+      ops = this.ops
+    }
+
+  	this.width = ops.media.width
+  	this.height = ops.media.height
+
+  	var tag = Parser.lookup.soundcloud.tag(ops.media)
+  	var $iframe = $(tag)
+  	var iframe = $iframe[0]
+  	$iframe.css('z-index', '-1')
+  	this.el.appendChild( iframe )
+
+  	var overlay = this.overlay = document.createElement("div")
+  	overlay.style.width = "100%"
+  	overlay.style.height = "100%"
+  	overlay.style.position = "absolute"
+  	overlay.style.top = "0"
+  	overlay.style.left = "0"
+  	overlay.style.zIndex = "2"
+  	overlay.className = "overlay"
+  	this.el.appendChild(overlay)
+  	
+  	this.player = SC.Widget( iframe )
+  	this.player.setVolume(80)
+  	
+  	this.duration = 0
+  	
+  	this.player.bind(SC.Widget.Events.READY, this.ready.bind(this))
+//   	this.player.bind(SC.Widget.Events.LOAD_PROGRESS, this.loadProgress.bind(this))
+//   	this.player.bind(SC.Widget.Events.PLAY_PROGRESS, this.playProgress.bind(this))
+  	this.player.bind(SC.Widget.Events.PLAY, this.didPlay.bind(this))
+  	this.player.bind(SC.Widget.Events.PAUSE, this.didPause.bind(this))
+  	this.player.bind(SC.Widget.Events.FINISH, this.finished.bind(this))
+  },
+  
+  ready: function(){
+  	if (this.media.autoplay) {
+  	  this.play()
+  	}
+
+  	this.player.getDuration(function(duration){
+  	  this.duration = duration
+  	}.bind(this))
+  },
+  
+  play: function(){
+    this.player.play()
+  },
+  
+  pause: function(){
+    this.player.pause()
+  },
+
+  toggle: function(state){
+    if (typeof state === "boolean") {
+      if (state) this.play()
+      else this.pause()
+    }
+    else {
+      this.player.toggle()
+    }
+  },
+  
+  seek: function(n){
+		if (n < 1) {
+			n = n * this.duration
+		}
+		this.player.seekTo(n)
+  },
+
+  setLoop: function(state){
+		this.media.loop = state
+  },
+  
+  didPlay: function(){
+    this.paused = false
+  },
+  
+  didPause: function(){
+    this.paused = true
+  },
+  
+  finished: function(){
+  	console.log("soundcloud finished")
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
+  	else if (this.bound) {
+  		$(".playButton").removeClass('playing')
+  	}
+  },
+  
+})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 436712a..a0f5b35 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -27,6 +27,11 @@ var Scenery = new function(){
 				scene_media = new Scenery.types.video (opt)
 				break
 			
+			case 'soundcloud':
+			  if (is_mobile) return
+				scene_media = new Scenery.types.audio (opt)
+				break
+			
 			case 'text':
 			  scene_media = new Scenery.types.text (opt)
 			  scene_media.focused = true
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/audio.js b/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
new file mode 100644
index 0000000..82f984e
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
@@ -0,0 +1,73 @@
+
+Scenery.types.audio = Scenery.types.base.extend(function(base){
+
+	var exports = {
+	
+	  type: 'audio',
+	
+		init: function(opt){
+
+			opt.scale = 1.0
+
+			base.init.call(this, opt)
+
+			this.build()
+			this.bind()
+			this.place(opt)
+		},
+
+		build: function(){
+			this.mx = new MX.Soundcloud({
+				scale: this.scale,
+				media: this.media,
+				y: this.scale * this.media.height/2,
+				backface: false,
+			})
+			scene.add( this.mx )
+			this.mx.load()
+		},
+
+		serialize: function(){
+			var data = base.serialize.call(this)
+			return data
+		},
+	
+		deserialize: function(data){
+			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
+      this.dimensions.deserialize(data.dimensions)
+		},
+
+		play: function(){
+			this.mx.play()
+		},
+		
+		pause: function(){
+			this.mx.pause()
+		},
+		
+		toggle: function(){
+		  this.mx.toggle()
+		},
+
+		paused: function(){
+			return this.mx.paused
+		},
+		
+		muted: function(){
+			return this.mx.muted
+		},
+		
+		seek: function(n){
+			this.mx.seek(n)
+		},
+	
+    setLoop: function(shouldLoop){
+			this.mx.setLoop(shouldLoop)
+		},
+		
+	}
+	
+	return exports
+})
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 9593ab7..4af94e5 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -190,6 +190,10 @@ var MediaViewer = ModalView.extend({
 				image.src = media.url
 				image.load()
 				break
+			
+			case 'soundcloud':
+				image.src = media.thumbnail
+			  break
 		}
 		
 		$span.data("media", media)
@@ -250,6 +254,7 @@ var MediaViewer = ModalView.extend({
 
 		switch (media.type) {
 			case "video":
+			case "soundcloud":
 				$floatingImg.attr('src', '/assets/img/playbutton.png')
 				break
 			
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index d68f58b..87d52ef 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -115,7 +115,6 @@ var Parser = {
 			return '<div class="video" style="width: ' + media.width + 'px; height: ' + media.height + 'px; overflow: hidden; position: relative;"><iframe frameborder="0" scrolling="no" seamless="seamless" webkitallowfullscreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen" id="okplayer" src="http://player.vimeo.com/video/' + media.token + '?api=1&title=0&byline=0&portrait=0&playbar=0&player_id=okplayer&loop=0&autoplay=0" width="' + media.width + '" height="' + media.height + '" style="position: absolute; top: 0px; left: 0px; width: ' + media.width + 'px; height: ' + media.height + 'px;"></iframe></div>'
 		}
 	},
-	/*
 	{
 		type: 'soundcloud',
 		regex: /soundcloud.com\/[-a-zA-Z0-9]+\/[-a-zA-Z0-9]+\/?$/i,
@@ -127,24 +126,28 @@ var Parser = {
 					+ '&client_id=' 
 					+ '0673fbe6fc794a7750f680747e863b10',
 				success: function(result) {
+				  // console.log(result)
 					done({
 						url: url,
 						type: "soundcloud",
 						token: result.id,
-						thumbnail: "",
-						title: "",
-						width: 100,
-						height: 100,
+						thumbnail: result.artwork_url || result.user.avatar_url,
+						title: result.title,
+						description: result.user.username,
+						width: 166,
+						height: 166,
 					})
 				}
 			});
 		},
 		tag: function (media) {
-			return '<iframe width="400" height="166" scrolling="no" frameborder="no"' +
+			return '<iframe width="166" height="166" scrolling="no" frameborder="no"' +
 					'src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/' + media.token +
 					'&amp;color=ff6600&amp;auto_play=false&amp;show_artwork=true"></iframe>'
 		}
-	}, {
+	},
+  /*
+	{
 		type: 'link',
 		regex: /^http.+/i,
 		fetch: function(url, done) {
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 42e7596..f5a0d2c 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -49,6 +49,9 @@ var MediaPlayer = FormView.extend({
 				return false
 			}
 		}
+		else if (media.type == "text") {
+		  return false
+		}
 
 		this.bind(scenery)
 		this.$el.addClass("active")
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index d5e8e5d..7391d36 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -26,6 +26,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.soundcloud.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
 
@@ -65,6 +66,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/randomize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/audio.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
@@ -130,3 +132,4 @@
 [[ } ]]
 
 <script type="text/javascript" src="http://www.youtube.com/player_api"></script>
+<script type="text/javascript" src="https://w.soundcloud.com/player/api.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 5b9b94d0dac5ddb70a5ea51b948cde40ae898202 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 14 Nov 2014 17:08:53 -0500
Subject: fix click/bind behavior

---
 .../javascripts/rectangles/engine/scenery/_scenery.js  |  3 ++-
 public/assets/javascripts/ui/editor/MediaEditor.js     | 18 +++++++++++++++---
 public/assets/javascripts/ui/editor/TextEditor.js      |  3 ++-
 public/assets/javascripts/ui/reader/MediaPlayer.js     | 14 ++++++++++++--
 4 files changed, 31 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index a0f5b35..d03e0e1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -34,7 +34,7 @@ var Scenery = new function(){
 			
 			case 'text':
 			  scene_media = new Scenery.types.text (opt)
-			  scene_media.focused = true
+			  scene_media.focused = !! opt.newMedia
 			  break
 		}
 		base.list[scene_media.id] = scene_media
@@ -42,6 +42,7 @@ var Scenery = new function(){
 	}
 	
 	base.addNextToWall = function(opt){
+	  opt.newMedia = true
 		opt.media = base.nextMedia
 		opt.index = opt.index || 0
 		var scene_media = base.add(opt)
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index de93f6e..21759d6 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -51,7 +51,7 @@ var MediaEditor = FormView.extend({
 	},
 	
 	pick: function(scenery) {
-		if (this.scenery) {
+		if (this.scenery && scenery !== this.scenery) {
 			this.unbind()
 		}
 
@@ -74,15 +74,17 @@ var MediaEditor = FormView.extend({
 		
 		switch (media.type) {
 			case "image":
-				this.$(".image").show()
 				this.$(".video").hide()
+				this.$(".audio").hide()
+				this.$(".image").show()
 				break
 
 			case "youtube":
 			case "vimeo":
 			case "video":
-				this.$(".video").show()
 				this.$(".image").hide()
+				this.$(".audio").hide()
+				this.$(".video").show()
 				
 				this.$playButton.toggleClass("paused", ! this.scenery.paused())
 				this.$autoplay.prop('checked', !! media.autoplay)
@@ -90,6 +92,15 @@ var MediaEditor = FormView.extend({
 				this.$mute.prop('checked', !! media.mute)
 				this.$keyframe.val( Number(media.keyframe || 0) )
 				break
+			
+			case "soundcloud":
+				this.$(".image").hide()
+				this.$(".video").hide()
+				this.$(".audio").show()
+				this.$playButton.toggleClass("paused", ! this.scenery.paused())
+				this.$autoplay.prop('checked', !! media.autoplay)
+				this.$loop.prop('checked', !! media.loop)
+			  break
 		}
 	},
 
@@ -161,6 +172,7 @@ var MediaEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
+	    this.scenery.focused = false
 	    if (this.tainted && this.scenery.media) {
         this.scenery.media.title = this.$name.val()
         this.scenery.media.description = this.$description.val()
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index d897f91..53d5b9f 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -96,6 +96,7 @@ var TextEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
+	    this.scenery.focused = false
       if (this.tainted) {
         Minotaur.watch( app.router.editorView.settings )
       }
@@ -119,7 +120,7 @@ var TextEditor = FormView.extend({
   },
   
   pick: function(scenery){
-		if (this.scenery) {
+		if (this.scenery && scenery !== this.scenery) {
 			this.unbind()
 		}
 
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index f5a0d2c..8424d9c 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -61,8 +61,9 @@ var MediaPlayer = FormView.extend({
 		
 		switch (media.type) {
 			case "image":
-				this.$(".image").show()
 				this.$(".video").hide()
+				this.$(".audio").hide()
+				this.$(".image").show()
 
 // 				this.$widthDimension.html( Number(media.widthDimension) || "" )
 // 				this.$heightDimension.html( Number(media.heightDimension) || "" )
@@ -73,13 +74,22 @@ var MediaPlayer = FormView.extend({
 			case "youtube":
 			case "vimeo":
 			case "video":
-				this.$(".video").show()
 				this.$(".image").hide()
+				this.$(".audio").hide()
+				this.$(".video").show()
 
 				this.$playButton.toggleClass("paused", ! this.scenery.paused())
 				this.$muteButton.toggleClass("muted", this.scenery.muted())
 
 				break
+			
+			case "soundcloud":
+				this.$(".image").hide()
+				this.$(".video").hide()
+				this.$(".audio").show()
+
+				this.$playButton.toggleClass("paused", ! this.scenery.paused())
+			  break
 		}
 		return true
 	},
-- 
cgit v1.2.3-70-g09d2


From 208020e87a423a35dfc33c16b9c715e84a69fda6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 17 Nov 2014 18:14:25 -0500
Subject: fix bug from coupling map stuff to editor

---
 public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 +-
 public/assets/javascripts/ui/builder/BuilderView.js          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(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 d1b0b89..7308344 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -184,7 +184,7 @@ Map.UI.Editor = function(map){
 				app.tube("builder-pick-room", room)
 
         // TODO: watch individual scenery object here
-        Minotaur.watch( app.router.editorView.settings )
+        Minotaur.watch( app.controller.settings )
 			}
 		}
     if (base.resizing || base.dragging) {
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index 9b7e1a2..b975499 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,6 +12,7 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.colorControl = new ColorControl ({ parent: this })
+		this.cursor = new HelpCursor({ parent: this })
 	},
 
 	load: function(name){
-- 
cgit v1.2.3-70-g09d2


From 15058f6c83da00b54f676b9fafbb758ddef0be84 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 13:46:57 -0500
Subject: undo random scenery placement

---
 .../rectangles/engine/scenery/_scenery.js          |  3 +++
 .../rectangles/engine/scenery/randomize.js         | 18 ++++++++++---
 .../javascripts/rectangles/engine/scenery/undo.js  | 30 +++++++++++++++++++++-
 3 files changed, 47 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index d03e0e1..d52fe21 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -99,6 +99,7 @@ var Scenery = new function(){
 	}
 
 	base.deserialize = function(scenery_data){
+	  var added = []
 		scenery_data.forEach(function(data){
 			var wall = Walls.lookup[data.wall_id] || Walls.first()
 			var scene_media = base.add({
@@ -107,7 +108,9 @@ var Scenery = new function(){
 				media: data.media,
 				id: data.id
 			})
+			added.push(scene_media)
 		})
+		return added
 	}
 
 	return base
diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
index 1c2eb56..6581f38 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js
@@ -33,7 +33,7 @@ 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 = {};
+  var walls = {}, removed = [];
 
   (wall_list || Walls.list).forEach(function(wall){
     walls[wall.id] = wall
@@ -44,6 +44,7 @@ Scenery.randomize.get_empty_walls = function(wall_list){
     Scenery.forEach(function(scenery){
       if (scenery.was_randomly_placed) {
         // remove it and reuse this wall?
+        removed.push( scenery.serialize() )
         Scenery.remove( scenery.id )
       }
       else {
@@ -52,7 +53,7 @@ Scenery.randomize.get_empty_walls = function(wall_list){
     })
   }
   
-  return walls
+  return { walls: walls, removed: removed }
 }
 
 // Randomly place a set of media objects on empty walls.
@@ -60,7 +61,10 @@ Scenery.randomize.get_empty_walls = function(wall_list){
 // 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)
+  var empty_data = Scenery.randomize.get_empty_walls(wall_list)
+  var walls = empty_data.walls
+  var removed = empty_data.removed
+  var added = []
   
   var wall_ids = _.keys(walls)
   if (! wall_ids.length) { return }
@@ -93,6 +97,7 @@ Scenery.randomize.add = function (media_objs, wall_list) {
         index: 0,
       })
       scenery.was_randomly_placed = true
+      added.push(scenery.serialize())
     }
     else {
       // artwork won't fit anywhere??
@@ -100,4 +105,11 @@ Scenery.randomize.add = function (media_objs, wall_list) {
   
     return false
   })
+  
+  UndoStack.push({
+    type: "randomize-scenery",
+    undo: { added: added, removed: removed },
+    redo: { added: added, removed: removed },
+  })
+  
 }
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 8b85d02..1232780 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -121,7 +121,7 @@
         })
       },
     },
-     
+    
     //
 
     {
@@ -166,6 +166,34 @@
         Minotaur.watch( app.router.editorView.settings )
       },
     },
+    {
+      type: "randomize-scenery",
+      undo: function(state){
+        state.added.forEach(function(_scenery){
+          Scenery.remove(_scenery.id)
+        })
+        var scenery_list = Scenery.deserialize(state.removed)
+        scenery_list.forEach(function(scenery){
+          scenery.was_randomly_placed = true
+        })
+        Scenery.resize.hide()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        state.removed.forEach(function(_scenery){
+          Scenery.remove(_scenery.id)
+        })
+        var scenery_list = Scenery.deserialize(state.added)
+        scenery_list.forEach(function(scenery){
+          scenery.was_randomly_placed = true
+        })
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
     
   ])
 })()
-- 
cgit v1.2.3-70-g09d2


From 87ce2f24887f20cf34165f92b43bbfd33435f30a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 13:59:42 -0500
Subject: hiding floor/ceiling in ff

---
 public/assets/javascripts/rectangles/engine/rooms/builder.js | 6 ++++++
 public/assets/javascripts/ui/editor/ColorControl.js          | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index c95734b..5e09fab 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -261,6 +261,9 @@
 			el.rotationX = PI/2
 			el.rect = region
 			el.side = FLOOR
+			if ($.browser.mozilla) {
+			  el.el.style.display = "none"
+			}
 			return el
 		}
 		this.make_ceiling = function (room, region) {
@@ -277,6 +280,9 @@
 			el.rotationX = -PI/2
 			el.rect = region
 			el.side = CEILING
+			if ($.browser.mozilla) {
+			  el.el.style.display = "none"
+			}
 			return el
 		}
 		this.make_wall = function (klass) {
diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js
index 9ab2623..54a6a2e 100644
--- a/public/assets/javascripts/ui/editor/ColorControl.js
+++ b/public/assets/javascripts/ui/editor/ColorControl.js
@@ -47,7 +47,12 @@ var ColorControl = View.extend({
     	$swatch.css("background-color","rgb(" + color + ")")
     	$swatch.data('color', color)
     	this.$colors.append($swatch)
-    }.bind(this))    
+    }.bind(this))
+    
+    if ($.browser.mozilla) {
+      $("#floor-color").parent().hide()
+      $("#ceiling-color").parent().hide()
+    }
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
-- 
cgit v1.2.3-70-g09d2


From 673cd38ccb8a9c6ba7ec0a879fc96dcc580b046c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 3 Feb 2015 14:46:16 -0500
Subject: enable hidpi canvas in main app

---
 Gruntfile.js                                       |  1 +
 bower.json                                         |  2 +-
 .../javascripts/rectangles/engine/map/draw.js      |  2 +-
 public/assets/javascripts/ui/lib/LabColorPicker.js | 26 ++++++++++++----------
 public/assets/javascripts/ui/reader/Tracker.js     | 14 +++++++-----
 public/assets/test/surface.html                    |  2 +-
 views/controls/editor/color-control.ejs            |  2 +-
 views/partials/scripts.ejs                         |  1 +
 8 files changed, 29 insertions(+), 21 deletions(-)

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

diff --git a/Gruntfile.js b/Gruntfile.js
index f7af106..70a8b13 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@ module.exports = function(grunt) {
           "public/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js",
           "public/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js",
           "public/assets/javascripts/vendor/bower_components/marked/lib/marked.js",
+          "public/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js",
           "public/assets/javascripts/vendor/tube.js",
           "public/assets/javascripts/vendor/loader.js",
           "public/assets/javascripts/vendor/polyfill.js",
diff --git a/bower.json b/bower.json
index c78310d..e3e83ca 100644
--- a/bower.json
+++ b/bower.json
@@ -10,6 +10,6 @@
     "jquery-jsonview": "1.2.0",
     "prefixfree": "",
     "marked": "0.3.2",
-    "hidpi-canvas": "~1.0.9"
+    "hidpi-canvas": "git://github.com/julescarbon/hidpi-canvas-polyfill.git#master"
   }
 }
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index eceda3c..5a9b592 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -56,9 +56,9 @@ Map.Draw = function(map, opt){
 		}
 
 		var canvas = document.createElement("canvas")
-		ctx = canvas.getContext('2d')
 		canvas.width = thumbnail_width
 		canvas.height = thumbnail_height
+		ctx = canvas.getContext('2d')
 		
 		draw.clear()
 
diff --git a/public/assets/javascripts/ui/lib/LabColorPicker.js b/public/assets/javascripts/ui/lib/LabColorPicker.js
index 7ddcdd5..2c8fb90 100644
--- a/public/assets/javascripts/ui/lib/LabColorPicker.js
+++ b/public/assets/javascripts/ui/lib/LabColorPicker.js
@@ -1,9 +1,12 @@
 var LabColorPicker = function (parent, w, h) {
   var base = this
   var canvas = this.canvas = document.createElement('canvas')
-  var ctx = this.ctx = canvas.getContext('2d')
-  var imageData = ctx.createImageData(w,h)
-  var data = imageData.data
+  canvas.width = w
+  canvas.height = h
+  var ctx = this.ctx = canvas.getContext('2d-lodpi')
+//  canvas.className = "colorPicker"
+//   var imageData = ctx.createImageData(w, h)
+//   var data = imageData.data
 
   var cursor = this.cursor = document.createElement("div")
   cursor.className = "colorPickerCursor"
@@ -15,10 +18,6 @@ var LabColorPicker = function (parent, w, h) {
 	brightnessControl.setAttribute("max", "110")
 	brightnessControl.setAttribute("value", "0")
 
-  canvas.width = w
-  canvas.height = h
-  canvas.className = "colorPicker"
-
   var ww = w-1
   var hh = h-1
   
@@ -84,11 +83,14 @@ var LabColorPicker = function (parent, w, h) {
   }
   this.paint = function() {
     val = clamp(val, L_range[0], L_range[1])
-    var x, y, t
-    for (var i = 0; i < w; i++) {
-      for (var j = 0; j < h; j++) {
-        x = mix( i/ww, a_range[0], a_range[1] )
-        y = mix( j/hh, b_range[0], b_range[1] )
+		var imageData = ctx.createImageData(canvas.width, canvas.height)
+		var data = imageData.data
+    var x, y, t, cw = imageData.width, ch = imageData.height
+    var cww = cw-1, chh = ch-1
+    for (var i = 0; i < cw; i++) {
+      for (var j = 0; j < ch; j++) {
+        x = mix( i/cww, a_range[0], a_range[1] )
+        y = mix( j/chh, b_range[0], b_range[1] )
         t = (j*w + i) * 4
         rgb = xyz2rgb(hunterlab2xyz(val, x, y))
         data[t] = Math.round( rgb[0] )
diff --git a/public/assets/javascripts/ui/reader/Tracker.js b/public/assets/javascripts/ui/reader/Tracker.js
index ce32c59..d2dec39 100644
--- a/public/assets/javascripts/ui/reader/Tracker.js
+++ b/public/assets/javascripts/ui/reader/Tracker.js
@@ -1,8 +1,12 @@
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
+if (window.location.host.indexOf("lvh.me") === -1) {
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+}
+else {
+	ga = function(){}
+}
 ga('create', 'UA-56883705-1', 'auto');
 ga('send', 'pageview');
 
diff --git a/public/assets/test/surface.html b/public/assets/test/surface.html
index 02b473d..9e6abe8 100644
--- a/public/assets/test/surface.html
+++ b/public/assets/test/surface.html
@@ -2,7 +2,7 @@
 
 <script src="/assets/javascripts/util.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
-<script src="/assets/javascripts/vendor/vendor/tube.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index c035e24..bcc955d 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox colorcontrol">
+<div class="vvbox colorcontrol active">
 	<h4>Edit Room Colors</h4>
 
   <div class="colors">
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index a58eca1..011644b 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -5,6 +5,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <!-- <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script> -->
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 220320494c60c154e84c579f86d2dfdd8f41be2f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 3 Feb 2015 17:41:36 -0500
Subject: orthographic polyline

---
 .../javascripts/rectangles/engine/map/_map.js      |   8 +
 .../javascripts/rectangles/engine/map/draw.js      |  19 +-
 .../assets/javascripts/rectangles/models/vec2.js   |   5 +
 public/assets/test/ortho.html                      | 224 +++++++++++++++++++++
 4 files changed, 251 insertions(+), 5 deletions(-)
 create mode 100644 public/assets/test/ortho.html

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 202803a..d582982 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -48,6 +48,13 @@ var Map = function(opt){
 	base.el.appendChild(canvas)
 	
 	switch (opt.type) {
+		case "ortho":
+			base.draw = new Map.Draw (base, { ortho: true })
+			base.ui = new Map.UI.Ortho (base)
+			base.sides = base.sides_for_camera
+			$(window).resize(base.resize)
+			break
+		
 		case "editor":
 			base.draw = new Map.Draw (base)
 			base.ui = new Map.UI.Editor (base)
@@ -65,6 +72,7 @@ var Map = function(opt){
 	base.resize = function(){
 		canvas.width = base.dimensions.a = window.innerWidth
 		canvas.height = base.dimensions.b = window.innerHeight
+		// resize here - esp if 2d-hires
 	}
 		
 	base.toggle = function(state){
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 5a9b592..b525696 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -5,14 +5,16 @@ Map.Draw = function(map, opt){
 
 	var draw = this
 	
-	var ctx = map.canvas.getContext("2d")
+	var ctx = draw.ctx = map.canvas.getContext("2d")
 
 	draw.animate = function(){
 		ctx.save()
 		draw.clear()
 		draw.fill("rgba(255,255,255,0.98)")
 
-		if (opt.minimap) {
+		if (opt.ortho) {
+		}
+		else if (opt.minimap) {
 			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
 			ctx.scale( map.zoom, map.zoom )
 			ctx.translate( opt.center.x, - opt.center.z )
@@ -22,7 +24,6 @@ Map.Draw = function(map, opt){
 			draw.regions(Rooms.regions, [ "#fff" ], "#000")
 			draw.camera(scene.camera)
 		}
-		
 		else {
 			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
 			ctx.scale( map.zoom, map.zoom )
@@ -31,12 +32,19 @@ Map.Draw = function(map, opt){
 
 			draw.regions(Rooms.regions, [ "#f8f8f8" ], "#000")
 			draw.mouse(map.ui.mouse.cursor)
+			draw.mouse_dimensions(map.ui.mouse.cursor)
 			draw.coords()
 			scene && draw.camera(scene.camera)
 		}
 
 		ctx.restore()
 	}
+	draw.translate = function(){
+		ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
+		ctx.scale( map.zoom, map.zoom )
+		ctx.translate( map.center.a, map.center.b )
+		ctx.scale( -1, 1 )
+	}
 
   // changes the ctx temporarily
 	draw.render = function(){
@@ -87,7 +95,7 @@ Map.Draw = function(map, opt){
 		ctx.putImageData(pixelData, 0, 0)
 
 		// reset the ctx
-		ctx = map.canvas.getContext("2d")
+		ctx = draw.ctx
 
 		return canvas
 	}
@@ -123,7 +131,8 @@ Map.Draw = function(map, opt){
 		ctx.beginPath();
 		ctx.arc(mouse.x.b, mouse.y.b, radius, 0, 2*Math.PI, false);
 		ctx.fill();
-
+	}
+	draw.mouse_dimensions = function(mouse){
 		if (mouse.width() != 0 && mouse.height() != 0) {
 			if (map.ui.dragging) {
 				stroke_rect(mouse)
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 14d0e6b..290e45e 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -80,6 +80,11 @@
 	  this.a = Math.round(this.a)
 	  this.b = Math.round(this.b)
 	}
+	vec2.prototype.distanceTo = function(v){
+		var va = (this.a - v.a)
+		var vb = (this.b - v.b)
+		return Math.sqrt( va*va + vb*vb )
+	}
 	vec2.prototype.setPosition = function(n){
 		var len = this.length()
 		this.a = n
diff --git a/public/assets/test/ortho.html b/public/assets/test/ortho.html
new file mode 100644
index 0000000..8626453
--- /dev/null
+++ b/public/assets/test/ortho.html
@@ -0,0 +1,224 @@
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	font-family: Menlo, monospace;
+	overflow: hidden;
+}
+#perspective {
+	position: absolute;
+	left:0%;
+	top:0px
+}
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+</style>
+
+<div id="perspective"></div>
+<div id="orthographic"></div>
+
+<div id="hud"></div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/polyfill.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+
+<script>
+
+// var w = canvas.width = window.innerWidth/2
+// var h = canvas.height = window.innerHeight
+
+// var ctx = canvas.getContext('2d')
+var scene = new MX.Scene()
+
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+			// compare to initial point
+			var p = new vec2( cursor.x.a, cursor.y.a )
+			console.log(p+"")
+			if (placing) {
+				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
+					points.push( points[0].clone() )
+					placing = false
+				}
+				else {
+					points.push( p )
+				}
+			}
+			else {
+				placing = true
+				points.length = 0
+				points.push( p )
+			}
+		},
+		move: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+// 			var p = new vec2( cursor.x.a, cursor.y.a )
+// 			if (placing && points.length > 2 && points[0].distanceTo(p) < 3 ) {
+// 				document.body.style.cursor = "pointer"
+// 			}
+// 			else {
+// 				document.body.style.cursor = "crosshair"
+// 			}
+		},
+		drag: function(e, cursor){
+			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+		},
+		up: function(e, cursor, new_cursor){
+			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		}
+	})
+
+}
+
+map = new Map ({
+	type: "ortho",
+	el: document.querySelector("#orthographic"),
+	width: window.innerWidth/2,
+	height: window.innerHeight,
+})
+
+scene.camera.move({
+	"x": 0,
+	"y": 0,
+	"z": 0,
+	"rotationX": 0, // PI/2,
+	"rotationY": PI/2, // PI
+})
+scene.camera.radius = 20
+
+var placing = false
+var points = []
+var ctx = map.draw.ctx
+
+function draw (time) {
+  if (points.length == 1) {
+    ctx.fillStyle = "#000"
+    ctx.fillRect(points[0].a, points[0].b, 10, 10)
+  }
+  if (points.length > 1) {
+    ctx.fillStyle = "#000"
+    ctx.strokeStyle = "#000"
+    ctx.beginPath()
+    ctx.moveTo(points[0].a, points[0].b)
+    points.forEach(function(point, i){
+      i && ctx.lineTo(point.a, point.b)
+    })
+    if (placing) {
+      ctx.stroke()
+    }
+    else {
+      ctx.fill()
+    }
+  }
+}
+
+
+function animate(time){
+  requestAnimationFrame(animate)
+  map.update(time)
+
+	map.draw.ctx.save()
+	map.draw.translate()
+
+	map.draw.coords()
+	map.draw.mouse(map.ui.mouse.cursor)
+  draw(time)
+
+	map.draw.ctx.restore()
+}
+animate()
+
+
+/*
+var mymouse = new mouse({
+  el: canvas,
+  down: function(e, cursor){
+    // compare to initial point
+    var p = new vec2( -cursor.x.a, cursor.y.a )
+    console.log(p+"")
+    if (placing) {
+      if (points.length > 2 && points[0].distanceTo( p ) < 3) {
+        points.push( points[0].clone() )
+        placing = false
+      }
+      else {
+        points.push( p )
+      }
+    }
+    else {
+      placing = true
+      points.length = 0
+      points.push( p )
+    }
+  },
+  move: function(e, cursor){
+    var p = new vec2( cursor.x.a, cursor.y.a )
+    if (placing && points.length > 2 && points[0].distanceTo(p) < 3 ) {
+      document.body.style.cursor = "pointer"
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+  },
+  drag: function(e, cursor){
+  },
+  up: function(e, cursor, new_cursor){
+  },
+})
+
+function draw (time) {
+  ctx.fillStyle = "#fff"
+  ctx.fillRect(0,0,w,h)
+
+  if (points.length == 1) {
+    ctx.fillStyle = "#000"
+    ctx.fillRect(points[0].a, points[0].b, 1, 1)
+  }
+  if (points.length > 1) {
+    ctx.fillStyle = "#000"
+    ctx.strokeStyle = "#000"
+    ctx.beginPath()
+    ctx.moveTo(points[0].x, points[0].y)
+    points.forEach(function(point, i){
+      i && ctx.lineTo(point.x, point.y)
+    })
+    if (placing) {
+      ctx.stroke()
+    }
+    else {
+      ctx.fill()
+    }
+  }
+}
+*/
+
+
+</script>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 4c7cad2ebfc44244ba845c1574271e48b9f2b740 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 4 Feb 2015 13:30:39 -0500
Subject: orbit camera

---
 .../javascripts/mx/extensions/mx.orbitCamera.js    |  80 ++++++++++++
 public/assets/javascripts/rectangles/util/mouse.js |   8 ++
 public/assets/test/orbit.html                      | 140 +++++++++++++++++++++
 public/assets/test/ortho.html                      |  50 ++------
 4 files changed, 235 insertions(+), 43 deletions(-)
 create mode 100644 public/assets/javascripts/mx/extensions/mx.orbitCamera.js
 create mode 100644 public/assets/test/orbit.html

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

diff --git a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
new file mode 100644
index 0000000..b3dcc43
--- /dev/null
+++ b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
@@ -0,0 +1,80 @@
+MX.OrbitCamera = function(opt){
+	var exports = {}, bound = false
+	exports.opt = opt = defaults(opt, {
+		el: window,                   // object to bind events on
+		camera: scene.camera,         // camera object we'll be moving
+		radius: 100,
+		radiusRange: [ 10, 1000 ],
+		rotationX: PI/2,
+		rotationY: 0,
+		center: { x: 0, y: 0, z: 0 },
+		sensitivity: 10,              // moving 1 pixel is like moving N radians
+		ease: 10,
+	})
+	var rx, ry, px, py, epsilon = 1e-10, dragging = false
+	exports.init = function(){
+    ry = opt.rotationY
+    rx = opt.rotationX
+		exports.bind()
+	}
+	exports.toggle = function(state){
+		if (state) exports.bind()
+		else exports.unbind()
+	}
+	exports.bind = function(){
+		if (bound) return;
+		bound = true
+		opt.el.addEventListener("mousedown", down)
+		opt.el.addEventListener("mousemove", move)
+		opt.el.addEventListener("mouseup", up)
+	}
+	exports.unbind = function(){
+		if (! bound) return;
+		bound = false
+		opt.el.removeEventListener("mousedown", down)
+		opt.el.removeEventListener("mousemove", move)
+		opt.el.removeEventListener("mouseup", up)
+	}
+	function down (e) {
+	  px = e.pageX
+	  py = e.pageY
+	  dragging = true
+	}
+	function move (e) {
+	  if (! dragging) return
+	  exports.delta(px- e.pageX, py - e.pageY)
+	  px = e.pageX
+	  py = e.pageY
+	}
+	function up (e) {
+	  dragging = false
+	}
+	exports.delta = function(x,y){
+	  opt.rotationY += x/window.innerWidth * opt.sensitivity
+	  opt.rotationX = clamp( opt.rotationX + y/window.innerHeight * opt.sensitivity, 0, PI)
+	}
+	exports.move = function(y, x){
+	  opt.rotationY = y
+	  if (typeof x == "number") { opt.rotationX = x }
+	}
+	exports.update = function(){
+	  if (abs(ry - opt.rotationY) > epsilon) {
+      ry = avg(ry, opt.rotationY, opt.ease)
+	  }
+	  else {
+	    ry = opt.rotationY
+	  }
+	  if (abs(rx - opt.rotationX) > epsilon) {
+      rx = avg(rx, opt.rotationX, opt.ease)
+	  }
+	  else {
+	    rx = opt.rotationX
+	  }
+		opt.camera.x = opt.center.x + opt.radius * sin(rx) * cos(ry)
+		opt.camera.z = opt.center.y + opt.radius * sin(rx) * sin(ry)
+		opt.camera.y = opt.center.z + opt.radius * cos(rx)
+ 		opt.camera.rotationX = PI/2 - rx
+ 		opt.camera.rotationY = ry + PI/2
+	}
+	return exports
+}
diff --git a/public/assets/javascripts/rectangles/util/mouse.js b/public/assets/javascripts/rectangles/util/mouse.js
index cb36038..86edf6c 100644
--- a/public/assets/javascripts/rectangles/util/mouse.js
+++ b/public/assets/javascripts/rectangles/util/mouse.js
@@ -76,6 +76,14 @@ function mouse (opt) {
     window.addEventListener("mousemove", base.mousemove)
     window.addEventListener("mouseup", base.mouseup)
   }
+  base.unbind = function(){
+    if (opt.el) {
+      opt.el.removeEventListener("mousedown", base.mousedown)
+      opt.el.removeEventListener("contextmenu", base.contextmenu)
+    }
+    window.removeEventListener("mousemove", base.mousemove)
+    window.removeEventListener("mouseup", base.mouseup)
+  }
 
   base.bind_el = function(el){
     el.addEventListener("mousedown", base.mousedown)
diff --git a/public/assets/test/orbit.html b/public/assets/test/orbit.html
new file mode 100644
index 0000000..8b45de6
--- /dev/null
+++ b/public/assets/test/orbit.html
@@ -0,0 +1,140 @@
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	font-family: Menlo, monospace;
+	overflow: hidden;
+}
+#perspective {
+	position: absolute;
+	left:0%;
+	top:0px
+}
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+#hud {
+	white-space: pre;
+}
+</style>
+
+<div id="perspective"></div>
+<div id="orthographic"></div>
+
+<div id="hud"></div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/polyfill.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+
+<script>
+
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		move: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		},
+	})
+}
+
+var scene, map, controls
+
+map = new Map ({
+	type: "ortho",
+	el: document.querySelector("#orthographic"),
+	width: window.innerWidth/2,
+	height: window.innerHeight,
+})
+
+var ctx = map.draw.ctx
+
+document.addEventListener('DOMContentLoaded', build_circle)
+function add_mx_point (p, theta, i) {
+	var mx = new MX.Object3D()
+	mx.updateChildren = false
+	mx.move({
+		x: p.a,
+		y: i/4,
+		z: p.b,
+		rotationY: -theta,
+		width: 1,
+		height: i/2,
+	})
+	mx.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
+	mx.el.style.backfaceVisibility = "visible"
+	scene.add(mx)
+	mx.update()
+}
+function build_circle () {
+	scene = new MX.Scene().addTo("#perspective")
+	scene.camera.move({
+		"x": 0,
+		"y": 0,
+		"z": 0,
+		"rotationX": 0, // PI/2,
+		"rotationY": PI/2, // PI
+	})
+	scene.camera.radius = 20
+
+	scene.width = window.innerWidth/2
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+
+	var theta, rad = 10;
+	for (var i = 0; i < 100; i++) {
+		theta = (i/100 * TWO_PI)
+		add_mx_point({
+			a: sin(theta) * rad,
+			b: cos(theta) * rad,
+		}, theta, i)
+	}
+
+	scene.update()
+
+	controls = new MX.OrbitCamera()
+	controls.init()
+
+	console.log("ready..perhaps")
+	animate(0)
+}
+function animate(time){
+  requestAnimationFrame(animate)
+  map.update(time)
+
+	controls.update()
+	hud.innerHTML = scene.camera.toString()
+  scene.update()
+
+	map.draw.ctx.save()
+	map.draw.translate()
+
+	map.draw.coords()
+	map.draw.mouse(map.ui.mouse.cursor)
+	map.draw.camera(scene.camera)
+
+	map.draw.ctx.restore()
+}
+
+</script>
\ No newline at end of file
diff --git a/public/assets/test/ortho.html b/public/assets/test/ortho.html
index bd94a51..57e050c 100644
--- a/public/assets/test/ortho.html
+++ b/public/assets/test/ortho.html
@@ -32,6 +32,7 @@ body {
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
 <script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
@@ -94,43 +95,6 @@ Map.UI.Ortho = function(map){
 		}
 	})
 }
-MX.OrbitCamera = function(opt){
-	var exports = {}, bound = false
-	exports.opt = opt = defaults(opt, {
-		el: window,                 // object to bind events on
-		camera: scene.camera,       // camera object we'll be moving
-		radius: 100,
-		radiusRange: [ 10, 1000 ],
-		rotationX: 0,
-		rotationY: 0,
-		center: { x: 0, y: 0, z: 0 },
-	})
-	exports.init = function(){
-		exports.bind()
-	}
-	exports.toggle = function(state){
-		if (state) exports.bind()
-		else exports.unbind()
-	}
-	exports.bind = function(){
-		if (bound) return;
-		bound = true
-	}
-	exports.unbind = function(){
-		if (! bound) return;
-		bound = false
-	}
-	exports.update = function(){
-		opt.camera.x = opt.radius * sin(opt.rotationY) * cos(opt.rotationX)
-		opt.camera.y = opt.radius * sin(opt.rotationY) * sin(opt.rotationX)
-		opt.camera.z = opt.radius * cos(opt.rotationY)
-		opt.camera.rotationX = opt.rotationX
-		opt.camera.rotationY = PI-opt.rotationY
-		hud.innerHTML = opt.camera.toString()
-	}
-	
-	return exports
-}
 
 var scene, map, controls
 
@@ -167,17 +131,17 @@ function polyline (time) {
   }
 }
 document.addEventListener('DOMContentLoaded', build_circle)
-function add_mx_point (p) {
+function add_mx_point (p, i) {
 	var mx = new MX.Object3D()
 	mx.updateChildren = false
 	mx.move({
 		x: p.a,
-		y: 0,
+		y: i/4,
 		z: p.b,
 		width: 1,
-		height: 1,
+		height: i/2,
 	})
-	mx.el.style.backgroundColor = "#f80"
+	mx.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
 	mx.el.style.backfaceVisibility = "visible"
 	scene.add(mx)
 	mx.update()
@@ -200,11 +164,11 @@ function build_circle () {
 
 	var theta, rad = 10;
 	for (var i = 0; i < 100; i++) {
-		theta = (i/TWO_PI)
+		theta = (i/100 * TWO_PI)
 		add_mx_point({
 			a: sin(theta) * rad,
 			b: cos(theta) * rad,
-		})
+		}, i)
 	}
 
 	scene.update()
-- 
cgit v1.2.3-70-g09d2


From 24c2c9bd7b776c49e5e90caef00c99bc008ac72a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 4 Feb 2015 14:04:48 -0500
Subject: separate orbit test & add mousewheel zoom

---
 .../javascripts/mx/extensions/mx.orbitCamera.js    | 31 ++++++++++++++++------
 .../javascripts/rectangles/engine/map/draw.js      | 21 ++++++++++++++-
 public/assets/javascripts/rectangles/util/wheel.js | 10 ++++---
 public/assets/test/orbit.html                      | 22 ++++++++++++---
 public/assets/test/ortho.html                      |  1 +
 5 files changed, 68 insertions(+), 17 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
index b3dcc43..b09512e 100644
--- a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
+++ b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
@@ -11,10 +11,17 @@ MX.OrbitCamera = function(opt){
 		sensitivity: 10,              // moving 1 pixel is like moving N radians
 		ease: 10,
 	})
-	var rx, ry, px, py, epsilon = 1e-10, dragging = false
+	var rx, ry, radius, px, py, epsilon = 1e-10, dragging = false
 	exports.init = function(){
     ry = opt.rotationY
     rx = opt.rotationX
+    radius = opt.radius
+    exports.wheel = new wheel({
+			el: opt.el,
+			update: function(e, delta){
+				opt.radius = clamp( opt.radius+delta, opt.radiusRange[0], opt.radiusRange[1] )
+			},
+		})
 		exports.bind()
 	}
 	exports.toggle = function(state){
@@ -25,15 +32,17 @@ MX.OrbitCamera = function(opt){
 		if (bound) return;
 		bound = true
 		opt.el.addEventListener("mousedown", down)
-		opt.el.addEventListener("mousemove", move)
-		opt.el.addEventListener("mouseup", up)
+		window.addEventListener("mousemove", move)
+		window.addEventListener("mouseup", up)
+		exports.wheel.unlock()
 	}
 	exports.unbind = function(){
 		if (! bound) return;
 		bound = false
 		opt.el.removeEventListener("mousedown", down)
-		opt.el.removeEventListener("mousemove", move)
-		opt.el.removeEventListener("mouseup", up)
+		window.removeEventListener("mousemove", move)
+		window.removeEventListener("mouseup", up)
+		exports.wheel.lock()
 	}
 	function down (e) {
 	  px = e.pageX
@@ -70,9 +79,15 @@ MX.OrbitCamera = function(opt){
 	  else {
 	    rx = opt.rotationX
 	  }
-		opt.camera.x = opt.center.x + opt.radius * sin(rx) * cos(ry)
-		opt.camera.z = opt.center.y + opt.radius * sin(rx) * sin(ry)
-		opt.camera.y = opt.center.z + opt.radius * cos(rx)
+	  if (abs(radius - opt.radius) > epsilon) {
+	    radius = avg(radius, opt.radius, opt.ease)
+	  }
+	  else {
+	    radius = opt.radius
+	  }
+		opt.camera.x = opt.center.x + radius * sin(rx) * cos(ry)
+		opt.camera.z = opt.center.y + radius * sin(rx) * sin(ry)
+		opt.camera.y = opt.center.z + radius * cos(rx)
  		opt.camera.rotationX = PI/2 - rx
  		opt.camera.rotationY = ry + PI/2
 	}
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index b525696..564b351 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -228,7 +228,7 @@ Map.Draw = function(map, opt){
 		line(r.x.a, r.y.a, r.x.b, r.y.b, r.translation)
 	}
 
-	function dot_at (x,z){
+	draw.dot_at = function dot_at (x,z){
 		ctx.save()
 		ctx.translate(x,z)
 
@@ -240,4 +240,23 @@ Map.Draw = function(map, opt){
 
 		ctx.restore()
 	}
+
+	draw.x_at = function x_at (x, z, length){
+		ctx.save()
+		ctx.translate(x,z)
+
+		var len = (length/2 || 4) / map.zoom
+
+    ctx.lineCap = "square"
+    ctx.lineWidth = 2/map.zoom
+    ctx.beginPath()
+		ctx.moveTo( -len, -len);
+		ctx.lineTo(  len,  len);
+		ctx.moveTo( -len,  len);
+		ctx.lineTo(  len, -len);
+		ctx.stroke();
+
+		ctx.restore()
+	}
+
 }
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/util/wheel.js b/public/assets/javascripts/rectangles/util/wheel.js
index 712d470..4155a70 100644
--- a/public/assets/javascripts/rectangles/util/wheel.js
+++ b/public/assets/javascripts/rectangles/util/wheel.js
@@ -3,8 +3,8 @@
 	
 		base.wheel = new wheel({
 			el: document.querySelector("#map"),
-			update: function(e, val, delta){
-				// do something with val
+			update: function(e, delta){
+				// do something with delta
 			},
 		})
 
@@ -13,7 +13,7 @@
 function wheel (opt) {
 	opt = defaults(opt, {
 		el: document,
-		fn: function(e, val, delta){},
+		update: function(e, delta){},
 		propagate: false,
 		locked: false,
 		reversible: true,
@@ -22,7 +22,7 @@ function wheel (opt) {
 	})
 
 	opt.el.addEventListener('wheel', onMouseWheel, false);
-// 	opt.el.addEventListener('mousewheel', onMouseWheel, false);
+  // opt.el.addEventListener('mousewheel', onMouseWheel, false);
 	opt.el.addEventListener('DOMMouseScroll', onMouseWheel, false);
 
 	function onMouseWheel (e) {
@@ -58,6 +58,8 @@ function wheel (opt) {
 		
 		// opt.val = clamp(opt.val + delta, opt.min, opt.max)
 		
+		// deltaX is also passed, but these values tend to be unusable
+		// try http://vvalls.com/assets/test/wheel.html with a trackpad
 		opt.update(e, deltaY, deltaX)
 	}
 
diff --git a/public/assets/test/orbit.html b/public/assets/test/orbit.html
index 8b45de6..0416ff7 100644
--- a/public/assets/test/orbit.html
+++ b/public/assets/test/orbit.html
@@ -35,6 +35,7 @@ body {
 <script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/wheel.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
@@ -76,17 +77,26 @@ function add_mx_point (p, theta, i) {
 	mx.updateChildren = false
 	mx.move({
 		x: p.a,
-		y: i/4,
+		y: i/2,
 		z: p.b,
 		rotationY: -theta,
 		width: 1,
-		height: i/2,
+		height: i,
 	})
 	mx.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
 	mx.el.style.backfaceVisibility = "visible"
 	scene.add(mx)
 	mx.update()
 }
+function add_center () {
+  var mx = new MX.Object3D()
+  mx.width = 79
+  mx.height = 64
+  mx.y = 32 * 0.05
+  mx.scale = 0.05
+  mx.el.style.backgroundImage = "url(http://i.asdf.us/im/b8/_1400215546_frankhats_1400215573_frankhats.gif)"
+  scene.add(mx)
+}
 function build_circle () {
 	scene = new MX.Scene().addTo("#perspective")
 	scene.camera.move({
@@ -102,7 +112,7 @@ function build_circle () {
 	scene.height = window.innerHeight
 	scene.perspective = window.innerHeight
 
-	var theta, rad = 10;
+	var theta, rad = 16;
 	for (var i = 0; i < 100; i++) {
 		theta = (i/100 * TWO_PI)
 		add_mx_point({
@@ -111,9 +121,11 @@ function build_circle () {
 		}, theta, i)
 	}
 
+  add_center()
+  
 	scene.update()
 
-	controls = new MX.OrbitCamera()
+	controls = new MX.OrbitCamera({ el: document.querySelector("#perspective") })
 	controls.init()
 
 	console.log("ready..perhaps")
@@ -131,6 +143,8 @@ function animate(time){
 	map.draw.translate()
 
 	map.draw.coords()
+  ctx.strokeStyle = "#f00";
+  map.draw.x_at(0,0)
 	map.draw.mouse(map.ui.mouse.cursor)
 	map.draw.camera(scene.camera)
 
diff --git a/public/assets/test/ortho.html b/public/assets/test/ortho.html
index 57e050c..b00b6fe 100644
--- a/public/assets/test/ortho.html
+++ b/public/assets/test/ortho.html
@@ -35,6 +35,7 @@ body {
 <script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/wheel.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
-- 
cgit v1.2.3-70-g09d2


From bcf1904e0bdd64353e6d06f922112cf28b1bc87f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 5 Feb 2015 12:28:04 -0500
Subject: line to cursor

---
 public/assets/javascripts/rectangles/engine/map/draw.js |  4 ++--
 public/assets/test/ortho.html                           | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 564b351..24f7cf3 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -228,11 +228,11 @@ Map.Draw = function(map, opt){
 		line(r.x.a, r.y.a, r.x.b, r.y.b, r.translation)
 	}
 
-	draw.dot_at = function dot_at (x,z){
+	draw.dot_at = function dot_at (x, z, radius){
 		ctx.save()
 		ctx.translate(x,z)
 
-		var radius = 2 / map.zoom
+		radius = (radius || 2) / map.zoom
 
 		ctx.beginPath();
 		ctx.arc(0, 0, radius, 0, 2*Math.PI, false);
diff --git a/public/assets/test/ortho.html b/public/assets/test/ortho.html
index ce52f99..1ca7e06 100644
--- a/public/assets/test/ortho.html
+++ b/public/assets/test/ortho.html
@@ -80,9 +80,11 @@ Map.UI.Ortho = function(map){
 			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
 			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
 			last_point = new vec2( cursor.x.a, cursor.y.a )
-			var p = new vec2( cursor.x.a, cursor.y.a )
-			if (placing && points.length > 1 && points[0].distanceTo( p ) < 10/map.zoom) {
+			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
 				document.body.style.cursor = "pointer"
+				last_point.assign(points[0])
+				cursor.x.a = cursor.x.b = last_point.a
+				cursor.y.a = cursor.y.b =last_point.b
 			}
 			else {
 				document.body.style.cursor = "crosshair"
@@ -119,7 +121,7 @@ function polyline (points, finished) {
   if (! points) return
   if (points.length == 1) {
     ctx.fillStyle = "#f80"
-    ctx.fillRect(points[0].a, points[0].b, 10, 10)
+    map.draw.dot_at(points[0].a, points[0].b, 5)
   }
   if (points.length > 1) {
     ctx.fillStyle = "#ff0"
@@ -167,7 +169,6 @@ function add_mx_polyline_face(head, tail){
     rotationY: angle
   })
   var hue = abs(round( angle / PI * 90 + 300))
-  console.log('hsl(' + [hue + "deg", "100%", "50%"] + ')')
   mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
   scene.add(mx)
   return mx
@@ -256,10 +257,13 @@ function animate(time){
 	map.draw.coords()
 
   polyline(points)
-  if (placing && last_point && points.length) {
+  if (placing && last_point) {
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
     ctx.beginPath()
-    ctx.moveTo(points[0].a, points[0].b)
+    ctx.moveTo(points[points.length-1].a, points[points.length-1].b)
     ctx.lineTo(last_point.a, last_point.b)
+    ctx.stroke()
   }
 
   shapes.forEach(function(shape){
-- 
cgit v1.2.3-70-g09d2


From 3832685358c9d3ad3e0aead51228f29255702007 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 24 Mar 2015 13:23:33 -0400
Subject: setVolume functions

---
 public/assets/javascripts/mx/primitives/mx.video.js                | 5 +++++
 public/assets/javascripts/mx/primitives/mx.vimeo.js                | 5 +++++
 public/assets/javascripts/mx/primitives/mx.youtube.js              | 5 +++++
 public/assets/javascripts/rectangles/engine/scenery/types/video.js | 4 ++++
 4 files changed, 19 insertions(+)

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

diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index c281f02..9138cdd 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -87,6 +87,11 @@ MX.Video = MX.Object3D.extend({
   	this.muted = false
   },
   
+  setVolume: function(n){
+    if (this.muted) return
+  	this.player.volume = n
+  },
+  
   setLoop: function(state){
 		this.media.loop = state
   },
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index fe5ce86..bff781b 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -130,6 +130,11 @@ MX.Vimeo = MX.Object3D.extend({
 		this.player.api('setVolume', 0.8)
   	this.muted = false
   },
+
+  setVolume: function(n){
+    if (this.muted) return
+  	this.player.api('setVolume', n)
+  },
   
   setLoop: function(state){
 		this.media.loop = state
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 5c92378..fad66dd 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -173,6 +173,11 @@ MX.Youtube = MX.Object3D.extend({
 		this.player.setVolume(80)
   	this.muted = false
   },
+
+  setVolume: function(n){
+    if (this.muted) return
+    this.player.setVolume( floor(n * 100) )
+  },
   
   setLoop: function(state){
 		this.media.loop = state
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index d1b1763..fb1a868 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -90,6 +90,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			}
 		},
 
+		setVolume: function(n){
+			this.mx.setVolume(n)
+		},
+		
 		serialize: function(){
 			var data = base.serialize.call(this)
 			return data
-- 
cgit v1.2.3-70-g09d2


From 0a67e7f8ab74f82212a123dd6c30903124c1e8df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 24 Mar 2015 17:08:47 -0400
Subject: sound interpolation

---
 .../assets/javascripts/mx/primitives/mx.soundcloud.js   |  5 +++++
 public/assets/javascripts/mx/primitives/mx.video.js     |  2 +-
 public/assets/javascripts/mx/primitives/mx.vimeo.js     |  2 +-
 public/assets/javascripts/mx/primitives/mx.youtube.js   |  2 +-
 .../javascripts/rectangles/engine/scenery/_scenery.js   |  1 +
 .../javascripts/rectangles/engine/scenery/sound.js      | 17 +++++++++++++++++
 .../rectangles/engine/scenery/types/audio.js            |  4 ++++
 views/partials/scripts.ejs                              |  1 +
 8 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/scenery/sound.js

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

diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
index 75286d9..fecb2f4 100644
--- a/public/assets/javascripts/mx/primitives/mx.soundcloud.js
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -102,6 +102,11 @@ MX.Soundcloud = MX.Object3D.extend({
   setLoop: function(state){
 		this.media.loop = state
   },
+
+  setVolume: function(n){
+    if (this.muted || ! this.player) return
+  	this.player.setVolume(floor( n * 100 ))
+  },
   
   didPlay: function(){
     this.paused = false
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index 9138cdd..43c392a 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -88,7 +88,7 @@ MX.Video = MX.Object3D.extend({
   },
   
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player) return
   	this.player.volume = n
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index bff781b..ccd0a13 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -132,7 +132,7 @@ MX.Vimeo = MX.Object3D.extend({
   },
 
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player) return
   	this.player.api('setVolume', n)
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index fad66dd..e4e73d6 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -175,7 +175,7 @@ MX.Youtube = MX.Object3D.extend({
   },
 
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player || ! this.player.setVolume) return
     this.player.setVolume( floor(n * 100) )
   },
   
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index d52fe21..18d665f 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -11,6 +11,7 @@ var Scenery = new function(){
 	
 	base.init = function(){
 		base.resize.init()
+		base.sound.init()
 	}
 
 	base.add = function(opt){
diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
new file mode 100644
index 0000000..2f7f8de
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -0,0 +1,17 @@
+
+Scenery.sound = {}
+Scenery.sound.max_distance = 600
+Scenery.sound.init = function(){
+  app.tube.on("move", Scenery.sound.move)
+}
+Scenery.sound.move = function(){
+  var vals = Scenery.map(function(scenery){
+    if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
+      //get distance from A to B
+      var distance = dist(cam.x, cam.z, 
+                          scenery.mx.x, scenery.mx.z)
+      var volume = 1 - (clamp( distance, 0, Scenery.sound.max_distance ) / Scenery.sound.max_distance)
+      scenery.setVolume(volume)
+    }
+  })
+}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/audio.js b/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
index 82f984e..fdd221d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/audio.js
@@ -39,6 +39,10 @@ Scenery.types.audio = Scenery.types.base.extend(function(base){
       this.dimensions.deserialize(data.dimensions)
 		},
 
+		setVolume: function(n){
+			this.mx.setVolume(n)
+		},
+		
 		play: function(){
 			this.mx.play()
 		},
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 011644b..72aaa8c 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -65,6 +65,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/resize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/randomize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/sound.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/audio.js"></script>
-- 
cgit v1.2.3-70-g09d2


From d7a12fac00ce78ef37a17da5eb1094281272bad7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 25 Mar 2015 15:09:57 -0400
Subject: longer distance

---
 public/assets/javascripts/rectangles/engine/scenery/sound.js | 3 +--
 views/controls/editor/color-control.ejs                      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 2f7f8de..776dd80 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -1,13 +1,12 @@
 
 Scenery.sound = {}
-Scenery.sound.max_distance = 600
+Scenery.sound.max_distance = 2000
 Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
 Scenery.sound.move = function(){
   var vals = Scenery.map(function(scenery){
     if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
-      //get distance from A to B
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
       var volume = 1 - (clamp( distance, 0, Scenery.sound.max_distance ) / Scenery.sound.max_distance)
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index bcc955d..c035e24 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox colorcontrol active">
+<div class="vvbox colorcontrol">
 	<h4>Edit Room Colors</h4>
 
   <div class="colors">
-- 
cgit v1.2.3-70-g09d2


From 2a984d83343d6d5f7510697ac6f61d2def21e721 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 25 Mar 2015 15:11:26 -0400
Subject: lil less

---
 public/assets/javascripts/rectangles/engine/scenery/sound.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 776dd80..37bdee0 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -1,6 +1,6 @@
 
 Scenery.sound = {}
-Scenery.sound.max_distance = 2000
+Scenery.sound.max_distance = 1500
 Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
-- 
cgit v1.2.3-70-g09d2


From b38b008981ee88c58cfff5c2e2e7820046dde415 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 30 Mar 2015 17:35:30 -0400
Subject: store rotation on wall object

---
 public/assets/javascripts/rectangles/engine/scenery/move.js          | 5 +++--
 public/assets/javascripts/rectangles/engine/scenery/resize.js        | 2 +-
 public/assets/javascripts/rectangles/engine/scenery/types/_object.js | 4 ++--
 public/assets/javascripts/rectangles/models/wall.js                  | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index f57ddba..0d26582 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -75,13 +75,14 @@ Scenery.move = function(base){
 		switch (base.wall.side) {
 			case FRONT:
 			case BACK:
-				base.mx.x = position.a + delta.a * cos(wall_rotation[base.wall.side]) + dimension.a / 2
+				base.mx.x = position.a + delta.a * cos(base.wall.rotationY) + dimension.a / 2
 				break
 			case LEFT:
 			case RIGHT:
-				base.mx.z = position.a + delta.a * sin(wall_rotation[base.wall.side]) + dimension.a / 2
+				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
 				break
 		}
+		console.log( sin(base.wall.rotationY), cos(base.wall.rotationY) )
 		if (editor.permissions.resize) {
 			Scenery.resize.move_dots()
 		}
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 5af7f3f..73fd82a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -49,7 +49,7 @@ Scenery.resize = new function(){
 	
 	// rotate the dots as appropriate
 	base.rotate_dots = function(){
-		rotationY = wall_rotation[obj.wall.side]
+		rotationY = obj.wall.rotationY
 		dots.forEach(function(dot){
 			dot.rotationY = rotationY
 		})
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index cd3f981..e3b9b4d 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -90,11 +90,11 @@ Scenery.types.base = Fiber.extend(function(base){
       switch (this.wall.side) {
         case FRONT:
         case BACK:
-          this.position.a += delta.a * cos(wall_rotation[this.wall.side])
+          this.position.a += delta.a * cos(this.wall.rotationY)
           break
         case LEFT:
         case RIGHT:
-          this.position.a += delta.a * sin(wall_rotation[this.wall.side])
+          this.position.a += delta.a * sin(this.wall.rotationY)
           break
       }
 		},
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index a026c3c..13f5cd7 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -18,6 +18,7 @@
 		this.edge = opt.edge
 		this.side = opt.side
 		this.surface = opt.surface
+		this.rotationY = ('rotationY' in opt) ? opt.rotationY : wall_rotation[opt.side]
 		this.mx = opt.mx
 		this.background = { src: "none" }
 	}
@@ -89,7 +90,7 @@
             mx_dot.move(mx_pos)
             mx_dot.width = 5
             mx_dot.height = 5
-            mx_dot.rotationY = wall_rotation[base.side]
+            mx_dot.rotationY = base.rotationY
             mx_dot.el.style.backgroundColor = "red"
             scene.add(mx_dot)
           }
@@ -236,7 +237,7 @@
 		  x: x,
 		  y: position.b + dimension.b / 2,
 		  z: z,
-		  rotationY: wall_rotation[ this.side ],
+		  rotationY: this.rotationY,
 		}
 	}
 	Wall.prototype.mxToPosition = function(mx, dimension) {
-- 
cgit v1.2.3-70-g09d2


From 9117849bf7d183c5ed773c5ed1ef105c41a0f659 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 30 Mar 2015 20:25:45 -0400
Subject: split out mx.grid

---
 public/assets/javascripts/mx/primitives/mx.grid.js |  60 +++++++
 .../javascripts/rectangles/engine/map/ui_ortho.js  |  65 +++++++
 .../javascripts/rectangles/engine/scenery/move.js  |   3 +-
 public/assets/test/ortho2.html                     | 200 +++++++++++++++++++++
 4 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/javascripts/mx/primitives/mx.grid.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/ui_ortho.js
 create mode 100644 public/assets/test/ortho2.html

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

diff --git a/public/assets/javascripts/mx/primitives/mx.grid.js b/public/assets/javascripts/mx/primitives/mx.grid.js
new file mode 100644
index 0000000..7a40144
--- /dev/null
+++ b/public/assets/javascripts/mx/primitives/mx.grid.js
@@ -0,0 +1,60 @@
+MX.Grid = MX.Object3D.extend({
+  init: function (ops) {
+  
+  	this.type = "Grid"
+
+  	var ops = this.ops = defaults(ops, {
+  	  x: 0, 
+  	  y: 0,
+  	  z: 0,
+  	  space: 20,
+  	  cells: 20,
+  	})
+
+    ops.side = ops.space * ops.cells
+    
+    var ctx, canvas = document.createElement("canvas")
+    
+    this.el = canvas
+    this.width = this.height = canvas.width = canvas.height = ops.side + 4
+
+    ctx = canvas.getContext('2d')
+
+		this.x = ops.x || 0
+		this.y = ops.y || 0
+		this.z = ops.z || 0
+		this.rotationX = PI/2
+		this.scale = ops.scale || 1
+		this.backface = ops.backface || false
+			
+		ops.className && this.el.classList.add(ops.className)
+		this.backface && this.el.classList.add("backface-visible")
+		this.el.classList.add("mx-grid")
+		
+		this.draw(ctx)
+  },
+  
+  draw: function(ctx){
+    ctx = ctx || this.ctx
+    
+    var cells = this.ops.cells,
+        space = this.ops.space,
+        side = this.ops.side
+
+    ctx.strokeStyle = "#444"
+    ctx.lineWidth = 1
+    ctx.beginPath()
+    ctx.translate(1,1)
+    for (var i = 0; i <= cells; i++) {
+      ctx.moveTo(i*space, 0)
+      ctx.lineTo(i*space, side)
+      ctx.moveTo(0, i*space)
+      ctx.lineTo(side, i*space)
+    }
+    ctx.closePath()
+    ctx.stroke()
+  },
+
+})
+
+
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
new file mode 100644
index 0000000..adff4d2
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -0,0 +1,65 @@
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+			// compare to initial point
+			var p = new vec2( cursor.x.a, cursor.y.a )
+			if (placing) {
+				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
+					points.push( points[0].clone() )
+					placing = false
+					add_mx_polyline(points)
+				}
+				else {
+					points.push( p )
+          mx_points.push( add_mx_point(p) )
+				}
+			}
+			else {
+				placing = true
+				points = []
+				points.push( p )
+        mx_points.push( add_mx_point(p) )
+			}
+		},
+		move: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+			last_point = new vec2( cursor.x.a, cursor.y.a )
+			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
+				document.body.style.cursor = "pointer"
+				last_point.assign(points[0])
+				cursor.x.a = cursor.x.b = last_point.a
+				cursor.y.a = cursor.y.b =last_point.b
+			}
+			else {
+				document.body.style.cursor = "crosshair"
+			}
+		},
+		drag: function(e, cursor){
+			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+		},
+		up: function(e, cursor, new_cursor){
+			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		}
+	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 0d26582..dd60a61 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -82,7 +82,7 @@ Scenery.move = function(base){
 				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
 				break
 		}
-		console.log( sin(base.wall.rotationY), cos(base.wall.rotationY) )
+
 		if (editor.permissions.resize) {
 			Scenery.resize.move_dots()
 		}
@@ -105,7 +105,6 @@ Scenery.move = function(base){
 		dragging = moved = false
     oldState = null
 		document.body.classList.remove("dragging")
-
   }
 	
 	function switch_wall (e, target, cursor){
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
new file mode 100644
index 0000000..d554a60
--- /dev/null
+++ b/public/assets/test/ortho2.html
@@ -0,0 +1,200 @@
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	font-family: Menlo, monospace;
+	overflow: hidden;
+}
+#perspective {
+	position: absolute;
+	left:0%;
+	top:0px
+}
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+#hud {
+	white-space: pre;
+}
+</style>
+
+<div id="perspective"></div>
+<div id="orthographic"></div>
+
+<div id="hud"></div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/polyfill.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/wheel.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+
+<script>
+
+var scene, map, controls
+
+map = new Map ({
+	type: "ortho",
+	el: document.querySelector("#orthographic"),
+	width: window.innerWidth/2,
+	height: window.innerHeight,
+	zoom: 0,
+})
+
+var placing = false
+var points, mx_points = []
+var shapes = []
+var ctx = map.draw.ctx
+var last_point
+
+function polyline (points, finished) {
+  if (! points) return
+  if (points.length == 1) {
+    ctx.fillStyle = "#f80"
+    map.draw.dot_at(points[0].a, points[0].b, 5)
+  }
+  if (points.length > 1) {
+    ctx.fillStyle = "#ff0"
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
+    ctx.beginPath()
+    ctx.moveTo(points[0].a, points[0].b)
+    points.forEach(function(point, i){
+      i && ctx.lineTo(point.a, point.b)
+    })
+		ctx.stroke()
+    if (! placing || finished) {
+      ctx.fill()
+    }
+  }
+}
+
+function add_mx_polyline (points) {
+  mx_points.forEach(function(mx){ scene.remove(mx) })
+  var faces = []
+  for (var i = 1; i < points.length; i++) {
+    var head = points[i-1]
+    var tail = points[i]
+    face = add_mx_polyline_face(head, tail)
+    faces.push(face)
+  }
+  shapes.push({
+    mx: faces,
+    points: points,
+  })
+  points = []
+}
+function add_mx_polyline_face(head, tail){
+  var mx = new MX.Object3D()
+  var mid_x = (head.a + tail.a)
+  var mid_z = (head.b + tail.b)
+  var len = head.distanceTo( tail )
+  var angle = atan2( head.b - tail.b, head.a - tail.a )
+  mx.move({
+    x: mid_x / 2,
+    y: 25 + 1,
+    z: mid_z / 2,
+    width: ceil(len),
+    height: 50,
+    rotationY: angle
+  })
+  var hue = abs(round( angle / PI * 90 + 300))
+  mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
+  scene.add(mx)
+  return mx
+}
+function add_mx_point (p, i) {
+	var mx = new MX.Object3D()
+	mx.updateChildren = false
+	mx.move({
+		x: p.a,
+		y: 11,
+		z: p.b,
+		width: 20,
+		height: 20,
+	})
+	mx.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
+	mx.el.style.backfaceVisibility = "visible"
+	scene.add(mx)
+	return mx
+}
+
+document.addEventListener('DOMContentLoaded', build)
+function build () {
+	scene = new MX.Scene().addTo("#perspective")
+	scene.camera.radius = 20
+
+	scene.width = window.innerWidth/2
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+
+  grid = new MX.Grid()
+  scene.add(grid)
+  
+	scene.update()
+
+	controls = new MX.OrbitCamera({
+	  el: scene.el,
+	  radius: 1000,
+	  rotationX: PI/4,
+	  rotationY: PI/2,
+	})
+	controls.init()
+
+	animate(0)
+}
+function animate(time){
+  requestAnimationFrame(animate)
+  map.update(time)
+
+	controls.update()
+  scene.update()
+
+	map.draw.ctx.save()
+	map.draw.translate()
+
+  map.draw.ctx.save()
+  map.draw.ctx.translate(-(20*20)/2, -(20*20)/2)
+  grid.draw(map.draw.ctx, 20, 20)
+  map.draw.ctx.restore()
+
+	map.draw.coords()
+
+  polyline(points)
+  if (placing && last_point) {
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
+    ctx.beginPath()
+    ctx.moveTo(points[points.length-1].a, points[points.length-1].b)
+    ctx.lineTo(last_point.a, last_point.b)
+    ctx.stroke()
+  }
+
+  shapes.forEach(function(shape){
+    polyline(shape.points, true)
+  })
+
+  ctx.strokeStyle = "#f00";
+  map.draw.x_at(0,0)
+	map.draw.mouse(map.ui.mouse.cursor)
+	map.draw.camera(scene.camera)
+
+	map.draw.ctx.restore()
+}
+
+</script>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 835fbcd8b47715d34d17b784409db1d45f992c29 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 30 Mar 2015 21:46:25 -0400
Subject: rightclick to recenter canvas

---
 .../javascripts/rectangles/engine/map/ui_ortho.js       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
index adff4d2..adcc078 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -10,6 +10,23 @@ Map.UI.Ortho = function(map){
 		down: function(e, cursor){
 			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
 			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+      if (e.ctrlKey || e.which === 3) {
+        if (placing) {
+          // close polyline or cancel
+          return
+        }
+        cursor.quantize(1/map.zoom)
+        map.center.a = cursor.x.a
+        map.center.b = -cursor.y.a
+        cursor.x.b = cursor.x.a
+        cursor.y.b = cursor.y.a
+        base.mouse.down = false
+        e.preventDefault()
+        e.stopPropagation()
+        return
+      }
+
 			// compare to initial point
 			var p = new vec2( cursor.x.a, cursor.y.a )
 			if (placing) {
-- 
cgit v1.2.3-70-g09d2


From 4b794104e86b74c531e35443cf23ce8cf144d505 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 31 Mar 2015 12:44:28 -0400
Subject: etc

---
 public/assets/javascripts/app.js                   |  2 -
 .../javascripts/rectangles/engine/map/ui_ortho.js  | 82 ---------------------
 public/assets/test/ortho.html                      |  9 +++
 public/assets/test/ortho2.html                     | 83 ++++++++++++++++++++++
 4 files changed, 92 insertions(+), 84 deletions(-)

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

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 6ff062e..6ebcda5 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -21,8 +21,6 @@ app.init = function () {
 app.launch = function () {
   if ($.browser.msie || ! has3d()) { return app.fallback() }
   
-	var movements
-
 	scene = new MX.Scene().addTo('#scene')
 	scene.width = window.innerWidth
 	scene.height = window.innerHeight
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
index adcc078..e69de29 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -1,82 +0,0 @@
-Map.UI = Map.UI || {}
-Map.UI.Ortho = function(map){
-
-	var base = this
-
-	base.creating = base.dragging = base.resizing = false
-
-	base.mouse = new mouse({
-		el: map.el,
-		down: function(e, cursor){
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-
-      if (e.ctrlKey || e.which === 3) {
-        if (placing) {
-          // close polyline or cancel
-          return
-        }
-        cursor.quantize(1/map.zoom)
-        map.center.a = cursor.x.a
-        map.center.b = -cursor.y.a
-        cursor.x.b = cursor.x.a
-        cursor.y.b = cursor.y.a
-        base.mouse.down = false
-        e.preventDefault()
-        e.stopPropagation()
-        return
-      }
-
-			// compare to initial point
-			var p = new vec2( cursor.x.a, cursor.y.a )
-			if (placing) {
-				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
-					points.push( points[0].clone() )
-					placing = false
-					add_mx_polyline(points)
-				}
-				else {
-					points.push( p )
-          mx_points.push( add_mx_point(p) )
-				}
-			}
-			else {
-				placing = true
-				points = []
-				points.push( p )
-        mx_points.push( add_mx_point(p) )
-			}
-		},
-		move: function(e, cursor){
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-			last_point = new vec2( cursor.x.a, cursor.y.a )
-			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
-				document.body.style.cursor = "pointer"
-				last_point.assign(points[0])
-				cursor.x.a = cursor.x.b = last_point.a
-				cursor.y.a = cursor.y.b =last_point.b
-			}
-			else {
-				document.body.style.cursor = "crosshair"
-			}
-		},
-		drag: function(e, cursor){
-			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
-			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
-		},
-		up: function(e, cursor, new_cursor){
-			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-		}
-	})
-
-	base.wheel = new wheel({
-		el: map.el,
-		update: mousewheel,
-	})
-
-	function mousewheel (e, deltaY, deltaX){
-		map.set_zoom(map.zoom_exponent - deltaY/20)
-	}
-}
\ No newline at end of file
diff --git a/public/assets/test/ortho.html b/public/assets/test/ortho.html
index 1ca7e06..2257006 100644
--- a/public/assets/test/ortho.html
+++ b/public/assets/test/ortho.html
@@ -99,6 +99,15 @@ Map.UI.Ortho = function(map){
 			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
 		}
 	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
 }
 
 var scene, map, controls
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 733c90c..17acead 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -46,6 +46,89 @@ body {
 <script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 
 <script>
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+      if (e.ctrlKey || e.which === 3) {
+        if (placing) {
+          // close polyline or cancel
+          return
+        }
+        cursor.quantize(1/map.zoom)
+        map.center.a = cursor.x.a
+        map.center.b = -cursor.y.a
+        cursor.x.b = cursor.x.a
+        cursor.y.b = cursor.y.a
+        base.mouse.down = false
+        e.preventDefault()
+        e.stopPropagation()
+        return
+      }
+
+			// compare to initial point
+			var p = new vec2( cursor.x.a, cursor.y.a )
+			if (placing) {
+				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
+					points.push( points[0].clone() )
+					placing = false
+					add_mx_polyline(points)
+				}
+				else {
+					points.push( p )
+          mx_points.push( add_mx_point(p) )
+				}
+			}
+			else {
+				placing = true
+				points = []
+				points.push( p )
+        mx_points.push( add_mx_point(p) )
+			}
+		},
+		move: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+			last_point = new vec2( cursor.x.a, cursor.y.a )
+			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
+				document.body.style.cursor = "pointer"
+				last_point.assign(points[0])
+				cursor.x.a = cursor.x.b = last_point.a
+				cursor.y.a = cursor.y.b =last_point.b
+			}
+			else {
+				document.body.style.cursor = "crosshair"
+			}
+		},
+		drag: function(e, cursor){
+			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+		},
+		up: function(e, cursor, new_cursor){
+			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		}
+	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
+}
+
 
 var scene, map, controls
 
-- 
cgit v1.2.3-70-g09d2


From 00614373ad41e679dc7e06aca950d7167bd1c68f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 31 Mar 2015 16:31:54 -0400
Subject: test with image url

---
 public/assets/javascripts/rectangles/util/mouse.js | 2 +-
 public/assets/test/ortho2.html                     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/util/mouse.js b/public/assets/javascripts/rectangles/util/mouse.js
index 86edf6c..2b98cee 100644
--- a/public/assets/javascripts/rectangles/util/mouse.js
+++ b/public/assets/javascripts/rectangles/util/mouse.js
@@ -134,7 +134,7 @@ function mouse (opt) {
     }
 
     var x = pos.a, y = pos.b
-    
+
     if (base.down) {
       base.cursor.x.b = x
       base.cursor.y.b = y
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 5609ec3..89a5688 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -69,6 +69,8 @@ Map.UI.Ortho = function(map){
       if (e.ctrlKey || e.which === 3) {
         if (placing) {
           // close polyline or cancel
+          placing = false
+					add_mx_polyline(points)
           return
         }
         cursor.quantize(1/map.zoom)
@@ -153,6 +155,7 @@ $(window).resize(function(){
 })
 
 
+var wall_height = 100
 var placing = false
 var points, mx_points = []
 var shapes = []
@@ -166,7 +169,7 @@ function polyline (points, finished) {
     map.draw.dot_at(points[0].a, points[0].b, 5)
   }
   if (points.length > 1) {
-    ctx.fillStyle = "#ff0"
+    ctx.fillStyle = "rgba(255,255,0,0.1)"
     ctx.strokeStyle = "#f80"
     ctx.lineWidth = 2 / map.zoom
     ctx.beginPath()
@@ -204,10 +207,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: 25 + 1,
+    y: wall_height/2 + 1,
     z: mid_z / 2,
     width: ceil(len),
-    height: 50,
+    height: wall_height,
     rotationY: angle
   })
   var hue = abs(round( angle / PI * 90 + 300))
-- 
cgit v1.2.3-70-g09d2


From 3916282fc61cb1143dfc33d79dfc3169293b0969 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 31 Mar 2015 17:30:53 -0400
Subject: rightclick to recenter

---
 public/assets/javascripts/rectangles/util/coords.js |  2 +-
 public/assets/test/ortho2.html                      | 12 +++++++++++-
 public/assets/test/ortho3.html                      |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/util/coords.js b/public/assets/javascripts/rectangles/util/coords.js
index 74b7fda..ff56199 100644
--- a/public/assets/javascripts/rectangles/util/coords.js
+++ b/public/assets/javascripts/rectangles/util/coords.js
@@ -30,4 +30,4 @@ function offsetFromPoint(event, element) {
       return 'left: ' + l + '%, top: ' + t + '%';
     }
   } : null;
-}
+}
\ No newline at end of file
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index d6f0c5c..2c600f5 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -50,6 +50,7 @@ body {
 <script src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
 <script src="/assets/javascripts/mx/primitives/mx.image.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script src="/assets/javascripts/rectangles/util/wheel.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
@@ -298,7 +299,16 @@ function build () {
     rotationY: PI,
   })
   scene.add(floorplan)
-  
+  floorplan.el.addEventListener("contextmenu", function(e){
+    e.preventDefault()
+    var offset = offsetFromPoint(e, this)
+    var x = (offset.left - 0.5) * floorplan.width
+    var z = (offset.top - 0.5) * floorplan.height
+    controls.opt.center.x = -x
+    controls.opt.center.y = 0
+    controls.opt.center.z = -z
+  }, true)
+
 	scene.update()
 
 	controls = new MX.OrbitCamera({
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index 19bb13a..37bf620 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -38,6 +38,7 @@ body {
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script src="/assets/javascripts/rectangles/util/wheel.js"></script>
+<script src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 39f1a7136567ae7e0afbf085732853cc86123393 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 1 Apr 2015 19:30:22 -0400
Subject: stub in 3d object ui

---
 .../javascripts/rectangles/engine/scenery/undo.js  | 65 ++++++++++++++
 .../rectangles/engine/sculpture/_sculpture.js      | 94 +++++++++++++++++++++
 .../rectangles/engine/sculpture/types/image.js     | 98 ++++++++++++++++++++++
 .../assets/javascripts/rectangles/models/floor.js  |  8 +-
 views/controls/editor/sculpture.ejs                | 42 ++++++++++
 views/editor.ejs                                   |  1 +
 views/partials/scripts.ejs                         |  3 +
 7 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/types/image.js
 create mode 100644 views/controls/editor/sculpture.ejs

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 1232780..b976ea2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -195,5 +195,70 @@
       },
     },
     
+    //
+    {
+      type: "create-sculpture",
+      undo: function(state){
+        Sculpture.remove(state.id)
+        Sculpture.resize.hide()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        var scenery = Sculpture.deserialize([ state ])
+        Sculpture.resize.show( sculpture )
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "update-sculpture",
+      undo: function(state){
+        var sculpture = Sculpture.find(state.id)
+
+        sculpture.deserialize(state)
+        
+        if (editor.permissions.resize) {
+          Sculpture.resize.show(sculpture)
+        }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        var sculpture = Sculpture.find(state.id)
+
+        sculpture.deserialize(state)
+
+        if (editor.permissions.resize) {
+          Sculpture.resize.show(sculpture)
+          Sculpture.resize.move_dots()
+          Sculpture.resize.rotate_dots()
+        }
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+    {
+      type: "destroy-sculpture",
+      undo: function(state){
+        var sculpture = Sculpture.deserialize([ state ])
+        Sculpture.resize.show( sculpture )
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+      redo: function(state){
+        Sculpture.resize.hide()
+        Sculpture.remove(state.id)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+      },
+    },
+
   ])
 })()
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
new file mode 100644
index 0000000..eb64e92
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -0,0 +1,94 @@
+
+var Sculpture = new function(){
+	
+	var base = this;
+
+	base.list = {}
+	base.nextMedia = null
+	
+	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
+	
+	base.init = function(){
+	}
+
+	base.add = function(opt){
+		var scene_media
+		switch (opt.media.type) {
+			case 'image':
+				scene_media = new Sculpture.types.image (opt)
+				break
+		}
+		base.list[scene_media.id] = scene_media
+		return scene_media
+	}
+	
+	base.addNextToWall = function(opt){
+	  opt.newMedia = true
+		opt.media = base.nextMedia
+		opt.index = opt.index || 0
+		var scene_media = base.add(opt)
+		
+		// test if scenery was placed here
+		if (! scene_media) {
+		  return null
+		}
+		else {
+			base.nextMedia = null
+			return scene_media
+		}
+	}
+
+	base.find = function(id){
+		return base.list[id] || null
+	}
+	
+	base.remove = function(id){
+		var scene_media = base.list[id]
+		delete base.list[id]
+		scene_media && scene_media.destroy()
+	}
+	
+	base.removeAll = function(){
+		base.forEach(function(scene_media){
+			base.remove(scene_media.id)
+		})
+	}
+
+	base.uid = new UidGenerator(base.list)
+	
+	base.forEach = function(f){
+		return base.values().forEach(f)
+	}
+	
+	base.map = function(f){
+		return base.values().map(f)
+	}
+	
+	base.values = function(){
+		return _.values(base.list)
+	}
+	
+	base.serialize = function(){
+		var sculptures = base.map(function(sculpture){
+			return sculpture.serialize()
+		})
+		return sculptures
+	}
+
+	base.deserialize = function(sculpture_data){
+	  var added = []
+		sculpture_data.forEach(function(data){
+			var scene_media = base.add({
+				id: data.id,
+			  data: data,
+				media: data.media,
+			})
+			added.push(scene_media)
+		})
+		return added
+	}
+
+	return base
+}
+
+Sculpture.types = {}
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
new file mode 100644
index 0000000..af538f7
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -0,0 +1,98 @@
+Scenery.types.base = Fiber.extend(function(base){
+
+	var exports = {
+
+		init: function(opt){
+			_.bindAll(this, 'enter', 'leave')
+
+			this.id = opt.id || Scenery.uid("scenery")
+			this.move = new Scenery.move (this)
+			this.media = opt.media
+			this.naturalDimensions = new vec2(this.media.width, this.media.height)
+			
+			this.set_scale( opt.scale || this.media.scale || 1.0 )
+			this.position = new vec2(0,0)
+		},
+
+		set_scale: function(scale){
+			this.scale = scale || 1.0
+			if (this.mx) {
+				this.mx.scale = this.mx.ops.scale = this.scale
+			}
+			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
+		},
+		
+		bind: function(){
+			this.move.bind()
+// 			$(this.mx.el).bind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
+		},
+	
+		unbind: function(){
+			this.move.unbind()
+// 			$(this.mx.el).unbind({
+// 				mouseenter: this.enter,
+// 				mouseleave: this.leave,
+// 			})
+		},
+		
+		remove: function(){
+		  if (this.removed) return
+		  this.removed = true
+		  
+      UndoStack.push({
+        type: 'destroy-sculpture',
+        undo: this.serialize(),
+        redo: { id: this.id },
+      })
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
+			Scenery.remove(this.id)
+
+      Scenery.resize.hide()
+      if (app.controller.mediaEditor) {
+        app.controller.mediaEditor.tainted = false
+        app.controller.mediaEditor.hide()
+      }
+      if (app.controller.textEditor) {
+        app.controller.textEditor.tainted = false
+        app.controller.textEditor.hide()
+      }
+		},
+
+		destroy: function(){
+			this.unbind()
+			scene.remove(this.mx)
+			this.mx.media = null
+			this.mx.ops = null
+			this.mx = null
+			this.move = null
+			this.media = null
+			this.dimensions = null
+			this.naturalDimensions = null
+			this.wall = null
+			this.bounds = null
+			this.center = null
+		},
+
+		serialize: function(){
+			var data = {
+				id: this.id,
+				wall_id: this.wall && this.wall.id,
+				side: this.wall && this.wall.side,
+				dimensions: this.dimensions.serialize(),
+				position: app.position(this.mx),
+				scale: this.scale,
+				media: this.media,
+			}
+			return data
+		},
+	}
+	
+	return exports
+
+})
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index ac1f8c9..439c16a 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -68,8 +68,12 @@
 				    }
 				    return
 				  }
-
-          if (Scenery.nextWallpaper) {
+          
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            //
+          }
+          else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
 						// Scenery.nextWallpaper = null
diff --git a/views/controls/editor/sculpture.ejs b/views/controls/editor/sculpture.ejs
new file mode 100644
index 0000000..21e5039
--- /dev/null
+++ b/views/controls/editor/sculpture.ejs
@@ -0,0 +1,42 @@
+<div class="vvbox settings" id="sculptureEditor">
+  <h4>3D Object</h4>
+  
+	<input type="hidden" name="_csrf" value="[[- token ]]">
+	<input type="hidden" name="_id" value="new">
+
+	<div class="setting">
+		<input type="text" name="name" placeholder="media title">
+	</div>
+	
+	<div class="setting">
+		<textarea name="description" placeholder="short description"></textarea>
+	</div>
+	
+	<div class="setting">
+	  <input type="checkbox" name="outline" value="1" id="sculpture_outline">
+	  <label for="sculpture_outline">Show outline?</label>
+	  <input type="color" name="color" value="#000000">
+	</div>
+
+  <div class="setting">
+	  <input type="checkbox" name="billboard" value="1" id="sculpture_billboard">
+	  <label for="sculpture_billboard">Billboard?</label>
+  </div>
+
+	<div class="setting number">
+		<label for="sculpture-width">width</label>
+		<input type="text" class="units" name="width" id="sculpture-width">
+	</div>
+	<div class="setting number">
+		<label for="sculpture-height">height</label>
+		<input type="text" class="units" name="height" id="sculpture-height">
+	</div>
+	<div class="setting number">
+		<label for="sculpture-height">depth</label>
+		<input type="text" class="units" name="height" id="sculpture-height">
+	</div>
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-sculpture">remove object</a>
+	</div>
+
+</div>
diff --git a/views/editor.ejs b/views/editor.ejs
index 74e4d6d..08959a0 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -16,6 +16,7 @@
 			[[ include controls/builder/info ]]
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
+			[[ include controls/editor/sculpture ]]
 			[[ include controls/editor/wallpaper ]]
 			[[ include controls/editor/color-control ]]
 			[[ include controls/editor/text-editor ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 72aaa8c..6cc5315 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -73,6 +73,9 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_editor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_minimap.js"></script>
-- 
cgit v1.2.3-70-g09d2


From f9112718b560d4cc8380dd905d6cb60c497230bb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 1 Apr 2015 21:42:40 -0400
Subject: get x/z position when clicking floor

---
 .../assets/javascripts/rectangles/models/floor.js  | 36 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 439c16a..7b020a9 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -69,9 +69,41 @@
 				    return
 				  }
           
+
+          var offset = offsetFromPoint(e, mx.el)
+          if (! offset) { return }
+
+          var x = mx.x + mx.width * (offset.left-0.5)
+          var z = mx.z + mx.height * (0.5-offset.top)
+  
           if (Scenery.nextMedia) {
             e.preventDefault()
-            //
+          
+            var sculpture = Sculpture.addNextToWall({
+              index: index,
+              position: pos,
+            })
+          
+            // scenery was not placed
+            if (! sculpture) {	
+              e.stopPropagation()
+              return
+            }
+
+            app.controller.toolbar.resetPermissions()
+            Sculpture.resize.show(sculpture)
+            Sculpture.hovering = true 
+          
+            // app.controller.pick(sculpture)
+
+            UndoStack.push({
+              type: 'create-sculpture',
+              undo: { id: sculpture.id },
+              redo: sculpture.serialize(),
+            })
+          
+            // TODO: watch individual sculpture object here
+            Minotaur.watch( app.router.editorView.settings )
           }
           else if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
@@ -102,7 +134,7 @@
 			this.mx.reverse()
 		}
 	}
-
+	
 	Floor.prototype.color = function(color){
 		this.$els.css("background-color", color)
 	}
-- 
cgit v1.2.3-70-g09d2


From c6eea0f4887ba14e5a6ecfff8c9e8480ae6421c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Apr 2015 17:05:31 -0400
Subject: placing objects on the floor

---
 .../rectangles/engine/sculpture/_sculpture.js      |  24 +++--
 .../rectangles/engine/sculpture/types/_object.js   |  91 +++++++++++++++++
 .../rectangles/engine/sculpture/types/image.js     | 110 ++++++---------------
 .../assets/javascripts/rectangles/models/floor.js  |   7 +-
 .../assets/javascripts/rectangles/models/vec3.js   |   9 ++
 .../assets/javascripts/ui/editor/EditorSettings.js |   3 +
 server/lib/schemas/Project.js                      |   1 +
 views/partials/scripts.ejs                         |   1 +
 8 files changed, 149 insertions(+), 97 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/types/_object.js

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
index eb64e92..c8c90d3 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -4,7 +4,6 @@ var Sculpture = new function(){
 	var base = this;
 
 	base.list = {}
-	base.nextMedia = null
 	
 	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
 	
@@ -12,29 +11,28 @@ var Sculpture = new function(){
 	}
 
 	base.add = function(opt){
-		var scene_media
+		var sculpture
 		switch (opt.media.type) {
 			case 'image':
-				scene_media = new Sculpture.types.image (opt)
+				sculpture = new Sculpture.types.image (opt)
 				break
 		}
-		base.list[scene_media.id] = scene_media
-		return scene_media
+		base.list[sculpture.id] = sculpture
+		return sculpture
 	}
 	
-	base.addNextToWall = function(opt){
+	base.addNext = function(opt){
 	  opt.newMedia = true
-		opt.media = base.nextMedia
-		opt.index = opt.index || 0
-		var scene_media = base.add(opt)
+		opt.media = Scenery.nextMedia
+		var sculpture = base.add(opt)
 		
-		// test if scenery was placed here
-		if (! scene_media) {
+		// test if sculpture was placed here
+		if (! sculpture) {
 		  return null
 		}
 		else {
-			base.nextMedia = null
-			return scene_media
+			Scenery.nextMedia = null
+			return sculpture
 		}
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
new file mode 100644
index 0000000..fa6b0b1
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -0,0 +1,91 @@
+Sculpture.types.base = Fiber.extend(function(base){
+
+	var exports = {
+
+		init: function(opt){
+			this.id = opt.id || Sculpture.uid("sculpture")
+			// this.move = new Sculpture.move (this)
+			this.media = opt.media
+			this.naturalDimensions = new vec2(this.media.width, this.media.height)
+			
+			this.set_scale( opt.scale || this.media.scale || 1.0 )
+			this.position = new vec2(0,0)
+		},
+
+		set_scale: function(scale){
+			this.scale = scale || 1.0
+			if (this.mx) {
+				this.mx.scale = this.mx.ops.scale = this.scale
+			}
+			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
+		},
+
+		place: function(opt){
+			if (opt.data) {
+        this.deserialize(opt.data)
+      }
+      else {
+        this.mx.move(opt.position)
+      }
+		},
+		
+		bind: function(){
+			// this.move.bind()
+		},
+	
+		unbind: function(){
+			// this.move.unbind()
+		},
+		
+		remove: function(){
+		  if (this.removed) return
+		  this.removed = true
+		  
+      UndoStack.push({
+        type: 'destroy-sculpture',
+        undo: this.serialize(),
+        redo: { id: this.id },
+      })
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+
+			Sculpture.remove(this.id)
+
+      // Sculpture.resize.hide()
+      if (app.controller.sculptureEditor) {
+        app.controller.sculptureEditor.tainted = false
+        app.controller.sculptureEditor.hide()
+      }
+		},
+
+		destroy: function(){
+			this.unbind()
+			scene.remove(this.mx)
+			this.mx.media = null
+			this.mx.ops = null
+			this.mx = null
+			this.move = null
+			this.media = null
+			this.dimensions = null
+			this.naturalDimensions = null
+			this.wall = null
+			this.bounds = null
+			this.center = null
+		},
+
+		serialize: function(){
+			var data = {
+				id: this.id,
+				dimensions: this.dimensions.serialize(),
+				position: app.position(this.mx),
+				scale: this.scale,
+				media: this.media,
+			}
+			return data
+		},
+	}
+	
+	return exports
+
+})
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index af538f7..ae62133 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -1,98 +1,48 @@
-Scenery.types.base = Fiber.extend(function(base){
 
-	var exports = {
+Sculpture.types.image = Sculpture.types.base.extend(function(base){
 
+	var exports = {
+	
+	  type: 'image',
+	
 		init: function(opt){
-			_.bindAll(this, 'enter', 'leave')
 
-			this.id = opt.id || Scenery.uid("scenery")
-			this.move = new Scenery.move (this)
-			this.media = opt.media
-			this.naturalDimensions = new vec2(this.media.width, this.media.height)
-			
-			this.set_scale( opt.scale || this.media.scale || 1.0 )
-			this.position = new vec2(0,0)
-		},
+			opt.scale = opt.scale || (opt.data && opt.data.scale) || DEFAULT_PICTURE_WIDTH / max(DEFAULT_PICTURE_WIDTH, opt.media.width)
 
-		set_scale: function(scale){
-			this.scale = scale || 1.0
-			if (this.mx) {
-				this.mx.scale = this.mx.ops.scale = this.scale
-			}
-			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
-		},
-		
-		bind: function(){
-			this.move.bind()
-// 			$(this.mx.el).bind({
-// 				mouseenter: this.enter,
-// 				mouseleave: this.leave,
-// 			})
-		},
-	
-		unbind: function(){
-			this.move.unbind()
-// 			$(this.mx.el).unbind({
-// 				mouseenter: this.enter,
-// 				mouseleave: this.leave,
-// 			})
-		},
-		
-		remove: function(){
-		  if (this.removed) return
-		  this.removed = true
-		  
-      UndoStack.push({
-        type: 'destroy-sculpture',
-        undo: this.serialize(),
-        redo: { id: this.id },
-      })
+			base.init.call(this, opt)
 
-      // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
+			this.build(opt)
+			this.bind()
+			this.place(opt)
+		},
 
-			Scenery.remove(this.id)
+		build: function(opt){
+		  this.footprint = new MX.Object3D()
+			this.mx = new MX.Image({
+				src: this.media.url,
+				scale: this.scale,
+				media: this.media,
+				backface: true,
+			})
 
-      Scenery.resize.hide()
-      if (app.controller.mediaEditor) {
-        app.controller.mediaEditor.tainted = false
-        app.controller.mediaEditor.hide()
-      }
-      if (app.controller.textEditor) {
-        app.controller.textEditor.tainted = false
-        app.controller.textEditor.hide()
-      }
-		},
+			opt.position.y = opt.position.y || this.scale * this.media.height/2,
+      opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY,
 
-		destroy: function(){
-			this.unbind()
-			scene.remove(this.mx)
-			this.mx.media = null
-			this.mx.ops = null
-			this.mx = null
-			this.move = null
-			this.media = null
-			this.dimensions = null
-			this.naturalDimensions = null
-			this.wall = null
-			this.bounds = null
-			this.center = null
+			scene.add( this.mx )
 		},
 
 		serialize: function(){
-			var data = {
-				id: this.id,
-				wall_id: this.wall && this.wall.id,
-				side: this.wall && this.wall.side,
-				dimensions: this.dimensions.serialize(),
-				position: app.position(this.mx),
-				scale: this.scale,
-				media: this.media,
-			}
+			var data = base.serialize.call(this)
 			return data
 		},
+	
+		deserialize: function(data){
+			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
+      this.dimensions.deserialize(data.dimensions)
+		},
 	}
 	
 	return exports
-
 })
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 7b020a9..530de2b 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -79,9 +79,8 @@
           if (Scenery.nextMedia) {
             e.preventDefault()
           
-            var sculpture = Sculpture.addNextToWall({
-              index: index,
-              position: pos,
+            var sculpture = Sculpture.addNext({
+              position: { x: x, y: 0, z: z },
             })
           
             // scenery was not placed
@@ -91,7 +90,7 @@
             }
 
             app.controller.toolbar.resetPermissions()
-            Sculpture.resize.show(sculpture)
+            // Sculpture.resize.show(sculpture)
             Sculpture.hovering = true 
           
             // app.controller.pick(sculpture)
diff --git a/public/assets/javascripts/rectangles/models/vec3.js b/public/assets/javascripts/rectangles/models/vec3.js
index c44dfe6..97329ed 100644
--- a/public/assets/javascripts/rectangles/models/vec3.js
+++ b/public/assets/javascripts/rectangles/models/vec3.js
@@ -32,3 +32,12 @@ vec3.prototype.apply_projection = function (m) {
 
 	return this;
 }
+
+vec3.prototype.serialize = function(){
+  return [ round(this.a), round(this.b), round(this.c) ]
+}
+vec3.prototype.deserialize = function(data){
+  this.a = data[0]
+  this.b = data[1]
+  this.c = data[2]
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index b319404..460863e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -77,6 +77,7 @@ var EditorSettings = FormView.extend({
 			data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop("checked", "checked")
 			
 			data.media && Scenery.deserialize(data.media)
+			data.sculpture && Sculpture.deserialize(data.sculpture)
 		}
 	},
 	
@@ -112,6 +113,7 @@ var EditorSettings = FormView.extend({
 	clear: function(e){
 		e.preventDefault()
 		Scenery.removeAll()
+		Sculpture.removeAll()
 	},
 	
 	destroy: function(){
@@ -191,6 +193,7 @@ var EditorSettings = FormView.extend({
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
+		fd.append( "sculpture", JSON.stringify( Sculpture.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( this.startPosition || false ) )
 		fd.append( "lastPosition", JSON.stringify( app.position(scene.camera) ) )
 		
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index a923d85..e9501fc 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -30,6 +30,7 @@ var ProjectSchema = new mongoose.Schema({
 	rooms: [mongoose.Schema.Types.Mixed],
 	walls: [mongoose.Schema.Types.Mixed],
 	media: [mongoose.Schema.Types.Mixed],
+	sculpture: [mongoose.Schema.Types.Mixed],
 	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
 	lastPosition: mongoose.Schema.Types.Mixed,
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 6cc5315..ca6cc94 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -74,6 +74,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 3986bd98b0c0a4674310aa6425c75dba5962f2c7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 3 Apr 2015 16:23:51 -0400
Subject: persist sculpture to db

---
 .../assets/javascripts/rectangles/engine/sculpture/types/image.js | 8 +++++---
 server/lib/api/projects.js                                        | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index ae62133..914abdf 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -25,9 +25,11 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 				backface: true,
 			})
 
-			opt.position.y = opt.position.y || this.scale * this.media.height/2,
-      opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY,
-
+      if (opt.position) {
+        opt.position.y = opt.position.y || this.scale * this.media.height/2 + 5
+        opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
+      }
+      
 			scene.add( this.mx )
 		},
 
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 1bf046f..3810168 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -40,6 +40,7 @@ var projects = {
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
+		data.sculpture = JSON.parse(data.sculpture)
 		data.colors = JSON.parse(data.colors)
 		data.startPosition = JSON.parse(data.startPosition)
 		data.lastPosition = JSON.parse(data.lastPosition)
@@ -100,11 +101,12 @@ var projects = {
         data.updated_at = new Date ()
 
 				_.extend(doc, data)
-				
+
 				doc.rooms = JSON.parse(data.rooms)
 				doc.walls = JSON.parse(data.walls)
 				doc.colors = JSON.parse(data.colors)
 				doc.media = JSON.parse(data.media)
+				doc.sculpture = JSON.parse(data.sculpture)
         doc.startPosition = JSON.parse(data.startPosition)
         doc.lastPosition = JSON.parse(data.lastPosition)
 
-- 
cgit v1.2.3-70-g09d2


From 66e10f749fcc35e779e2492521b8dd98a8770820 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 3 Apr 2015 16:54:51 -0400
Subject: billboard mode

---
 public/assets/javascripts/rectangles/_env.js                     | 1 +
 .../assets/javascripts/rectangles/engine/sculpture/_sculpture.js | 9 +++++++++
 .../javascripts/rectangles/engine/sculpture/types/image.js       | 3 +++
 3 files changed, 13 insertions(+)

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

diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 3221bac..14f73e3 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -20,6 +20,7 @@ environment.init = function(){
 	Rooms.init()
 	Walls.init()
 	Scenery.init()
+	Sculpture.init()
 	
 	scene.update()
 	environment.update()
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
index c8c90d3..1543def 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -8,6 +8,15 @@ var Sculpture = new function(){
 	base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true })
 	
 	base.init = function(){
+	  app.on("move", base.updateBillboards)
+	}
+	
+	base.updateBillboards = function(){
+	  base.forEach(function(sculpture){
+	    if (sculpture.billboard) {
+	      sculpture.mx.rotationY = cam.rotationY
+	    }
+	  })
 	}
 
 	base.add = function(opt){
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index 914abdf..9399097 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -28,6 +28,7 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
       if (opt.position) {
         opt.position.y = opt.position.y || this.scale * this.media.height/2 + 5
         opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
+        this.billboard = true
       }
       
 			scene.add( this.mx )
@@ -35,6 +36,7 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 
 		serialize: function(){
 			var data = base.serialize.call(this)
+			data.billboard = this.billboard
 			return data
 		},
 	
@@ -42,6 +44,7 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 			this.mx.move(data.position)
 			this.mx.ops.width = data.dimensions.a
 			this.mx.ops.height = data.dimensions.b
+			this.billboard = data.billboard
       this.dimensions.deserialize(data.dimensions)
 		},
 	}
-- 
cgit v1.2.3-70-g09d2


From 1f4d4c1034f7e3403c9671bd88e6e83d22696dcb Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 3 Apr 2015 17:30:37 -0400
Subject: backface

---
 .../assets/javascripts/rectangles/engine/sculpture/types/image.js  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index 9399097..9e8de58 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -17,7 +17,6 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 		},
 
 		build: function(opt){
-		  this.footprint = new MX.Object3D()
 			this.mx = new MX.Image({
 				src: this.media.url,
 				scale: this.scale,
@@ -26,9 +25,10 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 			})
 
       if (opt.position) {
-        opt.position.y = opt.position.y || this.scale * this.media.height/2 + 5
+        opt.position.y = opt.position.y || this.scale * this.media.height/2 + 3
         opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
         this.billboard = true
+        this.backface = true
       }
       
 			scene.add( this.mx )
@@ -37,6 +37,7 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 		serialize: function(){
 			var data = base.serialize.call(this)
 			data.billboard = this.billboard
+			data.backface = this.backface
 			return data
 		},
 	
@@ -45,6 +46,8 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 			this.mx.ops.width = data.dimensions.a
 			this.mx.ops.height = data.dimensions.b
 			this.billboard = data.billboard
+			this.backface = data.backface
+			if (! this.backface) this.mx.el.classList.remove("backface-visible")
       this.dimensions.deserialize(data.dimensions)
 		},
 	}
-- 
cgit v1.2.3-70-g09d2


From 519ff21e00c5c48d06e1ddee0cdc1dc3d90a26f8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 3 Apr 2015 18:40:04 -0400
Subject: pulling in move code / view code

---
 .../rectangles/engine/scenery/resize.js            |   1 +
 .../rectangles/engine/sculpture/move.js            | 158 ++++++++++++++++
 .../rectangles/engine/sculpture/types/_object.js   |  22 ++-
 .../rectangles/engine/sculpture/types/image.js     |  18 --
 public/assets/javascripts/ui/editor/EditorView.js  |  10 +-
 .../javascripts/ui/editor/SculptureEditor.js       | 200 +++++++++++++++++++++
 views/partials/scripts.ejs                         |   2 +
 7 files changed, 390 insertions(+), 21 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/move.js
 create mode 100644 public/assets/javascripts/ui/editor/SculptureEditor.js

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 73fd82a..a5e255a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -49,6 +49,7 @@ Scenery.resize = new function(){
 	
 	// rotate the dots as appropriate
 	base.rotate_dots = function(){
+	console.trace()
 		rotationY = obj.wall.rotationY
 		dots.forEach(function(dot){
 			dot.rotationY = rotationY
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
new file mode 100644
index 0000000..b5a4b40
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -0,0 +1,158 @@
+
+Sculpture.move = function(base){
+
+	var x, y, z, position, dimension, bounds
+	var dragging = false, moved = false
+	var oldState
+
+	this.bind = function(){
+		Sculpture.mouse.bind_el(base.mx.el)
+		Sculpture.mouse.on("down", down)
+		Sculpture.mouse.on("enter", switch_wall)
+		Sculpture.mouse.on("drag", drag)
+		Sculpture.mouse.on("up", up)
+	}
+
+	this.unbind = function(){
+	  base.focused = false
+		Sculpture.mouse.unbind_el(base.mx.el)
+		Sculpture.mouse.off("down", down)
+		Sculpture.mouse.off("enter", switch_wall)
+		Sculpture.mouse.off("drag", drag)
+		Sculpture.mouse.off("up", up)
+	}
+	
+	function down (e, cursor){
+		if (e.target != base.mx.el && (e.target != base.mx.overlay)) return;
+		if (editor.permissions.destroy) {
+		  base.remove()
+			return
+		}
+
+		// 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
+		}
+		dragging = true
+		moved = false
+		x = base.mx.x
+		y = base.mx.y
+		z = base.mx.z
+		
+		bounds = base.bounds
+		dimension = base.dimensions
+		position = base.wall.mxToPosition( base.mx, dimension )
+		
+		oldState = base.serialize()
+		document.body.classList.add("dragging")
+	}
+	
+	function drag (e, cursor){
+		if (! dragging) return
+		
+		moved = true
+
+		var flipX = base.wall.side & (FRONT | RIGHT)
+
+		var delta = cursor.delta()
+		delta.mul( cursor_amp ) // TODO: this should be proportional to your distance from the wall
+		if (flipX) { delta.a *= -1 }
+		delta.b *= -1
+
+		var new_bounds = base.wall.surface.translate( bounds, dimension, position, delta )
+		if (new_bounds) bounds = new_bounds
+		if (flipX) { delta.a *= -1 }
+
+		base.mx.y = position.b + delta.b + dimension.b / 2
+		switch (base.wall.side) {
+			case FRONT:
+			case BACK:
+				base.mx.x = position.a + delta.a * cos(base.wall.rotationY) + dimension.a / 2
+				break
+			case LEFT:
+			case RIGHT:
+				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
+				break
+		}
+
+		if (editor.permissions.resize) {
+			Sculpture.resize.move_dots()
+		}
+	}
+
+	function up (e, cursor){
+    if (! dragging || ! oldState) return
+        
+    if (moved) {
+      UndoStack.push({
+        type: 'update-sculpture',
+        undo: oldState,
+        redo: base.serialize(),
+      })
+
+      // TODO: watch individual sculpture object here
+      Minotaur.watch( app.router.editorView.settings )
+    }
+
+		dragging = moved = false
+    oldState = null
+		document.body.classList.remove("dragging")
+  }
+	
+	function switch_wall (e, target, cursor){
+		if (! dragging) return
+		if (target.wall.id == base.wall.id) return
+		
+		var old_wall_side = base.wall.side
+		var wall_group = old_wall_side | target.wall.side
+		var new_bounds = target.wall.surface.bounds_at_index_with_dimensions(target.index || 0, dimension)
+
+		if (! new_bounds) return
+
+		base.wall = target.wall
+		base.bounds = bounds = new_bounds
+
+		position.a = bounds.x.midpoint() - dimension.a / 2
+
+		if (old_wall_side !== target.wall.side && wall_group !== FRONT_BACK && wall_group !== LEFT_RIGHT) {
+			switch (old_wall_side) {
+				case FRONT:
+					position.a = bounds.x.a + dimension.a / 2
+					break
+				case BACK:
+					position.a = bounds.x.b - dimension.a / 2
+					break
+				case LEFT:
+					position.a = bounds.x.a + dimension.a / 2
+					break
+				case RIGHT:
+					position.a = bounds.x.b - dimension.a / 2
+					break
+			}
+		}
+
+		var mx_delta = base.wall.positionToMx( position, dimension )
+		base.mx.move(mx_delta)
+
+		if (editor.permissions.resize) {
+			Sculpture.resize.rotate_dots()
+ 			Sculpture.resize.move_dots()
+		}
+
+		cursor.x.a = cursor.x.b
+		//var delta = cursor.delta()
+		drag(e, cursor)
+
+	}
+	
+	return this
+
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index fa6b0b1..6c93b41 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -8,8 +8,14 @@ Sculpture.types.base = Fiber.extend(function(base){
 			this.media = opt.media
 			this.naturalDimensions = new vec2(this.media.width, this.media.height)
 			
+			this.move = new Sculpture.move (this)
+      this.billboard = true
+      this.backface = true
+
 			this.set_scale( opt.scale || this.media.scale || 1.0 )
 			this.position = new vec2(0,0)
+			
+			this.isSculpture = true
 		},
 
 		set_scale: function(scale){
@@ -30,11 +36,11 @@ Sculpture.types.base = Fiber.extend(function(base){
 		},
 		
 		bind: function(){
-			// this.move.bind()
+			this.move.bind()
 		},
 	
 		unbind: function(){
-			// this.move.unbind()
+			this.move.unbind()
 		},
 		
 		remove: function(){
@@ -81,9 +87,21 @@ Sculpture.types.base = Fiber.extend(function(base){
 				position: app.position(this.mx),
 				scale: this.scale,
 				media: this.media,
+        billboard: this.billboard,
+        backface: this.backface,
 			}
 			return data
 		},
+		
+		deserialize: function(data){
+			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
+			this.billboard = data.billboard
+			this.backface = data.backface
+			if (! this.backface) this.mx.el.classList.remove("backface-visible")
+      this.dimensions.deserialize(data.dimensions)
+		},
 	}
 	
 	return exports
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index 9e8de58..3e5ab08 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -27,29 +27,11 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
       if (opt.position) {
         opt.position.y = opt.position.y || this.scale * this.media.height/2 + 3
         opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
-        this.billboard = true
-        this.backface = true
       }
       
 			scene.add( this.mx )
 		},
 
-		serialize: function(){
-			var data = base.serialize.call(this)
-			data.billboard = this.billboard
-			data.backface = this.backface
-			return data
-		},
-	
-		deserialize: function(data){
-			this.mx.move(data.position)
-			this.mx.ops.width = data.dimensions.a
-			this.mx.ops.height = data.dimensions.b
-			this.billboard = data.billboard
-			this.backface = data.backface
-			if (! this.backface) this.mx.el.classList.remove("backface-visible")
-      this.dimensions.deserialize(data.dimensions)
-		},
 	}
 	
 	return exports
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 50d3650..e5e2ca0 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -17,6 +17,7 @@ var EditorView = View.extend({
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaTumblr = new MediaTumblr ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
+		this.sculptureEditor = new SculptureEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
 		this.colorControl = new ColorControl ({ parent: this })
 		this.textEditor = new TextEditor ({ parent: this })
@@ -56,12 +57,19 @@ var EditorView = View.extend({
 	},
 	
 	pick: function(scenery){
-	  if (scenery.type == "text") {
+	  if (scenery.isSculpture) {
       this.mediaEditor.hide()
+      this.textEditor.hide()
+      this.sculptureEditor.pick(scenery)
+	  }
+	  else if (scenery.type == "text") {
+      this.mediaEditor.hide()
+      this.sculptureEditor.hide()
       this.textEditor.pick(scenery)
 	  }
 	  else {
       this.textEditor.hide()
+      this.sculptureEditor.hide()
       this.mediaEditor.pick(scenery)
 	  }
 	},
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
new file mode 100644
index 0000000..cce000e
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -0,0 +1,200 @@
+
+var SculptureEditor = FormView.extend({
+	el: "#sculptureEditor",
+		
+	events: {
+		"keydown": 'taint',
+		"focus [name]": "clearMinotaur",
+		"click [data-role=play-media]": "togglePaused",
+		"mousedown [name=keyframe]": "stopPropagation",
+		"mousedown": "stopPropagation",
+		"change [name=keyframe]": "seek",
+		"change [name=autoplay]": "setAutoplay",
+		"change [name=loop]": "setLoop",
+		"change [name=mute]": "setMute",
+		"change [name=width]": 'changeWidth',
+		"change [name=height]": 'changeHeight',
+		"change [name=units]": 'changeUnits',
+		"click [data-role=destroy-media]": "destroy",
+	},
+	
+	initialize: function(opt){
+		this.parent = opt.parent
+		this.__super__.initialize.call(this)
+		
+		this.$name = this.$("[name=name]")
+		this.$description = this.$("[name=description]")
+
+		// image fields
+		this.$width = this.$("[name=width]")
+		this.$height = this.$("[name=height]")
+		this.$units = this.$("[name=units]")
+		
+		// video fields
+		this.$playButton = this.$("[data-role=play-media]")
+		this.$autoplay = this.$("[name=autoplay]")
+		this.$loop = this.$("[name=loop]")
+		this.$mute = this.$("[name=mute]")
+		this.$keyframe = this.$("[name=keyframe]")
+	},
+	
+	toggle: function(state) {
+    if (state) {
+      this.parent.settings.toggle()
+    }
+    this.$el.toggleClass("active", state);
+	},
+	
+	togglePaused: function(state){
+		var state = this.sculpture.toggle(state)
+		this.$playButton.toggleClass("paused", ! state)
+	},
+	
+	pick: function(sculpture) {
+		if (this.sculpture && sculpture !== this.sculpture) {
+			this.unbind()
+		}
+
+		this.bind(sculpture)
+		this.$el.addClass("active")
+		
+//     app.controller.toolbar.resetMode()
+    app.controller.toolbar.resetControls()
+		// Sculpture.resize.show(sculpture)
+		Sculpture.hovering = true
+		
+		var media = sculpture.media
+		
+		// console.log(media)
+		
+		this.$name.val(media.title) // || filenameFromUrl(media.url) )
+		this.$description.val(media.description)
+		this.setDimensions()
+		this.$units.val( "ft" )
+		
+		switch (media.type) {
+			case "image":
+				this.$(".video").hide()
+				this.$(".audio").hide()
+				this.$(".image").show()
+				break
+
+			case "youtube":
+			case "vimeo":
+			case "video":
+				this.$(".image").hide()
+				this.$(".audio").hide()
+				this.$(".video").show()
+				
+				this.$playButton.toggleClass("paused", ! this.sculpture.paused())
+				this.$autoplay.prop('checked', !! media.autoplay)
+				this.$loop.prop('checked', !! media.loop)
+				this.$mute.prop('checked', !! media.mute)
+				this.$keyframe.val( Number(media.keyframe || 0) )
+				break
+			
+			case "soundcloud":
+				this.$(".image").hide()
+				this.$(".video").hide()
+				this.$(".audio").show()
+				this.$playButton.toggleClass("paused", ! this.sculpture.paused())
+				this.$autoplay.prop('checked', !! media.autoplay)
+				this.$loop.prop('checked', !! media.loop)
+			  break
+		}
+	},
+
+	hide: function(sculpture){
+		if (this.sculpture) {
+			this.unbind()
+		}
+		this.toggle(false)
+	},
+	
+	seek: function(){
+		var n = parseFloat( this.$keyframe.val() )
+		this.sculpture.seek(n)
+		this.tainted = true
+		
+		this.sculpture.media.keyframe = n
+	},
+	setAutoplay: function(){
+		var checked = this.$autoplay.prop('checked')
+		this.sculpture.media.autoplay = checked
+		this.tainted = true
+		if (checked && this.sculpture.paused()) {
+			this.togglePaused()
+		}
+	},
+	setLoop: function(){
+		var checked = this.$loop.prop('checked')
+		this.sculpture.setLoop(checked)
+		this.tainted = true
+	},
+	setMute: function(){
+		var checked = this.$mute.prop('checked')
+		this.sculpture.media.mute = checked
+		this.sculpture.mute(checked)
+		this.tainted = true
+	},
+
+	setDimensions: function(){
+	  if (! this.sculpture) return
+		this.$width.unitVal( Number(this.sculpture.naturalDimensions.a * this.sculpture.scale) || "" )
+		this.$height.unitVal( Number(this.sculpture.naturalDimensions.b * this.sculpture.scale) || "" )
+		this.tainted = true
+	},
+	changeWidth: function(e){
+		e.stopPropagation()
+		this.sculpture.set_scale( this.$width.unitVal() / this.sculpture.naturalDimensions.a )
+		this.setDimensions()
+	},
+	changeHeight: function(e){
+		e.stopPropagation()
+		this.sculpture.set_scale( this.$height.unitVal() / this.sculpture.naturalDimensions.b )
+		this.setDimensions()
+	},
+	changeUnits: function(){
+		app.units = this.$units.val()
+		this.$('.units').resetUnitVal()
+	},
+	
+	taint: function(e){
+	  e.stopPropagation()
+		this.tainted = true
+	},
+
+	bind: function(sculpture){
+		this.sculpture = sculpture
+		this.sculpture.mx.bound = true
+		this.sculpture.mx.el.classList.add("picked")
+	},
+	
+	unbind: function(){
+	  if (this.sculpture) {
+	    this.sculpture.focused = false
+	    if (this.tainted && this.sculpture.media) {
+        this.sculpture.media.title = this.$name.val()
+        this.sculpture.media.description = this.$description.val()
+        Minotaur.watch( app.router.editorView.settings )
+      }
+	    if (this.sculpture.mx) {
+        this.sculpture.mx.bound = false
+        this.sculpture.mx.el.classList.remove("picked")
+      }
+    }
+    this.tainted = false
+    this.sculpture = null
+	},
+	
+	destroy: function(){
+    var sculpture = this.sculpture
+    this.hide()
+
+    sculpture.remove()
+    
+    this.tainted = false
+    this.sculpture = null
+	},
+
+})
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index ca6cc94..1eda8bd 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -74,6 +74,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
@@ -124,6 +125,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Presets.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/SculptureEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
-- 
cgit v1.2.3-70-g09d2


From d7c461e09e9ed644e35be86f067ccbe6d19e8b8c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 3 Apr 2015 20:23:30 -0400
Subject: moving statues

---
 .../rectangles/engine/sculpture/move.js            | 77 ++--------------------
 1 file changed, 7 insertions(+), 70 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index b5a4b40..28d707e 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -8,7 +8,6 @@ Sculpture.move = function(base){
 	this.bind = function(){
 		Sculpture.mouse.bind_el(base.mx.el)
 		Sculpture.mouse.on("down", down)
-		Sculpture.mouse.on("enter", switch_wall)
 		Sculpture.mouse.on("drag", drag)
 		Sculpture.mouse.on("up", up)
 	}
@@ -17,7 +16,6 @@ Sculpture.move = function(base){
 	  base.focused = false
 		Sculpture.mouse.unbind_el(base.mx.el)
 		Sculpture.mouse.off("down", down)
-		Sculpture.mouse.off("enter", switch_wall)
 		Sculpture.mouse.off("drag", drag)
 		Sculpture.mouse.off("up", up)
 	}
@@ -49,7 +47,6 @@ Sculpture.move = function(base){
 		
 		bounds = base.bounds
 		dimension = base.dimensions
-		position = base.wall.mxToPosition( base.mx, dimension )
 		
 		oldState = base.serialize()
 		document.body.classList.add("dragging")
@@ -60,32 +57,18 @@ Sculpture.move = function(base){
 		
 		moved = true
 
-		var flipX = base.wall.side & (FRONT | RIGHT)
-
 		var delta = cursor.delta()
 		delta.mul( cursor_amp ) // TODO: this should be proportional to your distance from the wall
-		if (flipX) { delta.a *= -1 }
 		delta.b *= -1
 
-		var new_bounds = base.wall.surface.translate( bounds, dimension, position, delta )
-		if (new_bounds) bounds = new_bounds
-		if (flipX) { delta.a *= -1 }
-
-		base.mx.y = position.b + delta.b + dimension.b / 2
-		switch (base.wall.side) {
-			case FRONT:
-			case BACK:
-				base.mx.x = position.a + delta.a * cos(base.wall.rotationY) + dimension.a / 2
-				break
-			case LEFT:
-			case RIGHT:
-				base.mx.z = position.a + delta.a * sin(base.wall.rotationY) + dimension.a / 2
-				break
-		}
+    // here we need to move the element based on the XY coords, as 
+		// base.mx.y = position.b + delta.b + dimension.b / 2
+    base.mx.x = x + delta.a * cos(cam.rotationY) - delta.b * sin(cam.rotationY)
+    base.mx.z = z + delta.a * sin(cam.rotationY) + delta.b * cos(cam.rotationY)
 
-		if (editor.permissions.resize) {
-			Sculpture.resize.move_dots()
-		}
+// 		if (editor.permissions.resize) {
+// 			Sculpture.resize.move_dots()
+// 		}
 	}
 
 	function up (e, cursor){
@@ -107,52 +90,6 @@ Sculpture.move = function(base){
 		document.body.classList.remove("dragging")
   }
 	
-	function switch_wall (e, target, cursor){
-		if (! dragging) return
-		if (target.wall.id == base.wall.id) return
-		
-		var old_wall_side = base.wall.side
-		var wall_group = old_wall_side | target.wall.side
-		var new_bounds = target.wall.surface.bounds_at_index_with_dimensions(target.index || 0, dimension)
-
-		if (! new_bounds) return
-
-		base.wall = target.wall
-		base.bounds = bounds = new_bounds
-
-		position.a = bounds.x.midpoint() - dimension.a / 2
-
-		if (old_wall_side !== target.wall.side && wall_group !== FRONT_BACK && wall_group !== LEFT_RIGHT) {
-			switch (old_wall_side) {
-				case FRONT:
-					position.a = bounds.x.a + dimension.a / 2
-					break
-				case BACK:
-					position.a = bounds.x.b - dimension.a / 2
-					break
-				case LEFT:
-					position.a = bounds.x.a + dimension.a / 2
-					break
-				case RIGHT:
-					position.a = bounds.x.b - dimension.a / 2
-					break
-			}
-		}
-
-		var mx_delta = base.wall.positionToMx( position, dimension )
-		base.mx.move(mx_delta)
-
-		if (editor.permissions.resize) {
-			Sculpture.resize.rotate_dots()
- 			Sculpture.resize.move_dots()
-		}
-
-		cursor.x.a = cursor.x.b
-		//var delta = cursor.delta()
-		drag(e, cursor)
-
-	}
-	
 	return this
 
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 24543d0839ad51b2afa7195b16d29bc52b3f1a1b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 13:15:19 -0400
Subject: remove sculpture

---
 .../javascripts/mx/extensions/mx.movements.js      |  5 +++-
 .../rectangles/engine/sculpture/types/_object.js   | 12 +++++++++
 .../javascripts/ui/editor/SculptureEditor.js       | 31 +++++++++++++++++++++-
 public/assets/stylesheets/app.css                  |  3 +++
 views/controls/editor/sculpture.ejs                | 10 +++----
 5 files changed, 54 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index bc71fc4..931caac 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -162,7 +162,10 @@ MX.Movements = function (cam) {
 				
 				case 8: // backspace
 				  e.preventDefault()
-          if (app.controller.mediaEditor.scenery) {
+          if (app.controller.sculptureEditor.sculpture) {
+            app.controller.sculptureEditor.sculpture.remove()
+          }
+          else if (app.controller.mediaEditor.scenery) {
             app.controller.mediaEditor.scenery.remove()
           }
           else if (app.controller.textEditor.scenery) {
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 6c93b41..48fd96a 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -43,6 +43,18 @@ Sculpture.types.base = Fiber.extend(function(base){
 			this.move.unbind()
 		},
 		
+		setOutline: function(val){
+		  this.outline = val
+		  // show/hide outline
+		},
+		setOutlineColor: function(val){
+		  this.outlineColor = val
+		  // set outline color
+		},
+		setBillboard: function(val){
+		  this.billboard = val
+		},
+		
 		remove: function(){
 		  if (this.removed) return
 		  this.removed = true
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
index cce000e..ab0ccd2 100644
--- a/public/assets/javascripts/ui/editor/SculptureEditor.js
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -10,12 +10,15 @@ var SculptureEditor = FormView.extend({
 		"mousedown": "stopPropagation",
 		"change [name=keyframe]": "seek",
 		"change [name=autoplay]": "setAutoplay",
+		"change [name=billboard]": "setBillboard",
+		"change [name=outline]": "setOutline",
+		"change [name=outlineColor]": "setOutlineColor",
 		"change [name=loop]": "setLoop",
 		"change [name=mute]": "setMute",
 		"change [name=width]": 'changeWidth',
 		"change [name=height]": 'changeHeight',
 		"change [name=units]": 'changeUnits',
-		"click [data-role=destroy-media]": "destroy",
+		"click [data-role=destroy-sculpture]": "destroy",
 	},
 	
 	initialize: function(opt){
@@ -25,6 +28,10 @@ var SculptureEditor = FormView.extend({
 		this.$name = this.$("[name=name]")
 		this.$description = this.$("[name=description]")
 
+		this.$billboard = this.$("[name=billboard]")
+		this.$outline = this.$("[name=outline]")
+		this.$outlineColor = this.$("[name=outlineColor]")
+
 		// image fields
 		this.$width = this.$("[name=width]")
 		this.$height = this.$("[name=height]")
@@ -71,6 +78,11 @@ var SculptureEditor = FormView.extend({
 		this.$description.val(media.description)
 		this.setDimensions()
 		this.$units.val( "ft" )
+
+		this.$outline.prop( 'checked', !! media.outline )
+		this.$outlineColor.val( media.outlineColor )
+		this.$billboard.prop( 'checked', !! media.billboard )
+
 		
 		switch (media.type) {
 			case "image":
@@ -138,6 +150,23 @@ var SculptureEditor = FormView.extend({
 		this.tainted = true
 	},
 
+
+	setBillboard: function(){
+		var checked = this.$billboard.prop('checked')
+		this.sculpture.setBillboard(checked)
+		this.tainted = true
+	},
+	setOutline: function(){
+		var checked = this.$outline.prop('checked')
+		this.sculpture.setOutline(checked)
+		this.tainted = true
+	},
+	setOutlineColor: function(){
+		var color = this.$outlineColor.val()
+		this.sculpture.setOutlineColor(color)
+		this.tainted = true
+	},
+
 	setDimensions: function(){
 	  if (! this.sculpture) return
 		this.$width.unitVal( Number(this.sculpture.naturalDimensions.a * this.sculpture.scale) || "" )
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index b23b50b..6e97500 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2455,6 +2455,9 @@ input[type="range"]::-webkit-slider-thumb {
 #mediaEditor .setting.number [type=text] {
 	width: 140px;
 }
+#sculptureEditor .setting.number input[type=text] {
+  width: 130px;
+}
 
 .playButton,.muteButton {
 	border-radius: 50%;
diff --git a/views/controls/editor/sculpture.ejs b/views/controls/editor/sculpture.ejs
index 21e5039..4b8535a 100644
--- a/views/controls/editor/sculpture.ejs
+++ b/views/controls/editor/sculpture.ejs
@@ -13,14 +13,14 @@
 	</div>
 	
 	<div class="setting">
-	  <input type="checkbox" name="outline" value="1" id="sculpture_outline">
-	  <label for="sculpture_outline">Show outline?</label>
-	  <input type="color" name="color" value="#000000">
+	  <input type="checkbox" name="outline" value="1" id="sculpture-outline">
+	  <label for="sculpture-outline">Show outline?</label>
+	  <input type="color" name="outlineColor" value="#000000">
 	</div>
 
   <div class="setting">
-	  <input type="checkbox" name="billboard" value="1" id="sculpture_billboard">
-	  <label for="sculpture_billboard">Billboard?</label>
+	  <input type="checkbox" name="billboard" value="1" id="sculpture-billboard">
+	  <label for="sculpture-billboard">Billboard?</label>
   </div>
 
 	<div class="setting number">
-- 
cgit v1.2.3-70-g09d2


From cee602fc6e1431fd505665a7b285c3fa85d32d3e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 13:17:15 -0400
Subject: toggle billboard

---
 .../javascripts/rectangles/engine/sculpture/types/_object.js      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 48fd96a..489a6a1 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -53,7 +53,13 @@ Sculpture.types.base = Fiber.extend(function(base){
 		},
 		setBillboard: function(val){
 		  this.billboard = val
-		},
+	    if (this.billboard) {
+	      this.mx.rotationY = cam.rotationY
+	    }
+	    else {
+	      this.mx.rotationY = PI/2
+	    }
+    },
 		
 		remove: function(){
 		  if (this.removed) return
-- 
cgit v1.2.3-70-g09d2


From 546fba7ee9dac48d2fb0015709247b1b2efca8bc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 14:31:24 -0400
Subject: store billboard setting

---
 public/assets/javascripts/rectangles/engine/scenery/resize.js      | 2 +-
 .../javascripts/rectangles/engine/sculpture/types/_object.js       | 6 ++++++
 public/assets/javascripts/ui/editor/EditorView.js                  | 1 +
 public/assets/javascripts/ui/editor/SculptureEditor.js             | 7 +++----
 4 files changed, 11 insertions(+), 5 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index a5e255a..006ff2a 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -49,7 +49,7 @@ Scenery.resize = new function(){
 	
 	// rotate the dots as appropriate
 	base.rotate_dots = function(){
-	console.trace()
+	  // console.trace()
 		rotationY = obj.wall.rotationY
 		dots.forEach(function(dot){
 			dot.rotationY = rotationY
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 489a6a1..b903c5b 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -54,9 +54,13 @@ Sculpture.types.base = Fiber.extend(function(base){
 		setBillboard: function(val){
 		  this.billboard = val
 	    if (this.billboard) {
+	      this.mx.el.classList.add("backface-visible")
+	      this.mx.el.classList.remove("backface-hidden")
 	      this.mx.rotationY = cam.rotationY
 	    }
 	    else {
+	      this.mx.el.classList.add("backface-hidden")
+	      this.mx.el.classList.remove("backface-visible")
 	      this.mx.rotationY = PI/2
 	    }
     },
@@ -106,6 +110,8 @@ Sculpture.types.base = Fiber.extend(function(base){
 				scale: this.scale,
 				media: this.media,
         billboard: this.billboard,
+        outline: this.outline,
+        outlineColor: this.outlineColor,
         backface: this.backface,
 			}
 			return data
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index e5e2ca0..a7b4f20 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -80,6 +80,7 @@ var EditorView = View.extend({
 	},
 	
 	hideExtras: function(){
+		this.sculptureEditor.hide()
 		this.mediaEditor.hide()
 		this.textEditor.hide()
 		this.share.hide()
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
index ab0ccd2..ff1e6b9 100644
--- a/public/assets/javascripts/ui/editor/SculptureEditor.js
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -79,10 +79,9 @@ var SculptureEditor = FormView.extend({
 		this.setDimensions()
 		this.$units.val( "ft" )
 
-		this.$outline.prop( 'checked', !! media.outline )
-		this.$outlineColor.val( media.outlineColor )
-		this.$billboard.prop( 'checked', !! media.billboard )
-
+		this.$outline.prop( 'checked', !! sculpture.outline )
+		this.$outlineColor.val( sculpture.outlineColor || "#000000" )
+		this.$billboard.prop( 'checked', !! sculpture.billboard )
 		
 		switch (media.type) {
 			case "image":
-- 
cgit v1.2.3-70-g09d2


From 0b8b54e26aa7a40065a0be6f7708b7021e4fec13 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 15:03:35 -0400
Subject: resize scenery

---
 Gruntfile.js                                       |   1 +
 .../rectangles/engine/scenery/resize.js            |   1 +
 .../rectangles/engine/sculpture/_sculpture.js      |   4 +
 .../rectangles/engine/sculpture/move.js            |   6 +-
 .../rectangles/engine/sculpture/resize.js          | 207 +++++++++++++++++++++
 .../rectangles/engine/sculpture/types/_object.js   |   2 +-
 .../assets/javascripts/rectangles/models/floor.js  |   2 +-
 public/assets/javascripts/ui/editor/EditorView.js  |   1 +
 .../javascripts/ui/editor/SculptureEditor.js       |   3 +-
 views/partials/scripts.ejs                         |   1 +
 10 files changed, 221 insertions(+), 7 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/sculpture/resize.js

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

diff --git a/Gruntfile.js b/Gruntfile.js
index 026ec6f..789ce6f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -79,6 +79,7 @@ module.exports = function(grunt) {
 
           "public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js",
           "public/assets/javascripts/rectangles/engine/sculpture/move.js",
+          "public/assets/javascripts/rectangles/engine/sculpture/resize.js",
           "public/assets/javascripts/rectangles/engine/sculpture/types/_object.js",
           "public/assets/javascripts/rectangles/engine/sculpture/types/image.js",
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 006ff2a..8dac140 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -8,6 +8,7 @@ Scenery.resize = new function(){
 	var dragging = false
 	var naturalDimension, naturalDimensionCopy, dimension, position, scale
 	var oldState
+  var rotationY
 
 	var dots = [], dot, selected_dot
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
index 1543def..888b925 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js
@@ -9,6 +9,7 @@ var Sculpture = new function(){
 	
 	base.init = function(){
 	  app.on("move", base.updateBillboards)
+	  base.resize.init()
 	}
 	
 	base.updateBillboards = function(){
@@ -17,6 +18,9 @@ var Sculpture = new function(){
 	      sculpture.mx.rotationY = cam.rotationY
 	    }
 	  })
+	  if (Sculpture.resize.obj && Sculpture.resize.obj.billboard) {
+	    Sculpture.resize.move_dots()
+	  }
 	}
 
 	base.add = function(opt){
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index 28d707e..f968bcf 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -66,9 +66,9 @@ Sculpture.move = function(base){
     base.mx.x = x + delta.a * cos(cam.rotationY) - delta.b * sin(cam.rotationY)
     base.mx.z = z + delta.a * sin(cam.rotationY) + delta.b * cos(cam.rotationY)
 
-// 		if (editor.permissions.resize) {
-// 			Sculpture.resize.move_dots()
-// 		}
+		if (editor.permissions.resize) {
+			Sculpture.resize.move_dots()
+		}
 	}
 
 	function up (e, cursor){
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/resize.js b/public/assets/javascripts/rectangles/engine/sculpture/resize.js
new file mode 100644
index 0000000..53b8b2d
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/sculpture/resize.js
@@ -0,0 +1,207 @@
+Sculpture.resize = new function(){
+
+	var base = this
+	
+	var obj
+	var x, y, z, bounds
+	var dragging = false
+	var naturalDimension, naturalDimensionCopy, dimension, position, scale
+	var oldState
+  var rotationY
+
+	var dots = [], dot, selected_dot
+
+	base.init = function(){
+		base.build()
+		base.bind()
+	}
+	
+	// create 9 dots at the corners of the div
+	base.build = function(){
+		[ TOP,
+			TOP_RIGHT,
+			RIGHT,
+			BOTTOM_RIGHT,
+			BOTTOM,
+			BOTTOM_LEFT,
+			LEFT,
+			TOP_LEFT ].forEach(base.build_dot)
+	}
+	
+	// generate a dot element
+	base.build_dot = function(side) {
+		var dot = new MX.Object3D('.dot')
+		dot.width = dot.height = dot_side * 2
+		dot.scale = 0.5
+		dot.side = side
+		$(dot.el).on({
+			mouseenter: function(){ base.hovering = true },
+			mouseleave: function(){ base.hovering = false },
+		})
+		dots.push(dot)
+	}
+
+	base.add_dots = function(){
+		dots.forEach(function(dot){
+			scene.add(dot)
+		})
+	}
+	
+	// move all the dots to the object's current position
+	base.move_dots = function(){
+		rotationY = obj.mx.rotationY
+
+		var x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
+		var y = obj.mx.y
+		var z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
+
+		dots.forEach(function(dot){
+			base.move_dot(dot, { x: x, y: y, z: z, rotationY: rotationY })
+		})
+	}
+		
+	// move a dot .. to the initial position of the image
+	base.move_dot = function(dot, pos){
+		if (dot.side & TOP) {
+			pos.y += obj.dimensions.b / 2
+		}
+		if (dot.side & BOTTOM) {
+			pos.y -= obj.dimensions.b / 2
+		}
+		if (dot.side & LEFT) {
+			pos.x -= cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z -= sin(rotationY) * (obj.dimensions.a) / 2
+		}
+		if (dot.side & RIGHT) {
+			pos.x += cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z += sin(rotationY) * (obj.dimensions.a) / 2
+		}
+		dot.move(pos)
+	}
+
+	// pick a new object to focus on and show the dots
+	base.show = function(new_object) {
+		// if (obj === new_object) return
+    if (! new_object) return
+		base.obj = obj = new_object
+		base.add_dots()
+		base.move_dots()
+	}
+
+	// dismiss the dots on blur
+	var dotsHideTimeout;
+	base.defer_hide = function(){
+		clearTimeout(dotsHideTimeout)
+
+		dotsHideTimeout = setTimeout(function(){
+			if (Scenery.hovering || Scenery.resize.hovering || Scenery.mouse.down) return
+			Scenery.resize.hide()
+		}, dot_hide_delay)
+	}
+
+	base.hide = function () {
+	  if (! obj) return
+		base.obj = obj = null
+		dots.forEach(function(dot){
+			scene.remove(dot)
+		})
+	}
+
+	base.bind = function(){
+		dots.forEach(function(dot){
+			Sculpture.mouse.bind_el(dot.el)
+		})
+		Sculpture.mouse.on("down", down)
+		Sculpture.mouse.on("drag", drag)
+		Sculpture.mouse.on("up", up)
+	}
+
+	base.unbind = function(){
+		dots.forEach(function(dot){
+			Sculpture.mouse.unbind_el(dot.el)
+		})
+		Sculpture.mouse.off("down", down)
+		Sculpture.mouse.off("drag", drag)
+		Sculpture.mouse.off("up", up)
+	}
+
+	function down (e, cursor){
+		var selection = dots.filter(function(dot){return e.target == dot.el})
+		if (! selection.length) return
+
+		selected_dot = selection[0]
+		dragging = true
+
+		naturalDimension = obj.naturalDimensions
+		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")
+	}
+
+	function drag (e, cursor){
+		if (! dragging) return
+
+		var x_sign = selected_dot.side & LEFT ? -1 : selected_dot.side & RIGHT ? 1 : 0
+		var y_sign = selected_dot.side & TOP ? -1 : selected_dot.side & BOTTOM ? 1 : 0
+		var width = cursor.x.magnitude()
+		var height = cursor.y.magnitude()
+		var mag = cursor.magnitude()
+
+		if (abs(width) > abs(height)) {
+			mag = x_sign * mag * sign(width)
+		}
+		else {
+			mag = y_sign * mag * sign(height)
+		}
+
+    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()
+		
+		app.controller.sculptureEditor.setDimensions()
+	}
+
+	function up (e, cursor){
+    if (! dragging) return
+		dragging = false
+		if (! editor.permissions.resize) { return }
+
+    obj.scale = obj.mx.ops.scale = obj.mx.scale
+    obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale)
+    
+    UndoStack.push({
+      type: 'update-sculpture',
+      undo: oldState,
+      redo: obj.serialize(),
+    })
+
+    // TODO: watch individual scenery object here
+    Minotaur.watch( app.router.editorView.settings )
+
+		document.body.classList.remove("dragging")
+		selected_dot = null
+	}
+}
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index b903c5b..390c42e 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -80,7 +80,7 @@ Sculpture.types.base = Fiber.extend(function(base){
 
 			Sculpture.remove(this.id)
 
-      // Sculpture.resize.hide()
+      Sculpture.resize.hide()
       if (app.controller.sculptureEditor) {
         app.controller.sculptureEditor.tainted = false
         app.controller.sculptureEditor.hide()
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 530de2b..799bdc7 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -90,7 +90,7 @@
             }
 
             app.controller.toolbar.resetPermissions()
-            // Sculpture.resize.show(sculpture)
+            Sculpture.resize.show(sculpture)
             Sculpture.hovering = true 
           
             // app.controller.pick(sculpture)
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index a7b4f20..a2d84a6 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -84,6 +84,7 @@ var EditorView = View.extend({
 		this.mediaEditor.hide()
 		this.textEditor.hide()
 		this.share.hide()
+		Sculpture.resize.hide()
     Scenery.resize.hide()
 		Scenery.hovering = false
   }
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
index ff1e6b9..35abc00 100644
--- a/public/assets/javascripts/ui/editor/SculptureEditor.js
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -67,7 +67,7 @@ var SculptureEditor = FormView.extend({
 		
 //     app.controller.toolbar.resetMode()
     app.controller.toolbar.resetControls()
-		// Sculpture.resize.show(sculpture)
+		Sculpture.resize.show(sculpture)
 		Sculpture.hovering = true
 		
 		var media = sculpture.media
@@ -149,7 +149,6 @@ var SculptureEditor = FormView.extend({
 		this.tainted = true
 	},
 
-
 	setBillboard: function(){
 		var checked = this.$billboard.prop('checked')
 		this.sculpture.setBillboard(checked)
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 1eda8bd..6dfe912 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -75,6 +75,7 @@
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/move.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/resize.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
-- 
cgit v1.2.3-70-g09d2


From 226e90a540e185c8ae2f861eac5e2b1747f5d729 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 15:05:11 -0400
Subject: hide dots

---
 public/assets/javascripts/rectangles/engine/scenery/resize.js | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 8dac140..252af74 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -95,6 +95,7 @@ Scenery.resize = new function(){
 		base.add_dots()
 		base.rotate_dots()
 		base.move_dots()
+    Sculpture.resize.hide()
 	}
 
 	// dismiss the dots on blur
-- 
cgit v1.2.3-70-g09d2


From 06fc629e2be66d79e94a02b169e12bc0918d0881 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 15:45:55 -0400
Subject: shift-drag scupltures up and down; dont drag through floor

---
 .../assets/javascripts/rectangles/engine/scenery/move.js |  2 +-
 .../javascripts/rectangles/engine/sculpture/move.js      | 16 ++++++++++++----
 .../rectangles/engine/sculpture/types/image.js           |  2 +-
 public/assets/javascripts/rectangles/util/constants.js   |  3 ++-
 4 files changed, 16 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index dd60a61..94c6281 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -28,7 +28,7 @@ Scenery.move = function(base){
 		  base.remove()
 			return
 		}
-
+    
 		// load the modal
 		app.controller.pick(base)
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index f968bcf..4f6d176 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -2,8 +2,9 @@
 Sculpture.move = function(base){
 
 	var x, y, z, position, dimension, bounds
-	var dragging = false, moved = false
+	var dragging = false, shiftPressed = false, moved = false
 	var oldState
+	var height, width
 
 	this.bind = function(){
 		Sculpture.mouse.bind_el(base.mx.el)
@@ -39,11 +40,13 @@ Sculpture.move = function(base){
 			e.clickAccepted = false
 			return
 		}
+    shiftPressed = e.shiftKey
 		dragging = true
 		moved = false
 		x = base.mx.x
 		y = base.mx.y
 		z = base.mx.z
+		height = base.mx.height * base.mx.scale
 		
 		bounds = base.bounds
 		dimension = base.dimensions
@@ -63,9 +66,14 @@ Sculpture.move = function(base){
 
     // here we need to move the element based on the XY coords, as 
 		// base.mx.y = position.b + delta.b + dimension.b / 2
-    base.mx.x = x + delta.a * cos(cam.rotationY) - delta.b * sin(cam.rotationY)
-    base.mx.z = z + delta.a * sin(cam.rotationY) + delta.b * cos(cam.rotationY)
-
+    if (e.shiftKey) {
+      base.mx.y = clamp( y + delta.b, height/2 + sculpture_distance_from_floor, Infinity )
+    }
+    else {
+      base.mx.x = x + delta.a * cos(cam.rotationY) - delta.b * sin(cam.rotationY)
+      base.mx.z = z + delta.a * sin(cam.rotationY) + delta.b * cos(cam.rotationY)
+    }
+    
 		if (editor.permissions.resize) {
 			Sculpture.resize.move_dots()
 		}
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
index 3e5ab08..1a53f5b 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/image.js
@@ -25,7 +25,7 @@ Sculpture.types.image = Sculpture.types.base.extend(function(base){
 			})
 
       if (opt.position) {
-        opt.position.y = opt.position.y || this.scale * this.media.height/2 + 3
+        opt.position.y = opt.position.y || this.scale * this.media.height/2 + sculpture_distance_from_floor
         opt.position.rotationY = opt.position.rotationY || scene.camera.rotationY
       }
       
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index 3bc314c..a70cacd 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -25,7 +25,8 @@ var height_min = 200,
 		MAP_GRID_SIZE = 360          // 10 feet
 
 var painting_distance_from_wall = 10,
-		dot_distance_from_picture = 3
+		dot_distance_from_picture = 3,
+		sculpture_distance_from_floor = 3
 
 var dot_hide_delay = 50, // ms
 		dot_side = 20
-- 
cgit v1.2.3-70-g09d2


From 6ce9d713a9ffdbf27155718ca8c9a3a4645389f2 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 16:45:09 -0400
Subject: alt to rotate a non-billboard scenery obj

---
 public/assets/javascripts/rectangles/engine/sculpture/move.js | 11 +++++++++--
 .../javascripts/rectangles/engine/sculpture/types/_object.js  |  8 ++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index 4f6d176..e571c3b 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -2,7 +2,8 @@
 Sculpture.move = function(base){
 
 	var x, y, z, position, dimension, bounds
-	var dragging = false, shiftPressed = false, moved = false
+	var rotationY
+	var dragging = false, altPressed = false, shiftPressed = false, moved = false
 	var oldState
 	var height, width
 
@@ -40,12 +41,14 @@ Sculpture.move = function(base){
 			e.clickAccepted = false
 			return
 		}
+		altPressed = (e.altKey && ! base.billboard)
     shiftPressed = e.shiftKey
 		dragging = true
 		moved = false
 		x = base.mx.x
 		y = base.mx.y
 		z = base.mx.z
+		rotationY = base.mx.rotationY
 		height = base.mx.height * base.mx.scale
 		
 		bounds = base.bounds
@@ -66,9 +69,13 @@ Sculpture.move = function(base){
 
     // here we need to move the element based on the XY coords, as 
 		// base.mx.y = position.b + delta.b + dimension.b / 2
-    if (e.shiftKey) {
+    if (shiftPressed) {
       base.mx.y = clamp( y + delta.b, height/2 + sculpture_distance_from_floor, Infinity )
     }
+    else if (altPressed) {
+      base.mx.rotationY = mod( rotationY + delta.a / (window.innerWidth / 2) , TWO_PI )
+      Sculpture.resize.move_dots()
+    }
     else {
       base.mx.x = x + delta.a * cos(cam.rotationY) - delta.b * sin(cam.rotationY)
       base.mx.z = z + delta.a * sin(cam.rotationY) + delta.b * cos(cam.rotationY)
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 390c42e..a9c1669 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -54,13 +54,13 @@ Sculpture.types.base = Fiber.extend(function(base){
 		setBillboard: function(val){
 		  this.billboard = val
 	    if (this.billboard) {
-	      this.mx.el.classList.add("backface-visible")
-	      this.mx.el.classList.remove("backface-hidden")
+	      this.mx.el.classList.add("backface-hidden")
+	      this.mx.el.classList.remove("backface-visible")
 	      this.mx.rotationY = cam.rotationY
 	    }
 	    else {
-	      this.mx.el.classList.add("backface-hidden")
-	      this.mx.el.classList.remove("backface-visible")
+	      this.mx.el.classList.add("backface-visible")
+	      this.mx.el.classList.remove("backface-hidden")
 	      this.mx.rotationY = PI/2
 	    }
     },
-- 
cgit v1.2.3-70-g09d2


From e2bb9e31b5cafe6bac49ef97dd791ab217797e94 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Apr 2015 16:51:41 -0400
Subject: wall

---
 public/assets/javascripts/rectangles/engine/sculpture/types/_object.js | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index a9c1669..5dd0aae 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -63,6 +63,7 @@ Sculpture.types.base = Fiber.extend(function(base){
 	      this.mx.el.classList.remove("backface-hidden")
 	      this.mx.rotationY = PI/2
 	    }
+	    Sculpture.resize.move_dots()
     },
 		
 		remove: function(){
-- 
cgit v1.2.3-70-g09d2


From 53695472cfb20b730d04b2d6a6a16c6d281e9180 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 27 Apr 2015 20:47:41 -0400
Subject: outline box

---
 .../rectangles/engine/sculpture/move.js            |  1 +
 .../rectangles/engine/sculpture/resize.js          |  3 +-
 .../rectangles/engine/sculpture/types/_object.js   | 52 +++++++++++++++++++---
 .../assets/javascripts/rectangles/models/vec3.js   | 18 +++++++-
 .../javascripts/rectangles/util/measurement.js     |  4 ++
 .../javascripts/ui/editor/SculptureEditor.js       | 11 +++++
 public/assets/stylesheets/app.css                  |  7 +++
 views/controls/editor/sculpture.ejs                |  2 +-
 8 files changed, 90 insertions(+), 8 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/sculpture/move.js b/public/assets/javascripts/rectangles/engine/sculpture/move.js
index e571c3b..0cbeccd 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/move.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/move.js
@@ -83,6 +83,7 @@ Sculpture.move = function(base){
     
 		if (editor.permissions.resize) {
 			Sculpture.resize.move_dots()
+			base.updateOutline()
 		}
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/resize.js b/public/assets/javascripts/rectangles/engine/sculpture/resize.js
index 53b8b2d..5f21d66 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/resize.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/resize.js
@@ -180,7 +180,8 @@ Sculpture.resize = new function(){
     }
 
 		base.move_dots()
-		
+    obj.updateOutline()
+
 		app.controller.sculptureEditor.setDimensions()
 	}
 
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 5dd0aae..2f24ae5 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -6,7 +6,8 @@ Sculpture.types.base = Fiber.extend(function(base){
 			this.id = opt.id || Sculpture.uid("sculpture")
 			// this.move = new Sculpture.move (this)
 			this.media = opt.media
-			this.naturalDimensions = new vec2(this.media.width, this.media.height)
+			this.naturalDimensions = new vec3(this.media.width, this.media.height, this.media.width)
+			this.dimensions = new vec3(this.media.width, this.media.height, this.media.width)
 			
 			this.move = new Sculpture.move (this)
       this.billboard = true
@@ -14,7 +15,7 @@ Sculpture.types.base = Fiber.extend(function(base){
 
 			this.set_scale( opt.scale || this.media.scale || 1.0 )
 			this.position = new vec2(0,0)
-			
+
 			this.isSculpture = true
 		},
 
@@ -25,6 +26,11 @@ Sculpture.types.base = Fiber.extend(function(base){
 			}
 			this.dimensions = this.naturalDimensions.clone().mul(this.scale)
 		},
+		set_depth: function(depth){
+		  console.log(this.dimensions.c, this.naturalDimensions.c, depth)
+		  this.dimensions.c = depth
+		  this.naturalDimensions.c = depth / this.scale
+		},
 
 		place: function(opt){
 			if (opt.data) {
@@ -45,11 +51,16 @@ Sculpture.types.base = Fiber.extend(function(base){
 		
 		setOutline: function(val){
 		  this.outline = val
-		  // show/hide outline
+		  if (val && ! this.outlineEl) {
+		    this.buildOutline()
+		  }
+		  this.outlineEl.el.style.display = val ? "block" : "none"
 		},
 		setOutlineColor: function(val){
 		  this.outlineColor = val
-		  // set outline color
+		  if (this.outlineEl) {
+		    this.outlineColor = this.outlineEl.el.style.borderColor = val
+		  }
 		},
 		setBillboard: function(val){
 		  this.billboard = val
@@ -65,6 +76,32 @@ Sculpture.types.base = Fiber.extend(function(base){
 	    }
 	    Sculpture.resize.move_dots()
     },
+    
+    buildOutline: function(){
+      this.outlineEl = new MX.Object3D(".mx-outline")
+      this.outlineEl.width = this.naturalDimensions.a
+      this.outlineEl.height = this.naturalDimensions.c
+      this.outlineEl.scale = this.mx.scale
+      this.outlineEl.rotationX = -PI/2
+      this.outlineEl.x = this.mx.x
+      this.outlineEl.y = sculpture_distance_from_floor
+      this.outlineEl.z = this.mx.z
+      this.outlineEl.el.style.borderColor = this.outlineColor || "#000000"
+      scene.add(this.outlineEl)
+    },
+    updateOutline: function(){
+      if (! this.outline) { return }
+      if (! this.outlineEl) {
+		    this.buildOutline()
+		  }
+      this.outlineEl.x = this.mx.x
+      this.outlineEl.y = sculpture_distance_from_floor
+      this.outlineEl.z = this.mx.z
+      this.outlineEl.width = this.naturalDimensions.a
+      this.outlineEl.height = this.naturalDimensions.c
+      
+      this.outlineEl.scale = this.mx.scale
+    },
 		
 		remove: function(){
 		  if (this.removed) return
@@ -112,7 +149,7 @@ Sculpture.types.base = Fiber.extend(function(base){
 				media: this.media,
         billboard: this.billboard,
         outline: this.outline,
-        outlineColor: this.outlineColor,
+        outlineColor: this.outlineColor || "#000000",
         backface: this.backface,
 			}
 			return data
@@ -123,9 +160,14 @@ Sculpture.types.base = Fiber.extend(function(base){
 			this.mx.ops.width = data.dimensions.a
 			this.mx.ops.height = data.dimensions.b
 			this.billboard = data.billboard
+			this.outline = data.outline
+			this.outlineColor = data.outlineColor || "#000000"
 			this.backface = data.backface
 			if (! this.backface) this.mx.el.classList.remove("backface-visible")
       this.dimensions.deserialize(data.dimensions)
+      if (this.outline) {
+        this.buildOutline()
+      }
 		},
 	}
 	
diff --git a/public/assets/javascripts/rectangles/models/vec3.js b/public/assets/javascripts/rectangles/models/vec3.js
index 97329ed..b3825a9 100644
--- a/public/assets/javascripts/rectangles/models/vec3.js
+++ b/public/assets/javascripts/rectangles/models/vec3.js
@@ -39,5 +39,21 @@ vec3.prototype.serialize = function(){
 vec3.prototype.deserialize = function(data){
   this.a = data[0]
   this.b = data[1]
-  this.c = data[2]
+  this.c = data[2] || data[0]
+  return this
+}
+vec3.prototype.clone = function(){
+  return new vec3(this.a, this.b, this.c)
+}
+vec3.prototype.assign = function(v){
+  this.a = v.a
+  this.b = v.b
+  this.c = v.c
+  return this
+}
+vec3.prototype.mul = function(n) {
+  this.a *= n
+  this.b *= n
+  this.c *= n
+  return this
 }
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/util/measurement.js b/public/assets/javascripts/rectangles/util/measurement.js
index d6a0b35..6346eac 100644
--- a/public/assets/javascripts/rectangles/util/measurement.js
+++ b/public/assets/javascripts/rectangles/util/measurement.js
@@ -28,6 +28,10 @@ function measurementToString( n ) {
 		case 'ft':
 			ft = floor(n / 36)
 			inch = abs(round((n % 36) / 3))
+			if (inch == 12) {
+			  inch = 0
+			  ft += 1
+			}
 			s = ft + "'"
 			if (inch > 0) {
 				s += " " + inch + '"'
diff --git a/public/assets/javascripts/ui/editor/SculptureEditor.js b/public/assets/javascripts/ui/editor/SculptureEditor.js
index 52663e1..953260c 100644
--- a/public/assets/javascripts/ui/editor/SculptureEditor.js
+++ b/public/assets/javascripts/ui/editor/SculptureEditor.js
@@ -17,6 +17,7 @@ var SculptureEditor = FormView.extend({
 		"change [name=mute]": "setMute",
 		"change [name=width]": 'changeWidth',
 		"change [name=height]": 'changeHeight',
+		"change [name=depth]": 'changeDepth',
 		"change [name=units]": 'changeUnits',
 		"click [data-role=destroy-sculpture]": "destroy",
 	},
@@ -35,6 +36,7 @@ var SculptureEditor = FormView.extend({
 		// image fields
 		this.$width = this.$("[name=width]")
 		this.$height = this.$("[name=height]")
+		this.$depth = this.$("[name=depth]")
 		this.$units = this.$("[name=units]")
 		
 		// video fields
@@ -168,17 +170,26 @@ var SculptureEditor = FormView.extend({
 	  if (! this.sculpture) return
 		this.$width.unitVal( Number(this.sculpture.naturalDimensions.a * this.sculpture.scale) || "" )
 		this.$height.unitVal( Number(this.sculpture.naturalDimensions.b * this.sculpture.scale) || "" )
+		this.$depth.unitVal( Number(this.sculpture.naturalDimensions.c * this.sculpture.scale) || "" )
 		this.tainted = true
 	},
 	changeWidth: function(e){
 		e.stopPropagation()
 		this.sculpture.set_scale( this.$width.unitVal() / this.sculpture.naturalDimensions.a )
 		this.setDimensions()
+		this.sculpture.updateOutline()
 	},
 	changeHeight: function(e){
 		e.stopPropagation()
 		this.sculpture.set_scale( this.$height.unitVal() / this.sculpture.naturalDimensions.b )
 		this.setDimensions()
+		this.sculpture.updateOutline()
+	},
+	changeDepth: function(e){
+		e.stopPropagation()
+		this.sculpture.set_depth( this.$depth.unitVal() )
+		this.$depth.unitVal( Number(this.sculpture.naturalDimensions.c * this.sculpture.scale) || "" )
+		this.sculpture.updateOutline()
 	},
 	changeUnits: function(){
 		app.units = this.$units.val()
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6e97500..6adb2a0 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1205,6 +1205,13 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
 }
+.mx-outline {
+  border-width: 2px;
+  border-style: dashed;
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box;
+  box-sizing: content-box;
+}
 .destroyActive .mx-scene, .destroyActive .mx-object3d.image {
 	cursor:url(/assets/img/delete-cursor.png), auto;
 }
diff --git a/views/controls/editor/sculpture.ejs b/views/controls/editor/sculpture.ejs
index 4b8535a..dfe917f 100644
--- a/views/controls/editor/sculpture.ejs
+++ b/views/controls/editor/sculpture.ejs
@@ -33,7 +33,7 @@
 	</div>
 	<div class="setting number">
 		<label for="sculpture-height">depth</label>
-		<input type="text" class="units" name="height" id="sculpture-height">
+		<input type="text" class="units" name="depth" id="sculpture-depth">
 	</div>
 	<div class="setting">
 		<a href="#" class="warn btn" data-role="destroy-sculpture">remove object</a>
-- 
cgit v1.2.3-70-g09d2


From aaa81d4b52659f991e38994f8fff56ba43baa419 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 28 Apr 2015 17:54:30 -0400
Subject: abstract out map tools

---
 .../javascripts/mx/extensions/mx.movements.js      |   8 +-
 .../javascripts/rectangles/engine/map/ui_ortho.js  |  49 +++
 .../rectangles/engine/sculpture/types/_object.js   |   2 +-
 public/assets/test/ortho2.html                     | 158 ++++-----
 public/assets/test/ortho3.html                     | 394 +++++++++++++++------
 5 files changed, 421 insertions(+), 190 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index cf00adb..931caac 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -94,12 +94,12 @@ MX.Movements = function (cam) {
 					moveRight = true
 					break
 
-				// case 37: // left
+				case 37: // left
 				case 81: // q
 					turnLeft = true
 					break
 						
-				// case 39: // right
+				case 39: // right
 				case 69: // e
 					turnRight = true
 					break
@@ -200,12 +200,12 @@ MX.Movements = function (cam) {
 					moveRight = false
 					break
 
-				// case 37: // left
+				case 37: // left
 				case 81: // q
 					turnLeft = false
 					break
 						
-				// case 39: // right
+				case 39: // right
 				case 69: // e
 					turnRight = false
 					break
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
index e69de29..0c501ad 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -0,0 +1,49 @@
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+      base.tools[currentTool].down(e, cursor)
+		},
+		move: function(e, cursor){
+			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+      base.tools[currentTool].move(e, cursor)
+		},
+		drag: function(e, cursor){
+			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+      base.tools[currentTool].drag(e, cursor)
+		},
+		up: function(e, cursor, new_cursor){
+			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+      base.tools[currentTool].up(e, cursor, new_cursor)
+		}
+	})
+	
+	var currentTool = "polyline"
+	base.setTool = function(s){
+	  currentTool = s
+	}
+	base.tools = {
+	  polyline: new PolylineTool,
+	  position: new PositionTool,
+	}
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
+}
diff --git a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
index 2f24ae5..2f593e8 100644
--- a/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/sculpture/types/_object.js
@@ -72,7 +72,7 @@ Sculpture.types.base = Fiber.extend(function(base){
 	    else {
 	      this.mx.el.classList.add("backface-visible")
 	      this.mx.el.classList.remove("backface-hidden")
-	      this.mx.rotationY = PI/2
+	      this.mx.rotationY = quantize(cam.rotationY, PI/2)
 	    }
 	    Sculpture.resize.move_dots()
     },
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 2c600f5..49e0308 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -41,6 +41,7 @@ body {
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
@@ -66,92 +67,87 @@ app.tube = new Tube ()
 app.on = function(){ app.tube.on.apply(app.tube, arguments) }
 app.off = function(){	app.tube.off.apply(app.tube, arguments) }
 
-Map.UI = Map.UI || {}
-Map.UI.Ortho = function(map){
-
-	var base = this
-
-	base.creating = base.dragging = base.resizing = false
+var MapTool = Fiber.extend(function(base){
+	var exports = {
+	  down: function(e, cursor){},
+	  move: function(e, cursor){},
+	  drag: function(e, cursor){},
+	  up: function(e, cursor, new_cursor){},
+  }
+  return exports
+})
 
-	base.mouse = new mouse({
-		el: map.el,
-		down: function(e, cursor){
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+var PositionTool = MapTool.extend(function(base){
+	var exports = {
+	  down: function(e, cursor){
+      cursor.quantize(1/map.zoom)
+      map.center.a = cursor.x.a
+      map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      map.ui.mouse.down = false
+	  },
+  }
+  return exports
+})
 
-      if (e.ctrlKey || e.which === 3) {
-        if (placing) {
-          // close polyline or cancel
-          placing = false
-					add_mx_polyline(points)
-          return
+var PolylineTool = MapTool.extend(function (base) {
+  var exports = {}
+  exports.down = function(e, cursor){
+
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      e.preventDefault()
+      e.stopPropagation()
+      if (placing) {
+        // close polyline or cancel
+        placing = false
+        if (points.length > 2) {
+          add_mx_polyline(points)
+        }
+        else {
+          points.length = 0
         }
-        cursor.quantize(1/map.zoom)
-        map.center.a = cursor.x.a
-        map.center.b = -cursor.y.a
-        cursor.x.b = cursor.x.a
-        cursor.y.b = cursor.y.a
-        base.mouse.down = false
-        e.preventDefault()
-        e.stopPropagation()
         return
       }
+      map.ui.tools.position.down(e, cursor)
+      return
+    }
 
-			// compare to initial point
-			var p = new vec2( cursor.x.a, cursor.y.a )
-			if (placing) {
-				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
-					points.push( points[0].clone() )
-					placing = false
-					add_mx_polyline(points)
-				}
-				else {
-					points.push( p )
-          mx_points.push( add_mx_point(p) )
-				}
-			}
-			else {
-				placing = true
-				points = []
-				points.push( p )
+    // compare to initial point
+    var p = new vec2( cursor.x.a, cursor.y.a )
+    if (placing) {
+      if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
+        points.push( points[0].clone() )
+        placing = false
+        add_mx_polyline(points)
+      }
+      else {
+        points.push( p )
         mx_points.push( add_mx_point(p) )
-			}
-		},
-		move: function(e, cursor){
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-
-			last_point = new vec2( cursor.x.a, cursor.y.a )
-			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
-				document.body.style.cursor = "pointer"
-				last_point.assign(points[0])
-				cursor.x.a = cursor.x.b = last_point.a
-				cursor.y.a = cursor.y.b = last_point.b
-			}
-			else {
-				document.body.style.cursor = "crosshair"
-			}
-		},
-		drag: function(e, cursor){
-			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
-			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
-		},
-		up: function(e, cursor, new_cursor){
-			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-		}
-	})
-
-	base.wheel = new wheel({
-		el: map.el,
-		update: mousewheel,
-	})
-
-	function mousewheel (e, deltaY, deltaX){
-		map.set_zoom(map.zoom_exponent - deltaY/20)
-	}
-}
-
+      }
+    }
+    else {
+      placing = true
+      points = []
+      points.push( p )
+      mx_points.push( add_mx_point(p) )
+    }
+  }
+  exports.move = function(e, cursor){
+    last_point = new vec2( cursor.x.a, cursor.y.a )
+    if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(points[0])
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+  }
+  return exports
+})
 
 var scene, map, controls
 
@@ -302,8 +298,8 @@ function build () {
   floorplan.el.addEventListener("contextmenu", function(e){
     e.preventDefault()
     var offset = offsetFromPoint(e, this)
-    var x = (offset.left - 0.5) * floorplan.width
-    var z = (offset.top - 0.5) * floorplan.height
+    var x = (offset.left - 0.5) * floorplan.width * floorplan.scale
+    var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
     controls.opt.center.x = -x
     controls.opt.center.y = 0
     controls.opt.center.z = -z
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index 37bf620..a41eb8b 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -1,3 +1,4 @@
+<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
 <style type="text/css">
 html,body{width:100%;height:100%;margin:0;padding:0;}
 body {
@@ -14,118 +15,256 @@ body {
 	left:50%;
 	top:0px
 }
-#hud {
-	white-space: pre;
+.hud {
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 10px;
+  background: white;
 }
+.ortho-hud {
+  left: 50%;
+  border-left: 1px solid black;
+}
+#url { width: 300px }
+.hud span { color: #888; cursor: pointer; }
+.hud span.active { color: #000; }
 </style>
 
 <div id="perspective"></div>
 <div id="orthographic"></div>
 
-<div id="hud"></div>
+<div class="hud persp-hud">
+  <input type="text" id="url" placeholder="paste an image URL here!">
+  <span class="ion-ionic active" data-role="orbit-mode"></span>
+  <span class="ion-archive" data-role="keyboard-mode"></span>
+</div>
+
+<div class="hud ortho-hud">
+  <span class="ion-navigate active" data-role="arrow-mode"></span>
+  <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
+  <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
+</div>
 
 <script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/defaults.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
 <script src="/assets/javascripts/mx/mx.js"></script>
 <script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
 <script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
 <script src="/assets/javascripts/mx/primitives/mx.image.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
 <script src="/assets/javascripts/rectangles/util/wheel.js"></script>
-<script src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
-<script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 
 <script>
-Map.UI = Map.UI || {}
-Map.UI.Ortho = function(map){
+var app = window.app || {}
+app.tube = new Tube ()
+app.on = function(){ app.tube.on.apply(app.tube, arguments) }
+app.off = function(){	app.tube.off.apply(app.tube, arguments) }
 
-	var base = this
+var MapTool = Fiber.extend(function(base){
+	var exports = {
+	  down: function(e, cursor){},
+	  move: function(e, cursor){},
+	  drag: function(e, cursor){},
+	  up: function(e, cursor, new_cursor){},
+  }
+  return exports
+})
 
-	base.creating = base.dragging = base.resizing = false
+var PositionTool = MapTool.extend(function(base){
+	var exports = {
+	  down: function(e, cursor){
+      cursor.quantize(1/map.zoom)
+      map.center.a = cursor.x.a
+      map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      map.ui.mouse.down = false
+	  },
+  }
+  return exports
+})
 
-	base.mouse = new mouse({
-		el: map.el,
-		down: function(e, cursor){
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+var PolylineTool = MapTool.extend(function (base) {
+  var exports = {}
+  exports.down = function(e, cursor){
 
-      if (e.ctrlKey || e.which === 3) {
-        if (placing) {
-          // close polyline or cancel
-          return
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      e.preventDefault()
+      e.stopPropagation()
+      if (placing) {
+        // close polyline or cancel
+        placing = false
+        if (line.points.length > 2) {
+          line.build()
+          line.closed = false
+        }
+        else {
+          line.reset()
         }
-        e.preventDefault()
-        e.stopPropagation()
-        cursor.quantize(1/map.zoom)
-        map.center.a = cursor.x.a
-        map.center.b = -cursor.y.a
-        cursor.x.b = cursor.x.a
-        cursor.y.b = cursor.y.a
-        base.mouse.down = false
         return
       }
+      map.ui.tools.position.down(e, cursor)
+      return
+    }
 
-			// compare to initial point
-			var p = new vec2( cursor.x.a, cursor.y.a )
-			if (placing) {
-				if (points.length > 2 && points[0].distanceTo( p ) < 10/map.zoom) {
-					points.push( points[0].clone() )
-					placing = false
-				}
-				else {
-					points.push( p )
-				}
-			}
-			else {
-				placing = true
-				points = []
-				points.push( p )
-			}
-		},
-		move: function(e, cursor){
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-			last_point = new vec2( cursor.x.a, cursor.y.a )
-			if (placing && points.length > 1 && points[0].distanceTo( last_point ) < 10/map.zoom) {
-				document.body.style.cursor = "pointer"
-				last_point.assign(points[0])
-				cursor.x.a = cursor.x.b = last_point.a
-				cursor.y.a = cursor.y.b = last_point.b
-			}
-			else {
-				document.body.style.cursor = "crosshair"
-			}
-		},
-		drag: function(e, cursor){
-			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
-			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
-		},
-		up: function(e, cursor, new_cursor){
-			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-		}
-	})
+    // compare to initial point
+    var p = new vec2( cursor.x.a, cursor.y.a )
+    if (placing) {
+      if (line.points.length > 2 && line.points[0].distanceTo( p ) < 10/map.zoom) {
+        line.points.push( line.points[0].clone() )
+        line.build()
+        placing = false
+      }
+      else {
+        line.add(p)
+      }
+    }
+    else {
+      placing = true
+      line = new Polyline ()
+      line.add(p)
+    }
+  }
+  exports.move = function(e, cursor){
+    last_point = new vec2( cursor.x.a, cursor.y.a )
+    if (placing && line.points.length > 1 && line.points[0].distanceTo( last_point ) < 10/map.zoom) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(line.points[0])
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+  }
+  return exports
+})
 
-	base.wheel = new wheel({
-		el: map.el,
-		update: mousewheel,
-	})
+var Polyline = Fiber.extend(function(base){
+	var exports = {}
+	
+	exports.init = function(){
+    this.points = []
+    this.mx_points = []
+    this.closed = false
+	}
 
-	function mousewheel (e, deltaY, deltaX){
-		map.set_zoom(map.zoom_exponent - deltaY/20)
+	exports.add = function(p){
+    this.points.push( p )
+    this.mx_points.push( new MX.Point(p) )
 	}
-}
+
+  exports.draw = function(ctx){
+    var points = this.points
+    if (! points.length) return
+    if (points.length == 1) {
+      ctx.fillStyle = "#f80"
+      map.draw.dot_at(this.points[0].a, points[0].b, 5)
+    }
+    if (points.length > 1) {
+      ctx.fillStyle = "rgba(255,255,0,0.1)"
+      ctx.strokeStyle = "#f80"
+      ctx.lineWidth = 2 / map.zoom
+      ctx.beginPath()
+      ctx.moveTo(points[0].a, points[0].b)
+      points.forEach(function(point, i){
+        i && ctx.lineTo(point.a, point.b)
+      })
+      ctx.stroke()
+      if (! placing || this.closed) {
+        ctx.fill()
+      }
+    }
+  }
+  exports.draw_line = function (ctx, p){
+    var last = this.points[this.points.length-1]
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
+    ctx.beginPath()
+    ctx.moveTo(last.a, last.b)
+    ctx.lineTo(p.a, p.b)
+    ctx.stroke()
+  }
+  exports.build = function(){
+    this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
+    this.mx = new MX.Polyline(this)
+    this.closed = true
+    shapes.push(this)
+  }
+  exports.reset = function(){
+    this.mx_points.forEach(function(mx){ scene.remove(mx) })
+    this.points.length = 0
+    this.mx_points.length = 0
+  }
+  return exports
+})
+
+MX.Polyline = MX.Object3D.extend({
+  init: function(polyline){
+    var faces = [], points = polyline.points
+    for (var i = 1; i < points.length; i++) {
+      var head = points[i-1]
+      var tail = points[i]
+      face = this.add_face(head, tail)
+      faces.push(face)
+    }
+  },
+
+  add_face: function (head, tail){
+    var mx = new MX.Object3D()
+    var mid_x = (head.a + tail.a)
+    var mid_z = (head.b + tail.b)
+    var len = head.distanceTo( tail )
+    var angle = atan2( head.b - tail.b, head.a - tail.a )
+    mx.move({
+      x: mid_x / 2,
+      y: wall_height/2 + 1,
+      z: mid_z / 2,
+      width: ceil(len),
+      height: wall_height,
+      rotationY: angle
+    })
+    var hue = abs(round( angle / PI * 90 + 300))
+    mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
+    scene.add(mx)
+    return mx
+  }
+})
+
+MX.Point = MX.Object3D.extend({
+  init: function(p){
+    this.updateChildren = false
+    this.move({
+      x: p.a,
+      y: 11,
+      z: p.b,
+      width: 20,
+      height: 20,
+      rotationX: PI/2,
+    })
+    this.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
+    this.el.style.backfaceVisibility = "visible"
+    this.el.style.borderRadius = "50%"
+    scene.add(this)
+  }
+})
 
 
 var scene, map, controls
@@ -142,43 +281,76 @@ $(window).resize(function(){
   map.canvas.width = map.dimensions.a = window.innerWidth/2
 })
 
-
+var wall_height = 180
 var placing = false
-var points = []
+var line
 var shapes = []
 var ctx = map.draw.ctx
 var last_point
 
-function polyline (points, finished) {
-  if (! points) return
-  if (points.length == 1) {
-    ctx.fillStyle = "#f80"
-    map.draw.dot_at(points[0].a, points[0].b, 5)
+$("#url").on("input", function(){
+  floorplan.load({ src: this.value })
+})
+
+
+var Toolbar = Fiber.extend(function(base){
+  var exports = {}
+  exports.init = function(rapper){
+    this.rapper = (typeof rapper == "string") ? $(rapper)[0] : rapper
+    this.tools = {}
   }
-  if (points.length > 1) {
-    ctx.fillStyle = "#ff0"
-    ctx.strokeStyle = "#f80"
-    ctx.lineWidth = 2 / map.zoom
-    ctx.beginPath()
-    ctx.moveTo(points[0].a, points[0].b)
-    points.forEach(function(point, i){
-      i && ctx.lineTo(point.a, point.b)
+  exports.add = function(role, fn){
+    this.tools[role] = fn
+    $("[data-role=" + role + "]", self.rapper).click(function(){
+      $(".active", self.rapper).removeClass('active')
+      $(this).addClass('active')
+      fn()
     })
-		ctx.stroke()
-    if (! placing || finished) {
-      ctx.fill()
-    }
   }
-}
+  return exports
+})
+
+var PerspectiveToolbar = new Toolbar (".persp-hud")
+PerspectiveToolbar.add("orbit-mode", function(){
+  controls.toggle(true)
+  movements.lock()
+})
+PerspectiveToolbar.add("keyboard-mode", function(){
+  controls.toggle(false)
+  movements.unlock()
+  movements.gravity(true)
+  cam.rotationX = 0
+  cam.rotationY = -cam.rotationY
+  cam.x = 0
+  cam.y = viewHeight + 100
+  cam.z = 0
+})
+
+var OrthographicToolbar = new Toolbar (".ortho-hud")
+OrthographicToolbar.add("", function(){
+})
 
 document.addEventListener('DOMContentLoaded', build)
 function build () {
 	scene = new MX.Scene().addTo("#perspective")
 	scene.camera.radius = 20
 
+  viewHeight = 100
+
 	scene.width = window.innerWidth/2
 	scene.height = window.innerHeight
 	scene.perspective = window.innerHeight
+	
+	cam = scene.camera
+	movements = new MX.Movements(cam, viewHeight)
+	movements.init()
+	movements.lock()
+	movements.velocity(8)
+	app.on("move", function(pos){
+	  cam.x = pos.x
+	  cam.y = pos.y
+	  cam.z = pos.z
+	})
 
   floorplan = new MX.Image({
     src: "https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg",
@@ -188,6 +360,17 @@ function build () {
   })
   scene.add(floorplan)
   
+  // recenter perspective view by rightclicking map
+  floorplan.el.addEventListener("contextmenu", function(e){
+    e.preventDefault()
+    var offset = offsetFromPoint(e, this)
+    var x = (offset.left - 0.5) * floorplan.width * floorplan.scale
+    var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
+    controls.opt.center.x = -x
+    controls.opt.center.y = 0
+    controls.opt.center.z = -z
+  }, true)
+
 	scene.update()
 
 	controls = new MX.OrbitCamera({
@@ -201,10 +384,16 @@ function build () {
 
 	animate(0)
 }
-function animate(time){
+var last_t = 0
+function animate(t){
   requestAnimationFrame(animate)
-  map.update(time)
 
+  var dt = t - last_t
+  last_t = t
+
+  map.update(t)
+
+  movements.update(dt)
 	controls.update()
   scene.update()
 
@@ -215,18 +404,15 @@ function animate(time){
 
 	map.draw.coords()
 
-  polyline(points)
-  if (placing && last_point) {
-    ctx.strokeStyle = "#f80"
-    ctx.lineWidth = 2 / map.zoom
-    ctx.beginPath()
-    ctx.moveTo(points[points.length-1].a, points[points.length-1].b)
-    ctx.lineTo(last_point.a, last_point.b)
-    ctx.stroke()
+  if (line) {
+    line.draw(map.draw.ctx)
+    if (placing && last_point) {
+      line.draw_line( map.draw.ctx, last_point )
+    }
   }
 
   shapes.forEach(function(shape){
-    polyline(shape.points, true)
+    shape.draw(map.draw.ctx)
   })
 
   ctx.strokeStyle = "#f00";
-- 
cgit v1.2.3-70-g09d2


From 6438a70116adf0516407a55606d859a5c85083d6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 28 Apr 2015 20:22:39 -0400
Subject: finding closest point and segment

---
 .../javascripts/rectangles/engine/map/ui_ortho.js  |  10 +-
 public/assets/test/ortho2.html                     |   4 +
 public/assets/test/ortho3.html                     | 135 +++++++++++++++++++--
 3 files changed, 131 insertions(+), 18 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
index 0c501ad..2177aaa 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -30,13 +30,13 @@ Map.UI.Ortho = function(map){
 	})
 	
 	var currentTool = "polyline"
-	base.setTool = function(s){
-	  currentTool = s
+	base.add_tool = function(name, tool){
+	  base.tools[name] = tool
 	}
-	base.tools = {
-	  polyline: new PolylineTool,
-	  position: new PositionTool,
+	base.set_tool = function(s){
+	  currentTool = s
 	}
+	base.tools = {}
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 49e0308..013c75b 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -158,6 +158,10 @@ map = new Map ({
 	height: window.innerHeight,
 	zoom: -2,
 })
+map.ui.add_tool("arrow", new ArrowTool)
+map.ui.add_tool("polyline", new PolylineTool)
+map.ui.add_tool("position", new PositionTool)
+
 $(window).resize(function(){
   scene.width = window.innerWidth/2
   map.canvas.width = map.dimensions.a = window.innerWidth/2
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index a41eb8b..467cbec 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -41,7 +41,7 @@ body {
 </div>
 
 <div class="hud ortho-hud">
-  <span class="ion-navigate active" data-role="arrow-mode"></span>
+  <span class="ion-navigate" data-role="arrow-mode"></span>
   <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
   <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
 </div>
@@ -86,6 +86,32 @@ var MapTool = Fiber.extend(function(base){
   return exports
 })
 
+var ArrowTool = MapTool.extend(function(base){
+	var exports = {}
+	
+  exports.move = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    var p
+    for (var i = 0; i < shapes.length; i++) {
+      p = shapes[i].hasPointNear(last_point)
+      if (p) break;
+    }
+    
+    if (p) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(line.points[0])
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+	}
+	
+	return exports
+})
+
 var PositionTool = MapTool.extend(function(base){
 	var exports = {
 	  down: function(e, cursor){
@@ -127,7 +153,7 @@ var PolylineTool = MapTool.extend(function (base) {
     // compare to initial point
     var p = new vec2( cursor.x.a, cursor.y.a )
     if (placing) {
-      if (line.points.length > 2 && line.points[0].distanceTo( p ) < 10/map.zoom) {
+      if (line.canCloseWith(p)) {
         line.points.push( line.points[0].clone() )
         line.build()
         placing = false
@@ -143,8 +169,9 @@ var PolylineTool = MapTool.extend(function (base) {
     }
   }
   exports.move = function(e, cursor){
-    last_point = new vec2( cursor.x.a, cursor.y.a )
-    if (placing && line.points.length > 1 && line.points[0].distanceTo( last_point ) < 10/map.zoom) {
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    if (placing && line.canCloseWith(last_point)) {
       document.body.style.cursor = "pointer"
       last_point.assign(line.points[0])
       cursor.x.a = cursor.x.b = last_point.a
@@ -157,6 +184,11 @@ var PolylineTool = MapTool.extend(function (base) {
   return exports
 })
 
+var OrthoPolylineTool = MapTool.extend(function (base) {
+  
+})
+
+
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
 	
@@ -170,6 +202,58 @@ var Polyline = Fiber.extend(function(base){
     this.points.push( p )
     this.mx_points.push( new MX.Point(p) )
 	}
+	
+	exports.canCloseWith = function(p){
+    return (this.points.length > 2 && this.points[0].distanceTo( p ) < 10/map.zoom)
+	}
+	
+	exports.hasPointNear = function(p){
+	  var point
+    for (var i = 0; i < this.points.length; i++){
+      point = this.points[i]
+      console.log(point.distanceTo( p ))
+      if (point.distanceTo( p ) < 10/map.zoom) {
+        return point
+      }
+    }
+    return null
+	}
+	
+	exports.hasSegmentNear = function(p, min_dist){
+    var p1, p2, d1, d2, sum, rat
+    var dx, dy, new_x, new_y, x, y, closest_distance = min_dist || Infinity
+    var closest_i = -1
+    var points = this.points
+    for (var i = 1; i < points.length; i++) {
+      d1 = p1.a - p2.a
+      d2 = p1.b - p2.b
+      sum = d1*d1 + d2*d2
+      rat = ((p.a - p1.a) * d1 + (p.b - p1.b) * d2) / sum
+      rat = rat < 0 ? 0 : rat < 1 ? rat : 1
+      new_x = p1.a + rat * d1
+      new_y = p1.b + rat * d2
+      dx = new_x - p.a
+      dy = new_y - p.b
+      sum2 = sqrt(dx*dx+dy*dy)
+      if (sum2 < closest_distance) {
+        x = new_x
+        y = new_y
+        closest_distance = sum2
+        closest_i = i
+      }
+    }
+    if (closest_i == -1) return null
+    return {
+      x: x,
+      y: y,
+      distance: closest_distance,
+      index: closest_i,
+    }
+	}
+	
+	exports.getSegment = function(i){
+	  return [ points[i], points[i+1] ]
+	}
 
   exports.draw = function(ctx){
     var points = this.points
@@ -208,6 +292,9 @@ var Polyline = Fiber.extend(function(base){
     this.closed = true
     shapes.push(this)
   }
+  exports.rebuild = function(){
+    this.mx.rebuild()
+  }
   exports.reset = function(){
     this.mx_points.forEach(function(mx){ scene.remove(mx) })
     this.points.length = 0
@@ -218,17 +305,28 @@ var Polyline = Fiber.extend(function(base){
 
 MX.Polyline = MX.Object3D.extend({
   init: function(polyline){
-    var faces = [], points = polyline.points
+    this.faces = []
+    this.points = polyline.points
+    for (var i = 1; i < this.points.length; i++) {
+      var mx = new MX.Object3D()
+      var head = this.points[i-1]
+      var tail = this.points[i]
+      face = this.move_face(mx, head, tail)
+      this.faces.push(face)
+      scene.add(mx)
+    }
+  },
+  
+  rebuild: function(){
     for (var i = 1; i < points.length; i++) {
+      var mx = this.faces[i-1]
       var head = points[i-1]
       var tail = points[i]
-      face = this.add_face(head, tail)
-      faces.push(face)
+      this.move_face(mx, head, tail)
     }
   },
 
-  add_face: function (head, tail){
-    var mx = new MX.Object3D()
+  move_face: function (mx, head, tail){
     var mid_x = (head.a + tail.a)
     var mid_z = (head.b + tail.b)
     var len = head.distanceTo( tail )
@@ -243,8 +341,6 @@ MX.Polyline = MX.Object3D.extend({
     })
     var hue = abs(round( angle / PI * 90 + 300))
     mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
-    scene.add(mx)
-    return mx
   }
 })
 
@@ -276,6 +372,11 @@ map = new Map ({
 	height: window.innerHeight,
 	zoom: -2,
 })
+map.ui.add_tool("arrow", new ArrowTool)
+map.ui.add_tool("polyline", new PolylineTool)
+map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
+map.ui.add_tool("position", new PositionTool)
+
 $(window).resize(function(){
   scene.width = window.innerWidth/2
   map.canvas.width = map.dimensions.a = window.innerWidth/2
@@ -286,7 +387,7 @@ var placing = false
 var line
 var shapes = []
 var ctx = map.draw.ctx
-var last_point
+var last_point = new vec2 (0,0)
 
 $("#url").on("input", function(){
   floorplan.load({ src: this.value })
@@ -300,6 +401,7 @@ var Toolbar = Fiber.extend(function(base){
     this.tools = {}
   }
   exports.add = function(role, fn){
+    var self = this
     this.tools[role] = fn
     $("[data-role=" + role + "]", self.rapper).click(function(){
       $(".active", self.rapper).removeClass('active')
@@ -327,7 +429,14 @@ PerspectiveToolbar.add("keyboard-mode", function(){
 })
 
 var OrthographicToolbar = new Toolbar (".ortho-hud")
-OrthographicToolbar.add("", function(){
+OrthographicToolbar.add("arrow-mode", function(){
+  map.ui.set_tool("arrow")
+})
+OrthographicToolbar.add("polyline-mode", function(){
+  map.ui.set_tool("polyline")
+})
+OrthographicToolbar.add("ortho-polyline-mode", function(){
+  map.ui.set_tool("ortho-polyline")
 })
 
 document.addEventListener('DOMContentLoaded', build)
-- 
cgit v1.2.3-70-g09d2


From 1c5d52929bcec9dfe0b15cf57e85c7b2808614b3 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Apr 2015 13:20:45 -0400
Subject: arrow tool for dragging points

---
 .../javascripts/rectangles/engine/map/ui_ortho.js  | 18 +++++-
 public/assets/test/ortho3.html                     | 71 +++++++++++++++++-----
 2 files changed, 72 insertions(+), 17 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
index 2177aaa..dab7354 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -2,40 +2,56 @@ Map.UI = Map.UI || {}
 Map.UI.Ortho = function(map){
 
 	var base = this
+	var last_event = null
 
 	base.creating = base.dragging = base.resizing = false
 
 	base.mouse = new mouse({
 		el: map.el,
 		down: function(e, cursor){
+		  last_event = e
 			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
 			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
       base.tools[currentTool].down(e, cursor)
 		},
 		move: function(e, cursor){
+		  last_event = e
 			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
 			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
       base.tools[currentTool].move(e, cursor)
 		},
 		drag: function(e, cursor){
+		  last_event = e
 			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
 			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
       base.tools[currentTool].drag(e, cursor)
 		},
 		up: function(e, cursor, new_cursor){
+		  last_event = e
 			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
 			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
       base.tools[currentTool].up(e, cursor, new_cursor)
+      if (nextTool) {
+        base.set_tool(nextTool)
+        nextTool = null
+      }
 		}
 	})
 	
-	var currentTool = "polyline"
+	var currentTool = "polyline", nextTool
 	base.add_tool = function(name, tool){
 	  base.tools[name] = tool
 	}
 	base.set_tool = function(s){
+	  console.log("set tool to", s)
+	  base.tools[currentTool].cancel()
 	  currentTool = s
 	}
+	base.set_drag_tool = function(s){
+	  nextTool = currentTool
+	  currentTool = s
+    base.tools[s].down(last_event, base.mouse.cursor)
+	}
 	base.tools = {}
 
 	base.wheel = new wheel({
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index 86f92d8..d6241ab 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -82,6 +82,7 @@ var MapTool = Fiber.extend(function(base){
 	  move: function(e, cursor){},
 	  drag: function(e, cursor){},
 	  up: function(e, cursor, new_cursor){},
+	  cancel: function(){},
   }
   return exports
 })
@@ -89,18 +90,29 @@ var MapTool = Fiber.extend(function(base){
 var ArrowTool = MapTool.extend(function(base){
 	var exports = {}
 	
-  exports.move = function(e, cursor){
+	var selected_point = null, original_point = null, selected_shape = null
+	
+	exports.down = function(e, cursor){
     last_point.a = cursor.x.a
     last_point.b = cursor.y.a
-    var p
-    for (var i = 0; i < shapes.length; i++) {
-      p = shapes[i].hasPointNear(last_point)
-      if (p) break;
+    var p = findClosestPoint(last_point)
+    if (p) {
+      selected_shape = p.shape
+      selected_point = p.point
+      original_point = selected_point.clone()
     }
-    
+    else {
+      map.ui.set_drag_tool("position")
+    }
+	}
+	
+  exports.move = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    var p = findClosestPoint(last_point)
     if (p) {
       document.body.style.cursor = "pointer"
-      last_point.assign(p)
+      last_point.assign(p.point)
       cursor.x.a = cursor.x.b = last_point.a
       cursor.y.a = cursor.y.b = last_point.b
     }
@@ -109,6 +121,16 @@ var ArrowTool = MapTool.extend(function(base){
     }
 	}
 	
+	exports.drag = function(e, cursor){
+    selected_point.a = original_point.a + cursor.x.magnitude()
+		selected_point.b = original_point.b + cursor.y.magnitude()
+		selected_shape.rebuild()
+	}
+	
+	exports.up = function(e, cursor){
+	  selected_point = selected_shape = original_point = null
+	}
+	
 	return exports
 })
 
@@ -139,7 +161,6 @@ var PolylineTool = MapTool.extend(function (base) {
         placing = false
         if (line.points.length > 2) {
           line.build()
-          line.closed = false
         }
         else {
           line.reset()
@@ -154,7 +175,7 @@ var PolylineTool = MapTool.extend(function (base) {
     var p = new vec2( cursor.x.a, cursor.y.a )
     if (placing) {
       if (line.canCloseWith(p)) {
-        line.points.push( line.points[0].clone() )
+        line.close()
         line.build()
         placing = false
       }
@@ -181,14 +202,29 @@ var PolylineTool = MapTool.extend(function (base) {
       document.body.style.cursor = "crosshair"
     }
   }
+  exports.cancel = function(){
+    if (placing) { line.reset() }
+    placing = false
+  }
   return exports
 })
 
 var OrthoPolylineTool = MapTool.extend(function (base) {
-  
+  // this will work like normal polyline except all walls will be orthogonal
 })
 
 
+// prefer to have this on the object that keeps track of the polylines
+function findClosestPoint (p){
+  var point
+  for (var i = 0; i < shapes.length; i++) {
+    point = shapes[i].hasPointNear(p)
+    if (point) return { point: point, shape: shapes[i] }
+  }
+  return null
+}
+
+
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
 	
@@ -285,10 +321,13 @@ var Polyline = Fiber.extend(function(base){
     ctx.lineTo(p.a, p.b)
     ctx.stroke()
   }
+  exports.close = function(){
+    this.points[this.points.length] = this.points[0]
+    this.closed = true
+  }
   exports.build = function(){
     this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
     this.mx = new MX.Polyline(this)
-    this.closed = true
     shapes.push(this)
   }
   exports.rebuild = function(){
@@ -310,17 +349,17 @@ MX.Polyline = MX.Object3D.extend({
       var mx = new MX.Object3D()
       var head = this.points[i-1]
       var tail = this.points[i]
-      face = this.move_face(mx, head, tail)
-      this.faces.push(face)
+      this.move_face(mx, head, tail)
+      this.faces.push(mx)
       scene.add(mx)
     }
   },
   
   rebuild: function(){
-    for (var i = 1; i < points.length; i++) {
+    for (var i = 1; i < this.points.length; i++) {
       var mx = this.faces[i-1]
-      var head = points[i-1]
-      var tail = points[i]
+      var head = this.points[i-1]
+      var tail = this.points[i]
       this.move_face(mx, head, tail)
     }
   },
-- 
cgit v1.2.3-70-g09d2


From 498069dec6ac9c1febf2da26b3d3f53f8bd1e1ef Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Apr 2015 17:22:25 -0400
Subject: playAll/pauseAll/rewindAll

---
 public/assets/javascripts/mx/primitives/mx.vimeo.js      |  2 +-
 .../javascripts/rectangles/engine/scenery/_scenery.js    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index ccd0a13..e1a3b84 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -99,7 +99,7 @@ MX.Vimeo = MX.Object3D.extend({
   		return
   	}
   	
-  	if (! this.started || n === 0) {
+  	if (! this.started) {
 	  	return
   	}
   	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index 18d665f..e9be663 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -114,6 +114,22 @@ var Scenery = new function(){
 		return added
 	}
 
+	base.rewindAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.seek(0)
+	  })
+	}
+	base.playAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.play()
+	  })
+	}
+	base.pauseAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.pause()
+	  })
+	}
+
 	return base
 }
 
-- 
cgit v1.2.3-70-g09d2


From 94ba321f96638906e41eda7abf371066011c8508 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Apr 2015 18:46:21 -0400
Subject: misc edits

---
 public/assets/javascripts/mx/extensions/mx.movements.js |  2 +-
 public/assets/javascripts/mx/primitives/mx.video.js     |  3 +++
 public/assets/javascripts/mx/primitives/mx.vimeo.js     | 16 ++++++++++++----
 public/assets/javascripts/mx/primitives/mx.youtube.js   |  3 +++
 .../javascripts/rectangles/engine/scenery/_scenery.js   | 17 +++++++++++++++--
 .../javascripts/rectangles/engine/scenery/sound.js      |  2 +-
 .../rectangles/engine/scenery/types/video.js            |  7 ++++++-
 public/assets/javascripts/ui/reader/ReaderView.js       |  2 ++
 8 files changed, 43 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 931caac..fa59908 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -20,7 +20,7 @@ MX.Movements = function (cam) {
 			rotationX_max = PI/6
 
 	var v = 12,
-			vr = Math.PI * 0.012,
+			vr = Math.PI * 0.018,
 			jumpV = 23,
 			vx = vy = vz = 0,
 			creepFactor = 0.3
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index 43c392a..53ccf2e 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -21,6 +21,7 @@ MX.Video = MX.Object3D.extend({
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
   	this.paused = !! this.media.autoplay
+  	this.playing = false
 		this.muted = app.muted || !! this.media.mute
   },
 
@@ -60,11 +61,13 @@ MX.Video = MX.Object3D.extend({
   
   play: function(){
   	this.paused = false
+  	this.playing = true
   	this.player.play()
   },
   
   pause: function(){
   	this.paused = true
+  	this.playing = false
   	this.player.pause()
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index e1a3b84..af138ae 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -20,6 +20,7 @@ MX.Vimeo = MX.Object3D.extend({
 		this.backface && this.el.classList.add("backface-visible")		
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
+    this.playing = false
   	this.paused = !! this.media.autoplay
 		this.muted = app.muted || !! this.media.mute
 		this.started = false
@@ -145,19 +146,26 @@ MX.Vimeo = MX.Object3D.extend({
   	if (this.paused) {
   		this.pause()
   	}
+  	else {
+      this.playing = true
+    }
   },
   
   onPause: function(){
   	if (! this.paused) {
   		this.play()
   	}
+  	else {
+      this.playing = false
+  	}
   },
   
   finished: function(){
-//   	if (this.media.loop) {
-//   		this.seek(0)
-//   		this.play()
-//   	}
+    console.log("vimeo finished")
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
 //   	else if (this.bound) {
   	if (! this.media.loop && this.bound) {
   		$(".playButton").removeClass('playing')
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index e4e73d6..8cd9f59 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -21,6 +21,7 @@ MX.Youtube = MX.Object3D.extend({
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
   	this.paused = !! this.media.autoplay
+  	this.playing = false
 		this.muted = app.muted || !! this.media.mute
   },
 
@@ -143,11 +144,13 @@ MX.Youtube = MX.Object3D.extend({
   
   play: function(){
 		this.paused = false
+  	this.playing = true
   	this.player.playVideo()
   },
   
   pause: function(){
 		this.paused = true
+  	this.playing = false
 		this.player.pauseVideo()
   },
   
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index e9be663..6203c20 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -121,7 +121,10 @@ var Scenery = new function(){
 	}
 	base.playAll = function(){
 	  base.forEach(function(scenery){
-	    if (scenery.type == "video") scenery.play()
+	    if (scenery.type == "video") {
+	      scenery.unmute()
+	      scenery.play()
+	    }
 	  })
 	}
 	base.pauseAll = function(){
@@ -129,7 +132,17 @@ var Scenery = new function(){
 	    if (scenery.type == "video") scenery.pause()
 	  })
 	}
-
+	base.muteAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.mx.mute()
+	  })
+	}
+	base.unmuteAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.mx.unmute()
+	  })
+	}
+	
 	return base
 }
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 37bdee0..d63d8c4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -5,7 +5,7 @@ Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
 Scenery.sound.move = function(){
-  var vals = Scenery.map(function(scenery){
+  Scenery.forEach(function(scenery){
     if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index fb1a868..163e19e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -38,7 +38,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 				backface: false,
 			})
 			scene.add(this.mx)
-			this.mx.load()
+			
+      this.mx.load()
 		},
 		
 		play: function(){
@@ -90,6 +91,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			}
 		},
 
+		unmute: function(){
+      this.mx.unmute()
+		},
+		
 		setVolume: function(n){
 			this.mx.setVolume(n)
 		},
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 55d2520..1ba97cf 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -94,6 +94,8 @@ var ReaderView = View.extend({
 		
 		// disable until we start using spinning again
 		// this.listen()
+
+    app.tube("site-ready")
 	},
 	
 	listen: function(){
-- 
cgit v1.2.3-70-g09d2


From dea857bcfb9695a1e205b7cf224388660c2735af Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 30 Apr 2015 12:24:39 -0400
Subject: minimap can pivot with camera orientation

---
 public/assets/javascripts/rectangles/engine/map/_map.js | 2 +-
 public/assets/javascripts/rectangles/engine/map/draw.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index d582982..bf646bb 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -16,6 +16,7 @@ var Map = function(opt){
 	var base = this
 	base.el = opt.el
 	base.$el = $(base.el)
+	base.opt = opt
 	
 	if (! base.el) return
 	
@@ -33,7 +34,6 @@ var Map = function(opt){
 										 scene.camera.x + sides.a, scene.camera.z + sides.b )
 	}
 
-
 	base.set_zoom = function (n) {
 		n = clamp(n, opt.zoom_min, opt.zoom_max)
 		base.zoom_exponent = n
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 24f7cf3..11ba3f8 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -17,6 +17,7 @@ Map.Draw = function(map, opt){
 		else if (opt.minimap) {
 			ctx.translate( map.dimensions.a * 1/2, map.dimensions.b * 1/2)
 			ctx.scale( map.zoom, map.zoom )
+      if (map.opt.pivot) { ctx.rotate(scene.camera.rotationY + PI) }
 			ctx.translate( opt.center.x, - opt.center.z )
 			ctx.scale( -1, 1 )
 
-- 
cgit v1.2.3-70-g09d2


From befad3026f5b0bb07cdd55560835425feb73b031 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 30 Apr 2015 15:04:55 -0400
Subject: ignore muted state FOR NOW

---
 public/assets/javascripts/rectangles/engine/scenery/sound.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index d63d8c4..5a783d6 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -6,7 +6,7 @@ Scenery.sound.init = function(){
 }
 Scenery.sound.move = function(){
   Scenery.forEach(function(scenery){
-    if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
+    if ((scenery.type == "video" || scenery.type == "audio")) { // && ! scenery.muted()) {
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
       var volume = 1 - (clamp( distance, 0, Scenery.sound.max_distance ) / Scenery.sound.max_distance)
-- 
cgit v1.2.3-70-g09d2


From ed786fddd4e65f6c9dfb95371d57deb4696273f4 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 30 Apr 2015 17:11:13 -0400
Subject: work out positioning logic

---
 .../javascripts/rectangles/engine/map/ui_ortho.js  | 68 +++++++++++++++++-----
 public/assets/test/ortho3.html                     | 18 ++++--
 2 files changed, 66 insertions(+), 20 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
index dab7354..52f7339 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
@@ -10,35 +10,72 @@ Map.UI.Ortho = function(map){
 		el: map.el,
 		down: function(e, cursor){
 		  last_event = e
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-      base.tools[currentTool].down(e, cursor)
+		  cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
+		  cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
+			if (tool.recenterCursor) {
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+        base.tools[currentTool].down(e, cursor)
+      }
+      else {
+        base.tools[currentTool].down(e, cursor)
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+      }
 		},
 		move: function(e, cursor){
 		  last_event = e
-			cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-      base.tools[currentTool].move(e, cursor)
+		  cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
+		  cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
+			if (tool.recenterCursor) {
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+        base.tools[currentTool].move(e, cursor)
+      }
+			else {
+        base.tools[currentTool].move(e, cursor)
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+      }
 		},
 		drag: function(e, cursor){
 		  last_event = e
-			cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
-			cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
-      base.tools[currentTool].drag(e, cursor)
+      cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom
+      cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom
+			if (tool.recenterCursor) {
+        cursor.x.b += map.center.a
+        cursor.y.b -= map.center.b
+        base.tools[currentTool].drag(e, cursor)
+      }
+			else {
+        base.tools[currentTool].drag(e, cursor)
+        cursor.x.b += map.center.a
+        cursor.y.b -= map.center.b
+      }
 		},
 		up: function(e, cursor, new_cursor){
 		  last_event = e
-			new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-			new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-      base.tools[currentTool].up(e, cursor, new_cursor)
+		  new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
+		  new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
+			if (tool.recenterCursor) {
+        new_cursor.x.add(map.center.a)
+        new_cursor.y.sub(map.center.b)
+        base.tools[currentTool].up(e, cursor, new_cursor)
+      }
+      else {
+        base.tools[currentTool].up(e, cursor, new_cursor)
+        new_cursor.x.add(map.center.a)
+        new_cursor.y.sub(map.center.b)
+      }
       if (nextTool) {
+        console.log('found nextTool')
         base.set_tool(nextTool)
         nextTool = null
       }
 		}
 	})
 	
-	var currentTool = "polyline", nextTool
+	var currentTool = "polyline", nextTool, tool
 	base.add_tool = function(name, tool){
 	  base.tools[name] = tool
 	}
@@ -46,11 +83,14 @@ Map.UI.Ortho = function(map){
 	  console.log("set tool to", s)
 	  base.tools[currentTool].cancel()
 	  currentTool = s
+	  tool = base.tools[currentTool]
 	}
 	base.set_drag_tool = function(s){
+	  console.log('set drag tool to', s)
 	  nextTool = currentTool
 	  currentTool = s
-    base.tools[s].down(last_event, base.mouse.cursor)
+	  tool = base.tools[currentTool]
+    base.tools[currentTool].down(last_event, base.mouse.cursor)
 	}
 	base.tools = {}
 
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index 319f788..6bf2619 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -78,6 +78,7 @@ app.off = function(){	app.tube.off.apply(app.tube, arguments) }
 
 var MapTool = Fiber.extend(function(base){
 	var exports = {
+	  recenterCursor: true,
 	  down: function(e, cursor){},
 	  move: function(e, cursor){},
 	  drag: function(e, cursor){},
@@ -136,14 +137,18 @@ var ArrowTool = MapTool.extend(function(base){
 
 var PositionTool = MapTool.extend(function(base){
 	var exports = {
-	  down: function(e, cursor){
+	  recenterCursor: false,
+	  drag: function(e, cursor){
+      map.center.a = -cursor.x.magnitude()
+      map.center.b = cursor.y.magnitude()
+	  },
+	  rightclick: function(e, cursor){
       cursor.quantize(1/map.zoom)
       map.center.a = cursor.x.a
       map.center.b = -cursor.y.a
       cursor.x.b = cursor.x.a
       cursor.y.b = cursor.y.a
-      map.ui.mouse.down = false
-	  },
+	  }
   }
   return exports
 })
@@ -167,7 +172,7 @@ var PolylineTool = MapTool.extend(function (base) {
         }
         return
       }
-      map.ui.tools.position.down(e, cursor)
+      map.ui.tools.position.rightclick(e, cursor)
       return
     }
 
@@ -216,7 +221,6 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
   
   var exports = {}
   exports.down = function(e, cursor){
-
     // rightclick?
     if (e.ctrlKey || e.which === 3) {
       e.preventDefault()
@@ -232,7 +236,9 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
         }
         return
       }
-      map.ui.tools.position.down(e, cursor)
+      else {
+        map.ui.tools.position.rightclick(e, cursor)
+      }
       return
     }
 
-- 
cgit v1.2.3-70-g09d2


From 44642b48203b3ee2fa9e281f31ed9fed3f60ee79 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 21 Jul 2015 13:23:22 -0400
Subject: find closest segment

---
 Gruntfile.js                                       |   8 +-
 .../assets/javascripts/mx/primitives/mx.point.js   |  17 +
 .../javascripts/mx/primitives/mx.polyline.js       |  48 +++
 .../rectangles/engine/map/tools/_base.js           |  11 +
 .../rectangles/engine/map/tools/arrow.js           |  46 +++
 .../rectangles/engine/map/tools/ortho.js           | 115 +++++++
 .../rectangles/engine/map/tools/polyline.js        |  69 ++++
 .../rectangles/engine/map/tools/position.js        |  17 +
 .../javascripts/rectangles/engine/map/ui/editor.js | 284 ++++++++++++++++
 .../rectangles/engine/map/ui/minimap.js            |  81 +++++
 .../javascripts/rectangles/engine/map/ui/ortho.js  | 105 ++++++
 .../javascripts/rectangles/engine/map/ui_editor.js | 284 ----------------
 .../rectangles/engine/map/ui_minimap.js            |  81 -----
 .../javascripts/rectangles/engine/map/ui_ortho.js  | 105 ------
 public/assets/test/ortho3.html                     | 362 ++-------------------
 views/partials/scripts.ejs                         |   4 +-
 16 files changed, 824 insertions(+), 813 deletions(-)
 create mode 100644 public/assets/javascripts/mx/primitives/mx.point.js
 create mode 100644 public/assets/javascripts/mx/primitives/mx.polyline.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/_base.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/arrow.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/ortho.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/polyline.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/position.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/ui/editor.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/ui/minimap.js
 create mode 100644 public/assets/javascripts/rectangles/engine/map/ui/ortho.js
 delete mode 100644 public/assets/javascripts/rectangles/engine/map/ui_editor.js
 delete mode 100644 public/assets/javascripts/rectangles/engine/map/ui_minimap.js
 delete mode 100644 public/assets/javascripts/rectangles/engine/map/ui_ortho.js

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

diff --git a/Gruntfile.js b/Gruntfile.js
index a0f4d83..233c7ff 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,8 +85,8 @@ module.exports = function(grunt) {
           "public/assets/javascripts/rectangles/engine/sculpture/types/image.js",
 
           "public/assets/javascripts/rectangles/engine/map/_map.js",
-          "public/assets/javascripts/rectangles/engine/map/ui_editor.js",
-          "public/assets/javascripts/rectangles/engine/map/ui_minimap.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/editor.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/minimap.js",
           "public/assets/javascripts/rectangles/engine/map/draw.js",
 
           "public/assets/javascripts/ui/lib/View.js",
@@ -228,8 +228,8 @@ module.exports = function(grunt) {
           "public/assets/javascripts/rectangles/engine/sculpture/types/image.js",
 
           "public/assets/javascripts/rectangles/engine/map/_map.js",
-          "public/assets/javascripts/rectangles/engine/map/ui_editor.js",
-          "public/assets/javascripts/rectangles/engine/map/ui_minimap.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/editor.js",
+          "public/assets/javascripts/rectangles/engine/map/ui/minimap.js",
           "public/assets/javascripts/rectangles/engine/map/draw.js",
 
           "public/assets/javascripts/ui/lib/View.js",
diff --git a/public/assets/javascripts/mx/primitives/mx.point.js b/public/assets/javascripts/mx/primitives/mx.point.js
new file mode 100644
index 0000000..41a7732
--- /dev/null
+++ b/public/assets/javascripts/mx/primitives/mx.point.js
@@ -0,0 +1,17 @@
+MX.Point = MX.Object3D.extend({
+  init: function(p){
+    this.updateChildren = false
+    this.move({
+      x: p.a,
+      y: 11,
+      z: p.b,
+      width: 20,
+      height: 20,
+      rotationX: PI/2,
+    })
+    this.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
+    this.el.style.backfaceVisibility = "visible"
+    this.el.style.borderRadius = "50%"
+    scene.add(this)
+  }
+})
diff --git a/public/assets/javascripts/mx/primitives/mx.polyline.js b/public/assets/javascripts/mx/primitives/mx.polyline.js
new file mode 100644
index 0000000..555b3c6
--- /dev/null
+++ b/public/assets/javascripts/mx/primitives/mx.polyline.js
@@ -0,0 +1,48 @@
+MX.Polyline = MX.Object3D.extend({
+  init: function(polyline){
+    this.faces = []
+    this.points = polyline.points
+    for (var i = 1; i < this.points.length; i++) {
+      var mx = new MX.Object3D()
+      var head = this.points[i-1]
+      var tail = this.points[i]
+      this.move_face(mx, head, tail)
+      this.faces.push(mx)
+      scene.add(mx)
+    }
+  },
+  
+  rebuild: function(){
+    for (var i = 1; i < this.points.length; i++) {
+      var mx = this.faces[i-1]
+      var head = this.points[i-1]
+      var tail = this.points[i]
+      this.move_face(mx, head, tail)
+    }
+  },
+
+  move_face: function (mx, head, tail){
+    var mid_x = (head.a + tail.a)
+    var mid_z = (head.b + tail.b)
+    var len = head.distanceTo( tail )
+    var angle = atan2( head.b - tail.b, head.a - tail.a )
+    mx.move({
+      x: mid_x / 2,
+      y: wall_height/2 + 1,
+      z: mid_z / 2,
+      width: ceil(len),
+      height: wall_height,
+      rotationY: angle
+    })
+    var hue = abs(round( angle / PI * 90 + 300))
+    mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
+  },
+  
+  destroy: function(){
+    this.faces.forEach(function(mx){
+      scene.remove(mx)
+    })
+    this.faces = null
+    this.points = null
+  },
+})
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/_base.js b/public/assets/javascripts/rectangles/engine/map/tools/_base.js
new file mode 100644
index 0000000..17b247d
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/_base.js
@@ -0,0 +1,11 @@
+var MapTool = Fiber.extend(function(base){
+	var exports = {
+	  recenterCursor: true,
+	  down: function(e, cursor){},
+	  move: function(e, cursor){},
+	  drag: function(e, cursor){},
+	  up: function(e, cursor, new_cursor){},
+	  cancel: function(){},
+  }
+  return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
new file mode 100644
index 0000000..2a73954
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
@@ -0,0 +1,46 @@
+var ArrowTool = MapTool.extend(function(base){
+	var exports = {}
+	
+	var selected_point = null, original_point = null, selected_shape = null
+	
+	exports.down = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    var p = shapes.findClosestPoint(last_point)
+    if (p) {
+      selected_shape = p.shape
+      selected_point = p.point
+      original_point = selected_point.clone()
+    }
+    else {
+      map.ui.set_drag_tool("position")
+    }
+	}
+	
+  exports.move = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    var p = shapes.findClosestPoint(last_point)
+    if (p) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(p.point)
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+	}
+	
+	exports.drag = function(e, cursor){
+    selected_point.a = original_point.a + cursor.x.magnitude()
+		selected_point.b = original_point.b + cursor.y.magnitude()
+		selected_shape.rebuild()
+	}
+	
+	exports.up = function(e, cursor){
+	  selected_point = selected_shape = original_point = null
+	}
+	
+	return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
new file mode 100644
index 0000000..be3d707
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -0,0 +1,115 @@
+var OrthoPolylineTool = MapTool.extend(function (base) {
+  // this will work like normal polyline except all walls will be orthogonal
+  
+  var prev_point, horizontal = false, first_edge_is_horizontal = false
+  
+  var exports = {}
+  exports.down = function(e, cursor){
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      e.preventDefault()
+      e.stopPropagation()
+      if (map.ui.placing) {
+        // close polyline or cancel
+        map.ui.placing = false
+        if (line.points.length > 2) {
+          line.build()
+        }
+        else {
+          line.reset()
+        }
+        return
+      }
+      else {
+        map.ui.tools.position.rightclick(e, cursor)
+      }
+      return
+    }
+
+    // compare to initial point
+    var p = last_point.clone()
+    if (map.ui.placing) {
+      if (line.lastPoint().eq(p)) {
+        return
+      }
+      else if (line.canCloseWith(p)) {
+        line.close()
+        line.build()
+        map.ui.placing = false
+      }
+      else {
+        line.add(p)
+        prev_point = p
+        horizontal = ! horizontal
+      }
+    }
+    else {
+      map.ui.placing = true
+      line = new Polyline ()
+      line.add(p)
+      first_point = prev_point = p
+      horizontal = false
+    }
+  }
+  exports.move = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    if (map.ui.placing) {
+      if (line.points.length == 1) {
+        var x = abs(prev_point.a - last_point.a)
+        var y = abs(prev_point.b - last_point.b)
+        if (x > y) {
+          last_point.b = prev_point.b
+          first_edge_is_horizontal = horizontal = true
+        }
+        else {
+          last_point.a = prev_point.a
+          first_edge_is_horizontal = horizontal = false
+        }
+      }
+      else {
+        if (horizontal) {
+          last_point.b = prev_point.b
+        }
+        else {
+          last_point.a = prev_point.a
+        }
+        if (horizontal == first_edge_is_horizontal) {
+          // check if this point is within N pixels of the normal
+          // and lock it into place if so
+          if (horizontal && abs( first_point.a - last_point.a ) < 10/map.zoom) {
+            last_point.a = first_point.a
+          }
+          else if (! horizontal && abs( first_point.b - last_point.b ) < 10/map.zoom) {
+            last_point.b = first_point.b
+          }
+        }
+      }
+
+      if (line.canCloseWith(last_point)) {
+        document.body.style.cursor = "pointer"
+        last_point.assign(first_point)
+        cursor.x.a = cursor.x.b = last_point.a
+        cursor.y.a = cursor.y.b = last_point.b
+      }
+      return
+    }
+    var end_point = shapes.findClosestEndPoint(last_point)
+    if (end_point) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(end_point.point)
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+      return
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+  }
+  exports.cancel = function(){
+    if (map.ui.placing) { line.reset() }
+    first_point = null
+    map.ui.placing = false
+  }
+  return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
new file mode 100644
index 0000000..559aea8
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -0,0 +1,69 @@
+var PolylineTool = MapTool.extend(function (base) {
+  var exports = {}
+  exports.down = function(e, cursor){
+
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      e.preventDefault()
+      e.stopPropagation()
+      if (map.ui.placing) {
+        // close polyline or cancel
+        map.ui.placing = false
+        if (line.points.length > 2) {
+          line.build()
+        }
+        else {
+          line.reset()
+        }
+        return
+      }
+      map.ui.tools.position.rightclick(e, cursor)
+      return
+    }
+
+    // compare to initial point
+    var p = last_point.clone()
+    if (map.ui.placing) {
+      if (line.canCloseWith(p)) {
+        line.close()
+        line.build()
+        map.ui.placing = false
+      }
+      else {
+        line.add(p)
+      }
+    }
+    else {
+      map.ui.placing = true
+      line = new Polyline ()
+      line.add(p)
+    }
+  }
+  exports.move = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    if (map.ui.placing && line.canCloseWith(last_point)) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(line.points[0])
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+      return
+    }
+    var end_point = shapes.findClosestEndPoint(last_point)
+    if (end_point) {
+      document.body.style.cursor = "pointer"
+      last_point.assign(end_point.point)
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+      return
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+  }
+  exports.cancel = function(){
+    if (map.ui.placing) { line.reset() }
+    map.ui.placing = false
+  }
+  return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/position.js b/public/assets/javascripts/rectangles/engine/map/tools/position.js
new file mode 100644
index 0000000..a994f5a
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/position.js
@@ -0,0 +1,17 @@
+var PositionTool = MapTool.extend(function(base){
+	var exports = {
+	  recenterCursor: false,
+	  drag: function(e, cursor){
+      map.center.a = -cursor.x.magnitude()
+      map.center.b = cursor.y.magnitude()
+	  },
+	  rightclick: function(e, cursor){
+      cursor.quantize(1/map.zoom)
+      map.center.a = cursor.x.a
+      map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+	  }
+  }
+  return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/ui/editor.js b/public/assets/javascripts/rectangles/engine/map/ui/editor.js
new file mode 100644
index 0000000..7308344
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui/editor.js
@@ -0,0 +1,284 @@
+
+Map.UI = Map.UI || {}
+Map.UI.Editor = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: down,
+		move: move,
+		drag: drag,
+		up: up,
+		rightclick: rightclick,
+	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+	
+	base.permissions = new Permissions({
+		create: true,
+		move: true,
+		resize: true,
+		destroy: false,
+	})
+
+	base.blur = function(){
+		Rooms.forEach(function(r){
+			return r.focused = false
+		})
+		app.tube("builder-pick-nothing")
+	}
+	
+	//
+	
+	function down (e, cursor){
+	  var room
+		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+		if (e.ctrlKey || e.which === 3) {
+		  if (Rooms.regions.length == 0) return
+			cursor.quantize(1/map.zoom)
+			map.center.a = cursor.x.a
+			map.center.b = -cursor.y.a
+			cursor.x.b = cursor.x.a
+			cursor.y.b = cursor.y.a
+			base.mouse.down = false
+			e.preventDefault()
+			e.stopPropagation()
+			return
+		}
+
+		var intersects = Rooms.filter(function(r){
+			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
+		})
+
+		if (intersects.length && (base.permissions.destroy || e.altKey)) {
+			base.mouse.down = false
+			
+			room = intersects[0]
+
+      UndoStack.push({
+        type: "destroy-room",
+        undo: room.copy(),
+        redo: { id: room.id },
+      })
+
+			Rooms.remove(room)
+			app.tube("builder-destroy-room", room)
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+			return
+		}
+		else if (intersects.length) {
+			base.dragging = intersects[0]
+			base.resizing = base.dragging.rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
+			base.dragging.rect.translation.sides = base.resizing
+			app.tube("builder-pick-room", intersects[0])
+		}
+		else if (base.permissions.create) {
+			base.creating = true
+		}
+
+		if (e.shiftKey && base.dragging) {
+			base.dragging.rect.quantize(10/map.zoom)
+		}
+	}
+
+	function move (e, cursor) {
+		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+		var intersects = Rooms.filter(function(r){
+			return r.rect.contains(cursor.x.a, cursor.y.a)
+		})
+		
+		if (base.permissions.destroy) {
+      map.el.className = "destroy"
+		}
+		else if (intersects.length) {
+		  var edges = intersects[0].rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
+		  switch (edges) {
+		    case FRONT_LEFT:
+		    case BACK_RIGHT:
+		      map.el.className = "nesw-resize"
+		      break
+
+		    case FRONT_RIGHT:
+		    case BACK_LEFT:
+		      map.el.className = "nwse-resize"
+		      break
+
+		    case FRONT:
+		    case BACK:
+		      map.el.className = "ns-resize"
+		      break
+
+		    case LEFT:
+		    case RIGHT:
+		      map.el.className = "ew-resize"
+		      break
+		    
+		    default:
+		      map.el.className = "move"
+		      break
+		  }
+		}
+		else {
+      map.el.className = ""
+		}
+	}
+
+	function drag (e, cursor) {
+		cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+		cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+
+		if (base.resizing) {
+			var x_length = base.dragging.rect.x.length(),
+					y_length = base.dragging.rect.y.length()
+
+			if (base.resizing & LEFT) {
+				base.dragging.rect.translation.a = clamp( cursor.x.magnitude(), x_length - side_max, x_length - side_min )
+			}
+			if (base.resizing & RIGHT) {
+				base.dragging.rect.translation.a = clamp( cursor.x.magnitude(), side_min - x_length, side_max - x_length )
+			}
+			if (base.resizing & FRONT) {
+				base.dragging.rect.translation.b = clamp( cursor.y.magnitude(), y_length - side_max, y_length - side_min )
+			}
+			if (base.resizing & BACK) {
+				base.dragging.rect.translation.b = clamp( cursor.y.magnitude(), side_min - y_length, side_max - y_length )
+			}
+		}
+		else if (base.dragging) {
+			base.dragging.rect.translation.a = cursor.x.magnitude()
+			base.dragging.rect.translation.b = cursor.y.magnitude()
+		}
+	}
+
+	function up (e, cursor, new_cursor) {
+		new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+		if (base.creating) {
+			if (cursor.height() > side_min && cursor.width() > side_min) {
+				cursor.x.abs().quantize(1)
+				cursor.y.abs().quantize(1)
+				var room = Rooms.add_with_rect( cursor )
+
+				Rooms.rebuild()
+
+        UndoStack.push({
+          type: "create-room",
+          undo: { id: room.id },
+          redo: room.copy()
+        })
+        
+        Rooms.rebuild()
+				app.tube("builder-pick-room", room)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.controller.settings )
+			}
+		}
+    if (base.resizing || base.dragging) {
+      var oldState = base.dragging.copy()
+      
+      if (base.resizing) {
+        base.dragging.rect.resize()
+      }
+      else if (base.dragging) {
+        base.dragging.rect.translate()
+      }
+      
+      UndoStack.push({
+        type: "update-room",
+        undo: oldState,
+        redo: base.dragging.copy()
+      })
+      Rooms.rebuild()
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
+    }
+
+		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
+	}
+
+  var wheelState, wheelTimeout
+
+	function mousewheel (e, deltaY, deltaX){
+		var cursor = base.mouse.cursor
+
+		var intersects = Rooms.filter(function(r){
+			return r.focused // = r.rect.contains(cursor.x.a, cursor.y.a)
+		})
+		
+		if (intersects.length && window.heightIsGlobal) {
+		  var rooms = Rooms.values()
+		  wheelState = wheelState || rooms[0].height
+		  var height = clamp( ~~(rooms[0].height + deltaY * 2), height_min, height_max )
+		  rooms.forEach(function(room){
+		    room.height = height
+		  })
+		  
+		  app.tube("builder-pick-room", intersects[0])
+
+      clearTimeout(wheelTimeout)
+			wheelTimeout = setTimeout(function(){
+        UndoStack.push({
+          type: "update-rooms-height",
+          undo: wheelState,
+          redo: height
+        })
+        Rooms.rebuild()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+
+        wheelState = null
+			}, 250)
+		}
+		else if (intersects.length) {
+			wheelState = wheelState || intersects[0].copy()
+			
+			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
+		  app.tube("builder-pick-room", intersects[0])
+			
+			clearTimeout(wheelTimeout)
+			wheelTimeout = setTimeout(function(){
+        UndoStack.push({
+          type: "update-room",
+          undo: wheelState,
+          redo: intersects[0].copy()
+        })
+        Rooms.rebuild()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+
+        wheelState = null
+			}, 250)
+		}
+		else {
+			map.set_zoom(map.zoom_exponent + deltaY/20)
+		}
+	}
+	
+	function rightclick (e){
+	}
+
+}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui/minimap.js b/public/assets/javascripts/rectangles/engine/map/ui/minimap.js
new file mode 100644
index 0000000..0fdd336
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui/minimap.js
@@ -0,0 +1,81 @@
+
+Map.UI = Map.UI || {}
+
+Map.UI.Minimap = function(map){
+
+	var base = this
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: down,
+		move: move,
+		drag: drag,
+		up: up,
+		rightclick: rightclick,
+	})
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+	
+	var x, z
+	
+	//
+	
+	function down (e, cursor){
+		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+		
+		x = scene.camera.x
+		z = scene.camera.z
+
+		if (e.ctrlKey || e.which === 3) {
+			cursor.quantize(1/map.zoom)
+			map.center.a = cursor.x.a
+			map.center.b = -cursor.y.a
+			console.log(map.center+"")
+			cursor.x.b = cursor.x.a
+			cursor.y.b = cursor.y.a
+			base.mouse.down = false
+			e.preventDefault()
+			e.stopPropagation()
+			return
+		}
+	}
+
+	function move (e, cursor) {
+		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+	}
+
+	function drag (e, cursor) {
+		cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
+		cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
+
+		scene.camera.x = x + cursor.x.magnitude() * map.zoom * 16
+		scene.camera.z = z + cursor.y.magnitude() * map.zoom * 16
+		Rooms.mover.room = null
+
+		if (base.dragging) {
+			base.dragging.rect.translation.a = cursor.x.magnitude()
+			base.dragging.rect.translation.b = cursor.y.magnitude()
+		}
+	}
+
+	function up (e, cursor, new_cursor) {
+		new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
+		new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
+
+		base.dragging = false
+	}
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
+	
+	function rightclick (e){
+	}
+}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
new file mode 100644
index 0000000..52f7339
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
@@ -0,0 +1,105 @@
+Map.UI = Map.UI || {}
+Map.UI.Ortho = function(map){
+
+	var base = this
+	var last_event = null
+
+	base.creating = base.dragging = base.resizing = false
+
+	base.mouse = new mouse({
+		el: map.el,
+		down: function(e, cursor){
+		  last_event = e
+		  cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
+		  cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
+			if (tool.recenterCursor) {
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+        base.tools[currentTool].down(e, cursor)
+      }
+      else {
+        base.tools[currentTool].down(e, cursor)
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+      }
+		},
+		move: function(e, cursor){
+		  last_event = e
+		  cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
+		  cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
+			if (tool.recenterCursor) {
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+        base.tools[currentTool].move(e, cursor)
+      }
+			else {
+        base.tools[currentTool].move(e, cursor)
+        cursor.x.add(map.center.a)
+        cursor.y.sub(map.center.b)
+      }
+		},
+		drag: function(e, cursor){
+		  last_event = e
+      cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom
+      cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom
+			if (tool.recenterCursor) {
+        cursor.x.b += map.center.a
+        cursor.y.b -= map.center.b
+        base.tools[currentTool].drag(e, cursor)
+      }
+			else {
+        base.tools[currentTool].drag(e, cursor)
+        cursor.x.b += map.center.a
+        cursor.y.b -= map.center.b
+      }
+		},
+		up: function(e, cursor, new_cursor){
+		  last_event = e
+		  new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
+		  new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
+			if (tool.recenterCursor) {
+        new_cursor.x.add(map.center.a)
+        new_cursor.y.sub(map.center.b)
+        base.tools[currentTool].up(e, cursor, new_cursor)
+      }
+      else {
+        base.tools[currentTool].up(e, cursor, new_cursor)
+        new_cursor.x.add(map.center.a)
+        new_cursor.y.sub(map.center.b)
+      }
+      if (nextTool) {
+        console.log('found nextTool')
+        base.set_tool(nextTool)
+        nextTool = null
+      }
+		}
+	})
+	
+	var currentTool = "polyline", nextTool, tool
+	base.add_tool = function(name, tool){
+	  base.tools[name] = tool
+	}
+	base.set_tool = function(s){
+	  console.log("set tool to", s)
+	  base.tools[currentTool].cancel()
+	  currentTool = s
+	  tool = base.tools[currentTool]
+	}
+	base.set_drag_tool = function(s){
+	  console.log('set drag tool to', s)
+	  nextTool = currentTool
+	  currentTool = s
+	  tool = base.tools[currentTool]
+    base.tools[currentTool].down(last_event, base.mouse.cursor)
+	}
+	base.tools = {}
+
+	base.wheel = new wheel({
+		el: map.el,
+		update: mousewheel,
+	})
+
+	function mousewheel (e, deltaY, deltaX){
+		map.set_zoom(map.zoom_exponent - deltaY/20)
+	}
+}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
deleted file mode 100644
index 7308344..0000000
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ /dev/null
@@ -1,284 +0,0 @@
-
-Map.UI = Map.UI || {}
-Map.UI.Editor = function(map){
-
-	var base = this
-
-	base.creating = base.dragging = base.resizing = false
-
-	base.mouse = new mouse({
-		el: map.el,
-		down: down,
-		move: move,
-		drag: drag,
-		up: up,
-		rightclick: rightclick,
-	})
-
-	base.wheel = new wheel({
-		el: map.el,
-		update: mousewheel,
-	})
-	
-	base.permissions = new Permissions({
-		create: true,
-		move: true,
-		resize: true,
-		destroy: false,
-	})
-
-	base.blur = function(){
-		Rooms.forEach(function(r){
-			return r.focused = false
-		})
-		app.tube("builder-pick-nothing")
-	}
-	
-	//
-	
-	function down (e, cursor){
-	  var room
-		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-
-		if (e.ctrlKey || e.which === 3) {
-		  if (Rooms.regions.length == 0) return
-			cursor.quantize(1/map.zoom)
-			map.center.a = cursor.x.a
-			map.center.b = -cursor.y.a
-			cursor.x.b = cursor.x.a
-			cursor.y.b = cursor.y.a
-			base.mouse.down = false
-			e.preventDefault()
-			e.stopPropagation()
-			return
-		}
-
-		var intersects = Rooms.filter(function(r){
-			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
-		})
-
-		if (intersects.length && (base.permissions.destroy || e.altKey)) {
-			base.mouse.down = false
-			
-			room = intersects[0]
-
-      UndoStack.push({
-        type: "destroy-room",
-        undo: room.copy(),
-        redo: { id: room.id },
-      })
-
-			Rooms.remove(room)
-			app.tube("builder-destroy-room", room)
-
-      // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
-			return
-		}
-		else if (intersects.length) {
-			base.dragging = intersects[0]
-			base.resizing = base.dragging.rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
-			base.dragging.rect.translation.sides = base.resizing
-			app.tube("builder-pick-room", intersects[0])
-		}
-		else if (base.permissions.create) {
-			base.creating = true
-		}
-
-		if (e.shiftKey && base.dragging) {
-			base.dragging.rect.quantize(10/map.zoom)
-		}
-	}
-
-	function move (e, cursor) {
-		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-
-		var intersects = Rooms.filter(function(r){
-			return r.rect.contains(cursor.x.a, cursor.y.a)
-		})
-		
-		if (base.permissions.destroy) {
-      map.el.className = "destroy"
-		}
-		else if (intersects.length) {
-		  var edges = intersects[0].rect.nearEdge(cursor.x.a, cursor.y.a, resize_margin / map.zoom)
-		  switch (edges) {
-		    case FRONT_LEFT:
-		    case BACK_RIGHT:
-		      map.el.className = "nesw-resize"
-		      break
-
-		    case FRONT_RIGHT:
-		    case BACK_LEFT:
-		      map.el.className = "nwse-resize"
-		      break
-
-		    case FRONT:
-		    case BACK:
-		      map.el.className = "ns-resize"
-		      break
-
-		    case LEFT:
-		    case RIGHT:
-		      map.el.className = "ew-resize"
-		      break
-		    
-		    default:
-		      map.el.className = "move"
-		      break
-		  }
-		}
-		else {
-      map.el.className = ""
-		}
-	}
-
-	function drag (e, cursor) {
-		cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
-		cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
-
-		if (base.resizing) {
-			var x_length = base.dragging.rect.x.length(),
-					y_length = base.dragging.rect.y.length()
-
-			if (base.resizing & LEFT) {
-				base.dragging.rect.translation.a = clamp( cursor.x.magnitude(), x_length - side_max, x_length - side_min )
-			}
-			if (base.resizing & RIGHT) {
-				base.dragging.rect.translation.a = clamp( cursor.x.magnitude(), side_min - x_length, side_max - x_length )
-			}
-			if (base.resizing & FRONT) {
-				base.dragging.rect.translation.b = clamp( cursor.y.magnitude(), y_length - side_max, y_length - side_min )
-			}
-			if (base.resizing & BACK) {
-				base.dragging.rect.translation.b = clamp( cursor.y.magnitude(), side_min - y_length, side_max - y_length )
-			}
-		}
-		else if (base.dragging) {
-			base.dragging.rect.translation.a = cursor.x.magnitude()
-			base.dragging.rect.translation.b = cursor.y.magnitude()
-		}
-	}
-
-	function up (e, cursor, new_cursor) {
-		new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-		new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-
-		if (base.creating) {
-			if (cursor.height() > side_min && cursor.width() > side_min) {
-				cursor.x.abs().quantize(1)
-				cursor.y.abs().quantize(1)
-				var room = Rooms.add_with_rect( cursor )
-
-				Rooms.rebuild()
-
-        UndoStack.push({
-          type: "create-room",
-          undo: { id: room.id },
-          redo: room.copy()
-        })
-        
-        Rooms.rebuild()
-				app.tube("builder-pick-room", room)
-
-        // TODO: watch individual scenery object here
-        Minotaur.watch( app.controller.settings )
-			}
-		}
-    if (base.resizing || base.dragging) {
-      var oldState = base.dragging.copy()
-      
-      if (base.resizing) {
-        base.dragging.rect.resize()
-      }
-      else if (base.dragging) {
-        base.dragging.rect.translate()
-      }
-      
-      UndoStack.push({
-        type: "update-room",
-        undo: oldState,
-        redo: base.dragging.copy()
-      })
-      Rooms.rebuild()
-
-      // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
-    }
-
-		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
-	}
-
-  var wheelState, wheelTimeout
-
-	function mousewheel (e, deltaY, deltaX){
-		var cursor = base.mouse.cursor
-
-		var intersects = Rooms.filter(function(r){
-			return r.focused // = r.rect.contains(cursor.x.a, cursor.y.a)
-		})
-		
-		if (intersects.length && window.heightIsGlobal) {
-		  var rooms = Rooms.values()
-		  wheelState = wheelState || rooms[0].height
-		  var height = clamp( ~~(rooms[0].height + deltaY * 2), height_min, height_max )
-		  rooms.forEach(function(room){
-		    room.height = height
-		  })
-		  
-		  app.tube("builder-pick-room", intersects[0])
-
-      clearTimeout(wheelTimeout)
-			wheelTimeout = setTimeout(function(){
-        UndoStack.push({
-          type: "update-rooms-height",
-          undo: wheelState,
-          redo: height
-        })
-        Rooms.rebuild()
-
-        // TODO: watch individual scenery object here
-        Minotaur.watch( app.router.editorView.settings )
-
-        wheelState = null
-			}, 250)
-		}
-		else if (intersects.length) {
-			wheelState = wheelState || intersects[0].copy()
-			
-			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
-		  app.tube("builder-pick-room", intersects[0])
-			
-			clearTimeout(wheelTimeout)
-			wheelTimeout = setTimeout(function(){
-        UndoStack.push({
-          type: "update-room",
-          undo: wheelState,
-          redo: intersects[0].copy()
-        })
-        Rooms.rebuild()
-
-        // TODO: watch individual scenery object here
-        Minotaur.watch( app.router.editorView.settings )
-
-        wheelState = null
-			}, 250)
-		}
-		else {
-			map.set_zoom(map.zoom_exponent + deltaY/20)
-		}
-	}
-	
-	function rightclick (e){
-	}
-
-}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
deleted file mode 100644
index 0fdd336..0000000
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ /dev/null
@@ -1,81 +0,0 @@
-
-Map.UI = Map.UI || {}
-
-Map.UI.Minimap = function(map){
-
-	var base = this
-
-	base.creating = base.dragging = base.resizing = false
-
-	base.mouse = new mouse({
-		el: map.el,
-		down: down,
-		move: move,
-		drag: drag,
-		up: up,
-		rightclick: rightclick,
-	})
-
-	base.wheel = new wheel({
-		el: map.el,
-		update: mousewheel,
-	})
-	
-	var x, z
-	
-	//
-	
-	function down (e, cursor){
-		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-		
-		x = scene.camera.x
-		z = scene.camera.z
-
-		if (e.ctrlKey || e.which === 3) {
-			cursor.quantize(1/map.zoom)
-			map.center.a = cursor.x.a
-			map.center.b = -cursor.y.a
-			console.log(map.center+"")
-			cursor.x.b = cursor.x.a
-			cursor.y.b = cursor.y.a
-			base.mouse.down = false
-			e.preventDefault()
-			e.stopPropagation()
-			return
-		}
-	}
-
-	function move (e, cursor) {
-		cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-		cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-	}
-
-	function drag (e, cursor) {
-		cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom + map.center.a
-		cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom - map.center.b
-
-		scene.camera.x = x + cursor.x.magnitude() * map.zoom * 16
-		scene.camera.z = z + cursor.y.magnitude() * map.zoom * 16
-		Rooms.mover.room = null
-
-		if (base.dragging) {
-			base.dragging.rect.translation.a = cursor.x.magnitude()
-			base.dragging.rect.translation.b = cursor.y.magnitude()
-		}
-	}
-
-	function up (e, cursor, new_cursor) {
-		new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom).add(map.center.a)
-		new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom).sub(map.center.b)
-
-		base.dragging = false
-	}
-
-	function mousewheel (e, deltaY, deltaX){
-		map.set_zoom(map.zoom_exponent - deltaY/20)
-	}
-	
-	function rightclick (e){
-	}
-}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js b/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
deleted file mode 100644
index 52f7339..0000000
--- a/public/assets/javascripts/rectangles/engine/map/ui_ortho.js
+++ /dev/null
@@ -1,105 +0,0 @@
-Map.UI = Map.UI || {}
-Map.UI.Ortho = function(map){
-
-	var base = this
-	var last_event = null
-
-	base.creating = base.dragging = base.resizing = false
-
-	base.mouse = new mouse({
-		el: map.el,
-		down: function(e, cursor){
-		  last_event = e
-		  cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
-		  cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
-			if (tool.recenterCursor) {
-        cursor.x.add(map.center.a)
-        cursor.y.sub(map.center.b)
-        base.tools[currentTool].down(e, cursor)
-      }
-      else {
-        base.tools[currentTool].down(e, cursor)
-        cursor.x.add(map.center.a)
-        cursor.y.sub(map.center.b)
-      }
-		},
-		move: function(e, cursor){
-		  last_event = e
-		  cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
-		  cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
-			if (tool.recenterCursor) {
-        cursor.x.add(map.center.a)
-        cursor.y.sub(map.center.b)
-        base.tools[currentTool].move(e, cursor)
-      }
-			else {
-        base.tools[currentTool].move(e, cursor)
-        cursor.x.add(map.center.a)
-        cursor.y.sub(map.center.b)
-      }
-		},
-		drag: function(e, cursor){
-		  last_event = e
-      cursor.x.b = ((cursor.x.b/map.dimensions.a)+0.5) * map.dimensions.a / map.zoom
-      cursor.y.b = ((cursor.y.b/map.dimensions.b)-0.5) * map.dimensions.b / map.zoom
-			if (tool.recenterCursor) {
-        cursor.x.b += map.center.a
-        cursor.y.b -= map.center.b
-        base.tools[currentTool].drag(e, cursor)
-      }
-			else {
-        base.tools[currentTool].drag(e, cursor)
-        cursor.x.b += map.center.a
-        cursor.y.b -= map.center.b
-      }
-		},
-		up: function(e, cursor, new_cursor){
-		  last_event = e
-		  new_cursor.x.div(map.dimensions.a).add(0.5).mul(map.dimensions.a / map.zoom)
-		  new_cursor.y.div(map.dimensions.b).sub(0.5).mul(map.dimensions.b / map.zoom)
-			if (tool.recenterCursor) {
-        new_cursor.x.add(map.center.a)
-        new_cursor.y.sub(map.center.b)
-        base.tools[currentTool].up(e, cursor, new_cursor)
-      }
-      else {
-        base.tools[currentTool].up(e, cursor, new_cursor)
-        new_cursor.x.add(map.center.a)
-        new_cursor.y.sub(map.center.b)
-      }
-      if (nextTool) {
-        console.log('found nextTool')
-        base.set_tool(nextTool)
-        nextTool = null
-      }
-		}
-	})
-	
-	var currentTool = "polyline", nextTool, tool
-	base.add_tool = function(name, tool){
-	  base.tools[name] = tool
-	}
-	base.set_tool = function(s){
-	  console.log("set tool to", s)
-	  base.tools[currentTool].cancel()
-	  currentTool = s
-	  tool = base.tools[currentTool]
-	}
-	base.set_drag_tool = function(s){
-	  console.log('set drag tool to', s)
-	  nextTool = currentTool
-	  currentTool = s
-	  tool = base.tools[currentTool]
-    base.tools[currentTool].down(last_event, base.mouse.cursor)
-	}
-	base.tools = {}
-
-	base.wheel = new wheel({
-		el: map.el,
-		update: mousewheel,
-	})
-
-	function mousewheel (e, deltaY, deltaX){
-		map.set_zoom(map.zoom_exponent - deltaY/20)
-	}
-}
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index fa7e3c5..7e7e8ec 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -61,6 +61,8 @@ body {
 <script src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
 <script src="/assets/javascripts/mx/primitives/mx.image.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.point.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.polyline.js"></script>
 <script src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script src="/assets/javascripts/rectangles/util/mouse.js"></script>
@@ -68,8 +70,13 @@ body {
 <script src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-<script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
 
 <script>
 var app = window.app || {}
@@ -77,274 +84,13 @@ app.tube = new Tube ()
 app.on = function(){ app.tube.on.apply(app.tube, arguments) }
 app.off = function(){	app.tube.off.apply(app.tube, arguments) }
 
-var MapTool = Fiber.extend(function(base){
-	var exports = {
-	  recenterCursor: true,
-	  down: function(e, cursor){},
-	  move: function(e, cursor){},
-	  drag: function(e, cursor){},
-	  up: function(e, cursor, new_cursor){},
-	  cancel: function(){},
-  }
-  return exports
-})
-
-var ArrowTool = MapTool.extend(function(base){
+var EraserTool = MapTool.extend(function(base){
 	var exports = {}
-	
-	var selected_point = null, original_point = null, selected_shape = null
-	
 	exports.down = function(e, cursor){
-    last_point.a = cursor.x.a
-    last_point.b = cursor.y.a
-    var p = shapes.findClosestPoint(last_point)
-    if (p) {
-      selected_shape = p.shape
-      selected_point = p.point
-      original_point = selected_point.clone()
-    }
-    else {
-      map.ui.set_drag_tool("position")
-    }
-	}
-	
-  exports.move = function(e, cursor){
-    last_point.a = cursor.x.a
-    last_point.b = cursor.y.a
-    var p = shapes.findClosestPoint(last_point)
-    if (p) {
-      document.body.style.cursor = "pointer"
-      last_point.assign(p.point)
-      cursor.x.a = cursor.x.b = last_point.a
-      cursor.y.a = cursor.y.b = last_point.b
-    }
-    else {
-      document.body.style.cursor = "crosshair"
-    }
-	}
-	
-	exports.drag = function(e, cursor){
-    selected_point.a = original_point.a + cursor.x.magnitude()
-		selected_point.b = original_point.b + cursor.y.magnitude()
-		selected_shape.rebuild()
-	}
-	
-	exports.up = function(e, cursor){
-	  selected_point = selected_shape = original_point = null
-	}
-	
-	return exports
-})
-
-var PositionTool = MapTool.extend(function(base){
-	var exports = {
-	  recenterCursor: false,
-	  drag: function(e, cursor){
-      map.center.a = -cursor.x.magnitude()
-      map.center.b = cursor.y.magnitude()
-	  },
-	  rightclick: function(e, cursor){
-      cursor.quantize(1/map.zoom)
-      map.center.a = cursor.x.a
-      map.center.b = -cursor.y.a
-      cursor.x.b = cursor.x.a
-      cursor.y.b = cursor.y.a
-	  }
-  }
-  return exports
-})
-
-var PolylineTool = MapTool.extend(function (base) {
-  var exports = {}
-  exports.down = function(e, cursor){
-
-    // rightclick?
-    if (e.ctrlKey || e.which === 3) {
-      e.preventDefault()
-      e.stopPropagation()
-      if (placing) {
-        // close polyline or cancel
-        placing = false
-        if (line.points.length > 2) {
-          line.build()
-        }
-        else {
-          line.reset()
-        }
-        return
-      }
-      map.ui.tools.position.rightclick(e, cursor)
-      return
-    }
-
-    // compare to initial point
-    var p = last_point.clone()
-    if (placing) {
-      if (line.canCloseWith(p)) {
-        line.close()
-        line.build()
-        placing = false
-      }
-      else {
-        line.add(p)
-      }
-    }
-    else {
-      placing = true
-      line = new Polyline ()
-      line.add(p)
-    }
   }
   exports.move = function(e, cursor){
     last_point.a = cursor.x.a
     last_point.b = cursor.y.a
-    if (placing && line.canCloseWith(last_point)) {
-      document.body.style.cursor = "pointer"
-      last_point.assign(line.points[0])
-      cursor.x.a = cursor.x.b = last_point.a
-      cursor.y.a = cursor.y.b = last_point.b
-      return
-    }
-    var end_point = shapes.findClosestEndPoint(last_point)
-    if (end_point) {
-      document.body.style.cursor = "pointer"
-      last_point.assign(end_point.point)
-      cursor.x.a = cursor.x.b = last_point.a
-      cursor.y.a = cursor.y.b = last_point.b
-      return
-    }
-    else {
-      document.body.style.cursor = "crosshair"
-    }
-  }
-  exports.cancel = function(){
-    if (placing) { line.reset() }
-    placing = false
-  }
-  return exports
-})
-
-var OrthoPolylineTool = MapTool.extend(function (base) {
-  // this will work like normal polyline except all walls will be orthogonal
-  
-  var prev_point, horizontal = false, first_edge_is_horizontal = false
-  
-  var exports = {}
-  exports.down = function(e, cursor){
-    // rightclick?
-    if (e.ctrlKey || e.which === 3) {
-      e.preventDefault()
-      e.stopPropagation()
-      if (placing) {
-        // close polyline or cancel
-        placing = false
-        if (line.points.length > 2) {
-          line.build()
-        }
-        else {
-          line.reset()
-        }
-        return
-      }
-      else {
-        map.ui.tools.position.rightclick(e, cursor)
-      }
-      return
-    }
-
-    // compare to initial point
-    var p = last_point.clone()
-    if (placing) {
-      if (line.lastPoint().eq(p)) {
-        return
-      }
-      else if (line.canCloseWith(p)) {
-        line.close()
-        line.build()
-        placing = false
-      }
-      else {
-        line.add(p)
-        prev_point = p
-        horizontal = ! horizontal
-      }
-    }
-    else {
-      placing = true
-      line = new Polyline ()
-      line.add(p)
-      first_point = prev_point = p
-      horizontal = false
-    }
-  }
-  exports.move = function(e, cursor){
-    last_point.a = cursor.x.a
-    last_point.b = cursor.y.a
-    if (placing) {
-      if (line.points.length == 1) {
-        var x = abs(prev_point.a - last_point.a)
-        var y = abs(prev_point.b - last_point.b)
-        if (x > y) {
-          last_point.b = prev_point.b
-          first_edge_is_horizontal = horizontal = true
-        }
-        else {
-          last_point.a = prev_point.a
-          first_edge_is_horizontal = horizontal = false
-        }
-      }
-      else {
-        if (horizontal) {
-          last_point.b = prev_point.b
-        }
-        else {
-          last_point.a = prev_point.a
-        }
-        if (horizontal == first_edge_is_horizontal) {
-          // check if this point is within N pixels of the normal
-          // and lock it into place if so
-          if (horizontal && abs( first_point.a - last_point.a ) < 10/map.zoom) {
-            last_point.a = first_point.a
-          }
-          else if (! horizontal && abs( first_point.b - last_point.b ) < 10/map.zoom) {
-            last_point.b = first_point.b
-          }
-        }
-      }
-
-      if (line.canCloseWith(last_point)) {
-        document.body.style.cursor = "pointer"
-        last_point.assign(first_point)
-        cursor.x.a = cursor.x.b = last_point.a
-        cursor.y.a = cursor.y.b = last_point.b
-      }
-      return
-    }
-    var end_point = shapes.findClosestEndPoint(last_point)
-    if (end_point) {
-      document.body.style.cursor = "pointer"
-      last_point.assign(end_point.point)
-      cursor.x.a = cursor.x.b = last_point.a
-      cursor.y.a = cursor.y.b = last_point.b
-      return
-    }
-    else {
-      document.body.style.cursor = "crosshair"
-    }
-  }
-  exports.cancel = function(){
-    if (placing) { line.reset() }
-    first_point = null
-    placing = false
-  }
-  return exports
-})
-
-var EraserTool = MapTool.extend(function(base){
-	var exports = {}
-	exports.down = function(e, cursor){
-  }
-  exports.move = function(e, cursor){
     var segment = shapes.findClosestSegment(last_point)
     if (segment) {
       document.body.style.cursor = "pointer"
@@ -463,8 +209,8 @@ var Polyline = Fiber.extend(function(base){
     for (var i = 1; i < points.length; i++) {
       p1 = p2
       p2 = points[i]
-      d1 = p1.a - p2.a
-      d2 = p1.b - p2.b
+      d1 = p2.a - p1.a
+      d2 = p2.b - p1.b
       sum = d1*d1 + d2*d2
       rat = ((p.a - p1.a) * d1 + (p.b - p1.b) * d2) / sum
       rat = rat < 0 ? 0 : rat < 1 ? rat : 1
@@ -506,7 +252,7 @@ var Polyline = Fiber.extend(function(base){
         i && ctx.lineTo(point.a, point.b)
       })
       ctx.stroke()
-      if (! placing || this.closed) {
+      if (! map.ui.placing || this.closed) {
         ctx.fill()
       }
     }
@@ -540,74 +286,6 @@ var Polyline = Fiber.extend(function(base){
   return exports
 })
 
-MX.Polyline = MX.Object3D.extend({
-  init: function(polyline){
-    this.faces = []
-    this.points = polyline.points
-    for (var i = 1; i < this.points.length; i++) {
-      var mx = new MX.Object3D()
-      var head = this.points[i-1]
-      var tail = this.points[i]
-      this.move_face(mx, head, tail)
-      this.faces.push(mx)
-      scene.add(mx)
-    }
-  },
-  
-  rebuild: function(){
-    for (var i = 1; i < this.points.length; i++) {
-      var mx = this.faces[i-1]
-      var head = this.points[i-1]
-      var tail = this.points[i]
-      this.move_face(mx, head, tail)
-    }
-  },
-
-  move_face: function (mx, head, tail){
-    var mid_x = (head.a + tail.a)
-    var mid_z = (head.b + tail.b)
-    var len = head.distanceTo( tail )
-    var angle = atan2( head.b - tail.b, head.a - tail.a )
-    mx.move({
-      x: mid_x / 2,
-      y: wall_height/2 + 1,
-      z: mid_z / 2,
-      width: ceil(len),
-      height: wall_height,
-      rotationY: angle
-    })
-    var hue = abs(round( angle / PI * 90 + 300))
-    mx.el.style.backgroundColor = 'hsl(' + [hue, "100%", "50%"] + ')'
-  },
-  
-  destroy: function(){
-    this.faces.forEach(function(mx){
-      scene.remove(mx)
-    })
-    this.faces = null
-    this.points = null
-  },
-
-})
-
-MX.Point = MX.Object3D.extend({
-  init: function(p){
-    this.updateChildren = false
-    this.move({
-      x: p.a,
-      y: 11,
-      z: p.b,
-      width: 20,
-      height: 20,
-      rotationX: PI/2,
-    })
-    this.el.style.backgroundColor = 'rgb(' + [abs(floor(p.a*30)), 0, abs(floor(p.b*30))] + ')'
-    this.el.style.backfaceVisibility = "visible"
-    this.el.style.borderRadius = "50%"
-    scene.add(this)
-  }
-})
-
 
 var scene, map, controls
 
@@ -626,13 +304,14 @@ map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
 map.ui.add_tool("eraser", new EraserTool)
 map.ui.add_tool("position", new PositionTool)
 
+map.ui.placing = false
+
 $(window).resize(function(){
   scene.width = window.innerWidth/2
   map.canvas.width = map.dimensions.a = window.innerWidth/2
 })
 
 var wall_height = 180
-var placing = false
 var line
 var shapes = new ShapeList
 var ctx = map.draw.ctx
@@ -695,7 +374,8 @@ OrthographicToolbar.add("ortho-polyline-mode", function(){
 OrthographicToolbar.add("eraser-mode", function(){
   map.ui.set_tool("eraser")
 })
-OrthographicToolbar.pick("ortho-polyline-mode")
+// OrthographicToolbar.pick("ortho-polyline-mode")
+OrthographicToolbar.pick("eraser-mode")
 
 document.addEventListener('DOMContentLoaded', build)
 function build () {
@@ -749,6 +429,14 @@ function build () {
 	})
 	controls.init()
 
+  line = new Polyline ()
+  line.add( new vec2(-100,100) )
+  line.add( new vec2(100,100) )
+  line.add( new vec2(100,-100) )
+  line.add( new vec2(-100,-100) )
+  line.close()
+  line.build()
+
 	animate(0)
 }
 var last_t = 0
@@ -773,7 +461,7 @@ function animate(t){
 
   if (line) {
     line.draw(map.draw.ctx)
-    if (placing && last_point) {
+    if (map.ui.placing && last_point) {
       line.draw_line( map.draw.ctx, last_point )
     }
   }
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 6dfe912..2de32fb 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -80,8 +80,8 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_editor.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_minimap.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/editor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/minimap.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 80723a9898ad237818ac04ae47ff801919f34961 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 28 Jul 2015 13:50:27 -0400
Subject: split out modules

---
 .../rectangles/engine/map/tools/eraser.js          |  27 +++
 .../rectangles/engine/shapes/polyline.js           | 147 +++++++++++++
 .../rectangles/engine/shapes/shapelist.js          |  61 ++++++
 public/assets/test/ortho3.html                     | 243 +--------------------
 4 files changed, 238 insertions(+), 240 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/eraser.js
 create mode 100644 public/assets/javascripts/rectangles/engine/shapes/polyline.js
 create mode 100644 public/assets/javascripts/rectangles/engine/shapes/shapelist.js

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

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/eraser.js b/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
new file mode 100644
index 0000000..648cd11
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
@@ -0,0 +1,27 @@
+var EraserTool = MapTool.extend(function(base){
+	var exports = {}
+	exports.down = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    var segment = shapes.findClosestSegment(last_point)
+    if (segment) {
+      shapes.removeSegment(segment)
+    }
+  }
+  exports.move = function(e, cursor){
+    last_point.a = cursor.x.a
+    last_point.b = cursor.y.a
+    var segment = shapes.findClosestSegment(last_point)
+    if (segment) {
+      document.body.style.cursor = "pointer"
+      last_point.a = segment.x
+      last_point.b = segment.y
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
+    }
+    else {
+      document.body.style.cursor = "crosshair"
+    }
+  }
+  return exports
+})
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
new file mode 100644
index 0000000..7e3c04c
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -0,0 +1,147 @@
+var Polyline = Fiber.extend(function(base){
+	var exports = {}
+	exports.init = function(){
+    this.points = []
+    this.mx_points = []
+    this.closed = false
+	}
+	exports.add = function(p){
+    this.points.push( p )
+    this.mx_points.push( new MX.Point(p) )
+	}
+	exports.firstPoint = function(){
+	  return this.points[0]
+	}
+	exports.lastPoint = function(){
+	  return this.points[this.points.length-1]
+	}
+	exports.canCloseWith = function(p){
+    return (this.points.length > 2 && this.points[0].distanceTo( p ) < 10/map.zoom)
+	}
+	exports.getHeadAtIndex = function(index){
+	  if (index == 0) { return null }
+	  if (index == this.points.length-1) { return this.clone() }
+	  var head = new Polyline()
+	  head.points = this.points.slice(0, index+1)
+	  return head
+	}
+	exports.getTailAtIndex = function(index){
+	  if (index == this.points.length-1) { return null }
+	  if (index == 0) { return this.clone() }
+	  var tail = new Polyline()
+	  tail.points = this.points.slice(index, this.points.length)
+	  return tail
+	}
+	exports.clone = function(){
+	  var clone = new Polyline()
+	  clone.points = this.points.concat()
+	}
+	exports.hasPointNear = function(p){
+	  var point
+    for (var i = 0; i < this.points.length; i++){
+      point = this.points[i]
+      if (point.distanceTo( p ) < 10/map.zoom) {
+        return point
+      }
+    }
+    return null
+	}
+	exports.hasEndPointNear = function(p){
+	  if (this.closed) return null
+    if (this.firstPoint().distanceTo( p ) < 10/map.zoom) {
+      return this.firstPoint()
+    }
+    if (this.lastPoint().distanceTo( p ) < 10/map.zoom) {
+      return this.lastPoint()
+    }
+    return null
+	}
+	exports.hasSegmentNear = function(p, min_dist){
+    var p1, p2, d1, d2, sum, rat
+    var dx, dy, new_x, new_y, x, y, closest_distance = min_dist || Infinity
+    var closest_i = -1
+    var points = this.points
+    var p1, p2 = points[0]
+    for (var i = 1; i < points.length; i++) {
+      p1 = p2
+      p2 = points[i]
+      d1 = p2.a - p1.a
+      d2 = p2.b - p1.b
+      sum = d1*d1 + d2*d2
+      rat = ((p.a - p1.a) * d1 + (p.b - p1.b) * d2) / sum
+      rat = rat < 0 ? 0 : rat < 1 ? rat : 1
+      new_x = p1.a + rat * d1
+      new_y = p1.b + rat * d2
+      dx = new_x - p.a
+      dy = new_y - p.b
+      sum2 = sqrt(dx*dx+dy*dy)
+      if (sum2 < closest_distance) {
+        x = new_x
+        y = new_y
+        closest_distance = sum2
+        closest_i = i
+      }
+    }
+    if (closest_i == -1) return null
+    return {
+      x: x,
+      y: y,
+      distance: closest_distance,
+      head: closest_i-1,
+      tail: closest_i,
+    }
+	}
+  exports.draw = function(ctx){
+    var points = this.points
+    if (! points.length) return
+    if (points.length == 1) {
+      ctx.fillStyle = "#f80"
+      map.draw.dot_at(this.points[0].a, points[0].b, 5)
+    }
+    if (points.length > 1) {
+      ctx.fillStyle = "rgba(255,255,0,0.1)"
+      ctx.strokeStyle = "#f80"
+      ctx.lineWidth = 2 / map.zoom
+      ctx.beginPath()
+      ctx.moveTo(points[0].a, points[0].b)
+      points.forEach(function(point, i){
+        i && ctx.lineTo(point.a, point.b)
+      })
+      ctx.stroke()
+      if (! map.ui.placing || this.closed) {
+        ctx.fill()
+      }
+    }
+  }
+  exports.draw_line = function (ctx, p){
+    var last = this.points[this.points.length-1]
+    ctx.strokeStyle = "#f80"
+    ctx.lineWidth = 2 / map.zoom
+    ctx.beginPath()
+    ctx.moveTo(last.a, last.b)
+    ctx.lineTo(p.a, p.b)
+    ctx.stroke()
+  }
+  exports.close = function(){
+    this.points[this.points.length] = this.points[0]
+    this.closed = true
+  }
+  exports.build = function(){
+    this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
+    this.mx = new MX.Polyline(this)
+    shapes.add(this)
+  }
+  exports.rebuild = function(){
+    this.mx.rebuild()
+  }
+  exports.reset = function(){
+    this.mx_points.forEach(function(mx){ scene.remove(mx) })
+    this.mx_points.length = 0
+    this.points.length = 0
+  }
+	exports.destroy = function(){
+	  this.reset()
+	  this.mx && this.mx.destroy()
+	}
+  return exports
+})
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
new file mode 100644
index 0000000..00e1a4e
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -0,0 +1,61 @@
+var ShapeList = Fiber.extend(function(base){
+  var exports = {}
+  exports.init = function(){
+    this.shapes = []
+  }
+  exports.add = function(shape){
+    this.shapes.push(shape)
+  }
+  exports.remove = function(shape){
+    var index = this.shapes.indexOf(shape)
+    if (index !== -1) {
+      this.shapes.splice(index, 1)
+    }
+  }
+  exports.removeSegment = function (segment){
+    var shape = segment.shape
+    var head = shape.getHeadAtIndex(segment.head)
+    var tail = shape.getTailAtIndex(segment.tail)
+    this.remove(shape)
+    shape.destroy()
+    if (head) {
+      this.add(head)
+      head.build()
+    }
+    if (tail) {
+      this.add(tail)
+      tail.build()
+    }
+  }
+  exports.findClosestPoint = function (p){
+    var point
+    for (var i = 0; i < this.shapes.length; i++) {
+      point = this.shapes[i].hasPointNear(p)
+      if (point) return { point: point, shape: this.shapes[i] }
+    }
+    return null
+  }
+  exports.findClosestEndPoint = function (p){
+    var point
+    for (var i = 0; i < this.shapes.length; i++) {
+      point = this.shapes[i].hasEndPointNear(p)
+      if (point) return { point: point, shape: this.shapes[i] }
+    }
+    return null
+  }
+  exports.findClosestSegment = function (p){
+    var segment = null, closest_segment = null
+    for (var i = 0; i < this.shapes.length; i++) {
+      segment = this.shapes[i].hasSegmentNear(p, 10)
+      if (segment && (! closest_segment || segment.distance < closest_segment.distance)) {
+        closest_segment = segment
+        closest_segment.shape = this.shapes[i]
+      }
+    }
+    return closest_segment
+  }
+  exports.forEach = function(fn){
+    this.shapes.forEach(fn)
+  }
+  return exports
+})
\ No newline at end of file
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index f56c73f..ef5732c 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -74,9 +74,12 @@ body {
 <script src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/eraser.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
+<script src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
+<script src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
 
 <script>
 var app = window.app || {}
@@ -84,246 +87,6 @@ app.tube = new Tube ()
 app.on = function(){ app.tube.on.apply(app.tube, arguments) }
 app.off = function(){	app.tube.off.apply(app.tube, arguments) }
 
-var EraserTool = MapTool.extend(function(base){
-	var exports = {}
-	exports.down = function(e, cursor){
-    last_point.a = cursor.x.a
-    last_point.b = cursor.y.a
-    var segment = shapes.findClosestSegment(last_point)
-    if (segment) {
-      shapes.removeSegment(segment)
-    }
-  }
-  exports.move = function(e, cursor){
-    last_point.a = cursor.x.a
-    last_point.b = cursor.y.a
-    var segment = shapes.findClosestSegment(last_point)
-    if (segment) {
-      document.body.style.cursor = "pointer"
-      last_point.a = segment.x
-      last_point.b = segment.y
-      cursor.x.a = cursor.x.b = last_point.a
-      cursor.y.a = cursor.y.b = last_point.b
-    }
-    else {
-      document.body.style.cursor = "crosshair"
-    }
-  }
-  return exports
-})
-
-var ShapeList = Fiber.extend(function(base){
-  var exports = {}
-  exports.init = function(){
-    this.shapes = []
-  }
-  exports.add = function(shape){
-    this.shapes.push(shape)
-  }
-  exports.remove = function(shape){
-    var index = this.shapes.indexOf(shape)
-    if (index !== -1) {
-      this.shapes.splice(index, 1)
-    }
-  }
-  exports.removeSegment = function (segment){
-    var shape = segment.shape
-    var head = shape.getHeadAtIndex(segment.head)
-    var tail = shape.getTailAtIndex(segment.tail)
-    this.remove(shape)
-    shape.destroy()
-    if (head) {
-      this.add(head)
-      head.build()
-    }
-    if (tail) {
-      this.add(tail)
-      tail.build()
-    }
-  }
-  exports.findClosestPoint = function (p){
-    var point
-    for (var i = 0; i < this.shapes.length; i++) {
-      point = this.shapes[i].hasPointNear(p)
-      if (point) return { point: point, shape: this.shapes[i] }
-    }
-    return null
-  }
-  exports.findClosestEndPoint = function (p){
-    var point
-    for (var i = 0; i < this.shapes.length; i++) {
-      point = this.shapes[i].hasEndPointNear(p)
-      if (point) return { point: point, shape: this.shapes[i] }
-    }
-    return null
-  }
-  exports.findClosestSegment = function (p){
-    var segment = null, closest_segment = null
-    for (var i = 0; i < this.shapes.length; i++) {
-      segment = this.shapes[i].hasSegmentNear(p, 10)
-      if (segment && (! closest_segment || segment.distance < closest_segment.distance)) {
-        closest_segment = segment
-        closest_segment.shape = this.shapes[i]
-      }
-    }
-    return closest_segment
-  }
-  exports.forEach = function(fn){
-    this.shapes.forEach(fn)
-  }
-  return exports
-})
-
-var Polyline = Fiber.extend(function(base){
-	var exports = {}
-	exports.init = function(){
-    this.points = []
-    this.mx_points = []
-    this.closed = false
-	}
-	exports.add = function(p){
-    this.points.push( p )
-    this.mx_points.push( new MX.Point(p) )
-	}
-	exports.firstPoint = function(){
-	  return this.points[0]
-	}
-	exports.lastPoint = function(){
-	  return this.points[this.points.length-1]
-	}
-	exports.canCloseWith = function(p){
-    return (this.points.length > 2 && this.points[0].distanceTo( p ) < 10/map.zoom)
-	}
-	exports.getHeadAtIndex = function(index){
-	  if (index == 0) { return null }
-	  if (index == this.points.length-1) { return this.clone() }
-	  var head = new Polyline()
-	  head.points = this.points.slice(0, index+1)
-	  return head
-	}
-	exports.getTailAtIndex = function(index){
-	  if (index == this.points.length-1) { return null }
-	  if (index == 0) { return this.clone() }
-	  var tail = new Polyline()
-	  tail.points = this.points.slice(index, this.points.length)
-	  return tail
-	}
-	exports.clone = function(){
-	  var clone = new Polyline()
-	  clone.points = this.points.concat()
-	}
-	exports.hasPointNear = function(p){
-	  var point
-    for (var i = 0; i < this.points.length; i++){
-      point = this.points[i]
-      if (point.distanceTo( p ) < 10/map.zoom) {
-        return point
-      }
-    }
-    return null
-	}
-	exports.hasEndPointNear = function(p){
-	  if (this.closed) return null
-    if (this.firstPoint().distanceTo( p ) < 10/map.zoom) {
-      return this.firstPoint()
-    }
-    if (this.lastPoint().distanceTo( p ) < 10/map.zoom) {
-      return this.lastPoint()
-    }
-    return null
-	}
-	exports.hasSegmentNear = function(p, min_dist){
-    var p1, p2, d1, d2, sum, rat
-    var dx, dy, new_x, new_y, x, y, closest_distance = min_dist || Infinity
-    var closest_i = -1
-    var points = this.points
-    var p1, p2 = points[0]
-    for (var i = 1; i < points.length; i++) {
-      p1 = p2
-      p2 = points[i]
-      d1 = p2.a - p1.a
-      d2 = p2.b - p1.b
-      sum = d1*d1 + d2*d2
-      rat = ((p.a - p1.a) * d1 + (p.b - p1.b) * d2) / sum
-      rat = rat < 0 ? 0 : rat < 1 ? rat : 1
-      new_x = p1.a + rat * d1
-      new_y = p1.b + rat * d2
-      dx = new_x - p.a
-      dy = new_y - p.b
-      sum2 = sqrt(dx*dx+dy*dy)
-      if (sum2 < closest_distance) {
-        x = new_x
-        y = new_y
-        closest_distance = sum2
-        closest_i = i
-      }
-    }
-    if (closest_i == -1) return null
-    return {
-      x: x,
-      y: y,
-      distance: closest_distance,
-      head: closest_i-1,
-      tail: closest_i,
-    }
-	}
-  exports.draw = function(ctx){
-    var points = this.points
-    if (! points.length) return
-    if (points.length == 1) {
-      ctx.fillStyle = "#f80"
-      map.draw.dot_at(this.points[0].a, points[0].b, 5)
-    }
-    if (points.length > 1) {
-      ctx.fillStyle = "rgba(255,255,0,0.1)"
-      ctx.strokeStyle = "#f80"
-      ctx.lineWidth = 2 / map.zoom
-      ctx.beginPath()
-      ctx.moveTo(points[0].a, points[0].b)
-      points.forEach(function(point, i){
-        i && ctx.lineTo(point.a, point.b)
-      })
-      ctx.stroke()
-      if (! map.ui.placing || this.closed) {
-        ctx.fill()
-      }
-    }
-  }
-  exports.draw_line = function (ctx, p){
-    var last = this.points[this.points.length-1]
-    ctx.strokeStyle = "#f80"
-    ctx.lineWidth = 2 / map.zoom
-    ctx.beginPath()
-    ctx.moveTo(last.a, last.b)
-    ctx.lineTo(p.a, p.b)
-    ctx.stroke()
-  }
-  exports.close = function(){
-    this.points[this.points.length] = this.points[0]
-    this.closed = true
-  }
-  exports.build = function(){
-    this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
-    this.mx = new MX.Polyline(this)
-    shapes.add(this)
-  }
-  exports.rebuild = function(){
-    this.mx.rebuild()
-  }
-  exports.reset = function(){
-    this.mx_points.forEach(function(mx){ scene.remove(mx) })
-    this.mx_points.length = 0
-    this.points.length = 0
-  }
-	exports.destroy = function(){
-	  this.reset()
-	  this.mx && this.mx.destroy()
-	}
-  return exports
-})
-
-
-
 var scene, map, controls
 
 map = new Map ({
-- 
cgit v1.2.3-70-g09d2


From 71c3a4a02c7c46533aec836ef30a0d0ffa96399b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Aug 2015 18:20:22 -0400
Subject: layout stuff

---
 .../javascripts/mx/extensions/mx.movements.js      |   6 +-
 .../assets/javascripts/mx/primitives/mx.image.js   |   3 +-
 .../rectangles/engine/map/tools/ortho.js           |  26 +-
 .../rectangles/engine/map/tools/polyline.js        |  24 +-
 .../rectangles/engine/shapes/shapelist.js          |   1 +
 public/assets/javascripts/ui/lib/Toolbar.js        |  22 ++
 public/assets/javascripts/ui/site/StaffView.js     |  26 +-
 public/assets/test/ortho3.html                     |  38 +--
 public/assets/test/ortho4.html                     | 261 +++++++++++++++++++++
 server/lib/middleware.js                           |   2 +-
 server/lib/schemas/Media.js                        |   1 +
 server/lib/views/staff.js                          |   3 +-
 views/staff/_layouts.ejs                           |   2 +-
 views/staff/layouts/show.ejs                       |   4 +-
 14 files changed, 352 insertions(+), 67 deletions(-)
 create mode 100644 public/assets/javascripts/ui/lib/Toolbar.js
 create mode 100644 public/assets/test/ortho4.html

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index fa59908..9ed8790 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -162,13 +162,13 @@ MX.Movements = function (cam) {
 				
 				case 8: // backspace
 				  e.preventDefault()
-          if (app.controller.sculptureEditor.sculpture) {
+          if (app.controller.sculptureEditor && app.controller.sculptureEditor.sculpture) {
             app.controller.sculptureEditor.sculpture.remove()
           }
-          else if (app.controller.mediaEditor.scenery) {
+          else if (app.controller.mediaEditor && app.controller.mediaEditor.scenery) {
             app.controller.mediaEditor.scenery.remove()
           }
-          else if (app.controller.textEditor.scenery) {
+          else if (app.controller.textEditor && app.controller.textEditor.scenery) {
             app.controller.textEditor.scenery.remove()
           }
 			}
diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index 64de4b2..f9de141 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -17,7 +17,7 @@ MX.Image = MX.Object3D.extend({
 
 		this.el.style.backgroundRepeat = 'no-repeat'
 		
-		this.load(ops)
+		ops.src && this.load(ops)
   },
 
   load: function(ops){
@@ -64,7 +64,6 @@ MX.Image = MX.Object3D.extend({
     if (recenter) {
       ctx.restore()
     }
-
   },
 
 })
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index be3d707..ef41096 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -12,11 +12,11 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
       if (map.ui.placing) {
         // close polyline or cancel
         map.ui.placing = false
-        if (line.points.length > 2) {
-          line.build()
+        if (shapes.workline.points.length > 2) {
+          shapes.workline.build()
         }
         else {
-          line.reset()
+          shapes.workline.reset()
         }
         return
       }
@@ -29,24 +29,24 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
     // compare to initial point
     var p = last_point.clone()
     if (map.ui.placing) {
-      if (line.lastPoint().eq(p)) {
+      if (shapes.workline.lastPoint().eq(p)) {
         return
       }
-      else if (line.canCloseWith(p)) {
-        line.close()
-        line.build()
+      else if (shapes.workline.canCloseWith(p)) {
+        shapes.workline.close()
+        shapes.workline.build()
         map.ui.placing = false
       }
       else {
-        line.add(p)
+        shapes.workline.add(p)
         prev_point = p
         horizontal = ! horizontal
       }
     }
     else {
       map.ui.placing = true
-      line = new Polyline ()
-      line.add(p)
+      shapes.workline = new Polyline ()
+      shapes.workline.add(p)
       first_point = prev_point = p
       horizontal = false
     }
@@ -55,7 +55,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
     last_point.a = cursor.x.a
     last_point.b = cursor.y.a
     if (map.ui.placing) {
-      if (line.points.length == 1) {
+      if (shapes.workline.points.length == 1) {
         var x = abs(prev_point.a - last_point.a)
         var y = abs(prev_point.b - last_point.b)
         if (x > y) {
@@ -86,7 +86,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
         }
       }
 
-      if (line.canCloseWith(last_point)) {
+      if (shapes.workline.canCloseWith(last_point)) {
         document.body.style.cursor = "pointer"
         last_point.assign(first_point)
         cursor.x.a = cursor.x.b = last_point.a
@@ -107,7 +107,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
     }
   }
   exports.cancel = function(){
-    if (map.ui.placing) { line.reset() }
+    if (map.ui.placing) { shapes.workline.reset() }
     first_point = null
     map.ui.placing = false
   }
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
index 559aea8..1ab86f6 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -9,11 +9,11 @@ var PolylineTool = MapTool.extend(function (base) {
       if (map.ui.placing) {
         // close polyline or cancel
         map.ui.placing = false
-        if (line.points.length > 2) {
-          line.build()
+        if (shapes.workline.points.length > 2) {
+          shapes.workline.build()
         }
         else {
-          line.reset()
+          shapes.workline.reset()
         }
         return
       }
@@ -24,27 +24,27 @@ var PolylineTool = MapTool.extend(function (base) {
     // compare to initial point
     var p = last_point.clone()
     if (map.ui.placing) {
-      if (line.canCloseWith(p)) {
-        line.close()
-        line.build()
+      if (shapes.workline.canCloseWith(p)) {
+        shapes.workline.close()
+        shapes.workline.build()
         map.ui.placing = false
       }
       else {
-        line.add(p)
+        shapes.workline.add(p)
       }
     }
     else {
       map.ui.placing = true
-      line = new Polyline ()
-      line.add(p)
+      shapes.workline = new Polyline ()
+      shapes.workline.add(p)
     }
   }
   exports.move = function(e, cursor){
     last_point.a = cursor.x.a
     last_point.b = cursor.y.a
-    if (map.ui.placing && line.canCloseWith(last_point)) {
+    if (map.ui.placing && shapes.workline.canCloseWith(last_point)) {
       document.body.style.cursor = "pointer"
-      last_point.assign(line.points[0])
+      last_point.assign(shapes.workline.points[0])
       cursor.x.a = cursor.x.b = last_point.a
       cursor.y.a = cursor.y.b = last_point.b
       return
@@ -62,7 +62,7 @@ var PolylineTool = MapTool.extend(function (base) {
     }
   }
   exports.cancel = function(){
-    if (map.ui.placing) { line.reset() }
+    if (map.ui.placing) { shapes.workline.reset() }
     map.ui.placing = false
   }
   return exports
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 00e1a4e..932ce36 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -2,6 +2,7 @@ var ShapeList = Fiber.extend(function(base){
   var exports = {}
   exports.init = function(){
     this.shapes = []
+    this.workline = null
   }
   exports.add = function(shape){
     this.shapes.push(shape)
diff --git a/public/assets/javascripts/ui/lib/Toolbar.js b/public/assets/javascripts/ui/lib/Toolbar.js
new file mode 100644
index 0000000..a9ce51c
--- /dev/null
+++ b/public/assets/javascripts/ui/lib/Toolbar.js
@@ -0,0 +1,22 @@
+var Toolbar = Fiber.extend(function(base){
+  var exports = {}
+  exports.init = function(rapper){
+    this.rapper = (typeof rapper == "string") ? $(rapper)[0] : rapper
+    this.tools = {}
+    this.els = {}
+  }
+  exports.add = function(role, fn){
+    var self = this
+    this.tools[role] = fn
+    this.els[role] = $("[data-role=" + role + "]", self.rapper)
+    this.els[role].click(function(){
+      $(".active", self.rapper).removeClass('active')
+      $(this).addClass('active')
+      fn()
+    })
+  }
+  exports.pick = function(role){
+    this.els[role].trigger("click")
+  }
+  return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/site/StaffView.js b/public/assets/javascripts/ui/site/StaffView.js
index 0398f71..59649e3 100644
--- a/public/assets/javascripts/ui/site/StaffView.js
+++ b/public/assets/javascripts/ui/site/StaffView.js
@@ -4,11 +4,13 @@ var StaffView = View.extend({
   events: {
     "click #toggle-staff": "toggleStaff",
     "click #toggle-featured": "toggleFeatured",
+    "click #toggle-stock": "toggleStock",
   },
 
 	initialize: function() {
 		this.$toggleStaff = $("#toggle-staff")
 		this.$toggleFeatured = $("#toggle-featured")
+		this.$toggleStock = $("#toggle-stock")
 		this.$mediaEmbed = $("#media-embed")
     if (this.$toggleStaff.length && this.$toggleStaff.data().isstaff) {
       this.$toggleStaff.html("Is Staff")
@@ -16,6 +18,9 @@ var StaffView = View.extend({
     if (this.$toggleFeatured.length && this.$toggleFeatured.data().featured) {
       this.$toggleFeatured.html("Featured Project")
     }
+    if (this.$toggleStock.length && this.$toggleStock.data().stock) {
+      this.$toggleStock.html("Layout is Stock")
+    }
     if (this.$mediaEmbed.length) {
       var media = this.$mediaEmbed.data()
       this.$mediaEmbed.html( Parser.tag( media ) )
@@ -67,6 +72,25 @@ var StaffView = View.extend({
         $("#isFeaturedProject").html(data.state ? "yes" : "no")
       }.bind(this)
     })
-  },	
+  },
+
+  toggleStock: function(){
+  console.log("stock")
+    var state = ! this.$toggleStock.data().stock
+    $.ajax({
+      type: "put",
+      dataType: "json",
+      url: window.location.href + "/stock",
+      data: {
+        state: state,
+        _csrf: $("#_csrf").val(),
+      },
+      success: function(data){
+        this.$toggleStock.data("stock", data.state)
+        this.$toggleStock.html(data.state ? "Stock Layout" : "Make this layout Stock")
+        $("#isStockLayout").html(data.state ? "yes" : "no")
+      }.bind(this)
+    })
+  },
 
 })
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html
index ef5732c..f41a0ba 100644
--- a/public/assets/test/ortho3.html
+++ b/public/assets/test/ortho3.html
@@ -80,6 +80,7 @@ body {
 <script src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
 <script src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
 <script src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+<script src="/assets/javascripts/ui/lib/Toolbar.js"></script>
 
 <script>
 var app = window.app || {}
@@ -112,7 +113,6 @@ $(window).resize(function(){
 })
 
 var wall_height = 180
-var line
 var shapes = new ShapeList
 var ctx = map.draw.ctx
 var last_point = new vec2 (0,0)
@@ -121,30 +121,6 @@ $("#url").on("input", function(){
   floorplan.load({ src: this.value })
 })
 
-
-var Toolbar = Fiber.extend(function(base){
-  var exports = {}
-  exports.init = function(rapper){
-    this.rapper = (typeof rapper == "string") ? $(rapper)[0] : rapper
-    this.tools = {}
-    this.els = {}
-  }
-  exports.add = function(role, fn){
-    var self = this
-    this.tools[role] = fn
-    this.els[role] = $("[data-role=" + role + "]", self.rapper)
-    this.els[role].click(function(){
-      $(".active", self.rapper).removeClass('active')
-      $(this).addClass('active')
-      fn()
-    })
-  }
-  exports.pick = function(role){
-    this.els[role].trigger("click")
-  }
-  return exports
-})
-
 var PerspectiveToolbar = new Toolbar (".persp-hud")
 PerspectiveToolbar.add("orbit-mode", function(){
   controls.toggle(true)
@@ -174,8 +150,8 @@ OrthographicToolbar.add("ortho-polyline-mode", function(){
 OrthographicToolbar.add("eraser-mode", function(){
   map.ui.set_tool("eraser")
 })
-// OrthographicToolbar.pick("ortho-polyline-mode")
-OrthographicToolbar.pick("eraser-mode")
+OrthographicToolbar.pick("ortho-polyline-mode")
+// OrthographicToolbar.pick("eraser-mode")
 
 
 document.addEventListener('DOMContentLoaded', build)
@@ -230,7 +206,7 @@ function build () {
 	})
 	controls.init()
 
-  line = new Polyline ()
+  var line = new Polyline ()
   line.add( new vec2(-100,100) )
   line.add( new vec2(100,100) )
   line.add( new vec2(100,-100) )
@@ -260,10 +236,10 @@ function animate(t){
 
 	map.draw.coords()
 
-  if (line) {
-    line.draw(map.draw.ctx)
+  if (shapes.workline) {
+    shapes.workline.draw(map.draw.ctx)
     if (map.ui.placing && last_point) {
-      line.draw_line( map.draw.ctx, last_point )
+      shapes.workline.draw_line( map.draw.ctx, last_point )
     }
   }
 
diff --git a/public/assets/test/ortho4.html b/public/assets/test/ortho4.html
new file mode 100644
index 0000000..b434efb
--- /dev/null
+++ b/public/assets/test/ortho4.html
@@ -0,0 +1,261 @@
+<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	font-family: Menlo, monospace;
+	overflow: hidden;
+}
+#perspective {
+	position: absolute;
+	left:0%;
+	top:0px
+}
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+.hud {
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 10px;
+  background: white;
+}
+.ortho-hud {
+  left: 50%;
+  border-left: 1px solid black;
+}
+#url { width: 300px }
+.hud span { color: #888; cursor: pointer; }
+.hud span.active { color: #000; }
+</style>
+
+<div id="perspective"></div>
+<div id="orthographic"></div>
+
+<div class="hud persp-hud">
+  <input type="text" id="url" placeholder="paste an image URL here!">
+  <span class="ion-ionic active" data-role="orbit-mode"></span>
+  <span class="ion-archive" data-role="keyboard-mode"></span>
+</div>
+
+<div class="hud ortho-hud">
+  <span class="ion-navigate" data-role="arrow-mode"></span>
+  <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
+  <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
+  <span class="ion-scissors" data-role="eraser-mode"></span>
+</div>
+
+<div class="mediaDrawer fixed animate blueprintUpload">
+	<span class="close">X</span>
+	<div class="box">
+		
+    <h2>Upload A Room Image</h2>
+
+	</div>
+</div>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/defaults.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<script src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script src="/assets/javascripts/vendor/polyfill.js"></script>
+<script src="/assets/javascripts/vendor/tube.js"></script>
+<script src="/assets/javascripts/mx/mx.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+<script src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.image.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.point.js"></script>
+<script src="/assets/javascripts/mx/primitives/mx.polyline.js"></script>
+<script src="/assets/javascripts/rectangles/util/constants.js"></script>
+<script src="/assets/javascripts/rectangles/util/coords.js"></script>
+<script src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script src="/assets/javascripts/rectangles/util/wheel.js"></script>
+<script src="/assets/javascripts/rectangles/models/vec2.js"></script>
+<script src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/eraser.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
+<script src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
+<script src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+<script src="/assets/javascripts/ui/lib/View.js"></script>
+<script src="/assets/javascripts/ui/lib/ModalView.js"></script>
+<script src="/assets/javascripts/ui/lib/Parser.js"></script>
+<script src="/assets/javascripts/ui/lib/Toolbar.js"></script>
+
+<script>
+var app = window.app || {}
+app.tube = new Tube ()
+app.on = function(){ app.tube.on.apply(app.tube, arguments) }
+app.off = function(){	app.tube.off.apply(app.tube, arguments) }
+
+var scene, map, controls
+
+map = new Map ({
+	type: "ortho",
+	el: document.querySelector("#orthographic"),
+	width: window.innerWidth/2,
+	height: window.innerHeight,
+	zoom: -2,
+  zoom_min: -6.2,
+  zoom_max: 1,
+})
+map.ui.add_tool("arrow", new ArrowTool)
+map.ui.add_tool("polyline", new PolylineTool)
+map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
+map.ui.add_tool("eraser", new EraserTool)
+map.ui.add_tool("position", new PositionTool)
+
+map.ui.placing = false
+
+$(window).resize(function(){
+  scene.width = window.innerWidth/2
+  map.canvas.width = map.dimensions.a = window.innerWidth/2
+})
+
+var wall_height = 180
+var shapes = new ShapeList
+var ctx = map.draw.ctx
+var last_point = new vec2 (0,0)
+
+$("#url").on("input", function(){
+  floorplan.load({ src: this.value })
+})
+
+var PerspectiveToolbar = new Toolbar (".persp-hud")
+PerspectiveToolbar.add("orbit-mode", function(){
+  controls.toggle(true)
+  movements.lock()
+})
+PerspectiveToolbar.add("keyboard-mode", function(){
+  controls.toggle(false)
+  movements.unlock()
+  movements.gravity(true)
+  cam.rotationX = 0
+  cam.rotationY = -cam.rotationY
+  cam.x = 0
+  cam.y = viewHeight + 100
+  cam.z = 0
+})
+
+var OrthographicToolbar = new Toolbar (".ortho-hud")
+OrthographicToolbar.add("arrow-mode", function(){
+  map.ui.set_tool("arrow")
+})
+OrthographicToolbar.add("polyline-mode", function(){
+  map.ui.set_tool("polyline")
+})
+OrthographicToolbar.add("ortho-polyline-mode", function(){
+  map.ui.set_tool("ortho-polyline")
+})
+OrthographicToolbar.add("eraser-mode", function(){
+  map.ui.set_tool("eraser")
+})
+OrthographicToolbar.pick("ortho-polyline-mode")
+
+
+document.addEventListener('DOMContentLoaded', build)
+function build () {
+	scene = new MX.Scene().addTo("#perspective")
+	scene.camera.radius = 20
+
+  viewHeight = 100
+
+	scene.width = window.innerWidth/2
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+	
+	cam = scene.camera
+	movements = new MX.Movements(cam, viewHeight)
+	movements.init()
+	movements.lock()
+	movements.velocity(8)
+	app.on("move", function(pos){
+	  cam.x = pos.x
+	  cam.y = pos.y
+	  cam.z = pos.z
+	})
+
+  floorplan = new MX.Image({
+    src: "https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg",
+    keepImage: true,
+    rotationX: -PI/2,
+    rotationY: PI,
+  })
+  scene.add(floorplan)
+  
+  // recenter perspective view by rightclicking map
+  floorplan.el.addEventListener("contextmenu", function(e){
+    e.preventDefault()
+    var offset = offsetFromPoint(e, this)
+    var x = (offset.left - 0.5) * floorplan.width * floorplan.scale
+    var z = (offset.top - 0.5) * floorplan.height * floorplan.scale
+    controls.opt.center.x = -x
+    controls.opt.center.y = 0
+    controls.opt.center.z = -z
+  }, true)
+
+	scene.update()
+
+	controls = new MX.OrbitCamera({
+	  el: scene.el,
+	  radius: 3000,
+	  radiusRange: [ 10, 10000 ],
+	  rotationX: PI/4,
+	  rotationY: PI/2,
+	})
+	controls.init()
+
+	animate(0)
+}
+var last_t = 0
+function animate(t){
+  requestAnimationFrame(animate)
+
+  var dt = t - last_t
+  last_t = t
+
+  map.update(t)
+
+  movements.update(dt)
+	controls.update()
+  scene.update()
+
+	map.draw.ctx.save()
+	map.draw.translate()
+
+  floorplan.draw(map.draw.ctx, true)
+
+	map.draw.coords()
+
+  if (shapes.workline) {
+    shapes.workline.draw(map.draw.ctx)
+    if (map.ui.placing && last_point) {
+      shapes.workline.draw_line( map.draw.ctx, last_point )
+    }
+  }
+
+  shapes.forEach(function(shape){
+    shape.draw(map.draw.ctx)
+  })
+
+  ctx.strokeStyle = "#f00";
+  map.draw.x_at(0,0)
+	map.draw.mouse(map.ui.mouse.cursor)
+	map.draw.camera(scene.camera)
+
+	map.draw.ctx.restore()
+}
+
+</script>
\ No newline at end of file
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 94c4acd..04cb330 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -114,7 +114,7 @@ var middleware = {
 					console.error(err)
 					req.layout = null
 				}
-				else if (! project) {
+				else if (! layout) {
 					req.layout = null
 				}
 				else {
diff --git a/server/lib/schemas/Media.js b/server/lib/schemas/Media.js
index 8247467..f37fb12 100644
--- a/server/lib/schemas/Media.js
+++ b/server/lib/schemas/Media.js
@@ -42,6 +42,7 @@ var MediaSchema = new mongoose.Schema({
 	mute: { type: Boolean, default: false },
 	keyframe: { type: Number, default: 0.0 },
 	tag: { type: String, default: "" },
+	scale: { type: Number, default: 1.0 },
 	
 	widthDimension: { type: Number },
 	heightDimension: { type: Number },
diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index a3d5bea..43330e2 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -6,6 +6,7 @@ var User = require('../schemas/User'),
 	Collaborator = require('../schemas/Collaborator'),
 	Plan = require('../schemas/Plan'),
 	Subscription = require('../schemas/Subscription'),
+	Layout = require('../schemas/Layout'),
 	config = require('../../../config'),
 	middleware = require('../middleware'),
 	util = require('../util'),
@@ -821,7 +822,7 @@ var staff = module.exports = {
     make_stock: function(req, res){
       res.locals.layout.is_stock = req.body.state == "true"
       res.locals.layout.save(function(err, layout){
-        res.json({ state: layout.featured })
+        res.json({ state: layout.is_stock })
       })
     },
   },
diff --git a/views/staff/_layouts.ejs b/views/staff/_layouts.ejs
index 3f3e6b2..d97883b 100644
--- a/views/staff/_layouts.ejs
+++ b/views/staff/_layouts.ejs
@@ -1,5 +1,5 @@
 <table id="users">
-[[ layouts.forEach(function(project){ ]]
+[[ layouts.forEach(function(layout){ ]]
   <tr>
     <td>
       <a href="/staff/layouts/[[- layout.slug ]]">[[- layout.name ]]</a>
diff --git a/views/staff/layouts/show.ejs b/views/staff/layouts/show.ejs
index 0a2014b..b66449f 100644
--- a/views/staff/layouts/show.ejs
+++ b/views/staff/layouts/show.ejs
@@ -45,14 +45,14 @@
         featured?
       </th>
       <td id="isStockLayout">
-        [[- layout.plan_type == 0 ? "yes" : "no" ]]
+        [[- layout.is_stock ? "yes" : "no" ]]
       </td>
     </tr>
   </table>
 
   <br><br>
   <div id="actions">
-    <button id="toggle-stock" data-stock="[[- !! (layout.plan_type == 0) ]]">Make this layout Stock</button>
+    <button id="toggle-stock" data-stock="[[- !! (layout.is_stock) ]]">Make this layout Stock</button>
   </div>
   
   <br>
-- 
cgit v1.2.3-70-g09d2


From e61e94f5d2f570f0cba3a3f7d91a18d8db524d79 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Aug 2015 20:42:19 -0400
Subject: blueprint upload stuff

---
 .../javascripts/rectangles/engine/map/_map.js      |   2 +-
 .../javascripts/ui/builder/BlueprintUpload.js      | 120 +++++++++++++++++++++
 public/assets/stylesheets/app.css                  |   3 +-
 public/assets/test/ortho4.html                     |  43 +++++++-
 4 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 public/assets/javascripts/ui/builder/BlueprintUpload.js

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index bf646bb..e3d7621 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -44,7 +44,7 @@ var Map = function(opt){
 	var canvas = base.canvas = document.createElement("canvas")
 	canvas.width = base.dimensions.a
 	canvas.height = base.dimensions.b
-	
+
 	base.el.appendChild(canvas)
 	
 	switch (opt.type) {
diff --git a/public/assets/javascripts/ui/builder/BlueprintUpload.js b/public/assets/javascripts/ui/builder/BlueprintUpload.js
new file mode 100644
index 0000000..dbc6f12
--- /dev/null
+++ b/public/assets/javascripts/ui/builder/BlueprintUpload.js
@@ -0,0 +1,120 @@
+
+var BlueprintUpload = UploadView.extend({
+	el: ".blueprintUpload",
+	
+	mediaTag: "blueprint",
+	createAction: "/api/media/new",
+	uploadAction: "/api/media/upload",
+	listAction: "/api/media/user",
+	destroyAction: "/api/media/destroy",
+
+	events: {
+		"mousedown": 'stopPropagation',
+    "change .url": "enterUrl",
+    "keydown .url": "enterSetUrl",
+    
+    "click .blueprint": "choose",
+    "change [name=blueprint-dimensions]": "changeDimensions",
+    "change [name=blueprint-units]": "changeUnits",
+    "click #saveBlueprint": "save",
+  },
+	
+	initialize: function(opt){
+	  this.parent = opt.parent
+	  this.__super__.initialize.call(this)
+
+    this.$url = this.$(".url")
+
+    this.$blueprintMap = this.$("#blueprintMap")
+    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+    this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$units = this.$("[name=blueprint-units]")
+    this.$save = this.$("#saveBlueprint")
+    
+    this.map = new Map ({ type: ortho })
+    
+    this.load()
+	},
+	
+  loaded: false,
+	load: function(){
+		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
+	},
+
+	populate: function(data){
+		this.loaded = true
+		if (data && data.length) {
+		  data.forEach(this.append.bind(this))
+		  this.$(".txt").hide()
+		}
+		else {
+		  this.$(".txt").show()
+		}
+	},
+	
+	append: function(media){
+	  var $el = $("<div>")
+	  $el.data("id", media._id)
+	  $el.addClass("blueprint")
+	  this.$blueprints.append($el)
+	},
+	
+	pick: function(e){
+	  var $el = $(e.currentTarget)
+	  // load map with it
+	},
+  
+	destroy: function(_id, cb){
+		$.ajax({
+			type: "delete",
+			url: this.destroyAction,
+			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
+		}).complete(cb || function(){})
+	},
+	
+	show: function(){
+    this.toggle(true)
+	},
+	hide: function(){
+		this.toggle(false)
+	},
+	toggle: function (state) {
+    this.$el.toggleClass("active", state)
+	},
+
+	addUrl: function (url){
+		Parser.loadImage(url, function(media){
+			if (! media) return
+			media._csrf = $("[name=_csrf]").val()
+			media.tag = this.mediaTag
+			
+			var request = $.ajax({
+				type: "post",
+				url: this.createAction,
+				data: media,
+			})
+			request.done(this.add.bind(this))
+			
+		}.bind(this))
+	},
+  enterUrl: function(){
+  	var url = this.$url.sanitize()
+  	this.addUrl(url)
+  	this.$url.val("")
+  },
+	enterSetUrl: function (e) {
+		e.stopPropagation()
+		if (e.keyCode == 13) {
+			setTimeout(this.enterUrl.bind(this), 100)
+		}
+	},
+	
+	add: function(media){
+	  this.append(media)
+	},
+	changeDimensions: function(){
+	},
+	changeUnits: function(){
+	},
+
+})
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 56c65fe..bb32500 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1597,7 +1597,8 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 .mediaDrawer.signin, .mediaDrawer.signup,
 .mediaDrawer.alert, .mediaDrawer.confirm,
 .mediaDrawer.passwordForgot, .mediaDrawer.passwordReset, .mediaDrawer.usernameTaken,
-.mediaDrawer.layouts, .mediaDrawer.projects, .mediaDrawer.newProject {
+.mediaDrawer.layouts, .mediaDrawer.projects, .mediaDrawer.newProject,
+.mediaDrawer.blueprintUpload {
     display:table;
 }
 .confirm button {
diff --git a/public/assets/test/ortho4.html b/public/assets/test/ortho4.html
index b434efb..12b6ab2 100644
--- a/public/assets/test/ortho4.html
+++ b/public/assets/test/ortho4.html
@@ -1,15 +1,19 @@
+<link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'>
 <link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
 <style type="text/css">
 html,body{width:100%;height:100%;margin:0;padding:0;}
 body {
-	font-family: Menlo, monospace;
 	overflow: hidden;
 }
-#perspective {
+#perspective,
+#perspective .mx-scene {
 	position: absolute;
 	left:0%;
-	top:0px
+	top:0px;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
 }
+
 #orthographic {
 	position: absolute;
 	left:50%;
@@ -29,6 +33,10 @@ body {
 #url { width: 300px }
 .hud span { color: #888; cursor: pointer; }
 .hud span.active { color: #000; }
+
+#blueprintForm {
+  width: 240px;
+}
 </style>
 
 <div id="perspective"></div>
@@ -47,11 +55,38 @@ body {
   <span class="ion-scissors" data-role="eraser-mode"></span>
 </div>
 
-<div class="mediaDrawer fixed animate blueprintUpload">
+<div class="mediaDrawer fixed animate blueprintUpload active">
 	<span class="close">X</span>
 	<div class="box">
 		
     <h2>Upload A Room Image</h2>
+    
+    <div id="blueprintForm">
+      <div class="wallpaperUpload toolButton">
+        <form>
+          <span class="ion-ios-upload-outline upload-icon"></span>
+          <label>Upload</label>
+          <input type="file" accept="image/*" multiple>
+        </form>
+      </div>
+      <input type="text" class="url" placeholder="Enter an image URL or...">
+    </div>
+    
+    Please tell us the scale of your map.
+    Click both corners of a wall, and then enter how long the wall is.
+    
+    <div id="blueprintMap">
+    </div>
+    
+    <div id="blueprintDimensions">
+      <input type="text" name="blueprint-dimensions">
+      <select id="blueprint-units" name="blueprint-units">
+        <option value="ft">foot</option>
+        <option value="m">meter</option>
+      </select>
+    
+      <button id="saveBlueprint">Save</button>
+    </div>
 
 	</div>
 </div>
-- 
cgit v1.2.3-70-g09d2


From 8d749201d661f62766b4e3a84735c3307ff7ab5e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Aug 2015 13:22:02 -0400
Subject: refactor environment loading

---
 public/assets/javascripts/app.js                   |  30 +-----
 public/assets/javascripts/rectangles/_env.js       |  34 +++++-
 public/assets/javascripts/ui/_router.js            |  11 ++
 .../javascripts/ui/builder/BlueprintUpload.js      | 120 ---------------------
 public/assets/test/ortho4.html                     |   9 +-
 views/modal.ejs                                    |   3 +-
 views/partials/scripts.ejs                         |  17 ++-
 7 files changed, 68 insertions(+), 156 deletions(-)
 delete mode 100644 public/assets/javascripts/ui/builder/BlueprintUpload.js

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

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 6ebcda5..3cafeca 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -21,40 +21,12 @@ app.init = function () {
 app.launch = function () {
   if ($.browser.msie || ! has3d()) { return app.fallback() }
   
-	scene = new MX.Scene().addTo('#scene')
-	scene.width = window.innerWidth
-	scene.height = window.innerHeight
-	scene.perspective = window.innerHeight
-
-	window.onresize = function () {
-		scene.width = window.innerWidth
-		scene.height = window.innerHeight
-		scene.perspective = window.innerHeight
-		scene.update()
-	}
-
-	cam = scene.camera
-	cam.y = viewHeight
-	
-	if (MX.Map) map = app.map = new MX.Map()
-	
-	if (is_mobile) {
-		app.movements = new MX.MobileMovements(cam, viewHeight)
-	}
-	else {
-		app.movements = new MX.Movements(cam, viewHeight)
-	}
-	app.movements.init()
-	
 	var last_t = 0
 	function animate (t) {
 		var dt = t - last_t
 		last_t = t
 		requestAnimationFrame(animate)
-		environment.update(t)
-		window.path && path.update(t)
-		app.movements.update(dt || 0)
-		scene.update()
+		environment.update(t, dt)
 	}
 
 	var loader = new Loader(function(){
diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js
index 14f73e3..b3c7d66 100644
--- a/public/assets/javascripts/rectangles/_env.js
+++ b/public/assets/javascripts/rectangles/_env.js
@@ -1,6 +1,22 @@
 var environment = new function(){}
 environment.init = function(){
 
+	scene = new MX.Scene().addTo('#scene')
+	scene.width = window.innerWidth
+	scene.height = window.innerHeight
+	scene.perspective = window.innerHeight
+
+	cam = scene.camera
+	cam.y = viewHeight
+	
+	if (is_mobile) {
+		app.movements = new MX.MobileMovements(cam, viewHeight)
+	}
+	else {
+		app.movements = new MX.Movements(cam, viewHeight)
+	}
+	app.movements.init()
+	
 	map = new Map ()
 
 	if (window.scene) {
@@ -16,7 +32,14 @@ environment.init = function(){
 		
 		scene.camera.radius = 20
 	}
-	
+
+	window.onresize = function () {
+		scene.width = window.innerWidth
+		scene.height = window.innerHeight
+		scene.perspective = window.innerHeight
+		scene.update()
+	}
+
 	Rooms.init()
 	Walls.init()
 	Scenery.init()
@@ -52,8 +75,13 @@ environment.init = function(){
     }
   })
 }
-environment.update = function(t){
+environment.minimal = function(){
+  environment.update = function(t){}
+}
+environment.update = function(t, dt){
+  app.movements.update(dt || 0)
+  scene.update()
 	map.update()
-	window.minimap && window.minimap.update && minimap.update()
+	window.minimap && minimap.update && minimap.update()
 	z = false
 }
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 1bdce19..857377c 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -44,6 +44,8 @@ var SiteRouter = Router.extend({
 		"/project/:name":       'projectViewer',
 		"/project/:name/edit":  'projectEditor',
 		"/project/:name/view":  'projectViewer',
+
+		"/test/blueprint":      'blueprintEditor',
 	},
 	
 	mobileRoutes: {
@@ -157,6 +159,15 @@ var SiteRouter = Router.extend({
 		this.readerView = app.controller = new ReaderView()
 		this.readerView.load(name)
 	},
+	
+	blueprintEditor: function(e){
+	  environment.init = environment.minimal
+	  app.launch()
+	  if (app.unsupported) return
+
+	  this.blueprintView = app.controller = new BlueprintView ()
+	  this.blueprintView.load()
+	},
 
 	signup: function(e){
 		e && e.preventDefault()
diff --git a/public/assets/javascripts/ui/builder/BlueprintUpload.js b/public/assets/javascripts/ui/builder/BlueprintUpload.js
deleted file mode 100644
index dbc6f12..0000000
--- a/public/assets/javascripts/ui/builder/BlueprintUpload.js
+++ /dev/null
@@ -1,120 +0,0 @@
-
-var BlueprintUpload = UploadView.extend({
-	el: ".blueprintUpload",
-	
-	mediaTag: "blueprint",
-	createAction: "/api/media/new",
-	uploadAction: "/api/media/upload",
-	listAction: "/api/media/user",
-	destroyAction: "/api/media/destroy",
-
-	events: {
-		"mousedown": 'stopPropagation',
-    "change .url": "enterUrl",
-    "keydown .url": "enterSetUrl",
-    
-    "click .blueprint": "choose",
-    "change [name=blueprint-dimensions]": "changeDimensions",
-    "change [name=blueprint-units]": "changeUnits",
-    "click #saveBlueprint": "save",
-  },
-	
-	initialize: function(opt){
-	  this.parent = opt.parent
-	  this.__super__.initialize.call(this)
-
-    this.$url = this.$(".url")
-
-    this.$blueprintMap = this.$("#blueprintMap")
-    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
-    this.$dimensions = this.$("[name=blueprint-dimensions]")
-    this.$units = this.$("[name=blueprint-units]")
-    this.$save = this.$("#saveBlueprint")
-    
-    this.map = new Map ({ type: ortho })
-    
-    this.load()
-	},
-	
-  loaded: false,
-	load: function(){
-		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
-	},
-
-	populate: function(data){
-		this.loaded = true
-		if (data && data.length) {
-		  data.forEach(this.append.bind(this))
-		  this.$(".txt").hide()
-		}
-		else {
-		  this.$(".txt").show()
-		}
-	},
-	
-	append: function(media){
-	  var $el = $("<div>")
-	  $el.data("id", media._id)
-	  $el.addClass("blueprint")
-	  this.$blueprints.append($el)
-	},
-	
-	pick: function(e){
-	  var $el = $(e.currentTarget)
-	  // load map with it
-	},
-  
-	destroy: function(_id, cb){
-		$.ajax({
-			type: "delete",
-			url: this.destroyAction,
-			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
-		}).complete(cb || function(){})
-	},
-	
-	show: function(){
-    this.toggle(true)
-	},
-	hide: function(){
-		this.toggle(false)
-	},
-	toggle: function (state) {
-    this.$el.toggleClass("active", state)
-	},
-
-	addUrl: function (url){
-		Parser.loadImage(url, function(media){
-			if (! media) return
-			media._csrf = $("[name=_csrf]").val()
-			media.tag = this.mediaTag
-			
-			var request = $.ajax({
-				type: "post",
-				url: this.createAction,
-				data: media,
-			})
-			request.done(this.add.bind(this))
-			
-		}.bind(this))
-	},
-  enterUrl: function(){
-  	var url = this.$url.sanitize()
-  	this.addUrl(url)
-  	this.$url.val("")
-  },
-	enterSetUrl: function (e) {
-		e.stopPropagation()
-		if (e.keyCode == 13) {
-			setTimeout(this.enterUrl.bind(this), 100)
-		}
-	},
-	
-	add: function(media){
-	  this.append(media)
-	},
-	changeDimensions: function(){
-	},
-	changeUnits: function(){
-	},
-
-})
diff --git a/public/assets/test/ortho4.html b/public/assets/test/ortho4.html
index 12b6ab2..1c1adef 100644
--- a/public/assets/test/ortho4.html
+++ b/public/assets/test/ortho4.html
@@ -91,14 +91,16 @@ body {
 	</div>
 </div>
 
-<script src="/assets/javascripts/util.js"></script>
-<script src="/assets/javascripts/defaults.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
 <script src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
 <script src="/assets/javascripts/vendor/polyfill.js"></script>
 <script src="/assets/javascripts/vendor/tube.js"></script>
+
+<script src="/assets/javascripts/util.js"></script>
+<script src="/assets/javascripts/defaults.js"></script>
+
 <script src="/assets/javascripts/mx/mx.js"></script>
 <script src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
 <script src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
@@ -126,8 +128,10 @@ body {
 <script src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
 <script src="/assets/javascripts/ui/lib/View.js"></script>
 <script src="/assets/javascripts/ui/lib/ModalView.js"></script>
+<script src="/assets/javascripts/ui/lib/UploadView.js"></script>
 <script src="/assets/javascripts/ui/lib/Parser.js"></script>
 <script src="/assets/javascripts/ui/lib/Toolbar.js"></script>
+<script src="/assets/javascripts/ui/builder/BlueprintUpload.js"></script>
 
 <script>
 var app = window.app || {}
@@ -199,6 +203,7 @@ OrthographicToolbar.add("eraser-mode", function(){
 })
 OrthographicToolbar.pick("ortho-polyline-mode")
 
+var BlueprintUpload = new BlueprintUploadView ({})
 
 document.addEventListener('DOMContentLoaded', build)
 function build () {
diff --git a/views/modal.ejs b/views/modal.ejs
index 732953d..433861e 100644
--- a/views/modal.ejs
+++ b/views/modal.ejs
@@ -10,7 +10,8 @@
 
 	<div style="height: 70%; clear: both;" id="content"></div>
 
-	[[ include partials/confirm-modal ]]	
+	[[ include controls/builder/blueprint ]]
+	[[ include partials/confirm-modal ]]
 	[[ include partials/sign-in ]]	
 	[[ include projects/layouts-modal ]]
 	[[ include projects/edit-project ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2de32fb..64ac135 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -28,6 +28,8 @@
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.soundcloud.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.polyline.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
 
@@ -79,10 +81,20 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/editor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/minimap.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/eraser.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
@@ -115,6 +127,9 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderToolbar.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
-- 
cgit v1.2.3-70-g09d2


From d84c89a8dd770ea174a7d2ac90927046a5f4b5f6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Aug 2015 16:50:31 -0400
Subject: blueprint upload styling

---
 .../javascripts/rectangles/engine/map/ui/ortho.js  |   4 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  30 -----
 .../javascripts/ui/blueprint/BlueprintScaler.js    |  43 ++++++++
 .../javascripts/ui/blueprint/BlueprintUpload.js    |  36 ++++--
 .../javascripts/ui/blueprint/BlueprintView.js      |   2 +-
 views/controls/blueprint/editor.ejs                | 122 +++++++++++++++++----
 views/partials/scripts.ejs                         |   2 +-
 7 files changed, 178 insertions(+), 61 deletions(-)
 delete mode 100644 public/assets/javascripts/ui/blueprint/BlueprintEditor.js
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintScaler.js

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

diff --git a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
index 52f7339..5be7446 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
@@ -81,7 +81,9 @@ Map.UI.Ortho = function(map){
 	}
 	base.set_tool = function(s){
 	  console.log("set tool to", s)
-	  base.tools[currentTool].cancel()
+	  if (base.tools[currentTool]) {
+	    base.tools[currentTool].cancel()
+	  }
 	  currentTool = s
 	  tool = base.tools[currentTool]
 	}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
deleted file mode 100644
index 227c1c8..0000000
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-var BlueprintEditor = ModalView.extend({
-	el: ".blueprintEditor",
-	
-	events: {
-    "change [name=blueprint-dimensions]": "changeDimensions",
-    "change [name=blueprint-units]": "changeUnits",
-    "click #saveBlueprint": "save",
-	},
-	
-	initialize: function(){
-    this.$blueprintMap = this.$("#blueprintMap")
-    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
-    this.$dimensions = this.$("[name=blueprint-dimensions]")
-    this.$units = this.$("[name=blueprint-units]")
-    this.$save = this.$("#saveBlueprint")
-
-    this.map = new Map ({ type: 'ortho' })
-
-    this.$blueprintMap.append(this.map.el)
-	},
-
-	changeDimensions: function(){
-	},
-	changeUnits: function(){
-	},
-	save: function(){
-	},
-
-})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
new file mode 100644
index 0000000..e11b61e
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -0,0 +1,43 @@
+
+var BlueprintScaler = ModalView.extend({
+	el: ".blueprintScaler",
+	
+	events: {
+    "change [name=blueprint-dimensions]": "changeDimensions",
+    "change [name=blueprint-units]": "changeUnits",
+    "click #saveBlueprint": "save",
+	},
+	
+	initialize: function(){
+    this.$blueprintMap = this.$("#blueprintMap")
+    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+    this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$units = this.$("[name=blueprint-units]")
+    this.$save = this.$("#saveBlueprint")
+
+    this.map = map = new Map ({
+      type: "ortho",
+      el: this.$blueprintMap.get(0),
+      width: window.innerWidth/2,
+      height: window.innerHeight,
+      zoom: -2,
+      zoom_min: -6.2,
+      zoom_max: 1,
+    })
+    map.ui.add_tool("arrow", new ArrowTool)
+    map.ui.add_tool("position", new PositionTool)
+    map.ui.set_tool("position")
+	},
+	
+	pick: function(){
+    
+	},
+
+	changeDimensions: function(){
+	},
+	changeUnits: function(){
+	},
+	save: function(){
+	},
+
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
index 9467715..deb1075 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -13,7 +13,8 @@ var BlueprintUpload = UploadView.extend({
     "change .url": "enterUrl",
     "keydown .url": "enterSetUrl",
     
-    "click .blueprint": "choose",
+    "click .blueprint": "pick",
+    "click .remove": "destroy",
   },
 	
 	initialize: function(opt){
@@ -34,25 +35,33 @@ var BlueprintUpload = UploadView.extend({
 	populate: function(data){
 		this.loaded = true
 		if (data && data.length) {
+		  this.$blueprints.show()
 		  data.forEach(this.append.bind(this))
-		  this.$(".txt").hide()
+		  this.show()
 		}
 		else {
-		  this.$(".txt").show()
+		  this.show()
 		}
 	},
 	
 	pick: function(e){
 	  var $el = $(e.currentTarget)
-	  // load map with it
+	  var media = $el.data("media")
+	  this.hide()
+	  this.parent.blueprintScaler.pick(media)
 	},
   
-	destroy: function(_id, cb){
+	destroy: function(e){
+	  e.stopPropagation()
+	  var $el = $(e.currentTarget)
+	  var _id = $el.closest(".blueprint").data("id")
+    $el.remove()
 		$.ajax({
 			type: "delete",
 			url: this.destroyAction,
 			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
-		}).complete(cb || function(){})
+		}).complete(function(){
+		})
 	},
 	
 	show: function(){
@@ -93,13 +102,24 @@ var BlueprintUpload = UploadView.extend({
 	},
 	
 	add: function(media){
+    this.$blueprints.show()
 	  this.append(media)
+	  this.hide()
+	  this.parent.blueprintScaler.pick(media)
 	},
 
 	append: function(media){
-	  var $el = $("<img>")
-	  $el.attr("src", media.url)
+	  var $el = $("<span>")
+	  var img = new Image ()
+	  img.src = media.url
+	  var remove = document.createElement("span")
+	  remove.className = "remove"
+	  remove.innerHTML = "<span>x</span>"
+	  
 	  $el.data("id", media._id)
+	  $el.data("media", media)
+	  $el.append(img)
+	  $el.append(remove)
 	  $el.addClass("blueprint")
 	  this.$blueprints.append($el)
 	},
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 40c61d7..a803f12 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -12,7 +12,7 @@ var BlueprintView = View.extend({
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
     this.blueprintUpload = new BlueprintUpload ({ parent: this })
-    this.blueprintEditor = new BlueprintEditor ({ parent: this })
+    this.blueprintScaler = new BlueprintScaler ({ parent: this })
 	},
 
 	load: function(name){
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index 6b80287..aec5e25 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -33,13 +33,88 @@ body {
 .hud span.active { color: #000; }
 
 .blueprintUpload {
-  width: 240px;
+  -webkit-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+  width: 340px;
+  position: absolute;
+  top: 50%; left: 50%;
+  background: white;
+  padding: 10px;
+  border: 1px solid black;
+  box-shadow: -3px 3px #000;
+  -webkit-transform: translate3D(0%,-200%,0);
+  transform: translate3D(0%,-200%,0);
+  margin-left: -175px;
+  margin-top: -200px;
+  opacity: 0;
+}
+.blueprintUpload.active {
+  -webkit-transform: translate3D(0,0,0);
+  transform: translate3D(0,0,0);
+  opacity: 1;
+}
+.blueprintUpload .toolButton {
+  float: none;
+  width: 108px;
+  display: inline-block;
+}
+.blueprintUpload .url {
+  font-size: 15px;
+  border: 1px solid #888;
+  padding: 2px;
+  font-weight: 300;
+  position: relative;
+  top: 3px;
+  margin-right: 10px;
+  width: 190px;
+}
+.blueprintUpload p {
+  font-weight: 300;
+  font-size: 13px;
+}
+.blueprintUpload .blueprints {
+  display: none;
+}
+.blueprintUpload .blueprints h5 {
+  width: 250px;
+  margin: 10px auto;
+  padding-top: 9px;
 }
 .blueprints .blueprint {
   border: 1px solid black;
-  padding: 5px;
+  background: white;
+  padding: 0px;
+  position: relative;
+  display: inline-block;
+}
+.blueprints .blueprint img {
   height: 100px;
   max-width: 200px;
+  display: block;
+  cursor: pointer;
+}
+.blueprints .blueprint .remove {
+  box-shadow: 0 1px 2px #888;
+  cursor: pointer;
+  position: absolute;
+  color: red;
+  top: 7px;
+  right: 7px;
+  width: 20px; height: 20px;
+  text-align: center;
+  background: #fff;
+  border-radius: 50%;
+}
+.blueprints .blueprint .remove span {
+  position: relative;
+  top: -2px;
+}
+.blueprintUpload .wallpaperUpload .upload-icon {
+  margin: 0 4px;
+}
+.uploadNewBlueprint {
+  color: #333;
+  border-bottom: 1px solid;
   cursor: pointer;
 }
 </style>
@@ -63,42 +138,49 @@ body {
 </div>
 
 <div class="mediaDrawer fixed animate active blueprintEditor">
-  <span class="close">X</span>
   <div class="box">
   
-    <h2>Upload your Blueprint</h2>
-  
     <div class="blueprintUpload">
+      <h2>Upload your Blueprint</h2>
+      <p>
+        Upload an image which you will trace to make a floor plan.
+        Images should be at least 1000x1000.
+      </p>
       <input type="hidden" name="_csrf" value="[[- token ]]">
+      <input type="text" class="url" placeholder="Enter an image URL or...">
       <div class="wallpaperUpload toolButton">
         <form>
           <span class="ion-ios-upload-outline upload-icon"></span>
-          <label>Upload</label>
+          <label>Upload a File</label>
           <input type="file" accept="image/*" multiple>
         </form>
       </div>
-      <input type="text" class="url" placeholder="Enter an image URL or...">
       <div class="blueprints">
         <h5>Your uploaded blueprints</h5>
       </div>
     </div>
     
-    Please tell us the scale of your blueprint.
-    Click both corners of a wall, and then enter how long the wall is.
-    https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg
+    <div class="blueprintScaler">
+      <div class="blueprintInfo">
+        Please tell us the scale of your blueprint.
+        Click both corners of a wall, and then enter how long the wall is.
+        <br><br>
+        Do you want to <span class="uploadNewBlueprint">upload a blueprint?</span>
+      </div>
 
-    <div id="blueprintMap">
-    </div>
+      <div id="blueprintMap">
+      </div>
   
-    <div id="blueprintDimensions">
-      <input type="text" name="blueprint-dimensions">
-      <select id="blueprint-units" name="blueprint-units">
-        <option value="ft">foot</option>
-        <option value="m">meter</option>
-      </select>
+      <div id="blueprintDimensions">
+        <input type="text" name="blueprint-dimensions">
+        <select id="blueprint-units" name="blueprint-units">
+          <option value="ft">foot</option>
+          <option value="m">meter</option>
+        </select>
   
-      <button id="saveBlueprint">Save</button>
+        <button id="saveBlueprint">Save</button>
+      </div>
     </div>
-
+    
   </div>
 </div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2a93e9b..136bd4d 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -128,7 +128,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 9ba29a587bf0722db82e5caf1b1cf4e5596003b6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 12 Aug 2015 18:38:12 -0400
Subject: functioning blueprint scaler

---
 .../javascripts/rectangles/engine/map/draw.js      |  2 +-
 .../rectangles/engine/map/tools/line.js            | 49 ++++++++++++
 .../assets/javascripts/rectangles/models/rect.js   |  6 ++
 .../javascripts/ui/blueprint/BlueprintScaler.js    | 91 ++++++++++++++++++++--
 .../javascripts/ui/blueprint/BlueprintView.js      |  3 +
 server/lib/schemas/Layout.js                       |  1 +
 views/controls/blueprint/editor.ejs                |  4 +-
 views/partials/scripts.ejs                         |  1 +
 8 files changed, 148 insertions(+), 9 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/line.js

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 11ba3f8..cc2f4d8 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -198,7 +198,7 @@ Map.Draw = function(map, opt){
 
 	//
 
-	function line (x,y,a,b,translation){
+	var line = draw.line = function (x,y,a,b,translation){
 		if (translation) {
 			x += translation.a
 			a += translation.a
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
new file mode 100644
index 0000000..8f409a8
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -0,0 +1,49 @@
+var LineTool = MapTool.extend(function(base){
+	var exports = {}
+	
+	var selected_point = null
+	
+	var line = exports.line = []
+	
+	var can_drag, dragging
+	
+	exports.down = function(e, cursor){
+	  this.cursor = cursor
+	  switch (line.length) {
+	    case 0:
+        line[0] = cursor.x_component()
+        can_drag = true
+        break
+      case 1:
+        line[1] = cursor.x_component()
+        can_drag = false
+        break
+      case 2:
+        line[0] = cursor.x_component()
+        line.pop()
+        can_drag = true
+        break
+    }
+	}
+	
+	exports.move = function(e, cursor){
+    this.cursor = cursor
+	}
+	
+	exports.drag = function(e, cursor){
+	  if (dragging) {
+	    line[1].a = cursor.x.b
+	    line[1].b = cursor.y.b
+	  }
+	  else if (can_drag && cursor.magnitude() > 10/map.zoom) {
+	    line[1] = cursor.y_component()
+	    dragging = true
+	  }
+	}
+	
+	exports.up = function(e, cursor){
+	  can_drag = dragging = false
+	}
+	
+	return exports
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index c667cf5..92c8c9e 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -39,6 +39,12 @@
 	Rect.prototype.clone = function(){
 		return new Rect( this.x.clone(), this.y.clone() )
 	}
+	Rect.prototype.x_component = function(){
+	  return new vec2( this.x.a, this.y.a )
+	}
+	Rect.prototype.y_component = function(){
+	  return new vec2( this.x.b, this.y.b )
+	}
 	Rect.prototype.assign = function(r) {
 	  this.x.assign(r.x)
 	  this.y.assign(r.y)
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index a81c89b..addf9a9 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -1,10 +1,13 @@
 
-var BlueprintScaler = ModalView.extend({
+var BlueprintScaler = ModalFormView.extend({
 	el: ".blueprintScaler",
 	
+	method: "/api/media/scale",
+	
 	events: {
     "change [name=blueprint-dimensions]": "changeDimensions",
     "change [name=blueprint-units]": "changeUnits",
+    "click .uploadNewBlueprint": "showBlueprintUpload",
     "click #saveBlueprint": "save",
 	},
 	
@@ -12,6 +15,7 @@ var BlueprintScaler = ModalView.extend({
     this.$blueprintMap = this.$("#blueprintMap")
     this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
     this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$pixels = this.$("[name=blueprint-pixels]")
     this.$units = this.$("[name=blueprint-units]")
     this.$save = this.$("#saveBlueprint")
 
@@ -24,23 +28,40 @@ var BlueprintScaler = ModalView.extend({
       zoom_min: -6.2,
       zoom_max: 1,
     })
-    map.ui.add_tool("arrow", new ArrowTool)
-    map.ui.add_tool("position", new PositionTool)
-    map.ui.set_tool("position")
+    this.lineTool = new LineTool
+    map.ui.add_tool("line", this.lineTool)
+    map.ui.set_tool("line")
     
     scene = scene || { camera: { x: 0, y: 0, z: 0 } }
     
     this.floorplan = new MX.Image ()
     
-    this.animate()
+    this.animating = false
+	},
+	
+	showBlueprintUpload: function(){
+	  this.parent.blueprintUpload.show()
 	},
 	
 	pick: function(media){
+	  this.media = media
+    
+    if (!! media.scale) {
+      this.parent.useFloorplan(media)
+    }
+
     this.floorplan.load({ media: media, keepImage: true })
+
+    if (! this.animating) {
+      this.animating = true
+      this.animate()
+    }
 	},
 	
 	animate: function(t){
     requestAnimationFrame(this.animate.bind(this))
+    
+    if (! this.animating) return
 
     var dt = t - this.last_t
     this.last_t = t
@@ -53,6 +74,27 @@ var BlueprintScaler = ModalView.extend({
     this.map.draw.translate()
 
     this.floorplan.draw(this.map.draw.ctx, true)
+    
+    this.map.draw.ctx.strokeStyle = "#f00"
+    this.map.draw.ctx.lineWidth = 2/map.zoom
+    switch (this.lineTool.line.length) {
+      case 1:
+        this.map.draw.line(
+          this.lineTool.line[0].a,
+          this.lineTool.line[0].b,
+          this.lineTool.cursor.x.a,
+          this.lineTool.cursor.y.a
+        )
+        break
+      case 2:
+        this.map.draw.line(
+          this.lineTool.line[0].a,
+          this.lineTool.line[0].b,
+          this.lineTool.line[1].a,
+          this.lineTool.line[1].b
+        )
+        break
+    }
 
     this.map.draw.coords()
 
@@ -62,10 +104,47 @@ var BlueprintScaler = ModalView.extend({
 	},
 
 	changeDimensions: function(){
+	  app.units = this.$units.val()
+	  this.$dimensions.unitVal()
 	},
 	changeUnits: function(){
+	  app.units = this.$units.val()
+	  this.$dimensions.resetUnitVal()
+	},
+	lineLength: function(){
+	  if (this.lineTool.line.length !== 2) return 0
+	  var line = this.lineTool.line
+	  return dist( line[0].a, line[0].b, line[1].a, line[1].b )
+	}
+
+	validate: function(){
+	  var val = this.$dimensions.unitVal()
+	  var errors = []
+	  if (! this.lineLength()) {
+	    errors.push("no line")
+	    alert("Please click two corners of a wall and then specify how long it is in feet or meters.")
+	  }
+	  else if (val == 0) {
+	    errors.push("no measurement")
+	    alert("Please tell us how long the wall is in feet or meters.")
+	  }
+    return errors
 	},
-	save: function(){
+	
+	showErrors: function(){},
+	
+	serialize: function(){
+    var fd = new FormData()
+    fd.append( "_id", this.media._id)
+    fd.append( "units", this.$units.val() )
+    fd.append( "scale", this.$dimensions.unitVal() / this.lineLength() )
+    fd.append( "_csrf", $("[name=_csrf]").val())
+    return fd
+	},
+	
+	success: function(){
+	  this.animating = false
+    this.parent.useFloorplan(media)
 	},
 
 })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index a803f12..6b204e5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -33,6 +33,9 @@ var BlueprintView = View.extend({
 	
 	hideExtras: function(){
 	},
+	
+	useFloorplan: function(media){
+	},
 
 	pickWall: function(wall, pos){
 	},
diff --git a/server/lib/schemas/Layout.js b/server/lib/schemas/Layout.js
index cff1d78..e15e188 100644
--- a/server/lib/schemas/Layout.js
+++ b/server/lib/schemas/Layout.js
@@ -23,6 +23,7 @@ var LayoutSchema = new mongoose.Schema({
 	photo: {
 		type: String,
 	},
+	media: mongoose.Schema.Types.Mixed,
 	rooms: [mongoose.Schema.Types.Mixed],
 	startPosition: mongoose.Schema.Types.Mixed,
 	viewHeight: { type: Number },
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index 308b4c8..3e0c097 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -99,8 +99,8 @@ body {
         <br><br>
 
         <div class="setting number">
-          <label for="wall-length">length</label>
-          <input type="text" class="units" name="wall-length" id="wall-length">
+          <label for="blueprint-dimensions">length</label>
+          <input type="text" class="units" name="blueprint-dimensions" id="blueprint-dimensions">
           <select id="blueprint-units" name="blueprint-units">
             <option value="ft">feet</option>
             <option value="m">meters</option>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 136bd4d..a0222b5 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -91,6 +91,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/line.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/eraser.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 72afc148b11ac57c991d699c205675b4b0f1cf70 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 19:35:02 -0400
Subject: set wall height

---
 public/assets/javascripts/defaults.js              |  1 +
 .../javascripts/mx/primitives/mx.polyline.js       | 11 +++++++++--
 .../javascripts/rectangles/engine/map/_map.js      |  2 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  2 +-
 .../javascripts/ui/blueprint/BlueprintInfo.js      | 23 ++++++++--------------
 .../javascripts/ui/blueprint/BlueprintScaler.js    |  4 ++--
 .../javascripts/ui/blueprint/BlueprintView.js      |  7 ++-----
 public/assets/test/ortho2.html                     |  6 +++---
 public/assets/test/ortho3.html                     |  2 +-
 public/assets/test/ortho4.html                     |  2 +-
 views/controls/blueprint/info.ejs                  |  2 --
 11 files changed, 29 insertions(+), 33 deletions(-)

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

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">
-- 
cgit v1.2.3-70-g09d2


From bbd62d9c7f3838d07e42e46c244c317a5dbdb5ae Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 20:01:58 -0400
Subject: clear shapes

---
 .../rectangles/engine/shapes/shapelist.js          |  6 ++++
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 38 +++-------------------
 .../javascripts/ui/blueprint/BlueprintView.js      |  5 ++-
 views/controls/blueprint/settings.ejs              | 18 ++--------
 views/controls/blueprint/toolbar.ejs               |  2 +-
 5 files changed, 16 insertions(+), 53 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 932ce36..e86c5d6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -13,6 +13,12 @@ var ShapeList = Fiber.extend(function(base){
       this.shapes.splice(index, 1)
     }
   }
+  exports.destroy = function(){
+    this.shapes.forEach(function(shape){
+      shape.destroy()
+    })
+    this.shapes = []
+  }
   exports.removeSegment = function (segment){
     var shape = segment.shape
     var head = shape.getHeadAtIndex(segment.head)
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 1ff3d6e..d460a9d 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -2,16 +2,14 @@
 var BlueprintSettings = FormView.extend({
 	el: "#blueprintSettings",
 	
-	createAction: "/api/layout/new",
-	updateAction: "/api/layout/edit",
-	destroyAction: "/api/layout/destroy",
+	action: "/api/blueprint/edit",
+	destroyAction: "/api/blueprint/destroy",
 
 	events: {
 	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'clickSave',
-		"click [data-role='clone-layout']": 'clone',
 		"click [data-role='clear-layout']": 'clear',
 		"click [data-role='destroy-layout']": 'destroy',
 	},
@@ -23,40 +21,15 @@ var BlueprintSettings = FormView.extend({
 		this.$id = this.$("[name=_id]")
 		this.$csrf = this.$("[name=_csrf]")
 		this.$name = this.$("[name=name]")
-		this.$privacy = this.$("[name=privacy]")
 	},
 	
 	load: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
-
-		this.parent.colorControl.loadDefaults()
-
-		data.rooms && Rooms.deserialize(data.rooms)
-		data.startPosition && scene.camera.move(data.startPosition)
-		data.privacy && this.$privacy.find("[value=" + data.privacy + "]").prop('checked', "checked")
-
-		this.action = data.isNew ? this.createAction : this.updateAction
-	},
-	
-	clone: function(){
-		var names = this.$name.val().split(" ")
-		if ( ! isNaN(Number( names[names.length-1] )) ) {
-			names[names.length-1] = Number( names[names.length-1] ) + 1
-		}
-		else {
-			names.push("2")
-		}
-
-		this.$id.val('new')
-		this.$name.val( names.join(" ") )
-		this.action = this.createAction
-		
-		window.history.pushState(null, document.title, "/builder/new")
 	},
 	
 	clear: function(){
-		Rooms.removeAll()
+		shapes.destroy()
 	},
 	
 	destroy: function(){
@@ -89,10 +62,10 @@ var BlueprintSettings = FormView.extend({
 		var errors = []
 		var name = this.$name.val()
 		if (! name || ! name.length) {
-			errors.push("Layout needs a name.")
+			errors.push("Blueprint needs a name.")
 		}
 		if (Rooms.count() == 0) {
-			errors.push("Please add some rooms by drawing boxes.")
+			errors.push("Please add some walls.")
 		}
 		return errors
 	},
@@ -113,7 +86,6 @@ var BlueprintSettings = FormView.extend({
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
-		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index f919cc7..8330154 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -8,7 +8,6 @@ var BlueprintView = View.extend({
 	},
 	
 	initialize: function(){
-// 		this.settings = new BuilderSettings ({ parent: this })
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
     this.map = this.buildMap()
@@ -17,11 +16,11 @@ var BlueprintView = View.extend({
     this.uploader = new BlueprintUploader ({ parent: this })
     this.scaler = new BlueprintScaler ({ parent: this })
 		this.info = new BlueprintInfo ({ parent: this })
+		this.settings = new BlueprintSettings ({ parent: this })
 	},
 
 	load: function(name){
 		if (! name || name == "new") {
-// 			this.ready({ isNew: true, _id: "new", name: "" })
       this.uploader.load()
 			return
 		}
@@ -53,7 +52,7 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
-// 		this.settings.load(data)
+		this.settings.load(data)
 		this.info.load(data)
 	  this.editor.loadFloorplan(data)
 	},
diff --git a/views/controls/blueprint/settings.ejs b/views/controls/blueprint/settings.ejs
index a7ce2f0..1347f5b 100644
--- a/views/controls/blueprint/settings.ejs
+++ b/views/controls/blueprint/settings.ejs
@@ -10,29 +10,15 @@
 	</div>
 
 	<div class="setting">
-		<input type="text" name="name" placeholder="layout name">
+		<input type="text" name="name" placeholder="Blueprint name">
 	</div>
-	
-	<div class="setting">
-		<div class="radio-group">
-			<input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked>
-			<label class="radio-group__label" for="privacy_private">
-				Everyone
-			</label>
-			<input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private">
-			<label class="radio-group__label" for="privacy_public">
-				Just for me
-			</label>
-		</div>
-	</div>
-	
+
 	<div class="setting">
 		<button data-role="save-layout">Save</button>
 	</div>
 	
 	<div class="setting subButtons">
 		<a href="#" data-role="clear-layout">Clear</a>
-		<a href="#" data-role="clone-layout">Clone</a>
 		<a href="#" data-role="destroy-layout">Delete</a>
 	</div>
 
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
index 82cbcba..9c55a4a 100644
--- a/views/controls/blueprint/toolbar.ejs
+++ b/views/controls/blueprint/toolbar.ejs
@@ -32,7 +32,7 @@
 
 	<span
 		data-role='toggle-layout-settings'
-		data-info="save layout"
+		data-info="save blueprint"
 		class="ion-ios-compose-outline"></span>
 </div>
 <!-- 
-- 
cgit v1.2.3-70-g09d2


From 40fa450839a171cbfa1d9c8470d25eeeba337a27 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 20:05:56 -0400
Subject: serialize/deserialize polyline

---
 .../assets/javascripts/rectangles/engine/shapes/polyline.js   | 10 ++++++++--
 .../assets/javascripts/rectangles/engine/shapes/shapelist.js  | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 7e3c04c..e853592 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -1,9 +1,12 @@
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
-	exports.init = function(){
-    this.points = []
+	exports.init = function(points){
+    this.points = points
     this.mx_points = []
     this.closed = false
+    if (points) {
+      this.build()
+    }
 	}
 	exports.add = function(p){
     this.points.push( p )
@@ -134,6 +137,9 @@ var Polyline = Fiber.extend(function(base){
   exports.rebuild = function(){
     this.mx.rebuild()
   }
+  exports.serialize = function(){
+    return this.points
+  }
   exports.reset = function(){
     this.mx_points.forEach(function(mx){ scene.remove(mx) })
     this.mx_points.length = 0
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index e86c5d6..c3b5758 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -64,5 +64,16 @@ var ShapeList = Fiber.extend(function(base){
   exports.forEach = function(fn){
     this.shapes.forEach(fn)
   }
+  exports.serialize = function(){
+    return this.shapes.map(function(shape){
+      return shape.serialize()
+    })
+  }
+  exports.deserialize = function(data){
+    data.forEach(function(points){
+      var line = new Polyline(points)
+      this.add(line)
+    }.bind(this))
+  }
   return exports
 })
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 62a8127787c1ed2f0ae420722be9327e421633bd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 20:08:44 -0400
Subject: serialize/deserialize

---
 public/assets/javascripts/rectangles/engine/shapes/shapelist.js | 3 +++
 public/assets/javascripts/ui/blueprint/BlueprintSettings.js     | 8 ++++----
 server/lib/schemas/Blueprint.js                                 | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index c3b5758..d8a03b2 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -19,6 +19,9 @@ var ShapeList = Fiber.extend(function(base){
     })
     this.shapes = []
   }
+  exports.count = function(){
+    return this.shapes.length
+  }
   exports.removeSegment = function (segment){
     var shape = segment.shape
     var head = shape.getHeadAtIndex(segment.head)
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index d460a9d..f9c9e78 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -26,6 +26,7 @@ var BlueprintSettings = FormView.extend({
 	load: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
+		this.data = data
 	},
 	
 	clear: function(){
@@ -64,7 +65,7 @@ var BlueprintSettings = FormView.extend({
 		if (! name || ! name.length) {
 			errors.push("Blueprint needs a name.")
 		}
-		if (Rooms.count() == 0) {
+		if (shapes.count() == 0) {
 			errors.push("Please add some walls.")
 		}
 		return errors
@@ -81,14 +82,13 @@ var BlueprintSettings = FormView.extend({
 	},
 	
 	serialize: function(){
-		var thumbnail = map.draw.render()
 		var fd = new FormData()
 		fd.append( "_csrf", this.$csrf.val() )
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
-		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
-		fd.append( "thumbnail", dataUriToBlob(thumbnail.toDataURL()) )
+		fd.append( "thumbnail", this.data.url )
 		return fd
 	},
 
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
index 40e67d8..78a388f 100644
--- a/server/lib/schemas/Blueprint.js
+++ b/server/lib/schemas/Blueprint.js
@@ -29,7 +29,7 @@ var BlueprintSchema = new mongoose.Schema({
 		type: Number,
 		default: 0
 	},
-	title: {
+	name: {
 		type: String,
 		default: ""
 	},
@@ -44,7 +44,10 @@ var BlueprintSchema = new mongoose.Schema({
 	heightDimension: { type: Number },
 	units: { type: String },
 	line: { type: String },
-	
+
+	rooms: [mongoose.Schema.Types.Mixed],
+	startPosition: mongoose.Schema.Types.Mixed,
+
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 });
-- 
cgit v1.2.3-70-g09d2


From d9ecfddd7ba63d3cf94b29053476d1d11118d38e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 21:25:28 -0400
Subject: saving blueprints

---
 .../javascripts/rectangles/engine/shapes/polyline.js | 12 ++++++------
 .../rectangles/engine/shapes/shapelist.js            |  7 ++++---
 .../javascripts/ui/blueprint/BlueprintSettings.js    |  7 +++++--
 .../javascripts/ui/blueprint/BlueprintToolbar.js     |  5 +++++
 .../javascripts/ui/blueprint/BlueprintUploader.js    | 16 ++++++++++++++--
 .../assets/javascripts/ui/blueprint/BlueprintView.js | 14 +++++---------
 server/index.js                                      |  1 +
 server/lib/api/blueprint.js                          | 20 ++++++++++++++++++++
 server/lib/schemas/Blueprint.js                      | 11 ++++++++++-
 9 files changed, 70 insertions(+), 23 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index e853592..3c4e9c3 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -1,12 +1,9 @@
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
-	exports.init = function(points){
-    this.points = points
+	exports.init = function(){
+    this.points = []
     this.mx_points = []
     this.closed = false
-    if (points) {
-      this.build()
-    }
 	}
 	exports.add = function(p){
     this.points.push( p )
@@ -138,7 +135,10 @@ var Polyline = Fiber.extend(function(base){
     this.mx.rebuild()
   }
   exports.serialize = function(){
-    return this.points
+    return this.points.map(function(point){ return [point.a, point.b] })
+  }
+  exports.deserialize = function(points){
+    this.points = points.map(function(point){ return new vec2(point[0], point[1]) })
   }
   exports.reset = function(){
     this.mx_points.forEach(function(mx){ scene.remove(mx) })
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index d8a03b2..1b8acfd 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -73,9 +73,10 @@ var ShapeList = Fiber.extend(function(base){
     })
   }
   exports.deserialize = function(data){
-    data.forEach(function(points){
-      var line = new Polyline(points)
-      this.add(line)
+    data && data.forEach(function(points){
+      var line = new Polyline()
+      line.deserialize(points)
+      line.build()
     }.bind(this))
   }
   return exports
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index f9c9e78..acd8dcc 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -26,6 +26,10 @@ var BlueprintSettings = FormView.extend({
 	load: function(data){
 		this.$id.val(data._id)
 		this.$name.val(data.name)
+		if (data.shapes) {
+      shapes.destroy()
+      shapes.deserialize( data.shapes )
+		}
 		this.data = data
 	},
 	
@@ -88,7 +92,6 @@ var BlueprintSettings = FormView.extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
-		fd.append( "thumbnail", this.data.url )
 		return fd
 	},
 
@@ -105,7 +108,7 @@ var BlueprintSettings = FormView.extend({
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 
-		window.history.pushState(null, document.title, "/layout/" + data.slug)
+		window.history.pushState(null, document.title, "/blueprint/" + data.slug)
 	},
 
 })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 5f313fd..e22535e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -9,6 +9,7 @@ var BlueprintToolbar = View.extend({
     "click [data-role=polyline-mode]": 'polylineMode',
     "click [data-role=ortho-polyline-mode]": 'orthoPolylineMode',
     "click [data-role=eraser-mode]": 'eraserMode',
+    "click [data-role=toggle-layout-settings]": 'toggleSettings',
   },
 
   initialize: function(opt){
@@ -49,6 +50,10 @@ var BlueprintToolbar = View.extend({
     }
   },
   
+  toggleSettings: function(){
+    this.parent.settings.toggle()
+  },
+  
   setActiveMode: function( $el ) {
     this.$modes.removeClass('active')
     $el.addClass('active')
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index 6d13817..c7138e9 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -26,7 +26,9 @@ var BlueprintUploader = UploadView.extend({
 	},
 	
   loaded: false,
-	load: function(){
+  nameToShow: null,
+	load: function(name){
+	  this.nameToShow = name || ""
 		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
 	},
 
@@ -36,7 +38,17 @@ var BlueprintUploader = UploadView.extend({
 		  this.$blueprints.show()
       data.forEach(this.append.bind(this))
       this.hide()
-      this.parent.scaler.pick(data[0])
+      if (this.nameToShow) {
+        data.some(function(el){
+          if (el.slug == this.nameToShow) {
+            this.parent.scaler.pick(el)
+            return true
+          }
+        }.bind(this))
+      }
+      else {
+        this.parent.scaler.pick(data[0])
+      }
 		}
 		else {
 		  this.parent.scaler.hideClose()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 8330154..e1d360f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -2,7 +2,7 @@
 var BlueprintView = View.extend({
 	el: "#blueprintView",
 
-	action: "/api/blueprint/",
+	action: "/api/blueprint/show/",
 
 	events: {
 	},
@@ -20,14 +20,10 @@ var BlueprintView = View.extend({
 	},
 
 	load: function(name){
-		if (! name || name == "new") {
-      this.uploader.load()
-			return
-		}
-		
-		name = sanitize(name)
-		
-		$.get(this.action + name, this.ready.bind(this))
+		name = sanitize(name) || "new"
+    this.uploader.load(name)
+// 		name = sanitize(name)
+// 		$.get(this.action + name, this.ready.bind(this))
 	},
 
   orbiting: true,
diff --git a/server/index.js b/server/index.js
index 421a6a7..7143da2 100644
--- a/server/index.js
+++ b/server/index.js
@@ -165,6 +165,7 @@ site.route = function () {
 	app.post('/api/blueprint/upload', middleware.ensureAuthenticated, api.blueprint.upload)
 	app.get('/api/blueprint/user', middleware.ensureAuthenticated, api.blueprint.user)
 	app.post('/api/blueprint/scale',  middleware.ensureAuthenticated, api.blueprint.scale)
+	app.post('/api/blueprint/edit', middleware.ensureAuthenticated, api.blueprint.update)
 	app.delete('/api/blueprint/destroy', middleware.ensureAuthenticated, api.blueprint.destroy)
 
 	app.get('/api/subscription', middleware.ensureAuthenticated, api.subscription.middleware.ensurePlans, api.subscription.middleware.ensureSubscription, api.subscription.show)
diff --git a/server/lib/api/blueprint.js b/server/lib/api/blueprint.js
index 7319055..e581d8f 100644
--- a/server/lib/api/blueprint.js
+++ b/server/lib/api/blueprint.js
@@ -81,6 +81,26 @@ var blueprint = {
 			})
 		})
 	},
+
+	update: function(req, res){
+	  var _id = req.body._id
+		var data = util.cleanQuery(req.body)
+    if (! _id) { return res.json({ error: 404 }) }
+	  Blueprint.findOne({ _id: _id }, function(err, doc){
+			if (! doc) { return res.json({ error: 404 }) }
+			if (String(doc.user_id) !== String(req.user._id)) { return res.json({ error: 404 }) }
+      
+      doc.name = util.sanitize(data.name)
+      doc.slug = util.slugify(data.name)
+      doc.shapes = JSON.parse(data.shapes)
+      doc.startPosition = JSON.parse(data.startPosition)
+
+			doc.save(function(err, rec){
+				if (err || ! rec) { return res.json({ error: err }) }
+				res.json(rec)
+			})
+		})
+	},
 	
 	destroy: function(req, res){
 		var _id = util.sanitize(req.body._id)
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
index 78a388f..666f0cf 100644
--- a/server/lib/schemas/Blueprint.js
+++ b/server/lib/schemas/Blueprint.js
@@ -33,6 +33,15 @@ var BlueprintSchema = new mongoose.Schema({
 		type: String,
 		default: ""
 	},
+	slug: {
+		type: String,
+		required: true,
+		validate: [function (val){
+			val = util.sanitize(val || this.displayName || "")
+			if (! val.length) return false
+			return true
+		},"{PATH} name is required"]
+	},
 	description: {
 		type: String,
 		default: ""
@@ -45,7 +54,7 @@ var BlueprintSchema = new mongoose.Schema({
 	units: { type: String },
 	line: { type: String },
 
-	rooms: [mongoose.Schema.Types.Mixed],
+	shapes: [mongoose.Schema.Types.Mixed],
 	startPosition: mongoose.Schema.Types.Mixed,
 
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
-- 
cgit v1.2.3-70-g09d2


From a4a001668f9f05272a4fbc28567b259ee45ada97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 13:21:44 -0400
Subject: RegionList

---
 .../rectangles/engine/shapes/polyline.js           | 10 ++++++
 .../rectangles/engine/shapes/regionlist.js         | 37 ++++++++++++++++++++++
 .../rectangles/engine/shapes/shapelist.js          |  7 ++++
 views/controls/blueprint/toolbar.ejs               |  4 ---
 views/partials/scripts.ejs                         |  3 +-
 5 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/shapes/regionlist.js

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 3c4e9c3..99c8fda 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -134,6 +134,16 @@ var Polyline = Fiber.extend(function(base){
   exports.rebuild = function(){
     this.mx.rebuild()
   }
+  exports.getSegments = function(){
+    if (this.points.length == 1) {
+      return []
+    }
+    var segments = []
+    for (var i = 1; i < this.points.length; i++) {
+      segments.push( [ this.points[i-1], this.points[i] ] )
+    }
+    return segments
+  }
   exports.serialize = function(){
     return this.points.map(function(point){ return [point.a, point.b] })
   }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
new file mode 100644
index 0000000..1f2810f
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -0,0 +1,37 @@
+var RegionList = (function(){
+
+  var RegionList = {}
+  var regions = RegionList.regions
+  
+  RegionList.init = function(){
+  }
+  
+  RegionList.build = function(){
+    var segments = shapes.getAllSegments()
+    segments.forEach(function(segment){
+      if (segment[0][0] == segment[1][0]) {
+        if (segment[0][1] > segment[1][1]) {
+          segment.push(segment.shift())
+        }
+      }
+      else if (segment[0][1] == segment[1][1]) {
+        if (segment[0][0] > segment[1][0]) {
+          segment.push(segment.shift())
+        }
+      }
+    })
+    segments = segments.sort(function(a,b){
+      return a[0][0] < b[0][0]
+    })
+    
+    console.log(segments)
+    
+    // get a list of all segments from these polylines
+    // re-orientate them so they're either facing up or right
+    // loop over them from left to right
+    // 
+  }
+  
+  return RegionList
+  
+})()
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 1b8acfd..4373caf 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -67,6 +67,13 @@ var ShapeList = Fiber.extend(function(base){
   exports.forEach = function(fn){
     this.shapes.forEach(fn)
   }
+  exports.getAllSegments = function(){
+    var segments = []
+    this.shapes.forEach(function(shape){
+      segments = segments.concat( shape.getSegments() )
+    })
+    return segments
+  }
   exports.serialize = function(){
     return this.shapes.map(function(shape){
       return shape.serialize()
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
index 15c5a28..ee9594e 100644
--- a/views/controls/blueprint/toolbar.ejs
+++ b/views/controls/blueprint/toolbar.ejs
@@ -35,7 +35,3 @@
 		data-info="save blueprint"
 		class="ion-ios-compose-outline"></span>
 </div>
-<!-- 
-    <span class="ion-ionic active" data-role="orbit-mode"></span>
-    <span class="ion-archive" data-role="keyboard-mode"></span>
- -->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 8a69888..bc8dacb 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -85,8 +85,9 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/regionlist.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 618ccc76b96fa5d070484ce2d0ec8d509153da69 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 19:14:32 -0400
Subject: starting to convert polylines into regions

---
 .../rectangles/engine/shapes/regionlist.js         | 83 ++++++++++++++++++----
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 11 ++-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |  2 +-
 3 files changed, 80 insertions(+), 16 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 1f2810f..94b902a 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -2,36 +2,91 @@ var RegionList = (function(){
 
   var RegionList = {}
   var regions = RegionList.regions
-  
-  RegionList.init = function(){
+
+  RegionList.build = function(){
+    var segments = RegionList.getSortedSegments()
+
+    // loop over them from left to right
+//    console.log(segments.map(function(s){ return s.toString() }).join("\n"))
+
+    var rooms = []
+    var open_segments = []
+    
+    var segment, open_segment, vertical, other_side
+
+    for (var i = 0; i < segments.length; i++) {
+      segment = segments[i]
+      if (! isVertical(segment)) {
+        continue
+      }
+      for (var j = 0; j < open_segments.length; j++) {
+        open_segment = open_segments[j]
+        if (overlaps(segment, open_segment)) {
+          // if we have overlap, it means we have made a full room
+          other_side = clone_segment(open_segment)
+          other_side[0].a = segment[0].a
+          other_side[1].a = segment[1].a
+          rooms.push([open_segment, other_side])
+          open_segments.splice(j, 1)
+          j--
+        }
+      }
+      open_segments.push(segment) 
+    }
+    
+//    console.log(rooms.map(function(s){ return s[0][0].toString() + " " + s[0][1].toString() + " " + s[1][0].toString() + " " + s[1][1].toString() }).join("\n"))
+    
+    return rooms
   }
   
-  RegionList.build = function(){
+  RegionList.getSortedSegments = function(){
+    // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
+
+    // re-orientate them so they're either facing up or right
     segments.forEach(function(segment){
-      if (segment[0][0] == segment[1][0]) {
-        if (segment[0][1] > segment[1][1]) {
+      // vertical
+      if (segment[0].a == segment[1].a) {
+        if (segment[0].b > segment[1].b) {
           segment.push(segment.shift())
         }
       }
-      else if (segment[0][1] == segment[1][1]) {
-        if (segment[0][0] > segment[1][0]) {
+      // horizontal
+      else if (segment[0].b == segment[1].b) {
+        if (segment[0].a > segment[1].a) {
           segment.push(segment.shift())
         }
       }
     })
+    
+    // sort them from top to bottom, left to right
     segments = segments.sort(function(a,b){
-      return a[0][0] < b[0][0]
+      if (a[0].a < b[0].a) {
+        return -1
+      }
+      else if (a[0].a == b[0].a) {
+        if (a[0].b < b[0].b) {
+          return -1
+        }
+        else if (a[0].b == b[0].b) {
+          return 0
+        }
+        else {
+          return 1
+        }
+      }
+      else {
+        return 1
+      }
     })
     
-    console.log(segments)
-    
-    // get a list of all segments from these polylines
-    // re-orientate them so they're either facing up or right
-    // loop over them from left to right
-    // 
+    return segments
   }
   
+  function isVertical (segment) { return segment[0].a == segment[1].a }
+  function isHorizontal (segment) { return segment[0].b == segment[1].b }
+  function overlaps (a,b) { return (a[0].b > b[0].b || a[1].b < b[1].b) }
+  function clone_segment(a){ return [a[0].clone(), a[1].clone()] }
   return RegionList
   
 })()
\ No newline at end of file
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)
-- 
cgit v1.2.3-70-g09d2


From 272474767b6ed1f419843c7a205c16f934eeb84f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 23:33:36 -0400
Subject: turn segments into rects

---
 .../rectangles/engine/shapes/regionlist.js         | 54 ++++++++--------------
 .../assets/javascripts/rectangles/models/rect.js   |  6 +++
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  2 +-
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 16 ++++---
 public/assets/javascripts/ui/lib/ToggleableView.js | 19 ++++++++
 views/controls/blueprint/info.ejs                  |  4 +-
 views/controls/builder/info.ejs                    |  4 +-
 views/controls/editor/media-editor.ejs             |  4 +-
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 65 insertions(+), 48 deletions(-)
 create mode 100644 public/assets/javascripts/ui/lib/ToggleableView.js

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 94b902a..42519cf 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -12,7 +12,7 @@ var RegionList = (function(){
     var rooms = []
     var open_segments = []
     
-    var segment, open_segment, vertical, other_side
+    var segment, open_segment, y_segments
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
@@ -21,12 +21,20 @@ var RegionList = (function(){
       }
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
-        if (overlaps(segment, open_segment)) {
+        if (segment.y.overlaps(open_segment.y)) {
           // if we have overlap, it means we have made a full room
-          other_side = clone_segment(open_segment)
-          other_side[0].a = segment[0].a
-          other_side[1].a = segment[1].a
-          rooms.push([open_segment, other_side])
+          
+          y_segments = open_segment.y.split(segment.y)
+          
+          if (y_segments.length == 1) {
+            open_segment.x.b = segment.x.b
+            rooms.push(open_segment)
+          }
+          
+//           other_side = clone_segment(open_segment)
+//           other_side[0].a = segment[0].a
+//           other_side[1].a = segment[1].a
+//           rooms.push([open_segment, other_side])
           open_segments.splice(j, 1)
           j--
         }
@@ -43,8 +51,8 @@ var RegionList = (function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
 
-    // re-orientate them so they're either facing up or right
-    segments.forEach(function(segment){
+    // re-orient them so they're either facing up or right and make them into rects
+    segments = segments.map(function(segment){
       // vertical
       if (segment[0].a == segment[1].a) {
         if (segment[0].b > segment[1].b) {
@@ -57,36 +65,12 @@ var RegionList = (function(){
           segment.push(segment.shift())
         }
       }
+      return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
     })
     
-    // sort them from top to bottom, left to right
-    segments = segments.sort(function(a,b){
-      if (a[0].a < b[0].a) {
-        return -1
-      }
-      else if (a[0].a == b[0].a) {
-        if (a[0].b < b[0].b) {
-          return -1
-        }
-        else if (a[0].b == b[0].b) {
-          return 0
-        }
-        else {
-          return 1
-        }
-      }
-      else {
-        return 1
-      }
-    })
-    
-    return segments
+    return sort.rects_by_position(segments)
   }
-  
-  function isVertical (segment) { return segment[0].a == segment[1].a }
-  function isHorizontal (segment) { return segment[0].b == segment[1].b }
-  function overlaps (a,b) { return (a[0].b > b[0].b || a[1].b < b[1].b) }
-  function clone_segment(a){ return [a[0].clone(), a[1].clone()] }
+
   return RegionList
   
 })()
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 92c8c9e..a4756ed 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -62,6 +62,12 @@
 	Rect.prototype.maxDimension = function(){
 		return abs(this.width) > abs(this.height) ? this.width : this.height
 	}
+	Rect.prototype.isVertical = function(){
+	  return this.x.isPoint()
+	}
+	Rect.prototype.isHorizontal = function(){
+	  return this.y.isPoint()
+	}
 
 	Rect.prototype.mul = function(n){
 		this.x.mul(n)
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 290e45e..90a56c6 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -43,6 +43,9 @@
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
+	vec2.prototype.isPoint = function(){
+		return this.a == this.b
+	}
 	vec2.prototype.add = function(n){
 		this.a += n
 		this.b += n
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 8fe66ca..18ecf5f 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()
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index acd8dcc..252e3f1 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -1,5 +1,5 @@
 
-var BlueprintSettings = FormView.extend({
+var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 	el: "#blueprintSettings",
 	
 	action: "/api/blueprint/edit",
@@ -25,7 +25,13 @@ var BlueprintSettings = FormView.extend({
 	
 	load: function(data){
 		this.$id.val(data._id)
-		this.$name.val(data.name)
+		if (data.name) {
+		  this.$name.val(data.name)
+      this.hide()
+		}
+		else {
+		  this.$name.val("")
+		}
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
@@ -51,10 +57,6 @@ var BlueprintSettings = FormView.extend({
 		}.bind(this))
 	},
 
-	toggle: function(state){
-		this.$el.toggleClass("active", state)
-	},
-
 	enterSubmit: function (e) {
 		e.stopPropagation()
 		var base = this
@@ -105,6 +107,8 @@ var BlueprintSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		this.hide()
+		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 
diff --git a/public/assets/javascripts/ui/lib/ToggleableView.js b/public/assets/javascripts/ui/lib/ToggleableView.js
new file mode 100644
index 0000000..371629f
--- /dev/null
+++ b/public/assets/javascripts/ui/lib/ToggleableView.js
@@ -0,0 +1,19 @@
+var ToggleableView = View.extend({
+
+	toggle: function(state){
+		this.$el.toggleClass("active", state)
+	},
+	
+	show: function(){
+	  this.toggle(true)
+	},
+
+	hide: function(){
+	  this.toggle(false)
+	},
+	
+	visible: function(){
+	  return this.$el.hasClass("active")
+	}
+
+})
\ No newline at end of file
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index 9f7d708..4e2316f 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -15,8 +15,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 8a0e0d5..11e995a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -34,8 +34,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 2a3d4f3..225bdc8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -49,8 +49,8 @@
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 	-->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bc8dacb..865c0f1 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -108,6 +108,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AnimatedView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ToggleableView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script>
-- 
cgit v1.2.3-70-g09d2


From ca76295998fb75e9ab9c83ee9a1a694b9e0656c1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 11:23:46 -0400
Subject: making rooms from segments

---
 .../javascripts/rectangles/engine/map/draw.js      | 18 ++++++++-
 .../rectangles/engine/shapes/regionlist.js         | 46 ++++++++++++----------
 .../javascripts/rectangles/util/constants.js       |  2 +-
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 18 +++++----
 4 files changed, 55 insertions(+), 29 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index cc2f4d8..5824cc8 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -189,9 +189,25 @@ Map.Draw = function(map, opt){
 		var sides = map.sides()
 		var quant = sides.clone().quantize(MAP_GRID_SIZE)
 		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
-			line(x, sides.y.a, x, sides.y.b)
+		  if (Math.round(x) % 10 == 0) {
+        ctx.strokeStyle = "rgba(0,0,0,0.3)"
+        ctx.lineWidth = 1/map.zoom
+		  }
+		  else {
+        ctx.strokeStyle = "rgba(0,0,0,0.05)"
+        ctx.lineWidth = 1/map.zoom
+		  }
+      line(x, sides.y.a, x, sides.y.b)
 		}
 		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
+		  if (Math.round(y) % 10 == 0) {
+        ctx.strokeStyle = "rgba(0,0,0,0.3)"
+        ctx.lineWidth = 1/map.zoom
+		  }
+		  else {
+        ctx.strokeStyle = "rgba(0,0,0,0.05)"
+        ctx.lineWidth = 1/map.zoom
+		  }
 			line(sides.x.a, y, sides.x.b, y)
 		}
 	}
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 42519cf..acb4ead 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -6,45 +6,51 @@ var RegionList = (function(){
   RegionList.build = function(){
     var segments = RegionList.getSortedSegments()
 
+//     var xx = t % (segments[0].x.a - segments[segments.length-1].x.b)
+
     // loop over them from left to right
-//    console.log(segments.map(function(s){ return s.toString() }).join("\n"))
+//   console.log(segments.map(function(s){ return s.toString() }).join("\n"))
 
     var rooms = []
     var open_segments = []
     
-    var segment, open_segment, y_segments
+    var segment, open_segment, x_segment, y_segments, overlapped
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
-      if (! isVertical(segment)) {
+      if (! segment.isVertical()) {
         continue
       }
+      overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
         if (segment.y.overlaps(open_segment.y)) {
           // if we have overlap, it means we have made a full room
-          
-          y_segments = open_segment.y.split(segment.y)
-          
-          if (y_segments.length == 1) {
-            open_segment.x.b = segment.x.b
-            rooms.push(open_segment)
-          }
-          
-//           other_side = clone_segment(open_segment)
-//           other_side[0].a = segment[0].a
-//           other_side[1].a = segment[1].a
-//           rooms.push([open_segment, other_side])
-          open_segments.splice(j, 1)
-          j--
+          console.log(segment.y+"", "overlaps", open_segment.y+"")
+          overlapped = true
+          open_segments.splice(j--, 1)
+
+          x_segment = new vec2( open_segment.x.a, segment.x.b )
+          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          console.log(y_segments.map(function(s){ return s+"" }).join("\n"))
+          y_segments.forEach(function(seg){
+
+            rooms.push(new Rect( x_segment, seg[0] ))
+
+            var new_seg = new Rect( segment.x, seg[0] )
+            open_segments.shift(new_seg)
+            j++
+          })
         }
       }
-      open_segments.push(segment) 
+      if (! overlapped) {
+        open_segments.push(segment)
+      }
     }
     
-//    console.log(rooms.map(function(s){ return s[0][0].toString() + " " + s[0][1].toString() + " " + s[1][0].toString() + " " + s[1][1].toString() }).join("\n"))
+//   console.log(rooms.map(function(s){ return s.toString() }).join("\n"))
     
-    return rooms
+    return { rooms: rooms, open_segments: open_segments, segments: segments }
   }
   
   RegionList.getSortedSegments = function(){
diff --git a/public/assets/javascripts/rectangles/util/constants.js b/public/assets/javascripts/rectangles/util/constants.js
index a70cacd..522689b 100644
--- a/public/assets/javascripts/rectangles/util/constants.js
+++ b/public/assets/javascripts/rectangles/util/constants.js
@@ -22,7 +22,7 @@ var height_min = 200,
 		resize_margin = 8,
 		cursor_amp = 1.5,
 		DEFAULT_PICTURE_WIDTH = 350,
-		MAP_GRID_SIZE = 360          // 10 feet
+		MAP_GRID_SIZE = 36          // 10 feet
 
 var painting_distance_from_wall = 10,
 		dot_distance_from_picture = 3,
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 18ecf5f..7ec1352 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -5,6 +5,8 @@ var last_point = new vec2 (0,0)
 
 var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 
+  rooms: [],
+
   initialize: function(opt){
     this.parent = opt.parent
 
@@ -81,6 +83,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
+    this.rooms = RegionList.build()
   },
   
   animate: function(t, dt){
@@ -93,7 +96,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,13 +116,14 @@ 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){
+    this.rooms.segments.forEach(function(seg,i){
+      map.draw.ctx.fillStyle = "#f00"
+      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+1, seg.height()+1 )
+    })
+
+    this.rooms.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.fillRect( room.x.a, room.y.a, room.width(), room.height() )
     })
 
     map.draw.ctx.restore()
-- 
cgit v1.2.3-70-g09d2


From 62c899384b0cf4aab6288f662e12f11321de95df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 12:55:44 -0400
Subject: getting full coverage with rooms

---
 .../assets/javascripts/rectangles/engine/shapes/polyline.js  |  2 +-
 .../javascripts/rectangles/engine/shapes/regionlist.js       | 12 +++++++-----
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js    | 11 ++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 99c8fda..6c64128 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -47,7 +47,7 @@ var Polyline = Fiber.extend(function(base){
     return null
 	}
 	exports.hasEndPointNear = function(p){
-	  if (this.closed) return null
+	  if (this.closed || ! this.points.length) return null
     if (this.firstPoint().distanceTo( p ) < 10/map.zoom) {
       return this.firstPoint()
     }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index acb4ead..f86968f 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -13,6 +13,7 @@ var RegionList = (function(){
 
     var rooms = []
     var open_segments = []
+    var closed_segments = []
     
     var segment, open_segment, x_segment, y_segments, overlapped
 
@@ -21,6 +22,7 @@ var RegionList = (function(){
       if (! segment.isVertical()) {
         continue
       }
+      console.log(segment+"")
       overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
@@ -28,17 +30,17 @@ var RegionList = (function(){
           // if we have overlap, it means we have made a full room
           console.log(segment.y+"", "overlaps", open_segment.y+"")
           overlapped = true
+          closed_segments.push(open_segments[j])
           open_segments.splice(j--, 1)
 
           x_segment = new vec2( open_segment.x.a, segment.x.b )
-          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          y_segments = open_segment.y.split(segment.y, TOP, BOTTOM)
           console.log(y_segments.map(function(s){ return s+"" }).join("\n"))
           y_segments.forEach(function(seg){
-
             rooms.push(new Rect( x_segment, seg[0] ))
 
             var new_seg = new Rect( segment.x, seg[0] )
-            open_segments.shift(new_seg)
+            open_segments.unshift(new_seg)
             j++
           })
         }
@@ -49,8 +51,8 @@ var RegionList = (function(){
     }
     
 //   console.log(rooms.map(function(s){ return s.toString() }).join("\n"))
-    
-    return { rooms: rooms, open_segments: open_segments, segments: segments }
+    console.log({ rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments })
+    return { rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments }
   }
   
   RegionList.getSortedSegments = function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 7ec1352..cf9dea6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -116,9 +116,14 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
 
-    this.rooms.segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "#f00"
-      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+1, seg.height()+1 )
+    this.rooms.open_segments.forEach(function(seg,i){
+      map.draw.ctx.fillStyle = "#00f"
+      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
+    })
+
+    this.rooms.closed_segments.forEach(function(seg,i){
+      map.draw.ctx.fillStyle = "#0ff"
+      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
     })
 
     this.rooms.rooms.forEach(function(room,i){
-- 
cgit v1.2.3-70-g09d2


From 0c1864a114a2efe1a3bb8b2b4951e8655712757a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 15:19:05 -0400
Subject: dedupe new rooms

---
 .../javascripts/rectangles/engine/map/draw.js      |  4 +-
 .../rectangles/engine/shapes/regionlist.js         | 62 +++++++++++++++++-----
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  8 +--
 4 files changed, 58 insertions(+), 19 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 5824cc8..f47f10c 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -189,7 +189,7 @@ Map.Draw = function(map, opt){
 		var sides = map.sides()
 		var quant = sides.clone().quantize(MAP_GRID_SIZE)
 		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
-		  if (Math.round(x) % 10 == 0) {
+		  if (Math.round(x) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
 		  }
@@ -200,7 +200,7 @@ Map.Draw = function(map, opt){
       line(x, sides.y.a, x, sides.y.b)
 		}
 		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
-		  if (Math.round(y) % 10 == 0) {
+		  if (Math.round(y) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
 		  }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index f86968f..93a0df7 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -6,52 +6,86 @@ var RegionList = (function(){
   RegionList.build = function(){
     var segments = RegionList.getSortedSegments()
 
-//     var xx = t % (segments[0].x.a - segments[segments.length-1].x.b)
-
-    // loop over them from left to right
-//   console.log(segments.map(function(s){ return s.toString() }).join("\n"))
-
     var rooms = []
+    var seen_rooms = {}
     var open_segments = []
     var closed_segments = []
     
-    var segment, open_segment, x_segment, y_segments, overlapped
+    var segment, open_segment, x_segment, y_segments, overlapped, seen_segments
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
       if (! segment.isVertical()) {
         continue
       }
-      console.log(segment+"")
       overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
         if (segment.y.overlaps(open_segment.y)) {
-          // if we have overlap, it means we have made a full room
-          console.log(segment.y+"", "overlaps", open_segment.y+"")
           overlapped = true
           closed_segments.push(open_segments[j])
           open_segments.splice(j--, 1)
 
           x_segment = new vec2( open_segment.x.a, segment.x.b )
           y_segments = open_segment.y.split(segment.y, TOP, BOTTOM)
-          console.log(y_segments.map(function(s){ return s+"" }).join("\n"))
+          
+          seen_segments = {}
+
           y_segments.forEach(function(seg){
-            rooms.push(new Rect( x_segment, seg[0] ))
+            seen_segments[ seg[0]+"" ] = true
+            var room = new Rect( x_segment, seg[0] )
+
+            if (seen_rooms[ room+"" ]) return;
+
+            seen_rooms[ room+"" ] = true
+            rooms.push(room)
+            var new_seg = new Rect( segment.x, seg[0] )
+            open_segments.unshift(new_seg)
+            j++
+          })
 
+          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          y_segments.forEach(function(seg){
+            if (seen_segments[ seg[0]+"" ]) return;
             var new_seg = new Rect( segment.x, seg[0] )
             open_segments.unshift(new_seg)
             j++
           })
         }
       }
-      if (! overlapped) {
+      if (overlapped) {
+        // sort open segments?
+        open_segments = open_segments.sort(function(a,b){
+          if (a.y.a < b.y.a) { return -1 }
+          if (a.y.a == b.y.a) { return 0 }
+          if (a.y.a > b.y.a) { return 1 }
+        })
+        
+        if (open_segments.length < 2) { continue }
+        
+        for (var k = 1; k < open_segments.length; k++) {
+          if (open_segments[k-1].y.containsVec(open_segments[k].y)) {
+            open_segments.splice(k--, 1)
+          }
+          else if (open_segments[k-1].y.overlaps(open_segments[k].y)) {
+            open_segments[k].y = open_segments[k].y.clone()
+            console.log(open_segments[k-1].y+"", open_segments[k].y+"")
+            open_segments[k].y.a = open_segments[k-1].y.b
+          }
+        }
+      }
+      else {
         open_segments.push(segment)
       }
     }
     
-//   console.log(rooms.map(function(s){ return s.toString() }).join("\n"))
-    console.log({ rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments })
+    for (var i = 0; i < segments.length; i++) {
+      segment = segments[i]
+      if (! segment.isHorizontal()) {
+        continue
+      }
+    }
+
     return { rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments }
   }
   
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 90a56c6..d37bc12 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -111,6 +111,9 @@
 	vec2.prototype.containsDisc = function(n,r){
 		return this.a <= n-r && n+r <= this.b
 	}
+	vec2.prototype.containsVec = function(v){
+		return this.a <= v.a && v.b <= this.b
+	}
 	vec2.prototype.clamp = function(n){
 		return clamp(n, this.a, this.b)
 	}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index cf9dea6..0b27d0c 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -108,7 +108,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     }
 
     shapes.forEach(function(shape){
-      shape.draw(map.draw.ctx)
+//      shape.draw(map.draw.ctx)
     })
 
     map.draw.ctx.strokeStyle = "#f00";
@@ -117,14 +117,16 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.camera(scene.camera)
 
     this.rooms.open_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "#00f"
+      map.draw.ctx.fillStyle = "rgba(0,0,255,0.2)"
       map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
     })
 
     this.rooms.closed_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "#0ff"
+      map.draw.ctx.fillStyle = "rgba(0,255,0,0.2)"
       map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
     })
+    
+    var colors = ["rgba(0,0,0,0.1)"]
 
     this.rooms.rooms.forEach(function(room,i){
       map.draw.ctx.fillStyle = colors[i % colors.length]
-- 
cgit v1.2.3-70-g09d2


From 3e87dcb3de9ad29f7c021792cbafc32d4c758d3f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 16:05:55 -0400
Subject: assigning sides

---
 .../javascripts/rectangles/engine/map/draw.js      | 14 -----
 .../rectangles/engine/shapes/regionlist.js         | 59 +++++++++++++++++++---
 .../javascripts/ui/blueprint/BlueprintEditor.js    | 24 +++------
 3 files changed, 59 insertions(+), 38 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index f47f10c..c97603b 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -169,20 +169,6 @@ Map.Draw = function(map, opt){
 	}
 
 	draw.coords = function(){
-		/*
-		ctx.fillStyle = "#888";
-		dot_at(0,0)
-		ctx.fillStyle = "#bbb";
-		dot_at(100,0)
-		dot_at(0,100)
-		ctx.fillStyle = "#ddd";
-		dot_at(200,0)
-		dot_at(0,200)
-		ctx.fillStyle = "#eee";
-		dot_at(300,0)
-		dot_at(0,300)
-		*/
-		
 		ctx.strokeStyle = "rgba(0,0,0,0.1)"
 		ctx.lineWidth = 1/map.zoom
 		
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 93a0df7..fb2c8e5 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -27,7 +27,7 @@ var RegionList = (function(){
           open_segments.splice(j--, 1)
 
           x_segment = new vec2( open_segment.x.a, segment.x.b )
-          y_segments = open_segment.y.split(segment.y, TOP, BOTTOM)
+          y_segments = open_segment.y.split(segment.y, 0, 0)
           
           seen_segments = {}
 
@@ -35,9 +35,11 @@ var RegionList = (function(){
             seen_segments[ seg[0]+"" ] = true
             var room = new Rect( x_segment, seg[0] )
 
-            if (seen_rooms[ room+"" ]) return;
-
+            if (seen_rooms[ room+"" ]) return
             seen_rooms[ room+"" ] = true
+            
+            room.sides = 0
+            
             rooms.push(room)
             var new_seg = new Rect( segment.x, seg[0] )
             open_segments.unshift(new_seg)
@@ -54,7 +56,6 @@ var RegionList = (function(){
         }
       }
       if (overlapped) {
-        // sort open segments?
         open_segments = open_segments.sort(function(a,b){
           if (a.y.a < b.y.a) { return -1 }
           if (a.y.a == b.y.a) { return 0 }
@@ -69,7 +70,6 @@ var RegionList = (function(){
           }
           else if (open_segments[k-1].y.overlaps(open_segments[k].y)) {
             open_segments[k].y = open_segments[k].y.clone()
-            console.log(open_segments[k-1].y+"", open_segments[k].y+"")
             open_segments[k].y.a = open_segments[k-1].y.b
           }
         }
@@ -79,14 +79,57 @@ var RegionList = (function(){
       }
     }
     
+    var splits, splitter
+    
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
-      if (! segment.isHorizontal()) {
-        continue
+      var horizontal = segment.isHorizontal(), vertical = segment.isVertical()
+      for (var r = 0; r < rooms.length; r++){
+        room = rooms[r]
+        if (vertical) {
+          if (segment.y.containsVec(room.y)) {
+            if (segment.x.a == room.x.a) {
+              room.sides |= LEFT
+            }
+            if (segment.x.a == room.x.b) {
+              room.sides |= RIGHT
+            }
+          }
+        }
+        if (horizontal) {
+          if (segment.x.containsVec(room.x)) {
+            if (segment.y.a == room.y.a) {
+              room.sides |= FRONT
+            }
+            if (segment.y.a == room.y.b) {
+              room.sides |= BACK
+            }
+          }
+/*
+          else if ((segment.y.a == room.y.a || segment.y.a == room.y.b) && room.x.containsVec(segment.x)) {
+            splits = room.x.split(segment.x, LEFT, RIGHT)
+            for (var k = 0; k < splits.length; k++) {
+              splitter = splits[k]
+              var new_room = new Rect( splitter[0], room.y )
+              new_room.sides |= splitter[1]
+              if (segment.x.containsVec(splitter[0])) {
+                if (segment.y.a == room.y.a) {
+                  room.sides |= FRONT
+                }
+                if (segment.y.a == room.y.b) {
+                  room.sides |= BACK
+                }
+              }
+              rooms.unshift(new_room)
+              r++
+            }
+          }
+*/
+        }
       }
     }
 
-    return { rooms: rooms, open_segments: open_segments, segments: segments, closed_segments: closed_segments }
+    return { rooms: rooms }
   }
   
   RegionList.getSortedSegments = function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 0b27d0c..c7aa219 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -108,30 +108,22 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     }
 
     shapes.forEach(function(shape){
-//      shape.draw(map.draw.ctx)
+      shape.draw(map.draw.ctx)
     })
 
     map.draw.ctx.strokeStyle = "#f00";
     map.draw.x_at(0,0)
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
-
-    this.rooms.open_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "rgba(0,0,255,0.2)"
-      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
-    })
-
-    this.rooms.closed_segments.forEach(function(seg,i){
-      map.draw.ctx.fillStyle = "rgba(0,255,0,0.2)"
-      map.draw.ctx.fillRect( seg.x.a, seg.y.a, seg.width()+10, seg.height() )
-    })
     
-    var colors = ["rgba(0,0,0,0.1)"]
+//    var colors = ["rgba(0,0,0,0.1)"]
 
-    this.rooms.rooms.forEach(function(room,i){
-      map.draw.ctx.fillStyle = colors[i % colors.length]
-      map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
-    })
+    map.draw.regions(this.rooms.rooms, colors, "#000")
+
+//     this.rooms.rooms.forEach(function(room,i){
+//       map.draw.ctx.fillStyle = colors[i % colors.length]
+//       map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
+//     })
 
     map.draw.ctx.restore()
   },
-- 
cgit v1.2.3-70-g09d2


From 73fdf8d46f10793d210f4369adb8c31afa536d20 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 21 Aug 2015 16:59:48 -0400
Subject: thinking

---
 .../rectangles/engine/shapes/regionlist.js         | 33 +++++++++++++---------
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 2 files changed, 22 insertions(+), 14 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index fb2c8e5..b2672ad 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -106,22 +106,27 @@ var RegionList = (function(){
             }
           }
 /*
-          else if ((segment.y.a == room.y.a || segment.y.a == room.y.b) && room.x.containsVec(segment.x)) {
-            splits = room.x.split(segment.x, LEFT, RIGHT)
-            for (var k = 0; k < splits.length; k++) {
-              splitter = splits[k]
-              var new_room = new Rect( splitter[0], room.y )
-              new_room.sides |= splitter[1]
-              if (segment.x.containsVec(splitter[0])) {
-                if (segment.y.a == room.y.a) {
-                  room.sides |= FRONT
-                }
-                if (segment.y.a == room.y.b) {
-                  room.sides |= BACK
+          else if (segment.y.a == room.y.a || segment.y.a == room.y.b)  {
+            if (room.x.overlaps(segment.x)) {
+              splits = room.x.split(segment.x, LEFT, RIGHT)
+              rooms.splice(r--, 1)
+              console.log(splits)
+              for (var k = 0; k < splits.length; k++) {
+                splitter = splits[k]
+                var new_room = new Rect( splitter[0], room.y )
+                new_room.sides = 0
+                new_room.sides |= splitter[1]
+                if (segment.x.containsVec( splitter[0] )) {
+                  if (segment.y.a == new_room.y.a) {
+                    new_room.sides |= FRONT
+                  }
+                  if (segment.y.a == new_room.y.b) {
+                    new_room.sides |= BACK
+                  }
                 }
+                rooms.unshift(new_room)
+                r++
               }
-              rooms.unshift(new_room)
-              r++
             }
           }
 */
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index d37bc12..226e56f 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -114,6 +114,9 @@
 	vec2.prototype.containsVec = function(v){
 		return this.a <= v.a && v.b <= this.b
 	}
+	vec2.prototype.containsCenterVec = function(v){
+		return this.a < v.a && v.b < this.b
+	}
 	vec2.prototype.clamp = function(n){
 		return clamp(n, this.a, this.b)
 	}
-- 
cgit v1.2.3-70-g09d2


From 0d2ff65db2cf26c993245dae752dfb52b8cb2819 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 10:46:29 -0400
Subject: generating all room sides

---
 .../assets/javascripts/rectangles/engine/shapes/regionlist.js  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index b2672ad..71f19d8 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -105,18 +105,18 @@ var RegionList = (function(){
               room.sides |= BACK
             }
           }
-/*
+
           else if (segment.y.a == room.y.a || segment.y.a == room.y.b)  {
             if (room.x.overlaps(segment.x)) {
-              splits = room.x.split(segment.x, LEFT, RIGHT)
+              splits = room.x.split(segment.x, room.sides & LEFT, room.sides & RIGHT)
               rooms.splice(r--, 1)
               console.log(splits)
               for (var k = 0; k < splits.length; k++) {
                 splitter = splits[k]
                 var new_room = new Rect( splitter[0], room.y )
                 new_room.sides = 0
-                new_room.sides |= splitter[1]
-                if (segment.x.containsVec( splitter[0] )) {
+                new_room.sides |= splitter[1] | ( room.sides & FRONT_BACK )
+                if (segment.x.overlaps( splitter[0] )) {
                   if (segment.y.a == new_room.y.a) {
                     new_room.sides |= FRONT
                   }
@@ -129,7 +129,7 @@ var RegionList = (function(){
               }
             }
           }
-*/
+
         }
       }
     }
-- 
cgit v1.2.3-70-g09d2


From 48fc9b27a77126da649959c8f74ad8faffcd6e2c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 11:15:50 -0400
Subject: comment the regionlist algorithm

---
 .../javascripts/rectangles/engine/map/_map.js      |  6 +-
 .../javascripts/rectangles/engine/rooms/builder.js |  1 +
 .../rectangles/engine/shapes/polyline.js           |  4 ++
 .../rectangles/engine/shapes/regionlist.js         | 83 ++++++++++++++++------
 .../rectangles/engine/shapes/shapelist.js          |  2 +
 .../assets/javascripts/rectangles/models/vec2.js   |  4 +-
 .../assets/javascripts/rectangles/models/wall.js   |  5 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  5 +-
 8 files changed, 79 insertions(+), 31 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 2aee962..e27346d 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -69,9 +69,9 @@ var Map = function(opt){
 			break
 	}
 	
-	base.resize = function(){
-		canvas.width = base.dimensions.a = window.innerWidth
-		canvas.height = base.dimensions.b = window.innerHeight
+	base.resize = function(w, h){
+		canvas.width = base.dimensions.a = w || window.innerWidth
+		canvas.height = base.dimensions.b = h || window.innerHeight
 		// resize here - esp if 2d-hires
 	}
 		
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 5e09fab..f78fb91 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -14,6 +14,7 @@
 		PI = Math.PI
 		HALF_PI = PI/2
 		TOP = CEILING, BOTTOM = FLOOR
+		$ = { browser: { mozilla: false } }
 		function sidesToString(sides){
 			var s = ""
 			if (sides & FRONT) s += "front "
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 6c64128..609a2c8 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -1,3 +1,7 @@
+// A Polyline is a set of points inputted by the user using the V2 editor to trace a blueprint.
+// Additionally, it manages a set of MX objects which correspond to the walls in 3D.
+// In this way, it attempts to bridge the 2D (canvas, imperative) and 3D (css, declarative) views.
+
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
 	exports.init = function(){
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 71f19d8..663f3fd 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -1,36 +1,58 @@
+// This algorithm takes the polylines from ShapeList as input and produces
+// a set of Rooms which can be used by the existing V1 mover and editor.
+
+// The algorithm assumes that
+// 1) all angles are orthogonal
+// 2) all polylines are closed
+
 var RegionList = (function(){
 
   var RegionList = {}
   var regions = RegionList.regions
 
   RegionList.build = function(){
+  
+    // first, get the segments sorted right to left & top to bottom
     var segments = RegionList.getSortedSegments()
 
     var rooms = []
     var seen_rooms = {}
     var open_segments = []
-    var closed_segments = []
     
     var segment, open_segment, x_segment, y_segments, overlapped, seen_segments
 
+    // first pass: generate rooms from the vertical segments only
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
       if (! segment.isVertical()) {
         continue
       }
+
+      // check all the "open segments" we know about, i.e. rooms where we've only found
+      // the right wall.
       overlapped = false
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
+        
+        // if these two segments overlap each other, then there is a room between them.
         if (segment.y.overlaps(open_segment.y)) {
           overlapped = true
-          closed_segments.push(open_segments[j])
           open_segments.splice(j--, 1)
 
+          // the X part of the room will be the span between these two vertical segments'
+          // X components.  the Y part of the room is the "split" or subdivision between
+          // the two horizontal vectors.
+          
+          // the split function is non-commutative,
+          // so we need to call A split B and B split A,
+          // then dedupe the segments we got back..
           x_segment = new vec2( open_segment.x.a, segment.x.b )
           y_segments = open_segment.y.split(segment.y, 0, 0)
           
           seen_segments = {}
 
+          // check each of the splits.. if the two segments overlap, then we definitely
+          // have a room here.
           y_segments.forEach(function(seg){
             seen_segments[ seg[0]+"" ] = true
             var room = new Rect( x_segment, seg[0] )
@@ -46,7 +68,8 @@ var RegionList = (function(){
             j++
           })
 
-          y_segments = segment.y.split(open_segment.y, TOP, BOTTOM)
+          // splitting the other way..
+          y_segments = segment.y.split(open_segment.y, 0, 0)
           y_segments.forEach(function(seg){
             if (seen_segments[ seg[0]+"" ]) return;
             var new_seg = new Rect( segment.x, seg[0] )
@@ -55,6 +78,9 @@ var RegionList = (function(){
           })
         }
       }
+      
+      // if we have overlap, then re-sort the open segments Y-wise
+      // and (again) dedupe..
       if (overlapped) {
         open_segments = open_segments.sort(function(a,b){
           if (a.y.a < b.y.a) { return -1 }
@@ -74,6 +100,7 @@ var RegionList = (function(){
           }
         }
       }
+      // if we don't have any overlap, then this is a new open segment.
       else {
         open_segments.push(segment)
       }
@@ -81,11 +108,15 @@ var RegionList = (function(){
     
     var splits, splitter
     
+    // second pass: now that we have a bunch of rooms, assign sides to all of them.
+    // sides are used in the "mover" script to do bounds checking.
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
       var horizontal = segment.isHorizontal(), vertical = segment.isVertical()
       for (var r = 0; r < rooms.length; r++){
         room = rooms[r]
+
+        // vertical segments determine the left and right edges of the room, fairly simply.
         if (vertical) {
           if (segment.y.containsVec(room.y)) {
             if (segment.x.a == room.x.a) {
@@ -96,6 +127,8 @@ var RegionList = (function(){
             }
           }
         }
+        
+        // horizontal segments determine the front and back edges of the room.
         if (horizontal) {
           if (segment.x.containsVec(room.x)) {
             if (segment.y.a == room.y.a) {
@@ -105,28 +138,30 @@ var RegionList = (function(){
               room.sides |= BACK
             }
           }
-
-          else if (segment.y.a == room.y.a || segment.y.a == room.y.b)  {
-            if (room.x.overlaps(segment.x)) {
-              splits = room.x.split(segment.x, room.sides & LEFT, room.sides & RIGHT)
-              rooms.splice(r--, 1)
-              console.log(splits)
-              for (var k = 0; k < splits.length; k++) {
-                splitter = splits[k]
-                var new_room = new Rect( splitter[0], room.y )
-                new_room.sides = 0
-                new_room.sides |= splitter[1] | ( room.sides & FRONT_BACK )
-                if (segment.x.overlaps( splitter[0] )) {
-                  if (segment.y.a == new_room.y.a) {
-                    new_room.sides |= FRONT
-                  }
-                  if (segment.y.a == new_room.y.b) {
-                    new_room.sides |= BACK
-                  }
+          
+          // however, since we did not split on horizontal segments, our rooms may
+          // only have partial overlap with these segments, in which case we need to
+          // split the rooms apart.
+          else if ((segment.y.a == room.y.a || segment.y.a == room.y.b) && room.x.overlaps(segment.x)) {
+            
+            // split the room across the segment. preserve whether or not we know the
+            // room borders a segment on the left or right.
+            splits = room.x.split(segment.x, room.sides & LEFT, room.sides & RIGHT)
+            rooms.splice(r--, 1)
+            for (var k = 0; k < splits.length; k++) {
+              splitter = splits[k]
+              var new_room = new Rect( splitter[0], room.y )
+              new_room.sides = splitter[1] | ( room.sides & FRONT_BACK )
+              if (segment.x.overlaps( splitter[0] )) {
+                if (segment.y.a == new_room.y.a) {
+                  new_room.sides |= FRONT
+                }
+                if (segment.y.a == new_room.y.b) {
+                  new_room.sides |= BACK
                 }
-                rooms.unshift(new_room)
-                r++
               }
+              rooms.unshift(new_room)
+              r++
             }
           }
 
@@ -137,6 +172,8 @@ var RegionList = (function(){
     return { rooms: rooms }
   }
   
+  
+  // Gets a list of polylines from the ShapeList and sorts the segments.
   RegionList.getSortedSegments = function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 4373caf..90714c2 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -1,3 +1,5 @@
+// The ShapeList manages the list of polylines which form a V2 layout.
+
 var ShapeList = Fiber.extend(function(base){
   var exports = {}
   exports.init = function(){
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 226e56f..8942d92 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -214,13 +214,13 @@
 	}
 
 	vec2.prototype.toString = function(){
-		return "[" + round(this.a) + " " + round(this.b) + "]"
+		return "[" + Math.round(this.a) + " " + Math.round(this.b) + "]"
 	}
 	vec2.prototype.exactString = function(){
 		return "[" + this.a + " " + this.b + "]"
 	}
 	vec2.prototype.serialize = function(){
-		return [ round(this.a), round(this.b) ]
+		return [ Math.round(this.a), Math.round(this.b) ]
 	}
 	vec2.prototype.deserialize = function(data){
 		this.a = data[0]
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 13f5cd7..9d4650b 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -10,6 +10,11 @@
 		vec2 = require('./vec2')
 		Rect = require('./rect')
 		UidGenerator = require('../util/uid')
+		wall_rotation = {}
+    wall_rotation[FRONT] = PI
+    wall_rotation[BACK] = 0
+    wall_rotation[LEFT] = HALF_PI
+    wall_rotation[RIGHT] = -HALF_PI
 	}
 	
 	var Wall = function(opt){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 39cf62e..a341a24 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -62,8 +62,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     if (this.parent.orbiting) {
       scene.width = window.innerWidth/2
       scene.height = window.innerHeight
-      this.parent.map.canvas.width = this.parent.map.dimensions.a = window.innerWidth/2
-      this.parent.map.canvas.height = this.parent.map.dimensions.b = window.innerHeight
+      this.parent.map.resize( window.innerWidth/2, window.innerHeight )
       this.parent.map.canvas.style.display = "block"
     }
     else {
@@ -119,7 +118,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 //    var colors = ["rgba(0,0,0,0.1)"]
 //     var colors = ["rgba(255,255,255,1)"]
 // 
-//     map.draw.regions(this.rooms.rooms, colors, "#000")
+    map.draw.regions(this.rooms.rooms, colors, "#000")
 
 //     this.rooms.rooms.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
-- 
cgit v1.2.3-70-g09d2


From a9bf197a6e8f91cc91d772238168d9be1beb3c4d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 12:15:14 -0400
Subject: makin sure tests work

---
 .../javascripts/rectangles/engine/map/tools/line.js      | 16 +++++++++++++++-
 .../javascripts/rectangles/engine/map/tools/ortho.js     |  2 ++
 .../javascripts/rectangles/engine/map/tools/polyline.js  |  2 ++
 .../javascripts/rectangles/engine/shapes/polyline.js     |  1 -
 .../javascripts/rectangles/engine/shapes/regionlist.js   |  2 +-
 .../javascripts/rectangles/engine/shapes/shapelist.js    |  7 ++++++-
 .../assets/javascripts/ui/blueprint/BlueprintEditor.js   |  8 ++++----
 .../assets/javascripts/ui/blueprint/BlueprintSettings.js |  1 +
 public/assets/test/ortho2.html                           |  9 ++++++++-
 9 files changed, 39 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index 8f409a8..8fe4fff 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,3 +1,6 @@
+// This tool lets you define a very simple line between two points.
+// It is used by the BlueprintScaler to specify a sample distance to scale.
+
 var LineTool = MapTool.extend(function(base){
 	var exports = {}
 	
@@ -8,6 +11,17 @@ var LineTool = MapTool.extend(function(base){
 	var can_drag, dragging
 	
 	exports.down = function(e, cursor){
+
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      cursor.quantize(1/map.zoom)
+      app.router.blueprintView.map.center.a = cursor.x.a
+      app.router.blueprintView.map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      return
+    }
+    
 	  this.cursor = cursor
 	  switch (line.length) {
 	    case 0:
@@ -44,6 +58,6 @@ var LineTool = MapTool.extend(function(base){
 	exports.up = function(e, cursor){
 	  can_drag = dragging = false
 	}
-	
+
 	return exports
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index ef41096..918ac0d 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -14,6 +14,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
         map.ui.placing = false
         if (shapes.workline.points.length > 2) {
           shapes.workline.build()
+          shapes.add(shapes.workline)
         }
         else {
           shapes.workline.reset()
@@ -35,6 +36,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
       else if (shapes.workline.canCloseWith(p)) {
         shapes.workline.close()
         shapes.workline.build()
+        shapes.add(shapes.workline)
         map.ui.placing = false
       }
       else {
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
index 1ab86f6..6716180 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -11,6 +11,7 @@ var PolylineTool = MapTool.extend(function (base) {
         map.ui.placing = false
         if (shapes.workline.points.length > 2) {
           shapes.workline.build()
+          shapes.add(shapes.workline)
         }
         else {
           shapes.workline.reset()
@@ -27,6 +28,7 @@ var PolylineTool = MapTool.extend(function (base) {
       if (shapes.workline.canCloseWith(p)) {
         shapes.workline.close()
         shapes.workline.build()
+        shapes.add(shapes.workline)
         map.ui.placing = false
       }
       else {
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 609a2c8..54e11c6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -133,7 +133,6 @@ var Polyline = Fiber.extend(function(base){
   exports.build = function(){
     this.mx_points && this.mx_points.forEach(function(mx){ scene.remove(mx) })
     this.mx = new MX.Polyline(this)
-    shapes.add(this)
   }
   exports.rebuild = function(){
     this.mx.rebuild()
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 663f3fd..86269a6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -169,7 +169,7 @@ var RegionList = (function(){
       }
     }
 
-    return { rooms: rooms }
+    return rooms
   }
   
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 90714c2..9cbf165 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -85,8 +85,13 @@ var ShapeList = Fiber.extend(function(base){
     data && data.forEach(function(points){
       var line = new Polyline()
       line.deserialize(points)
-      line.build()
+      shapes.add(line)
     }.bind(this))
   }
+  exports.build = function(){
+    this.shapes.forEach(function(shape){
+      shape.build()
+    })
+  }
   return exports
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index a341a24..547cdca 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -5,7 +5,7 @@ var last_point = new vec2 (0,0)
 
 var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 
-  rooms: [],
+  regions: [],
 
   initialize: function(opt){
     this.parent = opt.parent
@@ -82,7 +82,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
-    this.rooms = RegionList.build()
+    this.regions = RegionList.build()
   },
   
   animate: function(t, dt){
@@ -118,9 +118,9 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
 //    var colors = ["rgba(0,0,0,0.1)"]
 //     var colors = ["rgba(255,255,255,1)"]
 // 
-    map.draw.regions(this.rooms.rooms, colors, "#000")
+    map.draw.regions(this.regions, colors, "#000")
 
-//     this.rooms.rooms.forEach(function(room,i){
+//     this.regions.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
 //       map.draw.ctx.fillRect( room.x.a, room.y.a, room.width(), room.height() )
 //     })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 252e3f1..9c8808a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -35,6 +35,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
+      shapes.build()
 		}
 		this.data = data
 	},
diff --git a/public/assets/test/ortho2.html b/public/assets/test/ortho2.html
index 448f029..ef77256 100644
--- a/public/assets/test/ortho2.html
+++ b/public/assets/test/ortho2.html
@@ -58,7 +58,9 @@ body {
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-<script src="/assets/javascripts/rectangles/engine/map/ui_ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
 <script src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
 
 <script>
@@ -73,6 +75,7 @@ var MapTool = Fiber.extend(function(base){
 	  move: function(e, cursor){},
 	  drag: function(e, cursor){},
 	  up: function(e, cursor, new_cursor){},
+	  cancel: function(){},
   }
   return exports
 })
@@ -150,6 +153,7 @@ var PolylineTool = MapTool.extend(function (base) {
 })
 
 var scene, map, controls
+var last_point = new vec2(0,0)
 
 map = new Map ({
 	type: "ortho",
@@ -161,6 +165,7 @@ map = new Map ({
 map.ui.add_tool("arrow", new ArrowTool)
 map.ui.add_tool("polyline", new PolylineTool)
 map.ui.add_tool("position", new PositionTool)
+map.ui.set_tool("arrow")
 
 $(window).resize(function(){
   scene.width = window.innerWidth/2
@@ -174,6 +179,8 @@ var shapes = []
 var ctx = map.draw.ctx
 var last_point
 
+shapes.findClosestPoint = function(){}
+
 function polyline (points, finished) {
   if (! points) return
   if (points.length == 1) {
-- 
cgit v1.2.3-70-g09d2


From 630c08b712a2ace833217428f1ef20bddc0b975d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 25 Aug 2015 18:32:14 -0400
Subject: blueprint integration into project editor

---
 .../javascripts/rectangles/engine/rooms/_rooms.js  | 32 +++++++++
 public/assets/javascripts/ui/_router.js            | 75 +++++++++++++---------
 .../javascripts/ui/blueprint/BlueprintSettings.js  |  3 +
 .../javascripts/ui/blueprint/BlueprintView.js      |  2 +-
 .../assets/javascripts/ui/builder/BuilderInfo.js   |  4 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |  7 +-
 public/assets/javascripts/ui/editor/EditorView.js  |  5 ++
 server/lib/api/blueprint.js                        |  3 +
 server/lib/api/projects.js                         | 14 +++-
 server/lib/schemas/Blueprint.js                    |  1 +
 server/lib/schemas/Project.js                      |  2 +
 server/lib/util.js                                 |  4 ++
 12 files changed, 117 insertions(+), 35 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 46c1d7f..d4281ad 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -37,6 +37,7 @@
 	
 		base.list = {}
 		base.regions = []
+		base.shapesMode = false
 
 		base.uid = new UidGenerator(base.list)
 
@@ -95,6 +96,7 @@
 		}
 		
 		base.rebuild = function(walls_data){
+		  if (base.shapesMode) return
       walls_data = walls_data || Walls.serialize()
       Rooms.clipper.update()
       Rooms.builder.rebuild()
@@ -124,6 +126,36 @@
 			})
       Rooms.rebuild(walls_data)
 		}
+
+		base.deserializeFromShapes = function(shapes_data, walls_data) {
+		  base.shapesMode = true
+      window.viewHeight = data.viewHeight || app.defaults.viewHeight
+      window.wallHeight = data.wallHeight || app.defaults.wallHeight
+      $(".units").val( data.units )
+
+      shapes.deserialize( data.shapes )
+      shapes.build()
+
+      regions.forEach(function(region){
+        var room = new Room({
+          rect: region,
+          regions: [region],
+          height: wallHeight,
+        })
+        room.sides = region.sides
+        region.id = Rooms.uid("room_")
+        Rooms.list[ region.id ] = room
+        Rooms.builder.build(region)
+        room.mx_floor = Rooms.builder.make_floor(room, region)
+        room.mx_ceiling = Rooms.builder.make_ceiling(room, region)
+      })
+
+      Rooms.grouper.build()
+
+      Walls.paint()
+      Walls.deserialize(walls_data)
+      app.tube("rooms-built")
+		}
 		
 		base.report = function(){
 		  var data = []
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index e5e46e5..61b1d1b 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -18,35 +18,36 @@ var SiteRouter = Router.extend({
 	},
 	
 	routes: {
-		"/":                    'home',
-		"/home":                'home',
-		"/login":               'signin',
-		"/signin":              'signin',
-		"/signup":              'signup',
-
-		"/auth/usernameTaken":  'usernameTaken',
-		"/auth/password":       'passwordReset',
-		"/auth/forgotPassword": 'passwordForgot',
-
-		"/profile":             'profile',
-		"/profile/edit":        'editProfile',
-		"/profile/billing":     'editSubscription',
-		"/profile/:name":       'profile',
-		"/about/:name/edit":    'editDocument',
-		"/about/new":           'newDocument',
-
-		"/layout":              'layoutPicker',
-		"/layout/:name":        'layoutEditor',
-
-		"/blueprint":           'blueprintEditor',
-		"/blueprint/:name":     'blueprintEditor',
-
-		"/project":             'projectPicker',
-		"/project/new":         'newProject',
-		"/project/new/:layout": 'projectNewWithLayout',
-		"/project/:name":       'projectViewer',
-		"/project/:name/edit":  'projectEditor',
-		"/project/:name/view":  'projectViewer',
+		"/":                             'home',
+		"/home":                         'home',
+		"/login":                        'signin',
+		"/signin":                       'signin',
+		"/signup":                       'signup',
+
+		"/auth/usernameTaken":           'usernameTaken',
+		"/auth/password":                'passwordReset',
+		"/auth/forgotPassword":          'passwordForgot',
+
+		"/profile":                      'profile',
+		"/profile/edit":                 'editProfile',
+		"/profile/billing":              'editSubscription',
+		"/profile/:name":                'profile',
+		"/about/:name/edit":             'editDocument',
+		"/about/new":                    'newDocument',
+
+		"/layout":                       'layoutPicker',
+		"/layout/:name":                 'layoutEditor',
+
+		"/blueprint":                    'blueprintEditor',
+		"/blueprint/:name":              'blueprintEditor',
+
+		"/project":                      'projectPicker',
+		"/project/new":                  'newProject',
+		"/project/blueprint/:blueprint": 'projectNewWithBlueprint',
+		"/project/new/:layout":          'projectNewWithLayout',
+		"/project/:name":                'projectViewer',
+		"/project/:name/edit":           'projectEditor',
+		"/project/:name/view":           'projectViewer',
 
 		"/test/blueprint":      'blueprintEditor',
 	},
@@ -123,6 +124,22 @@ var SiteRouter = Router.extend({
 		window.history.pushState(null, document.title, "/project/new")
 		this.newProjectModal.load()
 	},
+	
+	projectNewWithBlueprint: function(e, blueprint){
+		e && e.preventDefault()
+		
+		Rooms.shapesMode = true
+
+		app.mode.editor = true
+		app.launch()
+		if (app.unsupported) return
+
+		blueprint = slugify(blueprint)
+		
+		window.history.pushState(null, document.title, "/project/blueprint/" + blueprint)
+		this.editorView = app.controller = new EditorView()
+		this.editorView.loadBlueprint(blueprint)
+	},
 
 	projectNewWithLayout: function(e, layout){
 		e && e.preventDefault()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 9c8808a..0870a11 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -95,6 +95,9 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+    fd.append( "wallHeight", this.parent.info.$height.unitVal() )
+    fd.append( "units", this.parent.info.$units.val() )
+
 		return fd
 	},
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index e1d360f..3095cfe 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -48,8 +48,8 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
-		this.settings.load(data)
 		this.info.load(data)
+		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
 	},
 	
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 9a7dbf9..aa58d6e 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -40,8 +40,8 @@ var BuilderInfo = View.extend({
 	
 	load: function(data){
 		this.$viewHeight.unitVal( window.viewHeight = data.viewHeight || app.defaults.viewHeight )
-		this.$units.val( "ft" )
-		this.$unitName.html( "ft" )
+		this.$units.val( data.units || "ft" )
+		this.$unitName.html( data.units || "ft" )
 
     if (Rooms.regions.length == 0) {
       this.changeHeightGlobal(true)
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 460863e..000852e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,12 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		data.rooms && Rooms.deserialize(data.rooms, data.walls)
+		if (data.rooms) {
+		  Rooms.deserialize(data.rooms, data.walls)
+		}
+		else if (data.shapes) {
+		  Rooms.deserializeFromShapes(data.shapes, data.walls)
+		}
 		if (data.startPosition) {
 		  scene.camera.move(data.startPosition)
 		  this.startPosition = data.startPosition
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index a2d84a6..879c963 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -2,6 +2,7 @@
 var EditorView = View.extend({
 	el: "#editorView",
 	
+	blueprintAction: "/api/blueprint/",
 	projectAction: "/api/project/",
 	layoutAction: "/api/layout/",
 
@@ -41,6 +42,10 @@ var EditorView = View.extend({
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
 	
+	loadBlueprint: function(blueprint){
+		$.get(this.blueprintAction + blueprint, this.readyLayout.bind(this))
+	},
+	
 	ready: function(data){
 		$("#map").hide()
 
diff --git a/server/lib/api/blueprint.js b/server/lib/api/blueprint.js
index e581d8f..222b466 100644
--- a/server/lib/api/blueprint.js
+++ b/server/lib/api/blueprint.js
@@ -92,6 +92,9 @@ var blueprint = {
       
       doc.name = util.sanitize(data.name)
       doc.slug = util.slugify(data.name)
+      doc.units = util.sanitize(data.units)
+      doc.viewHeight = util.sanitizeNumber(data.viewHeight)
+      doc.wallHeight = util.sanitizeNumber(data.wallHeight)
       doc.shapes = JSON.parse(data.shapes)
       doc.startPosition = JSON.parse(data.startPosition)
 
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 3810168..50d3b49 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -37,7 +37,12 @@ var projects = {
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
 		data.viewHeight = Number(data.viewHeight || 0)
-		data.rooms = JSON.parse(data.rooms)
+		if (data.shapes) {
+      data.shapes = JSON.parse(data.shapes)
+		}
+		else {
+      data.rooms = JSON.parse(data.rooms)
+		}
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
 		data.sculpture = JSON.parse(data.sculpture)
@@ -102,7 +107,12 @@ var projects = {
 
 				_.extend(doc, data)
 
-				doc.rooms = JSON.parse(data.rooms)
+        if (data.shapes) {
+          doc.shapes = JSON.parse(data.shapes)
+        }
+        else {
+          doc.rooms = JSON.parse(data.rooms)
+        }
 				doc.walls = JSON.parse(data.walls)
 				doc.colors = JSON.parse(data.colors)
 				doc.media = JSON.parse(data.media)
diff --git a/server/lib/schemas/Blueprint.js b/server/lib/schemas/Blueprint.js
index 76d0a09..3c3b0cc 100644
--- a/server/lib/schemas/Blueprint.js
+++ b/server/lib/schemas/Blueprint.js
@@ -51,6 +51,7 @@ var BlueprintSchema = new mongoose.Schema({
 	
 	widthDimension: { type: Number },
 	heightDimension: { type: Number },
+	wallHeight: { type: Number },
 	units: { type: String },
 	line: { type: String },
 
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index 855d95a..687555d 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -28,6 +28,7 @@ var ProjectSchema = new mongoose.Schema({
 		type: String,
 	},
 	rooms: [mongoose.Schema.Types.Mixed],
+	shapes: [mongoose.Schema.Types.Mixed],
 	walls: [mongoose.Schema.Types.Mixed],
 	media: [mongoose.Schema.Types.Mixed],
 	sculpture: [mongoose.Schema.Types.Mixed],
@@ -35,6 +36,7 @@ var ProjectSchema = new mongoose.Schema({
 	startPosition: mongoose.Schema.Types.Mixed,
 	lastPosition: mongoose.Schema.Types.Mixed,
 	viewHeight: { type: Number },
+	units: { type: String, default: "ft" },
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },
diff --git a/server/lib/util.js b/server/lib/util.js
index e3fd1ed..86fbdcc 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -5,6 +5,7 @@ var whitespace = new RegExp('\\s', 'g')
 var whitespaceHead = /^\s+/
 var whitespaceTail = /\s+$/
 var nonAlphanumerics = new RegExp('[^-_a-zA-Z0-9]', 'g')
+var nonNumerics = new RegExp('[^0-9]', 'g')
 var consecutiveDashes = new RegExp("-+", 'g')
 var entities = new RegExp("[<>&]", 'g')
 
@@ -19,6 +20,9 @@ util.slugify = function (s){
 util.sanitize = function (s){
 	return (s || "").replace(entities, "")
 }
+util.sanitizeNumber = function (s){
+	return (s || "").replace(nonNumerics, "")
+}
 util.escape = function (s){
 	return (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
 }
-- 
cgit v1.2.3-70-g09d2


From 73b8036e977a21d4b1e327245d02826eade3c843 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 12:24:12 -0400
Subject: loading rooms into editor

---
 .../assets/javascripts/rectangles/engine/rooms/_rooms.js  | 13 ++++++++++---
 public/assets/javascripts/rectangles/models/room.js       |  4 ++++
 public/assets/javascripts/ui/editor/EditorSettings.js     | 15 ++++++++++-----
 public/assets/javascripts/ui/editor/EditorView.js         |  2 +-
 server/index.js                                           |  2 ++
 server/lib/api/blueprint.js                               | 15 +++++++++++++++
 6 files changed, 42 insertions(+), 9 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index d4281ad..5c9945c 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -127,14 +127,16 @@
       Rooms.rebuild(walls_data)
 		}
 
-		base.deserializeFromShapes = function(shapes_data, walls_data) {
+		base.deserializeFromShapes = function(data, walls_data) {
+		  walls_data = walls_data || Walls.serialize()
 		  base.shapesMode = true
       window.viewHeight = data.viewHeight || app.defaults.viewHeight
       window.wallHeight = data.wallHeight || app.defaults.wallHeight
       $(".units").val( data.units )
 
       shapes.deserialize( data.shapes )
-      shapes.build()
+      // shapes.build()
+      var regions = RegionList.build()
 
       regions.forEach(function(region){
         var room = new Room({
@@ -142,12 +144,17 @@
           regions: [region],
           height: wallHeight,
         })
+
         room.sides = region.sides
         region.id = Rooms.uid("room_")
         Rooms.list[ region.id ] = room
-        Rooms.builder.build(region)
+        var mx_walls = Rooms.builder.build_walls(region)
         room.mx_floor = Rooms.builder.make_floor(room, region)
         room.mx_ceiling = Rooms.builder.make_ceiling(room, region)
+
+        mx_walls.forEach(function(mx){ scene.add(mx) })
+        scene.add(room.mx_floor)
+        scene.add(room.mx_ceiling)
       })
 
       Rooms.grouper.build()
diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 26bf055..0ef76e4 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -35,6 +35,10 @@
 
 		this.height = opt.height || 200
 		this.focused = false
+
+		this.mx_walls = []
+		this.mx_floor = []
+		this.mx_ceiling = []
 	}
 	
 	Room.prototype.copy = function(){
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 000852e..83bc8b7 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,11 +41,11 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		if (data.rooms) {
-		  Rooms.deserialize(data.rooms, data.walls)
+		if (data.shapes) {
+		  Rooms.deserializeFromShapes(data, data.walls)
 		}
-		else if (data.shapes) {
-		  Rooms.deserializeFromShapes(data.shapes, data.walls)
+		else if (data.rooms) {
+		  Rooms.deserialize(data.rooms, data.walls)
 		}
 		if (data.startPosition) {
 		  scene.camera.move(data.startPosition)
@@ -194,7 +194,12 @@ var EditorSettings = FormView.extend({
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "viewHeight", window.viewHeight )
-		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+		if (Rooms.shapesMode) {
+      fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
+		}
+		else {
+      fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
+		}
  		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
  		fd.append( "colors", JSON.stringify( Walls.colors ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 879c963..c05b373 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -2,7 +2,7 @@
 var EditorView = View.extend({
 	el: "#editorView",
 	
-	blueprintAction: "/api/blueprint/",
+	blueprintAction: "/api/blueprint/user/",
 	projectAction: "/api/project/",
 	layoutAction: "/api/layout/",
 
diff --git a/server/index.js b/server/index.js
index 7143da2..224aa86 100644
--- a/server/index.js
+++ b/server/index.js
@@ -138,6 +138,7 @@ site.route = function () {
 	app.get('/project', middleware.ensureAuthenticated, views.modal)
 	app.get('/project/new', middleware.ensureAuthenticated, views.modal)
 	app.get('/project/new/:layout', middleware.ensureAuthenticated, views.editor_new)
+	app.get('/project/blueprint/:layout', middleware.ensureAuthenticated, views.editor_new)
 	app.get('/project/:slug', middleware.ensureProject, middleware.ensureIsCollaborator, views.reader)
 	app.get('/project/:slug/view', middleware.ensureProject, middleware.ensureIsCollaborator, views.reader)
 	app.get('/project/:slug/edit', middleware.ensureProject, middleware.ensureIsCollaborator, views.editor)
@@ -163,6 +164,7 @@ site.route = function () {
 
 	app.post('/api/blueprint/new', middleware.ensureAuthenticated, api.blueprint.create)
 	app.post('/api/blueprint/upload', middleware.ensureAuthenticated, api.blueprint.upload)
+	app.get('/api/blueprint/user/:slug', middleware.ensureAuthenticated, api.blueprint.show)
 	app.get('/api/blueprint/user', middleware.ensureAuthenticated, api.blueprint.user)
 	app.post('/api/blueprint/scale',  middleware.ensureAuthenticated, api.blueprint.scale)
 	app.post('/api/blueprint/edit', middleware.ensureAuthenticated, api.blueprint.update)
diff --git a/server/lib/api/blueprint.js b/server/lib/api/blueprint.js
index 222b466..e780b92 100644
--- a/server/lib/api/blueprint.js
+++ b/server/lib/api/blueprint.js
@@ -25,6 +25,21 @@ var blueprint = {
 			})
 	},
 	
+	show: function(req, res){
+		Blueprint.findOne({ slug: req.params.slug }, function(err, doc){
+			if (doc) {
+				res.json(doc)
+				return
+			}
+			else {
+        Project.count({}, function(err, count){
+          var name = "Project #" + (count || 0)
+          res.json({ _id: "new", name: name, isNew: true })
+        })
+			}
+		})
+	},
+
 	create: function(req, res){
 		var data = util.cleanQuery(req.body)
 		data.user_id = req.user._id
-- 
cgit v1.2.3-70-g09d2


From 977429a9b945e6be0175b1672dd5802e49682c9b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 13:36:53 -0400
Subject: mover working with new layouts

---
 public/assets/javascripts/rectangles/models/room.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js
index 0ef76e4..1abe2ba 100644
--- a/public/assets/javascripts/rectangles/models/room.js
+++ b/public/assets/javascripts/rectangles/models/room.js
@@ -31,7 +31,7 @@
 	var Room = function(opt){
 		this.id = opt.id || Rooms.uid("room_")
 		this.rect = opt.rect
-		this.regions = []
+		this.regions = opt.regions || []
 
 		this.height = opt.height || 200
 		this.focused = false
@@ -129,6 +129,7 @@
 	Room.prototype.collidesDisc = function(src, dest, radius){
 	  var x = dest.x, y = dest.z
 		var collision = 0, wall_collision, contains_x, contains_y
+
 		this.regions.forEach(function(r){
 			if (! r.sides) return
 			
-- 
cgit v1.2.3-70-g09d2


From e350f13c3772d0f1f4053ce3c1a1dbc43713e4d0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 14:32:59 -0400
Subject: map stuff for shapes mode

---
 public/assets/javascripts/mx/extensions/mx.movements.js        |  2 +-
 public/assets/javascripts/rectangles/engine/map/draw.js        |  8 +++++++-
 public/assets/javascripts/rectangles/engine/shapes/polyline.js | 10 +++++-----
 .../assets/javascripts/rectangles/engine/shapes/shapelist.js   |  5 +++++
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js      |  4 +---
 5 files changed, 19 insertions(+), 10 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 9ed8790..cecba7a 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -155,7 +155,7 @@ MX.Movements = function (cam) {
 						app.controller.presets.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else {
+					else if (! Rooms.shapesMode) {
 						app.controller.toolbar.toggleMap()
 					}
 					break
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index c97603b..8498a46 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -22,7 +22,13 @@ Map.Draw = function(map, opt){
 			ctx.scale( -1, 1 )
 
 			draw.coords()
-			draw.regions(Rooms.regions, [ "#fff" ], "#000")
+			if (Rooms.shapesMode) {
+        shapes.draw(draw.ctx, "#fff", null)
+        shapes.draw(draw.ctx, null, "#000")
+			}
+			else {
+        draw.regions(Rooms.regions, [ "#fff" ], "#000")
+			}
 			draw.camera(scene.camera)
 		}
 		else {
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 54e11c6..fc6cad7 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -95,7 +95,7 @@ var Polyline = Fiber.extend(function(base){
       tail: closest_i,
     }
 	}
-  exports.draw = function(ctx){
+  exports.draw = function(ctx, fillStyle, strokeStyle){
     var points = this.points
     if (! points.length) return
     if (points.length == 1) {
@@ -103,17 +103,17 @@ var Polyline = Fiber.extend(function(base){
       map.draw.dot_at(this.points[0].a, points[0].b, 5)
     }
     if (points.length > 1) {
-      ctx.fillStyle = "rgba(255,255,0,0.1)"
-      ctx.strokeStyle = "#f80"
+      ctx.fillStyle = fillStyle
+      ctx.strokeStyle = strokeStyle
       ctx.lineWidth = 2 / map.zoom
       ctx.beginPath()
       ctx.moveTo(points[0].a, points[0].b)
       points.forEach(function(point, i){
         i && ctx.lineTo(point.a, point.b)
       })
-      ctx.stroke()
+      strokeStyle && ctx.stroke()
       if (! map.ui.placing || this.closed) {
-        ctx.fill()
+        fillStyle && ctx.fill()
       }
     }
   }
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 9cbf165..75ecae6 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -76,6 +76,11 @@ var ShapeList = Fiber.extend(function(base){
     })
     return segments
   }
+  exports.draw = function(ctx, fillStyle, strokeStyle) {
+    this.shapes.forEach(function(shape){
+      shape.draw(ctx, fillStyle, strokeStyle)
+    })
+  }
   exports.serialize = function(){
     return this.shapes.map(function(shape){
       return shape.serialize()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 4b80b2c..0f35ac5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -106,9 +106,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       }
     }
 
-    shapes.forEach(function(shape){
-      shape.draw(map.draw.ctx)
-    })
+    shapes.draw(map.draw.ctx, "rgba(255,255,0,0.1)", "#f80")
 
     map.draw.ctx.strokeStyle = "#f00";
     map.draw.x_at(0,0)
-- 
cgit v1.2.3-70-g09d2


From 0e03cb3c4065e002be50d37e80ddfab1407c8e6b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 16:10:42 -0400
Subject: popup notice to start a project

---
 public/assets/javascripts/rectangles/models/wall.js  |  2 +-
 .../javascripts/ui/blueprint/BlueprintNotice.js      | 20 ++++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintSettings.js    |  4 +++-
 .../javascripts/ui/blueprint/BlueprintToolbar.js     |  8 ++++++++
 .../assets/javascripts/ui/blueprint/BlueprintView.js |  5 +++++
 public/assets/stylesheets/app.css                    |  6 ++++++
 views/blueprint.ejs                                  |  6 +-----
 views/controls/blueprint/notice.ejs                  |  3 +++
 views/partials/scripts.ejs                           |  1 +
 9 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintNotice.js
 create mode 100644 views/controls/blueprint/notice.ejs

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

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 9d4650b..5aa8359 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -198,7 +198,7 @@
 	}
 	
 	Wall.prototype.serialize = function(){
-	  return {
+	  return { 
 	    id: this.id,
 	    background: this.background,
 	  }
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintNotice.js b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
new file mode 100644
index 0000000..bced4e1
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
@@ -0,0 +1,20 @@
+var BlueprintNotice = View.extend(ToggleableView.prototype).extend({
+  
+  el: "#blueprintNotice",
+  
+  initialize: function(opt){
+    this.parent = opt.parent
+    this.$notice = this.$(".notice")
+  },
+  
+  notice: function(msg){
+    this.$notice.html(msg)
+  },
+  
+  showCreateProjectNotice: function(){
+    this.notice("<a href='/project/blueprint/" + this.parent.data.slug +
+                "'>Start a new project</a> with this blueprint.")
+    this.show()
+  },
+
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 0870a11..e41962e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -37,7 +37,6 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
       shapes.deserialize( data.shapes )
       shapes.build()
 		}
-		this.data = data
 	},
 	
 	clear: function(){
@@ -107,11 +106,14 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 	},
 	
 	success: function(data){
+	  this.parent.data = data
+	  
 		this.$id.val(data._id)
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
 		this.hide()
+		this.parent.notice.showCreateProjectNotice()
 		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index e22535e..88f1d0a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -9,6 +9,7 @@ var BlueprintToolbar = View.extend({
     "click [data-role=polyline-mode]": 'polylineMode',
     "click [data-role=ortho-polyline-mode]": 'orthoPolylineMode',
     "click [data-role=eraser-mode]": 'eraserMode',
+    "click [data-role=start-position-mode]": 'startPositionMode',
     "click [data-role=toggle-layout-settings]": 'toggleSettings',
   },
 
@@ -21,6 +22,7 @@ var BlueprintToolbar = View.extend({
     this.$polylineMode = this.$('[data-role=polyline-mode]')
     this.$orthoPolylineMode = this.$('[data-role=ortho-polyline-mode]')
     this.$eraserMode = this.$('[data-role=eraser-mode]')
+    this.$startPositionMode = this.$('[data-role=start-position-mode]')
     
     this.orthoPolylineMode()
   },
@@ -52,6 +54,7 @@ var BlueprintToolbar = View.extend({
   
   toggleSettings: function(){
     this.parent.settings.toggle()
+    this.parent.notice.toggle( ! this.parent.data.isNew && ! this.parent.settings.visible() )
   },
   
   setActiveMode: function( $el ) {
@@ -79,4 +82,9 @@ var BlueprintToolbar = View.extend({
     this.parent.map.ui.set_tool("eraser")
   },
 
+  startPositionMode: function(){
+    this.setActiveMode( this.$startPositionMode )
+    this.parent.map.ui.set_tool("start-position")
+  },
+  
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 3095cfe..6f1d2f5 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -17,6 +17,7 @@ var BlueprintView = View.extend({
     this.scaler = new BlueprintScaler ({ parent: this })
 		this.info = new BlueprintInfo ({ parent: this })
 		this.settings = new BlueprintSettings ({ parent: this })
+		this.notice = new BlueprintNotice ({ parent: this })
 	},
 
 	load: function(name){
@@ -48,9 +49,13 @@ var BlueprintView = View.extend({
 	},
 	
 	ready: function(data){
+	  this.data = data
 		this.info.load(data)
 		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
+	  if (! data.isNew) {
+	    this.notice.showCreateProjectNotice()
+	  }
 	},
 	
 	hideExtras: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 2fef578..3caa063 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2352,6 +2352,12 @@ input[type="range"]::-webkit-slider-thumb {
   transition: -webkit-transform 0.2s ease-in-out;
 	width: 210px;
 }
+#blueprintNotice.settings {
+  width: 230px;
+}
+#blueprintNotice a {
+  border-bottom: 1px solid;
+}
 #textEditor.settings {
   width: 320px;
 }
diff --git a/views/blueprint.ejs b/views/blueprint.ejs
index e7f7c48..13e8182 100644
--- a/views/blueprint.ejs
+++ b/views/blueprint.ejs
@@ -17,11 +17,7 @@
 			[[ include controls/blueprint/settings ]]
       [[ include controls/blueprint/editor ]]
       [[ include controls/blueprint/scaler ]]
-		</div>
-
-		<div id="hud">
-			<div id="map" style="display: block">
-			</div>
+      [[ include controls/blueprint/notice ]]
 		</div>
 	</div>
 
diff --git a/views/controls/blueprint/notice.ejs b/views/controls/blueprint/notice.ejs
new file mode 100644
index 0000000..1be3f6f
--- /dev/null
+++ b/views/controls/blueprint/notice.ejs
@@ -0,0 +1,3 @@
+<div class="vvbox settings" id="blueprintNotice">
+	<div class="notice"></div>
+</div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 865c0f1..ac08216 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -142,6 +142,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintToolbar.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUploader.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintNotice.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 8ce3e6347b75a653ed3b7e4e3b2be5f23c841e97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 16:24:31 -0400
Subject: show start position

---
 public/assets/javascripts/rectangles/engine/map/draw.js     | 8 +++++++-
 public/assets/javascripts/ui/blueprint/BlueprintEditor.js   | 2 +-
 public/assets/javascripts/ui/blueprint/BlueprintSettings.js | 2 +-
 public/assets/javascripts/ui/blueprint/BlueprintToolbar.js  | 2 ++
 public/assets/javascripts/ui/blueprint/BlueprintView.js     | 7 ++++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index 8498a46..fd05f86 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -252,7 +252,13 @@ Map.Draw = function(map, opt){
 
 	draw.x_at = function x_at (x, z, length){
 		ctx.save()
-		ctx.translate(x,z)
+	  if (x && 'x' in x) {
+	    length = z
+      ctx.translate(x.x,x.z)
+	  }
+	  else {
+      ctx.translate(x,z)
+	  }
 
 		var len = (length/2 || 4) / map.zoom
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 0f35ac5..bf55aae 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -109,7 +109,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     shapes.draw(map.draw.ctx, "rgba(255,255,0,0.1)", "#f80")
 
     map.draw.ctx.strokeStyle = "#f00";
-    map.draw.x_at(0,0)
+    map.draw.x_at( this.parent.startPosition )
     map.draw.mouse(map.ui.mouse.cursor)
     map.draw.camera(scene.camera)
     
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index e41962e..94672f6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,7 +93,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.getStartPosition() ) )
     fd.append( "wallHeight", this.parent.info.$height.unitVal() )
     fd.append( "units", this.parent.info.$units.val() )
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 88f1d0a..bd42374 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -85,6 +85,8 @@ var BlueprintToolbar = View.extend({
   startPositionMode: function(){
     this.setActiveMode( this.$startPositionMode )
     this.parent.map.ui.set_tool("start-position")
+    this.parent.settings.hide()
+    this.parent.notice.showStartPositionNotice()
   },
   
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 6f1d2f5..7819abd 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -28,6 +28,7 @@ var BlueprintView = View.extend({
 	},
 
   orbiting: true,
+	startPosition: {},
 	buildMap: function(){
 	  // i forget if this has to be global
     map = new Map ({
@@ -53,7 +54,11 @@ var BlueprintView = View.extend({
 		this.info.load(data)
 		this.settings.load(data)
 	  this.editor.loadFloorplan(data)
-	  if (! data.isNew) {
+	  if (data.isNew) {
+	    this.startPosition = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: Math.PI/2 }
+	  }
+	  else {
+	    this.startPosition = data.startPosition
 	    this.notice.showCreateProjectNotice()
 	  }
 	},
-- 
cgit v1.2.3-70-g09d2


From a54c08b70c6072f6c2da48bc209a8b915c993a97 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 17:17:50 -0400
Subject: set default start position on blueprint

---
 .../rectangles/engine/map/tools/line.js            |  2 +-
 .../rectangles/engine/map/tools/start.js           | 29 +++++++++++++++
 .../javascripts/ui/blueprint/BlueprintNotice.js    | 42 ++++++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintSettings.js  |  2 +-
 .../javascripts/ui/blueprint/BlueprintToolbar.js   |  8 ++---
 .../javascripts/ui/blueprint/BlueprintView.js      |  1 +
 public/assets/stylesheets/app.css                  |  8 +++++
 views/controls/blueprint/notice.ejs                |  1 +
 views/controls/blueprint/settings.ejs              |  7 ----
 views/controls/blueprint/toolbar.ejs               |  5 +++
 views/partials/scripts.ejs                         |  1 +
 11 files changed, 93 insertions(+), 13 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/map/tools/start.js

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

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index 8fe4fff..a8e2473 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,4 +1,4 @@
-// This tool lets you define a very simple line between two points.
+// This tool is used to define a very simple line between two points.
 // It is used by the BlueprintScaler to specify a sample distance to scale.
 
 var LineTool = MapTool.extend(function(base){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/start.js b/public/assets/javascripts/rectangles/engine/map/tools/start.js
new file mode 100644
index 0000000..cca387c
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/map/tools/start.js
@@ -0,0 +1,29 @@
+// This tool is used to set the start position on the map.
+
+var StartPositionTool = MapTool.extend(function(base){
+	var exports = {}
+	
+	var selected_point = null
+	
+	var line = exports.line = []
+	
+	var can_drag, dragging
+	
+	exports.down = function(e, cursor){
+    // rightclick?
+    if (e.ctrlKey || e.which === 3) {
+      cursor.quantize(1/map.zoom)
+      app.router.blueprintView.map.center.a = cursor.x.a
+      app.router.blueprintView.map.center.b = -cursor.y.a
+      cursor.x.b = cursor.x.a
+      cursor.y.b = cursor.y.a
+      return
+    }
+    
+    cam.x = app.controller.startPosition.x = cursor.x.a
+    cam.z = app.controller.startPosition.z = cursor.y.a
+	}
+	
+	return exports
+	
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintNotice.js b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
index bced4e1..4b799a6 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintNotice.js
@@ -2,9 +2,14 @@ var BlueprintNotice = View.extend(ToggleableView.prototype).extend({
   
   el: "#blueprintNotice",
   
+  events: {
+    "click .next": "next",
+  },
+  
   initialize: function(opt){
     this.parent = opt.parent
     this.$notice = this.$(".notice")
+    this.$next = this.$(".next")
   },
   
   notice: function(msg){
@@ -14,7 +19,44 @@ var BlueprintNotice = View.extend(ToggleableView.prototype).extend({
   showCreateProjectNotice: function(){
     this.notice("<a href='/project/blueprint/" + this.parent.data.slug +
                 "'>Start a new project</a> with this blueprint.")
+    this.$next.hide()
+    this.nextFn = null
+    this.show()
+  },
+  
+  showStartPositionNotice: function(){
+    this.parent.settings.hide()
+    this.notice("First, click the map to set the starting location.")
+    this.$next.show().html("Next")
+    this.show()
+    this.nextFn = this.showStartAngleNotice.bind(this)
+  },
+  
+  showStartAngleNotice: function(){
+    this.parent.settings.hide()
+    this.notice("Next, rotate the camera to the desired orientation.")
+    this.$next.show().html("Done")
     this.show()
+    this.nextFn = this.doneSettingPosition.bind(this)
+    this.parent.toolbar.toggleOrbitMode(false)
+  },
+  
+  doneSettingPosition: function(){
+    this.nextFn = null
+    this.$next.hide()
+    this.hide()
+    this.parent.settings.show()
+    this.parent.startPosition.rotationX = cam.rotationX
+    this.parent.startPosition.rotationY = cam.rotationY
+    this.parent.toolbar.toggleOrbitMode(true)
+    this.parent.toolbar.orthoPolylineMode()
+  },
+  
+  nextFn: null,
+  next: function(){
+    if (this.nextFn) {
+      this.nextFn()
+    }
   },
 
 })
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 94672f6..80c9355 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,7 +93,7 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( this.parent.getStartPosition() ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.startPosition ) )
     fd.append( "wallHeight", this.parent.info.$height.unitVal() )
     fd.append( "units", this.parent.info.$units.val() )
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index bd42374..7721298 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -32,8 +32,8 @@ var BlueprintToolbar = View.extend({
     this.parent.uploader.show()
   },
   
-  toggleOrbitMode: function(){
-    this.parent.orbiting = ! this.parent.orbiting
+  toggleOrbitMode: function(state){
+    this.parent.orbiting = typeof state == "boolean" ? state : ! this.parent.orbiting
     this.$toggleOrbitMode.toggleClass("inuse", ! this.parent.orbiting)
     this.parent.editor.resize()
     if (this.parent.orbiting) {
@@ -46,9 +46,9 @@ var BlueprintToolbar = View.extend({
       movements.gravity(true)
       cam.rotationX = 0
       cam.rotationY = -cam.rotationY
-      cam.x = 0
+      cam.x = this.parent.startPosition.x
       cam.y = viewHeight
-      cam.z = 0
+      cam.z = this.parent.startPosition.z
     }
   },
   
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 7819abd..7d839aa 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -45,6 +45,7 @@ var BlueprintView = View.extend({
     map.ui.add_tool("ortho-polyline", new OrthoPolylineTool)
     map.ui.add_tool("eraser", new EraserTool)
     map.ui.add_tool("position", new PositionTool)
+    map.ui.add_tool("start-position", new StartPositionTool)
     map.ui.placing = false
     return map
 	},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3caa063..5ef8c18 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2358,6 +2358,14 @@ input[type="range"]::-webkit-slider-thumb {
 #blueprintNotice a {
   border-bottom: 1px solid;
 }
+#blueprintNotice .next {
+  display: inline-block;
+  background: black; color: white;
+  padding: 4px;
+  margin: 4px 0 0 0;
+  float: right;
+  cursor: pointer;
+}
 #textEditor.settings {
   width: 320px;
 }
diff --git a/views/controls/blueprint/notice.ejs b/views/controls/blueprint/notice.ejs
index 1be3f6f..bf1a310 100644
--- a/views/controls/blueprint/notice.ejs
+++ b/views/controls/blueprint/notice.ejs
@@ -1,3 +1,4 @@
 <div class="vvbox settings" id="blueprintNotice">
 	<div class="notice"></div>
+	<span class="next">Next</span>
 </div>
diff --git a/views/controls/blueprint/settings.ejs b/views/controls/blueprint/settings.ejs
index 1347f5b..9c615ea 100644
--- a/views/controls/blueprint/settings.ejs
+++ b/views/controls/blueprint/settings.ejs
@@ -2,13 +2,6 @@
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
-	<div class="setting">
-		<a href="#" id="startpoint">
-			<span class="ion-ios-navigate-outline"></span>
-			<span id="startText">Select Startpoint</span>
-			<span id="moveText">Move to Desired Point</span></a>
-	</div>
-
 	<div class="setting">
 		<input type="text" name="name" placeholder="Blueprint name">
 	</div>
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
index ee9594e..ba795e3 100644
--- a/views/controls/blueprint/toolbar.ejs
+++ b/views/controls/blueprint/toolbar.ejs
@@ -30,6 +30,11 @@
 		data-info="remove walls"
     class="ion-scissors mode"></span>
 
+  <span
+    data-role="start-position-mode"
+		data-info="set starting position"
+    class="ion-ios-home-outline mode"></span>
+
 	<span
 		data-role='toggle-layout-settings'
 		data-info="save blueprint"
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index ac08216..af7fe96 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -101,6 +101,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/start.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
-- 
cgit v1.2.3-70-g09d2


From c781911322c84eb0c2aa4a00860016437d7b7cba Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 18:30:33 -0400
Subject: surface blueprints on new project modal

---
 .../rectangles/engine/map/tools/arrow.js           |   2 +
 .../rectangles/engine/map/tools/eraser.js          |   2 +
 .../rectangles/engine/map/tools/line.js            |   2 +-
 .../rectangles/engine/map/tools/ortho.js           |   5 +-
 .../rectangles/engine/map/tools/polyline.js        |   2 +
 .../rectangles/engine/map/tools/position.js        |   2 +
 .../rectangles/engine/map/tools/start.js           |   2 +-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |   9 +-
 public/assets/javascripts/ui/site/LayoutsModal.js  | 190 +++++++++++++++++++--
 public/assets/stylesheets/app.css                  |   4 +-
 server/lib/api/layouts.js                          |  18 +-
 views/projects/layouts-modal.ejs                   |   3 +
 12 files changed, 211 insertions(+), 30 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
index 2a73954..00478d4 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
@@ -1,3 +1,5 @@
+// Tool used to move corners of polylines
+
 var ArrowTool = MapTool.extend(function(base){
 	var exports = {}
 	
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/eraser.js b/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
index 648cd11..8fc3687 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
@@ -1,3 +1,5 @@
+// Tool used to delete lines
+
 var EraserTool = MapTool.extend(function(base){
 	var exports = {}
 	exports.down = function(e, cursor){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index a8e2473..8175d66 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,4 +1,4 @@
-// This tool is used to define a very simple line between two points.
+// Tool is used to define a very simple line between two points.
 // It is used by the BlueprintScaler to specify a sample distance to scale.
 
 var LineTool = MapTool.extend(function(base){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index 918ac0d..6ced728 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -1,6 +1,7 @@
+// Tool to make a polyline where all walls are orthogonal
+
 var OrthoPolylineTool = MapTool.extend(function (base) {
-  // this will work like normal polyline except all walls will be orthogonal
-  
+
   var prev_point, horizontal = false, first_edge_is_horizontal = false
   
   var exports = {}
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
index 6716180..445ae26 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -1,3 +1,5 @@
+// Tool used to draw polylines with arbitrary angles
+
 var PolylineTool = MapTool.extend(function (base) {
   var exports = {}
   exports.down = function(e, cursor){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/position.js b/public/assets/javascripts/rectangles/engine/map/tools/position.js
index a994f5a..f8365bc 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/position.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/position.js
@@ -1,3 +1,5 @@
+// Tool used to set position on the map and let you change the view by dragging.
+
 var PositionTool = MapTool.extend(function(base){
 	var exports = {
 	  recenterCursor: false,
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/start.js b/public/assets/javascripts/rectangles/engine/map/tools/start.js
index cca387c..203a85f 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/start.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/start.js
@@ -1,4 +1,4 @@
-// This tool is used to set the start position on the map.
+// Tool is used to set the start position on the map.
 
 var StartPositionTool = MapTool.extend(function(base){
 	var exports = {}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index fbb71d5..fe1073a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -37,8 +37,12 @@ var BlueprintUploader = UploadView.extend({
 		if (data && data.length) {
 		  this.$blueprints.show()
       data.forEach(this.append.bind(this))
-      this.hide()
-      if (this.nameToShow && this.nameToShow !== "new") {
+      if (this.nameToShow === "new") {
+        // don't pick anything..
+        this.show()
+      }
+      else if (! this.nameToShow) {
+        this.hide()
         data.some(function(el){
           if (el.slug == this.nameToShow) {
             this.parent.scaler.pick(el)
@@ -47,6 +51,7 @@ var BlueprintUploader = UploadView.extend({
         }.bind(this))
       }
       else {
+        this.hide()
         this.parent.scaler.pick(data[0])
       }
 		}
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 87251af..a9c6ef0 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -6,6 +6,10 @@ var LayoutsIndex = View.extend({
 		this.$templatesList = this.$(".templates-list")
 		this.$noTemplates = this.$(".no-templates")
 		this.$form = this.$("form")
+		
+		this.$userTemplatesList = this.$(".userTemplatesList")
+		this.$blueprintsList = this.$(".blueprintsList")
+		this.$newBlueprintButton = this.$("[data-role='create-new-blueprint']")
 	},
 
 	load: function(type){
@@ -15,11 +19,6 @@ var LayoutsIndex = View.extend({
 	},
 
 	populate: function(data){
-/*
-	  if (data.user.plan_level < 1 && data.projectCount == 1) {
-	    // show lockout message
-	  }
-*/
 		if (! data.layouts.length) {
 			this.$templates.hide()
 			this.$form.hide()
@@ -89,20 +88,89 @@ var LayoutsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	action: "/api/layout",
 
 	events: {
-		"click .templates span": 'toggleActive',
+		"click .templates span": 'pick',
+		"click .userTemplates span": 'pick',
+		"click .blueprints span": 'pickBlueprint',
 		"submit form": 'newLayout',
 	},
 	
-	toggleActive: function(e){
+	pick: function(e){
 		e.preventDefault()
-		this.$(".templates .active").removeClass("active")
 		var $layout = $(e.currentTarget)
-		$layout.addClass("active")
+		window.location.pathname = "/layout/" + $layout.data("slug")
+	},
+
+	pick: function(e){
+		e.preventDefault()
+		var $blueprint = $(e.currentTarget)
+		$blueprint.addClass("active")
 		
-		// actually do
 		window.location.pathname = "/layout/" + $layout.data("slug")
 	},
-	
+
+	populate: function(data){
+/*
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
+	    // show lockout message
+	  }
+*/
+		if (! data.layouts.length) {
+			this.$templates.hide()
+			this.$form.hide()
+			this.$noTemplates.show()
+		}
+		this.$templatesList.empty()
+		data.layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+
+		data.user_layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$userTemplatesList.append($span)
+		}.bind(this))
+		
+		data.blueprints.forEach(function(blueprint){
+			var $span = $("<span>")
+			$span.data("slug", blueprint.slug)
+			
+			var $label = $("<label>")
+			$label.html( blueprint.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + blueprint.url + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$blueprintsList.append($span)
+		}.bind(this))
+		
+		this.show()
+	},
+
 	newLayout: function(e){
 		e && e.preventDefault()
 		window.location.pathname = "/layout/new"
@@ -118,8 +186,10 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 
 	events: {
 		"click [data-role='create-new-layout']": 'createNewLayout',
-		"click .templates span": 'choose',
-		"submit form": 'choose',
+		"click [data-role='create-new-blueprint']": 'createNewBlueprint',
+		"click .templates span": 'pick',
+		"click .userTemplates span": 'pick',
+		"click .blueprints span": 'pickBlueprint',
 	},
 	
 	toggleActive: function(e){
@@ -128,16 +198,104 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		$(e.currentTarget).addClass("active")
 	},
 	
-	choose: function(e){
+	pick: function(e){
 		e && e.preventDefault()
 // 		var layout = this.$(".templates .active").data("slug")
  		var layout = $(e.currentTarget).data("slug")
+ 		var isBlueprint = $(e.currentTarget).data("blueprint")
 		if (! layout || ! layout.length) return
-		window.location.pathname = "/project/new/" + layout
+		
+		if (isBlueprint) {
+      window.location.pathname = "/project/blueprint/" + layout
+		}
+		else {
+      window.location.pathname = "/project/new/" + layout
+		}
 	},
 
-	createNewLayout: function(){
+	createNewLayout: function(e){
+	  e.preventDefault()
 	  window.location.pathname = "/project/new/empty"
 	},
+
+	createNewBlueprint: function(s){
+	  e.preventDefault()
+	  window.location.pathname = "/blueprint/new"
+	},
+
+	populate: function(data){
+/*
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
+	    // show lockout message
+      this.$newBlueprintButton.hide()
+	  }
+*/
+		if (! data.layouts.length) {
+			this.$templates.hide()
+			this.$form.hide()
+			this.$noTemplates.show()
+		}
+		if (! data.blueprints.length) {
+		  this.$blueprintsList.parent().hide()
+    }
+		if (! data.user_layouts.length) {
+		  this.$userTemplatesList.parent().hide()
+    }
+
+		this.$templatesList.empty()
+		data.layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+
+		data.user_layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		
+		data.blueprints.forEach(function(blueprint){
+		  if (! blueprint.slug) { return }
+		  
+			var $span = $("<span>")
+			$span.data("blueprint", true)
+			$span.data("slug", blueprint.slug)
+			
+			var $label = $("<label>")
+			$label.html( blueprint.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + blueprint.url + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		
+		this.show()
+	},
+
 	
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 5ef8c18..a1bb466 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1157,7 +1157,9 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 	height: 100%;
 	padding: 20px 0 40px 0;
 }
-.templates-list {
+.templates-list,
+.userTemplatesList,
+.blueprintsList {
 	display: inline-block;
 	width: 100%;
 	margin-bottom: 40px;
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index f1db121..c04f926 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -5,18 +5,22 @@ var _ = require('lodash'),
 	upload = require('../upload'),
 	middleware = require('../middleware'),
 	config = require('../../../config.json'),
+	Blueprint = require('../schemas/Blueprint'),
 	Layout = require('../schemas/Layout');
 
 var layouts = {
 	index: function(req, res){
 		Layout.find({ is_stock: true }, function(err, stock_layouts){
-      Layout.find({ user_id: req.user._id }, function(err, user_layouts){
-        res.json({
-          layouts: stock_layouts,
-          user_layouts: user_layouts,
-          user: res.locals.user,
-          layoutCount: res.locals.layoutCount,
-          projectCount: res.locals.projectCount,
+      Layout.find({ user_id: req.user._id, is_stock: false }, function(err, user_layouts){
+        Blueprint.find({ user_id: req.user._id }, function(err, blueprints){
+          res.json({
+            layouts: stock_layouts,
+            user_layouts: user_layouts,
+            blueprints: blueprints,
+            user: res.locals.user,
+            layoutCount: res.locals.layoutCount,
+            projectCount: res.locals.projectCount,
+          })
         })
       })
 		})
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 6f60d81..31ba7bf 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -43,7 +43,10 @@
 	    
 			<div class="templates-list">
 			</div>
+
 			<form>
+				<input data-role="create-new-blueprint" class="button_text" type="submit" value="trace a blueprint">
+				<br><br>
 				<input data-role="create-new-layout" class="button_text" type="submit" value="or make your own template">
 			</form>
 		</div>
-- 
cgit v1.2.3-70-g09d2


From 685d5fd7b32ac868a0b2d8ac8a2a1b4120f274cf Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 11:57:51 -0400
Subject: fork orthopolyline

---
 .../rectangles/engine/map/tools/ortho.js           |  2 +-
 .../javascripts/rectangles/engine/shapes/ortho.js  | 41 ++++++++++++++++++++++
 .../rectangles/engine/shapes/polyline.js           | 21 +++++++----
 .../rectangles/engine/shapes/shapelist.js          | 14 ++++++--
 .../javascripts/ui/blueprint/BlueprintSettings.js  |  3 +-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |  2 +-
 .../javascripts/ui/blueprint/BlueprintView.js      | 22 ++++++++++++
 public/assets/stylesheets/app.css                  |  4 +--
 views/partials/header.ejs                          |  2 ++
 views/partials/scripts.ejs                         |  1 +
 views/profile.ejs                                  |  2 ++
 11 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 public/assets/javascripts/rectangles/engine/shapes/ortho.js

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

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index 6ced728..374c822 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -48,7 +48,7 @@ var OrthoPolylineTool = MapTool.extend(function (base) {
     }
     else {
       map.ui.placing = true
-      shapes.workline = new Polyline ()
+      shapes.workline = new OrthoPolyline ()
       shapes.workline.add(p)
       first_point = prev_point = p
       horizontal = false
diff --git a/public/assets/javascripts/rectangles/engine/shapes/ortho.js b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
new file mode 100644
index 0000000..8a8f928
--- /dev/null
+++ b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
@@ -0,0 +1,41 @@
+// An OrthoPolyline is a Polyline where all angles are 90 degrees.
+
+var OrthoPolyline = Polyline.extend(function(base){
+	var exports = {}
+	exports.type = function(){
+	  return "ortho"
+	}
+	exports.instantiate = function(){
+	  return new OrthoPolyline
+	}
+	exports.canCloseWith = function(p){
+    return (this.points.length > 2 && this.points[0].distanceTo( p ) < 10/map.zoom)
+	}
+  exports.draw = function(ctx, fillStyle, strokeStyle){
+    var points = this.points
+    if (! points.length) return
+    if (points.length == 1) {
+      ctx.fillStyle = "#f80"
+      map.draw.dot_at(this.points[0].a, points[0].b, 5)
+    }
+    if (points.length > 1) {
+      ctx.fillStyle = fillStyle
+      ctx.strokeStyle = strokeStyle
+      ctx.lineWidth = 2 / map.zoom
+      ctx.beginPath()
+      ctx.moveTo(points[0].a, points[0].b)
+      points.forEach(function(point, i){
+        i && ctx.lineTo(point.a, point.b)
+      })
+      strokeStyle && ctx.stroke()
+      if (! map.ui.placing || this.closed) {
+        fillStyle && ctx.fill()
+      }
+    }
+  }
+  exports.close = function(){
+    this.points[this.points.length] = this.points[0]
+    this.closed = true
+  }
+  return exports
+})
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index fc6cad7..65e22ad 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -9,6 +9,12 @@ var Polyline = Fiber.extend(function(base){
     this.mx_points = []
     this.closed = false
 	}
+	exports.type = function(){
+	  return "polyline"
+	}
+	exports.instantiate = function(){
+	  return new Polyline
+	}
 	exports.add = function(p){
     this.points.push( p )
     this.mx_points.push( new MX.Point(p) )
@@ -25,19 +31,19 @@ var Polyline = Fiber.extend(function(base){
 	exports.getHeadAtIndex = function(index){
 	  if (index == 0) { return null }
 	  if (index == this.points.length-1) { return this.clone() }
-	  var head = new Polyline()
+	  var head = this.instantiate()
 	  head.points = this.points.slice(0, index+1)
 	  return head
 	}
 	exports.getTailAtIndex = function(index){
 	  if (index == this.points.length-1) { return null }
 	  if (index == 0) { return this.clone() }
-	  var tail = new Polyline()
+	  var tail = this.instantiate()
 	  tail.points = this.points.slice(index, this.points.length)
 	  return tail
 	}
 	exports.clone = function(){
-	  var clone = new Polyline()
+	  var clone = this.instantiate()
 	  clone.points = this.points.concat()
 	}
 	exports.hasPointNear = function(p){
@@ -148,10 +154,13 @@ var Polyline = Fiber.extend(function(base){
     return segments
   }
   exports.serialize = function(){
-    return this.points.map(function(point){ return [point.a, point.b] })
+    return {
+      type: this.type(),
+      points: this.points.map(function(point){ return [point.a, point.b] }),
+    }
   }
-  exports.deserialize = function(points){
-    this.points = points.map(function(point){ return new vec2(point[0], point[1]) })
+  exports.deserialize = function(data){
+    this.points = (data.points || data).map(function(point){ return new vec2(point[0], point[1]) })
   }
   exports.reset = function(){
     this.mx_points.forEach(function(mx){ scene.remove(mx) })
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 75ecae6..e5a70fb 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -87,9 +87,17 @@ var ShapeList = Fiber.extend(function(base){
     })
   }
   exports.deserialize = function(data){
-    data && data.forEach(function(points){
-      var line = new Polyline()
-      line.deserialize(points)
+    data && data.forEach(function(shape_data){
+      var line
+      switch (shape_data.type) {
+        case 'ortho':
+          line = new OrthoPolyline()
+          break
+        default:
+          line = new Polyline()
+          break
+      }
+      line.deserialize(shape_data)
       shapes.add(line)
     }.bind(this))
   }
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index 80c9355..8addb9c 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -93,10 +93,9 @@ var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 		fd.append( "_id", this.$id.val() )
 		fd.append( "name", this.$name.val() )
 		fd.append( "shapes", JSON.stringify( shapes.serialize() ) )
-		fd.append( "startPosition", JSON.stringify( this.parent.startPosition ) )
+		fd.append( "startPosition", JSON.stringify( this.parent.quantizeStartPosition() ) )
     fd.append( "wallHeight", this.parent.info.$height.unitVal() )
     fd.append( "units", this.parent.info.$units.val() )
-
 		return fd
 	},
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index fe1073a..dc3c281 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -65,7 +65,7 @@ var BlueprintUploader = UploadView.extend({
 	  var $el = $(e.currentTarget)
 	  var media = $el.data("media")
 	  this.hide()
-	  this.parent.scaler.pick(media, true)
+	  this.parent.scaler.pick(media)
 	},
   
 	destroy: function(e){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index ecbb536..19b9e84 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -29,6 +29,28 @@ var BlueprintView = View.extend({
 
   orbiting: true,
 	startPosition: {},
+	quantizeStartPosition: function(){
+	  //
+	  var regions = RegionList.build()
+	  var pos = this.startPosition
+	  var startPositionIsInARoom = regions.some(function(region){
+	    return region.contains(pos.x, pos.z)
+	  })
+	  if (startPositionIsInARoom) {
+	    return this.startPosition
+	  }
+	  else {
+	    var center = regions[0].center()
+	    return {
+	      x: center.a,
+	      y: viewHeight,
+	      z: center.b,
+        rotationX: 0,
+        rotationY: Math.PI/2,
+	    }
+	  }
+	},
+	
 	buildMap: function(){
 	  // i forget if this has to be global
     map = new Map ({
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 634ea60..e4f1b27 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1156,6 +1156,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 	width: 100%;
 	height: 100%;
 	padding: 20px 0 40px 0;
+	text-align: center;
 }
 .templates-list,
 .userTemplatesList,
@@ -1186,8 +1187,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 }
 
 .templates span {
-	display: block;
-	float: left;
+	display: inline-block;
 	margin: 1vw 0;
 	width:20%;
 	padding: 2vw;
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index bb8fc6e..ce9ffae 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -64,7 +64,9 @@
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
+<!-- 
 	<a href="/profile" data-role="edit-subscription-modal" class="topLink editSubscription">Subscription</a>
+ -->
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink profileLink">Profile</a>
 	[[ } ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bac4120..da3f0ba 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -86,6 +86,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/ortho.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/regionlist.js"></script>
 
diff --git a/views/profile.ejs b/views/profile.ejs
index 63a07f5..d3ae10e 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -78,7 +78,9 @@
 	[[ } ]]
 
 	</div>
+<!-- 
 	[[ include partials/edit-subscription ]]
+ -->
 	[[ include partials/edit-profile ]]
 	[[ include projects/layouts-modal ]]	
 	[[ include projects/edit-project ]]
-- 
cgit v1.2.3-70-g09d2


From 464bd3bfe74695955239e176dce8fe885bba8ac3 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 12:44:17 -0400
Subject: arrow tool can translate walls orthogonally

---
 .../rectangles/engine/map/tools/arrow.js           | 47 +++++++++++++++++++---
 .../javascripts/rectangles/engine/shapes/ortho.js  | 16 ++++++++
 .../rectangles/engine/shapes/polyline.js           | 28 +++++++++++++
 .../javascripts/ui/blueprint/BlueprintToolbar.js   |  2 +-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |  3 ++
 5 files changed, 89 insertions(+), 7 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
index 00478d4..0b0557e 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
@@ -3,16 +3,33 @@
 var ArrowTool = MapTool.extend(function(base){
 	var exports = {}
 	
-	var selected_point = null, original_point = null, selected_shape = null
+	var selected_point = null, selected_segment = null, original_point = null, selected_shape = null
+	var src_points, dest_points
 	
 	exports.down = function(e, cursor){
     last_point.a = cursor.x.a
     last_point.b = cursor.y.a
     var p = shapes.findClosestPoint(last_point)
-    if (p) {
+    if (p && p.shape.type() !== "ortho") {
       selected_shape = p.shape
       selected_point = p.point
       original_point = selected_point.clone()
+      return
+    }
+    var segment = shapes.findClosestSegment(last_point)
+    if (segment) {
+      document.body.style.cursor = "pointer"
+
+      selected_segment = segment
+      console.log(segment.head, segment.tail)
+      selected_shape = segment.shape
+      src_points = segment.shape.cloneSegment( segment )
+      dest_points = segment.shape.getSegment( segment )
+
+      last_point.a = segment.x
+      last_point.b = segment.y
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
     }
     else {
       map.ui.set_drag_tool("position")
@@ -28,6 +45,15 @@ var ArrowTool = MapTool.extend(function(base){
       last_point.assign(p.point)
       cursor.x.a = cursor.x.b = last_point.a
       cursor.y.a = cursor.y.b = last_point.b
+      return
+    }
+    var segment = shapes.findClosestSegment(last_point)
+    if (segment) {
+      document.body.style.cursor = "pointer"
+      last_point.a = segment.x
+      last_point.b = segment.y
+      cursor.x.a = cursor.x.b = last_point.a
+      cursor.y.a = cursor.y.b = last_point.b
     }
     else {
       document.body.style.cursor = "crosshair"
@@ -35,13 +61,22 @@ var ArrowTool = MapTool.extend(function(base){
 	}
 	
 	exports.drag = function(e, cursor){
-    selected_point.a = original_point.a + cursor.x.magnitude()
-		selected_point.b = original_point.b + cursor.y.magnitude()
-		selected_shape.rebuild()
+	  if (selected_point) {
+      selected_point.a = original_point.a + cursor.x.magnitude()
+      selected_point.b = original_point.b + cursor.y.magnitude()
+      selected_shape.rebuild()
+	  }
+	  else if (selected_segment) {
+	    selected_shape.translateSegment(
+	      src_points, dest_points,
+	      cursor.x.magnitude(), cursor.y.magnitude()
+	    ) 
+      selected_shape.rebuild()
+	  }
 	}
 	
 	exports.up = function(e, cursor){
-	  selected_point = selected_shape = original_point = null
+	  selected_point = selected_shape = selected_segment = original_point = null
 	}
 	
 	return exports
diff --git a/public/assets/javascripts/rectangles/engine/shapes/ortho.js b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
index 8a8f928..c1acae5 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
@@ -33,6 +33,22 @@ var OrthoPolyline = Polyline.extend(function(base){
       }
     }
   }
+	exports.translateSegment = function(src, dest, dx, dy) {
+	  if (src[0].a == src[1].a) {
+	    dest[0].a = src[0].a + dx
+	    dest[1].a = src[1].a + dx
+	    if (src.length == 3) {
+        dest[2].a = src[2].a + dx
+	    }
+	  }
+	  else {
+	    dest[0].b = src[0].b + dy
+	    dest[1].b = src[1].b + dy
+	    if (src.length == 3) {
+        dest[2].b = src[2].b + dy
+	    }
+	  }
+	}
   exports.close = function(){
     this.points[this.points.length] = this.points[0]
     this.closed = true
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 65e22ad..579d0ea 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -46,6 +46,32 @@ var Polyline = Fiber.extend(function(base){
 	  var clone = this.instantiate()
 	  clone.points = this.points.concat()
 	}
+	exports.getSegment = function(segment){
+	  var seg = [
+	    this.points[segment.head],
+	    this.points[segment.tail],
+	  ]
+	  if (segment.head == 0) {
+	    seg.push( this.lastPoint() )
+	  }
+	  else if (segment.tail == this.points.length-1) {
+	    seg.push( this.firstPoint() )
+	  }
+	  return seg
+	}
+	exports.cloneSegment = function(segment){
+	  return this.getSegment(segment).map(function(point){ return point.clone() })
+	}
+	exports.translateSegment = function(src, dest, dx, dy){
+    dest[0].a = src[0].a + dx
+    dest[0].b = src[0].b + dy
+    dest[1].a = src[1].a + dx
+    dest[1].b = src[1].b + dy
+    if (src.length == 3) {
+      dest[2].a = src[2].a + dx
+      dest[2].b = src[2].b + dy
+    }
+	}
 	exports.hasPointNear = function(p){
 	  var point
     for (var i = 0; i < this.points.length; i++){
@@ -156,10 +182,12 @@ var Polyline = Fiber.extend(function(base){
   exports.serialize = function(){
     return {
       type: this.type(),
+      closed: this.closed,
       points: this.points.map(function(point){ return [point.a, point.b] }),
     }
   }
   exports.deserialize = function(data){
+    this.closed = data.closed || false
     this.points = (data.points || data).map(function(point){ return new vec2(point[0], point[1]) })
   }
   exports.reset = function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 7721298..8b0a08f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -24,7 +24,7 @@ var BlueprintToolbar = View.extend({
     this.$eraserMode = this.$('[data-role=eraser-mode]')
     this.$startPositionMode = this.$('[data-role=start-position-mode]')
     
-    this.orthoPolylineMode()
+    this.arrowMode()
   },
   
   showUploader: function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index dc3c281..aa62a4c 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -66,6 +66,9 @@ var BlueprintUploader = UploadView.extend({
 	  var media = $el.data("media")
 	  this.hide()
 	  this.parent.scaler.pick(media)
+	  if (media.slug) {
+	    window.history.pushState(null, document.title, "/blueprint/" + media.slug)
+	  }
 	},
   
 	destroy: function(e){
-- 
cgit v1.2.3-70-g09d2


From f2b0b712d4a73bfaeb1ed21674b0843f0d6fa28a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 12:52:02 -0400
Subject: toggle map with esc

---
 public/assets/javascripts/mx/extensions/mx.movements.js     |  5 ++++-
 public/assets/javascripts/rectangles/engine/rooms/_rooms.js |  4 +++-
 public/assets/javascripts/ui/blueprint/BlueprintToolbar.js  | 13 +++++++++----
 public/assets/javascripts/ui/blueprint/BlueprintView.js     |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

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

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index cecba7a..3e34c1b 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -155,7 +155,10 @@ MX.Movements = function (cam) {
 						app.controller.presets.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (! Rooms.shapesMode) {
+					else if (Rooms.shapesMode) {
+					  // don't show map in editor for now..
+					}
+					else {
 						app.controller.toolbar.toggleMap()
 					}
 					break
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
index 5c9945c..9aff33f 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js
@@ -134,10 +134,12 @@
       window.wallHeight = data.wallHeight || app.defaults.wallHeight
       $(".units").val( data.units )
 
+      Rooms.builder.clear()
+
       shapes.deserialize( data.shapes )
       // shapes.build()
       var regions = RegionList.build()
-
+      
       regions.forEach(function(region){
         var room = new Room({
           rect: region,
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
index 8b0a08f..458357d 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js
@@ -24,6 +24,10 @@ var BlueprintToolbar = View.extend({
     this.$eraserMode = this.$('[data-role=eraser-mode]')
     this.$startPositionMode = this.$('[data-role=start-position-mode]')
     
+    keys.on('escape', function(){
+      app.controller.toolbar.toggleOrbitMode()
+    })
+    
     this.arrowMode()
   },
   
@@ -44,11 +48,12 @@ var BlueprintToolbar = View.extend({
       controls.toggle(false)
       movements.unlock()
       movements.gravity(true)
-      cam.rotationX = 0
-      cam.rotationY = -cam.rotationY
-      cam.x = this.parent.startPosition.x
+      var pos = this.parent.quantizeStartPosition()
+      cam.rotationX = pos.rotationX
+      cam.rotationY = pos.rotationY
+      cam.x = pos.x
       cam.y = viewHeight
-      cam.z = this.parent.startPosition.z
+      cam.z = pos.z
     }
   },
   
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 19b9e84..e249c91 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -18,6 +18,7 @@ var BlueprintView = View.extend({
 		this.info = new BlueprintInfo ({ parent: this })
 		this.settings = new BlueprintSettings ({ parent: this })
 		this.notice = new BlueprintNotice ({ parent: this })
+		Rooms.shapesMode = true
 	},
 
 	load: function(name){
-- 
cgit v1.2.3-70-g09d2


From ebb9226fd5d37e8033e87e41b8ac0355d68f954c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 18:00:57 -0400
Subject: staff area for blueprints

---
 .../rectangles/engine/shapes/regionlist.js         | 64 +++++++++++++++-------
 .../rectangles/engine/shapes/shapelist.js          |  3 +
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  8 +--
 .../javascripts/ui/blueprint/BlueprintInfo.js      | 23 ++++++++
 public/assets/stylesheets/app.css                  |  9 +++
 server/lib/middleware.js                           | 23 ++++++++
 server/lib/views/staff/fields.js                   |  3 +-
 server/lib/views/staff/helpers.js                  |  7 +++
 server/lib/views/staff/index.js                    | 53 ++++++++++++++++--
 server/lib/views/staff/middleware.js               | 55 +++++++++++++++++++
 views/controls/blueprint/info.ejs                  |  7 +++
 views/staff/_blueprints.ejs                        | 21 +++++++
 views/staff/_nav.ejs                               |  1 +
 views/staff/blueprints/index.ejs                   | 13 +++++
 views/staff/blueprints/show.ejs                    | 59 ++++++++++++++++++++
 views/staff/blueprints/show_404.ejs                |  9 +++
 views/staff/layouts/show.ejs                       |  2 +-
 17 files changed, 331 insertions(+), 29 deletions(-)
 create mode 100644 views/staff/_blueprints.ejs
 create mode 100644 views/staff/blueprints/index.ejs
 create mode 100644 views/staff/blueprints/show.ejs
 create mode 100644 views/staff/blueprints/show_404.ejs

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

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 86269a6..0dd4a1e 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -10,10 +10,25 @@ var RegionList = (function(){
   var RegionList = {}
   var regions = RegionList.regions
 
+  // Build a list of regions from the existing shapes.
+  // Operates on all the shapes at once.
   RegionList.build = function(){
-  
-    // first, get the segments sorted right to left & top to bottom
     var segments = RegionList.getSortedSegments()
+    return RegionList.buildRoomsFromSegments(segments)
+  }
+  
+  // Build a list of regions from the individual shapes.
+  // Same, but operates on the shapes individually
+  RegionList.buildByShape = function(){
+    var shapes = RegionList.getSortedSegmentsByShape()
+    var region_lists = shapes.map(function(shape){
+      return RegionList.buildRoomsFromSegments(shape.segments)
+    })
+    var regions = []
+    return regions.concat.apply(regions, region_lists);
+  }
+  
+  RegionList.buildRoomsFromSegments = function(segments){
 
     var rooms = []
     var seen_rooms = {}
@@ -172,31 +187,42 @@ var RegionList = (function(){
     return rooms
   }
   
-  
   // Gets a list of polylines from the ShapeList and sorts the segments.
   RegionList.getSortedSegments = function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
 
-    // re-orient them so they're either facing up or right and make them into rects
-    segments = segments.map(function(segment){
-      // vertical
-      if (segment[0].a == segment[1].a) {
-        if (segment[0].b > segment[1].b) {
-          segment.push(segment.shift())
-        }
-      }
-      // horizontal
-      else if (segment[0].b == segment[1].b) {
-        if (segment[0].a > segment[1].a) {
-          segment.push(segment.shift())
-        }
-      }
-      return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
-    })
+    segments = segments.map(RegionList.segmentsToRects)
     
     return sort.rects_by_position(segments)
   }
+  
+  RegionList.getSortedSegmentsByShape = function(){
+    return shapes.getAllShapeSegments().map(function(shape){
+      var segments = shape.map(RegionList.segmentsToRects)
+      return {
+        shape: shape,
+        segments: sort.rects_by_position(segments)
+      }
+    })
+  }
+
+  // re-orient a segment so it's either facing up or right and make it into a rect
+  RegionList.segmentsToRects = function(segment){
+    // vertical
+    if (segment[0].a == segment[1].a) {
+      if (segment[0].b > segment[1].b) {
+        segment.push(segment.shift())
+      }
+    }
+    // horizontal
+    else if (segment[0].b == segment[1].b) {
+      if (segment[0].a > segment[1].a) {
+        segment.push(segment.shift())
+      }
+    }
+    return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
+  }
 
   return RegionList
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index e5a70fb..2d33af2 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -69,6 +69,9 @@ var ShapeList = Fiber.extend(function(base){
   exports.forEach = function(fn){
     this.shapes.forEach(fn)
   }
+  exports.getAllShapeSegments = function(){
+    return this.shapes.map(function(shape){ return shape.getSegments() })
+  }
   exports.getAllSegments = function(){
     var segments = []
     this.shapes.forEach(function(shape){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 7a1c064..7704689 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -82,7 +82,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
       scale: media.scale,
     })
     this.startAnimating()
-    this.regions = RegionList.build()
+    this.regions = RegionList.buildByShape()
   },
   
   animate: function(t, dt){
@@ -114,9 +114,9 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.camera(scene.camera)
     
 //    var colors = ["rgba(0,0,0,0.1)"]
-//     var colors = ["rgba(255,255,255,1)"]
-// 
-//    map.draw.regions(this.regions, colors, "#000")
+//    var colors = ["rgba(255,255,255,1)"]
+
+//     map.draw.regions(this.regions, colors, "#000")
 
 //     this.regions.forEach(function(room,i){
 //       map.draw.ctx.fillStyle = colors[i % colors.length]
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintInfo.js b/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
index 6dd6a7d..51b310e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintInfo.js
@@ -10,6 +10,7 @@ var BlueprintInfo = View.extend({
 		"change [name=units]": 'changeUnits',
 		"keydown [name=viewHeight]": 'enterViewHeight',
 		"change [name=viewHeight]": 'changeViewHeight',
+		"click .openScaler": 'openScaler',
 	},
 	
 	initialize: function(opt){
@@ -18,13 +19,30 @@ var BlueprintInfo = View.extend({
 		this.$units = this.$("[name=units]")
 		this.$viewHeight = this.$("[name=viewHeight]")
 		this.$unitName = this.$(".unitName")
+		this.$blueprintScaleDisplay = this.$("#blueprintScaleDisplay")
 	},
 	
 	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.$('span.units').html( data.units )
 		this.$unitName.html( data.units )
+
+		var resolution
+		switch (data.units) {
+		  case 'ft':
+		    resolution = app.defaults.footResolution
+		    break
+		  case 'm':
+		    resolution = app.defaults.meterResolution
+		    break
+		  case 'px':
+		  default:
+		    resolution = 1
+		    break
+		}
+    this.$blueprintScaleDisplay.html( ((1/data.scale) * resolution).toFixed(1) )
 		this.show()
 	},
 
@@ -33,6 +51,11 @@ var BlueprintInfo = View.extend({
     this.$viewHeight.unitVal( window.viewHeight )
 	},
 	
+	openScaler: function(){
+	  this.parent.scaler.pick( this.parent.data, true )
+	  this.parent.scaler.show()
+	},
+	
 	show: function(){	
 		this.toggle(true)
 	},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e4f1b27..1154fde 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2505,6 +2505,9 @@ input[type="range"]::-webkit-slider-thumb {
 	top: 5px;
 	font-weight:600;
 }
+.setting.number.scale label {
+	top: 0;
+}
 .setting.number label:after {
 	content:":";
 }
@@ -3328,6 +3331,7 @@ a[data-role="forgot-password"] {
   padding: 0px;
   position: relative;
   display: inline-block;
+  margin: 0 2px;
 }
 .blueprints .blueprint img {
   height: 100px;
@@ -3364,6 +3368,11 @@ a[data-role="forgot-password"] {
 [data-role="create-new-blueprint"] {
   margin-bottom: 10px;
 }
+.openScaler {
+  margin-left: 10px;
+  border-bottom: 1px solid;
+  cursor: pointer;
+}
 
 /* KEYBOARD SHORTCUTS */
 
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 04cb330..0a0a9ce 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -8,6 +8,7 @@ var passport = require('passport'),
 	Collaborator = require('./schemas/Collaborator'),
 	Project = require('./schemas/Project'),
 	Layout = require('./schemas/Layout'),
+	Blueprint = require('./schemas/Blueprint'),
 	Plan = require('./schemas/Plan');
 
 
@@ -129,6 +130,28 @@ var middleware = {
 		}
 	},
 
+	ensureBlueprint: function (req, res, next) {
+		if (req.params.slug) {
+			Blueprint.findOne({ slug: req.params.slug }, function(err, blueprint){
+				if (err) {
+					console.error(err)
+					req.blueprint = null
+				}
+				else if (! blueprint) {
+					req.blueprint = null
+				}
+				else {
+					req.blueprint = blueprint
+				}
+				next()
+			})
+		}
+		else {
+			req.blueprint = null
+			next()
+		}
+	},
+	
   ensureIsCollaborator: function(req, res, next) {
     req.isCollaborator = false
     req.isOwner = false
diff --git a/server/lib/views/staff/fields.js b/server/lib/views/staff/fields.js
index 57eea7e..84c1efa 100644
--- a/server/lib/views/staff/fields.js
+++ b/server/lib/views/staff/fields.js
@@ -1,7 +1,8 @@
 module.exports = {
   user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip",
   project: "_id name slug user_id privacy layout_type created_at updated_at",
-  layout: "_id name slug user_id layout_type created_at updated_at",
+  layout: "_id name slug user_id layout_type is_stock created_at updated_at",
+  blueprint: "_id name slug user_id created_at updated_at",
   plans: "monthly_price yearly_price basic_layout_monthly_price basic_layout_yearly_price " +
          "pro_layout_monthly_price pro_layout_yearly_price " +
          "basic_layout_limit pro_layout_limit stock_project_limit basic_project_limit pro_project_limit",
diff --git a/server/lib/views/staff/helpers.js b/server/lib/views/staff/helpers.js
index 57383f4..ff4065a 100644
--- a/server/lib/views/staff/helpers.js
+++ b/server/lib/views/staff/helpers.js
@@ -27,6 +27,13 @@ module.exports = {
     layout.user = {}
     return layout
   },
+
+  blueprint: function(blueprint){
+    blueprint = blueprint.toObject()
+    blueprint.date = moment( blueprint.updated_at || blueprint.created_at ).format("M/DD/YYYY hh:mm a")
+    blueprint.user = {}
+    return blueprint
+  },
   
   media: function(media){
     media = media.toObject()
diff --git a/server/lib/views/staff/index.js b/server/lib/views/staff/index.js
index 033fc88..49a0384 100644
--- a/server/lib/views/staff/index.js
+++ b/server/lib/views/staff/index.js
@@ -7,6 +7,7 @@ var User = require('../../schemas/User'),
 	Plan = require('../../schemas/Plan'),
 	Subscription = require('../../schemas/Subscription'),
 	Layout = require('../../schemas/Layout'),
+	Blueprint = require('../../schemas/Blueprint'),
 	config = require('../../../../config'),
 	middleware = require('../../middleware'),
 	util = require('../../util'),
@@ -159,7 +160,32 @@ var staff = module.exports = {
 
       staff.layouts.make_stock
     );
-    
+
+    //
+    // blueprints
+
+    app.get('/staff/blueprints',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+      
+      staff.middleware.ensureBlueprintsCount,
+
+      staff.middleware.ensureBlueprints,
+      staff.middleware.ensureBlueprintsUsers,
+
+      staff.blueprints.index
+    );
+    app.get('/staff/blueprints/:slug',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+
+      middleware.ensureBlueprint,
+      staff.middleware.ensureBlueprint,
+      staff.middleware.ensureBlueprintUser,
+
+      staff.blueprints.show
+    );
+
     //
     // media
     
@@ -321,7 +347,7 @@ var staff = module.exports = {
   },
   
   // /staff/projects/
-  // /staff/projects/:name
+  // /staff/projects/:slug
   projects: {
     index: function(req, res){
       res.locals.pagination.count = res.locals.projects.length
@@ -350,7 +376,7 @@ var staff = module.exports = {
   },
 
   // /staff/layouts/
-  // /staff/layouts/:name
+  // /staff/layouts/:slug
   layouts: {
     index: function(req, res){
       res.locals.pagination.count = res.locals.layouts.length
@@ -374,7 +400,26 @@ var staff = module.exports = {
       })
     },
   },
-  
+
+  // /staff/blueprints/
+  // /staff/blueprints/:slug
+  blueprints: {
+    index: function(req, res){
+      res.locals.pagination.count = res.locals.blueprints.length
+      res.locals.pagination.max = res.locals.blueprintCount
+      staff.paginate(req, res)
+      res.render('staff/blueprints/index')
+    },
+    show: function(req, res){
+      if (res.locals.blueprint) {
+        res.render('staff/blueprints/show', {
+        })
+      }
+      else {
+        res.render('staff/blueprints/show_404')
+      }
+    },
+  },
 
   media: {
     index: function(req, res){
diff --git a/server/lib/views/staff/middleware.js b/server/lib/views/staff/middleware.js
index 1ea98e9..03fda2e 100644
--- a/server/lib/views/staff/middleware.js
+++ b/server/lib/views/staff/middleware.js
@@ -6,6 +6,7 @@ var User = require('../../schemas/User'),
 	Plan = require('../../schemas/Plan'),
 	Subscription = require('../../schemas/Subscription'),
 	Layout = require('../../schemas/Layout'),
+	Blueprint = require('../../schemas/Blueprint'),
 	util = require('../../util'),
 	fields = require('./fields'),
 	helpers = require('./helpers'),
@@ -128,6 +129,35 @@ var middleware = module.exports = {
     })
   },
 
+  ensureBlueprints: function(req, res, next){
+    var paginationInfo = res.locals.pagination = {}
+    var criteria = req.criteria || {}
+    var limit = paginationInfo.limit = Math.min( Number(req.query.limit) || 50, 200 )
+    var offset = paginationInfo.offset = Number(req.query.offset) || 0
+    var sort
+    paginationInfo.sort = req.query.sort
+    paginationInfo.sortOptions = ["date", "name"]
+    switch (req.query.sort) {
+      default:
+      case 'date':
+        sort = {'updated_at': -1}
+        break
+      case 'name':
+        paginationInfo.sort = "name"
+        sort = {'slug': 1}
+        break
+    }
+    Blueprint.find(criteria)
+        .select(fields.blueprint)
+        .sort(sort)
+        .skip(offset)
+        .limit(limit)
+        .exec(function (err, blueprints) {
+      res.locals.blueprints = blueprints.map(helpers.blueprint)
+      next()
+    })
+  },
+
   ensureMedia: function(req, res, next){
     var paginationInfo = res.locals.pagination = {}
     var criteria = req.criteria || {}
@@ -240,6 +270,11 @@ var middleware = module.exports = {
     middleware.ensureObjectsUsers(res.locals.layouts, next)
   },
 
+  ensureBlueprintsUsers: function(req, res, next){
+    if (! res.locals.blueprints || ! res.locals.blueprints.length) { return next() }
+    middleware.ensureObjectsUsers(res.locals.blueprints, next)
+  },
+  
   ensureSubscriptionsUsers: function(req, res, next){
     if (! res.locals.subscriptions || ! res.locals.subscriptions.length) { return next() }
     middleware.ensureObjectsUsers(res.locals.subscriptions, next)
@@ -345,6 +380,13 @@ var middleware = module.exports = {
     })
   },
 
+  ensureBlueprintsCount: function(req, res, next){
+    Blueprint.count({}, function(err, count){
+      res.locals.blueprintCount = count || 0
+      next()
+    })
+  },
+  
   ensureMediaCount: function(req, res, next){
     Media.count({}, function(err, count){
       res.locals.mediaCount = count || 0
@@ -418,4 +460,17 @@ var middleware = module.exports = {
     })
   },
 
+  ensureBlueprint: function(req, res, next){
+    res.locals.blueprint = req.blueprint
+    next()
+  },
+  ensureBlueprintUser: function(req, res, next){
+    if (! res.locals.blueprint) { return next() }
+    User.findOne({ _id: res.locals.blueprint.user_id }, fields.user, function(err, user){
+      res.locals.blueprintUser = helpers.user(user) || defaults.user
+      next()
+    })
+  },
+
+
 }
\ No newline at end of file
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index 4e2316f..a86481b 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -20,4 +20,11 @@
 		</select>
 	</div>
 
+	<div class="setting number scale">
+		<label>scale</label>
+    <span id="blueprintScaleDisplay"></span>
+    px/<span class="units"></span>
+    <span class="openScaler">[edit scale]</span>
+	</div>
+
 </div>
diff --git a/views/staff/_blueprints.ejs b/views/staff/_blueprints.ejs
new file mode 100644
index 0000000..58fe2a3
--- /dev/null
+++ b/views/staff/_blueprints.ejs
@@ -0,0 +1,21 @@
+<table id="users">
+[[ blueprints.forEach(function(blueprint){ ]]
+  <tr>
+    <td>
+      <a href="/staff/blueprints/[[- blueprint.slug ]]">[[- blueprint.name ]]</a>
+    </td>
+    <td class="editLinks">
+      <a href="/blueprint/[[- blueprint.slug ]]">[view]</a>
+<!-- 
+      <a href="/api/rooms/[[- blueprint.slug ]]">[api]</a>
+ -->
+    </td>
+    <td>
+      <a href="/staff/users/[[- blueprint.user.username ]]">[[- blueprint.user.username ]]</a>
+    </td>
+    <td>
+      [[- blueprint.date ]]
+    </td>
+  </tr>
+[[ }) ]]
+</table>
diff --git a/views/staff/_nav.ejs b/views/staff/_nav.ejs
index 3bb3b08..702a374 100644
--- a/views/staff/_nav.ejs
+++ b/views/staff/_nav.ejs
@@ -3,6 +3,7 @@
   <a href="/staff/users">users</a>
   <a href="/staff/projects">projects</a>
   <a href="/staff/layouts">layouts</a>
+  <a href="/staff/blueprints">blueprints</a>
   <a href="/staff/media">media</a>
   <a href="/staff/plans">plans</a>
 <!-- <a href="/staff/subscriptions">subscriptions</a> -->
diff --git a/views/staff/blueprints/index.ejs b/views/staff/blueprints/index.ejs
new file mode 100644
index 0000000..2206a1c
--- /dev/null
+++ b/views/staff/blueprints/index.ejs
@@ -0,0 +1,13 @@
+[[ include ../_header ]]
+
+	<h1>Blueprints</h1>
+
+[[ include ../_nav ]]
+  
+  <hr>
+
+[[ include ../_pagination ]]
+[[ include ../_blueprints ]]
+[[ include ../_pagination ]]
+
+[[ include ../_footer ]]
diff --git a/views/staff/blueprints/show.ejs b/views/staff/blueprints/show.ejs
new file mode 100644
index 0000000..5fd9db6
--- /dev/null
+++ b/views/staff/blueprints/show.ejs
@@ -0,0 +1,59 @@
+[[ include ../_header ]]
+
+	<h1>[[- blueprint.name ]]</h1>
+
+[[ include ../_nav ]]
+
+  <hr>
+
+  <table>
+    <tr>
+      <td>
+        <a href="/staff/blueprints/[[- blueprint.slug ]]">[[- blueprint.name ]]</a>
+      </td>
+      <td class="editLinks">
+        <a href="/blueprint/[[- blueprint.slug ]]">[view]</a>
+        <a href="/blueprint/[[- blueprint.slug ]]/edit">[edit]</a>
+<!-- 
+        <a href="/api/rooms/[[- blueprint.slug ]]">[api]</a>
+ -->
+      </td>
+      <td>
+        [[- blueprint.date ]]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        [[ if (blueprintUser.photo) { ]]
+          <a href="/staff/users/[[- blueprintUser.username ]]"><div style="background-image:url([[- blueprintUser.photo ]])" class="avatar"></div></a>
+        [[ } ]]
+        <a href="/staff/users/[[- blueprintUser.username ]]">[[- blueprintUser.username ]]</a>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="999">
+        <img src="[[- blueprint.url ]]" style="max-width: 400px">
+      </td>
+    </tr>
+    <tr>
+      <td>Width</td>
+      <td>[[- blueprint.width ]]</td>
+    </tr>
+    <tr>
+      <td>Height</td>
+      <td>[[- blueprint.height ]]</td>
+    </tr>
+    <tr>
+      <td>Scale</td>
+      <td>[[- blueprint.scale ]]</td>
+    </tr>
+  </table>
+
+  <br><br>
+  <div id="actions">
+  </div>
+  
+  <br>
+  <br>
+
+[[ include ../_footer ]]
diff --git a/views/staff/blueprints/show_404.ejs b/views/staff/blueprints/show_404.ejs
new file mode 100644
index 0000000..0ffca86
--- /dev/null
+++ b/views/staff/blueprints/show_404.ejs
@@ -0,0 +1,9 @@
+[[ include ../_header ]]
+
+	<h1>Blueprint not found</h1>
+
+[[ include ../_nav ]]
+  
+  <hr>
+
+[[ include ../_footer ]]
diff --git a/views/staff/layouts/show.ejs b/views/staff/layouts/show.ejs
index b66449f..2742c1f 100644
--- a/views/staff/layouts/show.ejs
+++ b/views/staff/layouts/show.ejs
@@ -42,7 +42,7 @@
     </tr>
     <tr>
       <th>
-        featured?
+        stock layout?
       </th>
       <td id="isStockLayout">
         [[- layout.is_stock ? "yes" : "no" ]]
-- 
cgit v1.2.3-70-g09d2


From ee110d4725943bbc2b783323ec5087324531ca33 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 27 Aug 2015 18:17:14 -0400
Subject: get rooms api working with shapes

---
 .../javascripts/rectangles/engine/map/_map.js      |   3 +
 .../javascripts/rectangles/engine/map/draw.js      |  19 +--
 .../javascripts/rectangles/engine/shapes/ortho.js  |   9 ++
 .../rectangles/engine/shapes/polyline.js           |   9 ++
 .../rectangles/engine/shapes/regionlist.js         |  11 ++
 .../rectangles/engine/shapes/shapelist.js          |  13 +-
 .../assets/javascripts/ui/editor/EditorSettings.js |   2 +-
 public/assets/javascripts/ui/reader/ReaderView.js  |   7 +-
 server/lib/api/rooms.js                            | 139 +++++++++++++++------
 9 files changed, 161 insertions(+), 51 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index e27346d..6492db6 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -50,6 +50,7 @@ var Map = function(opt){
 	switch (opt.type) {
 		case "ortho":
 			base.draw = new Map.Draw (base, { ortho: true })
+			base.draw.grid_size = MAP_GRID_SIZE
 			base.ui = new Map.UI.Ortho (base)
 			base.sides = base.sides_for_center
 			$(window).resize(base.resize)
@@ -57,6 +58,7 @@ var Map = function(opt){
 		
 		case "editor":
 			base.draw = new Map.Draw (base)
+			base.draw.grid_size = MAP_GRID_SIZE
 			base.ui = new Map.UI.Editor (base)
 			base.sides = base.sides_for_center
 			$(window).resize(base.resize)
@@ -64,6 +66,7 @@ var Map = function(opt){
 		
 		case "minimap":
 			base.draw = new Map.Draw (base, { center: scene.camera, minimap: true })
+			base.draw.grid_size = MAP_GRID_SIZE * 10
 			base.ui = new Map.UI.Minimap (base)
 			base.sides = base.sides_for_camera
 			break
diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js
index fd05f86..4f4759f 100644
--- a/public/assets/javascripts/rectangles/engine/map/draw.js
+++ b/public/assets/javascripts/rectangles/engine/map/draw.js
@@ -179,8 +179,8 @@ Map.Draw = function(map, opt){
 		ctx.lineWidth = 1/map.zoom
 		
 		var sides = map.sides()
-		var quant = sides.clone().quantize(MAP_GRID_SIZE)
-		for (var x = quant.x.a - MAP_GRID_SIZE; x <= quant.x.b; x += MAP_GRID_SIZE) {
+		var quant = sides.clone().quantize(draw.grid_size)
+		for (var x = quant.x.a - draw.grid_size; x <= quant.x.b; x += draw.grid_size) {
 		  if (Math.round(x) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
@@ -191,17 +191,18 @@ Map.Draw = function(map, opt){
 		  }
       line(x, sides.y.a, x, sides.y.b)
 		}
-		for (var y = quant.y.a - MAP_GRID_SIZE; y <= quant.y.b; y += MAP_GRID_SIZE) {
-		  if (Math.round(y) % 360 == 0) {
+
+    for (var y = quant.y.a - draw.grid_size; y <= quant.y.b; y += draw.grid_size) {
+      if (Math.round(y) % 360 == 0) {
         ctx.strokeStyle = "rgba(0,0,0,0.3)"
         ctx.lineWidth = 1/map.zoom
-		  }
-		  else {
+      }
+      else {
         ctx.strokeStyle = "rgba(0,0,0,0.05)"
         ctx.lineWidth = 1/map.zoom
-		  }
-			line(sides.x.a, y, sides.x.b, y)
-		}
+      }
+      line(sides.x.a, y, sides.x.b, y)
+    }
 	}
 
 	//
diff --git a/public/assets/javascripts/rectangles/engine/shapes/ortho.js b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
index c1acae5..163f646 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/ortho.js
@@ -1,5 +1,9 @@
 // An OrthoPolyline is a Polyline where all angles are 90 degrees.
 
+if (! ('window' in this) ) {
+  var Polyline = require("./polyline.js")
+}
+
 var OrthoPolyline = Polyline.extend(function(base){
 	var exports = {}
 	exports.type = function(){
@@ -55,3 +59,8 @@ var OrthoPolyline = Polyline.extend(function(base){
   }
   return exports
 })
+
+
+if (! ('window' in this) ) {
+  module.exports = OrthoPolyline
+}
diff --git a/public/assets/javascripts/rectangles/engine/shapes/polyline.js b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
index 579d0ea..b2cd92f 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/polyline.js
@@ -2,6 +2,11 @@
 // Additionally, it manages a set of MX objects which correspond to the walls in 3D.
 // In this way, it attempts to bridge the 2D (canvas, imperative) and 3D (css, declarative) views.
 
+if (! ('window' in this) ) {
+  var Fiber = require("../../../vendor/bower_components/fiber/src/fiber.js")
+  var vec2 = require("../../models/vec2")
+}
+
 var Polyline = Fiber.extend(function(base){
 	var exports = {}
 	exports.init = function(){
@@ -201,3 +206,7 @@ var Polyline = Fiber.extend(function(base){
 	}
   return exports
 })
+
+if (! ('window' in this) ) {
+  module.exports = Polyline
+}
diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 0dd4a1e..8c9e732 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -5,6 +5,13 @@
 // 1) all angles are orthogonal
 // 2) all polylines are closed
 
+if (! ('window' in this) ) {
+  var Fiber = require("../../../vendor/bower_components/fiber/src/fiber.js")
+  var vec2 = require("../../models/vec2")
+  var Rect = require("../../models/rect")
+  var sort = require("../../util/sort")
+}
+
 var RegionList = (function(){
 
   var RegionList = {}
@@ -223,6 +230,10 @@ var RegionList = (function(){
     }
     return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
   }
+  
+  if (! ('window' in this) ) {
+		module.exports = RegionList
+	}
 
   return RegionList
   
diff --git a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
index 2d33af2..21beb76 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/shapelist.js
@@ -1,5 +1,11 @@
 // The ShapeList manages the list of polylines which form a V2 layout.
 
+if (! ('window' in this) ) {
+  var Fiber = require("../../../vendor/bower_components/fiber/src/fiber.js")
+  var Polyline = require("./polyline.js")
+  var OrthoPolyline = require("./ortho.js")
+}
+
 var ShapeList = Fiber.extend(function(base){
   var exports = {}
   exports.init = function(){
@@ -110,4 +116,9 @@ var ShapeList = Fiber.extend(function(base){
     })
   }
   return exports
-})
\ No newline at end of file
+})
+
+if (! ('window' in this) ) {
+  shapes = new ShapeList
+  module.exports = shapes
+}
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 83bc8b7..d8cfca6 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		if (data.shapes) {
+		if (data.shapes.length) {
 		  Rooms.deserializeFromShapes(data, data.walls)
 		}
 		else if (data.rooms) {
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 1ba97cf..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -76,7 +76,12 @@ var ReaderView = View.extend({
   },
   
   build: function(data){
-		data.rooms && Rooms.deserialize(data.rooms)
+		if (data.shapes.length) {
+		  Rooms.deserializeFromShapes(data)
+		}
+		else {
+		  Rooms.deserialize(data.rooms)
+		}
 		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
     data.sculpture && Sculpture.deserialize(data.sculpture)
diff --git a/server/lib/api/rooms.js b/server/lib/api/rooms.js
index c044309..2a1d2fe 100644
--- a/server/lib/api/rooms.js
+++ b/server/lib/api/rooms.js
@@ -6,6 +6,8 @@ var Clipper = require("../../../public/assets/javascripts/rectangles/engine/room
 var Builder = require("../../../public/assets/javascripts/rectangles/engine/rooms/builder.js")
 var Grouper = require("../../../public/assets/javascripts/rectangles/engine/rooms/grouper.js")
 var Walls = require("../../../public/assets/javascripts/rectangles/engine/rooms/_walls.js")
+var shapes = require("../../../public/assets/javascripts/rectangles/engine/shapes/shapelist.js")
+var RegionList = require("../../../public/assets/javascripts/rectangles/engine/shapes/regionlist.js")
 
 /* jshint node: true */
 
@@ -21,47 +23,106 @@ var rooms = module.exports = {
 			if (! doc) { res.json({ status: 404 }); return }
 			doc = doc.toObject()
 
-      doc.rooms.forEach(function(data){
-				var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
-				var room = new Room({
-					id: data.id,
-					rect: rect,
-					height: data.height
-				})
-				Rooms.add(room)
-			})
-			Rooms.clipper.solve_rects()
-      Rooms.builder.build()
-
-			var walls = [], mx_walls = [], mx_floor = [], mx_ceiling = []
-			var collections = Rooms.grouper.collect()
-			Rooms.grouper.cull(collections)
-			Rooms.grouper.group(walls, collections, FRONT)
-			Rooms.grouper.group(walls, collections, BACK)
-			Rooms.grouper.group(walls, collections, LEFT)
-			Rooms.grouper.group(walls, collections, RIGHT)
-			walls.forEach(function(wall){
-			  wall.mx.forEach(function(mx){
-			    var data = mx.report()
-			    data.id = wall.id
-          mx_walls.push(data)
-			  })
-			})
-
-      doc.mx_walls = mx_walls
-      doc.mx_floor = mx_floor
-      doc.mx_ceiling = mx_ceiling
-      
-      Rooms.forEach(function(room){
-        room.mx_floor.forEach(function(mx){
-          mx_floor.push( mx.report() )
-        })
-        room.mx_ceiling.forEach(function(mx){
-          mx_ceiling.push( mx.report() )
-        })
-      })
+      if (doc.shapes.length) {
+        parseMxShapes(doc)
+      }
+      else {
+        parseMxRooms(doc)
+      }
 
       res.json(doc)
 		})
 	}
 }
+
+function parseMxShapes (doc) {
+  var viewHeight = doc.viewHeight
+  var wallHeight = doc.wallHeight
+
+  shapes.deserialize( doc.shapes )
+
+  var walls = [], mx_walls = [], mx_floor = [], mx_ceiling = []
+  var regions = RegionList.build()
+  
+  regions.forEach(function(region){
+    var room = new Room({
+      rect: region,
+      regions: [region],
+      height: wallHeight,
+    })
+
+    room.sides = region.sides
+    region.id = Rooms.uid("room_")
+    Rooms.list[ region.id ] = room
+    Rooms.builder.build_walls(region)
+    mx_floor.push( Rooms.builder.make_floor(room, region) )
+    mx_ceiling.push( Rooms.builder.make_ceiling(room, region) )
+  })
+
+  var collections = Rooms.grouper.collect()
+  Rooms.grouper.cull(collections)
+  Rooms.grouper.group(walls, collections, FRONT)
+  Rooms.grouper.group(walls, collections, BACK)
+  Rooms.grouper.group(walls, collections, LEFT)
+  Rooms.grouper.group(walls, collections, RIGHT)
+  walls.forEach(function(wall){
+    wall.mx.forEach(function(mx){
+      var data = mx.report()
+      data.id = wall.id
+      mx_walls.push(data)
+    })
+  })
+
+  doc.mx_walls = mx_walls
+  doc.mx_floor = mx_floor
+  doc.mx_ceiling = mx_ceiling
+
+  Rooms.forEach(function(room){
+    mx_floor.push( room.mx_floor )
+    room.mx_ceiling.forEach(function(mx){
+      mx_ceiling.push( mx.report() )
+    })
+  })
+}
+
+function parseMxRooms (doc) {
+  doc.rooms.forEach(function(data){
+    var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1])
+    var room = new Room({
+      id: data.id,
+      rect: rect,
+      height: data.height
+    })
+    Rooms.add(room)
+  })
+  Rooms.clipper.solve_rects()
+  Rooms.builder.build()
+
+  var walls = [], mx_walls = [], mx_floor = [], mx_ceiling = []
+  var collections = Rooms.grouper.collect()
+  Rooms.grouper.cull(collections)
+  Rooms.grouper.group(walls, collections, FRONT)
+  Rooms.grouper.group(walls, collections, BACK)
+  Rooms.grouper.group(walls, collections, LEFT)
+  Rooms.grouper.group(walls, collections, RIGHT)
+  walls.forEach(function(wall){
+    wall.mx.forEach(function(mx){
+      var data = mx.report()
+      data.id = wall.id
+      mx_walls.push(data)
+    })
+  })
+
+  doc.mx_walls = mx_walls
+  doc.mx_floor = mx_floor
+  doc.mx_ceiling = mx_ceiling
+  
+  Rooms.forEach(function(room){
+    room.mx_floor.forEach(function(mx){
+      mx_floor.push( mx.report() )
+    })
+    room.mx_ceiling.forEach(function(mx){
+      mx_ceiling.push( mx.report() )
+    })
+  })
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 9d3c9cb918d03a8a30eb325e1f7e4d55f1765dcc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 25 Jan 2016 20:31:37 +0100
Subject: remove quotes from css url

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js | 2 +-
 public/assets/javascripts/rectangles/models/floor.js        | 2 +-
 public/assets/javascripts/rectangles/models/wall.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 04d0594..38dac84 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -162,7 +162,7 @@
 						wall.wallpaper(background, img)
 					})
 				}.bind(this)
-				img.src = background.src.replace("url(","").replace(")","")
+        img.src = background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"")
 				img.complete && img.onload()
 			},
 			floor: function(background){
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 799bdc7..63eebcc 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -153,7 +153,7 @@
     background.scale = background.scale || 1
 
 		this.background = background
-		this.background.src = this.background.src.replace("url(","").replace(")","")
+    this.background.src = this.background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"")
 
 		if (this.background.src == "none") {
 		  this.wallpaperLoad(this.background.src)
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 5aa8359..cf3cea8 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -294,7 +294,7 @@
     background.scale = background.scale || 1
 
 		this.background = background
-		this.background.src = this.background.src.replace("url(","").replace(")","")
+    this.background.src = this.background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"")
 
 		if (this.background.src == "none") {
 		  this.wallpaperLoad(this.background.src)
-- 
cgit v1.2.3-70-g09d2


From d3c355ce07e0d8ec41fedd9cde970f4a7c03dec6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Jun 2016 15:25:05 -0400
Subject: fix odd bugs that have appeared

---
 package.json                                       | 29 +++++++++++-----------
 .../assets/javascripts/rectangles/models/rect.js   | 21 ++++++++--------
 .../javascripts/ui/blueprint/BlueprintView.js      |  9 +++++++
 server/index.js                                    |  5 ++--
 views/home.ejs                                     |  2 +-
 5 files changed, 37 insertions(+), 29 deletions(-)

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

diff --git a/package.json b/package.json
index ce81cde..b055b9e 100644
--- a/package.json
+++ b/package.json
@@ -17,18 +17,17 @@
     "html-entities": "~1.0.10",
     "inspect": "0.0.2",
     "intro.js": "^0.9.0",
-    "js2xml": "^1.0.0",
+    "js2xml": "",
     "knox": "~0.8.10",
     "lodash": "~2.4.1",
     "marked": "~0.3.2",
+    "method-override": "^2.3.6",
     "moment": "~2.6.0",
-    "mongoose": "~3.8.8",
-    "mongoose-lifecycle": "~1.0.0",
-    "mongoose-unique-validator": "~0.3.0",
-    "monk": "~0.7.1",
+    "mongoose": "^4.2.8",
+    "mongoose-lifecycle": "",
+    "mongoose-unique-validator": "",
     "multer": "~0.1.0",
     "node-recurly": "julescarbon/node-recurly",
-    "node-restful": "~0.1.14",
     "passport": "~0.2.0",
     "passport-facebook": "~1.0.3",
     "passport-local": "~1.0.0",
@@ -36,16 +35,16 @@
     "passport.socketio": "~3.0.1",
     "socket.io": "~0.9.16",
     "useful-string": "0.0.1",
-    "xml2js": "^0.4.4"
+    "xml2js": ""
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-uglify": "~0.2.5",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-copy": "~0.5.0",
-    "grunt-dentist": "~0.3.4",
-    "mocha": "~1.20.1"
+    "grunt": "",
+    "grunt-contrib-concat": "",
+    "grunt-contrib-uglify": "",
+    "grunt-contrib-watch": "",
+    "grunt-contrib-clean": "",
+    "grunt-contrib-copy": "",
+    "grunt-dentist": "",
+    "mocha": ""
   }
 }
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index a4756ed..4f73bec 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -1,4 +1,3 @@
-
 (function(){
 	var vec2
 	if ('window' in this) {
@@ -8,17 +7,17 @@
 		vec2 = require('./vec2')
 		FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
 		TOP = CEILING, BOTTOM = FLOOR
-		function sidesToString(sides){
-			var s = ""
-			if (sides & FRONT) s += "front "
-			if (sides & BACK)  s += "back "
-			if (sides & LEFT)  s += "left "
-			if (sides & RIGHT) s += "right "
-			if (sides & TOP)  s += "top "
-			if (sides & BOTTOM) s += "bottom "
-			return s
-		}
 	}
+  function sidesToString(sides){
+    var s = ""
+    if (sides & FRONT) s += "front "
+    if (sides & BACK)  s += "back "
+    if (sides & LEFT)  s += "left "
+    if (sides & RIGHT) s += "right "
+    if (sides & TOP)  s += "top "
+    if (sides & BOTTOM) s += "bottom "
+    return s
+  }
 
 	var Rect = function (x0,y0,x1,y1){
 		if (x0 instanceof vec2) {
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index e249c91..1858c3d 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -40,6 +40,15 @@ var BlueprintView = View.extend({
 	  if (startPositionIsInARoom) {
 	    return this.startPosition
 	  }
+	  else if (! regions.length) {
+	    return {
+	      x: 0,
+	      y: viewHeight,
+	      z: 0,
+        rotationX: 0,
+        rotationY: Math.PI/2,
+	    }
+	  }
 	  else {
 	    var center = regions[0].center()
 	    return {
diff --git a/server/index.js b/server/index.js
index 224aa86..46f342e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -16,7 +16,8 @@ var http = require('http'),
 	MongoStore = require('connect-mongo')(express),
 	passport = require('passport'),
 	path = require('path'),
-	mongoose = require('mongoose');
+	mongoose = require('mongoose'),
+  methodOverride = require('method-override');
 
 var app = express()
 var server
@@ -58,7 +59,7 @@ site.setup = function(){
 	app.use(multer());
 	app.use(express.query());
 	app.use(express.csrf());
-	app.use(express.methodOverride());
+	app.use(methodOverride('X-HTTP-Method-Override'))
 	app.use(passport.initialize());
 	app.use(passport.session());
 	app.use(app.router);
diff --git a/views/home.ejs b/views/home.ejs
index 14fc0e3..af43f0b 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -38,7 +38,7 @@
 			</span>
 			<span>
 				<h3>Defy The Status Quo</h3>
-				<words>There is no platform on the internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.</words>
+				<words>There is no platform on the Internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.</words>
 			</span>
 		</div>
 		</div>
-- 
cgit v1.2.3-70-g09d2


From 7f443264d1c30b48cc3923ee6e700facdf0f7214 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Jun 2016 16:32:37 -0400
Subject: fix resize issues

---
 .../javascripts/rectangles/engine/map/_map.js      | 29 +++++++++++++---------
 public/assets/javascripts/rectangles/util/mouse.js | 15 ++++++++++-
 .../assets/javascripts/ui/editor/EditorSettings.js |  2 +-
 public/assets/stylesheets/app.css                  |  2 ++
 views/home.ejs                                     |  1 +
 5 files changed, 35 insertions(+), 14 deletions(-)

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

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 6492db6..ba3ec92 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -41,12 +41,28 @@ var Map = function(opt){
 	}
 	base.set_zoom(opt.zoom)
 
+	base.resize = function(w, h){
+	  if (w && h) {
+      canvas.width = base.dimensions.a = w
+      canvas.height = base.dimensions.b = h
+	  }
+	  else {
+      // resize here - esp if 2d-hires
+      canvas.width = base.dimensions.a = base.el.parentNode.offsetWidth
+      canvas.height = base.dimensions.b = base.el.parentNode.offsetHeight
+	  }
+	}
+		
+	base.toggle = function(state){
+		return $(base.el).toggle(state).is(':visible')
+	}
+
 	var canvas = base.canvas = document.createElement("canvas")
 	canvas.width = base.dimensions.a
 	canvas.height = base.dimensions.b
 
 	base.el.appendChild(canvas)
-	
+
 	switch (opt.type) {
 		case "ortho":
 			base.draw = new Map.Draw (base, { ortho: true })
@@ -71,17 +87,6 @@ var Map = function(opt){
 			base.sides = base.sides_for_camera
 			break
 	}
-	
-	base.resize = function(w, h){
-		canvas.width = base.dimensions.a = w || window.innerWidth
-		canvas.height = base.dimensions.b = h || window.innerHeight
-		// resize here - esp if 2d-hires
-	}
-		
-	base.toggle = function(state){
-		return $(base.el).toggle(state).is(':visible')
-	}
-
 }
 
 Map.prototype.update = function(){
diff --git a/public/assets/javascripts/rectangles/util/mouse.js b/public/assets/javascripts/rectangles/util/mouse.js
index 2b98cee..6d9862c 100644
--- a/public/assets/javascripts/rectangles/util/mouse.js
+++ b/public/assets/javascripts/rectangles/util/mouse.js
@@ -54,10 +54,20 @@ function mouse (opt) {
   opt.up && base.tube.on("up", opt.up)
   opt.rightclick && base.tube.on("rightclick", opt.rightclick)
   
-  var offset = (opt.use_offset && opt.el) ? opt.el.getBoundingClientRect() : null
+  var offset;
   
   base.init = function (){
     base.bind()
+    base.set_offset()
+  }
+  
+  base.set_offset = function(){
+    if (opt.use_offset && opt.el) {
+      offset = opt.el.getBoundingClientRect()
+    }
+    else {
+      offset = null
+    }
   }
 
   base.on = function(){
@@ -73,6 +83,9 @@ function mouse (opt) {
       opt.el.addEventListener("mousedown", base.mousedown)
       opt.el.addEventListener("contextmenu", base.contextmenu)
     }
+    if (opt.use_offset) {
+      window.addEventListener("resize", base.set_offset)
+    }
     window.addEventListener("mousemove", base.mousemove)
     window.addEventListener("mouseup", base.mouseup)
   }
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index d8cfca6..5aa88e9 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -41,7 +41,7 @@ var EditorSettings = FormView.extend({
 		this.action = data.isNew ? this.createAction : this.updateAction
     this.parent.data = data
     
-		if (data.shapes.length) {
+		if (data.shapes && data.shapes.length) {
 		  Rooms.deserializeFromShapes(data, data.walls)
 		}
 		else if (data.rooms) {
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 1154fde..fdf7c12 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1331,6 +1331,8 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 #hud {
 	position: fixed;
 	top:0;left:0;
+	width: 100%;
+	height: 100%;
 	z-index: 2;
 }
 #palette {
diff --git a/views/home.ejs b/views/home.ejs
index af43f0b..36dad83 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -60,6 +60,7 @@
   <h1>Sign Up</h1>
 
 	<div class="projectList about aboutintro">
+		<a href="/about/howto" class="greenbtn learn">Read Tutorial</a>
   </div>
 
 	<h1>Room Showcase</h1>
-- 
cgit v1.2.3-70-g09d2


From dcd316eda560e87c326a64c2ff05e0f74e02227a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Jun 2016 17:32:05 -0400
Subject: some light QA

---
 public/assets/javascripts/rectangles/engine/map/ui/editor.js |  8 ++++----
 public/assets/javascripts/rectangles/util/minotaur.js        |  6 ++----
 public/assets/javascripts/ui/builder/BuilderSettings.js      |  2 +-
 public/assets/javascripts/ui/builder/BuilderToolbar.js       |  3 +++
 public/assets/javascripts/ui/lib/FormView.js                 |  7 +++++--
 public/assets/stylesheets/app.css                            |  6 ++++++
 views/home.ejs                                               | 12 ++++++------
 7 files changed, 27 insertions(+), 17 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 7308344..699597a 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui/editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui/editor.js
@@ -73,7 +73,7 @@ Map.UI.Editor = function(map){
 			app.tube("builder-destroy-room", room)
 
       // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
+      Minotaur.watch( (app.router.builderView || app.router.editorView).settings )
 			return
 		}
 		else if (intersects.length) {
@@ -205,13 +205,13 @@ Map.UI.Editor = function(map){
       Rooms.rebuild()
 
       // TODO: watch individual scenery object here
-      Minotaur.watch( app.router.editorView.settings )
+      Minotaur.watch( (app.router.builderView || app.router.editorView).settings )
     }
 
 		var intersects = Rooms.filter(function(r){
 			return r.focused = r.rect.contains(cursor.x.a, cursor.y.a)
 		})
-		if (! intersects.length) {
+		if (! base.dragging && ! intersects.length) {
       app.tube("builder-pick-nothing")
 		}
     
@@ -247,7 +247,7 @@ Map.UI.Editor = function(map){
         Rooms.rebuild()
 
         // TODO: watch individual scenery object here
-        Minotaur.watch( app.router.editorView.settings )
+        Minotaur.watch( (app.router.builderView || app.router.editorView).settings )
 
         wheelState = null
 			}, 250)
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index d165ccc..8b1abfe 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -38,7 +38,7 @@
         for (var id in base.objects[type]) {
           var obj = base.objects[type][id]
           if (obj) {
-            obj.save(null, function(){ base.hide() }, function(){})
+            obj.save(null, function(){ base.hide() }, function(){ base.hide() })
           }
           delete base.objects[type][id]
           saving = true
@@ -53,9 +53,7 @@
     }
     
     base.hide = function () {
-      setTimeout(function(){
-        base.$el.removeClass()
-      }, 500)
+      base.$el.removeClass('saving')
     }
     
     base.init();
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index c8c8880..256bffe 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -52,7 +52,7 @@ var BuilderSettings = FormView.extend({
 		this.$name.val( names.join(" ") )
 		this.action = this.createAction
 		
-		window.history.pushState(null, document.title, "/builder/new")
+		window.history.pushState(null, document.title, "/layout/new")
 	},
 	
 	clear: function(){
diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js
index 6c218be..e9dcce3 100644
--- a/public/assets/javascripts/ui/builder/BuilderToolbar.js
+++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js
@@ -60,6 +60,9 @@ var BuilderToolbar = View.extend({
 		var state = map.ui.permissions.toggle("destroy")
 		$(".inuse").removeClass("inuse")
 		$(e.currentTarget).toggleClass("inuse", state)
+		if (! state) {
+		  this.resetPermissions()
+		}
 	},
 
 })
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 33effc8..a952ecb 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -69,7 +69,9 @@ var FormView = View.extend({
       var errors = this.validate()
       if (errors && errors.length) {
         if (errorCallback) {
-          errorCallback(errors)
+          setTimeout(function(){
+            errorCallback(errors)
+          })
         }
         else {
           this.showErrors(errors)
@@ -77,7 +79,6 @@ var FormView = View.extend({
         return
       }
     }
-    
     var action = typeof this.action == "function" ? this.action() : this.action
     if (! action) return
 
@@ -112,7 +113,9 @@ var FormView = View.extend({
         return
       }
       else {
+        console.log("ok")
         if (successCallback) {
+        console.log("use cb")
           successCallback(response)
         }
         if (this.success) {
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fdf7c12..7dda058 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -421,6 +421,10 @@ h5 {
 	float: right;
 }
 
+.projectList.about.makeAccountSingleton a {
+  margin: 0 20%;
+}
+
 .page .showcase {
   height:70vh;
 }
@@ -3066,6 +3070,8 @@ a[data-role="forgot-password"] {
   font-size: 13px;
   margin: 5px 0 0 0;
 }
+
+
 .share {
 	display:inline-block;
 	width:100%;
diff --git a/views/home.ejs b/views/home.ejs
index 36dad83..e3303ed 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -57,15 +57,15 @@
 		<a href="/about/howto" class="greenbtn learn">Read Tutorial</a>
 </div>
 	
-  <h1>Sign Up</h1>
-
-	<div class="projectList about aboutintro">
-		<a href="/about/howto" class="greenbtn learn">Read Tutorial</a>
-  </div>
-
 	<h1>Room Showcase</h1>
 
 	[[ include projects/list-projects ]]
+
+	[[ if (! logged_in) { ]]
+		<div class="projectList about makeAccountSingleton">
+      <a href="/about/howto" class="greenbtn learn">Make an Account</a>
+    </div>
+  [[ } ]]
 	
 	[[ include partials/confirm-modal ]]	
 	[[ include projects/layouts-modal ]]	
-- 
cgit v1.2.3-70-g09d2