@woosh/meep-engine 2.33.36 → 2.33.40

package/core/process/undo/ActionProcessor.js

@@ -96,16 +96,24 @@ export class ActionProcessor {
     }
 
     /**
-     * Drop records beyond a given limit. records are dropped in batches between marks.
+     * Remove all of the history
+     */
+    clear() {
+        // drop all of the history
+        this.dropHistory(Infinity);
+    }
+
+    /**
+     * Drop number of records from the history
      *
      * NOTE valid use-cases for this method from the outside are: 1) memory management and 1) removing access to a set of previous actions
      * NOTE this method is used internally by {@link #mark} method
      *
      * @example if there are 2 marks A at record 9 and B at record 11, and requested limit is 10 - 9 records will be kept as records 10 and 11 belong to the same batch and will be removed together.
-     * @param {number} limit maximum number of records to keep
+     * @param {number} drop_count maximum number of records to drop
      */
-    dropHistory(limit) {
-        const recordsToDrop = Math.min(limit, this.history.length);
+    dropHistory(drop_count) {
+        const recordsToDrop = Math.min(drop_count, this.history.length);
         if (recordsToDrop <= 0) {
             return;
         }
@@ -136,6 +144,9 @@ export class ActionProcessor {
 
         // dispatch signal
         dropped_marks.forEach(this.onMarkRemoved.send1, this.onMarkRemoved);
+
+        // update history
+
     }
 
     /**

package/editor/tools/FoliagePaintTool.js

@@ -2,11 +2,11 @@ import Tool from "./engine/Tool.js";
 import Vector1 from "../../core/geom/Vector1.js";
 import { obtainTerrain } from "../../../model/game/scenes/SceneUtils.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
-import { parseHex } from "../../core/color/ColorUtils.js";
 import Vector4 from "../../core/geom/Vector4.js";
 import loadSampler2D from "../../engine/graphics/texture/sampler/loadSampler2D.js";
 import convertSampler2D2Canvas from "../../engine/graphics/texture/sampler/Sampler2D2Canvas.js";
 import { InstancedMeshComponent } from "../../engine/ecs/foliage/ecs/InstancedMeshComponent.js";
+import { parseHex } from "../../core/color/parseHex.js";
 
 class FoliagePaintTool extends Tool {
     constructor() {

package/editor/tools/GridPaintTool.js

@@ -3,7 +3,6 @@ import GridPosition from "../../engine/grid/components/GridPosition.js";
 import GridObstacle from "../../engine/grid/components/GridObstacle.js";
 import { pick } from "../../../model/game/util/ScreenGridPicker.js";
 import Vector4 from "../../core/geom/Vector4.js";
-import { parseHex } from "../../core/color/ColorUtils.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector1 from "../../core/geom/Vector1.js";
 import WriteGridValueAction from "../actions/concrete/WriteGridValueAction.js";
@@ -12,6 +11,7 @@ import PaintTerrainOverlayAction from "../actions/concrete/PaintTerrainOverlayAc
 import { decodeMouseEventButtons, PointerDevice } from "../../engine/input/devices/PointerDevice.js";
 import Vector2 from "../../core/geom/Vector2.js";
 import TopDownCameraControllerSystem from "../../engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
+import { parseHex } from "../../core/color/parseHex.js";
 
 class GridPaintTool extends Tool {
     constructor() {

package/engine/asset/loaders/GLTFAssetLoader.js

@@ -337,16 +337,12 @@ export class GLTFAssetLoader extends AssetLoader {
                 return;
             }
 
-            //find a child that is a mesh
-            const meshes = scene.children.filter(isMesh);
 
-            let root;
+            let root = scene;
 
-            if (meshes.length !== 1) {
-                //use the whole scene
-                root = scene;
-            } else {
-                root = meshes[0];
+            if (children.length === 1 && isMesh(children[0])) {
+                // scene only contains a single mesh, use that directly
+                root = children[0];
             }
 
             traverseThreeObject(root, this.__prepareObjectMaterial, this);

package/engine/ecs/System.d.ts

@@ -1,3 +1,26 @@
-export class System {
+import {EntityManager} from "./EntityManager";
 
+interface Type<T> extends Function {
+    new(...args: any[]): T;
+}
+
+export class System<A, B = void, C = void, D = void, E = void> {
+    dependencies: Type<any>[]
+
+    startup(em: EntityManager, ready_callback: () => void, error_callback: () => void): void
+
+    shutdown(em: EntityManager, ready_callback: () => void, error_callback: () => void): void
+
+    link(a: A, entity: number): void
+    link(a: A, b: B, entity: number): void
+    link(a: A, b: B, c: C, entity: number): void
+    link(a: A, b: B, c: C, d: D, entity: number): void
+    link(a: A, b: B, c: C, d: D, e: E, entity: number): void
+
+    unlink(a: A, entity: number): void
+    unlink(a: A, b: B, entity: number): void
+    unlink(a: A, b: B, c: C, d: D, entity: number): void
+    unlink(a: A, b: B, c: C, d: D, e: E, entity: number): void
+
+    update(time_delta: number): void
 }

package/engine/ecs/foliage/InstancedFoliage.js

@@ -61,12 +61,29 @@ export class InstancedFoliage {
          */
         this.instances = new InstancedMeshGroup();
 
+        /**
+         *
+         * @type {THREE.BufferGeometry|null}
+         */
         this.geometry = null;
+
+        /**
+         *
+         * @type {Vector4|Vector4}
+         */
         this.instanceBoundingSphere = new Vector4(0, 0, 0, 0);
 
 
+        /**
+         *
+         * @type {ThreeFrustumsIntersectionBVHVisitor}
+         */
         this.bvhVisibilityVisitor = new ThreeFrustumsIntersectionBVHVisitor();
 
+        /**
+         *
+         * @type {FoliageVisibilitySetBuilder}
+         */
         this.visibilitySetBuilder = new FoliageVisibilitySetBuilder();
         this.bvhVisibilityVisitor.collector = this.visibilitySetBuilder;
 
@@ -84,6 +101,10 @@ export class InstancedFoliage {
         this.__garbagePointer = 0;
     }
 
+    /**
+     *
+     * @returns {number}
+     */
     hash() {
         return this.data.hash();
     }
@@ -95,6 +116,25 @@ export class InstancedFoliage {
 
     }
 
+    /**
+     *
+     * @param {SurfacePoint3} contact
+     * @param {number} origin_x
+     * @param {number} origin_y
+     * @param {number} origin_z
+     * @param {number} direction_x
+     * @param {number} direction_y
+     * @param {number} direction_z
+     * @returns {number} index of the contact instance, or -1 if no hit found
+     */
+    raypick(
+        contact,
+        origin_x, origin_y, origin_z,
+        direction_x, direction_y, direction_z
+    ) {
+        throw new Error('Not implemented');
+    }
+
     dispose() {
         this.instances.dispose();
     }
@@ -212,6 +252,11 @@ export class InstancedFoliage {
         this.instanceBoundingSphere = computeGeometryBoundingSphereMiniball(this.geometry);
     }
 
+    /**
+     *
+     * @param {BufferGeometry} geometry
+     * @param {Material} material
+     */
     setInstance(geometry, material) {
         if (material === undefined) {
             throw new Error(`Material is undefined`);

package/engine/ecs/foliage/ecs/InstancedMeshLayer.js

@@ -40,6 +40,10 @@ export class InstancedMeshLayer {
         this.data.dispose();
     }
 
+    /**
+     *
+     * @returns {number}
+     */
     hash() {
 
         return computeHashIntegerArray(

package/engine/ecs/storage/BinaryBufferSerializer.js

@@ -5,6 +5,48 @@ import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "./COMPONENT_SERIALIZATI
 import { currentTimeInSeconds } from "../../Clock.js";
 import { BinaryObjectSerializationAdapter } from "./binary/object/BinaryObjectSerializationAdapter.js";
 
+/**
+ * @template T
+ * @param {Class<T>|constructor|function|{serializable?:boolean}} componentClass
+ * @returns {boolean}
+ */
+function isComponentClassSerializable(componentClass) {
+    return componentClass.serializable !== false;
+}
+
+/**
+ * Whether or not an entity should be serialized at all
+ * @param {number} entity
+ * @param {EntityComponentDataset} dataset
+ * @param {number} smComponentIndex
+ * @param {Object} componentInstance
+ * @returns {boolean}
+ */
+function isEntityTransient(entity, dataset, smComponentIndex, componentInstance) {
+    if (smComponentIndex === -1) {
+        return false;
+    }
+
+    //check component instance flag
+    if (componentInstance[COMPONENT_SERIALIZATION_TRANSIENT_FIELD] === true) {
+        return true;
+    }
+
+
+    /**
+     *
+     * @type {SerializationMetadata}
+     */
+    const serializationMetadata = dataset.getComponentByIndex(entity, smComponentIndex);
+
+    if (serializationMetadata === undefined) {
+        return false;
+    }
+
+    const isTransient = serializationMetadata.getFlag(SerializationFlags.Transient);
+
+    return isTransient;
+}
 
 class BinaryBufferSerialization {
     constructor() {
@@ -27,9 +69,8 @@ class BinaryBufferSerialization {
 
         const smComponentIndex = dataset.computeComponentTypeIndex(SerializationMetadata);
 
-        const serializableComponentTypes = dataset.getComponentTypeMap().filter(function (componentClass) {
-            return componentClass.serializable !== false;
-        });
+        // get a list of serializable component classes
+        const serializableComponentTypes = dataset.getComponentTypeMap().filter(isComponentClassSerializable);
 
         const numSerializableTypes = serializableComponentTypes.length;
 
@@ -59,6 +100,9 @@ class BinaryBufferSerialization {
 
             const className = componentType.typeName;
 
+            if (className === undefined) {
+                throw new Error(`Component type has no .typeName property`);
+            }
 
             collectionSerializer.setClass(className);
             collectionSerializer.initialize({
@@ -83,7 +127,7 @@ class BinaryBufferSerialization {
                     return;
                 }
 
-                assert.ok(entity >= lastEntity, `entity(=${entity}) < lastEntity(=${lastEntity})`)
+                assert.ok(entity >= lastEntity, `entity[=${entity}] < lastEntity[=${lastEntity}]`);
 
                 //write only the entity step
                 const step = entity - lastEntity;
@@ -127,38 +171,4 @@ class BinaryBufferSerialization {
     }
 }
 
-/**
- * Whether or not an entity should be serialized at all
- * @param {number} entity
- * @param {EntityComponentDataset} dataset
- * @param {number} smComponentIndex
- * @param {Object} componentInstance
- * @returns {boolean}
- */
-function isEntityTransient(entity, dataset, smComponentIndex, componentInstance) {
-    if (smComponentIndex === -1) {
-        return false;
-    }
-
-    //check component instance flag
-    if (componentInstance[COMPONENT_SERIALIZATION_TRANSIENT_FIELD] === true) {
-        return true;
-    }
-
-
-    /**
-     *
-     * @type {SerializationMetadata}
-     */
-    const serializationMetadata = dataset.getComponentByIndex(entity, smComponentIndex);
-
-    if (serializationMetadata === undefined) {
-        return false;
-    }
-
-    const isTransient = serializationMetadata.getFlag(SerializationFlags.Transient);
-
-    return isTransient;
-}
-
 export default BinaryBufferSerialization;

package/engine/ecs/storage/binary/collection/BinaryCollectionSerializer.js

@@ -88,7 +88,7 @@ export class BinaryCollectionSerializer {
      * @param {string} className
      */
     setClass(className) {
-        assert.typeOf(className, 'string', 'className');
+        assert.isString(className, 'className');
 
         this.className = className;
     }

package/engine/ecs/terrain/ecs/splat/SplatMapOptimizerDebugger.js

@@ -10,8 +10,8 @@ import SVG from "../../../../../view/SVG.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import Vector4 from "../../../../../core/geom/Vector4.js";
 import { MersenneTwister } from "../../../../../core/math/random/MersenneTwister.js";
-import { hsv2rgb } from "../../../../../core/color/ColorUtils.js";
 import { arrayPickBestElement } from "../../../../../core/collection/array/arrayPickBestElement.js";
+import { hsv2rgb } from "../../../../../core/color/hsv2rgb.js";
 
 function removeAllChildren(node) {
     const children = node.children;

package/engine/ecs/terrain/tiles/TerrainTile.js

@@ -581,7 +581,7 @@ class TerrainTile {
         mesh.geometry = g;
 
         mesh.receiveShadow = true;
-        mesh.castShadow = false;
+        mesh.castShadow = true;
 
         // console.timeEnd('total');
         // console.groupEnd();

package/engine/graphics/GraphicsEngine.js

@@ -97,6 +97,9 @@ function GraphicsEngine(camera, entityManger) {
         preRender: new Signal(),
         postRender: new Signal(),
 
+        preOpaquePass: new Signal(),
+        postOpaquePass : new Signal(),
+
         /**
          * @deprecated
          */
@@ -558,6 +561,8 @@ GraphicsEngine.prototype.prepareRenderPass = function (passType) {
  * Renders opaque assets
  */
 GraphicsEngine.prototype.renderOpaque = function () {
+    this.on.preOpaquePass.send0();
+
     this.prepareRenderPass(RenderPassType.Opaque);
 
     const renderer = this.renderer;
@@ -570,6 +575,8 @@ GraphicsEngine.prototype.renderOpaque = function () {
     const frameBuffer = buffers.getById(StandardFrameBuffers.ColorAndDepth);
 
     renderTextureToScreenQuad(frameBuffer.renderTarget.texture, renderer);
+
+    this.on.postOpaquePass.send0();
 };
 
 /**

package/engine/graphics/ecs/light/binding/fp/FPLightBinding.js

@@ -1,5 +1,5 @@
 import { LightBinding } from "../LightBinding.js";
-import { PointLight } from "../../../../render/forward_plus/PointLight.js";
+import { PointLight } from "../../../../render/forward_plus/model/PointLight.js";
 
 export class FPLightBinding extends LightBinding {
     constructor() {

package/engine/graphics/ecs/mesh/Mesh.js

@@ -252,8 +252,8 @@ class Mesh {
 
     fromJSON({
                  url = null,
-                 castShadow = false,
-                 receiveShadow = false,
+                 castShadow = true,
+                 receiveShadow = true,
                  opacity = 1
              }) {
         this.url = url;

package/engine/graphics/ecs/mesh-v2/ShadedGeometry.js

@@ -167,3 +167,16 @@ export class ShadedGeometry {
         this.updateTransform();
     }
 }
+
+/**
+ * @readonly
+ * @type {string}
+ */
+ShadedGeometry.typeName = 'ShadedGeometry';
+
+/**
+ * TODO add serialization support
+ * @readonly
+ * @type {boolean}
+ */
+ShadedGeometry.serializable = false;