reset transformation values on new mesh

lautr3k · 2dd6ac3c38b9d804626f39e5b354dc1b5755ca2b · lautr3k committed Mar 21, 2016 · Mar 21, 2016 · 2dd6ac3
1 parent 44a82df
commit 2dd6ac3c38b9d804626f39e5b354dc1b5755ca2b
Unified Split

Showing with 16 additions and 7 deletions.

+16 −7 js/main.js
diff --git a/js/main.js b/js/main.js
@@ -318,6 +318,7 @@ var $fileBody  = initPanel('file');
 var $fileInput = $fileBody.find('#file-input');
 
 $fileInput.on('change', function(e) {
+    resetTransformValues();
     loader.loadFile(e.target.files[0]);
 });
 
@@ -662,11 +663,16 @@ var $transformY       = $transformBody.find('#transform-y');
 var $transformZ       = $transformBody.find('#transform-z');
 var $transformButtons = $transformBody.find('button');
 
-var transformAction = 'scale';
-var transformations = {
-    scale : { x:1, y:1 , z:1 },
-    rotate: { x:0, y:0 , z:0 }
-};
+var transformAction, transformations;
+
+function resetTransformValues() {
+    transformAction = 'scale';
+    transformations = {
+        scale : { x:1, y:1 , z:1 },
+        rotate: { x:0, y:0 , z:0 }
+    };
+    updateTransformAction();
+}
 
 function updateTransformAction() {
     transformAction = $transformAction.val();
@@ -755,7 +761,7 @@ $transformButtons.on('click', function(e) {
 
 $('#transform select').on('change', updateTransformAction);
 $('#transform input').on('input', updateTransformValues);
-updateTransformAction();
+resetTransformValues();
 
 // UI resize
 function resizeUI() {
@@ -805,7 +811,10 @@ function loadGeometry(geometry) {
 }
 
 // On Geometry loaded
-loader.onGeometry = loadGeometry;
+loader.onGeometry = function(geometry) {
+    resetTransformValues();
+    loadGeometry(geometry);
+};
 
 // On loading error
 loader.onError = errorHandler;