@woosh/meep-engine 2.43.0 → 2.43.3

package/engine/graphics/ecs/decal/v2/prototypeDecalSystem.js

@@ -13,9 +13,9 @@ import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/
 import { SGMesh } from "../../mesh-v2/aggregate/SGMesh.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
 import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
-import { TaskLoadingScreen } from "../../../../../view/task/TaskLoadingScreen.js";
 import '../../../../../../../../css/game.scss';
 import { countTask } from "../../../../../core/process/task/util/countTask.js";
+import Vector2 from "../../../../../core/geom/Vector2.js";
 
 const decal_urls = `data/textures/icons/FantasyIconsMegaPack/MagicItems/MagicItems_png/transparent/x64/staff_13_t.png
 data/textures/icons/FantasyIconsMegaPack/MagicItems/MagicItems_png/transparent/x64/artifact_01_t.png
@@ -207,6 +207,55 @@ function promise_time_out(t) {
     });
 }
 
+/**
+ *
+ * @param ecd
+ * @param {number} x
+ * @param {number} y
+ * @param {number} size_x
+ * @param {number} size_y
+ * @param {number} spacing
+ * @param {string[]} textures
+ */
+function grid(ecd, offset_x, offset_y,x, y, size_x, size_y, spacing, textures) {
+
+    const random = seededRandom();
+
+    for (let i = 0; i < x; i++) {
+        for (let j = 0; j < y; j++) {
+
+            const decal = new Decal();
+
+            decal.uri = randomFromArray(random, textures);
+
+            const entity = new EntityBuilder();
+
+            entity.clearFlag(EntityBuilderFlags.WatchDestruction);
+
+            const transform = new Transform();
+            transform.position.set(
+                i * (size_x + spacing) + offset_x,
+                0,
+                j * (size_y + spacing) + offset_y,
+            );
+            // transform.rotation.alignToDirection(Vector3.down);
+            // transform.rotation.set(0,0,-0.7,0.7);
+            // transform.rotation.set(0,0.7,0,0.7);
+            transform.rotation.set(-0.7, 0, 0, 0.7);
+            // transform.rotation.random(random);
+            transform.scale.set(size_x, size_y,1 );
+            // transform.scale.setScalar(1);
+
+            entity
+                .add(transform)
+                .add(decal)
+                .build(ecd);
+
+        }
+    }
+
+}
+
 /**
  *
  * @param {Engine} engine
@@ -216,7 +265,9 @@ async function main(engine) {
     await EngineHarness.buildBasics({
         engine,
         enableWater: false,
-        cameraFarDistance: 300
+        cameraFarDistance: 300,
+        terrainResolution: 1,
+        terrainSize: new Vector2(1000, 1000)
     });
 
     new EntityBuilder()
@@ -265,7 +316,7 @@ async function main(engine) {
 
     const task = countTask(0, ENTITY_COUNT, makeOne);
 
-    TaskLoadingScreen.instance.load(engine, task);
+    // TaskLoadingScreen.instance.load(engine, task);
 
     // console.profile('spawn');
 
@@ -273,8 +324,12 @@ async function main(engine) {
         // console.profileEnd('spawn');
     });
 
-    engine.executor.run(task);
+    // engine.executor.run(task);
+
+
+    grid(engine.entityManager.dataset, 20,10,80, 25, .4, .6, .1, decal_urls.slice(105, 105+3));
 
+    grid(engine.entityManager.dataset, 20,30,80, 25, .4, .6, .1, decal_urls.slice(105, 105+3));
     // await promise_time_out(10);
 
 

package/engine/graphics/geometry/VertexDataSpec.js

@@ -1,6 +1,6 @@
-import { isArrayEqual } from "../../../core/collection/ArrayUtils.js";
 import { invokeObjectHash } from "../../../core/model/object/invokeObjectHash.js";
 import { computeHashArray } from "../../../core/collection/array/computeHashArray.js";
+import { isArrayEqual } from "../../../core/collection/array/isArrayEqual.js";
 
 const DEFAULT_HASH = 123456;
 

package/engine/graphics/impostors/octahedral/prototypeBaker.js

@@ -51,10 +51,10 @@ async function main(engine) {
     // const path = 'data/models/road_bike/road_bike.gltf'; //large CAD-type model
     // const path = 'data/models/LowPolyTownshipSet/Barrel/model.gltf';
     // const path = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
-    const path = 'data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf';
+    // const path = 'data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf';
     // const path = 'data/models/MOBA and Tower Defense/Tree_01.gltf';
     // const path = 'data/models/samples/transform-hierarchy.glb';
-    // const path = 'data/models/sponza-pbr/gltf/sponza.glb';
+    const path = 'data/models/sponza-pbr/gltf/sponza.glb';
     // const path = 'moicon/gnutti_not_optimized/model.gltf';
     // const path = 'moicon/isiflow_Oct_15_21/1/model.gltf';
     // const path = 'moicon/Kople/EVCharger1.gltf';
@@ -64,7 +64,7 @@ async function main(engine) {
     // console.profile('bake');
     const id = baker.bake({
         objects,
-        frames: 8,
+        frames: 24,
         resolution: 1024,
         type: ImpostorCaptureType.Hemisphere
     });

package/engine/graphics/micron/plugin/GLTFAssetTransformer.js

@@ -174,7 +174,7 @@ export class GLTFAssetTransformer extends AssetTransformer {
         const micron_path = `${base}/${uri}`;
 
         try {
-            micron_data = await this.__am.promise(micron_path, ASSET_TYPE_ARRAY_BUFFER);
+            micron_data = await this.__am.promise(micron_path, ASSET_TYPE_ARRAY_BUFFER, { skip_queue: true });
         } catch (e) {
             console.error(`Failed to load micron geometry '${micron_path}' referenced in GLTF (will skip): ${e}`);
             return;

package/engine/graphics/micron/plugin/MicronRenderPlugin.js

@@ -149,7 +149,9 @@ export class MicronRenderPlugin extends EnginePlugin {
 
         // ensure that "arraybuffer" asset loader is present
         if (am.getLoaderByType(ASSET_TYPE_ARRAY_BUFFER) === undefined) {
-            am.registerLoader(ASSET_TYPE_ARRAY_BUFFER, new ArrayBufferLoader());
+            am.registerLoader(ASSET_TYPE_ARRAY_BUFFER, new ArrayBufferLoader({
+                fetch_priority: "low" // hint to fetch data in background
+            }));
         }
 
         this.__asset_transformer.assetManager = am;

package/engine/graphics/particles/node-based/codegen/modules/FunctionSignature.js

@@ -1,5 +1,5 @@
-import { isArrayEqual } from "../../../../../../core/collection/ArrayUtils.js";
 import { assert } from "../../../../../../core/assert.js";
+import { isArrayEqual } from "../../../../../../core/collection/array/isArrayEqual.js";
 
 export class FunctionSignature {
     constructor() {

package/engine/graphics/render/forward_plus/LightManager.js

@@ -17,7 +17,6 @@ import Vector3 from "../../../../core/geom/Vector3.js";
 import { query_bvh_frustum_from_objects } from "./query/query_bvh_frustum_from_objects.js";
 import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
 import { computeFrustumCorners } from "./computeFrustumCorners.js";
-import { arraySwapElements } from "../../../../core/collection/ArrayUtils.js";
 import { compute_light_data_hash_0 } from "./cluster/compute_light_data_hash_0.js";
 import { read_plane_pair } from "./cluster/read_plane_pair.js";
 import { read_frustum_planes_to_array } from "../../../../core/geom/3d/frustum/read_frustum_planes_to_array.js";
@@ -47,6 +46,7 @@ import { array_copy } from "../../../../core/collection/array/copyArray.js";
 import { arrayQuickSort } from "../../../../core/collection/array/arrayQuickSort.js";
 import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
 import { frustum_from_camera } from "../../ecs/camera/frustum_from_camera.js";
+import { arraySwapElements } from "../../../../core/collection/array/arraySwapElements.js";
 
 const LOOKUP_CACHE_SIZE = 1024; // must be power of two
 

package/engine/graphics/render/forward_plus/LightManager.spec.js

@@ -35,6 +35,10 @@ test('correct cluster content (single small light)', () => {
 
     const camera = new PerspectiveCamera(45, 1, 1, 10);
     camera.lookAt(0, 0, 5);
+    
+    camera.updateProjectionMatrix();
+    camera.updateMatrix();
+    camera.updateMatrixWorld(true);
 
     lm.setTileMapResolution(1, 1, 1);
 

package/engine/graphics/render/forward_plus/computeFrustumCorners.js

@@ -1,7 +1,9 @@
-import { plane_three_computeConvex3PlaneIntersection } from "../../../../core/geom/3d/plane/plane_computeConvex3PlaneIntersection.js";
+import {
+    plane_three_computeConvex3PlaneIntersection
+} from "../../../../core/geom/3d/plane/plane_three_compute_convex3_plane_intersection.js";
 
 /**
- *
+ * Get frustum corners from a set of planes
  * @param {Float32Array|number[]} result
  * @param {Plane[]} planes
  */

package/engine/graphics/render/forward_plus/prototype/prototypeLightManager.js

@@ -1561,10 +1561,10 @@ function draw_camera_view_planes() {
 // prepare_scene_2();
 // prepare_scene_decal_0();
 // prepare_scene_decal_1();
-// prepare_scene_decal_2();
+prepare_scene_decal_2();
 // prepare_scene_9();
 // prepare_scene_2();
-prepare_scene_0();
+// prepare_scene_0();
 animate();
 
 // draw_camera_view_planes();

package/engine/graphics/render/layers/RenderLayerUtils.js

@@ -1,7 +1,7 @@
+import { v3_distance_above_plane } from "../../../../core/geom/v3_distance_above_plane.js";
 import {
     plane_three_computeConvex3PlaneIntersection
-} from "../../../../core/geom/3d/plane/plane_computeConvex3PlaneIntersection.js";
-import { v3_distance_above_plane } from "../../../../core/geom/v3_distance_above_plane.js";
+} from "../../../../core/geom/3d/plane/plane_three_compute_convex3_plane_intersection.js";
 
 /**
  *

package/engine/graphics/shaders/DenoiseShader.js

@@ -60,7 +60,7 @@ void main(void) {
 `;
 
 /**
- *
+ * Normal Probability Distribution Function
  * @param {number} x
  * @param {number} sigma
  * @return {number}

package/engine/graphics/texture/atlas/AtlasPatch.js

@@ -31,7 +31,7 @@ export class AtlasPatch {
         this.id = -1;
 
         /**
-         *
+         * Texture data of the patch, this is what will be stenciled into the atlas
          * @type {Sampler2D|null}
          */
         this.sampler = null;
@@ -43,8 +43,9 @@ export class AtlasPatch {
         this.uv = new Rectangle(0, 0, 0, 0);
 
         /**
-         * Area in the atlas where patch along with the padding is packed into
-         * Used for packing inside TextureAtlas. Do not modify manually
+         * Area in the atlas where patch along with the padding is packed into.
+         * Used for packing inside TextureAtlas.
+         * Do not modify manually
          * @readonly
          * @protected
          * @type {AABB2}
@@ -56,6 +57,13 @@ export class AtlasPatch {
          * @type {number|AtlasPatchFlag}
          */
         this.flags = 0;
+
+        /**
+         * Version of associated sampler that was last written.
+         * Used to track and signal when sampler needs to be re-painted.
+         * @type {number}
+         */
+        this.last_painted_version = -1;
     }
 
     /**

package/engine/graphics/texture/atlas/CachingTextureAtlas.js

@@ -171,7 +171,7 @@ export class CachingTextureAtlas extends AbstractTextureAtlas {
 
         const target = this.__find_replacement_target(width, height);
 
-        if (target) {
+        if (target !== -1) {
             // evicted just one element
             this.__evict(target);
             return true;
@@ -228,7 +228,7 @@ export class CachingTextureAtlas extends AbstractTextureAtlas {
     }
 
     reset() {
-        this.__cached_patches.splice(i, this.__cached_patches.length);
+        this.__cached_patches.splice(0, this.__cached_patches.length);
         this.__atals.reset();
     }
 

package/engine/graphics/texture/atlas/TextureAtlas.js

@@ -210,6 +210,7 @@ export class TextureAtlas extends AbstractTextureAtlas {
         );
 
         patch.setFlag(AtlasPatchFlag.Painted);
+        patch.last_painted_version = source.version; // record version
 
         // console.timeEnd('TextureAtlas.paintPatch');
     }
@@ -462,10 +463,15 @@ export class TextureAtlas extends AbstractTextureAtlas {
         for (let i = 0; i < l; i++) {
             const patch = patches[i];
 
-            if (!patch.getFlag(AtlasPatchFlag.Painted)) {
+            if (
+                !patch.getFlag(AtlasPatchFlag.Painted)
+                || patch.last_painted_version !== patch.sampler.version
+            ) {
+
                 this.paintPatch(patch);
 
                 paintCount++;
+
             }
         }
 

package/engine/graphics/texture/atlas/TextureAtlas.spec.js

@@ -249,3 +249,25 @@ test("add 7 patches an update each time", () => {
     }
 
 });
+
+test("modified sampler get repainted during 'paint'", () => {
+    const atlas = new TextureAtlas();
+
+    const sampler = Sampler2D.uint8(4, 1, 1);
+
+    sampler.data.fill(7);
+
+    const patch = atlas.add(sampler);
+
+    atlas.update();
+
+    // modify sampler
+    sampler.data.fill(3);
+    sampler.version++;
+
+    atlas.paint(); //repaint
+
+    const v0 = atlas.sampler.readChannel(patch.position.x, patch.position.y, 0)
+
+    expect(v0).toBe(3);
+});

package/engine/graphics/texture/sampler/Sampler2D.js

@@ -1646,70 +1646,6 @@ export class Sampler2D {
         return sampler;
     }
 
-    /**
-     *
-     * @param {Sampler2D} input0
-     * @param {Sampler2D} input1
-     * @param {Sampler2D} result
-     * @param {function( value0 : number[], value1 : number[], result : number[], index : number) : void} operation
-     */
-    static combine(input0, input1, result, operation) {
-        assert.notEqual(input0, undefined, "input0 is undefined");
-        assert.notEqual(input1, undefined, "input1 is undefined");
-        assert.notEqual(result, undefined, "result is undefined");
-
-        assert.typeOf(operation, "function", "operation");
-
-        assert.equal(input0.width, input1.width, `input0.width(=${input0.width}) is not equal to input1.width(=${input1.width})`);
-        assert.equal(input0.height, input1.height, `input0.height(=${input0.height}) is not equal to input1.height(=${input1.height})`);
-
-        assert.equal(input0.width, result.width, `input width(=${input0.width}) is not equal to result.width(=${result.width})`);
-        assert.equal(input0.height, result.height, `input height(=${input0.height}) is not equal to result.height(=${result.height})`);
-
-        const width = input0.width;
-        const height = input0.height;
-
-        const length = width * height;
-
-        const arg0 = [];
-        const arg1 = [];
-        const res = [];
-
-        const itemSize0 = input0.itemSize;
-        const itemSize1 = input1.itemSize;
-        const itemSizeR = result.itemSize;
-
-        const data0 = input0.data;
-        const data1 = input1.data;
-        const dataR = result.data;
-
-
-        let i, j;
-
-        for (i = 0; i < length; i++) {
-
-            // read input 0
-            for (j = 0; j < itemSize0; j++) {
-                arg0[j] = data0[j + i * itemSize0];
-            }
-
-            // read input 1
-            for (j = 0; j < itemSize0; j++) {
-                arg1[j] = data1[j + i * itemSize1];
-            }
-
-            //perform operation
-            operation(arg0, arg1, res, i);
-
-            //write result
-            for (j = 0; j < itemSizeR; j++) {
-                dataR[j + i * itemSizeR] = res[j];
-            }
-
-        }
-
-        result.version++;
-    }
 }
 
 

package/engine/graphics/texture/sampler/Sampler2D.spec.js

@@ -1,4 +1,5 @@
 import { Sampler2D } from "./Sampler2D.js";
+import { sampler2d_combine } from "./sampler2d_combine.js";
 
 test("constructor arguments", () => {
     const uint8Array = new Uint8Array(24);
@@ -217,7 +218,7 @@ test('Sampler2.combine ADD', () => {
 
     const ut = new Sampler2D(new Array(8), 2, 2, 2);
 
-    Sampler2D.combine(s0, s1, ut, function (arg0, arg1, res, index) {
+    sampler2d_combine(s0, s1, ut, function (arg0, arg1, res, index) {
         res[0] = arg0[0] + arg1[0];
         res[1] = arg0[1] + arg1[1];
     });

package/engine/graphics/texture/sampler/sampler2d_combine.js

@@ -0,0 +1,67 @@
+import { assert } from "../../../../core/assert.js";
+
+
+/**
+ * Execute a binary operation with 2 input samplers and an output
+ * @param {Sampler2D} input0
+ * @param {Sampler2D} input1
+ * @param {Sampler2D} result
+ * @param {function( value0 : number[], value1 : number[], result : number[], index : number) : void} operation
+ */
+export function sampler2d_combine(input0, input1, result, operation) {
+    assert.notEqual(input0, undefined, "input0 is undefined");
+    assert.notEqual(input1, undefined, "input1 is undefined");
+    assert.notEqual(result, undefined, "result is undefined");
+
+    assert.typeOf(operation, "function", "operation");
+
+    assert.equal(input0.width, input1.width, `input0.width(=${input0.width}) is not equal to input1.width(=${input1.width})`);
+    assert.equal(input0.height, input1.height, `input0.height(=${input0.height}) is not equal to input1.height(=${input1.height})`);
+
+    assert.equal(input0.width, result.width, `input width(=${input0.width}) is not equal to result.width(=${result.width})`);
+    assert.equal(input0.height, result.height, `input height(=${input0.height}) is not equal to result.height(=${result.height})`);
+
+    const width = input0.width;
+    const height = input0.height;
+
+    const length = width * height;
+
+    const arg0 = [];
+    const arg1 = [];
+    const res = [];
+
+    const itemSize0 = input0.itemSize;
+    const itemSize1 = input1.itemSize;
+    const itemSizeR = result.itemSize;
+
+    const data0 = input0.data;
+    const data1 = input1.data;
+    const dataR = result.data;
+
+
+    let i, j;
+
+    for (i = 0; i < length; i++) {
+
+        // read input 0
+        for (j = 0; j < itemSize0; j++) {
+            arg0[j] = data0[j + i * itemSize0];
+        }
+
+        // read input 1
+        for (j = 0; j < itemSize0; j++) {
+            arg1[j] = data1[j + i * itemSize1];
+        }
+
+        //perform operation
+        operation(arg0, arg1, res, i);
+
+        //write result
+        for (j = 0; j < itemSizeR; j++) {
+            dataR[j + i * itemSizeR] = res[j];
+        }
+
+    }
+
+    result.version++;
+}

package/engine/intelligence/behavior/ecs/BehaviorSystem.spec.js

@@ -1,7 +1,6 @@
 import { BehaviorSystem } from "./BehaviorSystem.js";
 import { BehaviorComponent } from "./BehaviorComponent.js";
 import { Behavior } from "../Behavior.js";
-import { BehaviorStatus } from "../BehaviorStatus.js";
 import { EntityComponentDataset } from "../../../ecs/EntityComponentDataset.js";
 import { EntityManager } from "../../../ecs/EntityManager.js";
 import { noop } from "../../../../core/function/Functions.js";
@@ -44,7 +43,6 @@ test("unlinking finalizes behavior if it is running", () => {
 
     const behavior = new Behavior();
     behavior.finalize = jest.fn();
-    behavior.setStatus(BehaviorStatus.Running);
 
     s.unlink(BehaviorComponent.fromOne(behavior), 0);
 
@@ -56,7 +54,6 @@ test("update ticks behavior with the time delta", () => {
 
     const behavior = new Behavior();
     behavior.tick = jest.fn();
-    behavior.setStatus(BehaviorStatus.Running);
 
     const behaviorComponent = BehaviorComponent.fromOne(behavior);