@woosh/meep-engine 2.109.12 → 2.109.13

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.109.12",
+  "version": "2.109.13",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/collection/array/array_range_equal_strict.d.ts

@@ -1,12 +1,12 @@
 /**
  * Checks that elements in supplied arrays are exactly equal within a certain range defined by a pair of offsets and element count (length)
  * @template T
- * @param {T[]} a
+ * @param {T[]|Float32Array} a
  * @param {number} offset_a
- * @param {T[]} b
+ * @param {T[]|Float32Array} b
  * @param {number} offset_b
  * @param {number} length
  * @returns {boolean}
  */
-export function array_range_equal_strict<T>(a: T[], offset_a: number, b: T[], offset_b: number, length: number): boolean;
+export function array_range_equal_strict<T>(a: Float32Array | T[], offset_a: number, b: Float32Array | T[], offset_b: number, length: number): boolean;
 //# sourceMappingURL=array_range_equal_strict.d.ts.map

package/src/core/collection/array/array_range_equal_strict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array_range_equal_strict.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/array/array_range_equal_strict.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,8DANW,MAAM,oBAEN,MAAM,UACN,MAAM,GACJ,OAAO,CAanB"}
+{"version":3,"file":"array_range_equal_strict.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/array/array_range_equal_strict.js"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,6EANW,MAAM,mCAEN,MAAM,UACN,MAAM,GACJ,OAAO,CAanB"}

package/src/core/collection/array/array_range_equal_strict.js

@@ -1,9 +1,9 @@
 /**
  * Checks that elements in supplied arrays are exactly equal within a certain range defined by a pair of offsets and element count (length)
  * @template T
- * @param {T[]} a
+ * @param {T[]|Float32Array} a
  * @param {number} offset_a
- * @param {T[]} b
+ * @param {T[]|Float32Array} b
  * @param {number} offset_b
  * @param {number} length
  * @returns {boolean}

package/src/core/geom/3d/Ray3.d.ts

@@ -6,8 +6,38 @@ export class Ray3 extends Float32Array {
     set tMax(arg: any);
     get tMax(): any;
     6: any;
-    get direction(): Float32Array;
-    get origin(): Float32Array;
+    /**
+     *
+     * @param {number[]|Float32Array} v
+     */
+    set direction(arg: number[] | Float32Array);
+    get direction(): number[] | Float32Array;
+    /**
+     *
+     * @param {number[]|Float32Array} v
+     */
+    set origin(arg: number[] | Float32Array);
+    get origin(): number[] | Float32Array;
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     * @param {number} z
+     */
+    setOrigin(x: number, y: number, z: number): void;
+    0: number;
+    1: number;
+    2: number;
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     * @param {number} z
+     */
+    setDirection(x: number, y: number, z: number): void;
+    3: number;
+    4: number;
+    5: number;
     /**
      *
      * @param {number} distance
@@ -28,6 +58,7 @@ export class Ray3 extends Float32Array {
      * @param {Ray3} other
      */
     copy(other: Ray3): void;
+    hash(): number;
     /**
      *
      * @param {Ray3} other

package/src/core/geom/3d/Ray3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Ray3.d.ts","sourceRoot":"","sources":["../../../../../src/core/geom/3d/Ray3.js"],"names":[],"mappings":"AAKA;;GAEG;AACH;IACI,cAKC;IAMD,mBAEC;IAND,gBAEC;IAGG,OAAW;IAGf,8BAEC;IAED,2BAEC;IAED;;;OAGG;IACH,uBAFW,MAAM,QAMhB;IAED;;;OAGG;IACH,iBAFW,MAAM,EAAE,UAAM,YAAY,QAepC;IAED;;;OAGG;IACH,SAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,YAFW,IAAI,QAId;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAInB;CACJ"}
+{"version":3,"file":"Ray3.d.ts","sourceRoot":"","sources":["../../../../../src/core/geom/3d/Ray3.js"],"names":[],"mappings":"AAOA;;GAEG;AACH;IACI,cAKC;IAMD,mBAEC;IAND,gBAEC;IAGG,OAAW;IAOf;;;OAGG;IACH,4CAEC;IAVD,yCAEC;IAcD;;;OAGG;IACH,yCAEC;IAVD,sCAEC;IAUD;;;;;OAKG;IACH,aAJW,MAAM,KACN,MAAM,KACN,MAAM,QAMhB;IAHG,UAAW;IACX,UAAW;IACX,UAAW;IAGf;;;;;OAKG;IACH,gBAJW,MAAM,KACN,MAAM,KACN,MAAM,QAMhB;IAHG,UAAW;IACX,UAAW;IACX,UAAW;IAGf;;;OAGG;IACH,uBAFW,MAAM,QAMhB;IAED;;;OAGG;IACH,iBAFW,MAAM,EAAE,UAAM,YAAY,QAepC;IAED;;;OAGG;IACH,SAFa,IAAI,CAQhB;IAED;;;OAGG;IACH,YAFW,IAAI,QAId;IAED,eAEC;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAInB;CACJ"}

package/src/core/geom/3d/Ray3.js

@@ -1,4 +1,6 @@
+import { array_copy } from "../../collection/array/array_copy.js";
 import { array_range_equal_strict } from "../../collection/array/array_range_equal_strict.js";
+import { computeHashFloatArray } from "../../math/hash/computeHashFloatArray.js";
 import { v3_matrix4_multiply } from "../vec3/v3_matrix4_multiply.js";
 import { v3_matrix4_rotate } from "../vec3/v3_matrix4_rotate.js";
 import { ray3_interval_array_apply_matrix4 } from "./ray/ray3_interval_array_apply_matrix4.js";
@@ -26,10 +28,50 @@ export class Ray3 extends Float32Array {
         return new Float32Array(this.buffer, this.byteOffset + 3 * 4, 3);
     }
 
+    /**
+     *
+     * @param {number[]|Float32Array} v
+     */
+    set direction(v) {
+        array_copy(v, 0, this, 3, 3);
+    }
+
     get origin() {
         return new Float32Array(this.buffer, this.byteOffset, 3);
     }
 
+    /**
+     *
+     * @param {number[]|Float32Array} v
+     */
+    set origin(v) {
+        array_copy(v, 0, this, 0, 3);
+    }
+
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     * @param {number} z
+     */
+    setOrigin(x, y, z) {
+        this[0] = x;
+        this[1] = y;
+        this[2] = z;
+    }
+
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     * @param {number} z
+     */
+    setDirection(x, y, z) {
+        this[3] = x;
+        this[4] = y;
+        this[5] = z;
+    }
+
     /**
      *
      * @param {number} distance
@@ -79,6 +121,10 @@ export class Ray3 extends Float32Array {
         this.set(other);
     }
 
+    hash() {
+        return computeHashFloatArray(this);
+    }
+
     /**
      *
      * @param {Ray3} other

package/src/engine/graphics/ecs/camera/focal_length_to_fov.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @see https://en.wikipedia.org/wiki/Focal_length
+ * @param {number} focal_length (in mm)
+ * @param {number} [sensor_width] Width of camera sensor (in mm)
+ * @returns {number} in Radians
+ */
+export function focal_length_to_fov(focal_length: number, sensor_width?: number): number;
+//# sourceMappingURL=focal_length_to_fov.d.ts.map

package/src/engine/graphics/ecs/camera/focal_length_to_fov.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"focal_length_to_fov.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/camera/focal_length_to_fov.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,kDAJW,MAAM,iBACN,MAAM,GACJ,MAAM,CAMlB"}

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

@@ -0,0 +1,11 @@
+/**
+ * @see https://en.wikipedia.org/wiki/Focal_length
+ * @param {number} focal_length (in mm)
+ * @param {number} [sensor_width] Width of camera sensor (in mm)
+ * @returns {number} in Radians
+ */
+export function focal_length_to_fov(focal_length, sensor_width = 35) {
+
+    return 2 * Math.atan(sensor_width / (2 * focal_length));
+
+}

package/src/engine/graphics/render/gizmo/Gizmo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Gizmo.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/gizmo/Gizmo.js"],"names":[],"mappings":"AAEA,iDAA2D;6CAFd,mCAAmC"}
+{"version":3,"file":"Gizmo.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/gizmo/Gizmo.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,oBAFU,4BAA4B,CAEqB;6CANd,mCAAmC"}

package/src/engine/graphics/render/gizmo/Gizmo.js

@@ -1,3 +1,7 @@
 import { GizmoShapeRenderingInterface } from "./GizmoShapeRenderingInterface.js";
 
+/**
+ *
+ * @type {GizmoShapeRenderingInterface}
+ */
 export const Gizmo = GizmoShapeRenderingInterface.INSTANCE;

package/src/engine/graphics/render/gizmo/GizmoShapeRenderingInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GizmoShapeRenderingInterface.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/gizmo/GizmoShapeRenderingInterface.js"],"names":[],"mappings":"AAyCA;;GAEG;AACH;IAGQ;;;;OAIG;IACH,gBAA2B;IAE3B,kCAA8F;IAC9F,iCAA6F;IAI7F,mCAA2G;IAC3G,kCAAiG;IAKjG,eAA0B;IAG9B,+CAQC;IAED;;;;;OAKG;IACH,qBAJW,MAAM,QAAQ,EAAE,sBAChB,MAAM,WACN,MAAM,EAAE,UAYlB;IAED,cAOC;IAED;;;;OAIG;IACH,yBAMC;IAED;;;OAGG;IACH,sBAEC;IAED;;;;OAIG;IACH,wBAHW,MAAM,EAAE,QACR,MAAM,EAAE,QAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,EAAE,QACR,MAAM,EAAE,QAKlB;IAED;;;;OAIG;IACH,gBAHW,MAAM,EAAE,MACR,MAAM,EAAE,QAIlB;IAGD;;;;OAIG;IACH,0BAHW,MAAM,EAAE,UACR,MAAM,QAKhB;IAED;;;;OAIG;IACH,yBAHW,MAAM,EAAE,UACR,MAAM,QAKhB;CACJ;;;;mCA7KkC,iDAAiD;sBAQ9D,aAAa"}
+{"version":3,"file":"GizmoShapeRenderingInterface.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/render/gizmo/GizmoShapeRenderingInterface.js"],"names":[],"mappings":"AAyCA;;GAEG;AACH;IAGQ;;;;OAIG;IACH,gBAA6C;IAE7C,kCAA8F;IAC9F,iCAA6F;IAI7F,mCAA2G;IAC3G,kCAAiG;IAKjG,eAA0B;IAG9B,+CAQC;IAED;;;;;OAKG;IACH,qBAJW,MAAM,QAAQ,EAAE,sBAChB,MAAM,WACN,MAAM,EAAE,UAYlB;IAED,cAOC;IAED;;;;OAIG;IACH,yBAMC;IAED;;;OAGG;IACH,sBAEC;IAED;;;;OAIG;IACH,wBAHW,MAAM,EAAE,QACR,MAAM,EAAE,QAKlB;IAED;;;;OAIG;IACH,uBAHW,MAAM,EAAE,QACR,MAAM,EAAE,QAKlB;IAED;;;;OAIG;IACH,gBAHW,MAAM,EAAE,MACR,MAAM,EAAE,QAIlB;IAGD;;;;OAIG;IACH,0BAHW,MAAM,EAAE,UACR,MAAM,QAKhB;IAED;;;;OAIG;IACH,yBAHW,MAAM,EAAE,UACR,MAAM,QAKhB;CACJ;;;;mCAtKkC,iDAAiD;sBAC9D,aAAa"}

package/src/engine/graphics/render/gizmo/GizmoShapeRenderingInterface.js

@@ -1,13 +1,13 @@
-import { array_copy } from "../../../../core/collection/array/array_copy.js";
-import { assert } from "../../../../core/assert.js";
-import { InstancedMeshGroup } from "../../geometry/instancing/InstancedMeshGroup.js";
 import { BoxBufferGeometry, LineBasicMaterial, MeshBasicMaterial, OctahedronBufferGeometry } from "three";
+import { makeHelperBoxGeometry } from "../../../../../editor/process/symbolic/makeHelperBoxGeometry.js";
+import { makeHelperSphereGeometry } from "../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
+import { assert } from "../../../../core/assert.js";
+import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import { compose_matrix4_array } from "../../../../core/geom/3d/compose_matrix4_array.js";
-import Vector3 from "../../../../core/geom/Vector3.js";
 import Quaternion from "../../../../core/geom/Quaternion.js";
-import { makeHelperBoxGeometry } from "../../../../../editor/process/symbolic/makeHelperBoxGeometry.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
 import { DrawMode } from "../../ecs/mesh-v2/DrawMode.js";
-import { makeHelperSphereGeometry } from "../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
+import { InstancedMeshGroup } from "../../geometry/instancing/InstancedMeshGroup.js";
 import { Lines } from "../Lines.js";
 
 /**
@@ -47,10 +47,10 @@ export class GizmoShapeRenderingInterface {
 
         /**
          *
-         * @type {number[]}
+         * @type {number[]|Float32Array}
          * @private
          */
-        this.__color = [1, 1, 1, 1];
+        this.__color = new Float32Array([1, 1, 1, 1]);
 
         this.__boxes_solid = InstancedMeshGroup.from(new BoxBufferGeometry(), new MeshBasicMaterial());
         this.__boxes_wire = InstancedMeshGroup.from(makeHelperBoxGeometry(), new LineBasicMaterial());

package/src/engine/graphics/sh3/gi/material/common.glsl

@@ -515,8 +515,6 @@ vec4 lpv_renormalize_weights(in vec4 source) {
 
 }
 
-
-
 vec3 lpv_sample_irradiance(vec3 position, vec3 normal, vec3 view_direction) {
 
     // Bias the position at which visibility is computed; this

package/src/engine/graphics/sh3/gi/material/space_fragment/build_fragment_shader.js

@@ -24,7 +24,7 @@ const ACCUMULATION = `
         
         vec3 probe_irradiance = lpv_sample_irradiance( vWorldPosition, world_normal, geometry.viewDir );
         
-        irradiance += probe_irradiance * lpv_f_intensity;
+        irradiance  += probe_irradiance * lpv_f_intensity;
         
     }
 

package/src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PathTracerProbeRenderer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js"],"names":[],"mappings":"AAuBA;IACI,mBAA0B;IAC1B,yBAAqB;IACrB,qBAAmB;IACnB,qBAAyB;IAEzB,uBAA6B;IAE7B;;;;;;;;OAQG;IACH,kCAPW,MAAM,aACN,MAAM,YACN,MAAM,EAAE,mBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAahB;IAED,iFAuCC;IAKD,mBACC;IAED,4BAKC;CACJ;8BA5F6B,oBAAoB;2BAHvB,8BAA8B;gCADzB,mCAAmC"}
+{"version":3,"file":"PathTracerProbeRenderer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js"],"names":[],"mappings":"AAuBA;IACI,mBAA0B;IAC1B,yBAAqB;IACrB,qBAAoB;IACpB,qBAAyB;IAEzB,uBAA6B;IAE7B;;;;;;;;OAQG;IACH,kCAPW,MAAM,aACN,MAAM,YACN,MAAM,EAAE,mBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAahB;IAED,iFAuCC;IAKD,mBACC;IAED,4BAKC;CACJ;8BA5F6B,oBAAoB;2BAHvB,8BAA8B;gCADzB,mCAAmC"}

package/src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js

@@ -24,7 +24,7 @@ const sampled_irradiance = new Float32Array(3);
 export class PathTracerProbeRenderer extends ProbeRenderer {
     tracer = new PathTracer();
     max_bounce_count = 7;
-    sample_count = 192;
+    sample_count = 4096;
     random = seededRandom(0);
 
     scene = new PathTracedScene()

package/src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map.js

@@ -43,13 +43,13 @@ export function bake_octahedral_depth_map(
      * The lower the resolution - the higher the discontinuities
      * This is heights of an arch on a unit sphere, where arch spans 1/resolution angle
      * Half-PI is to get the height at midpoint of the arch
-     * x2 is to get error over the entire circle, as the previous term only gets us to semicircle
+     * x2 is to get error over the entire circle, as the previous term only gets us to semicircle (we can skip this to get half the max rise, or mean)
      * xMath.SQRT2 is to allow for diagonals between pixels
      * @type {number}
      */
-    const RESOLUTION_BIAS = Math.sin(PI_HALF / resolution) * 2 * Math.SQRT2;
+    const RESOLUTION_BIAS = Math.sin(PI_HALF / resolution) * Math.SQRT2;
 
-    const NORMAL_BIAS = max_depth * 0.01;
+    const NORMAL_BIAS = max_depth * 0.01 + 1e-6;
 
     const ray_direction = scratch_ray.direction;
 
@@ -84,21 +84,21 @@ export function bake_octahedral_depth_map(
                     ray_direction[0], ray_direction[1], ray_direction[2]
                 );
 
-                const resolution_bias_offset = distance * RESOLUTION_BIAS;
+                const resolution_bias_offset = max_depth * RESOLUTION_BIAS;
 
-                const hit_normal_bias = -clamp01(1 - hit_angle_cos) * NORMAL_BIAS;
+                const hit_normal_bias = clamp01(1 - hit_angle_cos) * (resolution_bias_offset) + NORMAL_BIAS;
 
                 // sink the contact into the surface along the hit normal
-                const biased_hit_x = surface_position_x + surface_normal_x * hit_normal_bias;
-                const biased_hit_y = surface_position_y + surface_normal_y * hit_normal_bias;
-                const biased_hit_z = surface_position_z + surface_normal_z * hit_normal_bias;
+                const biased_hit_x = surface_position_x - surface_normal_x * hit_normal_bias;
+                const biased_hit_y = surface_position_y - surface_normal_y * hit_normal_bias;
+                const biased_hit_z = surface_position_z - surface_normal_z * hit_normal_bias;
 
                 distance = v3_distance(
                     scratch_ray[0], scratch_ray[1], scratch_ray[2],
                     biased_hit_x, biased_hit_y, biased_hit_z
                 );
 
-                distance += resolution_bias_offset;
+                // distance += resolution_bias_offset;
             }
 
             const pixel_index = oct_y * resolution + oct_x;

package/src/engine/graphics/sh3/prototypeSH3Probe.js

@@ -25,6 +25,7 @@ import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { max2 } from "../../../core/math/max2.js";
 import { min2 } from "../../../core/math/min2.js";
+import { RAD_TO_DEG } from "../../../core/math/RAD_TO_DEG.js";
 import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import { number_pretty_print } from "../../../core/primitives/numbers/number_pretty_print.js";
@@ -39,6 +40,7 @@ import { TransformAttachmentSystem } from "../../ecs/transform-attachment/Transf
 import { Transform } from "../../ecs/transform/Transform.js";
 import { EngineHarness } from "../../EngineHarness.js";
 import { Camera } from "../ecs/camera/Camera.js";
+import { focal_length_to_fov } from "../ecs/camera/focal_length_to_fov.js";
 import TopDownCameraController from "../ecs/camera/topdown/TopDownCameraController.js";
 import { Light } from "../ecs/light/Light.js";
 import LightSystem from "../ecs/light/LightSystem.js";
@@ -243,7 +245,7 @@ async function getVolume({
         engine,
         ecd,
         bounds: mesh_bounds,
-        density: 500
+        density: 5000
     });
 
     const buffer = new BinaryBuffer();
@@ -337,6 +339,7 @@ async function main(engine) {
         pitch: 1,
         yaw: -1.54,
         distance: 54,
+        cameraFieldOfView: focal_length_to_fov(50, 25) * RAD_TO_DEG,
         // shadowmapResolution: 4096
     });
 
@@ -381,8 +384,12 @@ async function main(engine) {
     // const path = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
     // const path = 'data/models/sibenik/3-window-less/model.gltf';
     // const path = 'data/models/samples/gi_box_01/model.glb';
-    const path = 'data/models/sponza-pbr/gltf/sponza.glb';
+    // const path = 'data/models/sponza-pbr/gltf/sponza.glb';
     // const path = 'data/models/pica_pica/pica_pica.gltf';
+    // const path = 'data/models/samples/susanne.glb';
+    // const path = 'data/models/samples/teapot.gltf';
+    const path = 'data/models/samples/salle_de_bain/model.glb';
+    // const path = 'data/models/samples/conference/model-no-curtains.glb';
 
     const mesh_asset = await engine.assetManager.promise(path, 'model/gltf+json');
     const gltf = mesh_asset.gltf;
@@ -444,7 +451,7 @@ async function main(engine) {
     const camera = ecd.getAnyComponent(Camera);
     camera.component.clip_far = max2(100, model_footprint);
     const camera_controller = ecd.getComponent(camera.entity, TopDownCameraController);
-    camera_controller.distanceMax = model_footprint * 1.1;
+    camera_controller.distanceMax = model_footprint * 2;
     camera_controller.distanceMin = min2(camera_controller.distanceMin, model_footprint * 0.01);
     mesh_bounds.getCenter(camera_controller.target)