disarm delete after upload

2 files changed, 8 insertions, 3 deletions

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
 		}
 		
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index 98b26f4..b5b5551 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -16,6 +16,7 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 		build: function(){
 			this.mx = new MX.Image({
 				src: this.media.url,
+				scale: this.scale,
 				y: this.scale * this.media.height/2,
 				backface: false,
 			})
@@ -24,12 +25,14 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
 
 		serialize: function(){
 			var data = base.serialize.call(this)
-			console.log(data)
+// 			console.log(data)
 			return data
 		},
 	
 		deserialize: function(data){
 			this.mx.move(data.position)
+			this.mx.ops.width = data.dimensions.a
+			this.mx.ops.height = data.dimensions.b
 		},
 	}