Merge remote-tracking branch 'refs/remotes/origin/dev' into gh-pages

lautr3k · Aug 6, 2016 · 23ab07c6ba2dd3a9cc60e82f7682afc39849461f · 23ab07c
2 parents 9a7c56f + ccc91a3
commit 23ab07c6ba2dd3a9cc60e82f7682afc39849461f
Unified Split

Showing with 27 additions and 5 deletions.

+1 −0 index.html

+26 −5 js/main.js
diff --git a/index.html b/index.html
@@ -62,6 +62,7 @@ <h3 class="panel-title">Transformations</h3>
                             <select id="transform-action" class="form-control input-sm">
                                 <option>scale</option>
                                 <option>rotate</option>
+                                <option>translate</option>
                             </select>
                         </div>
                         <div class="form-group" id="transform-uniform">

diff --git a/js/main.js b/js/main.js
@@ -833,8 +833,9 @@ var transformAction, transformations;
 function resetTransformValues() {
     transformAction = 'scale';
     transformations = {
-        scale : { x:1, y:1 , z:1 },
-        rotate: { x:0, y:0 , z:0 }
+        scale    : { x:1, y:1 , z:1 },
+        rotate   : { x:0, y:0 , z:0 },
+        translate: { x:0, y:0 , z:0 }
     };
     updateTransformAction();
 }
@@ -851,13 +852,19 @@ function updateTransformAction() {
         max  = 999;
         step = 0.01;
     }
-    else {
+    else if (transformAction == 'rotate') {
         min  = 0;
         max  = 360;
         step = 1;
     }
+    else {
+        min  = -9999;
+        max  = 9999;
+        step = 1;
+    }
 
     $transformUniform.toggleClass('hidden', transformAction == 'rotate');
+    $transformZ.parent().toggleClass('hidden', transformAction == 'translate');
 
     $transformX.prop('min', min);
     $transformY.prop('min', min);
@@ -925,7 +932,7 @@ function updateTransformValues() {
             input.z / current.z
         );
     }
-    else {
+    else if (transformAction == 'rotate') {
         var deg     = Math.PI / 180;
         var offsets = {
             x: input.x - current.x,
@@ -937,12 +944,26 @@ function updateTransformValues() {
         slicer.mesh.geometry.rotateY(offsets.y * deg);
         slicer.mesh.geometry.rotateZ(offsets.z * deg);
     }
+    else {
+        var offsets = {
+            x: input.x - current.x,
+            y: input.y - current.y
+        };
+
+        slicer.mesh.geometry.translate(offsets.x, offsets.y, 0);
+    }
 
     current.x = input.x;
     current.y = input.y;
     current.z = input.z;
 
-    loadGeometry(slicer.mesh.geometry, false);
+    if (transformAction != 'translate') {
+        loadGeometry(slicer.mesh.geometry, false);
+        // stay at current position
+        var current = transformations['translate'];
+        slicer.mesh.geometry.translate(current.x, current.y, current.z);
+    }
+
     getSlice($sliderInput.slider('getValue'));
 }