1 files changed, 30 insertions, 28 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 93bccb0..94c6281 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(){
@@ -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)
@@ -22,29 +23,26 @@ Scenery.move = function(base){
 	}
 	
 	function down (e, cursor){
-		if (e.target != base.mx.el) return;
+		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
 		}
-
+    
 		// 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
@@ -59,6 +57,8 @@ Scenery.move = function(base){
 	
 	function drag (e, cursor){
 		if (! dragging) return
+		
+		moved = true
 
 		var flipX = base.wall.side & (FRONT | RIGHT)
 
@@ -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
 		}
+
 		if (editor.permissions.resize) {
 			Scenery.resize.move_dots()
 		}
@@ -89,21 +90,22 @@ Scenery.move = function(base){
 
 	function up (e, cursor){
     if (! dragging || ! oldState) return
-    
-		dragging = false
-		document.body.classList.remove("dragging")
-
-    UndoStack.push({
-      type: 'update-scenery',
-      undo: oldState,
-      redo: base.serialize(),
-    })
+        
+    if (moved) {
+      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
@@ -142,7 +144,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