vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-11-22 13:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
casperlamboo 2017-09-13 13:57:46 +02:00
commit c9536d857a
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package-lock.json generated
View File

@ -1,21 +1,21 @@
{ {
"name": "@doodle3d/doodle3d-slicer", "name": "@doodle3d/doodle3d-slicer",
"version": "0.0.4", "version": "0.0.12",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@doodle3d/clipper-js": { "@doodle3d/clipper-js": {
"version": "1.0.3", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.3.tgz", "resolved": "https://registry.npmjs.org/@doodle3d/clipper-js/-/clipper-js-1.0.7.tgz",
"integrity": "sha512-CM0g8ALJJoTaYh6WWwQVt1ak85vvDd1YvmAFzJ1Qe8l5q84+Bbq2XYUNVCnJ5D3FJgyKDx7TOmOTe4XySClycg==", "integrity": "sha512-8Ji8rrFWZ7LAEpIp1SQZJgewxt0FUBFeDku+ZRIR5PS0Jc6Abbq5KykQLVh1zOh3oqX2Cgl+myhqMhFeZXqutA==",
"requires": { "requires": {
"@doodle3d/clipper-lib": "6.2.2" "@doodle3d/clipper-lib": "6.4.2-b"
} }
}, },
"@doodle3d/clipper-lib": { "@doodle3d/clipper-lib": {
"version": "6.2.2", "version": "6.4.2-b",
"resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.2.2.tgz", "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz",
"integrity": "sha512-RLwCRi98bX4P3QcbznEFL9tLAXX32ychi+JIeS6S0BmPMvI0uSEw+IpbmihR44bqY+SxkQigs9Gcz7hMiZS2zA==" "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ=="
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@doodle3d/doodle3d-slicer", "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", "description": "JavaScript gcode slicer, Intended to use with the Doodle3D WiFi-Box # Usage",
"main": "lib/index.js", "main": "lib/index.js",
"module": "module/index.js", "module": "module/index.js",
@ -14,7 +14,7 @@
"build:module:settings": "cp -r src/settings module" "build:module:settings": "cp -r src/settings module"
}, },
"dependencies": { "dependencies": {
"@doodle3d/clipper-js": "^1.0.3", "@doodle3d/clipper-js": "^1.0.7",
"three": "^0.83.0" "three": "^0.83.0"
}, },
"devDependencies": { "devDependencies": {

7
src/sliceActions/shapesToSlices.js
View File

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

3
src/sliceActions/slicesToGCode.js
View File

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

1
src/slicer.worker.js
View File

@ -1,3 +1,4 @@
import 'core-js'; // polyfills
import slice from './sliceActions/slice.js'; import slice from './sliceActions/slice.js';
import * as THREE from 'three'; import * as THREE from 'three';