update to latest manifold api
This commit is contained in:
Stewart Allen
parent
bb7c232a3b
commit
0983acd50b
4 changed files with 40 additions and 153 deletions
155
src/geo/csg.js
155
src/geo/csg.js
|
|
@ -29,12 +29,12 @@ const CSG = {
|
|||
|
||||
moduleOp(name, op) {
|
||||
mesh.log(`${name} ${arguments.length} meshes`);
|
||||
const args = [...arguments].slice(2).map(a => new Module.Manifold(a));
|
||||
const args = [...arguments].slice(2).map(a => new Instance.Manifold(a));
|
||||
if (args.length < 2) {
|
||||
throw "missing one or more meshes";
|
||||
}
|
||||
const result = Module[op](...args);
|
||||
const output = result.getMesh({ normal: () => undefined });
|
||||
const result = Instance[op](...args);
|
||||
const output = result.getMesh();
|
||||
const errors = [ ...args, result ].map(m => m.status().value);
|
||||
for (let m of [ ...args, result ]) {
|
||||
m.delete();
|
||||
|
|
@ -46,33 +46,14 @@ const CSG = {
|
|||
},
|
||||
|
||||
toPositionArray(mesh) {
|
||||
const { vertPos, triVerts, vertex, index } = mesh;
|
||||
if (vertex && index) {
|
||||
const vertices = new Float32Array(index.length * 3);
|
||||
for (let p=0, i=0, l=index.length; i<l; i++) {
|
||||
let vi = index[i] * 3;
|
||||
vertices[p++] = vertex[vi++];
|
||||
vertices[p++] = vertex[vi++];
|
||||
vertices[p++] = vertex[vi++];
|
||||
}
|
||||
return vertices;
|
||||
}
|
||||
let { vertPos, triVerts } = mesh;
|
||||
if (vertPos && triVerts) {
|
||||
const vertices = new Float32Array(triVerts.length * 9);
|
||||
for (let i = 0, t = 0, l = triVerts.length; t < l; t++) {
|
||||
let tri = triVerts[t];
|
||||
let vert = vertPos[tri[0]]; // X
|
||||
vertices[i++] = vert[0];
|
||||
vertices[i++] = vert[1];
|
||||
vertices[i++] = vert[2];
|
||||
vert = vertPos[tri[1]]; // Y
|
||||
vertices[i++] = vert[0];
|
||||
vertices[i++] = vert[1];
|
||||
vertices[i++] = vert[2];
|
||||
vert = vertPos[tri[2]]; // Z
|
||||
vertices[i++] = vert[0];
|
||||
vertices[i++] = vert[1];
|
||||
vertices[i++] = vert[2];
|
||||
const vertices = new Float32Array(triVerts.length * 3);
|
||||
for (let p=0, i=0, l=triVerts.length; i<l; i++) {
|
||||
let vi = triVerts[i] * 3;
|
||||
vertices[p++] = vertPos[vi++];
|
||||
vertices[p++] = vertPos[vi++];
|
||||
vertices[p++] = vertPos[vi++];
|
||||
}
|
||||
return vertices;
|
||||
}
|
||||
|
|
@ -81,22 +62,10 @@ const CSG = {
|
|||
|
||||
fromPositionArray(pos) {
|
||||
const { index, vertices } = indexVertices(pos);
|
||||
const mesh = {
|
||||
vertPos: new Module.Vector_vec3(),
|
||||
triVerts: new Module.Vector_ivec3(),
|
||||
vertNormal: new Module.Vector_vec3(),
|
||||
halfedgeTangent: new Module.Vector_vec4()
|
||||
};
|
||||
for (let i = 0, l = vertices.length; i < l; ) {
|
||||
mesh.vertPos.push_back({
|
||||
x: vertices[i++],
|
||||
y: vertices[i++],
|
||||
z: vertices[i++]
|
||||
});
|
||||
}
|
||||
for (let i = 0, l = index.length; i < l; ) {
|
||||
mesh.triVerts.push_back([ index[i++], index[i++], index[i++] ]);
|
||||
}
|
||||
let mesh = new Instance.Mesh({
|
||||
vertPos: vertices.toFloat32(),
|
||||
triVerts: index.toUint32()
|
||||
});
|
||||
return mesh;
|
||||
}
|
||||
|
||||
|
|
@ -130,98 +99,12 @@ function indexVertices(pos) {
|
|||
return { index, vertices };
|
||||
}
|
||||
|
||||
function pos2mesh(pos) {
|
||||
|
||||
}
|
||||
|
||||
Module.onRuntimeInitialized = () => {
|
||||
let Instance;
|
||||
Module().then(Module => {
|
||||
Module.setup();
|
||||
|
||||
const tests = false;
|
||||
const mesh_perf = false;
|
||||
const ball_torture = false;
|
||||
|
||||
if (tests) {
|
||||
console.log('running Manifold tests');
|
||||
|
||||
let c = Module.cube([1,1,1], true);
|
||||
console.log({
|
||||
c,
|
||||
cm: c.getMesh(),
|
||||
cmd: c.getMesh({ normal: () => undefined }),
|
||||
cmdn: c.getMesh({})
|
||||
});
|
||||
|
||||
if (mesh_perf) {
|
||||
console.log('running Manifold getMesh() benchmark');
|
||||
|
||||
let l = 1000;
|
||||
let s = Module.sphere(10, 100);
|
||||
let sm = s.getMesh();
|
||||
let smd = s.getMesh({});
|
||||
console.log({
|
||||
s,
|
||||
sm,
|
||||
smd,
|
||||
});
|
||||
|
||||
console.time('getMesh');
|
||||
for (let i=0; i<l; i++) s.getMesh();
|
||||
console.timeEnd('getMesh');
|
||||
|
||||
console.time(`getMeshDirect`);
|
||||
for (let i=0; i<l; i++) s.getMesh({ normal: () => undefined });
|
||||
console.timeEnd(`getMeshDirect`);
|
||||
|
||||
console.time(`getMeshDirect`);
|
||||
for (let i=0; i<l; i++) s.getMesh({});
|
||||
console.timeEnd(`getMeshDirect`);
|
||||
}
|
||||
|
||||
if (ball_torture) {
|
||||
console.log('running Manifold ball torture test');
|
||||
|
||||
console.time('ball test');
|
||||
let iter = 1; // increases final complexity (cpu + mem)
|
||||
let maxBatch = 10; // increases memory pressure
|
||||
let sphereDetail = 64; // higher # speeds up progression of complexity
|
||||
let ball = Module.sphere(24, sphereDetail);
|
||||
let box = Module.cube([500, 500, 100], true);
|
||||
let deg2rad = Math.PI / 180;
|
||||
let z = 50;
|
||||
let rad = 250;
|
||||
let last = Date.now();
|
||||
let batch = 0;
|
||||
for (let i=0; i<360*iter; i++) {
|
||||
let x = Math.cos(deg2rad * i) * rad;
|
||||
let y = Math.sin(deg2rad * i) * rad;
|
||||
let ball2 = ball.translate(x, y, z);
|
||||
let box2 = box.subtract(ball2);
|
||||
ball2.delete();
|
||||
box.delete();
|
||||
box = box2;
|
||||
if (batch++ > maxBatch) {
|
||||
batch = 0;
|
||||
let nv = box.numVert();
|
||||
let now = Date.now();
|
||||
console.log(
|
||||
(i / (iter * 360)).toFixed(2), // % complete
|
||||
nv, // num vertices in target block
|
||||
now - last, // elapsed time for maxBatch boolean ops
|
||||
((now - last) / maxBatch).toFixed(4) // time per boolean op
|
||||
);
|
||||
last = now;
|
||||
}
|
||||
rad -= 0.04;
|
||||
z -= 0.08;
|
||||
}
|
||||
console.log(box.getMesh());
|
||||
ball.delete();
|
||||
box.delete();
|
||||
console.timeEnd('ball test');
|
||||
}
|
||||
}
|
||||
};
|
||||
Instance = Module;
|
||||
CSG.Instance = () => { return Instance };
|
||||
});
|
||||
|
||||
gapp.overlay(base, {
|
||||
CSG
|
||||
|
|
|
|||
Loading…
Reference in a new issue