From 1a1009d5cbfb1deb7cc110bacf3fd76236cf25a9 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Fri, 20 Jun 2014 01:40:43 -0400 Subject: resize based on magnitude.. --- .../assets/javascripts/rectangles/engine/scenery/resize.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'public/assets/javascripts/rectangles/engine') diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js index 33efd05..50c97bd 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/resize.js +++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js @@ -161,19 +161,21 @@ Scenery.resize = new function(){ 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 translation = new vec2( x_sign * cursor.x.magnitude() * cursor_amp, y_sign * cursor.y.magnitude() * cursor_amp ) - // resize using scale here instead of width and height + var mag = cursor.magnitude() + + // fix resizing here +// obj.mx.scale = obj.media.scale +// var translation = new vec2( x_sign * cursor.x.magnitude() * cursor_amp, y_sign * cursor.y.magnitude() * cursor_amp ) 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 + x_sign * cos(rotationY) * mag/2 * obj.mx.scale + obj.mx.z = position.c + x_sign * sin(rotationY) * mag/2 * obj.mx.scale } 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 - y_sign * mag/2 * obj.mx.scale } // bounds = obj.wall.bounds_for(dimensions) -- cgit v1.2.3-70-g09d2