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

partial sla slice render restore

Browse source
This commit is contained in:
Stewart Allen 2020-11-08 18:39:21 -05:00
commit 1c5c8e9cb4
10 changed files with 170 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

151
src/kiri/main.js
View file

@ -47,7 +47,6 @@
localFilterKey ='kiri-gcode-filters',
localFilters = js2o(SDB.getItem(localFilterKey)) || [],
// ---------------
renderMode = 4,
viewMode = VIEWS.ARRANGE,
layoutOnAdd = true,
local = SETUP.local,
@ -59,7 +58,6 @@
alerts = [],
grouping = false;
if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]);
DBUG.enable();
// remove version, preserve other settings
@ -227,11 +225,11 @@
feature,
function: {
slice: prepareSlices,
print: preparePrint,
prepare: preparePrint,
print: preparePreview,
prepare: preparePreview,
export: function() { KIRI.export(...arguments) },
cancel: cancelWorker,
clear: () => { console.log("api.function.clear unimplemented") }
clear: KIRI.client.clear
},
hide: {
alert: function(rec) { alert2cancel(rec) },
@ -655,71 +653,6 @@
showSlices();
}
function preparePrint(callback) {
if (viewMode === VIEWS.PREVIEW) return;
hideSlider(true);
// kick off slicing it hasn't been done already
for (let i=0; i < WIDGETS.length; i++) {
if (!WIDGETS[i].slices || WIDGETS[i].isModified()) {
prepareSlices(function() {
if (!WIDGETS[i].slices || WIDGETS[i].isModified()) {
alert2("nothing to print");
} else {
preparePrint(callback);
}
});
return;
}
}
let isCam = MODE === MODES.CAM, pMode = getMode();
if (feature.preview) {
setViewMode(VIEWS.PREVIEW);
}
API.conf.save();
API.event.emit('preview.begin', pMode);
if (isCam) {
setOpacity(color.cam_preview_opacity);
forAllWidgets(function(widget) {
widget.setColor(color.cam_preview);
});
} else if (feature.preview) {
setOpacity(color.preview_opacity);
}
KIRI.client.prepare(settings, function(progress, message) {
API.show.progress(progress, message);
}, function (output) {
API.show.progress(0);
if (!isCam) setOpacity(0);
output = KIRI.codec.decode(output);
if (feature.preview && output) {
STACKS.clear();
const stack = STACKS.create('print', SPACE.platform.world)
output.forEach(layer => {
stack.add(layer);
});
}
API.event.emit('print', pMode);
API.event.emit('preview.end', pMode);
if (feature.preview) {
SPACE.update();
updateSliderMax(true);
showSlices();
}
if (typeof(callback) === 'function') {
callback();
}
});
}
function cancelWorker() {
if (KIRI.work.isSlicing()) KIRI.work.restart();
}
@ -736,11 +669,6 @@
// UI.setMenu.style.display = andmenu ? 'none' : 'flex';
}
/**
* incrementally slice all meshes then incrementally update them
*
* @param {Function} callback
*/
function prepareSlices(callback) {
if (viewMode == VIEWS.ARRANGE) {
let snap = SPACE.screenshot();
@ -748,7 +676,7 @@
KIRI.work.snap(API.view.snapshot);
}
if (MODE === MODES.SLA && !callback) {
callback = preparePrint;
callback = preparePreview;
}
hideSlider(true);
@ -838,6 +766,77 @@
});
}
function preparePreview(callback) {
if (viewMode === VIEWS.PREVIEW) return;
if (viewMode === VIEWS.ARRANGE) {
prepareSlices(() => {
preparePreview(callback);
});
}
hideSlider(true);
// kick off slicing it hasn't been done already
for (let i=0; i < WIDGETS.length; i++) {
if (!WIDGETS[i].slices || WIDGETS[i].isModified()) {
prepareSlices(function() {
if (!WIDGETS[i].slices || WIDGETS[i].isModified()) {
alert2("nothing to print");
} else {
preparePreview(callback);
}
});
return;
}
}
let isCam = MODE === MODES.CAM, pMode = getMode();
if (feature.preview) {
setViewMode(VIEWS.PREVIEW);
}
API.conf.save();
API.event.emit('preview.begin', pMode);
if (isCam) {
setOpacity(color.cam_preview_opacity);
forAllWidgets(function(widget) {
widget.setColor(color.cam_preview);
});
} else if (feature.preview) {
setOpacity(color.preview_opacity);
}
KIRI.client.prepare(settings, function(progress, message) {
API.show.progress(progress, message);
}, function (output) {
API.show.progress(0);
if (!isCam) setOpacity(0);
output = KIRI.codec.decode(output);
if (feature.preview && output) {
STACKS.clear();
const stack = STACKS.create('print', SPACE.platform.world)
output.forEach(layer => {
stack.add(layer);
});
}
API.event.emit('print', pMode);
API.event.emit('preview.end', pMode);
if (feature.preview) {
SPACE.update();
updateSliderMax(true);
showSlices();
}
if (typeof(callback) === 'function') {
callback();
}
});
}
/** ******************************************************************
* Selection Functions
******************************************************************* */

34
src/kiri/print.js
View file

@ -39,7 +39,7 @@
this.settings = settings;
this.widgets = widgets;
this.group = new THREE.Group();
// this.group = new THREE.Group();
this.printView = [];
this.movesView = [];
@ -387,23 +387,23 @@
return out;
}
PRO.getLayerCount = function() {
return this.output.length;
}
// PRO.getLayerCount = function() {
// return this.output.length;
// }
PRO.hide = function() {
this.printView.forEach(function(layer) {
layer.setVisible(false);
})
this.movesView.forEach(function(layer) {
layer.setVisible(false);
})
};
PRO.showLayer = function(index, show, moves) {
if (this.printView[index]) this.printView[index].setVisible(show);
if (this.movesView[index]) this.movesView[index].setVisible(show && moves);
};
// PRO.hide = function() {
// this.printView.forEach(function(layer) {
// layer.setVisible(false);
// })
// this.movesView.forEach(function(layer) {
// layer.setVisible(false);
// })
// };
//
// PRO.showLayer = function(index, show, moves) {
// if (this.printView[index]) this.printView[index].setVisible(show);
// if (this.movesView[index]) this.movesView[index].setVisible(show && moves);
// };
/**
* @constructor

2
src/kiri/render.js
View file

@ -91,7 +91,7 @@
});
});
if (options && options.outline) {
this.addPolys(poly.clone());
this.addPolys(polys.clone(true));
}
}

6
src/kiri/stacks.js
View file

@ -110,7 +110,11 @@
const { polys, lines, faces, paths } = data;
if (polys.length || lines.length) {
const mat = new THREE.LineBasicMaterial({ color: data.color.line });
const mat = new THREE.LineBasicMaterial({
transparent: data.color.opacity != 1,
opacity: data.color.opacity,
color: data.color.line
});
const geo = new THREE.Geometry(), vert = geo.vertices;
for (let i=0, il=polys.length; i<il; i++) {
addPoly(vert, polys[i]);

4
src/kiri/worker.js
View file

@ -141,11 +141,11 @@ KIRI.worker = {
const output = driver.export(current.print, function(line) {
send.data({line});
});
const { time, lines, bytes, bounds } = current.print;
const { bounds, time, lines, bytes, distance } = current.print;
send.done({
done: true,
output: { time, lines, bytes, bounds }
output: { bounds, time, lines, bytes, distance }
});
},