@woosh/meep-engine 2.109.7 → 2.109.9

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":"AAmDA;IAGI,8BAAqC;IAGrC;;;;;OAKG;IACH,0DAJa,SAAS,CA6DrB;CACJ;wCAhHuC,8BAA8B;sBAJhD,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,CAgErB;CACJ;wCA1EuC,8BAA8B;sBALhD,4CAA4C"}

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

@@ -1,57 +1,12 @@
-import { v3_distance_sqr } from "../../../../core/geom/vec3/v3_distance_sqr.js";
-import {
-    tetrahedral_mesh_find_tets_attached_to_vertex
-} from "../../../../core/geometry/3d/tetrahedra/tetrahedral_mesh_find_tets_attached_to_vertex.js";
-import { max2 } from "../../../../core/math/max2.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
 import { actionTask } from "../../../../core/process/task/util/actionTask.js";
 import { countTask } from "../../../../core/process/task/util/countTask.js";
 import { promiseTask } from "../../../../core/process/task/util/promiseTask.js";
+import { find_max_depth_radius_for_point } from "./find_max_depth_radius_for_point.js";
 import { PathTracerProbeRenderer } from "./PathTracerProbeRenderer.js";
 
-/**
- *
- * @param {number} vertex_index
- * @param {TetrahedralMesh} mesh
- * @param {number[]} points
- */
-function find_max_depth_radius_for_point(vertex_index, mesh, points) {
-    const tets = [];
-
-    const count = tetrahedral_mesh_find_tets_attached_to_vertex(
-        tets, 0,
-        mesh,
-        vertex_index
-    );
-
-    const ref_x = points[vertex_index * 3];
-    const ref_y = points[vertex_index * 3 + 1];
-    const ref_z = points[vertex_index * 3 + 2];
-
-    let radius_sqr = 0;
-
-    for (let i = 0; i < count; i++) {
-        const tet = tets[i];
-
-        for (let j = 0; j < 4; j++) {
-            const v = mesh.getVertexIndex(tet, j);
-
-            const x = points[v * 3];
-            const y = points[v * 3 + 1];
-            const z = points[v * 3 + 2];
-
-            const r2 = v3_distance_sqr(ref_x, ref_y, ref_z, x, y, z);
-
-            radius_sqr = max2(r2, radius_sqr);
-        }
-    }
-
-    return Math.sqrt(radius_sqr);
-}
-
 export class LightProbeVolumeBaker {
 
-    // this._ren = new WebGLCubeProbeRenderer();
     _ren = new PathTracerProbeRenderer();
 
 
@@ -86,11 +41,14 @@ export class LightProbeVolumeBaker {
             // Bake depth
             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 depth_resolution = lpv.depth_map_resolution;
 
             renderer.bake_depth_octahedral(
                 depth_resolution,
-                max_distance*1.05 + 0.00001,
+                max_depth,
                 lpv.points, i * 3,
                 lpv.depth, i * depth_resolution * depth_resolution
             );

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

@@ -1,9 +1,9 @@
 export class PathTracerProbeRenderer extends ProbeRenderer {
     tracer: PathTracer;
+    max_bounce_count: number;
     sample_count: number;
     random: () => number;
     scene: PathTracedScene;
-    bake_depth(position: any, position_offset: any, output: any, output_offset: any): void;
     /**
      *
      * @param {number} resolution

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":"AAwBA;IACI,mBAA0B;IAC1B,qBAAmB;IACnB,qBAAyB;IAEzB,uBAA6B;IAE7B,uFAoBC;IAED;;;;;;;;OAQG;IACH,kCAPW,MAAM,aACN,MAAM,YACN,MAAM,EAAE,mBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAahB;IAED,iFAqCC;IAKD,mBACC;IAED,4BAKC;CACJ;8BA/G6B,oBAAoB;2BAJvB,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;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"}

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

@@ -12,7 +12,6 @@ import { PathTracedScene } from "../path_tracer/PathTracedScene.js";
 import { PathTracer } from "../path_tracer/PathTracer.js";
 import { populate_path_traced_scene_from_ecd } from "../path_tracer/populate_path_traced_scene_from_ecd.js";
 import { bake_octahedral_depth_map } from "./depth/octahedral/bake_octahedral_depth_map.js";
-import { sh3_bake_depth } from "./depth/sh3_bake_depth.js";
 import { ProbeRenderer } from "./ProbeRenderer.js";
 
 const __shared_buffer = new ArrayBuffer((27 + 9) * 8);
@@ -24,33 +23,12 @@ const sampled_irradiance = new Float32Array(3);
 
 export class PathTracerProbeRenderer extends ProbeRenderer {
     tracer = new PathTracer();
+    max_bounce_count = 7;
     sample_count = 192;
     random = seededRandom(0);
 
     scene = new PathTracedScene()
 
-    bake_depth(position, position_offset, output, output_offset) {
-
-        sh3_bake_depth(
-            coefficients, 0, this.scene,
-            position[position_offset],
-            position[position_offset + 1],
-            position[position_offset + 2],
-            1.5
-        );
-
-        sh3_dering_optimize_positive(coefficients, 0, coefficients, 0, 1);
-
-        for (let i = 0; i < 9; i++) {
-            const coefficient = coefficients[i];
-
-            for (let j = 0; j < 3; j++) {
-                output[output_offset + i * 3 + j] = coefficient;
-            }
-        }
-
-    }
-
     /**
      *
      * @param {number} resolution
@@ -84,13 +62,15 @@ export class PathTracerProbeRenderer extends ProbeRenderer {
 
         coefficients.fill(0);
 
+        const max_bounce = this.max_bounce_count;
+
         for (let i = 0; i < this.sample_count; i++) {
 
             randomPointOnSphere(this.random, ray, 3);
             ray.tMax = Infinity;
             ray.tMin = 0;
 
-            tracer.path_trace(sampled_irradiance, ray, 1, 7, this.random, this.scene);
+            tracer.path_trace(sampled_irradiance, ray, 1, max_bounce, this.random, this.scene);
 
             sh3_basis_at(ray[3], ray[4], ray[5], sh_basis);
 

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

@@ -1 +1 @@
-{"version":3,"file":"build_probes_for_scene.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/build_probes_for_scene.js"],"names":[],"mappings":"AAWA;;;;;;;;GAQG;AACH,iFAPW,gBAAgB,GAKd,QAAQ,gBAAgB,CAAC,CAmFrC;iCA7FgC,uBAAuB"}
+{"version":3,"file":"build_probes_for_scene.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/build_probes_for_scene.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,iFAPW,gBAAgB,GAKd,QAAQ,gBAAgB,CAAC,CAoFrC;iCA9FgC,uBAAuB"}

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

@@ -1,6 +1,7 @@
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { make_justified_point_grid } from "../../../../core/geom/3d/util/make_justified_point_grid.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
+import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { delay } from "../../../../core/process/delay.js";
 import Entity from "../../../ecs/Entity.js";
 import GUIElement from "../../../ecs/gui/GUIElement.js";
@@ -49,12 +50,13 @@ export async function build_probes_for_scene(
 
 
     // sg_hierarchy_compute_bounding_box_via_parent_entity(light_volume_bounds, composition.entity.entity, ecd);
+    const random = seededRandom(1);
 
-    // for (let i = 0; i < 100; i++) {
-    //     lpv.add_point(
-    //         randomFloatBetween(random, light_volume_bounds.x0, light_volume_bounds.x1),
-    //         randomFloatBetween(random,  light_volume_bounds.y0, light_volume_bounds.y1),
-    //         randomFloatBetween(random,  light_volume_bounds.z0, light_volume_bounds.z1),
+    // for (let i = 0; i < 1000; i++) {
+    //     volume.add_point(
+    //         randomFloatBetween(random, model_bounds.x0, model_bounds.x1),
+    //         randomFloatBetween(random, model_bounds.y0, model_bounds.y1),
+    //         randomFloatBetween(random, model_bounds.z0, model_bounds.z1),
     //     );
     // }
 
@@ -64,7 +66,7 @@ export async function build_probes_for_scene(
 
     // lpv.add_point(10, 1, -10);
 
-    await delay(2000);
+    await delay(1);
 
     //
     // console.profile('lpv build');

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":"AAQA;;;;;;;;;GASG;AACH,kDARW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,QAyChB"}
+{"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":"AAUA;;;;;;;;;GASG;AACH,kDARW,MAAM,EAAE,iBACR,MAAM,oCAEN,MAAM,EAAE,UAAQ,mBAChB,MAAM,cACN,MAAM,aACN,MAAM,QAuChB"}

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

@@ -6,6 +6,8 @@ import { Ray3 } from "../../../../../../core/geom/3d/Ray3.js";
 
 const scratch_ray = new Ray3();
 
+const ray_hit = [];
+
 /**
  *
  * @param {number[]} result
@@ -29,13 +31,11 @@ export function bake_octahedral_depth_map(
 
     const ray_direction = scratch_ray.direction;
 
-    const ray_hit = [];
-
     for (let oct_x = 0; oct_x < resolution; oct_x++) {
         for (let oct_y = 0; oct_y < resolution; oct_y++) {
 
-            const u = oct_x / (resolution - 1);
-            const v = oct_y / (resolution - 1);
+            const u = (oct_x) / (resolution - 1);
+            const v = (oct_y) / (resolution - 1);
 
             decode_octahedron_to_unit(
                 ray_direction, 0,

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

@@ -1 +1 @@
-{"version":3,"file":"VLPDepthMapVisualisation.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/engine/graphics/sh3/lpv/depth/octahedral/v2/VLPDepthMapVisualisation.js"],"names":[],"mappings":"AA0EA;IAYI;;;;OAIG;IACH,oCAFa,wBAAwB,CAQpC;IAfD,qBAEC;IAeD,gBA4CC;;CAEJ;mBAtIkB,iCAAiC"}
+{"version":3,"file":"VLPDepthMapVisualisation.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/engine/graphics/sh3/lpv/depth/octahedral/v2/VLPDepthMapVisualisation.js"],"names":[],"mappings":"AA6EA;IAYI;;;;OAIG;IACH,oCAFa,wBAAwB,CAQpC;IAfD,qBAEC;IAeD,gBA4CC;;CAEJ;mBAzIkB,iCAAiC"}

package/src/engine/graphics/sh3/lpv/depth/octahedral/v2/VLPDepthMapVisualisation.js

@@ -49,6 +49,9 @@ function makeMaterial(lpv) {
             },
             lpv_t_probe_depth: {
                 value: depth_atlas
+            },
+            lpv_u_probe_depth_resolution:{
+                value: lpv.depth_map_resolution
             }
         }
     });

package/src/engine/graphics/sh3/lpv/depth/octahedral/v2/visualise.frag.glsl

@@ -12,6 +12,8 @@ precision highp usampler3D;
 uniform sampler2D lpv_t_probe_positions;
 uniform sampler2D lpv_t_probe_depth;
 
+uniform uint lpv_u_probe_depth_resolution;
+
 #define SEARCH_STEP_LIMIT 64u
 #define INVALID_TET 1073741823u
 
@@ -84,7 +86,7 @@ float SampleBlended(sampler2D tex, vec2 uv0, vec2 uv1, vec2 uv2, vec4 weights) {
 
 float lpv_probe_getDepth(uint probe_index, vec3 direction) {
     // get offset
-    uint depth_tile_resolution = 24u;
+    uint depth_tile_resolution = lpv_u_probe_depth_resolution;
     uvec2 atlas_size = uvec2(4096u);
 
     uint tiles_per_row = atlas_size.x / depth_tile_resolution;
@@ -152,7 +154,7 @@ void main() {
     vec3 normal = normalize(vNormal);
     vec3 worldNormal = normalize(inverseTransformDirection(normal, viewMatrix));
 
-    float depth = lpv_probe_getDepth(instance_index , worldNormal) / 10.0;
+    float depth = lpv_probe_getDepth(instance_index , worldNormal) / 7.0;
 
     gl_FragColor = vec4(vec3(depth), 1.0);
 //    gl_FragColor = vec4( 1.0);

package/src/engine/graphics/sh3/lpv/find_max_depth_radius_for_point.d.ts

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {number} vertex_index
+ * @param {TetrahedralMesh} mesh
+ * @param {number[]} points
+ */
+export function find_max_depth_radius_for_point(vertex_index: number, mesh: TetrahedralMesh, points: number[]): number;
+//# sourceMappingURL=find_max_depth_radius_for_point.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"find_max_depth_radius_for_point.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/find_max_depth_radius_for_point.js"],"names":[],"mappings":"AAYA;;;;;GAKG;AACH,8DAJW,MAAM,iCAEN,MAAM,EAAE,UAiClB"}

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

@@ -0,0 +1,50 @@
+import { v3_distance_sqr } from "../../../../core/geom/vec3/v3_distance_sqr.js";
+import {
+    tetrahedral_mesh_find_tets_attached_to_vertex
+} from "../../../../core/geometry/3d/tetrahedra/tetrahedral_mesh_find_tets_attached_to_vertex.js";
+import { max2 } from "../../../../core/math/max2.js";
+
+/**
+ *
+ * @type {number[]}
+ */
+const tets = [];
+
+/**
+ *
+ * @param {number} vertex_index
+ * @param {TetrahedralMesh} mesh
+ * @param {number[]} points
+ */
+export function find_max_depth_radius_for_point(vertex_index, mesh, points) {
+
+    const count = tetrahedral_mesh_find_tets_attached_to_vertex(
+        tets, 0,
+        mesh,
+        vertex_index
+    );
+
+    const ref_x = points[vertex_index * 3];
+    const ref_y = points[vertex_index * 3 + 1];
+    const ref_z = points[vertex_index * 3 + 2];
+
+    let radius_sqr = 0;
+
+    for (let i = 0; i < count; i++) {
+        const tet = tets[i];
+
+        for (let j = 0; j < 4; j++) {
+            const v = mesh.getVertexIndex(tet, j);
+
+            const x = points[v * 3];
+            const y = points[v * 3 + 1];
+            const z = points[v * 3 + 2];
+
+            const r2 = v3_distance_sqr(ref_x, ref_y, ref_z, x, y, z);
+
+            radius_sqr = max2(r2, radius_sqr);
+        }
+    }
+
+    return Math.sqrt(radius_sqr);
+}

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

@@ -364,7 +364,6 @@ async function main(engine) {
     // const path = 'data/models/samples/sd_macross_city_standoff_diorama/scene.gltf';
     // const path = 'data/models/sibenik/2/model.gltf';
     // const path = 'data/models/vokselia_spawn/model.gltf';
-    // const path = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
     // const path = 'data/models/samples/just_a_girl/scene.gltf';
     // const path = 'data/models/samples/slum_house/scene.gltf';
     // const path = 'data/models/samples/jack_trigger/scene.gltf';
@@ -374,14 +373,15 @@ async function main(engine) {
     // const path = 'data/models/samples/ancient_bath_house_-_modular_set/scene.gltf';
     // const path = 'data/models/samples/environment_-_library/scene.gltf';
     // const path = 'data/models/Scans/green_car_wreck/scene.gltf';
-    // const path = 'data/models/pica_pica/pica_pica.gltf';
-    // const path = 'data/models/sibenik/3-window-less/model.gltf';
     // const path = 'data/models/samples/low_poly_classroom/no-glass/model.gltf';
     // const path = 'data/models/samples/the_attic_environment/scene1.gltf';
     // 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/samples/gi_box_01/model.glb';
     // const path = 'data/models/sponza-pbr/gltf/sponza.glb';
-    const path = 'data/models/samples/gi_box_01/model.glb';
+    const path = 'data/models/pica_pica/pica_pica.gltf';
 
     const mesh_asset = await engine.assetManager.promise(path, 'model/gltf+json');
     const gltf = mesh_asset.gltf;