@woosh/meep-engine 2.33.20 → 2.33.24

package/engine/graphics/GraphicsEngine.js

@@ -344,6 +344,7 @@ GraphicsEngine.prototype.start = function () {
     };
 
     const webGLRenderer = this.renderer = new WebGLRenderer(rendererParameters);
+
     //print GPU info
     const GPU_NAME = this.getGPUName();
 

package/engine/graphics/camera/testClippingPlaneComputation.js

@@ -95,11 +95,11 @@ 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),
-        new Trail2DSystem(graphics, assetManager),
+        new Trail2DSystem(engine),
         new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),

package/engine/graphics/ecs/animation/animator/AnimationClip.js

@@ -1,8 +1,9 @@
-import { computeHashFloat, computeHashIntegerArray} from "../../../../../core/math/MathUtils.js";
 import { min2 } from "../../../../../core/math/min2.js";
 import { AnimationClipFlag } from "./AnimationClipFlag.js";
 import { LoopOnce, LoopRepeat } from "three";
 import { AnimationEventTypes } from "./AnimationEventTypes.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationClip {
     constructor() {

package/engine/graphics/ecs/animation/animator/AnimationClipDefinition.js

@@ -1,7 +1,8 @@
 import { isArrayEqual } from "../../../../../core/collection/ArrayUtils.js";
-import { computeHashArray, computeHashIntegerArray } from "../../../../../core/math/MathUtils.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
 import { invokeObjectHash } from "../../../../../core/model/object/invokeObjectHash.js";
+import { computeHashArray } from "../../../../../core/collection/array/computeHashArray.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
 
 /**
  *

package/engine/graphics/ecs/animation/animator/AnimationNotification.js

@@ -1,4 +1,5 @@
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationNotification {
     constructor() {

package/engine/graphics/ecs/animation/animator/AnimationNotificationDefinition.js

@@ -1,6 +1,7 @@
-import { computeHashIntegerArray, computeObjectHash } from "../../../../../core/math/MathUtils.js";
 import { objectDeepEquals } from "../../../../../core/model/object/objectDeepEquals.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
+import { computeHashIntegerArray } from "../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeObjectHash } from "../../../../../core/math/hash/computeObjectHash.js";
 
 export class AnimationNotificationDefinition {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/AnimationGraph.js

@@ -3,11 +3,12 @@ import { AnimationTransition } from "./AnimationTransition.js";
 import { AnimationStateType } from "./AnimationStateType.js";
 import { AnimationMixer } from "three";
 import { AnimationGraphFlag } from "./AnimationGraphFlag.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../../core/math/MathUtils.js";
 import { writeAnimationGraphDefinitionToJSON } from "./definition/serialization/writeAnimationGraphDefinitionToJSON.js";
 import { readAnimationGraphDefinitionFromJSON } from "./definition/serialization/readAnimationGraphDefinitionFromJSON.js";
 import { assert } from "../../../../../../core/assert.js";
 import { threeUpdateTransform } from "../../../../util/threeUpdateTransform.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../../core/math/hash/computeHashFloat.js";
 
 export class AnimationGraph {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationGraphDefinition.js

@@ -4,8 +4,9 @@ import { AnimationStateDefinition } from "./AnimationStateDefinition.js";
 import { AnimationClipDefinition } from "../../AnimationClipDefinition.js";
 import { AnimationClip } from "../../AnimationClip.js";
 import { isArrayEqual } from "../../../../../../../core/collection/ArrayUtils.js";
-import { computeHashArray, computeHashIntegerArray } from "../../../../../../../core/math/MathUtils.js";
 import { invokeObjectHash } from "../../../../../../../core/model/object/invokeObjectHash.js";
+import { computeHashArray } from "../../../../../../../core/collection/array/computeHashArray.js";
+import { computeHashIntegerArray } from "../../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 export class AnimationGraphDefinition {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationStateDefinition.js

@@ -1,5 +1,5 @@
 import { AnimationStateType } from "../AnimationStateType.js";
-import { computeHashIntegerArray } from "../../../../../../../core/math/MathUtils.js";
+import { computeHashIntegerArray } from "../../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 export class AnimationStateDefinition {
     constructor() {

package/engine/graphics/ecs/animation/animator/graph/definition/AnimationTransitionDefinition.js

@@ -1,5 +1,6 @@
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../../../core/math/MathUtils.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";
 
 export class AnimationTransitionDefinition {
     constructor() {

package/engine/graphics/ecs/camera/CameraClippingPlaneComputer.js

@@ -1,7 +1,7 @@
-import { isValueBetweenInclusive } from "../../../../core/math/MathUtils.js";
 import { frustumFromCamera } from "./CameraSystem.js";
 import { Frustum as ThreeFrustum } from "three";
-import { v3_dot } from "../../../../core/geom/Vector3.js";
+import { v3_dot } from "../../../../core/geom/v3_dot.js";
+import { isValueBetweenInclusive } from "../../../../core/math/isValueBetweenInclusive.js";
 
 const CLIPPING_EPSILON = 0.001;
 

package/engine/graphics/ecs/highlight/HighlightDefinition.js

@@ -1,7 +1,8 @@
 import { Color } from "../../../../core/color/Color.js";
 import { assert } from "../../../../core/assert.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "../../../ecs/storage/COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 export class HighlightDefinition {
     constructor() {

package/engine/graphics/ecs/highlight/renderer/OutlineRenderer.js

@@ -18,8 +18,6 @@ import {
     Vector2,
     WebGLRenderTarget
 } from "three";
-import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
-import convertSampler2D2Canvas from "../../../texture/sampler/Sampler2D2Canvas.js";
 import { makeHighlightDecodeShader } from "./HighlightDecodeShader.js";
 import { makeDilationShader } from "./makeDilationShader.js";
 import { ScreenSpaceQuadShader } from "../../../shaders/ScreenSpaceQuadShader.js";
@@ -500,57 +498,6 @@ export class OutlineRenderer {
         renderer.setRenderTarget(null);
     }
 
-    debugObjectIDs() {
-
-        const s = Sampler2D.uint8(4, this.__renderTargetObjectId_t0.width, this.__renderTargetObjectId_t0.height);
-
-        this.renderer.readRenderTargetPixels(this.__renderTargetObjectId_t0, 0, 0, this.__renderTargetObjectId_t0.width, this.__renderTargetObjectId_t0.height, s);
-
-
-        const htmlCanvasElement = convertSampler2D2Canvas(s, 1, 0);
-
-        htmlCanvasElement.style.zIndex = 10000;
-        htmlCanvasElement.style.position = "absolute";
-
-        document.body.appendChild(htmlCanvasElement);
-    }
-
-    /**
-     *
-     * @param {Object3D} object
-     */
-    renderObjectId(object) {
-        if (object.isMesh || object.isSkinnedMesh) {
-
-            const geometry = object.geometry;
-
-            if (geometry === undefined) {
-                return;
-            }
-
-            const renderer = this.renderer;
-
-            if (object.isSkinnedMesh) {
-
-                renderer.renderBufferDirect(this.camera, null, geometry, material_id_skinned, object, null);
-
-            } else {
-                renderer.renderBufferDirect(this.camera, null, geometry, material_id_unskinned, object, null);
-            }
-
-        }
-
-        const children = object.children;
-
-        const child_count = children.length;
-
-        for (let i = 0; i < child_count; i++) {
-            const child = children[i];
-
-            this.renderObjectId(child);
-        }
-    }
-
     /**
      *
      * @param {Material} material

package/engine/graphics/ecs/light/Light.d.ts

@@ -1,6 +1,6 @@
 import ObservedEnum from "../../../../core/model/ObservedEnum";
 import {Color} from "../../../../core/color/Color";
-import {Vector1} from "../../../../core/geom/Vector1";
+import Vector1 from "../../../../core/geom/Vector1";
 import ObservedBoolean from "../../../../core/model/ObservedBoolean";
 import {LightType} from "./LightType";
 

package/engine/graphics/ecs/light/Light.js

@@ -103,7 +103,10 @@ export class Light {
 
         if (json.intensity !== undefined) {
             this.intensity.fromJSON(json.intensity);
+        } else {
+            this.intensity.set(1);
         }
+
         if (json.castShadow !== undefined) {
             this.castShadow.fromJSON(json.castShadow);
         }

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

@@ -3,13 +3,14 @@
  */
 import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
 import { LeafNode } from "../../../../core/bvh2/LeafNode.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../core/math/MathUtils.js";
 import { getSkeletonBoneByType } from "./SkeletonUtils.js";
 import { assert } from "../../../../core/assert.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { updateNodeByTransformAndBBB } from "./updateNodeByTransformAndBBB.js";
 import { applyTransformToThreeObject } from "./applyTransformToThreeObject.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 /**
  *

package/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -0,0 +1,13 @@
+import {BufferGeometry, Material} from "three";
+import {AABB3} from "../../../../core/bvh2/aabb3/AABB3";
+
+export class ShadedGeometry {
+    readonly geometry: BufferGeometry
+    readonly material: Material
+
+    readonly bvh: Readonly<AABB3>
+
+    from(geometry: BufferGeometry, material: Material): void
+
+    static from(geometry: BufferGeometry, material: Material): ShadedGeometry
+}

package/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.d.ts

@@ -0,0 +1,6 @@
+import {System} from "../../../ecs/System";
+import Engine from "../../../Engine";
+
+export class ShadedGeometrySystem extends System {
+    constructor(engine: Engine)
+}

package/engine/graphics/ecs/path/testPathDisplaySystem.js

@@ -106,11 +106,11 @@ 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),
-        new Trail2DSystem(graphics, assetManager),
+        new Trail2DSystem(engine),
         new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),
@@ -179,11 +179,11 @@ function catmullRom(points) {
     cv.link();
 
     cv.css({
-               position: "absolute",
-               left: 0,
-               right: 0,
-               zIndex: 99999
-           });
+        position: "absolute",
+        left: 0,
+        right: 0,
+        zIndex: 99999
+    });
 
     const sample = [];
 
@@ -216,92 +216,92 @@ function sample_style_entity() {
     const style = new EntityPathStyle();
     style.spacing = 0.6;
     style.marker_start = EntityPathMarkerDefinition.from({
-                                                             blueprint: EntityBlueprint.from([
-                                                                                                 Transform.fromJSON({}),
-                                                                                                 Mesh.fromJSON({
-                                                                                                                   url: "data/models/arrow-symbols/arrow4/model-green.gltf",
-                                                                                                                   castShadow: true,
-                                                                                                                   receiveShadow: true
-                                                                                                               })
-                                                                                             ]),
-                                                             transform: Transform.fromJSON({
-                                                                                               scale: {
-                                                                                                   x: 0.3,
-                                                                                                   y: 0.3,
-                                                                                                   z: 0.3
-                                                                                               },
-                                                                                               rotation: {
-                                                                                                   x: 0.5,
-                                                                                                   y: -0.5,
-                                                                                                   z: 0.5,
-                                                                                                   w: 0.5
-                                                                                               },
-                                                                                               position: {
-                                                                                                   x: 0,
-                                                                                                   y: 1,
-                                                                                                   z: 0
-                                                                                               }
-                                                                                           })
-                                                         });
+        blueprint: EntityBlueprint.from([
+            Transform.fromJSON({}),
+            Mesh.fromJSON({
+                url: "data/models/arrow-symbols/arrow4/model-green.gltf",
+                castShadow: true,
+                receiveShadow: true
+            })
+        ]),
+        transform: Transform.fromJSON({
+            scale: {
+                x: 0.3,
+                y: 0.3,
+                z: 0.3
+            },
+            rotation: {
+                x: 0.5,
+                y: -0.5,
+                z: 0.5,
+                w: 0.5
+            },
+            position: {
+                x: 0,
+                y: 1,
+                z: 0
+            }
+        })
+    });
     style.marker_end = EntityPathMarkerDefinition.from({
-                                                           blueprint: EntityBlueprint.from([
-                                                                                               Transform.fromJSON({}),
-                                                                                               Mesh.fromJSON({
-                                                                                                                 url: "data/models/arrow-symbols/arrow4/model-red.gltf",
-                                                                                                                 castShadow: true,
-                                                                                                                 receiveShadow: true
-                                                                                                             })
-                                                                                           ]),
-                                                           transform: Transform.fromJSON({
-                                                                                             scale: {
-                                                                                                 x: 0.3,
-                                                                                                 y: 0.3,
-                                                                                                 z: 0.3
-                                                                                             },
-                                                                                             rotation: {
-                                                                                                 x: 0.5,
-                                                                                                 y: -0.5,
-                                                                                                 z: 0.5,
-                                                                                                 w: 0.5
-                                                                                             },
-                                                                                             position: {
-                                                                                                 x: 0,
-                                                                                                 y: 1,
-                                                                                                 z: 0
-                                                                                             }
-                                                                                         })
-                                                       });
+        blueprint: EntityBlueprint.from([
+            Transform.fromJSON({}),
+            Mesh.fromJSON({
+                url: "data/models/arrow-symbols/arrow4/model-red.gltf",
+                castShadow: true,
+                receiveShadow: true
+            })
+        ]),
+        transform: Transform.fromJSON({
+            scale: {
+                x: 0.3,
+                y: 0.3,
+                z: 0.3
+            },
+            rotation: {
+                x: 0.5,
+                y: -0.5,
+                z: 0.5,
+                w: 0.5
+            },
+            position: {
+                x: 0,
+                y: 1,
+                z: 0
+            }
+        })
+    });
     style.marker_main = EntityPathMarkerDefinition.from({
-                                                            blueprint: EntityBlueprint.from([
-                                                                                                Transform.fromJSON({}),
-                                                                                                Mesh.fromJSON({
-                                                                                                                  url: "data/models/Barel-Roll Droid/handpainted.gltf",
-                                                                                                                  castShadow: true,
-                                                                                                                  receiveShadow: true
-                                                                                                              }),
-                                                                                                Animation.fromJSON({
-                                                                                                                       clips: [
-                                                                                                                           {
-                                                                                                                               name: "fly",
-                                                                                                                               repeatCount: Infinity
-                                                                                                                           }
-                                                                                                                       ]
-                                                                                                                   }),
-                                                                                                Highlight.fromOne(1, 0, 0, 1)
-                                                                                            ]),
-                                                            transform: Transform.fromJSON({
-                                                                                              scale: {
-                                                                                                  x: 0.2,
-                                                                                                  y: 0.2,
-                                                                                                  z: 0.2
-                                                                                              },
-                                                                                              position: {
-                                                                                                  x: 0,
-                                                                                                  y: 1,
-                                                                                                  z: 0
-                                                                                              }
-                                                                                          })
-                                                        });
+        blueprint: EntityBlueprint.from([
+            Transform.fromJSON({}),
+            Mesh.fromJSON({
+                url: "data/models/Barel-Roll Droid/handpainted.gltf",
+                castShadow: true,
+                receiveShadow: true
+            }),
+            Animation.fromJSON({
+                clips: [
+                    {
+                        name: "fly",
+                        repeatCount: Infinity
+                    }
+                ]
+            }),
+            Highlight.fromOne(1, 0, 0, 1)
+        ]),
+        transform: Transform.fromJSON({
+            scale: {
+                x: 0.2,
+                y: 0.2,
+                z: 0.2
+            },
+            position: {
+                x: 0,
+                y: 1,
+                z: 0
+            }
+        })
+    });
 
     return style;
 }
@@ -337,13 +337,13 @@ function main(engine) {
     // ], 50));
 
     _p.setPositionsFromVectorArray([
-                                       new Vector3(3, 1, 1),
-                                       new Vector3(3, 1, 3),
-                                       new Vector3(7, 1, 3),
-                                       new Vector3(7, 1, 7),
-                                       new Vector3(3, 1, 7),
-                                       new Vector3(3, 1, 8),
-                                   ]);
+        new Vector3(3, 1, 1),
+        new Vector3(3, 1, 3),
+        new Vector3(7, 1, 3),
+        new Vector3(7, 1, 7),
+        new Vector3(3, 1, 7),
+        new Vector3(3, 1, 8),
+    ]);
 
 
     const trailPathStyle = new RibbonPathStyle();

package/engine/graphics/ecs/trail2d/Trail2D.js

@@ -5,6 +5,7 @@
 
 import Vector3 from "../../../../core/geom/Vector3.js";
 import Vector4 from "../../../../core/geom/Vector4.js";
+import { RibbonXMaterialSpec } from "../../trail/x/RibbonXMaterialSpec.js";
 
 /**
  * @readonly
@@ -24,8 +25,6 @@ class Trail2D {
          */
         this.maxAge = 5;
 
-        this.textureURL = null;
-
         /**
          * Trail width
          * @type {number}
@@ -65,9 +64,9 @@ class Trail2D {
 
         /**
          * transient
-         * @type {Material|null}
+         * @type {RibbonXMaterialSpec}
          */
-        this.material = null;
+        this.material = new RibbonXMaterialSpec();
 
         /**
          * transient
@@ -82,6 +81,20 @@ class Trail2D {
         this.flags = Trail2DFlags.Spawning | Trail2DFlags.Aging;
     }
 
+    dispose() {
+        if (this.ribbon !== null) {
+            this.ribbon.dispose();
+        }
+    }
+
+    get textureURL() {
+        return this.material.diffuse;
+    }
+
+    set textureURL(v) {
+        this.material.diffuse = v;
+    }
+
     /**
      *
      * @param {number|Trail2DFlags} flag

package/engine/graphics/ecs/trail2d/Trail2DSystem.d.ts

@@ -1,7 +1,6 @@
 import {System} from "../../../ecs/System";
-import {GraphicsEngine} from "../../GraphicsEngine";
-import {AssetManager} from "../../../asset/AssetManager";
+import Engine from "../../../Engine";
 
 export default class Trail2DSystem extends System {
-    constructor(graphics: GraphicsEngine, assetManager: AssetManager)
+    constructor(engine: Engine)
 }