diff --git a/src/kiri/conf.js b/src/kiri/conf.js index 790e7335..3148c141 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -185,6 +185,15 @@ settings.ver = CVER; } + // fixup old/new detail settings + let detail = settings.controller.detail; + settings.controller.detail = { + "best": "100", + "good": "75", + "fair": "50", + "poor": "25" + }[detail] || detail; + fill_cull_once(settings, template); fill_cull_once(settings.device, default_dev); fill_cull_once(settings.process, default_pro); @@ -676,7 +685,7 @@ exportLocal: false, exportPreview: false, decimate: true, - detail: "100", + detail: "75", animesh: "200", healMesh: false, threaded: false, diff --git a/src/kiri/minion.js b/src/kiri/minion.js index 318f4131..30195e3b 100644 --- a/src/kiri/minion.js +++ b/src/kiri/minion.js @@ -28,6 +28,14 @@ function reply(msg, direct) { } const funcs = { + config: data => { + if (data.base) { + Object.assign(BASE.config, data.base); + } else { + console.log({invalid: data}); + } + }, + union: (data, seq) => { if (!(data.polys && data.polys.length)) { reply({ seq, union: CODEC.encode([]) }); diff --git a/src/kiri/worker.js b/src/kiri/worker.js index 148ff468..60051020 100644 --- a/src/kiri/worker.js +++ b/src/kiri/worker.js @@ -484,6 +484,12 @@ KIRI.worker = { } else { console.log({invalid:data}); } + for (let minion of minions) { + minion.postMessage({ + cmd: "config", + base: data.base + }); + } send.done({config: update}); }, diff --git a/src/mode/fdm/slice.js b/src/mode/fdm/slice.js index ccc7daa7..ee371a4c 100644 --- a/src/mode/fdm/slice.js +++ b/src/mode/fdm/slice.js @@ -126,28 +126,6 @@ firstSliceHeight = sliceMinHeight || sliceHeight; } - // const slicer = new KIRI.slicer2(widget.getPoints(), { }); - // const levels = slicer.interval(sliceHeight, { - // zlist: true, - // zline: true, - // boff: spro.firstSliceHeight || spro.sliceHeight - // }); - // const slices = []; - // let last; - // slicer.slice(levels, { genso: true, each: (data, idx, tot, time) => { - // const slice = data.slice; - // if (last) { - // slice.down = last; - // last.up = slice; - // } - // last = slice; - // slice.index = idx; - // slice.height = spro.firstSliceHeight || spro.sliceHeight; - // slices.push(slice); - // onupdate((idx / tot) * 0.5); - // } }); - // onSliceDone(slices); - SLICER.sliceWidget(widget, { height: sliceHeight, minHeight: sliceMinHeight, @@ -646,15 +624,9 @@ function doShells(slice, count, offsetN, fillOffset, opt = {}, promises) { let offset1 = offsetN / 2; - if (slice.index === 0) { - // console.log({slice_top_0: top_poly, count}); - // segment polygon - } - if (promises) { let oldtops = slice.tops; let newtops = slice.tops = []; - oldtops.old = true; for (let top of oldtops) { promises.push( new Promise((resolve, reject) => { @@ -670,7 +642,6 @@ }) ); } - newtops.new = true; } else { for (let top of slice.tops) { doTopShells(slice.z, top, count, offset1, offsetN, fillOffset, opt); @@ -1055,7 +1026,6 @@ * @return {boolean} true if filled, false if not */ function doSolidsFill(slice, spacing, angle, minArea, fillQ) { - let minarea = minArea || 1, tops = slice.tops, solids = slice.solids;