@woosh/meep-engine 2.110.4 → 2.110.6

package/src/engine/ecs/parent/EntityNode.js

@@ -412,7 +412,8 @@ export class EntityNode {
         // destroy children first
         const children = this.__children;
         const child_count = children.length;
-        for (let i = 0; i < child_count; i++) {
+
+        for (let i = child_count - 1; i >= 0; i--) {
             const child = children[i];
 
             child.destroy();

package/src/engine/graphics/geometry/buffered/makeGeometryIndexed.d.ts

@@ -1,6 +1,7 @@
 /**
  *
  * @param {THREE.BufferGeometry} geometry
+ * @return {THREE.BufferGeometry}
  */
-export function makeGeometryIndexed(geometry: THREE.BufferGeometry): void;
+export function makeGeometryIndexed(geometry: THREE.BufferGeometry): THREE.BufferGeometry;
 //# sourceMappingURL=makeGeometryIndexed.d.ts.map

package/src/engine/graphics/geometry/buffered/makeGeometryIndexed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeGeometryIndexed.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/buffered/makeGeometryIndexed.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH,8CAFW,MAAM,cAAc,QAsB9B"}
+{"version":3,"file":"makeGeometryIndexed.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/geometry/buffered/makeGeometryIndexed.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,8CAHW,MAAM,cAAc,GACnB,MAAM,cAAc,CAwB/B"}

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

@@ -1,9 +1,10 @@
-import { UintArrayForCount } from "../../../../core/collection/array/typed/uint_array_for_count.js";
 import { BufferAttribute } from "three";
+import { UintArrayForCount } from "../../../../core/collection/array/typed/uint_array_for_count.js";
 
 /**
  *
  * @param {THREE.BufferGeometry} geometry
+ * @return {THREE.BufferGeometry}
  */
 export function makeGeometryIndexed(geometry) {
     let index_attribute = geometry.getIndex();
@@ -25,4 +26,6 @@ export function makeGeometryIndexed(geometry) {
 
         geometry.setIndex(index_attribute);
     }
+
+    return geometry;
 }

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

@@ -447,12 +447,12 @@ vec4 lvp_mask_weights_by_visibility(in vec3 position, in vec3 normal, in vec3 vi
             // room, the normals on the details might rule out all of the probes that have mutual
             // visibility to the point. So, we instead use a "wrap shading" test below inspired by
             // NPR work.
-            //             weight *= max(0.0001, dot(direction_to_probe, normal));
+                         weight *= max(0.0001, dot(direction_to_probe, normal));
 
             // The small offset at the end reduces the "going to zero" impact
             // where this is really close to exactly opposite
-            float backface_term = max(0.0001, (dot(direction_to_probe, normal) + 1.0) * 0.5);
-            weight *= backface_term * backface_term + 0.05;
+//            float backface_term = max(0.0001, (dot(direction_to_probe, normal) + 1.0) * 0.5);
+//            weight *= backface_term * backface_term + 0.05;
 
         }
 

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;IAErB,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;8BA7F6B,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,qBAAmB;IAEnB,qBAAyB;IAEzB,uBAA6B;IAE7B;;;;;;;;OAQG;IACH,kCAPW,MAAM,aACN,MAAM,YACN,MAAM,EAAE,mBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAchB;IAED,iFAuCC;IAKD,mBACC;IAED,4BAKC;CACJ;8BA9F6B,oBAAoB;2BAHvB,8BAA8B;gCADzB,mCAAmC"}

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

@@ -24,8 +24,8 @@ const sampled_irradiance = new Float32Array(3);
 export class PathTracerProbeRenderer extends ProbeRenderer {
     tracer = new PathTracer();
     max_bounce_count = 5;
-    // sample_count = 190;
-    sample_count = 4096;
+    sample_count = 190;
+    // sample_count = 40960;
     random = seededRandom(0);
 
     scene = new PathTracedScene()
@@ -48,7 +48,8 @@ export class PathTracerProbeRenderer extends ProbeRenderer {
             output, output_offset,
             this.scene,
             position, position_offset,
-            resolution, max_depth
+            resolution, max_depth,
+            16
         );
     }
 

package/src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map.d.ts

@@ -7,6 +7,7 @@
  * @param {number} position_offset
  * @param {number} resolution
  * @param {number} max_depth
+ * @param {number} [sub_sample_count]
  */
-export function bake_octahedral_depth_map(result: number[], result_offset: number, scene: PathTracedScene, position: number[] | Vector3, position_offset: number, resolution: number, max_depth: number): void;
+export function bake_octahedral_depth_map(result: number[], result_offset: number, scene: PathTracedScene, position: number[] | Vector3, position_offset: number, resolution: number, max_depth: number, sub_sample_count?: number): void;
 //# sourceMappingURL=bake_octahedral_depth_map.d.ts.map

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":"AAkCA;;;;;;;;;GASG;AACH,kDARW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,QAkIhB"}
+{"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;;;;;;;;;;GAUG;AACH,kDATW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,qBACN,MAAM,QA+GhB"}

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

@@ -7,7 +7,6 @@ import {
 import { Ray3 } from "../../../../../../core/geom/3d/Ray3.js";
 import { v3_distance } from "../../../../../../core/geom/vec3/v3_distance.js";
 import { v3_dot_array_array } from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
-import { clamp } from "../../../../../../core/math/clamp.js";
 import { max2 } from "../../../../../../core/math/max2.js";
 import { generate_hammersley_jitter } from "../../../../../../core/math/statistics/generate_hammersley_jitter.js";
 
@@ -25,12 +24,6 @@ const scratch_ray = new Ray3();
  */
 const ray_hit = [];
 
-/**
- *
- * @type {number}
- */
-const SUB_SAMPLE_COUNT = 16;
-
 
 /**
  *
@@ -41,13 +34,14 @@ const SUB_SAMPLE_COUNT = 16;
  * @param {number} position_offset
  * @param {number} resolution
  * @param {number} max_depth
+ * @param {number} [sub_sample_count]
  */
 export function bake_octahedral_depth_map(
     result, result_offset,
     scene,
     position, position_offset,
     resolution,
-    max_depth
+    max_depth, sub_sample_count=4
 ) {
 
     assert.lessThan(result_offset + resolution * resolution, UINT32_MAX, 'Result overflow');
@@ -55,26 +49,7 @@ export function bake_octahedral_depth_map(
     scratch_ray.tMax = max_depth;
     array_copy(position, position_offset, scratch_ray, 0, 3);
 
-    /**
-     * In radians, how wide of an arc does a single texel cover
-     * @type {number}
-     */
-    const texel_angular_coverage = (Math.PI) / resolution;
-
-    /**
-     * 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 (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(texel_angular_coverage) * Math.SQRT2 * 2;
-
-    // const NORMAL_BIAS = max2(1e-6, max_depth * 0.01);
     const NORMAL_BIAS = 1e-6;
-    // const NORMAL_BIAS = clamp(max_depth * Math.sin(texel_angular_coverage),1e-6, max_depth*0.1);
 
     const ray_direction = scratch_ray.direction;
 
@@ -82,7 +57,7 @@ export function bake_octahedral_depth_map(
 
     const texel_uv_scale = 0.5 / (resolution);
 
-    const jittered_sub_samples = generate_hammersley_jitter(SUB_SAMPLE_COUNT);
+    const jittered_sub_samples = generate_hammersley_jitter(sub_sample_count);
 
 
     for (let oct_x = 0; oct_x < resolution; oct_x++) {
@@ -101,7 +76,7 @@ export function bake_octahedral_depth_map(
                 u * 2 - 1, v * 2 - 1
             );
 
-            for (let sub_sample_index = 0; sub_sample_index < SUB_SAMPLE_COUNT; sub_sample_index++) {
+            for (let sub_sample_index = 0; sub_sample_index < sub_sample_count; sub_sample_index++) {
 
                 const sample_index2 = sub_sample_index * 2;
 
@@ -170,4 +145,5 @@ export function bake_octahedral_depth_map(
         }
     }
 
-}
+}
+

package/src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map_fibonacci.d.ts

@@ -0,0 +1,13 @@
+/**
+ *
+ * @param {number[]} result
+ * @param {number} result_offset
+ * @param {PathTracedScene} scene
+ * @param {number[]|Vector3} position
+ * @param {number} position_offset
+ * @param {number} resolution
+ * @param {number} max_depth
+ * @param {number} [density]
+ */
+export function bake_octahedral_depth_map_fibonacci(result: number[], result_offset: number, scene: PathTracedScene, position: number[] | Vector3, position_offset: number, resolution: number, max_depth: number, density?: number): void;
+//# sourceMappingURL=bake_octahedral_depth_map_fibonacci.d.ts.map

package/src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map_fibonacci.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bake_octahedral_depth_map_fibonacci.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/lpv/depth/octahedral/bake_octahedral_depth_map_fibonacci.js"],"names":[],"mappings":"AA6BA;;;;;;;;;;GAUG;AACH,4DATW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,YACN,MAAM,QA4HhB"}

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

@@ -0,0 +1,163 @@
+import { assert } from "../../../../../../core/assert.js";
+import { UINT32_MAX } from "../../../../../../core/binary/UINT32_MAX.js";
+import { array_copy } from "../../../../../../core/collection/array/array_copy.js";
+import {
+    decode_octahedron_to_unit
+} from "../../../../../../core/geom/3d/normal/octahedron/decode_octahedron_to_unit.js";
+import {
+    encode_unit_to_octahedron
+} from "../../../../../../core/geom/3d/normal/octahedron/encode_unit_to_octahedron.js";
+import { Ray3 } from "../../../../../../core/geom/3d/Ray3.js";
+import { sphere_fibonacci_point } from "../../../../../../core/geom/3d/sphere/sphere_fibonacci_point.js";
+import { v3_distance } from "../../../../../../core/geom/vec3/v3_distance.js";
+import { v3_dot_array_array } from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
+import { max2 } from "../../../../../../core/math/max2.js";
+
+/**
+ * Weights of rays that are aligned with the probe direction get exponentially weighted by this exponent
+ * @type {number}
+ */
+const DEPTH_SHARPNESS = 3;
+
+const scratch_ray = new Ray3();
+
+/**
+ *
+ * @type {number[]}
+ */
+const ray_hit = [];
+
+/**
+ *
+ * @param {number[]} result
+ * @param {number} result_offset
+ * @param {PathTracedScene} scene
+ * @param {number[]|Vector3} position
+ * @param {number} position_offset
+ * @param {number} resolution
+ * @param {number} max_depth
+ * @param {number} [density]
+ */
+export function bake_octahedral_depth_map_fibonacci(
+    result, result_offset,
+    scene,
+    position, position_offset,
+    resolution,
+    max_depth, density = 4
+) {
+
+    const pixel_count = resolution * resolution;
+
+    assert.lessThan(result_offset + pixel_count, UINT32_MAX, 'Result overflow');
+
+    scratch_ray.tMax = max_depth;
+    array_copy(position, position_offset, scratch_ray, 0, 3);
+
+    const NORMAL_BIAS = 1e-6;
+
+    const ray_direction = scratch_ray.direction;
+
+    const probe_direction = new Float32Array(3);
+
+    const direction_sample_count = pixel_count * density;
+
+    const octahedral_uv = new Float32Array(2);
+
+    const weights = new Float32Array(pixel_count);
+
+
+    // clear result data
+    for (let i = 0; i < pixel_count; i++) {
+
+        const address = result_offset + i * 2;
+
+        result[address] = 0;
+        result[address + 1] = 0;
+    }
+
+    for (let sample_index = 0; sample_index < direction_sample_count; sample_index++) {
+        sphere_fibonacci_point(ray_direction, 0, sample_index, direction_sample_count);
+
+        encode_unit_to_octahedron(octahedral_uv, 0, ray_direction[0], ray_direction[1], ray_direction[2]);
+
+        const sample_u = octahedral_uv[0] * 0.5 + 0.5;
+        const sample_v = octahedral_uv[1] * 0.5 + 0.5;
+
+        const oct_x = (sample_u * resolution) >>> 0;
+        const oct_y = (sample_v * resolution) >>> 0;
+
+        // offset position by half a pixel, as we are storing values for pixel centers
+        const u = (oct_x + 0.5) / (resolution);
+        const v = (oct_y + 0.5) / (resolution);
+
+        decode_octahedron_to_unit(
+            probe_direction, 0,
+            u * 2 - 1, v * 2 - 1
+        );
+
+
+        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];
+
+            const hit_normal_bias = 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
+            );
+
+        }
+
+        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
+        );
+
+        const mean = distance * weight;
+        const mean2 = distance * distance * weight;
+
+        const pixel_index = oct_y * resolution + oct_x;
+
+        const address = result_offset + pixel_index * 2;
+
+        weights[pixel_index] += weight;
+
+        result[address] += mean;
+        result[address + 1] += mean2;
+    }
+
+    for (let i = 0; i < pixel_count; i++) {
+
+        const weight_sum = weights[i];
+
+        const address = result_offset + i * 2;
+
+        result[address] /= weight_sum;
+        result[address + 1] /= weight_sum;
+    }
+
+}

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

@@ -382,14 +382,14 @@ async function main(engine) {
     // const path = 'data/models/LowPolyTownshipSet/Small_house/Small_house.gltf';
     // const path = 'data/models/samples/cyberpunk_bike/scene.gltf';
     // const path = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
-    const path = 'data/models/sibenik/3-window-less/model.gltf';
+    // const path = 'data/models/sibenik/3-window-less/model.gltf';
     // const path = 'data/models/sponza-pbr/gltf/sponza.glb';
     // 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 path = 'data/models/pica_pica/pica_pica.gltf';
-    // const path = 'data/models/samples/gi_box_01/model.glb';
+    const path = 'data/models/samples/gi_box_01/model.glb';
     // const path = 'data/models/samples/low_poly_classroom/no-glass/model.gltf';
 
     const mesh_asset = await engine.assetManager.promise(path, 'model/gltf+json');

package/src/engine/graphics/trail/x/RibbonXMaterialSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RibbonXMaterialSpec.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonXMaterialSpec.js"],"names":[],"mappings":"AAEA;IAEQ;;;OAGG;IACH,SAFU,SAAO,IAAI,CAEF;IAGvB,4BAEC;IAED,eAEC;IAED;;aAEC;CACJ"}
+{"version":3,"file":"RibbonXMaterialSpec.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonXMaterialSpec.js"],"names":[],"mappings":"AAGA;IAEQ;;;OAGG;IACH,SAFU,SAAO,IAAI,CAEF;IAGvB,4BAEC;IAED,eAEC;IAED;;aASC;CACJ"}

package/src/engine/graphics/trail/x/RibbonXMaterialSpec.js

@@ -1,3 +1,4 @@
+import { assert } from "../../../../core/assert.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 
 export class RibbonXMaterialSpec {
@@ -17,7 +18,14 @@ export class RibbonXMaterialSpec {
         return computeStringHash(this.diffuse);
     }
 
-    fromJSON({diffuse}) {
-        this.diffuse = diffuse;
+    fromJSON({ diffuse }) {
+
+        if (diffuse !== undefined) {
+            assert.isString(diffuse, "diffuse");
+
+            this.diffuse = diffuse;
+        } else {
+            this.diffuse = null;
+        }
     }
 }

package/src/engine/graphics/trail/x/RibbonXPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RibbonXPlugin.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonXPlugin.js"],"names":[],"mappings":"AASA;IACI,8BA6BC;IA1BG,WAA2B;IAE3B;;;;OAIG;IACH,+BAKE;IAEF;;;;MAIC;IAED;;;;OAIG;IACH,oBAAwC;IAG5C,sCAIC;IAED,wBAMC;IAED,yBAKC;IAED;;;;OAIG;IACH,0EAIC;IAED;;;;OAIG;IACH,8CAFa,eAAe,CAe3B;IAGD;;;;;OAKG;IACH,yBA4BC;CACJ;6BAjI4B,iCAAiC;wBAE1B,OAAO;gCADX,sBAAsB"}
+{"version":3,"file":"RibbonXPlugin.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/trail/x/RibbonXPlugin.js"],"names":[],"mappings":"AASA;IACI,8BA6BC;IA1BG,WAA2B;IAE3B;;;;OAIG;IACH,+BAKE;IAEF;;;;MAIC;IAED;;;;OAIG;IACH,oBAAwC;IAG5C,sCAIC;IAED,wBAMC;IAED,yBAKC;IAED;;;;OAIG;IACH,0EAIC;IAED;;;;OAIG;IACH,8CAFa,eAAe,CAe3B;IAGD;;;;;OAKG;IACH,yBA8BC;CACJ;6BA9H4B,iCAAiC;wBAL1B,OAAO;gCAOX,sBAAsB"}

package/src/engine/graphics/trail/x/RibbonXPlugin.js

@@ -1,11 +1,11 @@
-import { EnginePlugin } from "../../../plugin/EnginePlugin.js";
-import { RibbonMaterialX } from "./RibbonMaterialX.js";
 import { DoubleSide, Vector2 } from "three";
-import { GameAssetType } from "../../../asset/GameAssetType.js";
 import { Cache } from "../../../../core/cache/Cache.js";
 import { invokeObjectEquals } from "../../../../core/model/object/invokeObjectEquals.js";
 import { invokeObjectHash } from "../../../../core/model/object/invokeObjectHash.js";
+import { GameAssetType } from "../../../asset/GameAssetType.js";
+import { EnginePlugin } from "../../../plugin/EnginePlugin.js";
 import { MaterialManager } from "../../material/manager/MaterialManager.js";
+import { RibbonMaterialX } from "./RibbonMaterialX.js";
 
 export class RibbonXPlugin extends EnginePlugin {
     initialize(engine) {
@@ -112,11 +112,13 @@ export class RibbonXPlugin extends EnginePlugin {
 
         material.uniforms.resolution = this.__shared_uniforms.resolution;
 
-        if (spec.diffuse !== null) {
+        if (typeof spec.diffuse === "string") {
             const am = this.engine.assetManager;
 
             am.get({
-                path: spec.diffuse, type: GameAssetType.Texture, callback: (asset) => {
+                path: spec.diffuse,
+                type: GameAssetType.Texture,
+                callback: (asset) => {
                     material.uniforms.uDiffuse.value = asset.create();
                 }, failure: console.warn
             });