forgecad 0.9.15 → 0.10.0

package/dist/assets/{scanProxyWorker-B-9VbLIs.js → scanProxyWorker-2GtDLk-R.js}

@@ -7544,7 +7544,7 @@ if (typeof window !== "undefined") {
 }
 const SCAN_PROXY_GRANULARITY_DEFAULT = 32;
 const SCAN_PROXY_SCENE_CELLS_ACROSS = SCAN_PROXY_GRANULARITY_DEFAULT;
-const SCAN_PROXY_CELL_GAP_RATIO = 0.22;
+const SCAN_PROXY_CELL_GAP_RATIO = 0.04;
 const FACE_DIRS = [
   { normal: [1, 0, 0], u: [0, 1, 0], v: [0, 0, 1] },
   { normal: [-1, 0, 0], u: [0, 0, 1], v: [0, 1, 0] },
@@ -7589,6 +7589,7 @@ function createScanProxyGeometry(source, options = {}) {
     },
     cellCenters,
     cellSize: spec.cellSize,
+    grid: scanProxyGridFromSpec(spec),
     cells: {
       shell: shell.size,
       core: 0,
@@ -7630,7 +7631,7 @@ function scanProxyPayloadTransferables(payload) {
   const transferables = [];
   for (const layer of Object.values(payload.geometries)) {
     if (!layer) continue;
-    transferables.push(layer.positions.buffer, layer.normals.buffer);
+    transferables.push(layer.positions.buffer, layer.normals.buffer, layer.cells.buffer);
   }
   if (payload.cellCenters) transferables.push(payload.cellCenters.positions.buffer);
   return transferables;
@@ -7652,6 +7653,7 @@ function scanProxyGeometryToPayload(proxy) {
     },
     cellCenters: pointPayloadFromGeometry(proxy.cellCenters),
     cellSize: proxy.cellSize,
+    grid: proxy.grid,
     cells: proxy.cells,
     faces: proxy.faces,
     telemetry: proxy.telemetry
@@ -7669,10 +7671,12 @@ function layerPayloadFromGeometry(geometry) {
   if (!geometry) return null;
   const positions = geometry.getAttribute("position");
   const normals = geometry.getAttribute("normal");
-  if (!positions || !normals) return null;
+  const cells = geometry.getAttribute("scanCell");
+  if (!positions || !normals || !cells) return null;
   return {
     positions: positions.array,
-    normals: normals.array
+    normals: normals.array,
+    cells: cells.array
   };
 }
 function buildCellCenterGeometry(cells, spec) {
@@ -7779,6 +7783,7 @@ function buildCellGeometry(cells, material, spec, lookup) {
   if (cells.size === 0) return { geometry: null, faces: 0 };
   const positions = [];
   const normals = [];
+  const cellCoords = [];
   let faces = 0;
   for (const cell of cells.values()) {
     for (const dir of FACE_DIRS) {
@@ -7786,7 +7791,7 @@ function buildCellGeometry(cells, material, spec, lookup) {
       const neighborMaterial = lookup.get(neighborKey);
       if (neighborMaterial === material) continue;
       if (neighborMaterial && neighborMaterial !== "shell") continue;
-      addFace(positions, normals, cell, dir, spec);
+      addFace(positions, normals, cellCoords, cell, dir, spec);
       faces += 1;
     }
   }
@@ -7794,10 +7799,11 @@ function buildCellGeometry(cells, material, spec, lookup) {
   const geometry = new BufferGeometry();
   geometry.setAttribute("position", new Float32BufferAttribute(positions, 3));
   geometry.setAttribute("normal", new Float32BufferAttribute(normals, 3));
+  geometry.setAttribute("scanCell", new Float32BufferAttribute(cellCoords, 3));
   geometry.computeBoundingSphere();
   return { geometry, faces };
 }
-function addFace(positions, normals, cell, dir, spec) {
+function addFace(positions, normals, cellCoords, cell, dir, spec) {
   const half = (spec.cellSize - scanProxyCellGap(spec.cellSize)) / 2;
   const center = cellCenter(cell, spec);
   const normal = new Vector3(dir.normal[0], dir.normal[1], dir.normal[2]);
@@ -7815,6 +7821,7 @@ function addFace(positions, normals, cell, dir, spec) {
   for (const point of pts) {
     positions.push(point.x, point.y, point.z);
     normals.push(normal.x, normal.y, normal.z);
+    cellCoords.push(cell.ix, cell.iy, cell.iz);
   }
 }
 function boundsForPosition(position, matrix) {
@@ -7899,6 +7906,12 @@ function cellCenter(cell, spec) {
     spec.min.z + (cell.iz + 0.5) * spec.cellSize
   );
 }
+function scanProxyGridFromSpec(spec) {
+  return {
+    cellSize: spec.cellSize,
+    origin: [spec.min.x, spec.min.y, spec.min.z]
+  };
+}
 function clampCellIndex(index, count) {
   return Math.max(0, Math.min(count - 1, index));
 }