Skip to content

Commit c9536d8

Browse files
committed
Merge branch 'develop'
2 parents 24a100f + 3422b12 commit c9536d8

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@doodle3d/doodle3d-slicer",
3-
"version": "0.0.4",
3+
"version": "0.0.12",
44
"description": "JavaScript gcode slicer, Intended to use with the Doodle3D WiFi-Box # Usage",
55
"main": "lib/index.js",
66
"module": "module/index.js",
@@ -14,7 +14,7 @@
1414
"build:module:settings": "cp -r src/settings module"
1515
},
1616
"dependencies": {
17-
"@doodle3d/clipper-js": "^1.0.3",
17+
"@doodle3d/clipper-js": "^1.0.7",
1818
"three": "^0.83.0"
1919
},
2020
"devDependencies": {

src/sliceActions/shapesToSlices.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@ export default function shapesToSlices(shapes, settings) {
2020
lineShapesClosed = new Shape(lineShapesClosed, true, true, true, true)
2121
.clean(cleanDelta);
2222

23-
lineShapesOpen = new Shape(lineShapesOpen, false, true, true, true);
24-
// .clean(cleanDelta);
25-
// TODO
26-
// Cleaning is actually wanted here but there is a bug in the clean function
27-
// https://sourceforge.net/p/jsclipper/tickets/16/
23+
lineShapesOpen = new Shape(lineShapesOpen, false, true, true, true)
24+
.clean(cleanDelta);
2825

2926
const slice = new Slice();
3027

src/sliceActions/slicesToGCode.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ export default function slicesToGCode(slices, settings) {
5050

5151
for (let i = 0; i < slice.parts.length; i ++) {
5252
const part = slice.parts[i];
53-
const outline = part.shell[0];
5453

5554
if (part.closed) {
55+
const outline = part.shell[0];
56+
5657
for (let i = 0; i < part.shell.length; i ++) {
5758
const shell = part.shell[i];
5859
const isOuterShell = i === 0;

src/slicer.worker.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'core-js'; // polyfills
12
import slice from './sliceActions/slice.js';
23
import * as THREE from 'three';
34

0 commit comments

Comments
 (0)