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

optimize verticesToPoints when not decimating (no hash). make slice async for future minion work

Browse source
This commit is contained in:
Stewart Allen 2023-01-14 18:22:41 -05:00
commit 14c4338534
4 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/geo/points.js
View file

@ -19,6 +19,7 @@ gapp.overlay(base, {
* with optional decimation
*/
function verticesToPoints(array, options) {
console.time('verticesToPoints');
let parr = new Array(array.length / 3),
i = 0,
j = 0,
@ -30,19 +31,6 @@ function verticesToPoints(array, options) {
oldpoints = parr.length,
newpoints;
// replace point objects with their equivalents
while (i < array.length) {
let p = base.newPoint(array[i++], array[i++], array[i++]),
k = p.key,
m = hash[k];
if (!m) {
m = p;
hash[k] = p;
unique++;
}
parr[j++] = m;
}
let {threshold, precision, maxpass} = options || {};
// threshold = point count for triggering decimation
// precision = under which points are merged
@ -51,6 +39,25 @@ function verticesToPoints(array, options) {
precision = precision >= 0 ? precision : config.precision_decimate;
maxpass = maxpass >= 0 ? maxpass : 0;
// replace point objects with their equivalents
if (maxpass) {
while (i < array.length) {
let p = base.newPoint(array[i++], array[i++], array[i++]),
k = p.key,
m = hash[k];
if (!m) {
m = p;
hash[k] = p;
unique++;
}
parr[j++] = m;
}
} else {
while (i < array.length) {
parr[j++] = base.newPoint(array[i++], array[i++], array[i++]);
}
}
// decimate until all point spacing > precision
if (maxpass && precision > 0.0)
while (parr.length > threshold) {
@ -115,6 +122,7 @@ function verticesToPoints(array, options) {
time: (Date.now() - t)
});
console.timeEnd('verticesToPoints');
return parr;
}

8
src/kiri-mode/cam/ops.js
View file

@ -256,7 +256,7 @@ class OpRough extends CamOp {
}
// console.log('indices', ...indices, {zBottom});
slicer.slice(indices, { each: (data, index, total) => {
await slicer.slice(indices, { each: (data, index, total) => {
shadow = unsafe ? data.tops : POLY.union(shadow.slice().appendAll(data.tops), 0.01, true);
if (flats.indexOf(data.z) >= 0) {
// exclude flats injected to complete shadow
@ -517,7 +517,7 @@ class OpOutline extends CamOp {
slices.push(slice);
});
} else
slicer.slice(indices, { each: (data, index, total) => {
await slicer.slice(indices, { each: (data, index, total) => {
shadow = unsafe ? data.tops : POLY.union(shadow.slice().appendAll(data.tops), 0.01, true);
if (flats.indexOf(data.z) >= 0) {
// exclude flats injected to complete shadow
@ -1504,7 +1504,7 @@ class OpXRay extends CamOp {
slice.xray();
addSlices(slice);
}, over: false, flatoff: 0, edges: true, openok: true };
slicer.slice(xrayind, xrayopt);
await slicer.slice(xrayind, xrayopt);
// xrayopt.over = true;
// slicer.slice(xrayind, xrayopt);
}
@ -1537,7 +1537,7 @@ class OpShadow extends CamOp {
}
let lsz; // only shadow up to bottom of last shadow for progressive union
let terrain = slicer.slice(tzindex, { each: (data, index, total) => {
let terrain = await slicer.slice(tzindex, { each: (data, index, total) => {
let shadow = trueShadow ? shadowAt(data.z, lsz) : [];
tshadow = POLY.union(tshadow.slice().appendAll(data.tops).appendAll(shadow), 0.01, true);
tslices.push(data.slice);

3
src/kiri-mode/cam/slice.js
View file

@ -59,8 +59,7 @@ CAM.slice = async function(settings, widget, onupdate, ondone) {
unsafe = proc.camExpertFast,
units = settings.controller.units === 'in' ? 25.4 : 1,
axisRotation,
axisIndex,
thruHoles;
axisIndex;
if (tabs) {
// make tab polygons

22
src/kiri-mode/cam/slicer.js
View file

@ -50,10 +50,13 @@ class Slicer {
this.zLine = {}; // count of z coplanar lines
this.zList = {}; // count of z values for auto slicing
this.zSum = 0; // used in bucketing calculations
return this
console.time('set points');
this
.computeBounds()
.computeFeatures()
.computeBuckets();
console.timeEnd('set points');
return this;
}
computeBounds() {
@ -70,7 +73,7 @@ class Slicer {
computeFeatures(options) {
const opt = this.setOptions(options);
const points = this.points;
const bounds = this.bounds;
// const bounds = this.bounds;
const zFlat = this.zFlat;
const zLine = this.zLine;
const zList = this.zList;
@ -80,6 +83,7 @@ class Slicer {
zList[z] = (zList[z] || 0) + 1;
}
console.time('compute features');
for (let i = 0, il = points.length; i < il; ) {
let p1 = points[i++];
let p2 = points[i++];
@ -122,6 +126,7 @@ class Slicer {
}
}
}
console.timeEnd('compute features');
return this;
}
@ -137,8 +142,9 @@ class Slicer {
let points = this.points;
let bucketCount = Math.max(1, Math.ceil(zMax / (zSum / points.length)) - 1);
let zScale = this.zScale = 1 / (zMax / bucketCount);
let buckets = this.buckets = {};
let buckets = this.buckets = [];
console.time('compute buckets');
if (bucketCount > 1) {
buckets.length = bucketCount;
// create empty buckets
@ -163,23 +169,25 @@ class Slicer {
}
}
}
console.timeEnd('compute buckets');
return this;
}
// slice through points at given Z and return polygons
slice(z, options, index, total, mark) {
async slice(z, options, index, total, mark) {
const opt = this.setOptions(options);
// if Z is supplied as an array, iterate and collect
if (Array.isArray(z)) {
const mark = util.time();
const rarr = [];
z.forEach((zv,zi) => {
const data = this.slice(zv, opt, zi, z.length, mark);
for (let zi=0; zi<z.length; zi++) {
const data = await this.slice(z[zi], opt, zi, z.length, mark);
if (data) {
rarr.push(data);
}
});
}
return rarr;
}