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

fix obj export, async loaded grouped import

Browse source
This commit is contained in:
Stewart Allen 2021-12-19 14:37:29 -05:00
commit 470a4c1f6b
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/kiri/main.js
View file

@ -1710,6 +1710,7 @@
}); });
if (format === "obj") { if (format === "obj") {
let obj = []; let obj = [];
let vpad = 0;
for (let out of outs) { for (let out of outs) {
let meta = out.widget.meta; let meta = out.widget.meta;
let name = meta.file || 'unnamed'; let name = meta.file || 'unnamed';
@ -1721,8 +1722,9 @@
obj.push(`v ${pvals[pi++]} ${pvals[pi++]} ${pvals[pi++]}`); obj.push(`v ${pvals[pi++]} ${pvals[pi++]} ${pvals[pi++]}`);
obj.push(`v ${pvals[pi++]} ${pvals[pi++]} ${pvals[pi++]}`); obj.push(`v ${pvals[pi++]} ${pvals[pi++]} ${pvals[pi++]}`);
obj.push(`v ${pvals[pi++]} ${pvals[pi++]} ${pvals[pi++]}`); obj.push(`v ${pvals[pi++]} ${pvals[pi++]} ${pvals[pi++]}`);
obj.push(`f ${i+1} ${i+2} ${i+3}`); obj.push(`f ${i+1+vpad} ${i+2+vpad} ${i+3+vpad}`);
} }
vpad += position.count;
} }
return obj.join('\n'); return obj.join('\n');
} }
@ -2677,12 +2679,19 @@
iskmz = lower.indexOf(".kmz") > 0; iskmz = lower.indexOf(".kmz") > 0;
reader.file = files[i]; reader.file = files[i];
reader.onloadend = function (e) { reader.onloadend = function (e) {
if (israw) platform.add( function load_dec() {
newWidget(undefined,group) if (--loaded === 0) platform.group_done(isgcode);
.loadVertices(JSON.parse(e.target.result).toFloat32()) }
); if (israw) {
platform.add(
newWidget(undefined,group)
.loadVertices(JSON.parse(e.target.result).toFloat32())
);
load_dec();
}
else if (API.feature.on_load && (isstl || isobj || is3mf)) { else if (API.feature.on_load && (isstl || isobj || is3mf)) {
API.feature.on_load(e.target.result, file); API.feature.on_load(e.target.result, file);
load_dec();
} }
else if (isstl) { else if (isstl) {
if (API.feature.on_add_stl) { if (API.feature.on_add_stl) {
@ -2694,6 +2703,7 @@
.saveToCatalog(e.target.file.name) .saveToCatalog(e.target.file.name)
); );
} }
load_dec();
} }
else if (isobj) { else if (isobj) {
let objs = MOTO.OBJ.parse(e.target.result); let objs = MOTO.OBJ.parse(e.target.result);
@ -2709,6 +2719,7 @@
.saveToCatalog(name) .saveToCatalog(name)
); );
} }
load_dec();
}; };
if (objs.length > 1 && !group) { if (objs.length > 1 && !group) {
UC.confirm('group objects?').then(ok => { UC.confirm('group objects?').then(ok => {
@ -2735,6 +2746,7 @@
.saveToCatalog(name) .saveToCatalog(name)
); );
} }
load_dec();
API.hide.alert(msg); API.hide.alert(msg);
} }
let msg = API.show.alert('Decoding 3MF'); let msg = API.show.alert('Decoding 3MF');
@ -2752,7 +2764,10 @@
} }
}); });
} }
else if (isgcode) loadCode(e.target.result, 'gcode'); else if (isgcode) {
loadCode(e.target.result, 'gcode');
load_dec();
}
else if (issvg) { else if (issvg) {
if (MODE === MODES.LASER) { if (MODE === MODES.LASER) {
loadCode(e.target.result, 'svg'); loadCode(e.target.result, 'svg');
@ -2769,13 +2784,13 @@
); );
} }
} }
load_dec();
} }
else if (iskmz) settingsImportZip(e.target.result, true); else if (iskmz) settingsImportZip(e.target.result, true);
else if (isset) settingsImport(e.target.result, true); else if (isset) settingsImport(e.target.result, true);
else if (ispng) loadImageDialog(e.target.result, e.target.file.name); else if (ispng) loadImageDialog(e.target.result, e.target.file.name);
else if (isjpg) loadImageConvert(e.target.result, e.target.file.name); else if (isjpg) loadImageConvert(e.target.result, e.target.file.name);
else API.show.alert(`Unsupported file: ${files[i].name}`); else API.show.alert(`Unsupported file: ${files[i].name}`);
if (--loaded === 0) platform.group_done(isgcode);
}; };
if (isstl || ispng || isjpg || iskmz) { if (isstl || ispng || isjpg || iskmz) {
reader.readAsArrayBuffer(reader.file); reader.readAsArrayBuffer(reader.file);

3
src/kiri/widget.js
View file

@ -558,6 +558,9 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
* called by center() and Group.center() * called by center() and Group.center()
*/ */
PRO.moveMesh = function(x, y, z) { PRO.moveMesh = function(x, y, z) {
if (!(x || y || z)) {
return;
}
let gap = this.mesh.geometry.attributes.position, let gap = this.mesh.geometry.attributes.position,
pa = gap.array; pa = gap.array;
// center point array on 0,0,0 // center point array on 0,0,0