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

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

(limited to 'public/assets/javascripts/rectangles/engine/scenery/move.js')

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
-- 
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/engine/scenery/move.js')

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/engine/scenery/move.js')

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 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/engine/scenery/move.js')

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 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/engine/scenery/move.js')

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/engine/scenery/move.js')

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/engine/scenery/move.js')

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

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

(limited to 'public/assets/javascripts/rectangles/engine/scenery/move.js')

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 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/engine/scenery/move.js')

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/engine/scenery/move.js')

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 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/engine/scenery/move.js')

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