AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

progressive transfer of prepare data. zerocodec helps in this scenario

Browse source
This commit is contained in:
Stewart Allen 2020-11-26 09:10:20 -05:00
commit 45b8ac8c2d
7 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/client.js
View file

@ -163,7 +163,7 @@ KIRI.work = {
prepare : function(settings, update, done) {
send("prepare", { settings }, function(reply) {
if (reply.progress) {
update(reply.progress, reply.message);
update(reply.progress, reply.message, reply.layer);
}
if (reply.done) {
done(reply.output, reply.maxSpeed);

2
src/kiri/codec.js
View file

@ -8,7 +8,7 @@
const BASE = self.base, KIRI = self.kiri, handlers = {};
const freeMem = true;
const zeroOut = false;
const zeroOut = true;
const codec = KIRI.codec = {
encode: encode,

14
src/kiri/main.js
View file

@ -855,9 +855,13 @@
segNumber = 0,
startTime,
lastMsg,
now = Date.now();
now = Date.now(),
output = [];
KIRI.client.prepare(settings, function(progress, message) {
KIRI.client.prepare(settings, function(progress, message, layer) {
if (layer) {
output.push(KIRI.codec.decode(layer));
}
if (message !== lastMsg) {
let mark = Date.now();
if (lastMsg) {
@ -867,7 +871,7 @@
startTime = mark;
}
API.show.progress(progress, message);
}, function (output, maxSpeed) {
}, function (oldout, maxSpeed) {
if (lastMsg) {
segtimes[`${segNumber++}_${lastMsg}`] = Date.now() - startTime;
}
@ -875,8 +879,8 @@
API.show.progress(0);
if (!isCam) setOpacity(0);
output = KIRI.codec.decode(output);
if (feature.preview && output) {
// output = KIRI.codec.decode(output);
if (feature.preview && output.length) {
startTime = Date.now();
STACKS.clear();
const stack = STACKS.create('print', SPACE.platform.world)

11
src/kiri/worker.js
View file

@ -120,8 +120,13 @@ KIRI.worker = {
return console.log({invalid_print_driver: mode, driver});
}
const layers = driver.prepare(widgets, settings, (progress, message) => {
send.data({ progress, message });
const layers = driver.prepare(widgets, settings, (progress, message, layer) => {
const state = { zeros: [] };
const emit = { progress, message };
if (layer) {
emit.layer = KIRI.codec.encode(layer, state)
}
send.data(emit);
});
const print = current.print || {};
@ -132,7 +137,7 @@ KIRI.worker = {
send.done({
done: true,
output: KIRI.codec.encode(layers, state),
// output: KIRI.codec.encode(layers, state),
maxSpeed
}, state.zeros);
},

4
src/mode/cam/prepare.js
View file

@ -33,8 +33,8 @@
});
});
print.render = KIRI.driver.FDM.prepareRender(print.output, progress => {
update(0.5 + progress * 0.5, "render");
print.render = KIRI.driver.FDM.prepareRender(print.output, (progress, layer) => {
update(0.5 + progress * 0.5, "render", layer);
}, {
thin: true,
print: 0,

14
src/mode/fdm/prepare.js
View file

@ -365,23 +365,23 @@
// if layer produced output, append to output array
if (layerout.length) output.append(layerout);
// notify progress
layerout.layer = layer++;
update((layer / maxLayers) * 0.5, "prepare");
// retract after last layer
if (layer === maxLayers && layerout.length) {
layerout.last().retract = true;
}
// notify progress
layerout.layer = layer++;
update((layer / maxLayers) * 0.5, "prepare");
slices = [];
layerout = [];
lastOut = undefined;
}
print.output = output;
print.render = FDM.prepareRender(output, progress => {
update(0.5 + progress * 0.5, "render");
print.render = FDM.prepareRender(output, (progress, layer) => {
update(0.5 + progress * 0.5, "render", layer);
}, { tools: device.extruders, thin: isThin, flat: isFlat, fdm: true });
return print.render;
};
@ -578,7 +578,7 @@
});
});
update(index / levels.length);
update(index / levels.length, output);
});
return layers;

8
src/mode/laser/driver.js
View file

@ -135,7 +135,7 @@
merged.push(p);
}
});
update(slices++ / totalSlices);
update((slices++ / totalSlices) * 0.5, "prepare");
});
let start = newPoint(0,0,0);
let gather = [];
@ -149,7 +149,7 @@
} else {
widget.slices.forEach(function(slice) {
sliceEmitObjects(print, slice, output);
update(slices++ / totalSlices);
update((slices++ / totalSlices) * 0.5, "prepare");
});
}
});
@ -209,7 +209,9 @@
// console.log({laser_it: output});
// }
return print.render = FDM.prepareRender(output, update, { thin: true, z: 0, action: "cut" });
return print.render = FDM.prepareRender(output, (progress, layer) => {
update(0.5 + progress * 0.5, "render", layer);
}, { thin: true, z: 0, action: "cut" });
};
function exportLaser(print, online, ondone) {