@woosh/meep-engine 2.33.21 → 2.33.25

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";
 
 /**
  *
@@ -337,7 +337,7 @@ export class ThemeEngine {
             const source_x = u * weights.width;
 
 
-            weights.sampleBilinear(source_x, source_y, weightSample);
+            weights.sampleBilinear(source_x, source_y, weightSample, 0);
 
             for (let i = 0; i < layer_count; i++) {
                 const targetAddress = (y * splatWidth + x) + i * splatLayerSize;

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,15 +4,15 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.21",
+  "version": "2.33.25",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",
     "simplex-noise": "2.4.0",
-    "three": "0.132.2"
+    "three": "^0.132.2"
   },
   "devDependencies": {
     "babel-jest": "^26.6.3",
-    "@types/three": "0.132.2"
+    "@types/three": "^0.132.2"
   }
 }

package/view/View.js

@@ -677,10 +677,12 @@ class View {
 
         const classesToRemove = [];
 
-        for (let i = 0; i < classList.length; i++) {
+        const initial_class_count = classList.length;
+
+        for (let i = 0; i < initial_class_count; i++) {
             const className = classList[i];
 
-            if (className.startsWith('locale-')) {
+            if (className.search(rx) !== -1) {
                 classesToRemove.push(className);
             }
         }

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

@@ -0,0 +1,94 @@
+import {
+    DataTexture,
+    LinearMipMapLinearFilter,
+    NearestFilter,
+    NormalBlending,
+    RGBAFormat,
+    ShaderMaterial,
+    Vector2 as ThreeVector2
+} from "three";
+
+/**
+ *
+ * @return {ShaderMaterial}
+ */
+export 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;
+}

package/engine/graphics/micron/format/MicronGeometryBufferAttributeSpec.js

@@ -1,71 +0,0 @@
-import { DataType } from "../../../../core/collection/table/DataType.js";
-import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
-import { DataTypeByteSizes } from "../../../../core/collection/table/DataTypeByteSizes.js";
-
-export class MicronGeometryBufferAttributeSpec {
-    constructor() {
-        /**
-         *
-         * @type {string}
-         */
-        this.name = "";
-        /**
-         *
-         * @type {DataType}
-         */
-        this.type = DataType.Float32;
-        /**
-         *
-         * @type {number}
-         */
-        this.itemSize = 1;
-
-        /**
-         * Normalized values will be automatically converted to float32 in the shader
-         * This gives good optimization opportunities for things like normal vectors
-         * @type {boolean}
-         */
-        this.normalized = false;
-    }
-
-    hash() {
-        return computeStringHash(this.name);
-    }
-
-    /**
-     *
-     * @param {MicronGeometryBufferAttributeSpec} other
-     * @returns {boolean}
-     */
-    equals(other) {
-        return this.type === other.type
-            && this.itemSize === other.itemSize
-            && this.normalized === other.normalized
-            && this.name === other.name
-            ;
-    }
-
-    /**
-     *
-     * @returns {number}
-     */
-    getByteSize() {
-        return this.itemSize * DataTypeByteSizes[this.type];
-    }
-
-    /**
-     *
-     * @param {MicronGeometryBufferAttributeSpec} a
-     * @param {MicronGeometryBufferAttributeSpec} b
-     * @return {number}
-     */
-    static byName(a, b) {
-        return a.name.localeCompare(b.name);
-    }
-}
-
-/**
- * @readonly
- * @type {boolean}
- */
-MicronGeometryBufferAttributeSpec.prototype.isMicronGeometryBufferAttributeSpec = true;