@woosh/meep-engine 2.33.59 → 2.33.60

package/engine/graphics/ecs/mesh/MeshSystem.js

@@ -18,7 +18,6 @@ import Mesh, { MeshFlags } from "./Mesh.js";
 import { applyComponentPropertiesToThreeObject, setMesh } from "./setMesh.js";
 import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { MeshEvents } from "./MeshEvents.js";
-import { MicronRenderPlugin } from "../../micron/plugin/MicronRenderPlugin.js";
 import { assert } from "../../../../core/assert.js";
 
 const placeholderGeometry = new BoxBufferGeometry(1, 1, 1);
@@ -86,13 +85,6 @@ export class MeshSystem extends System {
          * @type {BinaryNode}
          */
         this.bvh = null;
-
-        /**
-         *
-         * @type {boolean}
-         * @private
-         */
-        this.__use_micron = false;
     }
 
     /**
@@ -126,11 +118,11 @@ export class MeshSystem extends System {
 
         component.setFlag(MeshFlags.Loaded);
 
-        // micron
-        if (asset.micron !== undefined && this.__use_micron) {
-            component.micron_mesh = asset.micron.clone();
+        // override
+        if (asset.override_mesh !== undefined ) {
+            component.override_mesh = asset.override_mesh.clone();
 
-            applyComponentPropertiesToThreeObject(component, component.micron_mesh, entity);
+            applyComponentPropertiesToThreeObject(component, component.override_mesh, entity);
         }
 
         setMesh(dataset, entity, component, mesh);
@@ -141,11 +133,6 @@ export class MeshSystem extends System {
     }
 
     async startup(entityManager, readyCallback, errorCallback) {
-        const engine = this.__engine;
-
-        // is micron supported here?
-        this.__use_micron = engine.plugins.getPlugin(MicronRenderPlugin) !== undefined;
-
         const am = this.assetManager;
 
         this.entityManager = entityManager;
@@ -158,10 +145,15 @@ export class MeshSystem extends System {
         const graphics = this.graphics;
         this.renderLayer = graphics.layers.create("mesh-system");
 
+        /**
+         *
+         * @param {Mesh} component
+         * @return {Object3D}
+         */
         const extractRenderable = (component) => {
-            if (this.__use_micron && component.micron_mesh !== null) {
-                // use micron mesh
-                return component.micron_mesh;
+            if (component.override_mesh !== null) {
+                // use override mesh
+                return component.override_mesh;
             } else {
                 // use standard mesh
                 return component.mesh;

package/engine/graphics/ecs/trail2d/Trail2D.js

@@ -6,6 +6,10 @@
 import Vector3 from "../../../../core/geom/Vector3.js";
 import Vector4 from "../../../../core/geom/Vector4.js";
 import { RibbonXMaterialSpec } from "../../trail/x/RibbonXMaterialSpec.js";
+import { LeafNode } from "../../../../core/bvh2/LeafNode.js";
+import { makeGradientTrail } from "./makeGradientTrail.js";
+import { RibbonX } from "../../trail/x/RibbonX.js";
+import ThreeFactory from "../../three/ThreeFactory.js";
 
 /**
  * @readonly
@@ -14,6 +18,7 @@ import { RibbonXMaterialSpec } from "../../trail/x/RibbonXMaterialSpec.js";
 export const Trail2DFlags = {
     Spawning: 1,
     Aging: 2,
+    Built: 4,
 };
 
 class Trail2D {
@@ -37,6 +42,12 @@ class Trail2D {
          */
         this.time = 0;
 
+        /**
+         *
+         * @type {number}
+         */
+        this.trailingIndex = 0;
+
         /**
          * Time elapsed since last update
          * @type {number}
@@ -72,7 +83,11 @@ class Trail2D {
          * transient
          * @type {LeafNode|null}
          */
-        this.bvhLeaf = null;
+        this.bvhLeaf = new LeafNode(
+            this,
+            0, 0, 0,
+            0, 0, 0
+        );
 
         /**
          * @private
@@ -165,6 +180,21 @@ class Trail2D {
         }
     }
 
+    build(segment_count) {
+
+        const ribbon = new RibbonX();
+
+        ribbon.buildGeometry();
+        ribbon.setCount(segment_count);
+
+        const geometry = ribbon.getGeometry();
+
+        const mesh = ThreeFactory.createMesh(geometry, null);
+
+        this.ribbon = ribbon;
+        this.mesh = mesh;
+    }
+
     toJSON() {
         return {
             maxAge: this.maxAge,
@@ -187,10 +217,14 @@ class Trail2D {
             && this.offset.equals(other.offset)
             ;
     }
+
+
 }
 
 Trail2D.typeName = "Trail2D";
 
 Trail2D.serializable = false;
 
+Trail2D.makeGradientTrail = makeGradientTrail;
+
 export default Trail2D;

package/engine/graphics/ecs/trail2d/Trail2DSystem.js

@@ -10,9 +10,6 @@ import { Transform } from '../../../ecs/transform/Transform.js';
 import Vector3 from '../../../../core/geom/Vector3.js';
 
 import Trail2D, { Trail2DFlags } from './Trail2D.js';
-
-import { LeafNode } from '../../../../core/bvh2/LeafNode.js';
-import ThreeFactory from '../../three/ThreeFactory.js';
 import { GraphicsEngine } from "../../GraphicsEngine.js";
 import { RibbonXFixedPhysicsSimulator } from "../../trail/x/simulator/RibbonXFixedPhysicsSimulator.js";
 import { RibbonX } from "../../trail/x/RibbonX.js";
@@ -118,11 +115,11 @@ class Trail2DSystem extends System {
 
     /**
      *
-     * @param {Transform} transform
      * @param {Trail2D} trail
-     * @param {number} entityId
+     * @param {Transform} transform
+     * @private
      */
-    link(trail, transform, entityId) {
+    __build_trail(trail, transform) {
         const segmentsPerSecond = 60;
         const maxSegments = 1000;
         //instantiation
@@ -130,24 +127,19 @@ class Trail2DSystem extends System {
         //make a mesh
         const segment_count = Math.ceil(clamp(trail.maxAge * segmentsPerSecond, 2, maxSegments));
 
-        const ribbon = new RibbonX();
-
-        ribbon.buildGeometry();
-        ribbon.setCount(segment_count);
+        trail.build(segment_count);
 
-
-        const geometry = ribbon.getGeometry();
+        const ribbon = trail.ribbon;
 
         const ribbons = this.__ribbon_plugin.getValue();
 
         const material = ribbons.obtain_material_x(trail.material);
 
-        const mesh = ThreeFactory.createMesh(geometry, material);
+        trail.mesh.material = material;
 
         trail.time = 0;
         trail.trailingIndex = 0;
         trail.ribbon = ribbon;
-        trail.mesh = mesh;
         trail.timeSinceLastUpdate = 0;
 
 
@@ -173,16 +165,31 @@ class Trail2DSystem extends System {
 
         }
 
-        const leafNode = new LeafNode(
-            trail,
-
+        trail.bvhLeaf.resize(
             position_x, position_y, position_z,
             position_x, position_y, position_z
         );
 
-        trail.bvhLeaf = leafNode;
+        trail.setFlag(Trail2DFlags.Built);
+    }
+
+    /**
+     *
+     * @param {Transform} transform
+     * @param {Trail2D} trail
+     * @param {number} entityId
+     */
+    link(trail, transform, entityId) {
+        if (!trail.getFlag(Trail2DFlags.Built)) {
+            this.__build_trail(trail, transform);
+        } else {
+
+            const material = this.__ribbon_plugin.getValue().obtain_material_x(trail.material);
+            trail.mesh.material = material;
+        }
+
 
-        this.bvh.insertNode(leafNode);
+        this.bvh.insertNode(trail.bvhLeaf);
     }
 
     /**

package/engine/graphics/ecs/trail2d/makeGradientTrail.js

@@ -0,0 +1,68 @@
+import Trail2D, { Trail2DFlags } from "./Trail2D.js";
+import {
+    RIBBON_ATTRIBUTE_ADDRESS_AGE,
+    RIBBON_ATTRIBUTE_ADDRESS_COLOR,
+    RIBBON_ATTRIBUTE_ADDRESS_THICKNESS,
+    RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET
+} from "../../trail/x/ribbon_attributes_spec.js";
+import { assert } from "../../../../core/assert.js";
+
+/**
+ *
+ * @param {number[]} color
+ * @param {number[]} thickness
+ * @param {number} [duration]
+ * @param {number} [scale]
+ * @param {number[]} position
+ * @param {number[]} ages
+ * @param {string} texture
+ * @returns {Trail2D}
+ */
+export function makeGradientTrail({
+                                      color,
+                                      thickness,
+                                      position,
+                                      duration = 1,
+                                      scale = 1,
+                                      ages,
+                                      texture
+                                  }) {
+
+    const trail2D = new Trail2D();
+    trail2D.maxAge = duration;
+    trail2D.width = 1;
+    trail2D.textureURL = texture;
+
+    const point_count = thickness.length;
+
+    trail2D.build(point_count);
+
+    const ribbon = trail2D.ribbon;
+
+    for (let i = 0; i < point_count; i++) {
+
+        const f = i / (point_count - 1);
+        const i3 = i * 3;
+
+        ribbon.setPointAlpha(i, 0);
+        ribbon.setPointPosition(i, position[i3], position[i3 + 1], position[i3 + 2]);
+
+        ribbon.setPointAttribute_Scalar(i, RIBBON_ATTRIBUTE_ADDRESS_AGE, ages[i] * duration);
+        ribbon.setPointAttribute_Scalar(i, RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET, f);
+        ribbon.setPointAttribute_Scalar(i, RIBBON_ATTRIBUTE_ADDRESS_THICKNESS, thickness[i]);
+
+        const c_0 = color[i];
+
+        assert.isNumber(c_0, `color[i]`);
+
+        ribbon.setPointAttribute_Vector3(i, RIBBON_ATTRIBUTE_ADDRESS_COLOR, c_0 >> 16, c_0 >> 8, c_0);
+    }
+
+    // don't spawn more trail segments
+    trail2D.clearFlag(Trail2DFlags.Spawning);
+    trail2D.setFlag(Trail2DFlags.Built);
+
+    ribbon.computeBoundingBox(trail2D.bvhLeaf);
+
+    return trail2D;
+}

package/engine/graphics/micron/convert_three_object_to_micron.js

@@ -3,12 +3,18 @@ import { computeGeometryHash } from "../../asset/loaders/geometry/geometry/compu
 import { computeGeometryEquality } from "../../asset/loaders/geometry/geometry/computeGeometryEquality.js";
 import { buildMicronGeometryFromBufferGeometry } from "./build/buildMicronGeometryFromBufferGeometry.js";
 import { ThreeMicronMesh } from "./format/ThreeMicronMesh.js";
+import { AsyncMapWrapper } from "../../../core/collection/map/AsyncMapWrapper.js";
 
 /**
  *
  * @type {HashMap<THREE.BufferGeometry, MicronGeometry>}
  */
-const micron_cache = new HashMap({
+const default_micron_cache = new AsyncMapWrapper(new HashMap({
+    keyHashFunction: computeGeometryHash,
+    keyEqualityFunction: computeGeometryEquality
+}));
+
+const pending_cache = new HashMap({
     keyHashFunction: computeGeometryHash,
     keyEqualityFunction: computeGeometryEquality
 });
@@ -17,9 +23,10 @@ const micron_cache = new HashMap({
 /**
  *
  * @param {THREE.Object3D} object
+ * @param {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>} micron_cache
  * @returns {THREE.Object3D}
  */
-export async function convert_three_object_to_micron(object) {
+export async function convert_three_object_to_micron(object, micron_cache = default_micron_cache) {
 
     const promises = [];
 
@@ -29,19 +36,29 @@ export async function convert_three_object_to_micron(object) {
      * @returns {MicronGeometry}
      */
     async function obtain_geometry(g) {
-        const existing = micron_cache.get(g);
+        const existing = await micron_cache.get(g);
+
+        if (existing !== undefined && existing !== null) {
+            return existing;
+        }
+
+        const pending = pending_cache.get(g);
 
-        if (existing !== undefined) {
-            return await existing;
+        if (pending !== undefined) {
+            return await pending;
         }
 
         const micron_geometry_promise = buildMicronGeometryFromBufferGeometry(g);
 
-        micron_cache.set(g, micron_geometry_promise);
+        pending_cache.set(g, micron_geometry_promise);
 
         promises.push(micron_geometry_promise);
 
-        return await micron_geometry_promise;
+        const micron_geometry = await micron_geometry_promise;
+
+        await micron_cache.set(g, micron_geometry);
+
+        return micron_geometry;
     }
 
 

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

@@ -3,6 +3,57 @@ import { VGThreeRenderer } from "../render/v1/VGThreeRenderer.js";
 import { RenderLayer } from "../../render/layers/RenderLayer.js";
 import { RenderPassType } from "../../render/RenderPassType.js";
 import { SOURCE_RENDER_LAYER_PROPERTY } from "../../render/visibility/VisibilityComputer.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";
+import { CachedAsyncMap } from "../../../../core/collection/map/CachedAsyncMap.js";
+import { AsyncRemoteHashMap } from "../../../../core/collection/map/AsyncRemoteHashMap.js";
+import { BufferGeometrySerializationAdapter } from "./serialization/BufferGeometrySerializationAdapter.js";
+import { MicronGeometryBinarySerializationAdapter } from "../format/serialization/MicronGeometryBinarySerializationAdapter.js";
+import { AsyncMapWrapper } from "../../../../core/collection/map/AsyncMapWrapper.js";
+
+/**
+ *
+ * @type {string}
+ */
+const STORAGE_KEY = '@plugin/virtual-geometry-micron/geometry-cache';
+
+
+class GLTFAssetTransformer extends AssetTransformer {
+    /**
+     *
+     * @param {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>} cache
+     */
+    constructor(cache) {
+        super();
+
+        /**
+         *
+         * @type {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>}
+         * @private
+         */
+        this.__cache = cache;
+    }
+
+    async transform(source) {
+        const animationClips = source.animations;
+        if (animationClips !== undefined && animationClips.length > 0) {
+            // not suitable
+            return source;
+        }
+
+        const root = source.create();
+
+        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() {
@@ -37,6 +88,40 @@ export class MicronRenderPlugin extends EnginePlugin {
         });
 
         this.__view_observers = new Map();
+
+        /**
+         *
+         * @type {AsyncRemoteHashMap}
+         * @private
+         */
+        this.__persisted_geometry = new AsyncRemoteHashMap({
+            keyHashFunction: computeGeometryHash,
+            keyEqualityFunction: computeGeometryEquality,
+            keySerializationAdapter: new BufferGeometrySerializationAdapter(),
+            valueSerializationAdapter: new MicronGeometryBinarySerializationAdapter(),
+            storageKeyPrefix: STORAGE_KEY,
+
+        });
+        /**
+         *
+         * @type {AbstractAsyncMap<THREE.BufferGeometry, MicronGeometry>}
+         * @private
+         */
+        this.__cache = new CachedAsyncMap(
+            new AsyncMapWrapper(new Cache({
+                keyHashFunction: computeGeometryHash,
+                keyEqualityFunction: computeGeometryEquality
+            })),
+            this.__persisted_geometry
+        );
+
+        /**
+         *
+         * @type {AssetTransformer}
+         * @private
+         */
+        this.__asset_transformer = new GLTFAssetTransformer(this.__cache);
+
     }
 
     /**
@@ -87,13 +172,22 @@ export class MicronRenderPlugin extends EnginePlugin {
         view.on.preRender.remove(observer);
     }
 
+    __ingest_cache() {
+        this.engine.storage.lo
+    }
+
     async startup() {
 
+        const engine = this.engine;
+
+        engine.assetManager.registerTransformer("model/gltf", this.__asset_transformer);
+        engine.assetManager.registerTransformer("model/gltf+json", this.__asset_transformer);
+
         /**
          *
          * @type {GraphicsEngine}
          */
-        const ge = this.engine.graphics;
+        const ge = engine.graphics;
 
         ge.layers.add(this.__micron_render_layer);
 
@@ -101,13 +195,22 @@ export class MicronRenderPlugin extends EnginePlugin {
         ge.views.elements.on.removed.add(this.__handle_view_removed, this);
 
         // link all views
-        ge.views.elements.forEach(this.__handle_view_added,this);
+        ge.views.elements.forEach(this.__handle_view_added, this);
+
+        this.__persisted_geometry.attach_storage(engine.storage);
 
         await super.startup();
     }
 
     async shutdown() {
-        const ge = this.engine.graphics;
+        const engine = this.engine;
+
+        this.__persisted_geometry.detach_storage();
+
+        engine.assetManager.unregisterTransformer("model/gltf", this.__asset_transformer);
+        engine.assetManager.unregisterTransformer("model/gltf+json", this.__asset_transformer);
+
+        const ge = engine.graphics;
 
         ge.layers.remove(this.__micron_render_layer);
 
@@ -115,7 +218,7 @@ export class MicronRenderPlugin extends EnginePlugin {
         ge.views.elements.on.removed.remove(this.__handle_view_removed, this);
 
         // clear all observer
-        ge.views.elements.forEach(this.__handle_view_removed,this);
+        ge.views.elements.forEach(this.__handle_view_removed, this);
 
         await super.shutdown();
     }

package/engine/graphics/micron/plugin/serialization/BufferGeometrySerializationAdapter.js

@@ -0,0 +1,176 @@
+import { BinaryClassSerializationAdapter } from "../../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
+import { BufferAttribute, BufferGeometry } from "three";
+
+function typed_array_to_enum(array) {
+    if (array instanceof Uint8Array) {
+        return 0;
+    } else if (array instanceof Uint16Array) {
+        return 1;
+    } else if (array instanceof Uint32Array) {
+        return 2;
+    } else if (array instanceof Uint8Array) {
+        return 3;
+    } else if (array instanceof Uint16Array) {
+        return 4;
+    } else if (array instanceof Uint32Array) {
+        return 5;
+    } else if (array instanceof Float32Array) {
+        return 6;
+    } else if (array instanceof Float64Array) {
+        return 7;
+    } else {
+        throw new Error('Unsupported array type');
+    }
+}
+
+function marker_to_typed_array_constructor(marker) {
+    switch (marker) {
+        case 0:
+            return Uint8Array;
+        case 1:
+            return Uint16Array;
+        case 2:
+            return Uint32Array;
+        case 3:
+            return Int8Array;
+        case 4:
+            return Int16Array;
+        case 5:
+            return Int32Array;
+        case 6:
+            return Float32Array;
+        case 7:
+            return Float64Array;
+        default:
+            throw new Error('Unsupported marker');
+    }
+}
+
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @param {Uint8Array|Float32Array|ArrayLike<number>} value
+ */
+function write_typed_array(buffer, value) {
+
+    buffer.writeUint8(typed_array_to_enum(value));
+    buffer.writeUintVar(value.byteLength);
+
+    const data = new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+    buffer.writeBytes(data, 0, value.byteLength);
+}
+
+function read_typed_array(buffer) {
+    const type_marker = buffer.readUint8();
+    const byte_length = buffer.readUintVar();
+
+    const array = new Uint8Array(byte_length);
+
+    buffer.readBytes(array, 0, byte_length);
+
+    // re-interpret bytes
+    const TypedArray = marker_to_typed_array_constructor(type_marker);
+
+    return new TypedArray(array.buffer, 0);
+}
+
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @param {BufferAttribute} value
+ */
+function write_attribute(buffer, value) {
+    buffer.writeUTF8String(value.name);
+    buffer.writeUintVar(value.itemSize);
+    buffer.writeUint8(value.normalized ? 1 : 0);
+    buffer.writeUint32(value.usage);
+
+    write_typed_array(buffer, value.array);
+}
+
+/**
+ *
+ * @param {BinaryBuffer} buffer
+ * @returns {BufferAttribute}
+ */
+function read_attribute(buffer) {
+    const name = buffer.readUTF8String();
+    const itemSize = buffer.readUintVar();
+    const normalized = buffer.readUint8() !== 0;
+    const usage = buffer.readUint32();
+
+    const array = read_typed_array(buffer);
+
+    const attribute = new BufferAttribute(array, itemSize, normalized);
+
+    attribute.usage = usage;
+    attribute.name = name;
+
+    return attribute;
+}
+
+export class BufferGeometrySerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = BufferGeometry;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {BufferGeometry} value
+     */
+    serialize(buffer, value) {
+        // write index if one exists
+        const index = value.getIndex();
+        if (index === null) {
+            buffer.writeUint8(0);
+        } else {
+            buffer.writeUint8(1);
+
+            write_attribute(buffer, index);
+        }
+
+        const attributes = value.attributes;
+        const attribute_keys = Object.keys(attributes);
+
+        const attribute_count = attribute_keys.length;
+        buffer.writeUintVar(attribute_count);
+
+        for (let i = 0; i < attribute_count; i++) {
+            const attribute_key = attribute_keys[i];
+
+            buffer.writeUTF8String(attribute_key);
+
+            const attribute = attributes[attribute_key];
+
+            write_attribute(buffer, attribute);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {BufferGeometry} value
+     */
+    deserialize(buffer, value) {
+        const index_flag = buffer.readUint8();
+
+        if (index_flag !== 0) {
+            value.setIndex(read_attribute(buffer));
+        } else {
+            value.setIndex(null);
+        }
+
+        const attribute_count = buffer.readUintVar();
+
+        for (let i = 0; i < attribute_count; i++) {
+            const attribute_key = buffer.readUTF8String();
+
+            const attribute = read_attribute(buffer);
+
+            value.setAttribute(attribute_key, attribute);
+        }
+    }
+}