rm dead code. clean up slicing path marginally. bug fix belt support render

This commit is contained in:
Stewart Allen 2024-07-06 19:09:36 -04:00
commit 9d6e4a6512
6 changed files with 59 additions and 65 deletions

View file

@ -155,12 +155,10 @@ const client = exports({
},
// widget sync
sync(widgets, copy) {
sync(widgets) {
if (!widgets) {
widgets = kiri.api.widgets.all();
}
// send list of currently valid widgets
send("sync", { valid: widgets.map(w => w.id) }, () => {});
// sync any widget that has changed
for (let widget of widgets.filter(w => w.modified || !syncd[w.id])) {
syncd[widget.id] = true;
@ -170,7 +168,7 @@ const client = exports({
meta: widget.meta,
group: widget.group.id,
track: widget.track,
vertices: copy ? vertices.slice() : vertices,
vertices,
position: widget.mesh.position,
}, done => {
widget.modified = false;

View file

@ -72,7 +72,6 @@ function prepareSlices(callback, scale = 1, offset = 0) {
// refresh widget list because 'slice.begin' may generate support widgets
const slicing = api.widgets.all()
.slice()
.filter(w => !w.track.ignore && !w.meta.disabled);
if (slicing.length === 0) {
@ -117,17 +116,13 @@ function prepareSlices(callback, scale = 1, offset = 0) {
process.beltAnchor = process.firstLayerBeltLead;
}
stacks.clear();
stacks.clear(); // clear rendered stacks
client.clear(); // clear worker cache
client.sync(); // send fresh widget data to worker
if (isBelt) {
// clearing cache causes data to be re-sent to worker
client.clear();
// we send copies of vertices in belt mode only (possibly obsolete?)
client.sync(undefined, true);
// belt op required to rotate meshes for slicing
client.rotate(settings);
} else {
// send updated vertices if widget has been rotated/scaled
client.sync();
}
function sliceNext() {
@ -141,12 +136,9 @@ function prepareSlices(callback, scale = 1, offset = 0) {
}
function sliceWidget(widget) {
widget.stack = stacks.create(widget.id, widget.mesh);
// weight each widget progress % by their # vertices
let factor = (widget.getVertices().count / defvert);
// compensate for zcut (widget moved through floor)
widget.stack.obj.view.position.z = widget.track.zcut || 0;
widget.slice(settings, (sliced, error) => {
let mark = Date.now();
// update UI info
@ -229,8 +221,6 @@ function prepareSlices(callback, scale = 1, offset = 0) {
if (scale === 1) {
show.progress(0);
}
// cause visuals to update
space.scene.active();
// mark slicing complete for prep/preview
complete.slice = true;
event.emit('slice.end', settings.mode);
@ -240,9 +230,16 @@ function prepareSlices(callback, scale = 1, offset = 0) {
if (callback && typeof callback === 'function') {
callback();
}
if (isBelt) {
// required to render supports properly (in belt mode)
// because this updates widget top z which is affected by rotation
api.platform.update_top_z();
}
// refresh / repaint workspace
space.refresh();
}
// kick of slicing chain
// kick off slicing chain
sliceNext();
}

View file

@ -742,6 +742,10 @@ class Widget {
onupdate(0.0001, "slicing");
if (kiri.client && !widget.inWorker) {
// store slicing visuals
widget.stack = kiri.stacks.create(widget.id, widget.mesh);
// compensate for zcut (widget moved through floor)
widget.stack.obj.view.position.z = widget.track.zcut || 0;
// in case result of slice is nothing, do not preserve previous
widget.slices = []