@woosh/meep-engine 2.33.23 → 2.33.27

package/engine/graphics/util/composeMatrix4.js

@@ -1,13 +1,11 @@
 /**
  *
- * @param {Matrix4} result
+ * @param {number[]|Float32Array|mat4} result
  * @param {Vector3} position
  * @param {Quaternion} rotation
  * @param {Vector3} scale
  */
-export function composeMatrix4(result, position, rotation, scale) {
-    const te = result.elements;
-
+export function compose_matrix4_array(result, position, rotation, scale) {
     const x = rotation.x;
     const y = rotation.y;
     const z = rotation.z;
@@ -33,23 +31,35 @@ export function composeMatrix4(result, position, rotation, scale) {
     const sy = scale.y;
     const sz = scale.z;
 
-    te[0] = (1 - (yy + zz)) * sx;
-    te[1] = (xy + wz) * sx;
-    te[2] = (xz - wy) * sx;
-    te[3] = 0;
-
-    te[4] = (xy - wz) * sy;
-    te[5] = (1 - (xx + zz)) * sy;
-    te[6] = (yz + wx) * sy;
-    te[7] = 0;
-
-    te[8] = (xz + wy) * sz;
-    te[9] = (yz - wx) * sz;
-    te[10] = (1 - (xx + yy)) * sz;
-    te[11] = 0;
-
-    te[12] = position.x;
-    te[13] = position.y;
-    te[14] = position.z;
-    te[15] = 1;
+    result[0] = (1 - (yy + zz)) * sx;
+    result[1] = (xy + wz) * sx;
+    result[2] = (xz - wy) * sx;
+    result[3] = 0;
+
+    result[4] = (xy - wz) * sy;
+    result[5] = (1 - (xx + zz)) * sy;
+    result[6] = (yz + wx) * sy;
+    result[7] = 0;
+
+    result[8] = (xz + wy) * sz;
+    result[9] = (yz - wx) * sz;
+    result[10] = (1 - (xx + yy)) * sz;
+    result[11] = 0;
+
+    result[12] = position.x;
+    result[13] = position.y;
+    result[14] = position.z;
+    result[15] = 1;
+}
+
+/**
+ *
+ * @param {Matrix4} result
+ * @param {Vector3} position
+ * @param {Quaternion} rotation
+ * @param {Vector3} scale
+ */
+export function composeMatrix4(result, position, rotation, scale) {
+    const te = result.elements;
+    compose_matrix4_array(te, position, rotation, scale);
 }

package/engine/graphics/util/decompose_matrix_4_array.js

@@ -0,0 +1,61 @@
+/**
+ *
+ * @param {number[]} m
+ * @param {Vector3} position
+ * @param {Quaternion} rotation
+ * @param {Vector3} scale
+ */
+export function decompose_matrix_4_array(m, position, rotation, scale) {
+    const m11 = m[0];
+    const m12 = m[1];
+    const m13 = m[2];
+
+    const m21 = m[4];
+    const m22 = m[5];
+    const m23 = m[6];
+
+    const m31 = m[8];
+    const m32 = m[9];
+    const m33 = m[10];
+
+    const scale_x = Math.hypot(m11, m12, m13);
+    const scale_y = Math.hypot(m21, m22, m23);
+    const scale_z = Math.hypot(m31, m32, m33);
+
+    // extract rotation
+    const is1 = 1 / scale_x;
+    const is2 = 1 / scale_y;
+    const is3 = 1 / scale_z;
+
+    const sm11 = m11 * is1;
+    const sm12 = m12 * is1;
+    const sm13 = m13 * is1;
+
+    const sm21 = m21 * is2;
+    const sm22 = m22 * is2;
+    const sm23 = m23 * is2;
+
+    const sm31 = m31 * is3;
+    const sm32 = m32 * is3;
+    const sm33 = m33 * is3;
+
+    // write out results
+
+    position.set(
+        m[12],
+        m[13],
+        m[14]
+    );
+
+    scale.set(
+        scale_x,
+        scale_y,
+        scale_z
+    );
+
+    rotation.__setFromRotationMatrix(
+        sm11, sm21, sm31,
+        sm12, sm22, sm32,
+        sm13, sm23, sm33
+    );
+}

package/engine/grid/components/GridObstacle.js

@@ -4,11 +4,11 @@
 
 
 import Vector2 from '../../../core/geom/Vector2.js';
-import { computeHashIntegerArray } from "../../../core/math/MathUtils.js";
 import { assert } from "../../../core/assert.js";
 import { BinaryClassSerializationAdapter } from "../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import { computeIntegerArrayHash } from "../../../core/primitives/array/computeIntegerArrayHash.js";
 import { isArrayEqualStrict } from "../../../core/collection/array/isArrayEqualStrict.js";
+import { computeHashIntegerArray } from "../../../core/collection/array/computeHashIntegerArray.js";
 
 class GridObstacle {
     constructor() {

package/engine/intelligence/behavior/ecs/BehaviorComponent.js

@@ -1,5 +1,7 @@
 import { assert } from "../../../../core/assert.js";
 import { ClockChannelType } from "./ClockChannelType.js";
+import { RepeatBehavior } from "../decorator/RepeatBehavior.js";
+import { ActionBehavior } from "../primitive/ActionBehavior.js";
 
 export const BehaviorComponentFlag = {
     AllowSleep: 1
@@ -25,24 +27,38 @@ export class BehaviorComponent {
          */
         this.flags = 0;
     }
-}
 
-/**
- *
- * @param {Behavior} b
- * @returns {BehaviorComponent}
- */
-BehaviorComponent.fromOne = function (b) {
-    assert.notEqual(b, undefined, 'behavior is undefined');
-    assert.notEqual(b, null, 'behavior is null');
-    assert.equal(b.isBehavior, true, 'b.isBehavior !== true');
 
-    const result = new BehaviorComponent();
+    /**
+     *
+     * @param {function} f
+     * @param {*} [thisArg]
+     * @returns {BehaviorComponent}
+     */
+    static looping_function(f, thisArg) {
+        return BehaviorComponent.fromOne(RepeatBehavior.from(
+            new ActionBehavior(f, thisArg)
+        ));
+    }
 
-    result.list.push(b);
+    /**
+     *
+     * @param {Behavior} b
+     * @returns {BehaviorComponent}
+     */
+    static fromOne(b) {
+        assert.notEqual(b, undefined, 'behavior is undefined');
+        assert.notEqual(b, null, 'behavior is null');
+        assert.equal(b.isBehavior, true, 'b.isBehavior !== true');
 
-    return result;
-};
+        const result = new BehaviorComponent();
+
+        result.list.push(b);
+
+        return result;
+
+    }
+}
 
 /**
  * @readonly

package/engine/intelligence/behavior/selector/WeightedElement.js

@@ -1,7 +1,8 @@
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { assert } from "../../../../core/assert.js";
 import { invokeObjectEquals } from "../../../../core/model/object/invokeObjectEquals.js";
 import { invokeObjectHash } from "../../../../core/model/object/invokeObjectHash.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 export class WeightedElement {
 

package/engine/intelligence/optimization/RandomOptimizer.js

@@ -1,5 +1,5 @@
-import { randomFromArray} from "../../../core/math/MathUtils.js";
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
+import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
 
 /**
  * Hill climbing optimizer based on random moves

package/engine/knowledge/database/StaticKnowledgeDataTable.js

@@ -222,7 +222,7 @@ export class StaticKnowledgeDataTable {
             } catch (e) {
 
                 let id;
-                //attempt to extract talent ID
+                //attempt to extract item ID
                 try {
                     id = datum.id;
                 } catch (e) {
@@ -243,6 +243,11 @@ export class StaticKnowledgeDataTable {
                 return;
             }
 
+            if (this.contains(id)) {
+                console.error(`Duplicate id '${id}'`);
+                return;
+            }
+
             this.__json.set(id, datum);
 
             const added = this.add(element);

package/engine/navigation/ecs/components/Path.js

@@ -3,7 +3,6 @@
  */
 
 
-import { line3_computeSegmentPointDistance_sqr } from "../../../../core/geom/LineSegment.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 
 import { CatmullRomCurve3 } from "three";
@@ -18,6 +17,7 @@ import { min2 } from "../../../../core/math/min2.js";
 import { computeNonuniformCatmullRomSplineSample } from "./computeNonuniformCatmullRomSplineSample.js";
 import { InterpolationType } from "./InterpolationType.js";
 import { v3_distance } from "../../../../core/geom/v3_distance.js";
+import { line3_computeSegmentPointDistance_sqr } from "../../../../core/geom/3d/line/line3_computeSegmentPointDistance_sqr.js";
 
 const v3_a = new Vector3();
 const v3_b = new Vector3();
@@ -270,11 +270,6 @@ class Path {
     copy(other) {
         this.__data.copy(other.__data);
         this.interpolation = other.interpolation;
-
-        // Traversal variables
-        this.markerOffset = other.markerOffset;
-        this.markerIndex = other.markerIndex;
-        this.markerDistanceToNext = other.markerDistanceToNext;
     }
 
     /**

package/engine/navigation/grid/FastBinaryHeap.spec.js

@@ -1,7 +1,7 @@
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import BinaryHeap from "./FastBinaryHeap.js";
 import { passThrough, returnZero } from "../../../core/function/Functions.js";
-import { randomIntegerBetween} from "../../../core/math/MathUtils.js";
+import { randomIntegerBetween } from "../../../core/math/random/randomIntegerBetween.js";
 
 test("constructor doesn't throw", () => {
     new BinaryHeap(returnZero);

package/engine/sound/ecs/emitter/SoundEmitter.js

@@ -10,11 +10,12 @@ import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
 import { SoundAttenuationFunction } from "./SoundAttenuationFunction.js";
 import { attenuateSoundLinear } from "./attenuate/attenuateSoundLinear.js";
 import { attenuateSoundLogarithmic } from "./attenuate/attenuateSoundLogarithmic.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { SoundPanningModelType } from "./SoundPanningModelType.js";
 import { attenuateSoundSmith } from "./attenuate/attenuateSoundSmith.js";
 import { objectKeyByValue } from "../../../../core/model/object/objectKeyByValue.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";
 
 /**
  * Convert decibel to percentage volume

package/engine/sound/ecs/emitter/SoundTrack.js

@@ -1,8 +1,9 @@
 import Signal from "../../../../core/events/signal/Signal.js";
 import { SoundTrackFlags } from "./SoundTrackFlags.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { assert } from "../../../../core/assert.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";
 
 const DEFAULT_FLAGS = SoundTrackFlags.StartWhenReady;
 

package/engine/sound/material/concrete/RandomSoundMaterial.js

@@ -1,6 +1,6 @@
 import { AbstractSoundMaterialDefinition } from "../AbstractSoundMaterialDefinition.js";
-import { randomFromArray } from "../../../../core/math/MathUtils.js";
 import { SoundAssetPlaybackSpec } from "../../asset/SoundAssetPlaybackSpec.js";
+import { randomFromArray } from "../../../../core/math/random/randomFromArray.js";
 
 export class RandomSoundMaterial extends AbstractSoundMaterialDefinition {
     constructor() {

package/engine/ui/notification/notificationGenerator.js

@@ -1,6 +1,6 @@
 import { Notification } from "../../notify/Notification.js";
-import { randomFromArray } from "../../../core/math/MathUtils.js";
 import { NotificationAreaKind } from "../GUIEngine.js";
+import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
 
 function notificationGenerator(callback, timeout = 5) {
     const phrases = [

package/generation/filtering/numeric/complex/CellFilterGaussianBlur.js

@@ -1,5 +1,5 @@
 import { CellFilter } from "../../CellFilter.js";
-import { gaussian } from "../../../../core/math/MathUtils.js";
+import { gaussian } from "../../../../core/math/gaussian.js";
 
 function buildKernel(result, samplesX, samplesY, sigma_x, sigma_y) {
     const half_samples_x = (samplesX / 2);

package/generation/grid/generation/GridTaskExecuteRuleTimes.js

@@ -3,9 +3,10 @@ import { GridTaskGenerator } from "../GridTaskGenerator.js";
 import Task from "../../../core/process/task/Task.js";
 import TaskSignal from "../../../core/process/task/TaskSignal.js";
 import { BitSet } from "../../../core/binary/BitSet.js";
-import { PI_HALF, randomIntegerBetween} from "../../../core/math/MathUtils.js";
+import { PI_HALF } from "../../../core/math/MathUtils.js";
 import { actionTask } from "../../../core/process/task/TaskUtils.js";
 import TaskGroup from "../../../core/process/task/TaskGroup.js";
+import { randomIntegerBetween } from "../../../core/math/random/randomIntegerBetween.js";
 
 export class GridTaskExecuteRuleTimes extends GridTaskGenerator {
     constructor() {

package/generation/markers/actions/MarkerNodeActionSelectRandom.js

@@ -1,7 +1,7 @@
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import { MarkerNodeAction } from "./MarkerNodeAction.js";
 import { assert } from "../../../core/assert.js";
-import { randomFromArray} from "../../../core/math/MathUtils.js";
+import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
 
 export class MarkerNodeActionSelectRandom extends MarkerNodeAction {
     constructor() {

package/generation/markers/transform/MarkerNodeTransformerRecordUniqueRandomEnum.js

@@ -1,7 +1,7 @@
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import { MarkerNodeTransformer } from "./MarkerNodeTransformer.js";
-import { randomIntegerBetween} from "../../../core/math/MathUtils.js";
 import { assert } from "../../../core/assert.js";
+import { randomIntegerBetween } from "../../../core/math/random/randomIntegerBetween.js";
 
 export class MarkerNodeTransformerRecordUniqueRandomEnum extends MarkerNodeTransformer {
     constructor() {

package/generation/placement/action/random/CellActionSelectRandom.js

@@ -1,7 +1,7 @@
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { GridCellAction } from "../GridCellAction.js";
-import { randomFromArray} from "../../../../core/math/MathUtils.js";
 import { assert } from "../../../../core/assert.js";
+import { randomFromArray } from "../../../../core/math/random/randomFromArray.js";
 
 export class CellActionSelectRandom extends GridCellAction {
     constructor() {

package/generation/theme/ThemeEngine.js

@@ -1,7 +1,6 @@
 import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
 import { assert } from "../../core/assert.js";
 import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
-import { randomFloatBetween } from "../../core/math/MathUtils.js";
 import { seededRandom } from "../../core/math/random/seededRandom.js";
 import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.js";
 import { actionTask, countTask, emptyTask, futureTask } from "../../core/process/task/TaskUtils.js";
@@ -17,6 +16,7 @@ import { HashMap } from "../../core/collection/HashMap.js";
 import { TerrainLayer } from "../../engine/ecs/terrain/ecs/layers/TerrainLayer.js";
 import { TerrainFlags } from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
 import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLowIndex.js";
+import { randomFloatBetween } from "../../core/math/random/randomFloatBetween.js";
 
 /**
  *

package/misc/makeMaterialIconCached.js

@@ -1,8 +1,8 @@
 import { Cache } from "../core/cache/Cache.js";
-import { computeHashIntegerArray } from "../core/math/MathUtils.js";
 import { computeMaterialEquality } from "../engine/asset/loaders/material/computeMaterialEquality.js";
 import { computeMaterialHash } from "../engine/asset/loaders/material/computeMaterialHash.js";
 import { makeMaterialIcon } from "./makeMaterialIcon.js";
+import { computeHashIntegerArray } from "../core/collection/array/computeHashIntegerArray.js";
 
 /**
  *
@@ -47,4 +47,4 @@ export function makeMaterialIconCached(material, renderer, size) {
     }
 
     return sampler;
-}
+}

package/package.json

@@ -4,7 +4,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.23",
+  "version": "2.33.27",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",

package/view/elements/image/HTMLElementCacheKey.js

@@ -1,7 +1,8 @@
-import { computeHashArray, computeHashIntegerArray } from "../../../core/math/MathUtils.js";
 import { isArrayEqual } from "../../../core/collection/ArrayUtils.js";
 import { KeyValuePair } from "../../../core/collection/KeyValuePair.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";
 
 /**
  *

package/view/elements/radial/RadialText.js

@@ -1,7 +1,8 @@
 import View from "../../View.js";
 import SVG, { svgCircularPath } from "../../SVG.js";
-import { isValueBetween, PI2 } from "../../../core/math/MathUtils.js";
+import { PI2 } from "../../../core/math/MathUtils.js";
 import { assert } from "../../../core/assert.js";
+import { isValueBetween } from "../../../core/math/isValueBetween.js";
 
 let idCount = 0;
 

package/view/minimap/gl/MinimapMarkersGL.js

@@ -1,19 +1,6 @@
-import {
-    DataTexture,
-    LinearMipMapLinearFilter,
-    NearestFilter,
-    NormalBlending,
-    Points,
-    RGBAFormat,
-    ShaderMaterial,
-    Vector2 as ThreeVector2
-} from 'three';
+import { DataTexture, Points } from 'three';
 import { AssetManager } from "../../../engine/asset/AssetManager.js";
 import { ManagedAtlas } from "../../../engine/graphics/texture/atlas/ManagedTextureAtlas.js";
-import {
-    ParticleAttributeType,
-    ParticleDataType,
-} from "../../../engine/graphics/particles/particular/group/ParticleGroup.js";
 import { EntityObserver } from "../../../engine/ecs/EntityObserver.js";
 import { Transform } from "../../../engine/ecs/transform/Transform.js";
 import MinimapMarker from "../../../../model/game/ecs/component/minimap/MinimapMarker.js";
@@ -24,91 +11,10 @@ import { ParticleSpecification } from "../../../engine/graphics/particles/partic
 import { ParticleAttribute } from "../../../engine/graphics/particles/particular/group/ParticleAttribute.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import { writeSample2DDataToDataTexture } from "../../../engine/graphics/texture/sampler/writeSampler2DDataToDataTexture.js";
-
-/**
- *
- * @return {ShaderMaterial}
- */
-function buildMaterial() {
-    function vertexShader() {
-        return `
-            attribute float size;
-            attribute vec4 aPatch;
-            
-			varying vec4 vPatch;
-			
-			uniform vec2 resolution;
-			
-			vec2 extractScale2D(mat4 matrix){
-			    float sx = length(matrix[0].xy);
-			    float sz = length(matrix[2].xy);
-			
-			    return vec2(sx, sz);
-			}
-			
-			void main() {
-			    vPatch = aPatch;
-				vec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );
-				
-				//extract scale
-				vec2 scale =  extractScale2D(projectionMatrix);
-
-                float radius = size / 2.0;
-							
-				gl_Position = projectionMatrix * mvPosition;
-				gl_PointSize = resolution.y * radius * max(scale.x, scale.y);
-			}`;
-    }
-
-    function fragmentShader() {
-        return `
-            uniform sampler2D atlas;
-            
-			varying vec4 vPatch;
-			void main() {
-			    vec2 uv = gl_PointCoord*vPatch.zw + vPatch.xy;
-			    vec4 texel = texture2D( atlas, uv );
-			    
-			    if(texel.a == 0.0){
-			        discard;
-			    }
-			    
-				gl_FragColor = texel;
-			}`;
-    }
-
-
-    const dataTexture = new DataTexture(new Uint8Array(4), 1, 1, RGBAFormat);
-    dataTexture.flipY = false;
-    dataTexture.generateMipmaps = true;
-    dataTexture.minFilter = LinearMipMapLinearFilter;
-    dataTexture.magFilter = NearestFilter;
-
-    const uniforms = {
-        atlas: {
-            type: 't',
-            value: dataTexture
-        },
-        resolution: {
-            type: 'v2',
-            value: new ThreeVector2()
-        }
-    };
-
-    const material = new ShaderMaterial({
-        uniforms,
-        vertexShader: vertexShader(),
-        fragmentShader: fragmentShader(),
-        blending: NormalBlending,
-        lights: false,
-        fog: false,
-        depthTest: false,
-        transparent: true,
-        vertexColors: false
-    });
-
-    return material;
-}
+import { ParticleDataType } from "../../../engine/graphics/particles/particular/group/ParticleDataType.js";
+import { ParticleAttributeType } from "../../../engine/graphics/particles/particular/group/ParticleAttributeType.js";
+import { buildMaterial } from "./buildMaterial.js";
+import { ParticleGroup } from "../../../engine/graphics/particles/particular/group/ParticleGroup.js";
 
 /**
  *
@@ -164,7 +70,7 @@ export class MinimapMarkersGL extends MinimapWorldLayer {
          *
          * @type {ParticleGroup}
          */
-        const particles = this.particles = particleSpecification.build();
+        const particles = this.particles = new ParticleGroup(particleSpecification);
 
         this.entityObserver = new EntityObserver([Transform, MinimapMarker], addElement, removeElement);
 

package/view/minimap/gl/MinimapWorldGL.js

@@ -171,13 +171,20 @@ export class MinimapWorldGL {
     }
 
     update() {
-        this.layers.forEach(o => {
-            o.update(this.camera);
-            if (o.needsRender) {
+        const layers = this.layers;
+        const layer_count = layers.length;
+
+        for (let i = 0; i < layer_count; i++) {
+            const layer = layers[i];
+
+            layer.update(this.camera);
+
+            if (layer.needsRender) {
                 this.renderNeedsUpdate = true;
-                o.needsRender = false;
+                layer.needsRender = false;
             }
-        });
+
+        }
 
         if (this.renderNeedsUpdate) {
             this.render();