vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-07-01 08:31:22 +02:00
Code Issues Projects Releases Wiki Activity

pre calculate outer lines

Browse Source
This commit is contained in:
casperlamboo 2017-07-19 17:33:55 +02:00
parent 44197dd5e4
commit 8e45881a45
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sliceActions/generateInfills.js
View File

@ -26,8 +26,8 @@ export default function generateInfills(slices, settings) {
let surroundingLayer; let surroundingLayer;
if (layer - bottomSkinCount >= 0 && layer + topSkinCount < slices.length) { if (layer - bottomSkinCount >= 0 && layer + topSkinCount < slices.length) {
const downSkin = slices[layer - bottomSkinCount].getOutline(); const downSkin = slices[layer - bottomSkinCount].outline;
const upSkin = slices[layer + topSkinCount].getOutline(); const upSkin = slices[layer + topSkinCount].outline;
surroundingLayer = upSkin.intersect(downSkin); surroundingLayer = upSkin.intersect(downSkin);
} }

12
src/sliceActions/generateOutlines.js Normal file
View File

@ -0,0 +1,12 @@
import Shape from 'Doodle3D/clipper-js';
export default function calculateOutlines(slices, settings) {
for (let layer = 0; layer < slices.length; layer ++) {
const slice = slices[layer];
slice.outline = slice.parts.reduce((shape, part) => {
if (part.outerLine) shape.join(part.outerLine);
return shape;
}, new Shape([], true));
}
}

4
src/sliceActions/generateSupport.js
View File

@ -30,7 +30,7 @@ export default function generateSupport(slices, settings) {
if (supportAreas.length > 0) { if (supportAreas.length > 0) {
if (layer >= supportDistanceLayers) { if (layer >= supportDistanceLayers) {
var sliceSkin = slices[layer - supportDistanceLayers].getOutline(); var sliceSkin = slices[layer - supportDistanceLayers].outline;
sliceSkin = sliceSkin; sliceSkin = sliceSkin;
var supportAreasSlimmed = supportAreas.difference(sliceSkin.offset(supportMargin)); var supportAreasSlimmed = supportAreas.difference(sliceSkin.offset(supportMargin));
@ -52,7 +52,7 @@ export default function generateSupport(slices, settings) {
} }
} }
var supportSkin = slices[layer + supportDistanceLayers - 1].getOutline(); var supportSkin = slices[layer + supportDistanceLayers - 1].outline;
var slice = slices[layer + supportDistanceLayers]; var slice = slices[layer + supportDistanceLayers];
for (var i = 0; i < slice.parts.length; i ++) { for (var i = 0; i < slice.parts.length; i ++) {

6
src/sliceActions/helpers/Slice.js
View File

@ -4,12 +4,6 @@ export default class {
constructor() { constructor() {
this.parts = []; this.parts = [];
} }
getOutline() {
return this.parts.reduce((shape, part) => {
if (part.outerLine) shape.join(part.outerLine);
return shape;
}, new Shape([], true));
}
add(shape) { add(shape) {
const part = { shape }; const part = { shape };

3
src/sliceActions/slice.js
View File

@ -2,6 +2,7 @@ import calculateLayersIntersections from './calculateLayersIntersections.js';
import createLines from './createLines.js'; import createLines from './createLines.js';
import generateInfills from './generateInfills.js'; import generateInfills from './generateInfills.js';
import generateInnerLines from './generateInnerLines.js'; import generateInnerLines from './generateInnerLines.js';
import generateOutlines from './generateOutlines.js';
import generateSupport from './generateSupport.js'; import generateSupport from './generateSupport.js';
import intersectionsToShapes from './intersectionsToShapes.js'; import intersectionsToShapes from './intersectionsToShapes.js';
import addBrim from './addBrim.js'; import addBrim from './addBrim.js';
@ -45,6 +46,8 @@ export default function(geometry, settings, onProgress) {
updateProgress('Generating inner lines'); updateProgress('Generating inner lines');
generateInnerLines(slices, settings); generateInnerLines(slices, settings);
updateProgress('Generating out lines');
generateOutlines(slices, settings);
updateProgress('Generating infills'); updateProgress('Generating infills');
generateInfills(slices, settings); generateInfills(slices, settings);
updateProgress('Generating support'); updateProgress('Generating support');