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 closed lines detected as open lines

Browse Source 
fixed https://github.com/Doodle3D/Doodle3D-Slicer/issues/10
This commit is contained in:
casperlamboo 2015-07-29 20:59:34 +02:00
parent d4f6776aa1
commit 2bc9d8fb35
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slicer.js
View File

@ -208,7 +208,8 @@ export default class {
continue; continue;
} }
var firstPoint = index; var firstPoints = [index];
var isFirstPoint = true;
var closed = false; var closed = false;
var shape = []; var shape = [];
@ -226,7 +227,7 @@ export default class {
for (var j = 0; j < connects.length; j ++) { for (var j = 0; j < connects.length; j ++) {
var index = connects[j]; var index = connects[j];
if (index === firstPoint && shape.length > 2) { if (firstPoints.indexOf(index) !== -1 && shape.length > 2) {
closed = true; closed = true;
index = -1; index = -1;
break; break;
@ -241,6 +242,10 @@ export default class {
// can't calculate normal if distance is smaller as 0.0001 // can't calculate normal if distance is smaller as 0.0001
if ((faceNormal.x === 0 && faceNormal.y === 0) || a.distanceTo(b) < 0.0001) { if ((faceNormal.x === 0 && faceNormal.y === 0) || a.distanceTo(b) < 0.0001) {
if (isFirstPoint) {
firstPoints.push(index);
}
delete intersectionPoints[index]; delete intersectionPoints[index];
connects = connects.concat(lines[index].connects); connects = connects.concat(lines[index].connects);
@ -266,6 +271,7 @@ export default class {
index = -1; index = -1;
} }
} }
isFirstPoint = false;
} }
if (!closed) { if (!closed) {
@ -704,7 +710,6 @@ export default class {
this.progress.generatedGCode = true; this.progress.generatedGCode = true;
this._updateProgress(settings); this._updateProgress(settings);
return gcode.getGCode(); return gcode.getGCode();
} }