@woosh/meep-engine 2.33.21 → 2.33.25

package/engine/ecs/transform/Transform.js

@@ -5,14 +5,13 @@
 import Vector3 from "../../../core/geom/Vector3.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import { Matrix4 } from "../../../core/geom/Matrix4.js";
-import { Quaternion as ThreeQuaternion } from "three";
-import { composeMatrix4 } from "../../graphics/util/composeMatrix4.js";
+import { compose_matrix4_array } from "../../graphics/util/composeMatrix4.js";
+import { decompose_matrix_4_array } from "../../graphics/util/decompose_matrix_4_array.js";
 
 const delta = new Vector3();
 
 const m4_0 = new Matrix4();
 const m4_1 = new Matrix4();
-const threeQuaternion = new ThreeQuaternion();
 
 export class Transform {
     /**
@@ -166,9 +165,15 @@ export class Transform {
      * @param {Matrix4} matrix
      */
     fromThreeMatrix4(matrix) {
-        matrix.decompose(this.position, threeQuaternion, this.scale);
+        this.fromMatrix4(matrix.elements);
+    }
 
-        this.rotation.copy(threeQuaternion);
+    /**
+     *
+     * @param {mat4|number[]|Float32Array} m
+     */
+    fromMatrix4(m) {
+        decompose_matrix_4_array(m, this.position, this.rotation, this.scale);
     }
 
     /**
@@ -176,7 +181,15 @@ export class Transform {
      * @param {Matrix4} matrix
      */
     toThreeMatrix(matrix) {
-        composeMatrix4(matrix, this.position, this.rotation, this.scale);
+        this.toMatrix4(matrix.elements);
+    }
+
+    /**
+     *
+     * @param {number[]|Float32Array} result
+     */
+    toMatrix4(result) {
+        compose_matrix4_array(result, this.position, this.rotation, this.scale);
     }
 }
 

package/engine/ecs/util/hideEntityGracefully.js

@@ -15,10 +15,23 @@ import { DelayBehavior } from "../../intelligence/behavior/util/DelayBehavior.js
 import { Light } from "../../graphics/ecs/light/Light.js";
 import { TransitionPropertyVectorXBehavior } from "../../../../model/game/story/behaviors/generic/TransitionPropertyVectorXBehavior.js";
 
+/**
+ * @readonly
+ * @type {number}
+ */
 const SHUTDOWN_GRACE_PERIOD = 60;
 
+/**
+ *
+ * @type {Map<Class|function, function(T,entity?:EntityBuilder,createEntity?:function,createEntityContext?:*):number>}
+ */
 const component_shutdown = new Map();
 
+/**
+ * @template T
+ * @param {Class<T>} type
+ * @param {function(T,entity?:EntityBuilder,createEntity?:function,createEntityContext?:*):number} method
+ */
 function addShutdown(type, method) {
     component_shutdown.set(type, method);
 }
@@ -152,6 +165,11 @@ addShutdown(SoundEmitter, (soundEmitter, builder, createEntity, createEntityThis
  * @return {number} duration in seconds until the entity is completely hidden
  */
 export function hideEntityGracefully(builder, createEntity, createEntityThisArg) {
+    if (!builder.isBuilt) {
+        // already destroyed
+        return 0;
+    }
+
     let delay = 0;
 
     const components = builder.element;

package/engine/graphics/GraphicsEngine.js

@@ -40,6 +40,7 @@ import { ShadowMapRenderer } from "./shadows/ShadowMapRenderer.js";
 import { CameraViewManager } from "./render/view/CameraViewManager.js";
 import { StandardFrameBuffers } from "./StandardFrameBuffers.js";
 import { load_environment_map } from "./texture/cubemap/load_environment_map.js";
+import { CompositingStages } from "./composit/CompositingStages.js";
 
 /**
  *
@@ -96,7 +97,13 @@ function GraphicsEngine(camera, entityManger) {
         preRender: new Signal(),
         postRender: new Signal(),
 
+        /**
+         * @deprecated
+         */
         preComposite: new Signal(),
+        /**
+         * @deprecated
+         */
         postComposite: new Signal(),
 
         buffersRendered: new Signal(),
@@ -345,23 +352,6 @@ GraphicsEngine.prototype.start = function () {
 
     const webGLRenderer = this.renderer = new WebGLRenderer(rendererParameters);
 
-    let g = 0;
-    let t = 0;
-    webGLRenderer.info.memory = {
-        get geometries() {
-            return g;
-        },
-        set geometries(v) {
-            g = v;
-        },
-        get textures() {
-            return t;
-        },
-        set textures(v) {
-            t = v;
-        }
-    };
-
     //print GPU info
     const GPU_NAME = this.getGPUName();
 
@@ -387,7 +377,7 @@ GraphicsEngine.prototype.start = function () {
     const domElement = this.domElement = webGLRenderer.domElement;
     //disable selection
     const style = domElement.style;
-    domElement.classList.add("renderer-engine-render-canvas");
+    domElement.classList.add("graphics-engine-render-canvas");
     style.userSelect = style.webkitUserSelect = style.mozUserSelect = "none";
     // see : https://www.w3.org/TR/pointerevents/#the-touch-action-css-property
     style.touchAction = "none";
@@ -645,16 +635,14 @@ GraphicsEngine.prototype.render = function (renderTarget) {
     //do the opaque pass
     this.renderOpaque();
 
+    this.layerComposer.composite(renderer, CompositingStages.POST_OPAQUE);
+
     this.on.buffersRendered.send3(renderer, camera, scene);
 
     // transparent pass
     this.renderTransparent();
 
-    this.on.preComposite.send3(renderer, camera, scene);
-
-    this.layerComposer.composite(renderer);
-
-    this.on.postComposite.send3(renderer, camera, scene);
+    this.layerComposer.composite(renderer, CompositingStages.POST_TRANSPARENT);
 
 
     //dispatch post-render event

package/engine/graphics/camera/testClippingPlaneComputation.js

@@ -95,11 +95,11 @@ function makeConfig(engine) {
         new TopDownCameraControllerSystem(graphics),
         new TopDownCameraLanderSystem(),
         new CameraSystem(graphics.scene, graphics),
-        new MeshSystem(graphics, assetManager),
+        new MeshSystem(engine),
         new ClingToTerrainSystem(),
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
-        new Trail2DSystem(graphics, assetManager),
+        new Trail2DSystem(engine),
         new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),

package/engine/graphics/composit/CompositLayer.js

@@ -5,6 +5,7 @@ import { blendingType2three } from "../texture/sampler/blendingType2Three.js";
 import { ScreenSpaceQuadShader } from "../shaders/ScreenSpaceQuadShader.js";
 import { BlendingType } from "../texture/sampler/BlendingType.js";
 import { FULL_SCREEN_TRIANGLE_GEOMETRY } from "../geometry/FULL_SCREEN_TRIANGLE_GEOMETRY.js";
+import Signal from "../../../core/events/signal/Signal.js";
 
 /**
  *
@@ -29,11 +30,15 @@ function assignMaterialBlending(material, blending) {
 export class CompositLayer {
     /**
      *
-     * @param {WebGLRenderTarget} renderTarget
+     * @param {THREE.WebGLRenderTarget} renderTarget
      * @param {BlendingType} blending
      * @param {number} renderTargetScale
      */
-    constructor({ renderTarget, blending, renderTargetScale = 1 }) {
+    constructor({
+                    renderTarget,
+                    blending,
+                    renderTargetScale = 1
+                }) {
         /**
          * Human-readable name, useful for debugging
          * @type {string}
@@ -57,9 +62,13 @@ export class CompositLayer {
          */
         this.renderTargetScale = renderTargetScale;
 
-        const material = this.buildMaterial();
+        this.object = new Mesh(FULL_SCREEN_TRIANGLE_GEOMETRY, this.buildMaterial());
 
-        this.object = new Mesh(FULL_SCREEN_TRIANGLE_GEOMETRY, material);
+        /**
+         * Which compositing stage this layer belongs to, stages are rendered independently
+         * @type {number}
+         */
+        this.stage = 0;
 
         this.size = new Vector2();
 
@@ -74,6 +83,10 @@ export class CompositLayer {
          * @type {number}
          */
         this.__order = 0;
+
+        this.on = {
+            preRender: new Signal()
+        };
     }
 
     /**

package/engine/graphics/composit/CompositingStages.js

@@ -0,0 +1,8 @@
+/**
+ * @readonly
+ * @enum {number}
+ */
+export const CompositingStages = {
+    POST_OPAQUE: 1,
+    POST_TRANSPARENT: 0
+}

package/engine/graphics/composit/LayerCompositer.js

@@ -52,8 +52,6 @@ class LayerCompositer {
 
         layer.renderTarget.dispose();
 
-        this.scene.remove(layer.object);
-
         return true;
     }
 
@@ -113,8 +111,6 @@ class LayerCompositer {
 
         this.layerTargets.push(layer);
 
-        this.scene.add(layer.object);
-
         return true;
     }
 
@@ -138,13 +134,46 @@ class LayerCompositer {
 
     /**
      *
-     * @param {WebGLRenderer} renderer
+     * @param {number} stage
+     * @private
      */
-    composite(renderer) {
+    __prepare_scene_for_stage(stage) {
+        const layers = this.layerTargets;
+        const layer_count = layers.length;
+
+        const scene = this.scene;
+
+        let child_count = 0;
+
+        for (let i = 0; i < layer_count; i++) {
+            const layer = layers[i];
+
+            if (layer.stage !== stage) {
+                continue;
+            }
+
+            scene.children[child_count++] = layer.object;
+
+            layer.on.preRender.send0();
+        }
+
+        scene.children.length = child_count;
+    }
+
+    /**
+     *
+     * @param {THREE.WebGLRenderer} renderer
+     * @param {number} stage
+     */
+    composite(renderer, stage) {
+        assert.isNonNegativeInteger(stage, 'stage');
+
         if (!this.hasActiveLayers()) {
             return;
         }
 
+        this.__prepare_scene_for_stage(stage);
+
         const camera = this.camera;
         const scene = this.scene;
 

package/engine/graphics/ecs/animation/animator/AnimationClip.js

@@ -1,8 +1,9 @@
-import { computeHashFloat, computeHashIntegerArray} from "../../../../../core/math/MathUtils.js";
 import { min2 } from "../../../../../core/math/min2.js";
 import { AnimationClipFlag } from "./AnimationClipFlag.js";
 import { LoopOnce, LoopRepeat } from "three";
 import { AnimationEventTypes } from "./AnimationEventTypes.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationClip {
     constructor() {

package/engine/graphics/ecs/animation/animator/AnimationClipDefinition.js

@@ -1,7 +1,8 @@
 import { isArrayEqual } from "../../../../../core/collection/ArrayUtils.js";
-import { computeHashArray, computeHashIntegerArray } from "../../../../../core/math/MathUtils.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
 import { invokeObjectHash } from "../../../../../core/model/object/invokeObjectHash.js";
+import { computeHashArray } from "../../../../../core/collection/array/computeHashArray.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
 
 /**
  *

package/engine/graphics/ecs/animation/animator/AnimationNotification.js

@@ -1,4 +1,5 @@
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationNotification {
     constructor() {

package/engine/graphics/ecs/animation/animator/AnimationNotificationDefinition.js

@@ -1,6 +1,7 @@
-import { computeHashIntegerArray, computeObjectHash } from "../../../../../core/math/MathUtils.js";
 import { objectDeepEquals } from "../../../../../core/model/object/objectDeepEquals.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeObjectHash } from "../../../../../core/math/hash/computeObjectHash.js";
 
 export class AnimationNotificationDefinition {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/AnimationGraph.js

@@ -3,11 +3,12 @@ import { AnimationTransition } from "./AnimationTransition.js";
 import { AnimationStateType } from "./AnimationStateType.js";
 import { AnimationMixer } from "three";
 import { AnimationGraphFlag } from "./AnimationGraphFlag.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../../core/math/MathUtils.js";
 import { writeAnimationGraphDefinitionToJSON } from "./definition/serialization/writeAnimationGraphDefinitionToJSON.js";
 import { readAnimationGraphDefinitionFromJSON } from "./definition/serialization/readAnimationGraphDefinitionFromJSON.js";
 import { assert } from "../../../../../../core/assert.js";
 import { threeUpdateTransform } from "../../../../util/threeUpdateTransform.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationGraph {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationGraphDefinition.js

@@ -4,8 +4,9 @@ import { AnimationStateDefinition } from "./AnimationStateDefinition.js";
 import { AnimationClipDefinition } from "../../AnimationClipDefinition.js";
 import { AnimationClip } from "../../AnimationClip.js";
 import { isArrayEqual } from "../../../../../../../core/collection/ArrayUtils.js";
-import { computeHashArray, computeHashIntegerArray } from "../../../../../../../core/math/MathUtils.js";
 import { invokeObjectHash } from "../../../../../../../core/model/object/invokeObjectHash.js";
+import { computeHashArray } from "../../../../../../../core/collection/array/computeHashArray.js";
+import { computeHashIntegerArray } from "../../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 export class AnimationGraphDefinition {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationStateDefinition.js

@@ -1,5 +1,5 @@
 import { AnimationStateType } from "../AnimationStateType.js";
-import { computeHashIntegerArray } from "../../../../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 export class AnimationStateDefinition {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationTransitionDefinition.js

@@ -1,5 +1,6 @@
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../../../core/math/MathUtils.js";
 import { computeStringHash } from "../../../../../../../core/primitives/strings/computeStringHash.js";
+import { computeHashIntegerArray } from "../../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationTransitionDefinition {
     constructor() {

package/engine/graphics/ecs/camera/CameraClippingPlaneComputer.js

@@ -1,7 +1,7 @@
-import { isValueBetweenInclusive } from "../../../../core/math/MathUtils.js";
 import { frustumFromCamera } from "./CameraSystem.js";
 import { Frustum as ThreeFrustum } from "three";
 import { v3_dot } from "../../../../core/geom/v3_dot.js";
+import { isValueBetweenInclusive } from "../../../../core/math/isValueBetweenInclusive.js";
 
 const CLIPPING_EPSILON = 0.001;
 

package/engine/graphics/ecs/highlight/HighlightDefinition.js

@@ -1,7 +1,8 @@
 import { Color } from "../../../../core/color/Color.js";
 import { assert } from "../../../../core/assert.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "../../../ecs/storage/COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 export class HighlightDefinition {
     constructor() {

package/engine/graphics/ecs/highlight/plugin/OutlineRenderPlugin.js

@@ -7,6 +7,7 @@ import { HighlightRenderGroup } from "../renderer/HighlightRenderGroup.js";
 import { ObjectPoolFactory } from "../../../../../core/model/object/ObjectPoolFactory.js";
 import { HighlightRenderElement } from "../renderer/HighlightRenderElement.js";
 import { noop } from "../../../../../core/function/Functions.js";
+import { CompositingStages } from "../../../composit/CompositingStages.js";
 
 export class OutlineRenderPlugin extends EnginePlugin {
     constructor() {
@@ -99,12 +100,14 @@ export class OutlineRenderPlugin extends EnginePlugin {
 
     /**
      *
-     * @param {WebGLRenderer} renderer
-     * @param {Camera} camera
-     * @param {ThreeScene} scene
      * @private
      */
-    __render(renderer, camera, scene) {
+    __render() {
+        const engine = this.engine;
+        const graphics = engine.graphics;
+
+        const camera = graphics.camera;
+
         // collect elements
         const source_count = this.__sources.length;
 
@@ -139,11 +142,12 @@ export class OutlineRenderPlugin extends EnginePlugin {
 
         viewport_size.process(this.__set_viewport_size, this);
 
-        graphics.on.preComposite.add(this.__render, this);
-
         // create compositing layer
         this.__compositing_layer = graphics.layerComposer.createLayer(this.__renderer.__renderTargetFinal, BlendingType.MultiplyAdd);
         this.__compositing_layer.name = "Silhouette Outline";
+        this.__compositing_layer.stage = CompositingStages.POST_TRANSPARENT;
+
+        this.__compositing_layer.on.preRender.add(this.__render, this);
 
 
         // set rendering resolution
@@ -156,7 +160,7 @@ export class OutlineRenderPlugin extends EnginePlugin {
 
         const graphics = this.engine.graphics;
 
-        graphics.on.preComposite.remove(this.__render, this);
+        this.__compositing_layer.on.preRender.remove(this.__render, this);
 
         graphics.viewport.size.onChanged.remove(this.__set_viewport_size, this);
 

package/engine/graphics/ecs/light/Light.d.ts

@@ -1,6 +1,6 @@
 import ObservedEnum from "../../../../core/model/ObservedEnum";
 import {Color} from "../../../../core/color/Color";
-import {Vector1} from "../../../../core/geom/Vector1";
+import Vector1 from "../../../../core/geom/Vector1";
 import ObservedBoolean from "../../../../core/model/ObservedBoolean";
 import {LightType} from "./LightType";
 

package/engine/graphics/ecs/light/Light.js

@@ -103,9 +103,14 @@ export class Light {
 
         if (json.intensity !== undefined) {
             this.intensity.fromJSON(json.intensity);
+        } else {
+            this.intensity.set(1);
         }
+
         if (json.castShadow !== undefined) {
             this.castShadow.fromJSON(json.castShadow);
+        } else {
+            this.castShadow.set(false);
         }
 
         const actual_type = this.type.getValue();

package/engine/graphics/ecs/light/binding/three/ThreeLightBinding.js

@@ -99,7 +99,8 @@ export class ThreeLightBinding extends LightBinding {
          */
         const cache = this.__system.__three_light_cache;
 
-        threeEnsureLightObject(this.__c_light, cache);
+        const c_light = this.__c_light;
+        threeEnsureLightObject(c_light, cache);
 
         super.link(ctx);
     }
@@ -112,6 +113,9 @@ export class ThreeLightBinding extends LightBinding {
 
         cache.release(this.__three_getLight());
 
+        // clear bound light
+        this.__c_light.__threeObject = null;
+
         this.__shadowmap_unlink();
 
         super.unlink(ctx);

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

@@ -3,13 +3,14 @@
  */
 import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
 import { LeafNode } from "../../../../core/bvh2/LeafNode.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { getSkeletonBoneByType } from "./SkeletonUtils.js";
 import { assert } from "../../../../core/assert.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { updateNodeByTransformAndBBB } from "./updateNodeByTransformAndBBB.js";
 import { applyTransformToThreeObject } from "./applyTransformToThreeObject.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 /**
  *

package/engine/graphics/ecs/mesh-v2/DrawMode.js

@@ -0,0 +1,5 @@
+export const DrawMode = {
+    Triangles: 0,
+    Lines: 2,
+    LineSegments: 3
+};

package/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -0,0 +1,13 @@
+import {BufferGeometry, Material} from "three";
+import {AABB3} from "../../../../core/bvh2/aabb3/AABB3";
+
+export class ShadedGeometry {
+    readonly geometry: BufferGeometry
+    readonly material: Material
+
+    readonly bvh: Readonly<AABB3>
+
+    from(geometry: BufferGeometry, material: Material): void
+
+    static from(geometry: BufferGeometry, material: Material): ShadedGeometry
+}