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

move tab/support annotations into widget meta data / idb. fix support/lay flat conflict. fix support nozzle in slice.

Browse source
This commit is contained in:
Stewart Allen 2021-10-18 23:36:19 -04:00
commit bf51d56bb5
12 changed files with 92 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/kiri/widget.js
View file

@ -151,6 +151,8 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
this.roto = [];
// added meshes (supports, tabs, etc)
this.adds = [];
// persisted client annotations (cam tabs, fdm supports)
this.anno = {};
// THREE Mesh and points
this.mesh = null;
this.points = null;
@ -220,10 +222,12 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
indices = data.ind || undefined,
track = data.track || undefined,
group = data.group || id,
anno = data.anno || undefined,
widget = newWidget(id, Group.forid(group)),
meta = data.meta || widget.meta,
ptr = widget.loadVertices({vertices, indices});
widget.meta = meta;
widget.anno = anno || widget.anno;
// restore widget position if specified
if (move && track && track.pos) {
widget.track = track;
@ -265,13 +269,25 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
ind: widget.getGeoIndices(),
track: widget.track,
group: this.group.id,
meta: this.meta
meta: this.meta,
anno: this.annotations()
}, function(result) {
widget.meta.saved = time();
if (ondone) ondone();
});
};
PRO.annotations = function() {
let o = Object.clone(this.anno);
if (o.support) {
// clear out THREE.Box temps
for (let s of o.support) {
delete s.box;
}
}
return o;
};
/**
*
* @param {Float32Array} vertices
@ -474,8 +490,11 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
* @param {number} color
*/
PRO.setColor = function(color,settings) {
if (settings) {
console.trace('legacy call with settings');
}
if (Array.isArray(color)) {
color = color[this.getExtruder(settings) % color.length];
color = color[this.getExtruder() % color.length];
}
this.color = color;
let material = this.mesh.material;
@ -789,11 +808,15 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
};
PRO.getExtruder = function(settings) {
if (settings && settings.widget) {
let rec = settings.widget[this.id];
return rec && rec.extruder >= 0 ? rec.extruder : 0;
if (settings) {
console.trace('legacy call with settings');
}
return 0;
return this.anno.extruder || 0;
// if (settings && settings.widget) {
// let rec = settings.widget[this.id];
// return rec && rec.extruder >= 0 ? rec.extruder : 0;
// }
// return 0;
};
// allow worker code to run in same memspace as client