diff --git a/src/kiri/mode/cam/op-index.js b/src/kiri/mode/cam/op-index.js index becd0441..d226aac0 100644 --- a/src/kiri/mode/cam/op-index.js +++ b/src/kiri/mode/cam/op-index.js @@ -7,6 +7,10 @@ export class OpIndex extends CamOp { super(state, op); } + weight() { + return 0.1; + } + async slice() { let { op, state } = this; if (!state.isIndexed) { diff --git a/src/kiri/mode/cam/op-shadow.js b/src/kiri/mode/cam/op-shadow.js index 91c6f91a..5c782636 100644 --- a/src/kiri/mode/cam/op-shadow.js +++ b/src/kiri/mode/cam/op-shadow.js @@ -20,6 +20,10 @@ class OpShadow extends CamOp { super(state, op); } + weight() { + return 0.1; + } + async slice(progress) { let state = this.state; let { ops, slicer, widget, unsafe, addSlices, shadowAt } = state; diff --git a/src/kiri/mode/cam/prepare.js b/src/kiri/mode/cam/prepare.js index b54b9feb..4ca6e2fc 100644 --- a/src/kiri/mode/cam/prepare.js +++ b/src/kiri/mode/cam/prepare.js @@ -318,7 +318,7 @@ export function prepEach(widget, settings, print, firstPoint, update) { p.x + wmx, p.y + wmy, p.z + zadd - ) + ).setA(p.a); } /** diff --git a/src/kiri/mode/cam/slice.js b/src/kiri/mode/cam/slice.js index 6abf19f5..b117d74a 100644 --- a/src/kiri/mode/cam/slice.js +++ b/src/kiri/mode/cam/slice.js @@ -267,12 +267,12 @@ export async function cam_slice(settings, widget, onupdate, ondone) { if (isIndexed) { if (activeOps.length === 0 || activeOps[0].type !== 'index') { opList.push(new OPS.index(state, { type: "index", index: 0 })); - opTot++; + opTot += opList.peek().weight(); } } else { opList.push(new OPS.shadow(state, { type: "shadow", silent: true })); - opTot++; + opTot += opList.peek().weight(); } // determing # of steps and step weighting for progress bar