From befeb2ed9b7f7086ec0861cbfe4ab6450e1987af Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Fri, 20 Jun 2014 01:00:35 -0400 Subject: disarm delete after upload --- public/assets/javascripts/rectangles/engine/scenery/resize.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'public/assets/javascripts/rectangles/engine/scenery/resize.js') diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js index 2a400f5..33efd05 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/resize.js +++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js @@ -164,13 +164,15 @@ Scenery.resize = new function(){ 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 + if (selected_dot.side & LEFT_RIGHT) { - obj.mx.width = dimensions.a + translation.a +// 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 } if (selected_dot.side & TOP_BOTTOM) { - obj.mx.height = dimensions.b + translation.b +// obj.mx.height = dimensions.b + translation.b obj.mx.y = position.b - y_sign * translation.b/2 * obj.mx.scale } -- cgit v1.2.3-70-g09d2