@woosh/meep-engine 2.119.69 → 2.119.71

package/package.json

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

package/src/engine/graphics/sh3/gi/material/MaterialTransformer.d.ts

@@ -1,9 +1,18 @@
+/**
+ * Where should probes be resolved?
+ */
+export type ProbeResolutionStage = number;
+export namespace ProbeResolutionStage {
+    let Vertex: number;
+    let Fragment: number;
+}
 export class MaterialTransformer extends AbstractMaterialTransformer {
     /**
      *
      * @param {LightProbeVolume} volume
+     * @param {number|ProbeResolutionStage} stage either "vertex" or "fragment". Vertex sampling is faster but less accurate, fragment is more expensive and precise
      */
-    constructor({ volume }: LightProbeVolume);
+    constructor({ volume, stage, }: LightProbeVolume);
     /**
      *
      * @param {number} v

package/src/engine/graphics/sh3/gi/material/MaterialTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MaterialTransformer.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/gi/material/MaterialTransformer.js"],"names":[],"mappings":"AAiCA;IA0II;;;OAGG;IACH,0CAOC;IAnBD;;;OAGG;IACH,2BAEC;IAdD;;;OAGG;IACH,wBAEC;IAuBD,sBAIC;IAED,sBA2CC;IAED,eA+CC;IAED,4BA2BC;;CACJ;4CAlT2C,0DAA0D"}
+{"version":3,"file":"MaterialTransformer.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/gi/material/MaterialTransformer.js"],"names":[],"mappings":";;;mCAqBU,MAAM;;;;;AAchB;IA+II;;;;OAIG;IACH,kDAaC;IA3BD;;;OAGG;IACH,2BAEC;IAdD;;;OAGG;IACH,wBAEC;IA+BD,sBAIC;IAED,sBAiDC;IAED,eAgDC;IAED,4BA2BC;;CACJ;4CAtU2C,0DAA0D"}

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

@@ -1,4 +1,5 @@
 import { Vector3 } from "three";
+import { assert } from "../../../../../core/assert.js";
 import { BinaryDataType } from "../../../../../core/binary/type/BinaryDataType.js";
 import { AABB3 } from "../../../../../core/geom/3d/aabb/AABB3.js";
 import { aabb3_from_v3_array } from "../../../../../core/geom/3d/aabb/aabb3_from_v3_array.js";
@@ -20,7 +21,7 @@ const PROPERTY_TRANSFORMER_MARKER = '@light-probe-volume-material-transformer';
  * Where should probes be resolved?
  * @enum {number}
  */
-const ProbeResolutionSpace = {
+export const ProbeResolutionStage = {
     /**
      * Cheaper, but less precise
      */
@@ -31,6 +32,7 @@ const ProbeResolutionSpace = {
     Fragment: 1
 };
 
+
 export class MaterialTransformer extends AbstractMaterialTransformer {
 
     /**
@@ -44,9 +46,9 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
 
     /**
      *
-     * @type {ProbeResolutionSpace|number}
+     * @type {ProbeResolutionStage|number}
      */
-    #space = ProbeResolutionSpace.Fragment
+    #sampling_stage = ProbeResolutionStage.Fragment
 
     #textures = {
         vertex: new AttributeDataTexture(
@@ -130,6 +132,10 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
         }
     };
 
+    /**
+     *
+     * @type {number}
+     */
     #uniform_version = -1;
 
     /**
@@ -139,15 +145,15 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
     #onBeforeCompile = (shader) => {
         Object.assign(shader.uniforms, this.#uniforms);
 
-        switch (this.#space) {
-            case ProbeResolutionSpace.Vertex:
+        switch (this.#sampling_stage) {
+            case ProbeResolutionStage.Vertex:
                 space_vertex_transform_shader(shader);
                 break;
-            case ProbeResolutionSpace.Fragment:
+            case ProbeResolutionStage.Fragment:
                 space_fragment_transform_shader(shader);
                 break;
             default:
-                throw new Error(`Unsupported resolution space ${this.#space}`);
+                throw new Error(`Unsupported resolution space ${this.#sampling_stage}`);
         }
     };
 
@@ -169,16 +175,24 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
         this.#uniforms.lpv_f_intensity.value = v;
     }
 
+
     /**
      *
      * @param {LightProbeVolume} volume
+     * @param {number|ProbeResolutionStage} stage either "vertex" or "fragment". Vertex sampling is faster but less accurate, fragment is more expensive and precise
      */
     constructor({
-                    volume
+                    volume,
+                    stage = ProbeResolutionStage.Vertex,
                 }) {
+
         super();
 
+        assert.defined(volume, 'volume');
+        assert.enum(stage, ProbeResolutionStage, 'stage');
+
         this.#volume = volume;
+        this.#sampling_stage = stage;
 
     }
 
@@ -193,6 +207,10 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
 
         const bounds = this.#mesh_bounds;
 
+        const ex = bounds.getExtentsX();
+        const ey = bounds.getExtentsY();
+        const ez = bounds.getExtentsZ();
+
         const lookup = this.#mesh_lookup;
 
         const image = lookup.image;
@@ -202,6 +220,8 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
         const res_x = image.width;
 
         const volume = this.#volume;
+        const points = volume.points;
+        const mesh = volume.mesh;
 
         let last_tet = 0;
 
@@ -214,11 +234,11 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
                     const n_y = (y + 0.5) / res_y
                     const n_z = (z + 0.5) / res_z
 
-                    const w_x = n_x * bounds.getExtentsX() + bounds.x0;
-                    const w_y = n_y * bounds.getExtentsY() + bounds.y0;
-                    const w_z = n_z * bounds.getExtentsZ() + bounds.z0;
+                    const w_x = n_x * ex + bounds.x0;
+                    const w_y = n_y * ey + bounds.y0;
+                    const w_z = n_z * ez + bounds.z0;
 
-                    const tet = volume.mesh.walkToTetraContainingPoint(w_x, w_y, w_z, volume.points, last_tet);
+                    const tet = mesh.walkToTetraContainingPoint(w_x, w_y, w_z, points, last_tet);
 
                     if (tet !== -1) {
                         last_tet = tet;
@@ -241,6 +261,7 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
         }
 
         if (this.#uniform_version === lpv.version) {
+            // up to date
             return;
         }
 

package/src/engine/graphics/sh3/gi/material/space_vertex/build_vertex_shader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_vertex_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/gi/material/space_vertex/build_vertex_shader.js"],"names":[],"mappings":"AA6CA;;;GAGG;AACH,4CAFW,MAAM,UAchB"}
+{"version":3,"file":"build_vertex_shader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/engine/graphics/sh3/gi/material/space_vertex/build_vertex_shader.js"],"names":[],"mappings":"AA8CA;;;GAGG;AACH,4CAFW,MAAM,UAchB"}

package/src/engine/graphics/sh3/gi/material/space_vertex/build_vertex_shader.js

@@ -3,6 +3,7 @@ import PREAMBLE_COMMON from "../common.js";
 
 import PREAMBLE from "./preable.vert.js";
 
+//language=GLSL
 const SHADER_CHUNK_ACCUMULATION = `
     {
         // lookup nearby tet
@@ -11,12 +12,15 @@ const SHADER_CHUNK_ACCUMULATION = `
         vec3 lookup_coordinates = (worldPosition.xyz - lpv_mesh_bounds_min) / (lpv_mesh_bounds_max - lpv_mesh_bounds_min) ;
         
         uint nearest_tet = lpv_guess_initial_tet( worldPosition.xyz );
-    
+
         uint tet;
-        vec4 weights;
-        lpv_getTetrahedron(worldPosition.xyz, nearest_tet, tet, weights);
-    
-        weights = lvp_mask_weights_by_visibility(worldPosition.xyz, tet, weights);    
+        vec4 barycentric_coordinates;
+        lpv_walk_to_tetrahedron(position, nearest_tet, tet, barycentric_coordinates);
+
+        vec3 worldNormal = normalize(inverseTransformDirection( normalize(normal), viewMatrix ));
+        vec3 view_direction = vec3(0.0); // TODO build an actual view direction vector
+                
+        vec4 weights = lvp_mask_weights_by_visibility(worldPosition.xyz, worldNormal, view_direction, tet, barycentric_coordinates);  
         
         if(tet == INVALID_TET){
             lpv_values = vec3[](
@@ -34,10 +38,7 @@ const SHADER_CHUNK_ACCUMULATION = `
             );
         }else{
             
-	        vec3 worldNormal = normalize(inverseTransformDirection( normalize(normal), viewMatrix ));
-            
-            //weights = lpv_bias_weight_by_normal(worldPosition.xyz, normal, tet, weights);
-        
+                    
             lpv_values = lpv_interpolate_probes(weights, tet);
         }
     }

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

@@ -3,6 +3,10 @@
  * @see "Irradiance Volumes" by G.Greger, 1998
  */
 export class LightProbeVolume {
+    /**
+     *
+     * @return {number}
+     */
     get version(): number;
     clear(): void;
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"LightProbeVolume.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/LightProbeVolume.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH;IAiCI,sBAEC;IAED,cAkBC;IAED;;;OAGG;IACH,4BAEC;IAED,uBAEC;IAED,0BAEC;IAMD;;;OAGG;IACH,sCAIC;IAZD,mCAEC;IAYD,sBAEC;IAMD,uBAGC;IAPD,oBAEC;IAsCD;;;;;;OAMG;IACH,aALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,MAAM,CAqBlB;IAMD;;;OAGG;IACH,oBAFW,MAAM,QAYhB;IAED;;;;OAIG;IACH,sCAFW,UAAQ;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,CAAC,EAAC,MAAM,CAAA;KAAC,QAOhD;IAED;;OAEG;IACH,mBAcC;IAGD,yBAEC;;CAEJ;gCA9N+B,wDAAwD"}
+{"version":3,"file":"LightProbeVolume.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/LightProbeVolume.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH;IAiCI;;;OAGG;IACH,sBAEC;IAED,cAkBC;IAED;;;OAGG;IACH,4BAEC;IAED,uBAEC;IAED,0BAEC;IAMD;;;OAGG;IACH,sCAIC;IAZD,mCAEC;IAYD,sBAEC;IAMD,uBAGC;IAPD,oBAEC;IAsCD;;;;;;OAMG;IACH,aALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,MAAM,CAqBlB;IAMD;;;OAGG;IACH,oBAFW,MAAM,QAYhB;IAED;;;;OAIG;IACH,sCAFW,UAAQ;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,CAAC,EAAC,MAAM,CAAC;QAAC,CAAC,EAAC,MAAM,CAAA;KAAC,QAOhD;IAED;;OAEG;IACH,mBAcC;IAGD,yBAEC;;CAEJ;gCAlO+B,wDAAwD"}

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

@@ -46,6 +46,10 @@ export class LightProbeVolume {
 
     #probe_count = 0;
 
+    /**
+     *
+     * @return {number}
+     */
     get version() {
         return this.#version;
     }

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

@@ -317,7 +317,7 @@ async function main(engine) {
     // 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';
-    const path = 'data/models/samples/cornell_box/scene.gltf';
+    // const path = 'data/models/samples/cornell_box/scene.gltf';
     // const path = 'data/models/Slaughter Mech/Slaugter Mech.gltf';
     // const path = 'data/models/samples/gi_box_01/model-thick-1.glb';
     // const path = 'data/models/samples/ancient_bath_house_-_modular_set/scene.gltf';
@@ -333,7 +333,7 @@ async function main(engine) {
     // 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/pica_pica/pica_pica.gltf';
     // const path = 'data/models/samples/gi_box_01/model.glb';
     // const path = 'data/models/samples/low_poly_classroom/no-glass/model.gltf';
     // const path = 'customer_data/halon_scene.glb';