@woosh/meep-engine 2.51.0 → 2.53.0

package/src/engine/graphics/ecs/decal/DecalSystem.js

@@ -10,25 +10,7 @@ import LoadMaterial from "../../material/LoadMaterial.js";
 
 import Decal from "./Decal.js";
 import DecalGeometry from "./threejs/DecalGeometry.js";
-
-/**
- *
- * @param {string} str
- * @returns {number}
- */
-function stringHash(str) {
-    let hash = 5381,
-        i = str.length;
-
-    while (i) {
-        hash = (hash * 33) ^ str.charCodeAt(--i)
-    }
-
-    /* JavaScript does bitwise operations (like XOR, above) on 32-bit signed
-     * integers. Since we want the results to be always positive, convert the
-     * signed int to an unsigned by doing an unsigned bitshift. */
-    return hash >>> 0;
-}
+import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 
 const MaterialCache = function () {
     this.materialLoader = new MaterialLoader();
@@ -37,7 +19,7 @@ const MaterialCache = function () {
 
 MaterialCache.prototype.get = function (json) {
     const str = JSON.stringify(json);
-    const hash = stringHash(str);
+    const hash = computeStringHash(str);
     if (this.table.hasOwnProperty(hash)) {
         return this.table[hash];
     } else {

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

@@ -3,38 +3,38 @@ import { computeStringHash } from "../../../../../core/primitives/strings/comput
 import { assert } from "../../../../../core/assert.js";
 
 export class Decal {
-    constructor() {
-        /**
-         * Asset URL
-         * @type {string}
-         */
-        this.uri = "";
-
-        /**
-         * Controls draw order
-         * @type {number}
-         */
-        this.priority = 0;
-
-        /**
-         * Color of the decal will be pre-multiplied by this
-         * @type {Color}
-         */
-        this.color = new Color(1, 1, 1, 1);
-
-        /**
-         * Internal transient reference to loaded asset
-         * @type {Sampler2D|null}
-         * @private
-         */
-        this.__cached_sampler = null;
-        /**
-         *
-         * @type {String|null}
-         * @private
-         */
-        this.__cached_uri = null;
-    }
+
+    /**
+     * Asset URL
+     * @type {string}
+     */
+    uri = "";
+
+    /**
+     * Controls draw order
+     * @type {number}
+     */
+    priority = 0;
+
+    /**
+     * Color of the decal will be pre-multiplied by this
+     * @type {Color}
+     */
+    color = new Color(1, 1, 1, 1);
+
+    /**
+     * Internal transient reference to loaded asset
+     * @type {Sampler2D|null}
+     * @private
+     */
+    __cached_sampler = null;
+    
+    /**
+     *
+     * @type {String|null}
+     * @private
+     */
+    __cached_uri = null;
 
     static fromJSON(j) {
         const r = new Decal();

package/src/engine/graphics/ecs/decal/v2/Decal.spec.js

@@ -0,0 +1,5 @@
+import { Decal } from "./Decal.js";
+
+test("constructor does not throw", () => {
+    new Decal();
+});

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

@@ -387,7 +387,9 @@ export class FPDecalSystem extends AbstractContextSystem {
 
         const leaves = [];
 
-        const hit_count = bvh_query_leaves_ray(this.bvh, leaves, 0,
+        const bvh = this.bvh;
+
+        const hit_count = bvh_query_leaves_ray(bvh,bvh.root, leaves, 0,
             origin_x, origin_y, origin_z,
             direction_x, direction_y, direction_z
         );
@@ -399,7 +401,7 @@ export class FPDecalSystem extends AbstractContextSystem {
         for (let i = 0; i < hit_count; i++) {
             const node = leaves[i];
 
-            const entity = this.bvh.node_get_user_data(node);
+            const entity = bvh.node_get_user_data(node);
 
 
             /**

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

@@ -5,8 +5,8 @@ import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matri
 import { mat4 } from "gl-matrix";
 import { ray3_array_apply_matrix4 } from "../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
 import { GeometrySpatialQueryAccelerator } from "../../geometry/buffered/query/GeometrySpatialQueryAccelerator.js";
-import { assert } from "../../../../core/assert.js";
 import { EBBVHLeafProxy } from "../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
+import { aabb3_from_threejs_geometry } from "../../../../core/geom/3d/aabb/aabb3_from_threejs_geometry.js";
 
 /**
  * @readonly
@@ -267,38 +267,9 @@ export class ShadedGeometry {
 
     update_bounds() {
         // update bounds
-        const gbb = this.geometry.boundingBox;
-
-        const min = gbb.min;
-
-        const x0 = min.x;
-        const y0 = min.y;
-        const z0 = min.z;
-
-        const max = gbb.max;
-
-        const x1 = max.x;
-        const y1 = max.y;
-        const z1 = max.z;
-
-        // validate bounds
-        assert.notNaN(x0, 'x0');
-        assert.notNaN(y0, 'y0');
-        assert.notNaN(z0, 'z0');
-
-        assert.notNaN(x1, 'x1');
-        assert.notNaN(y1, 'y1');
-        assert.notNaN(z1, 'z1');
-
-        // marshal into transform-accepted format
-        scratch_aabb3_array[0] = x0;
-        scratch_aabb3_array[1] = y0;
-        scratch_aabb3_array[2] = z0;
-
-        scratch_aabb3_array[3] = x1;
-        scratch_aabb3_array[4] = y1;
-        scratch_aabb3_array[5] = z1;
+        aabb3_from_threejs_geometry(scratch_aabb3_array, this.geometry);
 
+        // transform
         aabb3_matrix4_project(this.__bvh_leaf.bounds, scratch_aabb3_array, this.transform);
     }
 
@@ -315,7 +286,7 @@ export class ShadedGeometry {
         mat4.invert(scratch_m4, transform_matrix4);
 
         // transform ray to local space
-        if (!ray3_array_apply_matrix4(scratch_ray_0,0, ray,0, scratch_m4)) {
+        if (!ray3_array_apply_matrix4(scratch_ray_0, 0, ray, 0, scratch_m4)) {
             // invalid transform matrix
             return false;
         }

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

@@ -369,7 +369,9 @@ export class ShadedGeometrySystem extends System {
 
         const hits = [];
 
-        const hit_count = bvh_query_leaves_generic(hits, 0, this.__bvh_binary, BVHQueryIntersectsRay.from([origin_x, origin_y, origin_z, direction_x, direction_y, direction_z]));
+        const bvh = this.__bvh_binary;
+
+        const hit_count = bvh_query_leaves_generic(hits, 0, bvh, bvh.root, BVHQueryIntersectsRay.from([origin_x, origin_y, origin_z, direction_x, direction_y, direction_z]));
 
         const ecd = this.entityManager.dataset;
 
@@ -383,7 +385,7 @@ export class ShadedGeometrySystem extends System {
         for (let i = 0; i < hit_count; i++) {
             const node_id = hits[i];
 
-            const entity = this.__bvh_binary.node_get_user_data(node_id);
+            const entity = bvh.node_get_user_data(node_id);
 
             /**
              *
@@ -447,7 +449,9 @@ export class ShadedGeometrySystem extends System {
 
         const hits = [];
 
-        const hit_count = bvh_query_leaves_generic(hits, 0, this.__bvh_binary, BVHQueryIntersectsRay.from([origin_x, origin_y, origin_z, direction_x, direction_y, direction_z]));
+        const bvh = this.__bvh_binary;
+
+        const hit_count = bvh_query_leaves_generic(hits, 0, bvh, bvh.root, BVHQueryIntersectsRay.from([origin_x, origin_y, origin_z, direction_x, direction_y, direction_z]));
 
         const ecd = this.entityManager.dataset;
 
@@ -460,7 +464,7 @@ export class ShadedGeometrySystem extends System {
         for (let i = 0; i < hit_count; i++) {
             const node_id = hits[i];
 
-            const entity = this.__bvh_binary.node_get_user_data(node_id);
+            const entity = bvh.node_get_user_data(node_id);
 
             /**
              *

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMesh.spec.js

@@ -0,0 +1,5 @@
+import { SGMesh } from "./SGMesh.js";
+
+test("constructor does not throw", () => {
+    expect(() => new SGMesh()).not.toThrow()
+});

package/src/engine/graphics/ecs/mesh-v2/sample/prototypeShadedGeometry.js

@@ -20,10 +20,6 @@ import { randomFromArray } from "../../../../../core/math/random/randomFromArray
 import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
 import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import {
-    MicronShadedGeometryRenderAdapter
-} from "../../../micron/plugin/shaded_geometry/MicronShadedGeometryRenderAdapter.js";
-import { MicronRenderContext } from "../../../micron/render/v1/MicronRenderContext.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 
 const eh = new EngineHarness();
@@ -57,14 +53,6 @@ async function main(engine) {
 
     const sgs = new ShadedGeometrySystem(engine);
 
-    const mrc = new MicronRenderContext();
-    sgs.register_render_adapter(2, () => {
-        const adapter = new MicronShadedGeometryRenderAdapter();
-        adapter.ctx = mrc;
-
-        return adapter;
-    });
-
     await em.addSystem(sgs);
     await em.addSystem(new BehaviorSystem(engine));
 

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

@@ -38,7 +38,6 @@ import LightSystem from "../light/LightSystem.js";
 import AnimationControllerSystem from "../animation/AnimationControllerSystem.js";
 import { AnimationGraphSystem } from "../animation/animator/AnimationGraphSystem.js";
 import { BehaviorSystem } from "../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../ecs/ik/InverseKinematicsSystem.js";
 import { PathDisplaySystem } from "./PathDisplaySystem.js";
 import { PathDisplay } from "./PathDisplay.js";
@@ -121,7 +120,6 @@ function makeConfig(engine) {
         new AnimationGraphSystem(graphics.viewport.size),
         headsUpDisplaySystem,
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new InverseKinematicsSystem(),
         new ShadedGeometryHighlightSystem(engine),
         new PathDisplaySystem(engine),

package/src/engine/graphics/ecs/path/tube/prototypeAnimatedPathMask.js

@@ -24,11 +24,10 @@ import WaterSystem from "../../water/WaterSystem.js";
 import Trail2DSystem from "../../trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridObstacleSystem from "../../../../grid/systems/GridObstacleSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../highlight/system/MeshHighlightSystem.js";
@@ -36,7 +35,6 @@ import LightSystem from "../../light/LightSystem.js";
 import AnimationControllerSystem from "../../animation/AnimationControllerSystem.js";
 import { AnimationGraphSystem } from "../../animation/animator/AnimationGraphSystem.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import { PathDisplaySystem } from "../PathDisplaySystem.js";
 import {
@@ -119,7 +117,6 @@ function makeConfig(engine) {
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),
         new SynchronizePositionSystem(),
-        new GridObstacleSystem(),
         new GridPositionSystem(),
         new InputControllerSystem(devices),
         new InputSystem(devices),
@@ -131,7 +128,6 @@ function makeConfig(engine) {
         new AnimationGraphSystem(graphics.viewport.size),
         headsUpDisplaySystem,
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new InverseKinematicsSystem(),
         new PathDisplaySystem(engine),
     );

package/src/engine/graphics/ecs/water2/shader/testWaterShader.js

@@ -11,11 +11,10 @@ import { MeshSystem } from "../../mesh/MeshSystem.js";
 import TerrainSystem from "../../../../ecs/terrain/ecs/TerrainSystem.js";
 import WaterSystem from "../../water/WaterSystem.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridObstacleSystem from "../../../../grid/systems/GridObstacleSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../highlight/system/MeshHighlightSystem.js";
@@ -54,7 +53,6 @@ function makeConfig(engine) {
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),
         new SynchronizePositionSystem(),
-        new GridObstacleSystem(),
         new GridPositionSystem(),
         new InputControllerSystem(devices),
         new InputSystem(devices),

package/src/engine/graphics/geometry/buffered/computeBufferAttributeHash.js

@@ -1,4 +1,4 @@
-import { computeStridedIntegerArrayHash } from "../../../computeStridedIntegerArrayHash.js";
+import { computeStridedIntegerArrayHash } from "../../../../core/primitives/array/computeStridedIntegerArrayHash.js";
 
 /**
  *

package/src/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -22,7 +22,6 @@ import { InputSystem } from "../../../../../../input/ecs/systems/InputSystem.js"
 import MeshHighlightSystem from "../../../../../ecs/highlight/system/MeshHighlightSystem.js";
 import LightSystem from "../../../../../ecs/light/LightSystem.js";
 import { BehaviorSystem } from "../../../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../../../../../ecs/systems/SerializationMetadataSystem.js";
 import { PathDisplaySystem } from "../../../../../ecs/path/PathDisplaySystem.js";
 import RenderSystem from "../../../../../../ecs/systems/RenderSystem.js";
 import { makeEngineOptionsModel } from "../../../../../../../../../model/game/options/makeEngineOptionsModel.js";
@@ -125,7 +124,6 @@ function makeConfig(engine) {
         }),
         headsUpDisplaySystem,
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new PathDisplaySystem(engine),
         new ParticleEmitterSystem(engine),
         new ShadedGeometrySystem(engine)

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

@@ -24,11 +24,10 @@ import WaterSystem from "../../../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridObstacleSystem from "../../../../grid/systems/GridObstacleSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";
@@ -38,7 +37,6 @@ import { AnimationGraphSystem } from "../../../ecs/animation/animator/AnimationG
 import { FogOfWarSystem } from "../../../../ecs/fow/FogOfWarSystem.js";
 import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import { CanvasView } from "../../../../../view/elements/CanvasView.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
@@ -111,7 +109,6 @@ function makeConfig(engine) {
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),
         new SynchronizePositionSystem(),
-        new GridObstacleSystem(),
         new GridPositionSystem(),
         new InputControllerSystem(devices),
         new InputSystem(devices),
@@ -125,7 +122,6 @@ function makeConfig(engine) {
         new FogOfWarSystem(graphics),
         new FogOfWarRevealerSystem(0),
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new InverseKinematicsSystem(),
         new PathDisplaySystem(engine),
     );

package/src/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -25,11 +25,10 @@ import WaterSystem from "../../../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridObstacleSystem from "../../../../grid/systems/GridObstacleSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";
@@ -39,7 +38,6 @@ import { AnimationGraphSystem } from "../../../ecs/animation/animator/AnimationG
 import { FogOfWarSystem } from "../../../../ecs/fow/FogOfWarSystem.js";
 import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
 import {
@@ -139,7 +137,6 @@ function makeConfig(engine) {
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),
         new SynchronizePositionSystem(),
-        new GridObstacleSystem(),
         new GridPositionSystem(),
         new InputControllerSystem(devices),
         new InputSystem(devices),
@@ -154,7 +151,6 @@ function makeConfig(engine) {
         new FogOfWarSystem(graphics),
         new FogOfWarRevealerSystem(0),
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new InverseKinematicsSystem(),
         new PathDisplaySystem(engine),
         new ShadedGeometrySystem(engine)

package/src/engine/graphics/render/forward_plus/prototype/prototypeLightManager.js

@@ -24,7 +24,6 @@ import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import { MouseEvents } from "../../../../input/devices/events/MouseEvents.js";
 import { RingBuffer } from "../../../../../core/collection/RingBuffer.js";
 import { query_bvh_frustum_from_objects } from "../query/query_bvh_frustum_from_objects.js";
-import { prettyPrint } from "../../../../../core/NumberFormat.js";
 import { FPlusDebugMaterial } from "../materials/FPlusDebugMaterial.js";
 import { parseColor } from "../../../../../core/color/parseColor.js";
 import { buildLightClusterWidget } from "../debug/buildLightClusterWidget.js";
@@ -66,6 +65,7 @@ import { Localization } from "../../../../../core/localization/Localization.js";
 import '../../../../../../../../../css/game.scss'
 import { randomFromArray } from "../../../../../core/math/random/randomFromArray.js";
 import { debugAtlas } from "../../../particles/particular/engine/shader/debugAtlas.js";
+import { number_pretty_print } from "../../../../../core/primitives/numbers/number_pretty_print.js";
 
 document.body.style.margin = 0;
 
@@ -1523,7 +1523,7 @@ function print_perf_stats() {
 
         metric.computeStats(stats);
 
-        values.push(`${m}: ${prettyPrint(stats.mean)}`);
+        values.push(`${m}: ${number_pretty_print(stats.mean)}`);
     });
 
     console.log(values.join(", "));

package/src/engine/graphics/render/visibility/hiz/prototypeHiZ.js

@@ -24,11 +24,10 @@ import WaterSystem from "../../../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridObstacleSystem from "../../../../grid/systems/GridObstacleSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";
@@ -38,7 +37,6 @@ import { AnimationGraphSystem } from "../../../ecs/animation/animator/AnimationG
 import { FogOfWarSystem } from "../../../../ecs/fow/FogOfWarSystem.js";
 import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
@@ -55,7 +53,6 @@ import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
 import GUIElement from "../../../../ecs/gui/GUIElement.js";
 import { MetricCollection } from "../../../../development/performance/MetricCollection.js";
 import { MetricStatistics } from "../../../../development/performance/MetricStatistics.js";
-import { prettyPrint } from "../../../../../core/NumberFormat.js";
 import { buildCanvasViewFromTexture } from "./buildCanvasViewFromTexture.js";
 import { BatchOcclusionQuery } from "./query/BatchOcclusionQuery.js";
 import HeadsUpDisplay from "../../../../ecs/gui/hud/HeadsUpDisplay.js";
@@ -69,6 +66,7 @@ import { min2 } from "../../../../../core/math/min2.js";
 import { mat4 } from "gl-matrix";
 import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
 import { load_and_set_cubemap_v0 } from "../../../load_and_set_cubemap_v0.js";
+import { number_pretty_print } from "../../../../../core/primitives/numbers/number_pretty_print.js";
 
 const engineHarness = new EngineHarness();
 
@@ -115,7 +113,6 @@ function makeConfig(engine) {
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),
         new SynchronizePositionSystem(),
-        new GridObstacleSystem(),
         new GridPositionSystem(),
         new InputControllerSystem(devices),
         new InputSystem(devices),
@@ -129,7 +126,6 @@ function makeConfig(engine) {
         new FogOfWarSystem(graphics),
         new FogOfWarRevealerSystem(0),
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new InverseKinematicsSystem(),
         new PathDisplaySystem(engine),
     );
@@ -186,7 +182,7 @@ function print_perf_stats() {
 
         metric.computeStats(stats);
 
-        values.push(`${m}: ${prettyPrint(stats.mean)}`);
+        values.push(`${m}: ${number_pretty_print(stats.mean)}`);
     });
 
     console.log(values.join(", "));

package/src/engine/graphics/sh3/path_tracer/GeometryBVHBatched.js

@@ -179,7 +179,8 @@ export class GeometryBVHBatched {
 
         // TODO we can unify BVH traversal with ray checks to reduce number of checks
         const count = bvh_query_leaves_ray(
-            bvh, leaf_buffer, 0,
+            bvh, bvh.root,
+            leaf_buffer, 0,
             origin_x, origin_y, origin_z,
             direction_x, direction_y, direction_z
         );

package/src/engine/graphics/sh3/path_tracer/PathTracer.js

@@ -378,7 +378,12 @@ export class PathTracer {
      */
     trace(out, ray, min_distance, max_distance) {
         const bvh = this.bvh_top_level;
-        const hit_count = bvh_query_leaves_ray(bvh, temp_ray_results, 0, ray[0], ray[1], ray[2], ray[3], ray[4], ray[5]);
+
+        const hit_count = bvh_query_leaves_ray(
+            bvh, bvh.root,
+            temp_ray_results, 0,
+            ray[0], ray[1], ray[2], ray[3], ray[4], ray[5]
+        );
 
         let nearest_hit_distance = max_distance;
         let nearest_mesh = null;

package/src/engine/graphics/sh3/path_tracer/prototypePathTracer.js

@@ -13,7 +13,6 @@ import { Sampler2D } from "../../texture/sampler/Sampler2D.js";
 import sampler2D2Canvas from "../../texture/sampler/Sampler2D2Canvas.js";
 import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
-import { prettyPrint } from "../../../../core/NumberFormat.js";
 import { float2uint8 } from "../../../../core/binary/float2uint8.js";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
 import { Camera } from "../../ecs/camera/Camera.js";
@@ -38,6 +37,7 @@ import { min2 } from "../../../../core/math/min2.js";
 import { makeGeometryIndexed } from "../../geometry/buffered/makeGeometryIndexed.js";
 import { DirectionalLight } from "../../render/forward_plus/model/DirectionalLight.js";
 import { kelvin_to_rgb } from "../../../../core/color/kelvin_to_rgb.js";
+import { number_pretty_print } from "../../../../core/primitives/numbers/number_pretty_print.js";
 
 document.body.style.margin = 0;
 document.body.style.overflow = "hidden";
@@ -500,7 +500,7 @@ function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
 
     const total_time = performance.now() - t0;
 
-    console.log(`Trace finished in ${prettyPrint(total_time)}ms. Total of ${prettyPrint(sample_count)} samples, ${prettyPrint(sample_count * 1000 / total_time)} samples per second`);
+    console.log(`Trace finished in ${number_pretty_print(total_time)}ms. Total of ${number_pretty_print(sample_count)} samples, ${number_pretty_print(sample_count * 1000 / total_time)} samples per second`);
 
 }
 

package/src/engine/graphics/shadows/testShadowMapRendering.js

@@ -23,7 +23,6 @@ import { InputSystem } from "../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../ecs/highlight/system/MeshHighlightSystem.js";
 import LightSystem from "../ecs/light/LightSystem.js";
 import { BehaviorSystem } from "../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { SerializationMetadataSystem } from "../../ecs/systems/SerializationMetadataSystem.js";
 import { PathDisplaySystem } from "../ecs/path/PathDisplaySystem.js";
 import { ParticleEmitterSystem } from "../particles/ecs/ParticleEmitterSystem.js";
 import { ShadedGeometrySystem } from "../ecs/mesh-v2/ShadedGeometrySystem.js";
@@ -96,7 +95,6 @@ function makeConfig(engine) {
         }),
         headsUpDisplaySystem,
         new BehaviorSystem(engine),
-        new SerializationMetadataSystem(),
         new PathDisplaySystem(engine),
         new ParticleEmitterSystem(engine),
         new ShadedGeometrySystem(engine),

package/src/engine/graphics/texture/TextureBackedMemoryRegion.js

@@ -21,7 +21,10 @@ const DATA_TEXTURE_WIDTH = 128;
 const SHRINK_FACTOR = 0.5;
 const GROW_FACTOR = 1.05;
 
-
+/**
+ * Mainly used for storing non-color data in GPU memory
+ * Useful for things like simulation and running general purpose GPU compute inside fragment shaders
+ */
 export class TextureBackedMemoryRegion {
 
     constructor() {

package/src/engine/graphics/texture/sampler/Sampler2D.js

@@ -15,7 +15,7 @@ import {
     compute_typed_array_constructor_from_data_type
 } from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
 import { Base64 } from "../../../../core/binary/Base64.js";
-import { computeStridedIntegerArrayHash } from "../../../computeStridedIntegerArrayHash.js";
+import { computeStridedIntegerArrayHash } from "../../../../core/primitives/array/computeStridedIntegerArrayHash.js";
 import { is_typed_array_equals } from "../../../../core/collection/array/typed/is_typed_array_equals.js";
 
 /**