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

Fixed bug in constucting low/high fill areas

Browse Source
This commit is contained in:
casperlamboo 2015-07-30 11:36:20 +02:00
parent 2bc9d8fb35
commit 0dd19d060a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/slicer.js
View File

@ -82,7 +82,7 @@ export default class {
} }
_createLines (settings) { _createLines (settings) {
console.log('constructing lines from geometry'); console.log('constructing unique lines from geometry');
var lines = []; var lines = [];
var lineLookup = {}; var lineLookup = {};
@ -188,8 +188,6 @@ export default class {
_intersectionsToShapes (layerIntersectionIndexes, layerIntersectionPoints, lines, settings) { _intersectionsToShapes (layerIntersectionIndexes, layerIntersectionPoints, lines, settings) {
console.log("generating slices"); console.log("generating slices");
var layerHeight = settings.config["layerHeight"];
var shapes = []; var shapes = [];
for (var layer = 1; layer < layerIntersectionIndexes.length; layer ++) { for (var layer = 1; layer < layerIntersectionIndexes.length; layer ++) {
@ -275,10 +273,10 @@ export default class {
} }
if (!closed) { if (!closed) {
var index = firstPoint; var index = firstPoints[0];
while (index !== -1) { while (index !== -1) {
if (index !== firstPoint) { if (firstPoints.indexOf(index) === -1) {
var intersection = intersectionPoints[index]; var intersection = intersectionPoints[index];
shape.unshift({X: intersection.x, Y: intersection.y}); shape.unshift({X: intersection.x, Y: intersection.y});
@ -334,22 +332,23 @@ export default class {
for (var i = 0; i < shapeParts.length; i ++) { for (var i = 0; i < shapeParts.length; i ++) {
var shapePart1 = shapeParts[i]; var shapePart1 = shapeParts[i];
if (shapePart1.closed) { if (!shapePart1.closed) {
var merge = false; slice.add(shapePart1);
continue;
}
for (var j = 0; j < slice.parts.length; j ++) { var merge = false;
var shapePart2 = slice.parts[j].intersect;
if (shapePart2.closed && shapePart2.intersect(shapePart1).length > 0) { for (var j = 0; j < slice.parts.length; j ++) {
shapePart2.join(shapePart1); var shapePart2 = slice.parts[j].intersect;
merge = true; if (shapePart2.closed && shapePart2.intersect(shapePart1).length > 0) {
break; shapePart2.join(shapePart1);
} merge = true;
} break;
if (!merge) {
slice.add(shapePart1);
} }
} }
else {
if (!merge) {
slice.add(shapePart1); slice.add(shapePart1);
} }
} }
@ -464,12 +463,13 @@ export default class {
var lowFillArea = fillArea.difference(highFillArea); var lowFillArea = fillArea.difference(highFillArea);
} }
else { else {
var lowFillArea = new Paths([], true);
var highFillArea = fillArea; var highFillArea = fillArea;
} }
var fill = new Paths([], false); var fill = new Paths([], false);
if (lowFillArea !== undefined && lowFillArea.length > 0) { if (lowFillArea.length > 0 && lowFillArea.length > 0) {
var bounds = lowFillArea.bounds(); var bounds = lowFillArea.bounds();
var lowFillTemplate = this._getFillTemplate(bounds, fillGridSize, true, true); var lowFillTemplate = this._getFillTemplate(bounds, fillGridSize, true, true);