@woosh/meep-engine 2.33.21 → 2.33.25

package/engine/asset/loaders/image/ImageRGBADataAsset.js

@@ -28,6 +28,12 @@ export class ImageRGBADataAsset extends Asset {
          */
         this.height = height;
 
+        /**
+         * Number of channels
+         * @type {number}
+         */
+        this.itemSize = 4;
+
         this.byteSize = data.length;
     }
 
@@ -35,7 +41,8 @@ export class ImageRGBADataAsset extends Asset {
         return {
             data: this.data,
             width: this.width,
-            height: this.height
+            height: this.height,
+            itemSize: this.itemSize
         };
     }
 }

package/engine/asset/loaders/material/computeImageBitmapEquality.js

@@ -79,6 +79,17 @@ function obtainCanvasCtx(width, height) {
     return gl;
 }
 
+/**
+ *
+ * @param {ImageBitmap} bitmap
+ * @return {Sampler2D}
+ */
+export function sampler_from_bitmap(bitmap) {
+    const ctx = obtainCanvasCtx(bitmap.width, bitmap.height);
+
+    return obtainSampler(bitmap, ctx);
+}
+
 /**
  *
  * @param {ImageBitmap} a

package/engine/asset/loaders/material/computeImageBitmapHash.js

@@ -1,47 +1,41 @@
 import { min2 } from "../../../../core/math/min2.js";
-import { computeIntegerArrayHash } from "../../../../core/primitives/array/computeIntegerArrayHash.js";
+import { sampler_from_bitmap } from "./computeImageBitmapEquality.js";
 
-let canvas = null;
-let canvasContext = null;
 
 /**
  *
- * @returns {CanvasRenderingContext2D}
+ * @param {ImageBitmap} bitmap
+ * @returns {number}
  */
-function getCanvasContext() {
+export function computeImageBitmapHash(bitmap) {
 
-    if (canvasContext === null) {
-        canvas = document.createElement('canvas');
+    const w = min2(bitmap.width, 8);
+    const h = min2(bitmap.height, 8);
 
-        canvas.height = 8;
-        canvas.width = 8;
+    const sampler = sampler_from_bitmap(bitmap);
 
-        canvasContext = canvas.getContext('2d');
+    const sampler_data = sampler.data;
+    const item_size = sampler.itemSize;
 
-    }
+    let hash = 0;
 
-    return canvasContext;
+    for (let y = 0; y < h; y++) {
 
-}
+        const row_size = y * sampler.width;
 
-/**
- *
- * @param {ImageBitmap} bitmap
- * @returns {number}
- */
-export function computeImageBitmapHash(bitmap) {
-    const ctx = getCanvasContext();
+        for (let x = 0; x < w; x++) {
 
-    const w = min2(bitmap.width, 8);
-    const h = min2(bitmap.height, 8);
+            const texel_index = x + row_size;
+            const address = texel_index * item_size;
 
-    ctx.clearRect(0, 0, w, h);
+            for (let i = 0; i < item_size; i++) {
 
-    ctx.drawImage(bitmap, 0, 0, w, h, 0, 0, w, h);
+                const v = sampler_data[address];
 
-    const imageData = ctx.getImageData(0, 0, w, h);
-
-    const data = imageData.data;
+                hash = (hash << 5) - hash + v;
+            }
+        }
+    }
 
-    return computeIntegerArrayHash(data, 0, data.length);
+    return hash;
 }

package/engine/asset/loaders/material/computeMaterialHash.js

@@ -1,7 +1,9 @@
-import { computeHashArray, computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { planeHash } from "./planeHash.js";
 import { computeTextureHash } from "./computeTextureHash.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
+import { computeHashArray } from "../../../../core/collection/array/computeHashArray.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 /**
  *

package/engine/asset/loaders/material/computeTextureHash.js

@@ -1,6 +1,7 @@
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { max2 } from "../../../../core/math/max2.js";
 import { computeImageBitmapHash } from "./computeImageBitmapHash.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 /**
  *

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/animation/Animation.js

@@ -8,7 +8,8 @@ import ObservedString from "../../../core/model/ObservedString.js";
 import ObservedInteger from "../../../core/model/ObservedInteger.js";
 import Vector1 from "../../../core/geom/Vector1.js";
 import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../core/math/hash/computeHashFloat.js";
 
 /**
  *

package/engine/ecs/animation/InverseKinematics.js

@@ -1,7 +1,8 @@
 import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 import { NumericInterval } from "../../../core/math/interval/NumericInterval.js";
-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";
 
 class IKConstraint {
     constructor() {

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/dynamic_actions/DynamicActorSystem.js

@@ -14,11 +14,12 @@ import { SerializationMetadata } from "../components/SerializationMetadata.js";
 import Tag from "../components/Tag.js";
 import { OverrideContextBehavior } from "../../../../model/game/util/behavior/OverrideContextBehavior.js";
 import { HashMap } from "../../../core/collection/HashMap.js";
-import { randomFloatBetween, randomFromArray } from "../../../core/math/MathUtils.js";
 import { assert } from "../../../core/assert.js";
 import { RuleExecution } from "./RuleExecution.js";
 import { computeContextualDynamicRuleDebugString } from "./rules/computeContextualDynamicRuleDebugString.js";
 import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
+import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
+import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
 
 /**
  * In seconds

package/engine/ecs/dynamic_actions/DynamicRuleDescriptionTable.spec.js

@@ -3,15 +3,13 @@ import { DynamicRuleDescriptionTable } from "./rules/DynamicRuleDescriptionTable
 import { createRandomReactiveExpression } from "../../../core/model/reactive/model/util/createRandomReactiveExpression.js";
 import { ReactiveReference } from "../../../core/model/reactive/model/terminal/ReactiveReference.js";
 import { ReactiveLiteralNumber } from "../../../core/model/reactive/model/terminal/ReactiveLiteralNumber.js";
-import {
-    randomFloatBetween,
-    randomFromArray,
-    randomIntegerBetween
-} from "../../../core/math/MathUtils.js";
 import { ReactiveLiteralString } from "../../../core/model/reactive/model/terminal/ReactiveLiteralString.js";
 import { ReactiveLiteralBoolean } from "../../../core/model/reactive/model/terminal/ReactiveLiteralBoolean.js";
 import { DynamicRuleDescription } from "./rules/DynamicRuleDescription.js";
 import DataType from "../../../core/parser/simple/DataType.js";
+import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
+import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
+import { randomIntegerBetween } from "../../../core/math/random/randomIntegerBetween.js";
 
 describe.skip('performance', () => {
 

package/engine/ecs/dynamic_actions/actions/definition/WeightedRandomActionDescription.js

@@ -1,7 +1,7 @@
 import { AbstractActionDescription } from "./AbstractActionDescription.js";
 import { WeightedRandomBehavior } from "../../../../intelligence/behavior/selector/WeightedRandomBehavior.js";
 import { WeightedElement } from "../../../../intelligence/behavior/selector/WeightedElement.js";
-import { computeHashFloat } from "../../../../../core/math/MathUtils.js";
+import { computeHashFloat } from "../../../../../core/math/hash/computeHashFloat.js";
 
 export class WeightedRandomActionDescription extends AbstractActionDescription {
     constructor() {

package/engine/ecs/evaluation/complex/PointFitnessGaussianBlur.js

@@ -1,6 +1,6 @@
 import { PointFitnessFunction } from "../PointFitnessFunction.js";
 import { assert } from "../../../../core/assert.js";
-import { gaussian } from "../../../../core/math/MathUtils.js";
+import { gaussian } from "../../../../core/math/gaussian.js";
 
 export class PointFitnessGaussianBlur extends PointFitnessFunction {
     constructor() {

package/engine/ecs/foliage/ecs/Foliage2.js

@@ -4,7 +4,7 @@ import ObservedBoolean from "../../../../core/model/ObservedBoolean.js";
 import { InstancedFoliage } from "../InstancedFoliage.js";
 import { Base64 } from "../../../../core/binary/Base64.js";
 import { BinaryBuffer } from "../../../../core/binary/BinaryBuffer.js";
-import { computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 
 export class FoliageLayer {
     constructor() {

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/fow/shader/FogOfWarRenderer.js

@@ -1,8 +1,8 @@
 import { buildScreenSpaceFogOfWarShader } from "./screenSpaceFogOfWarShader.js";
 import { assert } from "../../../../core/assert.js";
 import { Mesh, OrthographicCamera, Scene } from "three";
-import { isValueBetweenInclusive } from "../../../../core/math/MathUtils.js";
 import { FULL_SCREEN_TRIANGLE_GEOMETRY } from "../../../graphics/geometry/FULL_SCREEN_TRIANGLE_GEOMETRY.js";
+import { isValueBetweenInclusive } from "../../../../core/math/isValueBetweenInclusive.js";
 
 /**
  *

package/engine/ecs/gui/GUIElement.js

@@ -6,9 +6,9 @@ import ObservedBoolean from "../../../core/model/ObservedBoolean.js";
 import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "../storage/COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
 import { assert } from "../../../core/assert.js";
-import { computeHashIntegerArray } 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";
 
 /**
  *

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

@@ -7,7 +7,7 @@
 
 import Vector3 from '../../../../core/geom/Vector3.js';
 import { HeadsUpDisplayFlag } from "./HeadsUpDisplayFlag.js";
-import { computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 
 class HeadsUpDisplay {
     /**

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/gui/position/ViewportPosition.js

@@ -5,7 +5,8 @@
 import Vector2 from "../../../../core/geom/Vector2.js";
 import ObservedBoolean from "../../../../core/model/ObservedBoolean.js";
 import { BinaryClassSerializationAdapter } from "../../storage/binary/BinaryClassSerializationAdapter.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 /**
  * @readonly

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/RangedAttackSystem.js

@@ -8,7 +8,7 @@ import PhysicalBody from '../components/PhysicalBody.js';
 import Motion from '../components/Motion.js';
 import Renderable from '../components/Renderable.js';
 import { Matrix4 as ThreeMatrix4, Vector3 as ThreeVector3 } from 'three';
-import { solveQuadratic } from "../../../core/math/MathUtils.js";
+import { solveQuadratic } from "../../../core/math/solveQuadratic.js";
 
 /**
  * Return the firing solution for a projectile starting at 'src' with

package/engine/ecs/systems/SteeringSystem.js

@@ -10,10 +10,10 @@ import PhysicalBody from '../components/PhysicalBody.js';
 import Motion from '../components/Motion.js';
 import { Transform } from '../transform/Transform.js';
 import Steering, { SteeringEvents, SteeringFlags } from '../components/Steering.js';
-import { solveQuadratic } from "../../../core/math/MathUtils.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { alignToVector } from "../terrain/ecs/ClingToTerrainSystem.js";
 import { v3_dot } from "../../../core/geom/v3_dot.js";
+import { solveQuadratic } from "../../../core/math/solveQuadratic.js";
 
 /**
  *

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/terrain/tiles/TerrainTileManager.js

@@ -14,7 +14,6 @@ import CheckersTexture from '../../../graphics/texture/CheckersTexture.js';
 import { MeshPhongMaterial } from 'three';
 import { assert } from "../../../../core/assert.js";
 import { Color } from "../../../../core/color/Color.js";
-import { randomFloatBetween } from "../../../../core/math/MathUtils.js";
 import { noop } from "../../../../core/function/Functions.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
@@ -24,6 +23,7 @@ import { traverseBinaryNodeUsingVisitor } from "../../../../core/bvh2/traversal/
 import { aabb2_overlapExists } from "../../../../core/geom/AABB2.js";
 import ObservedInteger from "../../../../core/model/ObservedInteger.js";
 import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
+import { randomFloatBetween } from "../../../../core/math/random/randomFloatBetween.js";
 
 class TerrainTileManager {
     /**

package/engine/ecs/tooltip/TooltipComponent.js

@@ -1,3 +1,5 @@
+import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
+
 export class TooltipComponent {
     constructor() {
         /**
@@ -7,6 +9,19 @@ export class TooltipComponent {
         this.key = '';
     }
 
+    hash() {
+        return computeStringHash(this.key);
+    }
+
+    /**
+     *
+     * @param {TooltipComponent} other
+     * @return {boolean}
+     */
+    equals(other) {
+        return this.key === other.key;
+    }
+
     toJSON() {
         return {
             key: this.key