vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-12-23 19:43:48 +01:00
Code Issues Projects Releases Wiki Activity

fixed bug in shell thickness

Browse Source
This commit is contained in:
casperlamboo 2015-07-30 14:31:55 +02:00
parent 0dd19d060a
commit 0c557172e0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slicer.js
View File

@ -150,7 +150,6 @@ export default class {
for (var lineIndex = 0; lineIndex < lines.length; lineIndex ++) { for (var lineIndex = 0; lineIndex < lines.length; lineIndex ++) {
var line = lines[lineIndex].line; var line = lines[lineIndex].line;
// not happy about this, toFixes returns a string which has to be parsed again
var min = Math.ceil(Math.min(line.start.y, line.end.y) / layerHeight); var min = Math.ceil(Math.min(line.start.y, line.end.y) / layerHeight);
var max = Math.floor(Math.max(line.start.y, line.end.y) / layerHeight); var max = Math.floor(Math.max(line.start.y, line.end.y) / layerHeight);
@ -238,7 +237,7 @@ export default class {
var a = new THREE.Vector2(intersection.x, intersection.y); var a = new THREE.Vector2(intersection.x, intersection.y);
var b = new THREE.Vector2(intersectionPoints[index].x, intersectionPoints[index].y); var b = new THREE.Vector2(intersectionPoints[index].x, intersectionPoints[index].y);
// can't calculate normal if distance is smaller as 0.0001 // can't calculate normal between points 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) { if (isFirstPoint) {
firstPoints.push(index); firstPoints.push(index);
@ -292,7 +291,6 @@ export default class {
break; break;
} }
else { else {
delete intersectionPoints[index];
index = -1; index = -1;
} }
} }
@ -372,6 +370,7 @@ export default class {
var nozzleDiameter = settings.config["nozzleDiameter"] * scale; var nozzleDiameter = settings.config["nozzleDiameter"] * scale;
var shellThickness = settings.config["shellThickness"] * scale; var shellThickness = settings.config["shellThickness"] * scale;
var nozzleRadius = nozzleDiameter / 2; var nozzleRadius = nozzleDiameter / 2;
var shells = Math.round(shellThickness / nozzleDiameter);
for (var layer = 0; layer < slices.length; layer ++) { for (var layer = 0; layer < slices.length; layer ++) {
var slice = slices[layer]; var slice = slices[layer];
@ -389,7 +388,9 @@ export default class {
if (outerLine.length > 0) { if (outerLine.length > 0) {
part.outerLine = outerLine; part.outerLine = outerLine;
for (var offset = nozzleDiameter; offset <= shellThickness; offset += nozzleDiameter) { for (var shell = 1; shell < shells; shell += 1) {
var offset = shell * nozzleDiameter;
var innerLine = outerLine.offset(-offset); var innerLine = outerLine.offset(-offset);
if (innerLine.length > 0) { if (innerLine.length > 0) {
@ -614,7 +615,7 @@ export default class {
var left = Math.floor(bounds.left / size) * size; var left = Math.floor(bounds.left / size) * size;
var right = Math.ceil(bounds.right / size) * size; var right = Math.ceil(bounds.right / size) * size;
var top = Math.floor(bounds.top / size) * size; var top = Math.floor(bounds.top / size) * size;
var bottom = Math.floor(bounds.bottom / size) * size; var bottom = Math.ceil(bounds.bottom / size) * size;
var width = right - left; var width = right - left;