@woosh/meep-engine 2.109.12 → 2.109.14

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.14",
   "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,48 @@ 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;
+    normalizeDirection(): void;
+    /**
+     *
+     * @param {number} x normalized coordinates in -1,1 range
+     * @param {number} y normalized coordinates in -1,1 range
+     * @param {number} z normalized coordinates in -1,1 range, typically 0.5
+     * @param {number[]|Float32Array|mat4} transform
+     * @param {number[]|Float32Array|mat4} projection_inverse
+     */
+    projectFromCamera(x: number, y: number, z: number, transform: number[] | Float32Array | mat4, projection_inverse: number[] | Float32Array | mat4): void;
     /**
      *
      * @param {number} distance
@@ -28,6 +68,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":"AASA;;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,QAUhB;IAHG,UAAW;IACX,UAAW;IACX,UAAW;IAGf;;;;;OAKG;IACH,gBAJW,MAAM,KACN,MAAM,KACN,MAAM,QAUhB;IAHG,UAAW;IACX,UAAW;IACX,UAAW;IAGf,2BAEC;IAED;;;;;;;OAOG;IACH,qBANW,MAAM,KACN,MAAM,KACN,MAAM,aACN,MAAM,EAAE,GAAC,YAAY,OAAK,sBAC1B,MAAM,EAAE,GAAC,YAAY,OAAK,QA6BpC;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,eAEC;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAInB;CACJ"}

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

@@ -1,6 +1,10 @@
+import { assert } from "../../assert.js";
+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 { v3_normalize_array } from "../vec3/v3_normalize_array.js";
 import { ray3_interval_array_apply_matrix4 } from "./ray/ray3_interval_array_apply_matrix4.js";
 
 /**
@@ -26,10 +30,99 @@ 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) {
+        assert.isNumber(x, 'x');
+        assert.isNumber(y, 'y');
+        assert.isNumber(z, 'z');
+
+        this[0] = x;
+        this[1] = y;
+        this[2] = z;
+    }
+
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     * @param {number} z
+     */
+    setDirection(x, y, z) {
+        assert.isNumber(x, 'x');
+        assert.isNumber(y, 'y');
+        assert.isNumber(z, 'z');
+
+        this[3] = x;
+        this[4] = y;
+        this[5] = z;
+    }
+
+    normalizeDirection() {
+        v3_normalize_array(this, 3, this, 3);
+    }
+
+    /**
+     *
+     * @param {number} x normalized coordinates in -1,1 range
+     * @param {number} y normalized coordinates in -1,1 range
+     * @param {number} z normalized coordinates in -1,1 range, typically 0.5
+     * @param {number[]|Float32Array|mat4} transform
+     * @param {number[]|Float32Array|mat4} projection_inverse
+     */
+    projectFromCamera(
+        x, y, z,
+        transform,
+        projection_inverse
+    ) {
+        assert.isNumber(x, 'x');
+        assert.isNumber(y, 'y');
+        assert.isNumber(z, 'z');
+
+        // extract position from transform matrix
+        const origin_x = transform[12];
+        const origin_y = transform[13];
+        const origin_z = transform[14];
+
+        this.setOrigin(origin_x, origin_y, origin_z);
+
+        this.setDirection(x, y, z);
+        v3_matrix4_multiply(this, 3, this, 3, projection_inverse);
+        v3_matrix4_multiply(this, 3, this, 3, transform);
+
+        // subtract origin
+        this[3] -= origin_x;
+        this[4] -= origin_y;
+        this[5] -= origin_z;
+
+        // normalize
+        this.normalizeDirection();
+    }
+
     /**
      *
      * @param {number} distance
@@ -79,6 +172,10 @@ export class Ray3 extends Float32Array {
         this.set(other);
     }
 
+    hash() {
+        return computeHashFloatArray(this);
+    }
+
     /**
      *
      * @param {Ray3} other

package/src/core/geom/vec3/v3_normalize_array.d.ts

@@ -1,9 +1,9 @@
 /**
  *
- * @param {number[]} input
+ * @param {number[]|Float32Array} input
  * @param {number} input_offset
- * @param {number[]} output
+ * @param {number[]|Float32Array} output
  * @param {number} output_offset
  */
-export function v3_normalize_array(input: number[], input_offset: number, output: number[], output_offset: number): void;
+export function v3_normalize_array(input: number[] | Float32Array, input_offset: number, output: number[] | Float32Array, output_offset: number): void;
 //# sourceMappingURL=v3_normalize_array.d.ts.map

package/src/core/geom/vec3/v3_normalize_array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v3_normalize_array.d.ts","sourceRoot":"","sources":["../../../../../src/core/geom/vec3/v3_normalize_array.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,0CALW,MAAM,EAAE,gBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAqBhB"}
+{"version":3,"file":"v3_normalize_array.d.ts","sourceRoot":"","sources":["../../../../../src/core/geom/vec3/v3_normalize_array.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,0CALW,MAAM,EAAE,GAAC,YAAY,gBACrB,MAAM,UACN,MAAM,EAAE,GAAC,YAAY,iBACrB,MAAM,QAqBhB"}

package/src/core/geom/vec3/v3_normalize_array.js

@@ -1,8 +1,8 @@
 /**
  *
- * @param {number[]} input
+ * @param {number[]|Float32Array} input
  * @param {number} input_offset
- * @param {number[]} output
+ * @param {number[]|Float32Array} output
  * @param {number} output_offset
  */
 export function v3_normalize_array(

package/src/core/math/random/generate_halton_jitter.js

@@ -13,8 +13,8 @@ export function generate_halton_jitter(point_count) {
 
     for (let i = 0; i < point_count; i++) {
         const i2 = i * 2;
-        result[i2] = halton_sequence(2, i) * 2 - 1;
-        result[i2 + 1] = halton_sequence(3, i) * 2 - 1;
+        result[i2] = 1 - halton_sequence(2, i) * 2;
+        result[i2 + 1] = 1 - halton_sequence(3, i) * 2;
     }
 
     return result;

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/makeOctahedralDepthAtlas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeOctahedralDepthAtlas.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/gi/material/makeOctahedralDepthAtlas.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,sDAHW,MAAM,GACJ,WAAW,CAsBvB;4BA3BqF,OAAO"}
+{"version":3,"file":"makeOctahedralDepthAtlas.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/gi/material/makeOctahedralDepthAtlas.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,sDAHW,MAAM,GACJ,WAAW,CAsBvB;4BA3BoF,OAAO"}

package/src/engine/graphics/sh3/gi/material/makeOctahedralDepthAtlas.js

@@ -1,4 +1,4 @@
-import { ClampToEdgeWrapping, DataTexture, FloatType, NearestFilter, RedFormat } from "three";
+import { ClampToEdgeWrapping, DataTexture, FloatType, NearestFilter, RGFormat } from "three";
 
 /**
  *
@@ -7,10 +7,10 @@ import { ClampToEdgeWrapping, DataTexture, FloatType, NearestFilter, RedFormat }
  */
 export function makeOctahedralDepthAtlas(resolution = 4096) {
     const texture = new DataTexture(
-        new Float32Array(resolution * resolution),
+        new Float32Array(resolution * resolution * 2),
         resolution,
         resolution,
-        RedFormat,
+        RGFormat, // 2 channels
         FloatType
     );
 

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/LightProbeVolumeBaker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LightProbeVolumeBaker.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/LightProbeVolumeBaker.js"],"names":[],"mappings":"AAOA;IAEI,8BAAqC;IAGrC;;;;;OAKG;IACH,0DAJa,SAAS,CAgErB;CACJ;wCA1EuC,8BAA8B;sBALhD,4CAA4C"}
+{"version":3,"file":"LightProbeVolumeBaker.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/LightProbeVolumeBaker.js"],"names":[],"mappings":"AAOA;IAEI,8BAAqC;IAGrC;;;;;OAKG;IACH,0DAJa,SAAS,CAkErB;CACJ;wCA5EuC,8BAA8B;sBALhD,4CAA4C"}

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

@@ -42,15 +42,17 @@ export class LightProbeVolumeBaker {
             const max_distance = find_max_depth_radius_for_point(i, lpv.mesh, lpv.points);
 
             // bias a little to ensure we capture everything
-            const max_depth = max_distance * 1.01 + 0.00001;
+            const max_depth = max_distance * 1.01 + 1e-6;
 
             const depth_resolution = lpv.depth_map_resolution;
 
+            const probe_element_count = depth_resolution * depth_resolution * 2;
+
             renderer.bake_depth_octahedral(
                 depth_resolution,
                 max_depth,
                 lpv.points, i * 3,
-                lpv.depth, i * depth_resolution * depth_resolution
+                lpv.depth, i * probe_element_count
             );
 
         });

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bake_octahedral_depth_map.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map.js"],"names":[],"mappings":"AAkBA;;;;;;;;;GASG;AACH,kDARW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,QAmFhB"}
+{"version":3,"file":"bake_octahedral_depth_map.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map.js"],"names":[],"mappings":"AA2BA;;;;;;;;;GASG;AACH,kDARW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,QA+GhB"}

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

@@ -5,8 +5,9 @@ import {
 import { Ray3 } from "../../../../../../core/geom/3d/Ray3.js";
 import { v3_distance } from "../../../../../../core/geom/vec3/v3_distance.js";
 import { v3_dot } from "../../../../../../core/geom/vec3/v3_dot.js";
-import { clamp01 } from "../../../../../../core/math/clamp01.js";
-import { PI_HALF } from "../../../../../../core/math/PI_HALF.js";
+import { v3_dot_array_array } from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
+import { max2 } from "../../../../../../core/math/max2.js";
+import { generate_halton_jitter } from "../../../../../../core/math/random/generate_halton_jitter.js";
 
 const scratch_ray = new Ray3();
 
@@ -16,6 +17,14 @@ const scratch_ray = new Ray3();
  */
 const ray_hit = [];
 
+/**
+ *
+ * @type {number}
+ */
+const SUB_SAMPLE_COUNT = 7;
+
+const DEPTH_SHARPNESS = 1;
+
 /**
  *
  * @param {number[]} result
@@ -37,73 +46,101 @@ export function bake_octahedral_depth_map(
     scratch_ray.tMax = max_depth;
     array_copy(position, position_offset, scratch_ray, 0, 3);
 
+    const CONSTANT_NORMAL_BIAS = max_depth * 0.01 + 1e-6;
 
-    /**
-     * Resolution bias is to compensate for discontinuities between samples
-     * 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
-     * xMath.SQRT2 is to allow for diagonals between pixels
-     * @type {number}
-     */
-    const RESOLUTION_BIAS = Math.sin(PI_HALF / resolution) * 2 * Math.SQRT2;
+    const ray_direction = scratch_ray.direction;
 
-    const NORMAL_BIAS = max_depth * 0.01;
+    const probe_direction = new Float32Array(3);
+
+    const texel_uv_scale = 0.5 / (resolution - 1);
+
+    const jittered_sub_samples = generate_halton_jitter(SUB_SAMPLE_COUNT);
 
-    const ray_direction = scratch_ray.direction;
 
     for (let oct_x = 0; oct_x < resolution; oct_x++) {
         for (let oct_y = 0; oct_y < resolution; oct_y++) {
 
+            let distance_sum = 0;
+            let distance2_sum = 0;
+            let weight_sum = 0;
+
             const u = (oct_x) / (resolution - 1);
             const v = (oct_y) / (resolution - 1);
 
             decode_octahedron_to_unit(
-                ray_direction, 0,
+                probe_direction, 0,
                 u * 2 - 1, v * 2 - 1
             );
 
-            let distance = scene.trace(ray_hit, scratch_ray);
+            for (let sub_sample_index = 0; sub_sample_index < SUB_SAMPLE_COUNT; sub_sample_index++) {
 
-            if (distance < 0) {
-                // no hit
-                distance = max_depth;
-            } else {
-                const surface_normal_x = ray_hit[3];
-                const surface_normal_y = ray_hit[4];
-                const surface_normal_z = ray_hit[5];
+                const sample_index2 = sub_sample_index * 2;
 
-                const surface_position_x = ray_hit[0];
-                const surface_position_y = ray_hit[1];
-                const surface_position_z = ray_hit[2];
+                const ray_u = u + jittered_sub_samples[sample_index2] * texel_uv_scale;
+                const ray_v = v + jittered_sub_samples[sample_index2 + 1] * texel_uv_scale;
 
-                // check for possible miss
-                const hit_angle_cos = -v3_dot(
-                    surface_normal_x, surface_normal_y, surface_normal_z,
-                    ray_direction[0], ray_direction[1], ray_direction[2]
+                decode_octahedron_to_unit(
+                    ray_direction, 0,
+                    ray_u * 2 - 1, ray_v * 2 - 1
                 );
 
-                const resolution_bias_offset = distance * RESOLUTION_BIAS;
+                let distance = scene.trace(ray_hit, scratch_ray);
+
+                if (distance < 0) {
+                    // no hit
+                    distance = max_depth;
+                } else {
+                    const surface_normal_x = ray_hit[3];
+                    const surface_normal_y = ray_hit[4];
+                    const surface_normal_z = ray_hit[5];
+
+                    const surface_position_x = ray_hit[0];
+                    const surface_position_y = ray_hit[1];
+                    const surface_position_z = ray_hit[2];
+
+                    // check for possible miss
+                    const hit_angle_cos = -v3_dot(
+                        surface_normal_x, surface_normal_y, surface_normal_z,
+                        ray_direction[0], ray_direction[1], ray_direction[2]
+                    );
+
+                    const resolution_bias_offset = max_depth * texel_uv_scale;
 
-                const hit_normal_bias = -clamp01(1 - hit_angle_cos) * NORMAL_BIAS;
+                    const hit_normal_bias = CONSTANT_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;
+                    // 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;
 
-                distance = v3_distance(
-                    scratch_ray[0], scratch_ray[1], scratch_ray[2],
-                    biased_hit_x, biased_hit_y, biased_hit_z
+                    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;
+                }
+
+                const direction_dot_product = v3_dot_array_array(ray_direction, 0, probe_direction, 0);
+
+                const weight = Math.pow(
+                    max2(0,
+                        direction_dot_product
+                    ),
+                    DEPTH_SHARPNESS
                 );
 
-                distance += resolution_bias_offset;
+                distance_sum += distance * weight;
+                distance2_sum += distance * distance * weight;
+                weight_sum += weight;
             }
 
             const pixel_index = oct_y * resolution + oct_x;
 
-            result[result_offset + pixel_index] = distance;
+            const address = result_offset + pixel_index * 2;
+
+            result[address] = distance_sum / weight_sum;
+            result[address + 1] = distance2_sum / weight_sum;
         }
     }
 

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

@@ -1 +1 @@
-{"version":3,"file":"probe_volume_to_textures.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/probe_volume_to_textures.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,6EAHW,MAAM,EAAE,eACR,MAAM,QAiChB;AAGD;;;;;;GAMG;AACH,2DALW,oBAAoB,UACpB,MAAM,EAAE,eACR,MAAM,eACN,MAAM,QAiBhB;qCAhEoC,uCAAuC"}
+{"version":3,"file":"probe_volume_to_textures.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/probe_volume_to_textures.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,6EAHW,MAAM,EAAE,eACR,MAAM,QAqChB;AAGD;;;;;;GAMG;AACH,2DALW,oBAAoB,UACpB,MAAM,EAAE,eACR,MAAM,eACN,MAAM,QAiBhB;qCApEoC,uCAAuC"}

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

@@ -27,14 +27,18 @@ export function octahedral_depth_to_atlas(lpv, atlas_data, atlas_width) {
 
                 const tile_pixel_index = pixel_y * tile_resolution + pixel_x;
 
-                const source_value = probe_depth[source_offset + tile_pixel_index];
+                const source_pixel_index = source_offset + tile_pixel_index;
+                const source_pixel_address = source_pixel_index * 2;
 
                 const target_pixel_x = tile_x * tile_resolution + pixel_x;
                 const target_pixel_y = tile_y * tile_resolution + pixel_y;
 
                 const target_pixel_index = target_pixel_y * atlas_width + target_pixel_x;
 
-                atlas_data[target_pixel_index] = source_value;
+                const target_pixel_address = target_pixel_index * 2;
+
+                atlas_data[target_pixel_address] = probe_depth[source_pixel_address];
+                atlas_data[target_pixel_address + 1] = probe_depth[source_pixel_address + 1];
             }
         }
     }

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

@@ -411,9 +411,6 @@ function* render(target, pt, camera, scene, progress = { current: 0, total: 0 })
     const pixel_accummulation = [];
     const ray = new Ray3();
 
-    const ray_origin = new Vector3();
-    const ray_direction = new Vector3();
-
     const width = target.width;
     const height = target.height;
 
@@ -467,16 +464,12 @@ function* render(target, pt, camera, scene, progress = { current: 0, total: 0 })
 
                     for (let i = 0; i < pixel_sample_count; i++) {
 
-                        Camera.projectRay(camera,
+                        ray.projectFromCamera(
                             _x + random() * pixel_scale_x * 2,
                             _y + random() * pixel_scale_y * 2,
-                            ray_origin, ray_direction
-                        );
-
-                        ray3_array_compose(
-                            ray,
-                            ray_origin.x, ray_origin.y, ray_origin.z,
-                            ray_direction.x, ray_direction.y, ray_direction.z
+                            0.5,
+                            camera.matrixWorld.elements,
+                            camera.projectionMatrixInverse.elements
                         );
 
                         ray.tMax = Infinity;
@@ -542,8 +535,8 @@ async function start_renderer(camera) {
     // await prepare_scene_rtiow(pt, camera);
     // await prepare_scene_sphere_01(pt, camera);
     // await prepare_gi_box_scene(scene, camera);
-    // await prepare_sponza(scene, camera);
-    await prepare_attic_scene(scene, camera);
+    await prepare_sponza(scene, camera);
+    // await prepare_attic_scene(scene, camera);
     // await prepare_scene_gltf({scene, camera, path, url: path});
 
 

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";
@@ -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/pica_pica/pica_pica.gltf';
+    // 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;
@@ -442,9 +449,9 @@ async function main(engine) {
 
 
     const camera = ecd.getAnyComponent(Camera);
-    camera.component.clip_far = max2(100, model_footprint);
+    camera.component.clip_far = max2(100, model_footprint * 3);
     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)