Merge branch 'develop'

Doodle3D · Sep 13, 2017 · c9536d8 · c9536d8
2 parents 24a100f + 3422b12
commit c9536d8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@doodle3d/doodle3d-slicer",
-  "version": "0.0.4",
+  "version": "0.0.12",
   "description": "JavaScript gcode slicer, Intended to use with the Doodle3D WiFi-Box # Usage",
   "main": "lib/index.js",
   "module": "module/index.js",
@@ -14,7 +14,7 @@
     "build:module:settings": "cp -r src/settings module"
   },
   "dependencies": {
-    "@doodle3d/clipper-js": "^1.0.3",
+    "@doodle3d/clipper-js": "^1.0.7",
     "three": "^0.83.0"
   },
   "devDependencies": {

diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js
@@ -20,11 +20,8 @@ export default function shapesToSlices(shapes, settings) {
     lineShapesClosed = new Shape(lineShapesClosed, true, true, true, true)
       .clean(cleanDelta);
 
-    lineShapesOpen = new Shape(lineShapesOpen, false, true, true, true);
-    //   .clean(cleanDelta);
-    // TODO
-    // Cleaning is actually wanted here but there is a bug in the clean function
-    // https://sourceforge.net/p/jsclipper/tickets/16/
+    lineShapesOpen = new Shape(lineShapesOpen, false, true, true, true)
+      .clean(cleanDelta);
 
     const slice = new Slice();
 

diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js
@@ -50,9 +50,10 @@ export default function slicesToGCode(slices, settings) {
 
     for (let i = 0; i < slice.parts.length; i ++) {
       const part = slice.parts[i];
-      const outline = part.shell[0];
 
       if (part.closed) {
+        const outline = part.shell[0];
+
         for (let i = 0; i < part.shell.length; i ++) {
           const shell = part.shell[i];
           const isOuterShell = i === 0;

diff --git a/src/slicer.worker.js b/src/slicer.worker.js
@@ -1,3 +1,4 @@
+import 'core-js'; // polyfills
 import slice from './sliceActions/slice.js';
 import * as THREE from 'three';