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

major changes to upgrade to 3JS 1.2.5 -- deprecated THREE.Geometry -- breakage may ensue

Browse source
This commit is contained in:
Stewart Allen 2021-03-01 22:41:29 -05:00
commit 6aa78d2a6a
8 changed files with 83 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/kiri/main.js
View file

@ -1504,51 +1504,22 @@
widgets.forEach(widget => {
let mesh = widget.mesh;
let geo = mesh.geometry;
// let geo = new THREE.Geometry().fromBufferGeometry(mesh.geometry);
outs.push({geo, widget});
facets += geo.attributes.position.count;
// facets += geo.faces.length;
});
let stl = new Uint8Array(80 + 4 + facets * 50);
let dat = new DataView(stl.buffer);
let pos = 84;
dat.setInt32(80, facets, true);
// outs.forEach(out => {
// let { faces, vertices } = out.geo;
// for (let i=0, il=faces.length; i<il; i++) {
// let {a, b, c, normal} = faces[i];
// let xo = 0, yo = 0, zo = 0;
// if (outs.length > 1) {
// let {x, y, z} = out.widget.track.pos;
// xo = x;
// yo = y;
// zo = z;
// }
// dat.setFloat32(pos + 0, normal.x, true);
// dat.setFloat32(pos + 4, normal.y, true);
// dat.setFloat32(pos + 8, normal.z, true);
// dat.setFloat32(pos + 12, vertices[a].x + xo, true);
// dat.setFloat32(pos + 16, vertices[a].y + yo, true);
// dat.setFloat32(pos + 20, vertices[a].z + zo, true);
// dat.setFloat32(pos + 24, vertices[b].x + xo, true);
// dat.setFloat32(pos + 28, vertices[b].y + yo, true);
// dat.setFloat32(pos + 32, vertices[b].z + zo, true);
// dat.setFloat32(pos + 36, vertices[c].x + xo, true);
// dat.setFloat32(pos + 40, vertices[c].y + yo, true);
// dat.setFloat32(pos + 44, vertices[c].z + zo, true);
// pos += 50;
// }
// });
for (let out of outs) {
let { normal, position } = out.geo.attributes;
let nvals = normal.array;
let { position } = out.geo.attributes;
let pvals = position.array;
for (let i=0, il=position.count; i<il; i += 3) {
let pi = i * position.itemSize;
// average vertex normals to produce a face normal
let nx = (nvals[pi + 0] + nvals[pi + 3] + nvals[pi + 6]) / 3;
let ny = (nvals[pi + 1] + nvals[pi + 4] + nvals[pi + 7]) / 3;
let nz = (nvals[pi + 2] + nvals[pi + 5] + nvals[pi + 8]) / 3;
let p0 = new THREE.Vector3(pvals[pi++], pvals[pi++], pvals[pi++]);
let p1 = new THREE.Vector3(pvals[pi++], pvals[pi++], pvals[pi++]);
let p2 = new THREE.Vector3(pvals[pi++], pvals[pi++], pvals[pi++]);
let norm = THREE.computeFaceNormal(p0, p1, p2);
let xo = 0, yo = 0, zo = 0;
if (outs.length > 1) {
let {x, y, z} = out.widget.track.pos;
@ -1556,18 +1527,18 @@
yo = y;
zo = z;
}
dat.setFloat32(pos + 0, nx, true);
dat.setFloat32(pos + 4, ny, true);
dat.setFloat32(pos + 8, nz, true);
dat.setFloat32(pos + 12, pvals[pi + 0] + xo, true);
dat.setFloat32(pos + 16, pvals[pi + 1] + yo, true);
dat.setFloat32(pos + 20, pvals[pi + 2] + zo, true);
dat.setFloat32(pos + 24, pvals[pi + 3] + xo, true);
dat.setFloat32(pos + 28, pvals[pi + 4] + yo, true);
dat.setFloat32(pos + 32, pvals[pi + 5] + zo, true);
dat.setFloat32(pos + 36, pvals[pi + 6] + xo, true);
dat.setFloat32(pos + 40, pvals[pi + 7] + yo, true);
dat.setFloat32(pos + 44, pvals[pi + 8] + zo, true);
dat.setFloat32(pos + 0, norm.x, true);
dat.setFloat32(pos + 4, norm.y, true);
dat.setFloat32(pos + 8, norm.z, true);
dat.setFloat32(pos + 12, p0.x + xo, true);
dat.setFloat32(pos + 16, p0.y + yo, true);
dat.setFloat32(pos + 20, p0.z + zo, true);
dat.setFloat32(pos + 24, p1.x + xo, true);
dat.setFloat32(pos + 28, p1.y + yo, true);
dat.setFloat32(pos + 32, p1.z + zo, true);
dat.setFloat32(pos + 36, p2.x + xo, true);
dat.setFloat32(pos + 40, p2.y + yo, true);
dat.setFloat32(pos + 44, p2.z + zo, true);
pos += 50;
}
}

19
src/kiri/widget.js
View file

@ -557,7 +557,24 @@
};
PRO.getGeoVertices = function() {
return this.mesh.geometry.getAttribute('position').array;
let geo = this.mesh.geometry;
let pos = geo.getAttribute('position').array;
if (geo.index) {
let idx = geo.index.array;
let len = idx.length;
let p2 = new Float32Array(len * 3);
let inc = 0;
for (let i=0; i<len; i++) {
let iv = idx[i];
let ip = iv * 3;
p2[inc++] = pos[ip++];
p2[inc++] = pos[ip++];
p2[inc++] = pos[ip];
}
return p2;
} else {
return pos;
}
};
PRO.getPoints = function() {