@woosh/meep-engine 2.33.17 → 2.33.21

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/geometry/bvh/buffered/BVHGeometryRaycaster.js

@@ -1,9 +1,10 @@
-import Vector3, { v3_length } from "../../../../../core/geom/Vector3.js";
+import Vector3 from "../../../../../core/geom/Vector3.js";
 
 import { Vector3 as ThreeVector3 } from 'three';
 import { rayTriangleIntersection } from "../../../../../core/geom/GeometryMath.js";
 import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
 import { assert } from "../../../../../core/assert.js";
+import { v3_length } from "../../../../../core/geom/v3_length.js";
 
 const hit = new ThreeVector3();
 

package/engine/graphics/micron/build/clustering/computeFaceCurvatureScore.js

@@ -1,4 +1,4 @@
-import { v3_dot } from "../../../../../core/geom/Vector3.js";
+import { v3_dot } from "../../../../../core/geom/v3_dot.js";
 
 /**
  * If a given face is added to the patch, how beneficial would that be?

package/engine/graphics/micron/build/clustering/compute_face_connection_weight.js

@@ -1,5 +1,5 @@
-import { v3_distance_sqr } from "../../../../../core/geom/Vector3.js";
 import { vec3 } from "gl-matrix";
+import { v3_distance_sqr } from "../../../../../core/geom/v3_distance_sqr.js";
 
 /**
  *

package/engine/graphics/micron/build/hierarchy/computePatchMergeScore.js

@@ -1,5 +1,5 @@
 import { ConicRay } from "../../../../../core/geom/ConicRay.js";
-import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/compute_bounding_cone_of_2_cones.js";
+import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/cone/compute_bounding_cone_of_2_cones.js";
 import { compute_patches_shared_vertex_count } from "./compute_patches_shared_vertex_count.js";
 import { compute_bounding_sphere_of_2_spheres } from "../../../../../core/geom/3d/compute_bounding_sphere_of_2_spheres.js";
 import { max2 } from "../../../../../core/math/max2.js";

package/engine/graphics/micron/build/hierarchy/patch_combine.js

@@ -5,7 +5,7 @@ import { array_remove_first } from "../../../../../core/collection/array/array_r
 import { max2 } from "../../../../../core/math/max2.js";
 import { array_push_if_unique } from "../../../../../core/collection/array/array_push_if_unique.js";
 import { compute_bounding_sphere_of_2_spheres } from "../../../../../core/geom/3d/compute_bounding_sphere_of_2_spheres.js";
-import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/compute_bounding_cone_of_2_cones.js";
+import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/cone/compute_bounding_cone_of_2_cones.js";
 import { ConicRay } from "../../../../../core/geom/ConicRay.js";
 import { passThrough } from "../../../../../core/function/Functions.js";
 

package/engine/graphics/micron/render/refinement/is_patch_facing_back.js

@@ -1,5 +1,5 @@
 import { PI_HALF } from "../../../../../core/math/MathUtils.js";
-import { v3_angleBetween } from "../../../../../core/geom/Vector3.js";
+import { v3_angle_between } from "../../../../../core/geom/v3_angle_between.js";
 
 /**
  *
@@ -28,7 +28,7 @@ function is_patch_facing_back(refinement_spec, patch) {
         // compute view angle of the bounding sphere
         const normal_cone_direction = normal_cone.direction;
 
-        const angle = v3_angleBetween(
+        const angle = v3_angle_between(
             view_direction_x, view_direction_y, view_direction_z,
             normal_cone_direction.x, normal_cone_direction.y, normal_cone_direction.z
         );

package/engine/graphics/particles/particular/engine/shader/ShaderManager.js

@@ -115,6 +115,8 @@ export class ShaderManager {
             anisotropy: 0
         });
 
+        this.spriteTexture.name = 'Sprite sheet';
+
         /**
          *
          * @type {Texture|null}
@@ -284,37 +286,14 @@ export class ShaderManager {
 
                 console.warn('Recomputing hashes ... ');
 
-                this.recordGraveyard.updateHashes();
-                this.materialMap.updateHashes();
+                this.recordGraveyard.rebuild();
+                this.materialMap.rebuild();
             }
 
             this.materialMap.delete(bestKey);
         }
     }
 
-    /**
-     *
-     * @param {MaterialRecord} entry
-     */
-    destroyMaterialRecord(entry) {
-
-        const parameters = entry.parameters.asArray();
-
-        //remove parameters from parameter sheet
-        for (let i = 0; i < parameters.length; i++) {
-            const particleParameter = parameters[i];
-            this.parameterSheet.remove(particleParameter);
-        }
-
-        //unlink signal bindings
-        entry.signalBindings.forEach(function (binding) {
-            binding.unlink();
-        });
-
-        //decommission material
-        entry.material.dispose();
-    }
-
     /**
      *
      * @param {ParticleEmitter} emitter
@@ -369,6 +348,7 @@ export class ShaderManager {
         const cameraNear = camera.near;
         const cameraFar = camera.far;
 
+        // TODO use a shader uniform structure to avoid iteration
         this.materialMap.forEach(function (entry) {
             const uniforms = entry.material.uniforms;
 
@@ -386,6 +366,7 @@ export class ShaderManager {
     setDepthTexture(texture) {
         this.depthTexture = texture;
 
+        // TODO use a shader uniform structure to avoid iteration
         this.materialMap.forEach(function (entry) {
             const material = entry.material;
             material.uniforms.tDepth.value = texture;
@@ -400,6 +381,7 @@ export class ShaderManager {
     setViewportSize(x, y) {
         this.viewportSize.set(x, y);
 
+        // TODO use a shader uniform structure to avoid iteration
         this.materialMap.forEach(function (entry) {
             entry.material.uniforms.resolution.value.set(x, y);
         });

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

@@ -1,5 +1,5 @@
 import Vector3 from "../../../../core/geom/Vector3.js";
-import { plane_three_computeConvex3PlaneIntersection } from "../../../../core/geom/3d/plane_computeConvex3PlaneIntersection.js";
+import { plane_three_computeConvex3PlaneIntersection } from "../../../../core/geom/3d/plane/plane_computeConvex3PlaneIntersection.js";
 
 const v_000 = new Vector3();
 const v_001 = new Vector3();

package/engine/graphics/render/forward_plus/plugin/MaterialTransformer.js

@@ -61,12 +61,22 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
     }
 
     transform(source) {
+        let result = source;
+
         if (isLitMaterial(source)) {
 
-            source.onBeforeCompile = composeCompile(source.onBeforeCompile, this.__on_before_compile);
+            result = source.clone();
+            // inherit uniforms directly
+
+            if (source.isShaderMaterial) {
+                result.uniforms = source.uniforms;
+                result.defines = source.defines;
+            }
+
+            result.onBeforeCompile = composeCompile(source.onBeforeCompile, this.__on_before_compile);
 
         }
 
-        return source;
+        return result;
     }
 }

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

@@ -1,7 +1,7 @@
-import { v3_distance_sqr } from "../../../../core/geom/Vector3.js";
 import { line3_computeSegmentPointDistance_sqr } from "../../../../core/geom/LineSegment.js";
 import { computeConePlaneSide } from "../../../../core/geom/3d/cone/computeConePlaneSide.js";
 import { aabb3_computeDistanceAbovePlane } from "../../../../core/geom/3d/aabb/aabb3_computeDistanceAbovePlane.js";
+import { v3_distance_sqr } from "../../../../core/geom/v3_distance_sqr.js";
 
 /**
  *

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

@@ -1,6 +1,6 @@
 import Vector3 from "../../../../core/geom/Vector3.js";
 import { computePointDistanceToPlane } from "../../../../core/geom/Plane.js";
-import { plane_three_computeConvex3PlaneIntersection } from "../../../../core/geom/3d/plane_computeConvex3PlaneIntersection.js";
+import { plane_three_computeConvex3PlaneIntersection } from "../../../../core/geom/3d/plane/plane_computeConvex3PlaneIntersection.js";
 
 /**
  *

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

@@ -116,28 +116,32 @@ export class TextureAtlas {
      *
      * @param {number} x
      * @param {number} y
-     * @returns {boolean}
+     * @returns {boolean} true if resizing successful, false otherwise
      */
     resize(x, y) {
         //check if any patches would be cut
         const patches = this.patches;
         const numPatches = patches.length;
-        const patchBoundsViolated = patches.some(patch => {
 
-            if (!patch.getFlag(AtlasPatchFlag.Packed)) {
+        //update patch UVs
+        for (let i = 0; i < numPatches; i++) {
+            const patch = patches[i];
+
+            if (patch.getFlag(AtlasPatchFlag.Packed)) {
                 //only care about packed patches
-                return false;
-            }
 
-            const x1 = patch.position.x + patch.size.x + patch.padding;
-            const y1 = patch.position.y + patch.size.y + patch.padding;
+                const pp = patch.position;
+                const ps = patch.size;
 
-            return x1 >= x || y1 >= y;
-        });
+                const x1 = pp.x + ps.x + patch.padding;
+                const y1 = pp.y + ps.y + patch.padding;
 
-        if (patchBoundsViolated) {
-            //Resizing atlas would result in some patches not fitting
-            return false;
+                if (x1 >= x || y1 >= y) {
+                    // patch bounds would violate the desired atlas extends
+                    //Resizing atlas would result in some patches not fitting
+                    return false;
+                }
+            }
         }
 
         //update patch UVs

package/engine/graphics/util/projectSphere.js

@@ -1,6 +1,6 @@
 import { assert } from "../../../core/assert.js";
 import { v4_applyMatrix4 } from "../../../core/geom/Vector4.js";
-import { v3_dot } from "../../../core/geom/Vector3.js";
+import { v3_dot } from "../../../core/geom/v3_dot.js";
 
 const v4 = [];
 

package/engine/navigation/ecs/components/Path.js

@@ -4,7 +4,7 @@
 
 
 import { line3_computeSegmentPointDistance_sqr } from "../../../../core/geom/LineSegment.js";
-import Vector3, { v3_distance } from "../../../../core/geom/Vector3.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
 
 import { CatmullRomCurve3 } from "three";
 import { clamp } from "../../../../core/math/clamp.js";
@@ -17,6 +17,7 @@ import { max2 } from "../../../../core/math/max2.js";
 import { min2 } from "../../../../core/math/min2.js";
 import { computeNonuniformCatmullRomSplineSample } from "./computeNonuniformCatmullRomSplineSample.js";
 import { InterpolationType } from "./InterpolationType.js";
+import { v3_distance } from "../../../../core/geom/v3_distance.js";
 
 const v3_a = new Vector3();
 const v3_b = new Vector3();

package/engine/network/convertPathToURL.js

@@ -36,7 +36,7 @@ export function convertPathToURL(path) {
             scope = self;
         } else if (ENVIRONMENT_IS_NODE) {
 
-            let normalized_path = `${process.cwd()}/${path}`.replace(/\\/g, '/');
+            let normalized_path = `${process.cwd()}/`.replace(/\\/g, '/');
 
             // remove multiple sequential slashes
             normalized_path = normalized_path.replace(/\/+/g, '/');
@@ -68,8 +68,8 @@ export function convertPathToURL(path) {
         */
 
         if (pathname.endsWith('/')) {
-            //path is to a directory
-            directoryPath = pathname;
+            //path is to a directory, strip last slash
+            directoryPath = pathname.substring(0, pathname.length - 1);
         } else {
             //path is to a file
             const i = pathname.lastIndexOf('/');

package/generation/filtering/numeric/complex/CellFilterAngleToNormal.js

@@ -1,6 +1,7 @@
 import { CellFilter } from "../../CellFilter.js";
-import Vector3, { v3_angleBetween } from "../../../../core/geom/Vector3.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
 import { assert } from "../../../../core/assert.js";
+import { v3_angle_between } from "../../../../core/geom/v3_angle_between.js";
 
 /**
  * Builds surface normal of another filter, and then computes the angle to a fixed 3d vector
@@ -70,7 +71,7 @@ export class CellFilterAngleToNormal extends CellFilter {
 
         const reference = this.reference;
 
-        const angle = v3_angleBetween(reference.x, reference.y, reference.z, _x, _y, _z);
+        const angle = v3_angle_between(reference.x, reference.y, reference.z, _x, _y, _z);
 
         return angle;
     }

package/generation/markers/GridCellActionPlaceMarker.js

@@ -36,6 +36,12 @@ export class GridCellActionPlaceMarker extends GridCellAction {
          */
         this.transformers = [];
 
+        /**
+         *
+         * @type {number}
+         */
+        this.priority = 0;
+
         /**
          *
          * @type {Vector2}
@@ -91,6 +97,7 @@ export class GridCellActionPlaceMarker extends GridCellAction {
      * @param {string[]} [tags]
      * @param {Transform} [transform]
      * @param {*} [properties]
+     * @param priority
      * @return {GridCellActionPlaceMarker}
      */
     static from({
@@ -99,7 +106,8 @@ export class GridCellActionPlaceMarker extends GridCellAction {
                     transformers = [],
                     tags = [],
                     transform,
-                    properties
+                    properties,
+                    priority = 0
                 }) {
 
         assert.typeOf(type, 'string', 'type');
@@ -125,6 +133,8 @@ export class GridCellActionPlaceMarker extends GridCellAction {
             r.properties = properties;
         }
 
+        r.priority = priority;
+
         return r;
     }
 
@@ -183,6 +193,8 @@ export class GridCellActionPlaceMarker extends GridCellAction {
         //write properties
         Object.assign(node.properties, this.properties);
 
+        node.priority = this.priority;
+
         //apply transformations
         const transformers = this.transformers;
         const transformerCount = transformers.length;

package/generation/markers/MarkerNode.js

@@ -5,6 +5,12 @@ import { circleIntersectsCircle } from "../../core/geom/2d/circle/circleIntersec
 
 export class MarkerNode {
     constructor() {
+        /**
+         * Processing order, higher priority nodes are processed first
+         * @type {number}
+         */
+        this.priority = 0;
+
         /**
          *
          * @type {String}

package/generation/theme/ThemeEngine.js

@@ -451,6 +451,9 @@ export class ThemeEngine {
         return new Task({
             initializer() {
                 grid.markers.getRawData(nodes);
+
+                // sort nodes by priority
+                nodes.sort((a, b) => b.priority - a.priority);
             },
             cycleFunction
         });

package/package.json

@@ -4,7 +4,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.17",
+  "version": "2.33.21",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",

package/view/minimap/gl/MinimapMarkersGL.js

@@ -297,8 +297,17 @@ export class MinimapMarkersGL extends MinimapWorldLayer {
     }
 
 
+    /**
+     *
+     * @return {DataTexture}
+     * @private
+     */
+    __getAtlasTexture() {
+        return this.material.uniforms.atlas.value;
+    }
+
     handleAtlasUpdate() {
-        writeSample2DDataToDataTexture(this.atlasManager.atlas.sampler, this.material.uniforms.atlas.value);
+        writeSample2DDataToDataTexture(this.atlasManager.atlas.sampler, this.__getAtlasTexture());
 
         this.updateSprites();
 
@@ -391,6 +400,9 @@ export class MinimapMarkersGL extends MinimapWorldLayer {
         //clear out data arrays
         this.particles.reset();
 
+        // release atlas GPU memory
+        this.__getAtlasTexture().dispose();
+
         //execute shutdown hooks
         this.shutdownHooks.forEach(function (hook) {
             hook();