@woosh/meep-engine 2.163.11 → 2.164.0

package/src/engine/ecs/transform/Transform.js

@@ -1,7 +1,7 @@
 import { assert } from "../../../core/assert.js";
-import { allocate_m4 } from "../../../core/geom/3d/mat4/allocate_m4.js";
-import { compose_matrix4_array } from "../../../core/geom/3d/mat4/compose_matrix4_array.js";
-import { decompose_matrix_4_array } from "../../../core/geom/3d/mat4/decompose_matrix_4_array.js";
+import { m4_allocate } from "../../../core/geom/3d/mat4/m4_allocate.js";
+import { m4_compose } from "../../../core/geom/3d/mat4/m4_compose.js";
+import { m4_decompose } from "../../../core/geom/3d/mat4/m4_decompose.js";
 import { M4_IDENTITY } from "../../../core/geom/3d/mat4/M4_IDENTITY.js";
 import { m4_multiply } from "../../../core/geom/3d/mat4/m4_multiply.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
@@ -63,7 +63,7 @@ export class Transform {
      * @readonly
      * @type {Float32Array}
      */
-    matrix = allocate_m4();
+    matrix = m4_allocate();
 
     /**
      * Various bit flags, see {@link TransformFlags}
@@ -194,7 +194,7 @@ export class Transform {
      * Useful for when {@link TransformFlags.AutomaticChangeDetection} is disabled.
      */
     updateMatrix() {
-        compose_matrix4_array(this.matrix, this.position, this.rotation, this.scale);
+        m4_compose(this.matrix, this.position, this.rotation, this.scale);
     }
 
     /**
@@ -380,7 +380,7 @@ export class Transform {
 
         this.matrix.set(matrix);
 
-        decompose_matrix_4_array(matrix, this.position, this.rotation, this.scale);
+        m4_decompose(matrix, this.position, this.rotation, this.scale);
 
         // restore value of the flag
         this.writeFlag(TransformFlags.AutomaticChangeDetection, ad);
@@ -395,7 +395,7 @@ export class Transform {
      */
     toMatrix(result = new Float32Array(16)) {
 
-        compose_matrix4_array(result, this.position, this.rotation, this.scale);
+        m4_compose(result, this.position, this.rotation, this.scale);
 
         return result;
     }

package/src/engine/ecs/transform/TransformSerializationAdapter.js

@@ -1,5 +1,5 @@
-import { quat_decode_from_uint32 } from "../../../core/geom/3d/quaternion/quat_decode_from_uint32.js";
-import { quat_encode_to_uint32 } from "../../../core/geom/3d/quaternion/quat_encode_to_uint32.js";
+import { quat3_decode_from_uint32 } from "../../../core/geom/3d/quaternion/quat3_decode_from_uint32.js";
+import { quat3_encode_to_uint32 } from "../../../core/geom/3d/quaternion/quat3_encode_to_uint32.js";
 import { v3_binary_equality_decode } from "../../../core/geom/vec3/serialization/v3_binary_equality_decode.js";
 import { v3_binary_equality_encode } from "../../../core/geom/vec3/serialization/v3_binary_equality_encode.js";
 import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
@@ -25,7 +25,7 @@ export class TransformSerializationAdapter extends BinaryClassSerializationAdapt
         buffer.writeFloat64(position.y);
         buffer.writeFloat64(position.z);
 
-        const encoded_rotation = quat_encode_to_uint32(
+        const encoded_rotation = quat3_encode_to_uint32(
             rotation.x,
             rotation.y,
             rotation.z,
@@ -51,7 +51,7 @@ export class TransformSerializationAdapter extends BinaryClassSerializationAdapt
 
         v3_binary_equality_decode(buffer, value.scale, 0);
 
-        quat_decode_from_uint32(value.rotation, 0, encoded_rotation);
+        quat3_decode_from_uint32(value.rotation, 0, encoded_rotation);
         value.position.set(positionX, positionY, positionZ);
     }
 }

package/src/engine/graphics/ecs/camera/auto_set_camera_clipping_planes.js

@@ -1,5 +1,5 @@
 import { Frustum as ThreeFrustum } from "three";
-import { read_three_planes_to_array } from "../../../../core/geom/3d/frustum/read_three_planes_to_array.js";
+import { frustum3_planes_to_flat_from_three } from "../../../../core/geom/3d/frustum/frustum3_planes_to_flat_from_three.js";
 import { frustum_from_camera } from "./frustum_from_camera.js";
 
 const CLIPPING_EPSILON = 0.001;
@@ -45,7 +45,7 @@ export function auto_set_camera_clipping_planes(c, layers) {
     camera.far = c.clip_far;
 
     frustum_from_camera(camera, scratch_three_frustum, true);
-    read_three_planes_to_array(scratch_three_frustum.planes, scratch_frustum_planes);
+    frustum3_planes_to_flat_from_three(scratch_three_frustum.planes, scratch_frustum_planes);
 
     // Depth plane: passes through camera position, normal pointing along the
     // view direction (-Z in camera local). A world-space point's distance to

package/src/engine/graphics/ecs/camera/topdown/TopDownCameraController.js

@@ -1,6 +1,6 @@
 import { Matrix4 } from "three";
 import { assert } from "../../../../../core/assert.js";
-import { eulerAnglesFromMatrix } from "../../../../../core/geom/3d/mat4/eulerAnglesFromMatrix.js";
+import { m4_euler_angles } from "../../../../../core/geom/3d/mat4/m4_euler_angles.js";
 import { normalize_angle_rad } from "../../../../../core/geom/normalize_angle_rad.js";
 import Quaternion from "../../../../../core/geom/Quaternion.js";
 import Vector3 from '../../../../../core/geom/Vector3.js';
@@ -133,7 +133,7 @@ class TopDownCameraController {
          */
         m4.lookAt(target, eye, up);
 
-        eulerAnglesFromMatrix(angles, m4.elements, 2, 1, 0)
+        m4_euler_angles(angles, m4.elements, 2, 1, 0)
 
         this.pitch = angles[2];
         this.yaw = angles[1];

package/src/engine/graphics/ecs/decal/v2/FPDecalSystem.js

@@ -4,19 +4,19 @@ import { BVH } from "../../../../../core/bvh2/bvh3/BVH.js";
 import { BvhClient } from "../../../../../core/bvh2/bvh3/BvhClient.js";
 import { bvh_query_leaves_ray } from "../../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
 import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+    bvh_query_user_data_intersects_frustum
+} from "../../../../../core/bvh2/bvh3/query/bvh_query_user_data_intersects_frustum.js";
 import { LoadingCache } from "../../../../../core/cache/LoadingCache.js";
 
 import { returnTrue } from "../../../../../core/function/returnTrue.js";
 import { strictEquals } from "../../../../../core/function/strictEquals.js";
 import { aabb3_matrix4_project } from "../../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { aabb3_raycast } from "../../../../../core/geom/3d/aabb/aabb3_raycast.js";
+import { aabb3_raycast_hit_point } from "../../../../../core/geom/3d/aabb/aabb3_raycast_hit_point.js";
 import {
     aabb3_transformed_compute_plane_side
 } from "../../../../../core/geom/3d/aabb/aabb3_transformed_compute_plane_side.js";
 import { ray3_array_apply_matrix4 } from "../../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
-import { ray3_array_compose } from "../../../../../core/geom/3d/ray/ray3_array_compose.js";
+import { ray3_compose_array } from "../../../../../core/geom/3d/ray/ray3_compose_array.js";
 import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
 import { AssetManager } from "../../../../asset/AssetManager.js";
@@ -311,7 +311,7 @@ export class FPDecalSystem extends AbstractContextSystem {
         }
 
         const entities = [];
-        const rough_count = bvh_query_user_data_overlaps_frustum(
+        const rough_count = bvh_query_user_data_intersects_frustum(
             entities, 0,
             this.bvh,
             planes
@@ -390,7 +390,7 @@ export class FPDecalSystem extends AbstractContextSystem {
 
         const bvh = this.bvh;
 
-        const hit_count = bvh_query_leaves_ray(bvh, bvh.root, leaves, 0,
+        const hit_count = bvh_query_leaves_ray(leaves, 0, bvh, bvh.root,
             origin_x, origin_y, origin_z,
             direction_x, direction_y, direction_z
         );
@@ -431,7 +431,7 @@ export class FPDecalSystem extends AbstractContextSystem {
                 continue;
             }
 
-            ray3_array_compose(
+            ray3_compose_array(
                 scratch_ray_0,
                 origin_x, origin_y, origin_z,
                 direction_x, direction_y, direction_z
@@ -444,7 +444,7 @@ export class FPDecalSystem extends AbstractContextSystem {
             // transform ray into decal's local space
             ray3_array_apply_matrix4(scratch_ray_0, 0, scratch_ray_0, 0, scratch_m4);
 
-            if (aabb3_raycast(
+            if (aabb3_raycast_hit_point(
                 temp_hit, 0,
                 -0.5, -0.5, -0.5,
                 0.5, 0.5, 0.5,

package/src/engine/graphics/ecs/light/shadow/extend_shadow_camera_near_for_casters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extend_shadow_camera_near_for_casters.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/ecs/light/shadow/extend_shadow_camera_near_for_casters.js"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qEAHW,MAAM,kBAAkB,oCAuDlC"}
+{"version":3,"file":"extend_shadow_camera_near_for_casters.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/ecs/light/shadow/extend_shadow_camera_near_for_casters.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qEAHW,MAAM,kBAAkB,oCAuDlC"}

package/src/engine/graphics/ecs/light/shadow/extend_shadow_camera_near_for_casters.js

@@ -1,7 +1,5 @@
-import {
-    clipping_volume_matrix4_project
-} from "../../../../../core/geom/3d/frustum/clipping_volume_matrix4_project.js";
-import { hexahedron_from_aabb } from "../../../../../core/geom/3d/frustum/hexahedron_from_aabb.js";
+import { frustum3_matrix4_project_n } from "../../../../../core/geom/3d/frustum/frustum3_matrix4_project_n.js";
+import { frustum3_from_aabb } from "../../../../../core/geom/3d/frustum/frustum3_from_aabb.js";
 
 const scratch_local_planes = new Float32Array(24);
 const scratch_world_planes = new Float32Array(24);
@@ -52,13 +50,13 @@ export function extend_shadow_camera_near_for_casters(shadow_camera, layers) {
     const y0 = shadow_camera.bottom;
     const y1 = shadow_camera.top;
 
-    hexahedron_from_aabb(
+    frustum3_from_aabb(
         scratch_local_planes, 0,
         x0, y0, -CASTER_QUERY_HALF_RANGE,
         x1, y1, CASTER_QUERY_HALF_RANGE
     );
 
-    clipping_volume_matrix4_project(
+    frustum3_matrix4_project_n(
         scratch_world_planes, 0,
         scratch_local_planes, 0,
         6,

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

@@ -1,7 +1,7 @@
 import { mat4 } from "gl-matrix";
 import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
-import { aabb3_from_threejs_geometry } from "../../../../core/geom/3d/aabb/aabb3_from_threejs_geometry.js";
+import { aabb3_from_three_geometry } from "../../../../core/geom/3d/aabb/aabb3_from_three_geometry.js";
 import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
 import { ray3_array_apply_matrix4 } from "../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
 import { GeometrySpatialQueryAccelerator } from "../../geometry/buffered/query/GeometrySpatialQueryAccelerator.js";
@@ -255,7 +255,7 @@ export class ShadedGeometry {
 
     update_bounds() {
         // update bounds
-        aabb3_from_threejs_geometry(scratch_aabb3_array, this.geometry);
+        aabb3_from_three_geometry(scratch_aabb3_array, this.geometry);
 
         // transform
         aabb3_matrix4_project(this.__bvh_leaf.bounds, scratch_aabb3_array, this.transform);

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js

@@ -4,12 +4,12 @@ import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { bvh_query_depth_range_in_frustum } from "../../../../core/bvh2/bvh3/query/bvh_query_depth_range_in_frustum.js";
 import { bvh_query_leaves_generic } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_generic.js";
 import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+    bvh_query_user_data_intersects_frustum
+} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_intersects_frustum.js";
 import { BVHQueryIntersectsRay } from "../../../../core/bvh2/bvh3/query/BVHQueryIntersectsRay.js";
 
 import { returnTrue } from "../../../../core/function/returnTrue.js";
-import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
+import { ray3_compose_array } from "../../../../core/geom/3d/ray/ray3_compose_array.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { v3_distance_sqr } from "../../../../core/geom/vec3/v3_distance_sqr.js";
 import Task from "../../../../core/process/task/Task.js";
@@ -352,7 +352,7 @@ export class ShadedGeometrySystem extends System {
         result_offset,
         planes
     ) {
-        return bvh_query_user_data_overlaps_frustum(result, result_offset, this.__bvh_binary, planes);
+        return bvh_query_user_data_intersects_frustum(result, result_offset, this.__bvh_binary, planes);
     }
 
     /**
@@ -407,7 +407,7 @@ export class ShadedGeometrySystem extends System {
 
             const m4 = sg.transform;
 
-            ray3_array_compose(
+            ray3_compose_array(
                 scratch_ray_0,
                 origin_x, origin_y, origin_z,
                 direction_x, direction_y, direction_z
@@ -490,7 +490,7 @@ export class ShadedGeometrySystem extends System {
              */
             const m4 = sg.transform;
 
-            ray3_array_compose(
+            ray3_compose_array(
                 scratch_ray_0,
                 origin_x, origin_y, origin_z,
                 direction_x, direction_y, direction_z

package/src/engine/graphics/ecs/mesh-v2/render/ShadedGeometryRendererContext.js

@@ -1,7 +1,7 @@
 import { assert } from "../../../../../core/assert.js";
 import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+    bvh_query_user_data_intersects_frustum
+} from "../../../../../core/bvh2/bvh3/query/bvh_query_user_data_intersects_frustum.js";
 import { ShadedGeometry } from "../ShadedGeometry.js";
 import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
 import { AbstractRenderAdapter } from "./adapters/AbstractRenderAdapter.js";
@@ -113,7 +113,7 @@ export class ShadedGeometryRendererContext {
 
 
         // get all meshes
-        const intersection_count = bvh_query_user_data_overlaps_frustum(collection_array, 0, bvh, view.frustum);
+        const intersection_count = bvh_query_user_data_intersects_frustum(collection_array, 0, bvh, view.frustum);
 
         const sg_component_index = ecd.computeComponentTypeIndex(ShadedGeometry);
 

package/src/engine/graphics/ecs/trail2d/Trail2D.d.ts

@@ -11,6 +11,17 @@ declare class Trail2D {
      * @type {number}
      */
     width: number;
+    /**
+     * How new trail segments are committed behind the head.
+     * @type {TrailSpawnMode|number}
+     */
+    spawnMode: TrailSpawnMode | number;
+    /**
+     * Distance the head must travel before committing a new segment, used only when
+     * {@link spawnMode} is {@link TrailSpawnMode.Distance}.
+     * @type {number}
+     */
+    spawnDistance: number;
     /**
      * Current simulated time since trail birth
      * @type {number}
@@ -26,6 +37,11 @@ declare class Trail2D {
      * @type {number}
      */
     timeSinceLastUpdate: number;
+    /**
+     * Distance the head has travelled since the last segment was committed.
+     * @type {number}
+     */
+    distanceSinceLastUpdate: number;
     /**
      * @readonly
      * @type {Color}
@@ -94,21 +110,25 @@ declare class Trail2D {
      * Clear the trail's geometry and reset its state.
      */
     clear(): void;
-    fromJSON({ maxAge, width, textureURL, offset, color }: {
+    fromJSON({ maxAge, width, spawnMode, spawnDistance, textureURL, offset, color }: {
         maxAge?: number;
         width?: number;
+        spawnMode?: number;
+        spawnDistance?: number;
         textureURL: any;
         offset?: Vector3;
         color?: {
-            x: number;
-            y: number;
-            z: number;
-            w: number;
+            r: number;
+            g: number;
+            b: number;
+            a: number;
         };
     }): void;
     toJSON(): {
         maxAge: number;
         width: number;
+        spawnMode: number;
+        spawnDistance: number;
         color: {
             r: number;
             g: number;
@@ -142,6 +162,7 @@ declare namespace Trail2D {
     export let serializable: boolean;
     export { makeGradientTrail };
 }
+import { TrailSpawnMode } from "../../trail/TrailSpawnMode.js";
 import { Color } from "../../../../core/color/Color.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import { RibbonX } from "../../trail/x/RibbonX.js";

package/src/engine/graphics/ecs/trail2d/Trail2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Trail2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/Trail2D.js"],"names":[],"mappings":";AAoBA;IA6KI,oCAMC;IAjLD;;;OAGG;IACH,QAFU,MAAM,CAES;IAEzB;;;OAGG;IACH,OAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,eAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,qBAFU,MAAM,CAEQ;IAExB;;;OAGG;IACH,gBAFU,KAAK,CAEe;IAE9B;;;;OAIG;IACH,iBAFU,OAAO,CAEM;IAEvB;;;OAGG;IACH,QAFU,OAAO,GAAC,IAAI,CAER;IAEd;;;OAGG;IACH,UAFU,mBAAmB,CAEQ;IAErC;;;OAGG;IACH,cAFU,SAAS,CAEG;IAEtB;;;OAGG;IACH,cAAsB;IAEtB,gBAQC;IAMD,4BAEC;IAND,yBAEC;IAMD;;;;OAIG;IACH,cAHW,MAAM,GAAC,YAAY,GACjB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,YAAY,GACjB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,YAAY,SACnB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,GAAC,YAAY,GACjB,OAAO,CAInB;IAED;;;OAGG;IACH,qBAFW,MAAM,QAehB;IADG,kHAAgB;IAGpB;;OAEG;IACH,cAsBC;IAUD;;;;;;;;;;;aAcC;IAGD;;;;;;;;;;;;;;;MAQC;IAED;;;OAGG;IACH,cAFW,OAAO,WASjB;IAED;;;;;;;OAOG;IACH,cANW,MAAM,KACN,MAAM,KACN,MAAM,YACN,MAAM,GACJ,OAAO,CAyDnB;CAEJ;;;;;;sBAhTqB,iCAAiC;oBACnC,kCAAkC;wBAI9B,0BAA0B;oCACd,sCAAsC;0BAPhD,yCAAyC;6BAStC,mBAAmB;kCADd,wBAAwB"}
+{"version":3,"file":"Trail2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/Trail2D.js"],"names":[],"mappings":";AAwBA;IAgMI,oCAMC;IApMD;;;OAGG;IACH,QAFU,MAAM,CAES;IAEzB;;;OAGG;IACH,OAFU,MAAM,CAEM;IAEtB;;;OAGG;IACH,WAFU,cAAc,GAAC,MAAM,CAEC;IAEhC;;;;OAIG;IACH,eAFU,MAAM,CAEuB;IAEvC;;;OAGG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,eAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,qBAFU,MAAM,CAEQ;IAExB;;;OAGG;IACH,yBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,gBAFU,KAAK,CAEe;IAE9B;;;;OAIG;IACH,iBAFU,OAAO,CAEM;IAEvB;;;OAGG;IACH,QAFU,OAAO,GAAC,IAAI,CAER;IAEd;;;OAGG;IACH,UAFU,mBAAmB,CAEQ;IAErC;;;OAGG;IACH,cAFU,SAAS,CAEG;IAEtB;;;OAGG;IACH,cAAsB;IAEtB,gBAQC;IAMD,4BAEC;IAND,yBAEC;IAMD;;;;OAIG;IACH,cAHW,MAAM,GAAC,YAAY,GACjB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,YAAY,GACjB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,YAAY,SACnB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,GAAC,YAAY,GACjB,OAAO,CAInB;IAED;;;OAGG;IACH,qBAFW,MAAM,QAehB;IADG,kHAAgB;IAGpB;;OAEG;IACH,cAsBC;IAUD;;;;;;;;;;;;;aAkBC;IAGD;;;;;;;;;;;;;;;;;MAUC;IAED;;;OAGG;IACH,cAFW,OAAO,WAWjB;IAED;;;;;;;OAOG;IACH,cANW,MAAM,KACN,MAAM,KACN,MAAM,YACN,MAAM,GACJ,OAAO,CAkEnB;CAEJ;;;;;;+BAnV8B,+BAA+B;sBALxC,iCAAiC;oBACnC,kCAAkC;wBAM9B,0BAA0B;oCACd,sCAAsC;0BAThD,yCAAyC;6BAWtC,mBAAmB;kCADd,wBAAwB"}

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

@@ -2,8 +2,10 @@ import { FLOAT32_MAX } from "../../../../core/binary/FLOAT32_MAX.js";
 import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 import { Color } from "../../../../core/color/Color.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
+import { v3_distance } from "../../../../core/geom/vec3/v3_distance.js";
 import { clamp01 } from "../../../../core/math/clamp01.js";
 import ThreeFactory from "../../three/ThreeFactory.js";
+import { TrailSpawnMode } from "../../trail/TrailSpawnMode.js";
 import { RIBBON_ATTRIBUTE_ADDRESS_AGE } from "../../trail/x/ribbon_attributes_spec.js";
 import { RibbonX } from "../../trail/x/RibbonX.js";
 import { RibbonXMaterialSpec } from "../../trail/x/RibbonXMaterialSpec.js";
@@ -16,6 +18,8 @@ const DEFAULT_MAX_AGE = 5;
 
 const DEFAULT_WIDTH = 1;
 
+const DEFAULT_SPAWN_DISTANCE = 1;
+
 const v3_array = new Float32Array(3);
 
 class Trail2D {
@@ -32,6 +36,19 @@ class Trail2D {
      */
     width = DEFAULT_WIDTH;
 
+    /**
+     * How new trail segments are committed behind the head.
+     * @type {TrailSpawnMode|number}
+     */
+    spawnMode = TrailSpawnMode.Time;
+
+    /**
+     * Distance the head must travel before committing a new segment, used only when
+     * {@link spawnMode} is {@link TrailSpawnMode.Distance}.
+     * @type {number}
+     */
+    spawnDistance = DEFAULT_SPAWN_DISTANCE;
+
     /**
      * Current simulated time since trail birth
      * @type {number}
@@ -50,6 +67,12 @@ class Trail2D {
      */
     timeSinceLastUpdate = 0;
 
+    /**
+     * Distance the head has travelled since the last segment was committed.
+     * @type {number}
+     */
+    distanceSinceLastUpdate = 0;
+
     /**
      * @readonly
      * @type {Color}
@@ -202,13 +225,17 @@ class Trail2D {
     fromJSON({
                  maxAge = DEFAULT_MAX_AGE,
                  width = DEFAULT_WIDTH,
+                 spawnMode = TrailSpawnMode.Time,
+                 spawnDistance = DEFAULT_SPAWN_DISTANCE,
                  textureURL,
                  offset = Vector3.zero,
-                 color = { x: 1, y: 1, z: 1, w: 1 }
+                 color = { r: 1, g: 1, b: 1, a: 1 }
              }) {
 
         this.maxAge = maxAge;
         this.width = width;
+        this.spawnMode = spawnMode;
+        this.spawnDistance = spawnDistance;
         this.textureURL = textureURL;
 
         this.offset.fromJSON(offset);
@@ -220,6 +247,8 @@ class Trail2D {
         return {
             maxAge: this.maxAge,
             width: this.width,
+            spawnMode: this.spawnMode,
+            spawnDistance: this.spawnDistance,
             color: this.color.toJSON(),
             textureURL: this.textureURL,
             offset: this.offset.toJSON()
@@ -234,6 +263,8 @@ class Trail2D {
         return this.textureURL === other.textureURL
             && this.width === other.width
             && this.maxAge === other.maxAge
+            && this.spawnMode === other.spawnMode
+            && this.spawnDistance === other.spawnDistance
             && this.color.equals(other.color)
             && this.offset.equals(other.offset)
             ;
@@ -263,6 +294,7 @@ class Trail2D {
                 ribbon.setPointPosition(i, x, y, z);
             }
             this.timeSinceLastUpdate = 0;
+            this.distanceSinceLastUpdate = 0;
             this.clearFlag(Trail2DFlags.Reseed);
         }
 
@@ -275,19 +307,27 @@ class Trail2D {
             || y !== v3_array[1]
             || z !== v3_array[2];
 
-        if (this.timeSinceLastUpdate >= refitTimeDelta) {
+        if (head_position_changed) {
+            this.distanceSinceLastUpdate += v3_distance(v3_array[0], v3_array[1], v3_array[2], x, y, z);
+        }
+
+        // In Time mode (default) this matches the historical behaviour exactly:
+        // commit a segment once `maxAge / count` has elapsed. In Distance mode we
+        // commit once the head has travelled `spawnDistance`, keeping segments
+        // evenly spaced regardless of speed.
+        const should_spawn = this.spawnMode === TrailSpawnMode.Distance
+            ? this.distanceSinceLastUpdate >= this.spawnDistance
+            : this.timeSinceLastUpdate >= refitTimeDelta;
 
-            if (
-                head_position_changed
-            ) {
-                // make sure that this is a new position before rotating new segment
-                this.timeSinceLastUpdate = 0;
+        if (should_spawn && head_position_changed) {
+            // make sure that this is a new position before rotating new segment
+            this.timeSinceLastUpdate = 0;
+            this.distanceSinceLastUpdate = 0;
 
-                // rotating segment
-                ribbon.rotate();
+            // rotating segment
+            ribbon.rotate();
 
-                head_index = ribbon.getHeadIndex();
-            }
+            head_index = ribbon.getHeadIndex();
         }
 
         if (head_position_changed) {

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

@@ -1 +1 @@
-{"version":3,"file":"Trail2DSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/Trail2DSystem.js"],"names":[],"mappings":";AA0BA;IAkCI;;;OAGG;IACH,4BA4BC;IAjED,oDAAoC;IAEpC,+DAEE;IAEF;;;OAGG;IACH,WAFU,4BAA4B,CAES;IAE/C;;;;OAIG;IACH,wBAAiC;IAGjC;;;;OAIG;IACH,oBAAgB;IAEhB;;;OAGG;IACH,YAAgB;IAcZ;;;;OAIG;IACH,iBAAsB;IAEtB;;;OAGG;IACH,UAFU,cAAc,CAEO;IAE/B;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEH;IAK3B,2CAmBC;IAED,4CAIC;IAED;;;;;OAKG;IACH,sBAoDC;IAED;;;;;OAKG;IACH,YAHW,OAAO,aADP,SAAS,YAET,MAAM,QAahB;IAED;;;;;OAKG;IACH,kBAJW,OAAO,aACP,SAAS,UACT,MAAM,QAShB;IAED;;;;OAIG;IACH,yBAHW,OAAO,aACP,SAAS,QAoCnB;IAED,6BAWC;CACJ;uBApQsB,wBAAwB;0BACrB,qCAAqC;oBAY3C,cAAc;4CAdU,uDAAuD;6CAYtD,yDAAyD;+BARvE,yBAAyB"}
+{"version":3,"file":"Trail2DSystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/trail2d/Trail2DSystem.js"],"names":[],"mappings":";AA0BA;IAkCI;;;OAGG;IACH,4BA4BC;IAjED,oDAAoC;IAEpC,+DAEE;IAEF;;;OAGG;IACH,WAFU,4BAA4B,CAES;IAE/C;;;;OAIG;IACH,wBAAiC;IAGjC;;;;OAIG;IACH,oBAAgB;IAEhB;;;OAGG;IACH,YAAgB;IAcZ;;;;OAIG;IACH,iBAAsB;IAEtB;;;OAGG;IACH,UAFU,cAAc,CAEO;IAE/B;;;OAGG;IACH,aAFU,cAAY,IAAI,CAEH;IAK3B,2CAmBC;IAED,4CAIC;IAED;;;;;OAKG;IACH,sBAqDC;IAED;;;;;OAKG;IACH,YAHW,OAAO,aADP,SAAS,YAET,MAAM,QAahB;IAED;;;;;OAKG;IACH,kBAJW,OAAO,aACP,SAAS,UACT,MAAM,QAShB;IAED;;;;OAIG;IACH,yBAHW,OAAO,aACP,SAAS,QAoCnB;IAED,6BAWC;CACJ;uBArQsB,wBAAwB;0BACrB,qCAAqC;oBAY3C,cAAc;4CAdU,uDAAuD;6CAYtD,yDAAyD;+BARvE,yBAAyB"}

package/src/engine/graphics/ecs/trail2d/Trail2DSystem.js

@@ -147,6 +147,7 @@ class Trail2DSystem extends System {
         trail.trailingIndex = 0;
         trail.ribbon = ribbon;
         trail.timeSinceLastUpdate = 0;
+        trail.distanceSinceLastUpdate = 0;
 
 
         const trail_offset = trail.offset;

package/src/engine/graphics/ecs/trail2d/prototypeTrail2D.js

@@ -1,5 +1,5 @@
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
-import { make_justified_point_grid } from "../../../../core/geom/3d/util/make_justified_point_grid.js";
+import { aabb3_emit_point_grid } from "../../../../core/geom/3d/util/aabb3_emit_point_grid.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
 import Entity from "../../../ecs/Entity.js";
@@ -27,7 +27,7 @@ async function main(engine) {
 
     const bounds = new AABB3(2, 1, 2, 18, 1, 18);
 
-    const grid_points = make_justified_point_grid(bounds, 0.2, (x, y, z) => {
+    const grid_points = aabb3_emit_point_grid(bounds, 0.2, (x, y, z) => {
 
         const entity = new Entity();