From d3038d87d7256f8a6707b5aff74f520336e11c92 Mon Sep 17 00:00:00 2001 From: Peter Uithoven Date: Thu, 7 Sep 2017 12:55:56 +0200 Subject: [PATCH 1/7] Adding polyfills --- src/slicer.worker.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/slicer.worker.js b/src/slicer.worker.js index 7c0bc37..59bb2ce 100644 --- 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'; From f3c1ca885ac5dd528b2c3fbbbfa1b68242e685d4 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 13 Sep 2017 11:43:25 +0200 Subject: [PATCH 2/7] update clipper-js --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index be224ad..ce3d352 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,17 @@ "requires": true, "dependencies": { "@doodle3d/clipper-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.3.tgz", - "integrity": "sha512-CM0g8ALJJoTaYh6WWwQVt1ak85vvDd1YvmAFzJ1Qe8l5q84+Bbq2XYUNVCnJ5D3FJgyKDx7TOmOTe4XySClycg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.6.tgz", + "integrity": "sha512-enmAhWHHJrsnTeYuzSdicaOX3io0wW9SNczt93qq2C69uZSJ1ClhXxInU8XOfrjH9dks0O4G5ykGb41grA/QmA==", "requires": { - "@doodle3d/clipper-lib": "6.2.2" + "@doodle3d/clipper-lib": "6.4.2" } }, "@doodle3d/clipper-lib": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.2.2.tgz", - "integrity": "sha512-RLwCRi98bX4P3QcbznEFL9tLAXX32ychi+JIeS6S0BmPMvI0uSEw+IpbmihR44bqY+SxkQigs9Gcz7hMiZS2zA==" + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2.tgz", + "integrity": "sha512-NMz4KiK9rNHB+deenb4g9+PsCuK5kXQOtU/UaON5Ieae1yNfoKqnAdy6LsKD7oc/MBif/SAu+wNGIdfmslQbJA==" }, "ansi-regex": { "version": "2.1.1", diff --git a/package.json b/package.json index f58fe60..2420f2f 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "build:module:settings": "cp -r src/settings module" }, "dependencies": { - "@doodle3d/clipper-js": "^1.0.3", + "@doodle3d/clipper-js": "^1.0.6", "three": "^0.83.0" }, "devDependencies": { From f857a2f76f4cbc28c79826b07d992b84e8e391e7 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 13 Sep 2017 11:43:51 +0200 Subject: [PATCH 3/7] add clean to open shapes Is now possible because of updated clipper-lib --- src/sliceActions/shapesToSlices.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js index 2d0fe94..9553c67 100644 --- 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(); From c3eb42ee2e1f1601652bc94eb4a364910748a1ec Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 13 Sep 2017 11:45:15 +0200 Subject: [PATCH 4/7] Version bumb --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce3d352..7a34922 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@doodle3d/doodle3d-slicer", - "version": "0.0.4", + "version": "0.0.10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2420f2f..dbf72f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@doodle3d/doodle3d-slicer", - "version": "0.0.4", + "version": "0.0.10", "description": "JavaScript gcode slicer, Intended to use with the Doodle3D WiFi-Box # Usage", "main": "lib/index.js", "module": "module/index.js", From ef687769a18bcef25816d1fd2ee4908d5190c1e3 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 13 Sep 2017 12:29:28 +0200 Subject: [PATCH 5/7] update clipper-js --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7a34922..de75211 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,21 +1,21 @@ { "name": "@doodle3d/doodle3d-slicer", - "version": "0.0.10", + "version": "0.0.11", "lockfileVersion": 1, "requires": true, "dependencies": { "@doodle3d/clipper-js": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.6.tgz", - "integrity": "sha512-enmAhWHHJrsnTeYuzSdicaOX3io0wW9SNczt93qq2C69uZSJ1ClhXxInU8XOfrjH9dks0O4G5ykGb41grA/QmA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.7.tgz", + "integrity": "sha512-8Ji8rrFWZ7LAEpIp1SQZJgewxt0FUBFeDku+ZRIR5PS0Jc6Abbq5KykQLVh1zOh3oqX2Cgl+myhqMhFeZXqutA==", "requires": { - "@doodle3d/clipper-lib": "6.4.2" + "@doodle3d/clipper-lib": "6.4.2-b" } }, "@doodle3d/clipper-lib": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2.tgz", - "integrity": "sha512-NMz4KiK9rNHB+deenb4g9+PsCuK5kXQOtU/UaON5Ieae1yNfoKqnAdy6LsKD7oc/MBif/SAu+wNGIdfmslQbJA==" + "version": "6.4.2-b", + "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz", + "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ==" }, "ansi-regex": { "version": "2.1.1", diff --git a/package.json b/package.json index dbf72f0..59c2ba2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@doodle3d/doodle3d-slicer", - "version": "0.0.10", + "version": "0.0.11", "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.6", + "@doodle3d/clipper-js": "^1.0.7", "three": "^0.83.0" }, "devDependencies": { From 935e4eca989a044b9ffda2c7d3b723c53802256c Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 13 Sep 2017 13:56:19 +0200 Subject: [PATCH 6/7] Fix error in slices to gcode --- src/sliceActions/slicesToGCode.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sliceActions/slicesToGCode.js b/src/sliceActions/slicesToGCode.js index 96e1db3..a3dda02 100644 --- 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; From 3422b1283f42c665a4bc766d238510855229d41e Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 13 Sep 2017 13:57:39 +0200 Subject: [PATCH 7/7] version bumb --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index de75211..2095700 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@doodle3d/doodle3d-slicer", - "version": "0.0.11", + "version": "0.0.12", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 59c2ba2..f24a937 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@doodle3d/doodle3d-slicer", - "version": "0.0.11", + "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",