merge

1 files changed, 20 insertions, 26 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 2a400f5..ac13326 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 dimensions, position
+	var dimensions, position, scale
 
 	var dots = [], dot, selected_dot
 
@@ -147,54 +147,48 @@ Scenery.resize = new function(){
 		selected_dot = selection[0]
 		dragging = true
 		
-		dimensions = new vec2(obj.mx.width, obj.mx.height)
+		dimensions = obj.dimensions
 		position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z)
+		scale = obj.mx.scale
 
-		console.log("down on", sidesToString(selected_dot.side))
-		
 		document.body.classList.add("dragging")
 	}
 
 	function drag (e, cursor){
 		if (! dragging) return
-		// cursor.x.magnitude()*cursor_amp
 
 		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()
+		var old_width = dimensions.a * scale
+
+		if (abs(width) > abs(height)) {
+			mag = x_sign * mag * sign(width)
+		}
+		else {
+			mag = y_sign * mag * sign(height)
+		}
 		
-		var translation = new vec2( x_sign * cursor.x.magnitude() * cursor_amp, y_sign * cursor.y.magnitude() * cursor_amp )
+ 		obj.mx.scale = scale * (old_width + mag) / old_width
 
 		if (selected_dot.side & LEFT_RIGHT) {
-			obj.mx.width = dimensions.a + translation.a
-			obj.mx.x = position.a + x_sign * cos(rotationY) * translation.a/2 * obj.mx.scale
-			obj.mx.z = position.c + x_sign * sin(rotationY) * translation.a/2 * obj.mx.scale
+			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.height = dimensions.b + translation.b
-			obj.mx.y = position.b - y_sign * translation.b/2 * obj.mx.scale
+			obj.mx.y = position.b - mag/2 * y_sign
 		}
-		
-// 		bounds = obj.wall.bounds_for(dimensions)
-
-// 		base.mx.y = bounds.y.clamp( y - cursor.y.magnitude()*cursor_amp )
-// 		switch (base.wall.side) {
-// 			case FRONT:
-// 			case BACK:
-// 				base.mx.x = bounds.x.clamp( x + cos(wall_rotation[base.wall.side]) * cursor.x.magnitude()*cursor_amp )
-// 				break
-// 			case LEFT:
-// 			case RIGHT:
-// 				base.mx.z = bounds.x.clamp( z + sin(wall_rotation[base.wall.side]) * cursor.x.magnitude()*cursor_amp )
-// 				break
-// 		}
 
 		base.move_dots()
-		
 	}
 
 	function up (e, cursor){
 		dragging = false
 		selected_dot = null
+		obj.scale = obj.mx.ops.scale = obj.mx.scale
+		obj.set_wall()
 		document.body.classList.remove("dragging")
 	}