@woosh/meep-engine 2.34.43 → 2.34.47

package/engine/graphics/micron/plugin/MicronRenderPlugin.js

@@ -2,8 +2,6 @@ import { EnginePlugin } from "../../../plugin/EnginePlugin.js";
 import { VGThreeRenderer } from "../render/v1/VGThreeRenderer.js";
 import { RenderLayer } from "../../render/layers/RenderLayer.js";
 import { RenderPassType } from "../../render/RenderPassType.js";
-import { AssetTransformer } from "../../../asset/AssetTransformer.js";
-import { convert_three_object_to_micron } from "../convert_three_object_to_micron.js";
 import { Cache } from "../../../../core/cache/Cache.js";
 import { computeGeometryHash } from "../../../asset/loaders/geometry/geometry/computeGeometryHash.js";
 import { computeGeometryEquality } from "../../../asset/loaders/geometry/geometry/computeGeometryEquality.js";
@@ -12,13 +10,9 @@ import { AsyncRemoteHashMap } from "../../../../core/collection/map/AsyncRemoteH
 import { BufferGeometrySerializationAdapter } from "./serialization/BufferGeometrySerializationAdapter.js";
 import { MicronGeometryBinarySerializationAdapter } from "../format/serialization/MicronGeometryBinarySerializationAdapter.js";
 import { AsyncMapWrapper } from "../../../../core/collection/map/AsyncMapWrapper.js";
-import { async_traverse_three_object } from "../../../asset/loaders/async_traverse_three_object.js";
-import { computePathDirectory } from "../../../../core/FilePath.js";
-import { BinaryBuffer } from "../../../../core/binary/BinaryBuffer.js";
 import { MicronGeometry } from "../format/MicronGeometry.js";
 import { ArrayBufferLoader } from "../../../asset/loaders/ArrayBufferLoader.js";
-import { MICRON_URI_FIELD } from "../MICRON_URI_FIELD.js";
-import { MICRON_GEOMETRY_FIELD } from "../MICRON_GEOMETRY_FIELD.js";
+import { ASSET_TYPE_ARRAY_BUFFER, GLTFAssetTransformer } from "./GLTFAssetTransformer.js";
 
 /**
  *
@@ -26,134 +20,6 @@ import { MICRON_GEOMETRY_FIELD } from "../MICRON_GEOMETRY_FIELD.js";
  */
 const STORAGE_KEY = '@plugin/virtual-geometry-micron/geometry-cache';
 
-const ASSET_TYPE_ARRAY_BUFFER = "arraybuffer";
-
-class GLTFAssetTransformer extends AssetTransformer {
-    /**
-     *
-     * @param {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>} cache
-     */
-    constructor(cache) {
-        super();
-
-        /**
-         *
-         * @type {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>}
-         * @private
-         */
-        this.__cache = cache;
-
-        /**
-         *
-         * @type {AssetManager|null}
-         * @private
-         */
-        this.__am = null;
-
-        /**
-         *
-         * @type {MicronGeometryBinarySerializationAdapter}
-         * @private
-         */
-        this.__serde = new MicronGeometryBinarySerializationAdapter();
-    }
-
-    /**
-     *
-     * @param {AssetManager|null} am
-     */
-    set assetManager(am) {
-        this.__am = am;
-    }
-
-
-    /**
-     * @param {THREE.Object3D} object
-     * @param {{asset:AssetDescription}} ctx
-     * @return {Promise<void>}
-     * @private
-     */
-    async __visitObjectToLoadMicron(object, ctx) {
-        if (!object.isMesh) {
-            return;
-        }
-
-        /**
-         * @type {THREE.BufferGeometry}
-         */
-        const geometry = object.geometry;
-
-        const micron_uri = geometry.userData[MICRON_URI_FIELD];
-
-        if (typeof micron_uri !== "string") {
-            return;
-        }
-
-
-        /**
-         * @type {AssetDescription}
-         */
-        const ad = ctx.asset;
-
-        const base = computePathDirectory(ad.path);
-
-        let micron_data;
-
-        const micron_path = `${base}/${micron_uri}`;
-
-        try {
-            micron_data = await this.__am.promise(micron_path, ASSET_TYPE_ARRAY_BUFFER);
-        } catch (e) {
-            console.error(`Failed to load micron geometry '${micron_path}' referenced in GLTF (will skip): ${e}`);
-            return;
-        }
-
-        // deserialize micron data
-        const buffer = BinaryBuffer.fromArrayBuffer(micron_data.create());
-        const micron_geometry = new MicronGeometry();
-
-        this.__serde.deserialize(buffer, micron_geometry);
-
-        // set proxy for raycasting
-        micron_geometry.proxy = geometry;
-
-        geometry[MICRON_GEOMETRY_FIELD] = micron_geometry;
-    }
-
-
-    /**
-     *
-     * @param {Asset} source
-     * @param {AssetDescription} asset_description
-     * @return {Promise<Asset>}
-     */
-    async transform(source, asset_description) {
-        const animationClips = source.animations;
-
-        if (animationClips !== undefined && animationClips.length > 0) {
-            // animations might cause trouble
-            console.warn(`model '${asset_description.path}' contains animations, these animations might not works as intended with micron.`);
-        }
-
-        /**
-         * @type {THREE.Object3D}
-         */
-        const root = source.create();
-
-        // attempt to load existing micron geometries
-        await async_traverse_three_object(root, this.__visitObjectToLoadMicron, this, {
-            asset: asset_description
-        });
-
-        const micron_root = await convert_three_object_to_micron(root.clone(), this.__cache);
-        micron_root.boundingSphere = root.boundingSphere;
-
-        source.override_mesh = micron_root;
-
-        return source;
-    }
-}
-
 export class MicronRenderPlugin extends EnginePlugin {
     constructor() {
         super();

package/engine/graphics/micron/prototypeVirtualGeometry.js

@@ -48,7 +48,6 @@ import { CanvasView } from "../../../view/elements/CanvasView.js";
 import { Sampler2D } from "../texture/sampler/Sampler2D.js";
 import { downsampleSampler2D } from "../texture/sampler/downsampleSampler2D.js";
 import { ShadowMapRenderer } from "../shadows/ShadowMapRenderer.js";
-import { MouseEvents } from "../../input/devices/events/MouseEvents.js";
 import { mat4 } from "gl-matrix";
 
 const background = new TextureLoader().load('data/textures/utility/checkers_white_grey_256x256.png');
@@ -460,14 +459,15 @@ function init() {
 
     // sample_gltf_sponza();
     // gltf_sample('data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf');
-    // sample_lucy();
+    sample_lucy();
+    // sample_dragon();
     // sample_gltf_hapro_2();
     // sample_gltf_hapro_1();
     // sample_gltf_broken_isiflow();
     // 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('moicon/08-clickable-assets/model.gltf');
+    // gltf_sample('moicon/05-ground-floor/model.gltf');
     // gltf_sample('data/models/moicon/isiflow_Oct_15_21/0/model.gltf');
     // gltf_sample('moicon/29_Dec_2021_Nammo/1/model.gltf');
     // gltf_sample('moicon/29_Dec_2021_Nammo/1-onematerial/model.gltf');
@@ -478,7 +478,7 @@ function init() {
     // gltf_sample('moicon/03_Jan_22_Demo/4-area_1st_floor/model.gltf');
     // gltf_sample('moicon/03_Jan_22_Demo/8-assets/model.gltf');
     // gltf_sample('moicon/03_Jan_22_Demo/worker_test/model.gltf');
-    gltf_sample('moicon/A4/A4/model.gltf');
+    // gltf_sample('moicon/A4/A4/model.gltf');
 
     document.addEventListener("mousemove", onDocumentMouseMove);
 
@@ -546,6 +546,7 @@ function onWindowResize() {
  * @param {number} scale
  */
 function createScene(geometry, m1, scale) {
+
     geometry.computeVertexNormals();
 
 
@@ -709,6 +710,8 @@ function print_perf_stats() {
     });
 
     console.log(values.join(", "));
+
+    metrics.clear();
 }
 
 setInterval(print_perf_stats, 2000);
@@ -796,7 +799,7 @@ function render() {
     // console.log(`patches:${active_patches.length}, polycount:${polycount}`);
 }
 
-window.document.body.addEventListener(MouseEvents.Move, ({ clientX, clientY }) => {
+const raycast_handler = ({ clientX, clientY }) => {
     const direction = new Vector3();
 
     const viewport_size = new Vector2();
@@ -856,5 +859,7 @@ window.document.body.addEventListener(MouseEvents.Move, ({ clientX, clientY }) =
     if (hits.length > 0) {
         console.log(`HITS: ${hits.map(JSON.stringify).join(',')}`);
     }
-});
+};
+
+// window.document.body.addEventListener(MouseEvents.Move, raycast_handler);
 

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

@@ -69,7 +69,7 @@ export class PatchCacheKey {
     fromPatchOccurrence(o) {
         this.patch_id = o.patch.id;
         this.geometry_id = o.geometry_id;
-        this.transform.set(o.transform.elements);
+        this.transform.set(o.transform);
     }
 }
 

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

@@ -1,10 +1,10 @@
-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 "./refinement/RefinementSpec.js";
 import { ActivePatchList } from "./refinement/ActivePatchList.js";
 import { ActivePatchFlags } from "./refinement/ActivePatchFlags.js";
+import { mat4 } from "gl-matrix";
 
 /**
  * @readonly
@@ -14,27 +14,27 @@ const refinement_spec = new RefinementSpec();
 
 export class VirtualGeometryBuilder {
     constructor() {
-        this.view_projection_matrix = new Matrix4();
+
+
+        const common_buffer = new ArrayBuffer(192);
+
 
         /**
-         *
+         * Camera's world inverse matrix
          * @type {Float32Array|number[]|mat4}
          */
-        this.matrix_projection = new Float32Array(16);
-
-        this.matrix_projection_inverse = new Matrix4();
-
+        this.matrix_world_inverse = new Float32Array(common_buffer, 0, 16);
         /**
-         *
+         * Camera's projection matrix
          * @type {Float32Array|number[]|mat4}
          */
-        this.matrix_world_inverse = new Float32Array(16);
+        this.matrix_projection = new Float32Array(common_buffer, 64, 16);
 
         /**
          *
-         * @type {Frustum}
+         * @type {Float32Array|number[]|mat4}
          */
-        this.view_frustum = new Frustum();
+        this.view_projection_matrix = new Float32Array(common_buffer, 128, 16);
 
         /**
          * @private
@@ -74,20 +74,6 @@ export class VirtualGeometryBuilder {
          * @type {number}
          */
         this.error_bias = 2;
-
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__info_enforced_node_splits = 0;
-
-        /**
-         *
-         * @type {boolean}
-         * @private
-         */
-        this.__flags__enforce_dependency_splits = true;
     }
 
     dropCache() {
@@ -111,27 +97,15 @@ export class VirtualGeometryBuilder {
         camera.updateMatrix();
         camera.updateMatrixWorld(true);
 
-        this.view_projection_matrix.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
-
         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);
+        mat4.multiply(this.view_projection_matrix, this.matrix_projection, this.matrix_world_inverse);
 
         //
         refinement_spec.focal_length = camera.fov / 180;
     }
 
-    /**
-     *
-     * @param {THREE.Matrix4} matrix
-     */
-    setProjectionMatrix(matrix) {
-        this.view_projection_matrix.copy(matrix);
-    }
-
     /**
      *
      * @param {THREE.Object3D|ThreeMicronMesh} object
@@ -151,12 +125,11 @@ export class VirtualGeometryBuilder {
                 // get acl
                 const acl = this.__acl;
 
-                acl.initializeFromGeometry(micron_geometry);
 
                 this.buildForMesh(
                     object.instance_id,
                     micron_geometry,
-                    object.matrixWorld,
+                    object.matrixWorld.elements,
                     acl
                 );
             }
@@ -176,7 +149,7 @@ export class VirtualGeometryBuilder {
      *
      * @param {number} instance_id
      * @param {MicronGeometry} geometry
-     * @param {THREE.Matrix4} transform
+     * @param {number[]} transform world transform matrix of the instance
      * @param {ActivePatchList} apl
      */
     buildForMesh(
@@ -185,8 +158,9 @@ export class VirtualGeometryBuilder {
         transform,
         apl
     ) {
+        apl.initializeFromGeometry(geometry);
 
-        refinement_spec.build(transform.elements, this.matrix_world_inverse, this.matrix_projection);
+        refinement_spec.build(transform, this.view_projection_matrix);
 
         const output = this.output;
 
@@ -265,7 +239,6 @@ export class VirtualGeometryBuilder {
         // clear output
         this.output.clear();
 
-        this.__info_enforced_node_splits = 0;
 
         const n = this.input_scene_length;
         const input_objects = this.input_scene;

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

@@ -141,6 +141,10 @@ export class ThreeInstancedAdapter {
         const geo = this.__buffer_geometry;
 
         const patch_transform_attribute = geo.getAttribute(ATTRIBUTE_NAME_TRANSFORM);
+        /**
+         *
+         * @type {Float32Array}
+         */
         const patch_transform_array = patch_transform_attribute.array;
 
         patch_transform_attribute.needsUpdate = true;
@@ -157,7 +161,7 @@ export class ThreeInstancedAdapter {
 
             const i16 = i * 16;
 
-            occurrence.transform.toArray(patch_transform_array, i16);
+            patch_transform_array.set(occurrence.transform, i16);
 
             const patch_slot_id = patch_data.ensure(occurrence.patch);
 

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

@@ -2,7 +2,7 @@ import { ActivePatchRecord } from "./ActivePatchRecord.js";
 import { ActivePatchFlags } from "./ActivePatchFlags.js";
 import { aabb3_project_to_2d } from "../../../../../core/geom/3d/aabb/aabb3_compute_projected_area.js";
 import { BitSet } from "../../../../../core/binary/BitSet.js";
-import { aabb3_intersects_frustum } from "../../../../../core/bvh2/aabb3/aabb3_intersects_frustum.js";
+import { aabb3_intersects_frustum_array } from "../../../../../core/bvh2/aabb3/aabb3_intersects_frustum_array.js";
 
 export class ActivePatchList {
     constructor() {
@@ -194,27 +194,20 @@ export class ActivePatchList {
 
             const node = record.patch;
 
-            // check if record needs to be split
-            const prev_is_visible = record.getFlag(ActivePatchFlags.Visible);
 
             /*
              check if node is in view frustum
              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 in_view_frustum = aabb3_intersects_frustum(node.bounding_box, frustum_planes);
+            const in_view_frustum = aabb3_intersects_frustum_array(node.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;
             }
 
-            if (!prev_is_visible) {
-                record.setFlag(ActivePatchFlags.Visible);
-            }
+            record.setFlag(ActivePatchFlags.Visible);
 
             /*
              scale error to projection space:
@@ -224,6 +217,7 @@ export class ActivePatchList {
              */
 
 
+            // check if record needs to be split
             if (node.lod > 0) {
 
                 // not the lowest level of LOD, see if subdivision might be necessary

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

@@ -1,6 +1,6 @@
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import { mat4 } from "gl-matrix";
-import { array_setFromProjectionMatrix } from "../../../../../core/geom/3d/frustum/array_setFromProjectionMatrix.js";
+import { frustum_from_projection_matrix_array } from "../../../../../core/geom/3d/frustum/frustum_from_projection_matrix_array.js";
 
 export class RefinementSpec {
     constructor() {
@@ -37,25 +37,20 @@ export class RefinementSpec {
          */
         const array_buffer = new ArrayBuffer(160);
 
-        /**
-         * Object-space camera frustum
-         * Frustum planes in compact form
-         * @type {Float32Array}
-         */
-        this.frustum_f32 = new Float32Array(array_buffer, 0, 24);
-
 
         /**
          * Contains transformation from camera space to object space
          * @type {Float32Array|number[]|mat4}
          */
-        this.projection_matrix = new Float32Array(array_buffer, 24 * 4, 16);
+        this.projection_matrix = new Float32Array(array_buffer, 0, 16);
 
         /**
-         * Model world transform
-         * @type {Float32Array|number[]|mat4}
+         * Object-space camera frustum
+         * Frustum planes in compact form
+         * @type {Float32Array}
          */
-        // this.transform = new Float32Array(16);
+        this.frustum_f32 = new Float32Array(array_buffer, 64, 24);
+
 
         /**
          * Object-space camera position
@@ -68,6 +63,11 @@ export class RefinementSpec {
         throw new Error('deprecated, use .frustum_f32 instead');
     }
 
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     */
     setResolution(x, y) {
         this.resolution.set(x, y);
 
@@ -79,20 +79,16 @@ export class RefinementSpec {
     /**
      *
      * @param {number[]|mat4|Float32Array|ArrayLike<number>} transform world-space object transform
-     * @param {number[]|mat4|Float32Array|ArrayLike<number>} matrix_world_inverse camera's world inverse matrix
-     * @param {number[]|mat4|Float32Array|ArrayLike<number>} matrix_projection camera's projection matrix
+     * @param {number[]|mat4|Float32Array|ArrayLike<number>} view_projection_matrix camera's view projection matrix (projection* world_inverse)
      */
-    build(transform, matrix_world_inverse, matrix_projection) {
-        // const _transform = this.transform;
-        // _transform.set(transform);
+    build(transform, view_projection_matrix) {
 
         // build projection matrix
         const projection_matrix = this.projection_matrix;
 
-        mat4.multiply(projection_matrix, matrix_world_inverse, transform);
-        mat4.multiply(projection_matrix, matrix_projection, projection_matrix);
+        mat4.multiply(projection_matrix, view_projection_matrix, transform);
 
         // compute view frustum in model-space
-        array_setFromProjectionMatrix(this.frustum_f32, projection_matrix);
+        frustum_from_projection_matrix_array(this.frustum_f32, projection_matrix);
     }
 }