@woosh/meep-engine 2.33.1 → 2.33.5

package/engine/graphics/micron/render/refinement/ActivePatchList.js

@@ -1,102 +1,8 @@
 import { ActivePatchRecord } from "./ActivePatchRecord.js";
 import { ActivePatchFlags } from "./ActivePatchFlags.js";
-import { PI_HALF } from "../../../../../core/math/MathUtils.js";
-import { v3_angleBetween } from "../../../../../core/geom/Vector3.js";
 import { aabb3_project_to_2d } from "../../../../../core/geom/3d/aabb/aabb3_compute_projected_area.js";
-import AABB2 from "../../../../../core/geom/AABB2.js";
-import { approximateTriangleArea } from "../approximateTriangleArea.js";
 import { BitSet } from "../../../../../core/binary/BitSet.js";
-
-const scratch_aabb2 = new AABB2();
-
-/**
- *
- * @param {RefinementSpec} refinement_spec
- * @param {MicronGeometryPatch} patch
- * @returns {boolean}
- */
-function is_patch_facing_back(refinement_spec, patch) {
-
-    const normal_cone = patch.normal_cone;
-    const normal_cone_angle = normal_cone.angle;
-
-    // Do normal cone check against view angle
-    if (normal_cone_angle < PI_HALF) {
-        // compute view direction
-        // TODO position might be way off from the surface center, as well as patch might curve a lot more than expected, need to account for that
-
-        const bounds_center_x = patch.bounding_sphere[0];
-        const bounds_center_y = patch.bounding_sphere[1];
-        const bounds_center_z = patch.bounding_sphere[2];
-
-        const view_direction_x = refinement_spec.view_position[0] - bounds_center_x;
-        const view_direction_y = refinement_spec.view_position[1] - bounds_center_y;
-        const view_direction_z = refinement_spec.view_position[2] - bounds_center_z;
-
-        // compute view angle of the bounding sphere
-        const normal_cone_direction = normal_cone.direction;
-
-        const angle = v3_angleBetween(
-            view_direction_x, view_direction_y, view_direction_z,
-            normal_cone_direction.x, normal_cone_direction.y, normal_cone_direction.z
-        );
-
-        if (angle > normal_cone_angle + PI_HALF) {
-            return false;
-        }
-
-    }
-
-    return true;
-}
-
-/**
- *
- * @param {RefinementSpec} refinement_spec
- * @param {MicronGeometryPatch} node
- * @returns {boolean}
- */
-function is_patch_visible(refinement_spec, node) {
-
-    // check if node is in view frustum
-    const bounding_box = node.bounding_box;
-    const in_view_frustum = bounding_box.intersectFrustum(refinement_spec.frustum);
-
-    if (!in_view_frustum) {
-        // outside of view frustum, cull
-        return false;
-    }
-
-
-    // compute projected bounds of the patch
-    aabb3_project_to_2d(scratch_aabb2, bounding_box, refinement_spec.projection_matrix);
-
-    // Cull by screen area
-    const normalized_screen_area = scratch_aabb2.computeArea();
-    const patch_screen_area = normalized_screen_area * refinement_spec.viewport_area;
-
-    if (patch_screen_area < refinement_spec.error_threshold) {
-        // the whole patch is too small, cull
-        return false;
-    }
-
-    return true;
-}
-
-/**
- *
- * @param {AABB3} bounding_box
- * @param {RefinementSpec} spec
- * @returns {number}
- */
-function compute_projected_area(bounding_box, spec) {
-    aabb3_project_to_2d(scratch_aabb2, bounding_box, spec.projection_matrix);
-
-    // Cull by screen area
-    const normalized_screen_area = scratch_aabb2.computeArea();
-    const patch_screen_area = normalized_screen_area * spec.viewport_area;
-    return patch_screen_area;
-}
+import { aabb3_intersects_frustum } from "../../../../../core/bvh2/aabb3/aabb3_intersects_frustum.js";
 
 export class ActivePatchList {
     constructor() {
@@ -117,6 +23,19 @@ export class ActivePatchList {
          * @type {BitSet}
          */
         this.unfolded = new BitSet();
+
+        // prevent re-allocation related thrashing
+        this.unfolded.preventShrink();
+    }
+
+    clear() {
+        const unfolded = this.unfolded;
+
+        unfolded.reset();
+
+        ActivePatchRecord.pool_release_all(this.records);
+
+        this.records = null;
     }
 
     /**
@@ -124,13 +43,16 @@ export class ActivePatchList {
      * @param {MicronGeometry} geometry
      */
     initializeFromGeometry(geometry) {
-        const record = ActivePatchRecord.fromPatch(geometry.root);
+        this.clear();
+
+        const record = ActivePatchRecord.pool_get();
 
+        record.patch = geometry.root;
         record.link_next = null;
         record.link_previous = null;
 
-        this.unfolded.reset();
-        this.unfolded.set(record.patch.id, true);
+        const unfolded = this.unfolded;
+        unfolded.set(record.patch.id, true);
 
         this.records = record;
     }
@@ -138,6 +60,7 @@ export class ActivePatchList {
     /**
      *
      * @param {ActivePatchRecord} record
+     * @returns {ActivePatchRecord}
      */
     node_split(record) {
 
@@ -150,19 +73,24 @@ export class ActivePatchList {
 
             const child_id = child.id;
 
-            if (unfolded.get(child_id)) {
+            if (unfolded.getAndSet(child_id)) {
                 // already unfolded, skip
                 continue;
             }
 
-            const child_record = ActivePatchRecord.fromPatch(child);
+            const child_record = ActivePatchRecord.pool_get();
+            child_record.patch = child;
 
             this.record_insert_after(record, child_record);
-
-            unfolded.set(child_id, true);
         }
 
         this.record_remove(record);
+
+        const next = record.link_next;
+
+        ActivePatchRecord.pool_release(record);
+
+        return next;
     }
 
     /**
@@ -226,36 +154,6 @@ export class ActivePatchList {
         this.record_remove(b);
     }
 
-    /**
-     *
-     * @param {ActivePatchRecord} record
-     * @param {RefinementSpec} spec
-     */
-    node_try_merge(record, spec) {
-        const next = record.link_next;
-        if (next === null) {
-            // no next record
-            return;
-        }
-
-        return;
-
-        const parent = record.patch.parent;
-
-        if (parent !== next.patch.parent) {
-            // not a sibling
-            return;
-        }
-
-        const patch_screen_area = compute_projected_area(parent.bounding_box, spec);
-
-        const approximate_triangle_area = patch_screen_area * approximateTriangleArea(parent);
-
-        if (approximate_triangle_area <= spec.error_threshold) {
-            this.node_merge(record, next);
-        }
-
-    }
 
     /**
      * Populate with LOD-X of a given geometry
@@ -286,7 +184,11 @@ export class ActivePatchList {
      */
     refine(spec) {
 
-        for (let record = this.records; record !== null; record = record.link_next) {
+        const frustum_planes = spec.frustum_f32;
+
+        let record = this.records
+
+        for (; record !== null;) {
 
             const node = record.patch;
 
@@ -298,13 +200,14 @@ export class ActivePatchList {
              NOTE: following suggestion in "FastMesh: Efficient View-dependent Meshing" by Renato Pajarola et al, we can do a more coarse frustum test approximating frustum as a cone initially
              */
             const bounding_box = node.bounding_box;
-            const in_view_frustum = bounding_box.intersectFrustum(spec.frustum);
+            const in_view_frustum = aabb3_intersects_frustum(bounding_box, frustum_planes);
 
             if (!in_view_frustum) {
                 // outside of view frustum, cull
                 if (prev_is_visible) {
                     record.clearFlag(ActivePatchFlags.Visible);
                 }
+                record = record.link_next;
                 continue;
             }
 
@@ -340,17 +243,17 @@ export class ActivePatchList {
                 // not the lowest level of LOD, see if subdivision might be necessary
 
                 // compute average triangle area
-                const group_screen_area = compute_projected_area(node.group_bounding_box, spec);
+                const group_screen_area = aabb3_project_to_2d(node.group_bounding_box_corners, spec.projection_matrix);
                 const screen_space_error = node.group_error * group_screen_area;
 
 
-                if (screen_space_error > spec.error_threshold) {
+                if (screen_space_error > spec.error_threshold_normalized) {
                     // error too large, needs to be split
-                    this.node_split(record);
+                    record = this.node_split(record);
                     continue;
                 }
             }
-
+            record = record.link_next;
 
             // check if record and its sibling can be merged
             // if (approximate_triangle_area < spec.error_threshold) {

package/engine/graphics/micron/render/refinement/ActivePatchRecord.js

@@ -60,8 +60,6 @@ export class ActivePatchRecord {
         patch_pool_size--;
 
         // reset record
-        r.link_next = null;
-
         r.flags = 0;
 
         return r;
@@ -91,6 +89,10 @@ export class ActivePatchRecord {
      * @param {ActivePatchRecord} r
      */
     static pool_release_all(r) {
+        if (r === null) {
+            return;
+        }
+
         let p = r;
 
         for (; patch_pool_size < patch_limit;) {

package/engine/graphics/micron/render/refinement/is_patch_facing_back.js

@@ -0,0 +1,43 @@
+import { PI_HALF } from "../../../../../core/math/MathUtils.js";
+import { v3_angleBetween } from "../../../../../core/geom/Vector3.js";
+
+/**
+ *
+ * @param {RefinementSpec} refinement_spec
+ * @param {MicronGeometryPatch} patch
+ * @returns {boolean}
+ */
+function is_patch_facing_back(refinement_spec, patch) {
+
+    const normal_cone = patch.normal_cone;
+    const normal_cone_angle = normal_cone.angle;
+
+    // Do normal cone check against view angle
+    if (normal_cone_angle < PI_HALF) {
+        // compute view direction
+        // TODO position might be way off from the surface center, as well as patch might curve a lot more than expected, need to account for that
+
+        const bounds_center_x = patch.bounding_sphere[0];
+        const bounds_center_y = patch.bounding_sphere[1];
+        const bounds_center_z = patch.bounding_sphere[2];
+
+        const view_direction_x = refinement_spec.view_position[0] - bounds_center_x;
+        const view_direction_y = refinement_spec.view_position[1] - bounds_center_y;
+        const view_direction_z = refinement_spec.view_position[2] - bounds_center_z;
+
+        // compute view angle of the bounding sphere
+        const normal_cone_direction = normal_cone.direction;
+
+        const angle = v3_angleBetween(
+            view_direction_x, view_direction_y, view_direction_z,
+            normal_cone_direction.x, normal_cone_direction.y, normal_cone_direction.z
+        );
+
+        if (angle > normal_cone_angle + PI_HALF) {
+            return false;
+        }
+
+    }
+
+    return true;
+}

package/engine/graphics/micron/render/refinement/is_patch_visible.js

@@ -0,0 +1,37 @@
+import AABB2 from "../../../../../core/geom/AABB2.js";
+import { aabb3_project_to_2d } from "../../../../../core/geom/3d/aabb/aabb3_compute_projected_area.js";
+
+const scratch_aabb2 = new AABB2();
+
+/**
+ *
+ * @param {RefinementSpec} refinement_spec
+ * @param {MicronGeometryPatch} node
+ * @returns {boolean}
+ */
+function is_patch_visible(refinement_spec, node) {
+
+    // check if node is in view frustum
+    const bounding_box = node.bounding_box;
+    const in_view_frustum = bounding_box.intersectFrustum(refinement_spec.frustum);
+
+    if (!in_view_frustum) {
+        // outside of view frustum, cull
+        return false;
+    }
+
+
+    // compute projected bounds of the patch
+    aabb3_project_to_2d(scratch_aabb2, bounding_box, refinement_spec.projection_matrix);
+
+    // Cull by screen area
+    const normalized_screen_area = scratch_aabb2.computeArea();
+    const patch_screen_area = normalized_screen_area * refinement_spec.viewport_area;
+
+    if (patch_screen_area < refinement_spec.error_threshold) {
+        // the whole patch is too small, cull
+        return false;
+    }
+
+    return true;
+}

package/engine/graphics/micron/util/unit_hemioct.spec.js

@@ -1,5 +1,5 @@
 import { decode_hemioct_to_unit, encode_unit_to_hemioct } from "./encode_unit3_hemioct.js";
-import { v3Length_i } from "../../../../core/geom/Vector3.js";
+import { v3_length } from "../../../../core/geom/Vector3.js";
 
 test('encode-decode', () => {
     const v0 = [];
@@ -7,7 +7,7 @@ test('encode-decode', () => {
 
     function validate(x, y, z) {
         // normalize input
-        const l = 1 / v3Length_i(x, y, z);
+        const l = 1 / v3_length(x, y, z);
 
         const _x = x * l;
         const _y = y * l;

package/engine/graphics/render/buffer/buffers/NormalFrameBuffer.js

@@ -52,11 +52,15 @@ export class NormalFrameBuffer extends FrameBuffer {
         this.__material_skinned.side = DoubleSide;
 
 
+        const scene = new Scene();
         /**
          * @type {Scene}
          * @private
          */
-        this.__scene = new Scene();
+        this.__scene = scene;
+        scene.autoUpdate = false;
+        scene.matrixAutoUpdate = false;
+        scene.matrixWorldNeedsUpdate = false;
     }
 
 
@@ -90,7 +94,13 @@ export class NormalFrameBuffer extends FrameBuffer {
 
             if (source_material !== undefined) {
                 // assign normal map and color map
-                target_material.map = source_material.map;
+
+                if (source_material.alphaTest > 0) {
+                    target_material.map = source_material.map;
+                } else {
+                    target_material.map = null;
+                }
+
                 target_material.normalMap = source_material.normalMap;
             }
         }

package/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -50,8 +50,6 @@ import { enableEditor } from "../../../../../editor/enableEditor.js";
 import EntityBuilder from "../../../../ecs/EntityBuilder.js";
 import { Transform } from "../../../../ecs/transform/Transform.js";
 import Mesh from "../../../ecs/mesh/Mesh.js";
-import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
-import GUIElement from "../../../../ecs/gui/GUIElement.js";
 import { CopyShader } from "three/examples/jsm/shaders/CopyShader.js";
 import {
     DoubleSide,
@@ -64,11 +62,11 @@ import {
     UniformsUtils,
     WebGLRenderTarget
 } from "three";
-import { buildCubeURLs } from "../../../GraphicsEngine.js";
 import { AmbientOcclusionPostProcessEffect } from "../simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
 import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 import { StandardFrameBuffers } from "../../../StandardFrameBuffers.js";
+import { buildCubeURLs } from "../../../texture/cubemap/buildCubeURLs.js";
 
 const engineHarness = new EngineHarness();
 
@@ -386,13 +384,13 @@ function main(engine) {
     //     .build(ecd);
 
     // const canvasView = makeCameraClippingDebug(engine);
-
-    new EntityBuilder()
-        .add(ViewportPosition.fromJSON({
-            offset: new Vector2(10, 10)
-        }))
-        .add(GUIElement.fromView(canvasView))
-        .build(ecd);
+    //
+    // new EntityBuilder()
+    //     .add(ViewportPosition.fromJSON({
+    //         offset: new Vector2(10, 10)
+    //     }))
+    //     .add(GUIElement.fromView(canvasView))
+    //     .build(ecd);
 
 
 }

package/engine/graphics/render/forward_plus/LightManager.js

@@ -11,15 +11,13 @@ import { compute_light_data_hash_0 } from "./cluster/compute_light_data_hash_0.j
 import { read_plane_pair } from "./cluster/read_plane_pair.js";
 import { read_frustum_planes_to_array } from "./cluster/read_frustum_planes_to_array.js";
 import { compute_cluster_planes_from_points } from "./cluster/compute_cluster_planes_from_points.js";
-import {
-    computeDataType,
-    computeThreeTextureInternalFormatFromDataType,
-    computeThreeTextureTypeFromDataType,
-    NumericType,
-    TextureBackedMemoryRegion
-} from "./TextureBackedMemoryRegion.js";
+import { TextureBackedMemoryRegion } from "./data/TextureBackedMemoryRegion.js";
 import { assert } from "../../../../core/assert.js";
 import { DataType2TypedArrayConstructorMapping } from "../../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
+import { NumericType } from "./data/NumericType.js";
+import { computeDataType } from "./data/computeDataType.js";
+import { computeThreeTextureTypeFromDataType } from "./data/computeThreeTextureTypeFromDataType.js";
+import { computeThreeTextureInternalFormatFromDataType } from "./data/computeThreeTextureInternalFormatFromDataType.js";
 
 const LOOKUP_CACHE_SIZE = 16384; // must be power of two
 /**

package/engine/graphics/render/forward_plus/data/NumericType.js

@@ -0,0 +1,9 @@
+/**
+ *
+ * @enum {number}
+ */
+export const NumericType = {
+    Uint: 0,
+    Int: 1,
+    Float: 2
+};