Merge remote-tracking branch 'refs/remotes/origin/feature/svg_export'…

… into gh-pages
lautr3k · 3cc80dfcf4f46bde03fbb1842cef5f375263e048 · lautr3k committed Jul 26, 2016 · Jul 26, 2016 · 3cc80df
2 parents 047b4d2 + c8139b0
commit 3cc80dfcf4f46bde03fbb1842cef5f375263e048
Unified Split

Showing with 6 additions and 13 deletions.

+6 −3 js/main.js

+0 −10 viewer2d.html
diff --git a/js/main.js b/js/main.js
@@ -117,9 +117,8 @@ function hexToDec(hex) {
     return parseInt(hex.toString().replace('#', ''), 16);
 }
 
-function sliceImage(dataURL, mirror) {
+function sliceImage(dataURL) {
     settings.set('slice.dataURL', dataURL || 'none');
-    settings.set('slice.mirror' , mirror ? 'mirror' : '');
 }
 
 function getSlice(layerNumber) {
@@ -164,6 +163,10 @@ function getSlice(layerNumber) {
         shape = shapes[i];
         slice = shape.clone();
 
+        if (settings.get('slicer.mirror')) {
+            slice.applyMatrix(new THREE.Matrix4().makeScale(-1, 1, 1));
+        }
+
         slice.material = slice.material.clone();
         slice.material.color.setHex(0xffffff);
         viewer2d.addObject(slice);
@@ -180,7 +183,7 @@ function getSlice(layerNumber) {
 
     // render 2D view
     viewer2d.screenshot(function(dataURL) {
-        sliceImage(dataURL, settings.get('slicer.mirror'));
+        sliceImage(dataURL);
 
         if (zipFolder) {
             var fileName = layerNumber + '.png';
diff --git a/viewer2d.html b/viewer2d.html
@@ -21,14 +21,6 @@
                 background-position: center;
                 background-repeat: no-repeat;
             }
-            .mirror {
-                -moz-transform: scaleX(-1);
-                -o-transform: scaleX(-1);
-                -webkit-transform: scaleX(-1);
-                transform: scaleX(-1);
-                filter: FlipH;
-                -ms-filter: "FlipH";
-            }
         </style>
     </head>
     <body>
@@ -38,13 +30,11 @@
         <script>
                 function storageListener() {
                     var settings = new SLAcer.Settings();
-                    var mirror   = settings.get('slice.mirror', false);
                     var dataURL  = settings.get('slice.dataURL', 'none');
                     var image    = dataURL !== 'none' ? 'url(' + dataURL + ')' : 'none';
                     var slice    =  document.getElementById('slice');
 
                     slice.style.backgroundImage = image;
-                    slice.className = mirror ? 'mirror' : '';
                 }
 
                 window.addEventListener('storage', storageListener, false);