diff --git a/src/kiri/mode/cam/op-index.js b/src/kiri/mode/cam/op-index.js index 9714a0a8..a56555b8 100644 --- a/src/kiri/mode/cam/op-index.js +++ b/src/kiri/mode/cam/op-index.js @@ -7,10 +7,6 @@ export class OpIndex extends CamOp { super(state, op); } - weight() { - return 3; - } - async slice(progress) { let { op, state } = this; diff --git a/src/kiri/mode/cam/op-shadow.js b/src/kiri/mode/cam/op-shadow.js index 349b0c4c..e0289a11 100644 --- a/src/kiri/mode/cam/op-shadow.js +++ b/src/kiri/mode/cam/op-shadow.js @@ -21,10 +21,6 @@ class OpShadow extends CamOp { super(state, op); } - weight() { - return 3; - } - async slice(progress) { let state = this.state; @@ -68,7 +64,7 @@ class OpShadow extends CamOp { .setLayer("shadow", {line: 0x888800, thin: true }) .addPolys(shadow, { thin: true }); } - progress(0.5 + i / tzindex.length, 'shadow'); + progress(0.5 + (i / tzindex.length) * 0.5, 'shadow'); } if (devel && slices.length) { diff --git a/src/kiri/mode/cam/topo4.js b/src/kiri/mode/cam/topo4.js index 9d8d4468..f78ec3ec 100644 --- a/src/kiri/mode/cam/topo4.js +++ b/src/kiri/mode/cam/topo4.js @@ -203,13 +203,13 @@ export class Topo { await gpu.loadTerrain({ triangles: vertices, boundsOverride, - onProgress(pct) { onupdate(pct/100) } + onProgress: (pct) => onupdate(pct / 1000) }); let output = await gpu.generateToolpaths({ xStep, yStep: 1, zFloor: zBottom, - onProgress(i,j) { onupdate(i/j) } + onProgress: (i,j) => onupdate(0.1 + i / j) }); gpu.terminate();