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

properly check for undefined

Browse Source
This commit is contained in:
casperlamboo 2017-06-22 10:19:15 +02:00 committed by Simon Voordouw
parent b4b6e59807
commit 55b63ac8ad
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sliceActions/createLines.js
View File

@ -32,9 +32,9 @@ export default function createLines(geometry, settings, openClosed) {
// only add unique lines // only add unique lines
// returns index of said line // returns index of said line
const indexA = lookupA !== undefined ? lookupA : addLine(geometry, lineLookup, lines, face.a, face.b); const indexA = typeof lookupA !== 'undefined' ? lookupA : addLine(geometry, lineLookup, lines, face.a, face.b);
const indexB = lookupB !== undefined ? lookupB : addLine(geometry, lineLookup, lines, face.b, face.c); const indexB = typeof lookupB !== 'undefined' ? lookupB : addLine(geometry, lineLookup, lines, face.b, face.c);
const indexC = lookupC !== undefined ? lookupC : addLine(geometry, lineLookup, lines, face.c, face.a); const indexC = typeof lookupC !== 'undefined' ? lookupC : addLine(geometry, lineLookup, lines, face.c, face.a);
// set connecting lines (based on face) // set connecting lines (based on face)
lines[indexA].connects.push(indexB, indexC); lines[indexA].connects.push(indexB, indexC);

6
src/sliceActions/intersectionsToShapes.js
View File

@ -17,7 +17,7 @@ export default function intersectionsToShapes(layerIntersectionIndexes, layerInt
for (let i = 0; i < intersectionIndexes.length; i ++) { for (let i = 0; i < intersectionIndexes.length; i ++) {
let index = intersectionIndexes[i]; let index = intersectionIndexes[i];
if (intersectionPoints[index] === undefined) continue; if (typeof intersectionPoints[index] === 'undefined') continue;
const shape = []; const shape = [];
@ -46,7 +46,7 @@ export default function intersectionsToShapes(layerIntersectionIndexes, layerInt
} }
// Check if index has an intersection or is already used // Check if index has an intersection or is already used
if (intersectionPoints[index] !== undefined) { if (typeof intersectionPoints[index] !== 'undefined') {
const faceNormal = faceNormals[Math.floor(i / 2)]; const faceNormal = faceNormals[Math.floor(i / 2)];
const a = new THREE.Vector2(intersection.x, intersection.y); const a = new THREE.Vector2(intersection.x, intersection.y);
@ -99,7 +99,7 @@ export default function intersectionsToShapes(layerIntersectionIndexes, layerInt
for (let i = 0; i < connects.length; i ++) { for (let i = 0; i < connects.length; i ++) {
index = connects[i]; index = connects[i];
if (intersectionPoints[index] !== undefined) { if (typeof intersectionPoints[index] !== 'undefined') {
break; break;
} else { } else {
index = -1; index = -1;

4
src/sliceActions/optimizePaths.js
View File

@ -9,7 +9,7 @@ export default function optimizePaths(slices, settings) {
for (let layer = 0; layer < slices.length; layer ++) { for (let layer = 0; layer < slices.length; layer ++) {
const slice = slices[layer]; const slice = slices[layer];
if (slice.brim !== undefined && slice.brim.paths.length > 0) { if (typeof slice.brim !== 'undefined' && slice.brim.paths.length > 0) {
slice.brim = optimizeShape(slice.brim, start); slice.brim = optimizeShape(slice.brim, start);
start.copy(slice.brim.lastPoint(true)); start.copy(slice.brim.lastPoint(true));
} }
@ -73,7 +73,7 @@ export default function optimizePaths(slices, settings) {
slice.parts = parts; slice.parts = parts;
if (slice.support !== undefined && slice.support.length > 0) { if (typeof slice.support !== 'undefined' && slice.support.length > 0) {
slice.support = optimizeShape(slice.support, start); slice.support = optimizeShape(slice.support, start);
start.copy(slice.support.lastPoint(true)); start.copy(slice.support.lastPoint(true));
} }

4
src/sliceActions/removePrecision.js
View File

@ -24,10 +24,10 @@ export default function removePrecision(slices) {
} }
} }
if (slice.support !== undefined) { if (typeof slice.support !== 'undefined') {
slice.support.scaleDown(inversePrecision); slice.support.scaleDown(inversePrecision);
} }
if (slice.brim !== undefined) { if (typeof slice.brim !== 'undefined') {
slice.brim.scaleDown(inversePrecision); slice.brim.scaleDown(inversePrecision);
} }
} }

6
src/sliceActions/slicesToGCode.js
View File

@ -13,7 +13,7 @@ export default function slicesToGCode(slices, settings) {
gcode.bottom = false; gcode.bottom = false;
} }
if (slice.brim !== undefined) { if (typeof slice.brim !== 'undefined') {
pathToGCode(gcode, slice.brim, true, true, layer, 'brim'); pathToGCode(gcode, slice.brim, true, true, layer, 'brim');
} }
@ -30,12 +30,12 @@ export default function slicesToGCode(slices, settings) {
pathToGCode(gcode, part.fill, true, false, layer, 'fill'); pathToGCode(gcode, part.fill, true, false, layer, 'fill');
} else { } else {
const retract = !(slice.parts.length === 1 && slice.support === undefined); const retract = !(slice.parts.length === 1 && typeof slice.support === 'undefined');
pathToGCode(gcode, part.shape, retract, retract, layer, 'outerLine'); pathToGCode(gcode, part.shape, retract, retract, layer, 'outerLine');
} }
} }
if (slice.support !== undefined) { if (typeof slice.support !== 'undefined') {
pathToGCode(gcode, slice.support, true, true, layer, 'support'); pathToGCode(gcode, slice.support, true, true, layer, 'support');
} }
} }