@woosh/meep-engine 2.33.4 → 2.33.9

package/engine/graphics/filter/FlipArrayInPlace.js

@@ -0,0 +1,25 @@
+/**
+ * @param {Uint8Array} input
+ * @param {number} width
+ * @param {number} height
+ * @param {number} channel_count
+ */
+export function flipArrayInPlace(input, width, height, channel_count = 4) {
+    const rowLength = width * channel_count;
+    let t, x0, x1;
+    let i = 0;
+    const l = height >> 1;
+
+    for (; i < l; i++) {
+        //swap lines
+        const k = (height - i - 1) * rowLength;
+        const m = i * rowLength;
+        for (let j = 0; j < rowLength; j++) {
+            x0 = m + j;
+            x1 = k + j;
+            t = input[x0];
+            input[x0] = input[x1];
+            input[x1] = t;
+        }
+    }
+}

package/engine/graphics/filter/FlipArrayViaCanvas.js

@@ -0,0 +1,13 @@
+function flipArrayViaCanvas(input, width, height) {
+    const canvas = document.createElement("canvas");
+    const c = canvas.getContext('2d');
+    const imageData = c.createImageData(width, height);
+    imageData.data.set(input);
+    c.putImageData(imageData, 0, 0);
+    c.translate(0, height);
+    c.scale(1, -1);
+    c.drawImage(canvas, 0, 0);
+    const imgd = c.getImageData(0, 0, width, height);
+
+    return imgd.data;
+}

package/engine/graphics/filter/ImageFilter.js

@@ -3,59 +3,25 @@
  */
 
 
-import {
-    LinearFilter,
-    Mesh,
-    OrthographicCamera,
-    PlaneBufferGeometry,
-    Scene,
-    ShaderMaterial,
-    WebGLRenderTarget
-} from 'three';
-
-export function flipArrayInPlace(input, width, height) {
-    const rowLength = width * 4;
-    let t, x0, x1;
-    let i = 0;
-    const l = height >> 1;
-    for (; i < l; i++) {
-        //swap lines
-        const k = (height - i - 1) * rowLength;
-        const m = i * rowLength;
-        for (let j = 0; j < rowLength; j++) {
-            x0 = m + j;
-            x1 = k + j;
-            t = input[x0];
-            input[x0] = input[x1];
-            input[x1] = t;
-        }
-    }
-}
-
-function flipArrayViaCanvas(input, width, height) {
-    const canvas = document.createElement("canvas");
-    const c = canvas.getContext('2d');
-    const imageData = c.createImageData(width, height);
-    imageData.data.set(input);
-    c.putImageData(imageData, 0, 0);
-    c.translate(0, height);
-    c.scale(1, -1);
-    c.drawImage(canvas, 0, 0);
-    const imgd = c.getImageData(0, 0, width, height);
-
-    return imgd.data;
-}
+import { LinearFilter, Mesh, OrthographicCamera, Scene, ShaderMaterial, WebGLRenderTarget } from 'three';
+import { FULL_SCREEN_TRIANGLE_GEOMETRY } from "../geometry/FULL_SCREEN_TRIANGLE_GEOMETRY.js";
 
 /**
  *
  * @param {WebGLRenderer} renderer
  * @param {number} width
  * @param {number} height
- * @param processShader
+ * @param {{vertexShader:string,fragmentShader:string, uniforms?:Object, defines?:Object}} processShader
  * @param {Uint8Array} [destination]
  * @return {{array: Uint8Array, renderer: WebGLRenderer}}
  */
-function processTexture(renderer, width, height, processShader, destination) {
+function processTexture(
+    renderer,
+    width,
+    height,
+    processShader,
+    destination
+) {
     if (destination === undefined) {
         destination = new Uint8Array(width * height * 4);
     }
@@ -72,9 +38,10 @@ function processTexture(renderer, width, height, processShader, destination) {
     material.lights = false;
     material.fog = false;
 
-    const quad = new Mesh(new PlaneBufferGeometry(2, 2), material);
+    const quad = new Mesh(FULL_SCREEN_TRIANGLE_GEOMETRY, material);
 
     scene.add(quad);
+
     //render
     const renderTargetOptions = {
         generateMipmaps: false,
@@ -82,28 +49,30 @@ function processTexture(renderer, width, height, processShader, destination) {
         stencilBuffer: false,
         depthBuffer: false
     };
+
     const renderTarget = new WebGLRenderTarget(width, height, renderTargetOptions);
 
+    const __rt = renderer.getRenderTarget(); // remember old renderer state
+
     renderer.setRenderTarget(renderTarget);
 
     renderer.render(scene, camera);
 
     const gl = renderer.getContext();
+
     //void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView? pixels)
     gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, destination);
 
-    renderer.setRenderTarget(null);
+    // restore renderer state
+    renderer.setRenderTarget(__rt);
 
-    //reorder lines in the buffer to make Y axis match
-
-    //uint8Array = flipArrayViaCanvas(uint8Array, width, height);
-    //
+    // cleanup resources
     renderTarget.dispose();
     material.dispose();
+
     return {
         array: destination,
         graphics: renderer
-        //renderTarget: renderTarget
     };
 }
 

package/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -8,6 +8,7 @@ import {
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
 import { composeCompile } from "../../material/composeCompile.js";
+import { typed_array_copy } from "../../../../core/collection/array/typed/typed_array_copy.js";
 
 /**
  *
@@ -29,14 +30,14 @@ function InstancedMeshGroup() {
      * Minimum spare capacity increase during growing
      * @type {number}
      */
-    this.growConstant = 1;
+    this.growConstant = 4;
 
-    this.shrinkFactor = 0.8;
+    this.shrinkFactor = 0.5;
     /**
      * Minimum capacity reduction for shrinkage to occur
      * @type {number}
      */
-    this.shrinkConstant = 32;
+    this.shrinkConstant = 64;
 
     /**
      *
@@ -217,14 +218,30 @@ InstancedMeshGroup.prototype.setCapacity = function (size) {
  * @param {number} size
  */
 InstancedMeshGroup.prototype.ensureCapacity = function (size) {
+
     const currentCapacity = this.capacity;
+
     if (currentCapacity < size) {
-        const newCapacityRaw = Math.max(size, currentCapacity * this.growFactor, currentCapacity + this.growConstant);
+        // grow
+
+        const newCapacityRaw = Math.max(
+            size,
+            currentCapacity * this.growFactor,
+            currentCapacity + this.growConstant
+        );
+
         const newCapacityInteger = Math.ceil(newCapacityRaw);
+
         this.setCapacity(newCapacityInteger);
-    } else if (currentCapacity * this.shrinkFactor > size && currentCapacity - this.shrinkConstant > size) {
+
+    } else if (
+        currentCapacity * this.shrinkFactor > size
+        && currentCapacity - this.shrinkConstant > size
+    ) {
+        // shrink
         this.setCapacity(size);
     }
+
 };
 
 /**
@@ -375,14 +392,6 @@ InstancedMeshGroup.prototype.remove = function (reference) {
     this.setCount(this.count - 1);
 };
 
-/**
- * @param {Uint8Array|Uint16Array|Uint32Array|Int8Array|Int16Array|Int32Array|Float32Array|Float64Array} source
- * @param {Uint8Array|Uint16Array|Uint32Array|Int8Array|Int16Array|Int32Array|Float32Array|Float64Array}target
- */
-function copyArray(source, target) {
-    target.set(source.subarray(0, Math.min(target.length, source.length)), 0)
-}
-
 InstancedMeshGroup.prototype.build = function () {
     if (this.__threeGeometry !== null) {
         // dispose old geometry's GPU memory
@@ -415,16 +424,16 @@ InstancedMeshGroup.prototype.build = function () {
     if (this.__attributePosition !== null) {
         //copy old data
         const oldPositionArray = this.__attributePosition.array;
-        copyArray(oldPositionArray, newPositionArray);
+        typed_array_copy(oldPositionArray, newPositionArray);
     }
     if (this.__attributeRotation !== null) {
         //copy old data
         const oldRotationArray = this.__attributeRotation.array;
-        copyArray(oldRotationArray, newRotationArray);
+        typed_array_copy(oldRotationArray, newRotationArray);
     }
     if (this.__attributeScale !== null) {
         const oldScaleArray = this.__attributeScale.array;
-        copyArray(oldScaleArray, newScaleArray);
+        typed_array_copy(oldScaleArray, newScaleArray);
 
         if (newScaleArray.length > oldScaleArray.length) {
             //fill the rest of the array with scale factor of 1 as a default

package/engine/graphics/material/SplatMaterial.js

@@ -4,7 +4,7 @@
 import {
     ClampToEdgeWrapping,
     Color,
-    DoubleSide,
+    FrontSide,
     GLSL3,
     LinearFilter,
     NormalBlending,
@@ -15,95 +15,10 @@ import {
     Vector4 as ThreeVector4
 } from 'three';
 import TerrainShader from "../shaders/TerrainShader.js";
-import Vector4 from "../../../core/geom/Vector4.js";
 import { Sampler2D } from "../texture/sampler/Sampler2D.js";
 import sampler2D2Texture from "../texture/sampler/Sampler2D2Texture.js";
 
-/**
- *
- * @param {Vector4} tex0
- * @param {Vector4} tex1
- * @param {Vector4} tex2
- * @param {Vector4} tex3
- * @param {Vector4} splat
- * @param {Vector4} result
- */
-export function blendSplatTextures(tex0, tex1, tex2, tex3, splat, result) {
-    const b0 = splat.x;
-    const b1 = splat.y;
-    const b2 = splat.z;
-    const b3 = splat.w;
-
-    const bT = b0 + b1 + b2 + b3;
-
-
-    result.set(
-        (tex0.x * b0 + tex1.x * b1 + tex2.x * b2 + tex3.x * b3) / bT,
-        (tex0.y * b0 + tex1.y * b1 + tex2.y * b2 + tex3.y * b3) / bT,
-        (tex0.z * b0 + tex1.z * b1 + tex2.z * b2 + tex3.z * b3) / bT,
-        (tex0.w * b0 + tex1.w * b1 + tex2.w * b2 + tex3.w * b3) / bT
-    );
-}
-
-/**
- *
- * @param {Sampler2D[]} diffuse
- * @param {Vector2} diffuseRepeat
- * @param {Sampler2D} splat
- * @param {Vector2} gridSize
- * @param {Vector2} resultTextureSize
- * @returns {Sampler2D}
- */
-export function buildTerrainTexture({ diffuse, diffuseRepeat, splat, gridSize, resultTextureSize }) {
-    const texture0 = diffuse[0];
-    const texture1 = diffuse[1];
-    const texture2 = diffuse[2];
-    const texture3 = diffuse[3];
-
-    const resultData = new Uint8Array(resultTextureSize.x * resultTextureSize.y * 4);
-
-    const result = new Sampler2D(resultData, 4, resultTextureSize.x, resultTextureSize.y);
-
-    //do the splatting
-    let x, y, u, v;
-
-    const tex0 = new Vector4(0, 0, 0, 0);
-    const tex1 = new Vector4(0, 0, 0, 0);
-    const tex2 = new Vector4(0, 0, 0, 0);
-    const tex3 = new Vector4(0, 0, 0, 0);
-
-    const vSplat = new Vector4(0, 0, 0, 0);
-
-    const vTemp = new Vector4(0, 0, 0, 0);
-
-    for (x = 0; x < resultTextureSize.x; x++) {
-
-        u = x / (resultTextureSize.x - 1);
-
-        for (y = 0; y < resultTextureSize.y; y++) {
-
-            v = y / (resultTextureSize.y - 1);
-
-            const dU = (u * diffuseRepeat.x) % 1;
-            const dV = (v * diffuseRepeat.y) % 1;
-
-            texture0.sample(dU, dV, tex0);
-            texture1.sample(dU, dV, tex1);
-            texture2.sample(dU, dV, tex2);
-            texture3.sample(dU, dV, tex3);
-
-            splat.sample(u, v, vSplat);
-
-            blendSplatTextures(tex0, tex1, tex2, tex3, vSplat, vTemp);
-
-            result.set(x, y, [vTemp.x, vTemp.y, vTemp.z, 255]);
-        }
-    }
-
-    return result;
-}
-
-function whitePixelTexture() {
+export function whitePixelTexture() {
     const sampler = Sampler2D.uint8(4, 1, 1);
 
     for (let i = 0; i < sampler.data.length; i++) {
@@ -205,17 +120,12 @@ export function SplatMaterial(
         uniforms.gridResolution.value.set(gridResolution.x, gridResolution.y);
     }
 
-
-    //this is for the water shader, so that back of the terrain reflects in the water, otherwise edges of shoreline look odd
-    //TODO check how this can be removed, it would speed water(and ordinary) rendering if back faces could be culled
-    const side = DoubleSide;
-
     const sm = new ShaderMaterial({
 
         uniforms: uniforms,
         vertexShader: TerrainShader.vertexShader,
         fragmentShader: TerrainShader.fragmentShader,
-        side: side,
+        side: FrontSide,
         blending: NormalBlending,
         depthTest: true,
         depthWrite: true,
@@ -249,11 +159,8 @@ export function SplatMaterial(
         sm.aoMap = true;
         uniforms.aoMap.value = lightMap;
         uniforms.aoMapIntensity.value = 0.7;
-        //
-        // sm.lightMap = true;
-        // uniforms.lightMap.value = options.lightMap;
-        // uniforms.lightMapIntensity.value = 1;
     }
+
     sm.extensions.derivatives = true; //needed for rendering grid
     sm.needsUpdate = true;
 

package/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -4,7 +4,6 @@ import { MicronGeometry } from "../format/MicronGeometry.js";
 import { buildAbstractPatchHierarchy } from "./hierarchy/buildAbstractPatchHierarchy.js";
 import { MicronGeometryBufferAttributeSpec } from "../format/MicronGeometryBufferAttributeSpec.js";
 import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
-import { RowFirstTableSpec } from "../../../../core/collection/table/RowFirstTableSpec.js";
 import { DataType } from "../../../../core/collection/table/DataType.js";
 import { MicronGeometryPatch } from "../format/MicronGeometryPatch.js";
 import { build_clustering_info } from "./debug/build_clustering_info.js";
@@ -12,7 +11,7 @@ import { build_graph_info } from "./debug/build_graph_info.js";
 import { expandConnectivityByLocality } from "../../../../core/geom/3d/topology/expandConnectivityByLocality.js";
 import { build_geometry_info } from "./build_geometry_info.js";
 import { build_leaf_patches_metis } from "./clustering/build_leaf_patches_metis.js";
-import { compute_buffer_geometry_byte_size } from "./compute_buffer_geometry_byte_size.js";
+import { compute_buffer_geometry_byte_size } from "../../geometry/buffered/compute_buffer_geometry_byte_size.js";
 
 
 /**
@@ -202,11 +201,8 @@ export async function buildMicronGeometryFromBufferGeometry(input) {
     // console.time('build geometry');
 
     const vertex_attributes = attributes_from_buffer_geometry(input);
-    const data_types = buildVertexDataTypeMap(vertex_attributes);
-    const vertex_data_spec = RowFirstTableSpec.get(data_types);
 
-    r.vertex_spec.data = vertex_data_spec;
-    r.vertex_spec.attributes = vertex_attributes;
+    r.vertex_spec.setAttributes(vertex_attributes);
     r.root = compilePatchGraph(root, input, r.vertex_spec);
 
     r.initialize();

package/engine/graphics/micron/build/clustering/build_clustering_2.js

@@ -1,6 +1,6 @@
 import FastBinaryHeap from "../../../../navigation/grid/FastBinaryHeap.js";
-import { mn_graph_collapse_weighted_edge } from "../graph/mn_graph_collapse_weighted_edge.js";
-import { build_face_graph_from_mesh } from "../graph/build_face_graph_from_mesh.js";
+import { mn_graph_collapse_weighted_edge } from "../../../../../core/graph/mn_graph_collapse_weighted_edge.js";
+import { build_face_graph_from_mesh } from "../../../../../core/graph/build_face_graph_from_mesh.js";
 
 /**
  *

package/engine/graphics/micron/build/clustering/build_leaf_patches_metis.js

@@ -1,4 +1,4 @@
-import { cluster_mesh_metis } from "./cluster_mesh_metis.js";
+import { cluster_mesh_metis } from "../../../../../core/graph/cluster_mesh_metis.js";
 import { MICRON_PATCH_SIZE_MAX } from "../MICRON_PATCH_SIZE_MAX.js";
 import { PatchRepresentation } from "../PatchRepresentation.js";
 import { TopoMesh } from "../../../../../core/geom/3d/topology/TopoMesh.js";

package/engine/graphics/micron/build/fill_patch_geometry_data.js

@@ -198,6 +198,8 @@ export function fill_patch_geometry_data(result, buffer_geometry, topo, vertex_d
     const micron_attributes = vertex_data_spec.attributes;
     const attribute_count = micron_attributes.length;
 
+    //TODO create a single ArrayBuffer for all attributes to get better cache coherence for rendering
+
     for (let i = 0; i < attribute_count; i++) {
         const attribute_spec = micron_attributes[i];
 

package/engine/graphics/micron/build/hierarchy/buildAbstractPatchHierarchy.js

@@ -1,11 +1,11 @@
 import { Graph } from "../../../../../core/graph/v2/Graph.js";
-import { MultiNode } from "../graph/MultiNode.js";
+import { MultiNode } from "../../../../../core/graph/MultiNode.js";
 import { merge_patches } from "./merge_patches.js";
-import { coarsen_graph } from "../graph/coarsen_graph.js";
+import { coarsen_graph } from "../../../../../core/graph/coarsen_graph.js";
 import { build_merge_graph } from "./build_merge_graph.js";
 import { assign_patch_neighbours_from_topology } from "../clustering/assign_patch_neighbours_from_topology.js";
 import { assert } from "../../../../../core/assert.js";
-import { graph_create_off_mesh_links } from "../graph/build_face_graph_from_mesh.js";
+import { graph_create_off_mesh_links } from "../../../../../core/graph/build_face_graph_from_mesh.js";
 import { build_vertex_quadratics } from "../../../../../core/geom/3d/topology/simplify/quadratic/build_vertex_quadratics.js";
 
 /**

package/engine/graphics/micron/build/hierarchy/build_intermediate_patch_topology.js

@@ -2,78 +2,6 @@ import { simplifyTopoMesh } from "../../../../../core/geom/3d/topology/simplify/
 import { MICRON_PATCH_SIZE_MAX } from "../MICRON_PATCH_SIZE_MAX.js";
 
 
-/**
- * @template T
- * @returns Set<T>
- * @param {Set<T>} a
- * @param {Set<T>} b
- */
-export function compute_set_intersection(a, b) {
-    const result = new Set();
-
-    const a_array = Array.from(a);
-
-    const n = a_array.length;
-    for (let i = 0; i < n; i++) {
-        const t = a_array[i];
-
-        if (b.has(t)) {
-            result.add(t);
-        }
-    }
-
-    return result;
-}
-
-/**
- * @template T
- * @returns Set<T>
- * @param {Set<T>} a
- * @param {Set<T>} b
- */
-export function compute_set_difference(a, b) {
-    const result = new Set();
-
-    const a_array = Array.from(a);
-    const a_count = a_array.length;
-    for (let i = 0; i < a_count; i++) {
-        const t = a_array[i];
-
-        if (!b.has(t)) {
-            result.add(t);
-        }
-    }
-
-    const b_array = Array.from(b);
-    const b_count = b_array.length;
-    for (let i = 0; i < b_count; i++) {
-        const t = b_array[i];
-
-        if (!a.has(t)) {
-            result.add(t);
-        }
-    }
-
-
-    return result;
-}
-
-/**
- * @template T
- * @param {Set<T>} a
- * @param {Set<T>} b
- */
-export function set_remove(a, b) {
-    const bs = Array.from(b);
-
-    const n = bs.length;
-    for (let i = 0; i < n; i++) {
-        const t = bs[i];
-
-        a.delete(t);
-    }
-}
-
 /**
  *
  * @param {Set<number>} result

package/engine/graphics/micron/build/hierarchy/build_merge_graph.js

@@ -1,7 +1,7 @@
 import { Graph } from "../../../../../core/graph/v2/Graph.js";
-import { MultiNode } from "../graph/MultiNode.js";
+import { MultiNode } from "../../../../../core/graph/MultiNode.js";
 import { computePatchMergeScore } from "./computePatchMergeScore.js";
-import { WeightedEdge } from "../graph/WeightedEdge.js";
+import { WeightedEdge } from "../../../../../core/graph/WeightedEdge.js";
 import { assert } from "../../../../../core/assert.js";
 
 /**

package/engine/graphics/micron/build/hierarchy/computePatchMergeScore.js

@@ -1,7 +1,7 @@
 import { ConicRay } from "../../../../../core/geom/ConicRay.js";
-import { compute_bounding_cone_of_2_cones } from "../bounds/compute_bounding_cone_of_2_cones.js";
+import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/compute_bounding_cone_of_2_cones.js";
 import { compute_patches_shared_vertex_count } from "./compute_patches_shared_vertex_count.js";
-import { compute_bounding_sphere_of_2_spheres } from "../bounds/compute_bounding_sphere_of_2_spheres.js";
+import { compute_bounding_sphere_of_2_spheres } from "../../../../../core/geom/3d/compute_bounding_sphere_of_2_spheres.js";
 import { max2 } from "../../../../../core/math/max2.js";
 import { min2 } from "../../../../../core/math/min2.js";
 
@@ -58,7 +58,7 @@ const pi_sqr = 9.86960440109;
 
 /**
  *
- * @param {number} r
+ * @param {number} r radius
  * @return {number}
  */
 function compute_sphere_volume(r) {

package/engine/graphics/micron/build/hierarchy/merge_patches.js

@@ -9,12 +9,15 @@ import { collapse_edges, extract_edge_cost } from "../../../../../core/geom/3d/t
 import { build_edge_collapse_candidates } from "../../../../../core/geom/3d/topology/simplify/build_edge_collapse_candidates.js";
 import { collapse_all_degenerate_edges } from "../../../../../core/geom/3d/topology/simplify/collapse_all_degenerate_edges.js";
 import { deep_copy_vertex_quadratics } from "../../../../../core/geom/3d/topology/simplify/quadratic/build_vertex_quadratics.js";
-import { SquareMatrix } from "../graph/SquareMatrix.js";
+import { SquareMatrix } from "../../../../../core/graph/SquareMatrix.js";
 import { DataType } from "../../../../../core/collection/table/DataType.js";
-import { matrix_eigenvalues_in_place } from "../graph/eigen/eigen.js";
+import { matrix_eigenvalues_in_place } from "../../../../../core/graph/eigen/eigen.js";
 import { min2 } from "../../../../../core/math/min2.js";
 import { PatchRepresentation } from "../PatchRepresentation.js";
-import { build_face_graph_from_mesh, graph_create_off_mesh_links } from "../graph/build_face_graph_from_mesh.js";
+import {
+    build_face_graph_from_mesh,
+    graph_create_off_mesh_links
+} from "../../../../../core/graph/build_face_graph_from_mesh.js";
 import { optimize_graph_partitioning_balance_detailed } from "./optimize_graph_partitioning_balance.js";
 import { patch_build_parent } from "./patch_combine.js";
 import { array_copy } from "../../../../../core/collection/array/copyArray.js";

package/engine/graphics/micron/build/hierarchy/metis_cluster_clusters.js

@@ -1,6 +1,6 @@
 //
 
-import { metis_cluster_bs } from "../clustering/cluster_mesh_metis.js";
+import { metis_cluster_bs } from "../../../../../core/graph/cluster_mesh_metis.js";
 
 /**
  *

package/engine/graphics/micron/build/hierarchy/optimize_graph_partitioning_balance.js

@@ -1,4 +1,4 @@
-import { graph_k_means_cluster_detailed } from "../graph/graph_k_means_cluster.js";
+import { graph_k_means_cluster_detailed } from "../../../../../core/graph/graph_k_means_cluster.js";
 import { array_remove_first } from "../../../../../core/collection/array/array_remove_first.js";
 
 /**

package/engine/graphics/micron/build/hierarchy/patch_combine.js

@@ -4,8 +4,8 @@ import { array_copy_unique } from "../../../../../core/collection/array/array_co
 import { array_remove_first } from "../../../../../core/collection/array/array_remove_first.js";
 import { max2 } from "../../../../../core/math/max2.js";
 import { array_push_if_unique } from "../../../../../core/collection/array/array_push_if_unique.js";
-import { compute_bounding_sphere_of_2_spheres } from "../bounds/compute_bounding_sphere_of_2_spheres.js";
-import { compute_bounding_cone_of_2_cones } from "../bounds/compute_bounding_cone_of_2_cones.js";
+import { compute_bounding_sphere_of_2_spheres } from "../../../../../core/geom/3d/compute_bounding_sphere_of_2_spheres.js";
+import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/compute_bounding_cone_of_2_cones.js";
 import { ConicRay } from "../../../../../core/geom/ConicRay.js";
 import { passThrough } from "../../../../../core/function/Functions.js";
 

package/engine/graphics/micron/build/hierarchy/qvdr_build_simplified_clusters.js

@@ -1,13 +1,14 @@
 import { array_push_if_unique } from "../../../../../core/collection/array/array_push_if_unique.js";
 import FastBinaryHeap from "../../../../navigation/grid/FastBinaryHeap.js";
 import { build_vertex_quadratics } from "../../../../../core/geom/3d/topology/simplify/quadratic/build_vertex_quadratics.js";
-import { compute_set_intersection, compute_set_of_border_vertex_indices } from "./build_intermediate_patch_topology.js";
+import { compute_set_of_border_vertex_indices } from "./build_intermediate_patch_topology.js";
 import { compute_patches_shared_vertices } from "./compute_patches_shared_vertices.js";
 import { max2 } from "../../../../../core/math/max2.js";
 import { MICRON_PATCH_SIZE_MAX } from "../MICRON_PATCH_SIZE_MAX.js";
 import { collapse_edges, extract_edge_cost } from "../../../../../core/geom/3d/topology/simplify/simplifyTopoMesh.js";
 import { build_edge_collapse_candidates } from "../../../../../core/geom/3d/topology/simplify/build_edge_collapse_candidates.js";
 import { collapse_all_degenerate_edges } from "../../../../../core/geom/3d/topology/simplify/collapse_all_degenerate_edges.js";
+import { compute_set_intersection } from "../../../../../core/collection/set/compute_set_intersection.js";
 
 /**
  * Cluster must share at least this many vertices for the vertex boundary constraint to be relaxed and allow them to be made dependent on each other

package/engine/graphics/micron/format/MicronGeometry.js

@@ -55,6 +55,18 @@ export class MicronGeometry {
         this.__proxy = null;
     }
 
+    get patches() {
+        return this.__patches;
+    }
+
+    /**
+     *
+     * @param {MicronGeometryPatch[]} v
+     */
+    set patches(v) {
+        this.__patches = v;
+    }
+
     /**
      * @param {THREE.BufferGeometry} geometry
      */