@woosh/meep-engine 2.33.24 → 2.33.25

package/{engine/graphics/render/forward_plus/materials → core/primitives/strings}/insert_after.js

@@ -3,6 +3,7 @@
  * @param {string} source
  * @param {string} term
  * @param {string} extra
+ * @returns {string}
  */
 export function insert_after(source, term, extra) {
     const i = source.indexOf(term);
@@ -16,3 +17,5 @@ export function insert_after(source, term, extra) {
 
     return source.slice(0, end) + extra + source.slice(end);
 }
+
+

package/core/primitives/strings/insert_after_or_replace.js

@@ -0,0 +1,27 @@
+/**
+ *
+ * @param {string} source
+ * @param {string} insert_term
+ * @param {string} replace_term
+ * @param {string} value
+ * @returns {string}
+ */
+export function insert_after_or_replace(source, insert_term, replace_term, value) {
+    const insert_term_index = source.indexOf(insert_term);
+
+    if (insert_term_index !== -1) {
+        const end = insert_term_index + insert_term.length;
+        return source.slice(0, end) + value + source.slice(end);
+    }
+
+    const replace_term_index = source.indexOf(replace_term);
+
+    if (replace_term_index === -1) {
+        // not found
+        console.warn(`Neither insert term '${insert_term}', nor replacement term '${replace_term}' were found in the source`, source, value);
+        return source;
+    }
+
+
+    return source.slice(0, replace_term_index) + value + source.slice(replace_term_index + replace_term.length);
+}

package/editor/process/symbolic/makeHelperBoxGeometry.js

@@ -0,0 +1,44 @@
+import { BufferAttribute, BufferGeometry, Float32BufferAttribute } from "three";
+
+export function makeHelperBoxGeometry(sx = 1, sy = 1, sz = 1) {
+
+    const geometry = new BufferGeometry();
+
+    const dx = sx / 2;
+    const dy = sy / 2;
+    const dz = sz / 2;
+
+    const vertices = new Float32Array([
+        -dx, -dy, -dz,
+        dx, -dy, -dz,
+        dx, dy, -dz,
+        -dx, dy, -dz,
+
+        -dx, dy, dz,
+        dx, dy, dz,
+        dx, -dy, dz,
+        -dx, -dy, dz
+    ]);
+
+    geometry.setAttribute("position", new Float32BufferAttribute(vertices, 3));
+
+    geometry.setIndex(new BufferAttribute(new Uint8Array([
+        0, 1,
+        1, 2,
+        2, 3,
+        3, 0,
+
+        4, 5,
+        5, 6,
+        6, 7,
+        7, 4,
+
+
+        0, 7,
+        1, 6,
+        2, 5,
+        3, 4
+    ]), 1, false));
+
+    return geometry;
+}

package/editor/view/ecs/EntityEditor.js

@@ -38,7 +38,7 @@ import { HeadsUpDisplayController } from "./components/HeadsUpDisplayController.
 import { BlackboardController } from "./components/BlackboardController.js";
 import { GridObstacleController } from "./components/GridObstacleController.js";
 import { AttachmentSocketsController } from "./components/sockets/AttachmentSocketsController.js";
-import { ParticleEmitterSystem2 } from "../../../engine/graphics/particles/ecs/ParticleEmitterSystem2.js";
+import { ParticleEmitterSystem } from "../../../engine/graphics/particles/ecs/ParticleEmitterSystem.js";
 
 /**
  *
@@ -82,7 +82,7 @@ function prepareComponentFactory(factory, editor) {
         .register('ParticleEmitter', () => {
             const em = editor.engine.entityManager;
 
-            const particleEmitterSystem = em.getSystem(ParticleEmitterSystem2);
+            const particleEmitterSystem = em.getSystem(ParticleEmitterSystem);
 
             return new ParticleEmitterController(particleEmitterSystem);
         })

package/editor/view/ecs/components/particles/ParticleEmitterController.js

@@ -24,7 +24,7 @@ export function enumNameByValue(value, enumerable) {
 /**
  *
  * @param {ParticleEmitter} emitter
- * @param {ParticleEmitterSystem2} system
+ * @param {ParticleEmitterSystem} system
  * @param {function} op
  * @param {*} [arg0]
  */
@@ -61,7 +61,7 @@ function applyEmitterChanges(emitter, system, op, arg0) {
 export class ParticleEmitterController extends EmptyView {
     /**
      *
-     * @param {ParticleEmitterSystem2} particleEmitterSystem
+     * @param {ParticleEmitterSystem} particleEmitterSystem
      * @constructor
      */
     constructor(particleEmitterSystem) {

package/engine/EngineHarness.js

@@ -367,6 +367,7 @@ export class EngineHarness {
             sensitivity
         });
 
+        eb.add(Tag.fromJSON(['CameraController']));
         eb.add(SerializationMetadata.Transient);
 
         eb.build(ecd);

package/engine/animation/AnimationUtils.js

@@ -7,7 +7,7 @@ import { removeComponentsExcept } from "../ecs/util/removeComponentsExcept.js";
 import { createSound, createTimer } from "../EntityCreator.js";
 import Mesh from "../graphics/ecs/mesh/Mesh.js";
 import Trail2D, { Trail2DFlags } from "../graphics/ecs/trail2d/Trail2D.js";
-import { ParticleEmitterSystem2 } from "../graphics/particles/ecs/ParticleEmitterSystem2.js";
+import { ParticleEmitterSystem } from "../graphics/particles/ecs/ParticleEmitterSystem.js";
 import { ParticleEmitter } from "../graphics/particles/particular/engine/emitter/ParticleEmitter.js";
 import { ParticleEmitterFlag } from "../graphics/particles/particular/engine/emitter/ParticleEmitterFlag.js";
 import { distributeParticlesOnObject3D } from "../graphics/particles/particular/engine/utils/distributeParticlesOnObject3D.js";
@@ -137,9 +137,9 @@ export function removeEntityWithMeshParticlesEffect(
 
     /**
      *
-     * @type {ParticleEmitterSystem2}
+     * @type {ParticleEmitterSystem}
      */
-    const sPE = entityManager.getSystem(ParticleEmitterSystem2);
+    const sPE = entityManager.getSystem(ParticleEmitterSystem);
 
     /**
      *
@@ -214,9 +214,9 @@ export function removeEntityGenericEffect(
 
     /**
      *
-     * @type {ParticleEmitterSystem2}
+     * @type {ParticleEmitterSystem}
      */
-    const sPE = engine.entityManager.getSystem(ParticleEmitterSystem2);
+    const sPE = engine.entityManager.getSystem(ParticleEmitterSystem);
 
     /**
      *

package/engine/ecs/EntityBuilder.js

@@ -1,6 +1,7 @@
 import Signal from "../../core/events/signal/Signal.js";
 import { assert } from "../../core/assert.js";
 import { EventType } from "./EntityManager.js";
+import { isDefined } from "../../core/process/matcher/Matchers.js";
 
 /**
  *
@@ -63,7 +64,6 @@ class EntityBuilder {
         this.on = {
             built: new Signal()
         };
-
     }
 
     /**
@@ -238,10 +238,10 @@ class EntityBuilder {
             this.dataset.addEntityEventListener(this.entity, eventName, listener, context);
         } else {
             this.deferredListeners.push({
-                                            name: eventName,
-                                            listener: listener,
-                                            context
-                                        });
+                name: eventName,
+                listener: listener,
+                context
+            });
         }
         return this;
     }
@@ -356,6 +356,26 @@ class EntityBuilder {
         this.on.built.send2(entity, dataset);
         return entity;
     }
+
+    /**
+     *
+     * @param {number} entity
+     * @param {EntityComponentDataset} dataset
+     * @returns {EntityBuilder}
+     */
+    static readFromDataset(entity, dataset) {
+        const r = new EntityBuilder();
+
+        dataset.getAllComponents(entity)
+            .filter(isDefined)
+            .forEach(r.add, r);
+
+        r.setFlag(EntityBuilderFlags.Built);
+        r.entity = entity;
+        r.dataset = dataset;
+
+        return r;
+    }
 }
 
 /**

package/engine/ecs/attachment/AttachmentBinding.js

@@ -30,6 +30,14 @@ export class AttachmentBinding {
         this.attachment = null;
     }
 
+    link() {
+
+    }
+
+    unlink() {
+
+    }
+
     update() {
 
     }

package/engine/ecs/attachment/AttachmentSystem.js

@@ -265,6 +265,8 @@ export class AttachmentSystem extends System {
             //update iterator
             this.waiting.splice(i, 1);
 
+            binding.link();
+
             i--;
             numRecords--;
         }
@@ -305,6 +307,8 @@ export class AttachmentSystem extends System {
                         parentBindings.splice(i, 1);
                     }
 
+                    attachmentBinding.unlink();
+
                     break;
                 }
             }

package/engine/ecs/attachment/TransformAttachmentBinding.js

@@ -1,18 +1,9 @@
-import Vector3 from "../../../core/geom/Vector3.js";
-import { Matrix4, Quaternion as ThreeQuaternion } from "three";
 import { AttachmentBinding } from "./AttachmentBinding.js";
-import Quaternion from "../../../core/geom/Quaternion.js";
+import { mat4 } from "gl-matrix";
 
-const socketM4 = new Matrix4();
-
-const threeQuaternion = new ThreeQuaternion();
-
-const pScale = new Vector3();
-const pPosition = new Vector3();
-
-const attachmentM4 = new Matrix4();
-
-const parentM4 = new Matrix4();
+const scratch_m4_0 = new Float32Array(16);
+const scratch_m4_1 = new Float32Array(16);
+const scratch_m4_2 = new Float32Array(16);
 
 export class TransformAttachmentBinding extends AttachmentBinding {
     constructor() {
@@ -24,40 +15,19 @@ export class TransformAttachmentBinding extends AttachmentBinding {
      * TODO make use of Transform.multiplyTransforms for better readability and performance
      */
     update() {
-        const socketTransform = this.socket.transform;
-
-        threeQuaternion.copy(socketTransform.rotation);
-
-        socketM4.compose(socketTransform.position, threeQuaternion, socketTransform.scale);
-
-        const parentTransform = this.parentTransform;
-
-        threeQuaternion.copy(parentTransform.rotation);
-
-        parentM4.compose(parentTransform.position, threeQuaternion, parentTransform.scale);
-
-        const attachment = this.attachment;
-        const aT = attachment.transform;
-
-        threeQuaternion.copy(aT.rotation);
-
-        attachmentM4.compose(aT.position, threeQuaternion, aT.scale);
-
-        socketM4.multiplyMatrices(parentM4, socketM4);
-        socketM4.multiply(attachmentM4);
-        socketM4.decompose(pPosition, threeQuaternion, pScale);
-
-        const t = this.attachedTransform;
 
-        if (Number.isNaN(threeQuaternion.x)) {
-            t.rotation.copy(Quaternion.identity);
-        } else {
-            t.rotation.copy(threeQuaternion);
-        }
+        this.socket.transform.toMatrix4(scratch_m4_0);
+        this.parentTransform.toMatrix4(scratch_m4_1);
+        this.attachment.transform.toMatrix4(scratch_m4_2);
 
-        t.scale.copy(pScale);
+        mat4.multiply(
+            scratch_m4_0, scratch_m4_1, scratch_m4_0
+        );
+        mat4.multiply(
+            scratch_m4_0, scratch_m4_0, scratch_m4_2
+        );
 
-        t.position.copy(pPosition);
+        this.attachedTransform.fromMatrix4(scratch_m4_0);
     }
 
     link() {

package/engine/ecs/components/Tag.js

@@ -81,6 +81,8 @@ export class Tag {
      * @returns {boolean}
      */
     add(value) {
+        assert.isString(value, 'value');
+
         if (this.contains(value)) {
             return false;
         }
@@ -117,6 +119,8 @@ export class Tag {
      * @returns {boolean}
      */
     contains(value) {
+        assert.isString(value, 'value');
+
         return this.values.indexOf(value) !== -1;
     }
 
@@ -125,16 +129,20 @@ export class Tag {
      * @param {string[]} values
      */
     containsAll(values) {
-        const valueCount = values.length;
+        assert.isArray(values, 'values');
+
+        const search_value_count = values.length;
+
+        const these_values = this.values;
+        const these_values_count = these_values.length;
 
-        const values1 = this.values;
-        const tagCount = values1.length;
+        let i = 0, j = 0;
 
-        main: for (let i = 0; i < valueCount; i++) {
+        main: for (; i < search_value_count; i++) {
             const v = values[i];
 
-            for (let j = 0; j < tagCount; j++) {
-                const tag = values1[j];
+            for (j = 0; j < these_values_count; j++) {
+                const tag = these_values[j];
 
                 if (tag === v) {
                     continue main;
@@ -287,6 +295,19 @@ export class Tag {
         return result;
     }
 
+    /**
+     *
+     * @param {string} tag
+     * @returns {Tag}
+     */
+    static fromOne(tag) {
+        const r = new Tag();
+
+        r.add(tag);
+
+        return r;
+    }
+
 
     /**
      *

package/engine/ecs/fow/FogOfWar.js

@@ -75,6 +75,10 @@ export class FogOfWar {
          */
         this.texture = null;
 
+        /**
+         * Resolution scale of FoW versus terrain resolution, higher number makes FoW more detailed
+         * @type {Vector1}
+         */
         this.scale = new Vector1(1);
 
         /**

package/engine/ecs/fow/FogOfWarSystem.js

@@ -12,6 +12,7 @@ import { BlendingType } from "../../graphics/texture/sampler/BlendingType.js";
 import { FogOfWarRenderer } from "./shader/FogOfWarRenderer.js";
 import { StandardFrameBuffers } from "../../graphics/StandardFrameBuffers.js";
 import { CompositLayer } from "../../graphics/composit/CompositLayer.js";
+import { CompositingStages } from "../../graphics/composit/CompositingStages.js";
 
 
 const frustum = new Frustum();
@@ -133,6 +134,7 @@ export class FogOfWarSystem extends System {
 
         const compositerLayer = graphics.layerComposer.createLayer({}, BlendingType.Normal);
         compositerLayer.name = 'Fog of War';
+        compositerLayer.stage = CompositingStages.POST_TRANSPARENT;
 
         // Fog of war should be drawn last typically, over everything else, so we set order to a large number
         compositerLayer.order = 1000;

package/engine/ecs/gui/hud/HeadsUpDisplaySystem.js

@@ -144,7 +144,9 @@ class HeadsUpDisplaySystem extends System {
                 up.set(worldPositionX, worldPositionY + 1, worldPositionZ, 1);
                 up.threeApplyMatrix4(projectionMatrix);
 
+                // compute perspective divide
                 const d = 1 / Math.abs(up.w);
+
                 up.x *= d;
                 up.y *= d;
                 up.z *= d;

package/engine/ecs/system/AbstractContextSystem.js

@@ -38,7 +38,7 @@ export class AbstractContextSystem extends System {
                 // TODO
             },
             (ctx) => {
-                ctx.unlink();
+                //ctx.unlink();
             }
         );
 

package/engine/ecs/systems/TagSystem.js

@@ -13,6 +13,23 @@ class TagSystem extends System {
 
         this.entityManager = null;
     }
+
+    /**
+     *
+     * @param {string} tag
+     * @param {EntityComponentDataset} ecd
+     * @returns  {number[]}
+     */
+    static find_entities_with_tag(tag, ecd) {
+        const r = [];
+        ecd.traverseComponents(Tag, (t, e) => {
+            if (t.contains(tag)) {
+                r.push(e);
+            }
+        });
+
+        return r;
+    }
 }
 
 

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/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(),
@@ -370,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";
@@ -628,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/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
+}