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

post split add healing faces

Browse source
This commit is contained in:
Stewart Allen 2024-08-10 16:50:12 -04:00
commit b549aad3fe
4 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/mesh/api.js
View file

@ -927,11 +927,11 @@ const tool = {
return { id: m.id, matrix: m.matrix }
}))
.then(data => {
api.selection.visible(false);
let group = api.group.new([new mesh.model({
file: `merged`,
mesh: data
})]).promote();
api.selection.visible(false);
api.selection.set([group]);
log('merge complete').unpin();
});
@ -946,11 +946,11 @@ const tool = {
worker
.model_union(models.map(m => m.id))
.then(data => {
api.selection.visible(false);
let group = api.group.new([new mesh.model({
file: `union`,
mesh: data
})]).promote();
api.selection.visible(false);
api.selection.set([ group ]);
})
.catch(error => {
@ -969,11 +969,11 @@ const tool = {
log(`diff ${models.length} models`).pin();
worker.model_difference(models.map(m => m.id))
.then(data => {
api.selection.visible(false);
let group = api.group.new([new mesh.model({
file: `diff`,
mesh: data
})]).promote();
api.selection.visible(false);
api.selection.set([group]);
})
.catch(error => {

8
src/mesh/model.js
View file

@ -262,6 +262,7 @@ mesh.model = class MeshModel extends mesh.object {
this.geometry.computeBoundingBox();
this.geometry.computeBoundingSphere();
this.log('update-bounds', this.geometry.boundingBox);
this.normals({ refresh: true });
this.updateBoundsBox();
moto.space.update();
this.sync();
@ -552,14 +553,13 @@ mesh.model = class MeshModel extends mesh.object {
return new Promise((resolve,reject) => {
worker.model_split({ id: this.id, z }).then(data => {
let { o1, o2 } = data;
let model;
if (o1.length)
if (o1?.length)
this.group.add(new mesh.model({
file: `${this.file}-top`,
mesh: o1
}).reCenter());
if (o2.length)
this.group.add(model = new mesh.model({
if (o2?.length)
this.group.add(new mesh.model({
file: `${this.file}-bot`,
mesh: o2
}).reCenter());

6
src/mesh/object.js
View file

@ -27,14 +27,14 @@ mesh.object = class MeshObject {
constructor(id) {
this.id = id || mesh.util.uuid();
worker.object_create({ id: this.id, type: this.type });
// storage location for meta data like position, scale, rotation
this.meta = { pos: [0,0,0] };
worker.object_create({ id: this.id, type: this.type });
worker.object_meta({ id: this.id, meta: this.meta });
this.log('NEW');
}
log() {
mesh.api.log.emit(this.id, this.type, ...arguments);
// mesh.api.log.emit(this.id, this.type, ...arguments);
}
get type() {

37
src/mesh/work.js
View file

@ -21,19 +21,14 @@
gapp.main("mesh.work", [], (root) => {
const { Matrix4, Vector3, BufferGeometry, BufferAttribute, computeFaceNormal } = THREE;
const { Quaternion, } = THREE;
const { base, mesh, moto } = root;
const { client, worker } = moto;
const { util } = mesh;
const { CSG, newPoint, newPolygon, sliceConnect } = base;
const cache = {};
// add scoped access to cache
mesh.work = { cache };
// compensation for space/world/platform rotation
const core_matrix = new Matrix4().makeRotationX(Math.PI / 2);
// start worker pool (disabled for now with *0)
client.start(`/code/mesh_pool?${gapp.version}`, client.max() * 0);
@ -52,7 +47,7 @@ function translate_encode(id) {
let rec = cache[id];
let { pos } = rec;
let mkey = pos.map(v => v.round(6)).join('-');
// re-translate on missing cache or changed matrix
// re-translate on missing cache or changed position
if (!rec || !rec.trans || rec.mkey !== mkey) {
let geo = rec.geo.clone().translate(new Vector3().fromArray(pos));
rec.mkey = mkey;
@ -102,12 +97,7 @@ let model = {
let { vertices, name, id } = data;
let geo = new BufferGeometry();
geo.setAttribute('position', new BufferAttribute(vertices, 3));
cacheUpdate(id, {
name,
geo,
trans: undefined,
tool: undefined
});
cacheUpdate(id, { name, geo, mkey: '' });
},
// merge several model vertices into a single array
@ -247,12 +237,15 @@ let model = {
}
on.length = over.length = under.length = 0;
}
// let mi4 = core_matrix.clone().multiply(new Matrix4().fromArray(matrix)).invert();
// let b1 = new BufferAttribute(o1.toFloat32(), 3);
// let b2 = new BufferAttribute(o2.toFloat32(), 3);
// o1 = b1.applyMatrix4(mi4).array;
// o2 = b2.applyMatrix4(mi4).array;
console.log({ edges, split_face: sliceConnect(edges, z), o1, o2 });
if (edges.length) {
// heal open spaces created by split
let heal = sliceConnect(edges, z).map(poly => poly.earcut()).flat();
let o1p = heal.map(poly => poly.points.map(p => [ p.x, p.y, p.z ]));
let o2p = heal.map(poly => poly.points.reverse().map(p => [ p.x, p.y, p.z ]));
o1.appendAll(o1p.flat().flat());
o2.appendAll(o2p.flat().flat());
// console.log({ edges, heal, o1, o2 });
}
return { o1: o1.toFloat32(), o2: o2.toFloat32() };
},
@ -394,8 +387,8 @@ let file = {
let { format, recs } = data;
let vtot = 0;
for (let rec of recs) {
let { id, matrix, file } = rec;
let vs = rec.varr = Array.from(translate_encode(id, matrix)).map(v => v.round(5));
let { id } = rec;
let vs = rec.varr = Array.from(translate_encode(id)).map(v => v.round(5));
vtot += (vs.length / 3);
}
switch (format) {
@ -403,7 +396,7 @@ let file = {
let p = 1;
let obj = [header];
for (let rec of recs) {
let { id, matrix, file, varr } = rec;
let { file, varr } = rec;
obj.push(`g ${file}`);
for (let i=0; i<varr.length; p += 3) {
obj.push(`v ${varr[i++]} ${varr[i++]} ${varr[i++]}`);
@ -420,7 +413,7 @@ let file = {
header.split('').forEach((c,i) => {
dat.setUint8(i, c.charCodeAt(0));
});
// todo put Kiri:Moto info in header
// todo put Mesh:Tool info in header
dat.setInt32(80, vtot/3, true);
for (let rec of recs) {
let { id, matrix, file, varr } = rec;