@woosh/meep-engine 2.33.2 → 2.33.6

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

@@ -1,13 +1,9 @@
-import { BitSet } from "../../../../core/binary/BitSet.js";
 import { TopoMesh } from "../../../../core/geom/3d/topology/TopoMesh.js";
 import { PatchRepresentation } from "./PatchRepresentation.js";
-import { max3 } from "../../../../core/math/max3.js";
-import { min3 } from "../../../../core/math/min3.js";
 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";
@@ -15,6 +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";
 
 
 /**
@@ -38,55 +35,6 @@ function buildVertexDataTypeMap(attributes) {
     return data_types;
 }
 
-
-/**
- *
- * @param {FastBinaryHeap} candidates
- * @param {BitSet} open_set
- * @param {TopoMesh} mesh
- */
-function pickCandidateForNextPatch(candidates, open_set, mesh) {
-
-}
-
-/**
- *
- * @param {AABB3} bounds
- * @param {TopoTriangle} face
- */
-function expandBoundsByFace(bounds, face) {
-    const vertices = face.vertices;
-
-    const vA = vertices[0];
-    const vB = vertices[1];
-    const vC = vertices[2];
-
-    bounds._expandToFitPoint(vA.x, vA.y, vA.z);
-    bounds._expandToFitPoint(vB.x, vB.y, vB.z);
-    bounds._expandToFitPoint(vC.x, vC.y, vC.z);
-}
-
-/**
- *
- * @param {AABB3} bounds
- * @param {TopoVertex} vA
- * @param {TopoVertex} vB
- * @param {TopoVertex} vC
- * @returns {number}
- */
-function computeBoundsTriangleInclusionCost(bounds, vA, vB, vC) {
-    // compute AABB of triangle
-    const x0 = min3(vA.x, vB.x, vC.x);
-    const y0 = min3(vA.y, vB.y, vC.y);
-    const z0 = min3(vA.z, vB.z, vC.z);
-
-    const x1 = max3(vA.x, vB.x, vC.x);
-    const y1 = max3(vA.y, vB.y, vC.y);
-    const z1 = max3(vA.z, vB.z, vC.z);
-
-    return bounds._costForInclusion(x0, y0, z0, x1, y1, z1);
-}
-
 /**
  *
  * @param {MicronGeometryBufferAttributeSpec} spec
@@ -120,6 +68,7 @@ function format_attribute(spec, source, name) {
 
     switch (name) {
         case 'uv':
+        case 'uv2':
             custom_attribute_format_uv(spec, source);
             break;
         case 'tangent':
@@ -157,23 +106,6 @@ function attributes_from_buffer_geometry(buffer_geometry) {
     return result;
 }
 
-/**
- *
- * @param {THREE.BufferGeometry} g
- * @returns {number}
- */
-export function compute_buffer_geometry_byte_size(g) {
-    let result = 0;
-
-    result += g.getIndex().array.buffer.byteLength;
-
-    for (const attribute_name in g.attributes) {
-        result += g.attributes[attribute_name].array.buffer.byteLength;
-    }
-
-    return result;
-}
-
 const PRINT_VERBOSE_STATS = false;
 
 /**
@@ -261,7 +193,7 @@ export async function buildMicronGeometryFromBufferGeometry(input) {
     const r = new MicronGeometry();
 
     r.proxy = input; // TODO use r.buildProxy(1) instead
-    
+
     r.source_triangle_count = index_attribute.count / 3;
     r.source_vertex_count = input.getAttribute('position').count;
     r.source_byte_size = compute_buffer_geometry_byte_size(input);
@@ -269,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/compute_buffer_geometry_byte_size.js

@@ -0,0 +1,16 @@
+/**
+ * Estimated GPU-side geometry size
+ * @param {THREE.BufferGeometry} g
+ * @returns {number}
+ */
+export function compute_buffer_geometry_byte_size(g) {
+    let result = 0;
+
+    result += g.getIndex().array.buffer.byteLength;
+
+    for (const attribute_name in g.attributes) {
+        result += g.attributes[attribute_name].array.buffer.byteLength;
+    }
+
+    return result;
+}

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/format/MicronGeometryBufferAttributeSpec.js

@@ -40,8 +40,8 @@ export class MicronGeometryBufferAttributeSpec {
     equals(other) {
         return this.type === other.type
             && this.itemSize === other.itemSize
-            && this.name === other.name
             && this.normalized === other.normalized
+            && this.name === other.name
             ;
     }
 

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

@@ -1,4 +1,3 @@
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
 import { squirrel3 } from "../../../../core/math/hash/squirrel3.js";
 import { ConicRay } from "../../../../core/geom/ConicRay.js";
 import { vec4 } from "gl-matrix";
@@ -14,17 +13,30 @@ export class MicronGeometryPatch {
          */
         this.id = 0;
 
+        /**
+         * Continuous memory region for various pieces of data to get better memory access patterns
+         * All pieces of data end up in a continuous piece of memory, resulting in better cache coherence
+         * @type {ArrayBuffer}
+         */
+        const array_buffer = new ArrayBuffer((6 + 6 + 24) * 4);
+
         /**
          * Bounds are used to determine screen error and whether a patch should be subdivided or not for rendering
-         * @type {AABB3}
+         * @type {number[]}
+         */
+        this.bounding_box = new Float32Array(array_buffer, 0, 6);
+
+        /**
+         *
+         * @type {number[]|Float32Array}
          */
-        this.bounding_box = new AABB3(0, 0, 0, 0, 0, 0);
+        this.group_bounding_box = new Float32Array(array_buffer, 6 * 4, 6);
 
         /**
          *
-         * @type {AABB3}
+         * @type {number[]|Float32Array}
          */
-        this.group_bounding_box = new AABB3(0, 0, 0, 0, 0, 0);
+        this.group_bounding_box_corners = new Float32Array(array_buffer, 12 * 4, 24);
 
         /**
          *

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

@@ -2,6 +2,8 @@ import { isArrayEqual } from "../../../../core/collection/ArrayUtils.js";
 import { computeHashArray } from "../../../../core/math/MathUtils.js";
 import { invokeObjectHash } from "../../../../core/model/object/invokeObjectHash.js";
 
+const DEFAULT_HASH = 123456;
+
 export class MicronVertexDataSpec {
     constructor() {
         /**
@@ -12,9 +14,21 @@ export class MicronVertexDataSpec {
 
         /**
          *
-         * @type {RowFirstTableSpec|null}
+         * @type {number}
+         * @private
          */
-        this.data = null;
+        this.__hash = DEFAULT_HASH;
+    }
+
+    /**
+     *
+     * @param {MicronGeometryBufferAttributeSpec[]} attributes
+     */
+    setAttributes(attributes) {
+        this.attributes = attributes;
+
+        // reset hash to trigger hash update
+        this.__hash = DEFAULT_HASH;
     }
 
     /**
@@ -30,10 +44,18 @@ export class MicronVertexDataSpec {
         return isArrayEqual(this.attributes, other.attributes);
     }
 
-    hash() {
+    computeHash() {
         return computeHashArray(this.attributes, invokeObjectHash);
     }
 
+    hash() {
+        if (this.__hash === DEFAULT_HASH) {
+            this.__hash = this.computeHash();
+        }
+
+        return this.__hash;
+    }
+
     /**
      *
      * @param {string} name

package/engine/graphics/micron/prototypeVirtualGeometry.js

@@ -53,7 +53,7 @@ background.wrapS = RepeatWrapping;
 background.wrapT = RepeatWrapping;
 
 const metrics = new MetricCollection();
-const METRIC_BUFFER_SIZE = 100;
+const METRIC_BUFFER_SIZE = 1000;
 metrics.create({
     name: 'vg_build', buffer_size: METRIC_BUFFER_SIZE
 });
@@ -153,17 +153,21 @@ async function micron_add_object(object) {
         if (t.isMesh && material !== null) {
 
             const attachments = TextureAttachmentsByMaterialType[material.type];
-            const n = attachments.length;
 
-            for (let i = 0; i < n; i++) {
-                const a = attachments[i];
-                const texture = a.read(material);
+            if (attachments !== undefined) {
 
-                if (texture !== undefined && texture !== null) {
-                    texture.anisotropy = 8;
+                const n = attachments.length;
+
+                for (let i = 0; i < n; i++) {
+                    const a = attachments[i];
+                    const texture = a.read(material);
+
+                    if (texture !== undefined && texture !== null) {
+                        texture.anisotropy = 8;
+                    }
                 }
-            }
 
+            }
 
         }
     });
@@ -228,7 +232,7 @@ function init() {
     pointLight.add(mesh);
 
     // add directional light
-    directionalLight = new DirectionalLight(0xFFAAAA, 0.7);
+    directionalLight = new DirectionalLight(0xFFAAAA, 0.8);
     directionalLight.position.set(-500, 1000, 300);
     directionalLight.castShadow = true;
     const shadow_camera = directionalLight.shadow.camera;
@@ -452,12 +456,15 @@ function init() {
 
     // sample_gltf_sponza();
     // sample_gltf_rts_factory();
-    // sample_lucy();
+    sample_lucy();
     // sample_gltf_hapro_2();
     // sample_gltf_hapro_1();
     // sample_gltf_broken_isiflow();
-    gltf_grid('data/models/moicon/Kople/EVCharger1.gltf');
+    // gltf_grid('data/models/moicon/Kople/EVCharger1.gltf');
     // gltf_grid('data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf');
+    // gltf_sample('data/models/moicon/08-clickable-assets/model.gltf');
+    // gltf_sample('data/models/moicon/05-ground-floor/model.gltf');
+    // gltf_sample('data/models/moicon/isiflow_Oct_15_21/0/model.gltf');
 
     document.addEventListener("mousemove", onDocumentMouseMove);
 
@@ -528,7 +535,7 @@ function createScene(geometry, m1, scale) {
     geometry.computeVertexNormals();
 
 
-    const grid_size = 10;
+    const grid_size = 100;
     const grid_spacing = 2000;
 
     for (let i = 0; i < grid_size; i++) {

package/engine/graphics/micron/render/VirtualGeometryBuilder.js

@@ -2,19 +2,33 @@ import { Frustum, Matrix4 } from "three";
 import { array_copy } from "../../../../core/collection/array/copyArray.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import { MicronGeometryPatchOccurrence } from "../format/MicronGeometryPatchOccurance.js";
-import { RefinementSpec } from "./RefinementSpec.js";
+import { RefinementSpec } from "./refinement/RefinementSpec.js";
 import { ActivePatchList } from "./refinement/ActivePatchList.js";
 import { ActivePatchFlags } from "./refinement/ActivePatchFlags.js";
 
-
+/**
+ * @readonly
+ * @type {RefinementSpec}
+ */
 const refinement_spec = new RefinementSpec();
 
 export class VirtualGeometryBuilder {
     constructor() {
         this.view_projection_matrix = new Matrix4();
-        this.matrix_projection = new Matrix4();
+
+        /**
+         *
+         * @type {Float32Array|number[]|mat4}
+         */
+        this.matrix_projection = new Float32Array(16);
+
         this.matrix_projection_inverse = new Matrix4();
-        this.matrix_world_inverse = new Matrix4();
+
+        /**
+         *
+         * @type {Float32Array|number[]|mat4}
+         */
+        this.matrix_world_inverse = new Float32Array(16);
 
         /**
          *
@@ -48,10 +62,10 @@ export class VirtualGeometryBuilder {
 
         /**
          *
-         * @type {WeakMap<ThreeMicronMesh, ActivePatchList>}
+         * @type {ActivePatchList}
          * @private
          */
-        this.__acls = new WeakMap();
+        this.__acl = new ActivePatchList();
 
         /**
          * How much error to accept when deciding to subdivide a cluster
@@ -76,12 +90,8 @@ export class VirtualGeometryBuilder {
         this.__flags__enforce_dependency_splits = true;
     }
 
-    /**
-     * Drop all cached data, forcing a complete rebuild next time
-     * Useful for testing and debugging
-     */
     dropCache() {
-        this.__acls = new WeakMap();
+        this.__acl.clear();
     }
 
     /**
@@ -102,8 +112,10 @@ export class VirtualGeometryBuilder {
         camera.updateMatrixWorld(true);
 
         this.view_projection_matrix.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
-        this.matrix_world_inverse.copy(camera.matrixWorldInverse);
-        this.matrix_projection.copy(camera.projectionMatrix);
+
+        this.matrix_world_inverse.set(camera.matrixWorldInverse.elements);
+        this.matrix_projection.set(camera.projectionMatrix.elements);
+
         this.matrix_projection_inverse.copy(camera.projectionMatrixInverse);
 
         this.view_frustum.setFromProjectionMatrix(this.view_projection_matrix);
@@ -129,8 +141,6 @@ export class VirtualGeometryBuilder {
             return;
         }
 
-        const children = object.children;
-
         if (object.isMicronMesh) {
             /**
              *
@@ -139,14 +149,7 @@ export class VirtualGeometryBuilder {
             const micron_geometry = object.geometry;
             if (micron_geometry !== undefined) {
                 // get acl
-
-                let acl = this.__acls.get(object);
-
-
-                if (acl === undefined) {
-                    acl = new ActivePatchList();
-                    this.__acls.set(object, acl);
-                }
+                const acl = this.__acl;
 
                 acl.initializeFromGeometry(micron_geometry);
 
@@ -159,7 +162,9 @@ export class VirtualGeometryBuilder {
             }
         }
 
+        const children = object.children;
         const children_count = children.length;
+
         for (let i = 0; i < children_count; i++) {
             const child = children[i];
 
@@ -181,7 +186,7 @@ export class VirtualGeometryBuilder {
         apl
     ) {
 
-        refinement_spec.build(transform, this.matrix_world_inverse, this.matrix_projection);
+        refinement_spec.build(transform.elements, this.matrix_world_inverse, this.matrix_projection);
 
         const output = this.output;
 
@@ -252,9 +257,10 @@ export class VirtualGeometryBuilder {
 
         // update refinement spec
         refinement_spec.error_threshold = this.error_bias;
-        refinement_spec.resolution.copy(this.resolution);
 
-        refinement_spec.viewport_area = this.resolution.x * this.resolution.y;
+        const resolution = this.resolution;
+
+        refinement_spec.setResolution(resolution.x, resolution.y);
 
         // clear output
         this.output.clear();
@@ -262,9 +268,10 @@ export class VirtualGeometryBuilder {
         this.__info_enforced_node_splits = 0;
 
         const n = this.input_scene_length;
+        const input_objects = this.input_scene;
 
         for (let i = 0; i < n; i++) {
-            const object3D = this.input_scene[i];
+            const object3D = input_objects[i];
 
             this.buildForObject(object3D);
         }

package/engine/graphics/micron/render/instanced/AttributeDataTexture.js

@@ -2,14 +2,12 @@ import { assert } from "../../../../../core/assert.js";
 import { MICRON_PATCH_SIZE_MAX } from "../../build/MICRON_PATCH_SIZE_MAX.js";
 import { typed_array_copy } from "../../../../../core/collection/array/typed/typed_array_copy.js";
 import { channelCountToThreeTextureFormat } from "../../../texture/channelCountToThreeTextureFormat.js";
-import {
-    computeThreeTextureInternalFormatFromDataType,
-    computeThreeTextureTypeFromDataType
-} from "../../../render/forward_plus/TextureBackedMemoryRegion.js";
 import { DataTexture, NearestFilter } from "three";
 import { DataTypeByteSizes } from "../../../../../core/collection/table/RowFirstTableSpec.js";
 import { DataType } from "../../../../../core/collection/table/DataType.js";
 import { compute_micron_buffer_array_constructor } from "../../build/compute_micron_buffer_array_constructor.js";
+import { computeThreeTextureTypeFromDataType } from "../../../render/forward_plus/data/computeThreeTextureTypeFromDataType.js";
+import { computeThreeTextureInternalFormatFromDataType } from "../../../render/forward_plus/data/computeThreeTextureInternalFormatFromDataType.js";
 
 /**
  *

package/engine/graphics/micron/render/instanced/PatchDataTextures.js

@@ -253,6 +253,7 @@ export class PatchDataTextures {
                 capacity + 1
             );
 
+            // Clamp to maximum texture size
             next_capacity = min2(next_capacity, MAX_TEXTURE_SIZE * this.__column_count);
 
             if (next_capacity < capacity) {

package/engine/graphics/micron/render/instanced/ThreeInstancedAdapter.js

@@ -8,7 +8,7 @@ import {
 } from "three";
 import { MICRON_PATCH_SIZE_MAX } from "../../build/MICRON_PATCH_SIZE_MAX.js";
 import Signal from "../../../../../core/events/signal/Signal.js";
-import { ATTRIBUTE_INSTANCE_ID, ATTRIBUTE_NAME_ADDRESS, ATTRIBUTE_NAME_TRANSFORM } from "./shader/constants.js";
+import { ATTRIBUTE_NAME_ADDRESS, ATTRIBUTE_NAME_TRANSFORM } from "./shader/constants.js";
 import { shader_rewrite_standard } from "./shader/shader_rewrite_standard.js";
 
 
@@ -98,20 +98,8 @@ export class ThreeInstancedAdapter {
         const ia_patch_ref = new InstancedBufferAttribute(new Uint16Array(capacity), 1, false);
         ia_patch_ref.setUsage(StreamDrawUsage);
 
-
-        /**
-         * This is a workaround for bug in WebGLBindingStates
-         * @see https://github.com/mrdoob/three.js/issues/22843
-         * @type {number}
-         */
-        ia_patch_ref.data = 0;
-
         geo.setAttribute(ATTRIBUTE_NAME_ADDRESS, ia_patch_ref);
 
-        const ia_instance_id = new InstancedBufferAttribute(new Uint16Array(capacity), 1, false);
-        ia_instance_id.setUsage(StreamDrawUsage);
-        geo.setAttribute(ATTRIBUTE_INSTANCE_ID, ia_instance_id);
-
         // signal
         this.onRebuild.send0();
     }
@@ -151,7 +139,6 @@ export class ThreeInstancedAdapter {
      */
     build(patches, patch_count) {
         this.__prepare_capacity(patch_count);
-        // this.__build_geometry();
 
         const geo = this.__buffer_geometry;
 
@@ -163,21 +150,8 @@ export class ThreeInstancedAdapter {
         const patch_address_attribute = geo.getAttribute(ATTRIBUTE_NAME_ADDRESS);
         const patch_address_array = patch_address_attribute.array;
 
-        /**
-         * This is a workaround for bug in WebGLBindingStates
-         * @see https://github.com/mrdoob/three.js/issues/22843
-         * @type {number}
-         */
-        patch_address_attribute.data++;
-
         patch_address_attribute.needsUpdate = true;
 
-
-        const patch_instance_id_attribute = geo.getAttribute(ATTRIBUTE_INSTANCE_ID);
-        const patch_instance_id_array = patch_instance_id_attribute.array;
-
-        patch_instance_id_attribute.needsUpdate = true;
-
         const patch_data = this.__patch_data;
 
         for (let i = 0; i < patch_count; i++) {
@@ -190,8 +164,6 @@ export class ThreeInstancedAdapter {
             const patch_slot_id = patch_data.ensure(occurrence.patch);
 
             patch_address_array[i] = patch_slot_id;
-
-            patch_instance_id_array[i] = occurrence.instance_id;
         }
     }
 }