From abbfd27b6b7f60e9e7ccaa13ee55c47cc82b6f49 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Thu, 24 Jun 2021 12:39:47 -0400 Subject: [PATCH] a few simple SLA fixes --- src/mode/fdm/slice.js | 4 ++-- src/mode/sla/export.js | 4 ++-- src/mode/sla/slice.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mode/fdm/slice.js b/src/mode/fdm/slice.js index f321d5f5..3ca7d3a1 100644 --- a/src/mode/fdm/slice.js +++ b/src/mode/fdm/slice.js @@ -665,9 +665,9 @@ * @param {number} fillOffset * @param {Obejct} options */ - function doShells(slice, count, offsetN, fillOffset, opt = {}) { + function doShells(slice, count, offset1, offsetN, fillOffset, opt = {}) { for (let top of slice.tops) { - doTopShells(slice.z, top, count, offsetN / 2, offsetN, fillOffset, opt); + doTopShells(slice.z, top, count, offset1, offsetN, fillOffset, opt); } } diff --git a/src/mode/sla/export.js b/src/mode/sla/export.js index 61c9df24..026643ca 100644 --- a/src/mode/sla/export.js +++ b/src/mode/sla/export.js @@ -528,7 +528,7 @@ let slice = widget.slices[index]; if (slice) { if (slice.synth) count++; - let polys = slice.solids.unioned; + let polys = slice.unioned; if (!polys) polys = slice.tops.map(t => t.poly); if (slice.supports) polys.appendAll(slice.supports); array.appendAll(polys.map(poly => { @@ -576,7 +576,7 @@ if (slice) { // prevent premature exit on empty synth slice if (slice.synth) count++; - let polys = slice.solids.unioned; + let polys = slice.unioned; if (!polys) polys = slice.tops.map(t => t.poly); if (slice.supports) polys.appendAll(slice.supports); polys.forEach(poly => { diff --git a/src/mode/sla/slice.js b/src/mode/sla/slice.js index d7c25379..003bef93 100644 --- a/src/mode/sla/slice.js +++ b/src/mode/sla/slice.js @@ -160,7 +160,7 @@ let trims = slice.solids || []; traces.appendAll(trims); let union = POLY.union(traces, undefined, true); - slice.unioned = union; + slice.unioned = POLY.setZ(union, slice.z); }, "solid"); } else { forSlices(slices, 10, (slice) => {