mirror of
https://github.com/Doodle3D/Doodle3D-Slicer.git
synced 2024-11-19 04:27:55 +01:00
splice slice sync and slice async
This commit is contained in:
parent
0ae8ef33b9
commit
178e88f76b
@ -11,6 +11,6 @@ const geometry = new THREE.TorusGeometry(20, 10, 30, 30);
|
||||
const slicer = new SLICER.Slicer();
|
||||
|
||||
slicer.setGeometry(geometry);
|
||||
slicer.slice(settings, true).then(gcode => {
|
||||
slicer.slice(settings).then(gcode => {
|
||||
document.getElementById('gcode').innerHTML = gcode.replace(/(?:\r\n|\r|\n)/g, '<br />');
|
||||
});
|
||||
|
@ -30,34 +30,32 @@ export default class {
|
||||
|
||||
return this;
|
||||
}
|
||||
async slice(settings, async = false) {
|
||||
let gcode;
|
||||
sliceSync(settings) {
|
||||
return slice(this.geometry, settings);
|
||||
}
|
||||
slice(settings) {
|
||||
const sliceWorker = new SliceWorker();
|
||||
|
||||
if (async) {
|
||||
const sliceWorker = new SliceWorker();
|
||||
const geometry = this.geometry.toJSON();
|
||||
const { config } = settings;
|
||||
|
||||
const geometry = this.geometry.toJSON();
|
||||
const { config } = settings;
|
||||
return new Promise((resolve, reject) => {
|
||||
sliceWorker.onerror = reject;
|
||||
|
||||
gcode = await new Promise((resolve) => {
|
||||
sliceWorker.addEventListener('message', (event) => {
|
||||
const { message, data } = event.data;
|
||||
switch (message) {
|
||||
case 'SLICE': {
|
||||
sliceWorker.terminate();
|
||||
resolve(data.gcode);
|
||||
}
|
||||
sliceWorker.addEventListener('message', (event) => {
|
||||
const { message, data } = event.data;
|
||||
switch (message) {
|
||||
case 'SLICE': {
|
||||
sliceWorker.terminate();
|
||||
resolve(data.gcode);
|
||||
}
|
||||
});
|
||||
|
||||
sliceWorker.postMessage({
|
||||
message: 'SLICE',
|
||||
data: { geometry, config }
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
gcode = slice(this.geometry, settings);
|
||||
}
|
||||
return gcode;
|
||||
|
||||
sliceWorker.postMessage({
|
||||
message: 'SLICE',
|
||||
data: { geometry, config }
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user