@woosh/meep-engine 2.31.1 → 2.31.5

package/engine/graphics/micron/render/v1/MaterialContext.js

@@ -1,6 +1,6 @@
 import { ThreeInstancedAdapter } from "../instanced/ThreeInstancedAdapter.js";
 import { composeCompile } from "../../../material/composeCompile.js";
-import { Mesh, MeshDepthMaterial, RGBADepthPacking } from "three";
+import { Mesh, MeshDepthMaterial, MeshNormalMaterial, RGBADepthPacking } from "three";
 
 const MATERIAL_FLAG = '@micron_instanced_rewritten';
 
@@ -97,9 +97,28 @@ export class MaterialContext {
         const customDepthMaterial = new MeshDepthMaterial({
             depthPacking: RGBADepthPacking
         });
-        m.customDepthMaterial = customDepthMaterial;
+
+        customDepthMaterial.map = material.map;
+        customDepthMaterial.alphaTest = material.alphaTest;
         customDepthMaterial.onBeforeCompile = rewrite_material;
 
+        m.customDepthMaterial = customDepthMaterial;
+
+        const customNormalMaterial = new MeshNormalMaterial({
+            depthWrite: true
+        });
+
+        customNormalMaterial.map = material.map;
+        customNormalMaterial.normalMap = material.normalMap;
+        customNormalMaterial.normalScale = material.normalScale;
+        customNormalMaterial.normalMapType = material.normalMapType;
+
+        customNormalMaterial.alphaTest = material.alphaTest;
+        customNormalMaterial.onBeforeCompile = rewrite_material;
+
+        m.customNormalMaterial = customNormalMaterial;
+
+
         //
         this.adapter.onRebuild.add(() => {
             m.geometry = this.adapter.__buffer_geometry;

package/engine/graphics/particles/particular/engine/renderers/billboard/prototypeBillboardRenderer.js

@@ -31,7 +31,7 @@ async function init(engineHarness) {
 
     const config = new EngineConfiguration();
 
-    config.addSystem(new MeshSystem(engine.graphics, engine.assetManager));
+    config.addSystem(new MeshSystem(engine));
     config.addLoader('image', new ImageRGBADataLoader());
 
     await config.apply(engine);

package/engine/graphics/particles/particular/engine/simulator/SimulationStepFixedPhysics.js

@@ -36,7 +36,7 @@ export class SimulationStepFixedPhysics extends AbstractSimulationStep {
 
             const layer_position = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
-            const layer_index = layer_position * layerCount;
+            const layer_index = Math.round(layer_position * layerCount);
 
             if ((layerMask & (1 << layer_index)) === 0) {
                 //skip

package/engine/graphics/render/buffer/buffers/NormalFrameBuffer.js

@@ -93,6 +93,10 @@ export class NormalFrameBuffer extends FrameBuffer {
      * @param {Object3D} object
      */
     __renderObject(object) {
+        if (!object.visible) {
+            return;
+        }
+
         if (object.isMesh || object.isSkinnedMesh) {
 
             /**
@@ -107,28 +111,33 @@ export class NormalFrameBuffer extends FrameBuffer {
                 return;
             }
 
-            /**
-             *
-             * @type {Material}
-             */
-            const source_material = mesh.material;
-
 
             let target_material;
 
-            // TODO take normal map into account
-
-            if (mesh.isSkinnedMesh) {
-                target_material = this.__material_skinned;
+            if (mesh.customNormalMaterial !== undefined) {
+                target_material = mesh.customNormalMaterial;
             } else {
-                target_material = this.__material_static;
-            }
+
+                /**
+                 *
+                 * @type {Material}
+                 */
+                const source_material = mesh.material;
+
+                // TODO take normal map into account
+
+                if (mesh.isSkinnedMesh) {
+                    target_material = this.__material_skinned;
+                } else {
+                    target_material = this.__material_static;
+                }
 
 
-            if (source_material !== undefined) {
-                // assign normal map and color map
-                target_material.map = source_material.map;
-                target_material.normalMap = source_material.normalMap;
+                if (source_material !== undefined) {
+                    // assign normal map and color map
+                    target_material.map = source_material.map;
+                    target_material.normalMap = source_material.normalMap;
+                }
             }
 
             this.__renderer.renderBufferDirect(this.__current_render_camera, null, geometry, target_material, mesh, null);

package/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -41,7 +41,6 @@ import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSyst
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
 import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/animation/InverseKinematicsSystem.js";
-import { PathDisplaySystem } from "../../../../../../model/engine/visual/path/PathDisplaySystem.js";
 import { CanvasView } from "../../../../../view/elements/CanvasView.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
@@ -67,6 +66,8 @@ import {
 } from "three";
 import { buildCubeURLs, StandardFrameBuffers } from "../../../GraphicsEngine.js";
 import { AmbientOcclusionPostProcessEffect } from "../simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
+import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
+import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 
 const engineHarness = new EngineHarness();
 
@@ -104,7 +105,7 @@ function makeConfig(engine) {
         new TopDownCameraControllerSystem(graphics),
         new TopDownCameraLanderSystem(),
         new CameraSystem(graphics.scene, graphics),
-        new MeshSystem(graphics, assetManager),
+        new MeshSystem(engine),
         new ClingToTerrainSystem(),
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
@@ -133,13 +134,14 @@ function makeConfig(engine) {
         new PathDisplaySystem(engine),
     );
 
+
+
     // Plugins
+    config.addPlugin(MicronRenderPlugin);
 
 
     // Knowledge
 
-    config.knowledge.push();
-
     return config;
 }
 
@@ -343,7 +345,6 @@ function main(engine) {
     engine.graphics.loadEnvironmentMap(buildCubeURLs('data/textures/cubemaps/hip_miramar/32/', '.png'));
 
 
-
     engine.plugins.acquire(AmbientOcclusionPostProcessEffect);
 }
 

package/engine/graphics/trail/x/RibbonMaterialX.js

@@ -1,4 +1,4 @@
-import { ShaderMaterial, Vector2 } from "three";
+import { DoubleSide, NormalBlending, ShaderMaterial, Vector2 } from "three";
 
 const vertexShader = `
     varying vec2 vUv;
@@ -110,7 +110,12 @@ export class RibbonMaterialX extends ShaderMaterial {
                 defines: {
                     USE_TEXTURE: false
                 }
-            }
+            },
+            blending: NormalBlending,
+            transparent: true,
+            depthWrite: false,
+            depthTest: true,
+            side: DoubleSide
         });
 
         this.setValues(params);

package/engine/grid/components/GridPosition.js

@@ -3,149 +3,49 @@
  */
 
 import Vector2 from '../../../core/geom/Vector2.js';
-import { BinaryClassSerializationAdapter } from "../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
-import { BinaryClassUpgrader } from "../../ecs/storage/binary/BinaryClassUpgrader.js";
 
-/**
- * @extends {Vector2}
- * @constructor
- */
-function GridPosition() {
-    Vector2.call(this);
-}
-
-GridPosition.typeName = "GridPosition";
-
-GridPosition.prototype = Object.create(Vector2.prototype);
-GridPosition.prototype.constructor = GridPosition;
-
-/**
- *
- * @param {object} json
- * @returns {GridPosition}
- */
-GridPosition.fromJSON = function (json) {
-    const r = new GridPosition();
-
-    r.fromJSON(json);
-
-    return r;
-};
-
-GridPosition.prototype.toJSON = function () {
-    return {
-        x: this.x,
-        y: this.y
-    };
-};
-
-GridPosition.prototype.fromJSON = function (obj) {
-    this.x = obj.x;
-    this.y = obj.y;
-};
-
-/**
- *
- * @param {GridPosition|Vector2} other
- */
-GridPosition.prototype.copy = function (other) {
-    Vector2.prototype.copy.call(this, other);
-    return this;
-};
-
-GridPosition.prototype.clone = function () {
-    const clone = new GridPosition();
-
-    clone.copy(this);
-
-    return clone;
-};
-
-export default GridPosition;
-
-export class GridPositionSerializationAdapter extends BinaryClassSerializationAdapter {
+class GridPosition extends Vector2{
+    /**
+     * @extends {Vector2}
+     * @constructor
+     */
     constructor() {
         super();
-
-        this.klass = GridPosition;
-        this.version = 1;
     }
 
     /**
      *
-     * @param {BinaryBuffer} buffer
-     * @param {GridPosition} value
+     * @param {GridPosition|Vector2} other
      */
-    serialize(buffer, value) {
-        const x = value.x;
-        const y = value.y;
+    copy(other) {
+        Vector2.prototype.copy.call(this, other);
+        return this;
+    }
 
-        let header = 0;
-        if (Number.isInteger(x) && Number.isInteger(y) && x >= 0 && y >= 0) {
-            header = 1;
-        }
+    clone() {
+        const clone = new GridPosition();
 
-        buffer.writeUint8(header);
+        clone.copy(this);
 
-        if (header === 1) {
-            //both components are uint
-            buffer.writeUintVar(x);
-            buffer.writeUintVar(y);
-        } else {
-            buffer.writeFloat32(x);
-            buffer.writeFloat32(y);
-        }
+        return clone;
     }
 
     /**
      *
-     * @param {BinaryBuffer} buffer
-     * @param {GridPosition} value
+     * @param {object} json
+     * @returns {GridPosition}
      */
-    deserialize(buffer, value) {
-        const header = buffer.readUint8();
+    static fromJSON(json) {
+        const r = new GridPosition();
 
-        let x = 0, y = 0;
-        if (header === 1) {
-            x = buffer.readUintVar();
-            y = buffer.readUintVar();
-        } else {
-            //float
-            x = buffer.readFloat32();
-            y = buffer.readFloat32();
-        }
+        r.fromJSON(json);
 
-        value.set(x, y);
+        return r;
     }
 }
 
-export class GridPositionSerializationUpdater_0_1 extends BinaryClassUpgrader {
-    constructor() {
-        super();
-
-        this.__targetVersion = 1;
-        this.__startVersion = 0;
-    }
-
-    upgrade(source, target) {
-        const x = source.readFloat64();
-        const y = source.readFloat64();
-
-        let header = 0;
-        if (Number.isInteger(x) && Number.isInteger(y) && x >= 0 && y >= 0) {
-            header = 1;
-        }
+GridPosition.typeName = "GridPosition";
 
-        target.writeUint8(header);
 
-        if (header === 1) {
-            //both components are uint
-            target.writeUintVar(x);
-            target.writeUintVar(y);
-        } else {
-            target.writeFloat32(x);
-            target.writeFloat32(y);
-        }
+export default GridPosition;
 
-    }
-}

package/engine/grid/components/GridPositionSerializationAdapter.js

@@ -0,0 +1,58 @@
+import { BinaryClassSerializationAdapter } from "../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
+import GridPosition from "./GridPosition.js";
+
+export class GridPositionSerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = GridPosition;
+        this.version = 1;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {GridPosition} value
+     */
+    serialize(buffer, value) {
+        const x = value.x;
+        const y = value.y;
+
+        let header = 0;
+        if (Number.isInteger(x) && Number.isInteger(y) && x >= 0 && y >= 0) {
+            header = 1;
+        }
+
+        buffer.writeUint8(header);
+
+        if (header === 1) {
+            //both components are uint
+            buffer.writeUintVar(x);
+            buffer.writeUintVar(y);
+        } else {
+            buffer.writeFloat32(x);
+            buffer.writeFloat32(y);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {GridPosition} value
+     */
+    deserialize(buffer, value) {
+        const header = buffer.readUint8();
+
+        let x = 0, y = 0;
+        if (header === 1) {
+            x = buffer.readUintVar();
+            y = buffer.readUintVar();
+        } else {
+            //float
+            x = buffer.readFloat32();
+            y = buffer.readFloat32();
+        }
+
+        value.set(x, y);
+    }
+}

package/engine/grid/components/GridPositionSerializationUpdater_0_1.js

@@ -0,0 +1,37 @@
+import { BinaryClassUpgrader } from "../../ecs/storage/binary/BinaryClassUpgrader.js";
+
+export class GridPositionSerializationUpdater_0_1 extends BinaryClassUpgrader {
+    constructor() {
+        super();
+
+        this.__targetVersion = 1;
+        this.__startVersion = 0;
+    }
+
+    upgrade(source, target) {
+        const x = source.readFloat64();
+        const y = source.readFloat64();
+
+        let header = 0;
+        if (
+            Number.isInteger(x)
+            && Number.isInteger(y)
+            && x >= 0
+            && y >= 0
+        ) {
+            header = 1;
+        }
+
+        target.writeUint8(header);
+
+        if (header === 1) {
+            //both components are uint
+            target.writeUintVar(x);
+            target.writeUintVar(y);
+        } else {
+            target.writeFloat32(x);
+            target.writeFloat32(y);
+        }
+
+    }
+}

package/engine/intelligence/mcts/MonteCarlo.js

@@ -236,7 +236,17 @@ export class MonteCarloTreeSearch {
         if (!node.isTerminal() && node.depth >= this.maxExplorationDepth) {
             //cap the state by depth, propagate heuristic score
             node.type = StateType.DepthCapped;
-            recordArbitratedPlayout(node, state);
+        }
+
+        // record play-through
+        const terminalFlag = node.type;
+
+        if (terminalFlag === StateType.Win) {
+            node.addPlayouts(1, 1, 0);
+        } else if (terminalFlag === StateType.Loss) {
+            node.addPlayouts(1, 0, 1);
+        } else if (terminalFlag === StateType.Tie || terminalFlag === StateType.DepthCapped) {
+            node.addPlayouts(1, 0, 0);
         }
 
         return state;
@@ -273,22 +283,9 @@ function materializedEdgeTarget(state, source, edge, computeTerminalFlag, heuris
 
     child.heuristicValue = childHeuristicScore;
 
-    if (terminalFlag === StateType.Undecided) {
-        //do nothing
-    } else {
-
-
-        if (terminalFlag === StateType.Win) {
-            child.addPlayouts(1, 1, 0);
-        } else if (terminalFlag === StateType.Loss) {
-            child.addPlayouts(1, 0, 1);
-        } else if (terminalFlag === StateType.Tie || terminalFlag === StateType.DepthCapped) {
-            child.addPlayouts(1, 0, 0);
-        }
-    }
 
     // bubble the heuristic score up the tree
-    child.bubbleUpHeuristicScore();
+    // child.bubbleUpHeuristicScore(); // heuristic value changes sign depending on the team making the move, so aggregation becomes tricky
 
     return computedState;
 }

package/engine/intelligence/mcts/StateNode.js

@@ -235,9 +235,9 @@ export class StateNode {
          */
         const moves = computeValidMoves(state, this);
 
-        assert.notEqual(moves, null, 'computedValidMoves expected to be an array, instead it was null');
-        assert.notEqual(moves, undefined, 'computedValidMoves expected to be an array, instead it was undefined');
-        assert.ok(Array.isArray(moves), 'computedValidMoves expected to be an array, instead was something else');
+        assert.notNull(moves, 'moves');
+        assert.defined(moves, 'moves');
+        assert.isArray(moves, 'moves');
 
         const numMoves = moves.length;
 

package/generation/GridTags.js

@@ -1,5 +1,5 @@
 /**
- *
+ * Tags
  * @enum {number}
  */
 export const GridTags = {
@@ -10,5 +10,6 @@ export const GridTags = {
     StartingPoint: 16,
     Occupied: 32,
     Road: 64,
-    PlayArea: 128
+    PlayArea: 128,
+    Objective: 256,
 };

package/generation/example/SampleGenerator0.js

@@ -21,7 +21,7 @@ import { matcher_tag_traversable } from "./rules/matcher_tag_traversable.js";
 import { GridTaskGenerateRoads } from "../grid/generation/road/GridTaskGenerateRoads.js";
 import { mir_generator_place_road_decorators } from "./generators/mir_generator_place_road_decorators.js";
 import { MarkerNodeMatcherByType } from "../markers/matcher/MarkerNodeMatcherByType.js";
-import { mir_generator_place_buff_objects } from "./generators/mir_generator_place_buff_objects.js";
+import { mir_generator_place_buff_objects } from "./generators/interactive/mir_generator_place_buff_objects.js";
 import { GridTaskDensityMarkerDistribution } from "../grid/generation/GridTaskDensityMarkerDistribution.js";
 import { CellFilterSimplexNoise } from "../filtering/numeric/complex/CellFilterSimplexNoise.js";
 import { NumericInterval } from "../../core/math/interval/NumericInterval.js";