@woosh/meep-engine 2.119.45 → 2.119.47

package/package.json

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

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

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {Engine} engine
+ * @param {string} path
+ * @param {LightProbeVolume} [volume]
+ * @param {number} [density] only used when building mesh, if loading this parameter is ignored
+ * @return {Promise<LightProbeVolume>}
+ */
+export function lpv_obtain_storage_cached_volume({ engine, path, volume, density }: Engine): Promise<LightProbeVolume>;
+import { LightProbeVolume } from "./LightProbeVolume.js";
+//# sourceMappingURL=lpv_obtain_storage_cached_volume.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lpv_obtain_storage_cached_volume.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/lpv_obtain_storage_cached_volume.js"],"names":[],"mappings":"AASA;;;;;;;GAOG;AACH,6FAFY,QAAQ,gBAAgB,CAAC,CAsEpC;iCA/EgC,uBAAuB"}

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

@@ -0,0 +1,86 @@
+import { BinaryBuffer } from "../../../../core/binary/BinaryBuffer.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+import { number_pretty_print } from "../../../../core/primitives/numbers/number_pretty_print.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
+import { build_probes_for_scene } from "./build_probes_for_scene.js";
+import { LightProbeVolume } from "./LightProbeVolume.js";
+import { LightProbeVolumeSerializationAdapter } from "./serialization/LightProbeVolumeSerializationAdapter.js";
+
+/**
+ *
+ * @param {Engine} engine
+ * @param {string} path
+ * @param {LightProbeVolume} [volume]
+ * @param {number} [density] only used when building mesh, if loading this parameter is ignored
+ * @return {Promise<LightProbeVolume>}
+ */
+export async function lpv_obtain_storage_cached_volume({
+                                                           engine,
+                                                           path,
+                                                           volume = new LightProbeVolume(),
+    density = 500
+                                                       }) {
+
+    volume.clear();
+
+    const key = `lpv:${path}`;
+
+    const adapter = new LightProbeVolumeSerializationAdapter();
+
+    if (await engine.storage.promiseContains(key)
+        // && false // TODO re-enable
+    ) {
+        const data = await engine.storage.promiseLoadBinary(key);
+
+        console.log(`LPV data size ${number_pretty_print(data.byteLength)} bytes`);
+
+        const buffer = BinaryBuffer.fromArrayBuffer(data);
+
+        adapter.deserialize(buffer, volume);
+
+        return volume;
+    }
+
+
+    const ecd = engine.entityManager.dataset;
+
+    // build bounding box for the scene
+    const mesh_bounds = new AABB3();
+    mesh_bounds.setNegativelyInfiniteBounds();
+
+    ecd.traverseEntities([ShadedGeometry, Transform],
+        /**
+         *
+         * @param {ShadedGeometry} sg
+         * @param transform
+         * @param entity
+         */
+        (sg, transform, entity) => {
+
+            const box = new AABB3();
+
+            sg.getBoundingBox(box);
+
+            mesh_bounds.expandToFit(box);
+
+        });
+
+    await build_probes_for_scene({
+        volume,
+        engine,
+        ecd,
+        bounds: mesh_bounds,
+        density: density
+    });
+
+    const buffer = new BinaryBuffer();
+
+    adapter.serialize(buffer, volume);
+
+    buffer.trim();
+
+    engine.storage.promiseStoreBinary(key, buffer.data)
+
+    return volume;
+}

package/src/engine/graphics/sh3/path_tracer/PathTracedScene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PathTracedScene.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/PathTracedScene.js"],"names":[],"mappings":"AAiCA;IAGI;;;OAGG;IACH,eAFU,GAAG,CAEa;IAG1B;;;OAGG;IACH,QAFU,IAAI,MAAM,EAAE,cAAc,CAAC,CAElB;IAEnB;;;OAGG;IACH,UAFU,aAAa,EAAE,CAEX;IAEd;;;OAGG;IACH,WAFU,IAAI,MAAM,cAAc,EAAE,mBAAmB,CAAC,CAElC;IAmBtB;;;;OAIG;IACH,6BAA6C;IAkF7C,iBAOC;IAED;;;;OAIG;IACH,uBAHW,MAAM,cAAc,GACnB,mBAAmB,CAmB9B;IAED;;;OAGG;IACH,gBAFW,aAAa,QAMvB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAInB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAiCnB;IAED;;;;OAIG;IACH,iBAHW,cAAc,GACZ,OAAO,CAgBnB;IAED;;;;OAIG;IACH,yBAHW,MAAM,QAAQ,oBAKxB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,cAAc,YACpB,MAAM,QAAQ,aACd,OAAK,MAAM,EAAE,QAavB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,IAAI,QA0Cd;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAsCnB;IAED;;;;;OAKG;IACH,WAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACZ,MAAM,CA+CjB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,EAAE,cACR,MAAM,aACN,MAAM,EAAE,oBACR,MAAM,QAIhB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,EAAE,cACR,MAAM,OACN,MAAM,EAAE,QAkElB;;CACJ;oBAjhB8B,mCAAmC;+BAmBnC,qBAAqB;8BAJtB,kDAAkD;oCAC5C,0BAA0B;qBALzC,kCAAkC"}
+{"version":3,"file":"PathTracedScene.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/PathTracedScene.js"],"names":[],"mappings":"AAmDA;IAGI;;;OAGG;IACH,eAFU,GAAG,CAEa;IAG1B;;;OAGG;IACH,QAFU,IAAI,MAAM,EAAE,cAAc,CAAC,CAElB;IAEnB;;;OAGG;IACH,UAFU,aAAa,EAAE,CAEX;IAEd;;;OAGG;IACH,WAFU,IAAI,MAAM,cAAc,EAAE,mBAAmB,CAAC,CAElC;IAmBtB;;;;OAIG;IACH,6BAA6C;IAkF7C,iBAOC;IAED;;;;OAIG;IACH,uBAHW,MAAM,cAAc,GACnB,mBAAmB,CAmB9B;IAED;;;OAGG;IACH,gBAFW,aAAa,QAMvB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAInB;IAED;;;;OAIG;IACH,cAHW,cAAc,GACZ,OAAO,CAiCnB;IAED;;;;OAIG;IACH,iBAHW,cAAc,GACZ,OAAO,CAgBnB;IAED;;;;OAIG;IACH,yBAHW,MAAM,QAAQ,oBAKxB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,cAAc,YACpB,MAAM,QAAQ,aACd,OAAK,MAAM,EAAE,QAavB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,EAAE,OACR,MAAM,EAAE,gBACR,IAAI,QA0Cd;IAED;;;;OAIG;IACH,cAHW,IAAI,GACF,OAAO,CAsCnB;IAED;;;;;OAKG;IACH,WAJW,MAAM,EAAE,OACR,MAAM,EAAE,GAAC,IAAI,GACZ,MAAM,CA+CjB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,EAAE,cACR,MAAM,aACN,MAAM,EAAE,oBACR,MAAM,QAIhB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,EAAE,cACR,MAAM,OACN,MAAM,EAAE,QAwHlB;;CACJ;oBAzlB8B,mCAAmC;+BAqBnC,qBAAqB;8BAJtB,kDAAkD;oCAC5C,0BAA0B;qBAPzC,kCAAkC"}

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

@@ -12,6 +12,8 @@ import { v3_morton_encode_bounded } from "../../../../core/geom/3d/morton/v3_mor
 import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
 import { Ray3 } from "../../../../core/geom/3d/Ray3.js";
 import { v3_dot } from "../../../../core/geom/vec3/v3_dot.js";
+import { v3_length } from "../../../../core/geom/vec3/v3_length.js";
+import { saturate } from "../../../../core/math/clamp01.js";
 import { max2 } from "../../../../core/math/max2.js";
 import { compute_geometry_polycount } from "../../geometry/compute_geometry_polycount.js";
 import { AbstractLight } from "../../render/forward_plus/model/AbstractLight.js";
@@ -21,6 +23,22 @@ import { MaterialConverter } from "./material/MaterialConverter.js";
 import { PathTracedMesh } from "./PathTracedMesh.js";
 import { sample_material } from "./texture/sample_material.js";
 
+function light_getDistanceAttenuation( distance, cutoff_distance, decay_exponent){
+
+    let distanceFalloff = 1.0 / Math.max( Math.pow( distance, decay_exponent ), 0.01 );
+
+    if ( cutoff_distance > 0.0 ) {
+        const b = distance / cutoff_distance;
+        const b2 = b*b;
+        const b4 = b2*b2;
+
+        const c= saturate( 1.0 - b4 );
+
+        distanceFalloff *= c*c;
+    }
+
+    return distanceFalloff;
+}
 /**
  *
  * @type {number[]|Uint32Array}
@@ -473,6 +491,14 @@ export class PathTracedScene {
             out[out_offset + i] = 0;
         }
 
+        const ray_origin_x = ray[0];
+        const ray_origin_y = ray[1];
+        const ray_origin_z = ray[2];
+
+        const ray_direction_x = ray[3];
+        const ray_direction_y = ray[4];
+        const ray_direction_z = ray[5];
+
         for (let i = 0; i < light_count; i++) {
             const light = lights[i];
 
@@ -481,10 +507,6 @@ export class PathTracedScene {
 
                 // see https://github.com/mrdoob/three.js/blob/f0a9e0cf90a2f1ba5017fcb7fd46f02748b920cf/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js#L172
 
-                const ray_direction_x = ray[3];
-                const ray_direction_y = ray[4];
-                const ray_direction_z = ray[5];
-
                 const light_dir_inv_x = -dir.x;
                 const light_dir_inv_y = -dir.y;
                 const light_dir_inv_z = -dir.z;
@@ -499,9 +521,6 @@ export class PathTracedScene {
                     continue;
                 }
 
-                const ray_origin_x = ray[0];
-                const ray_origin_y = ray[1];
-                const ray_origin_z = ray[2];
 
                 ray3_array_compose(_ray_1,
                     ray_origin_x, ray_origin_y, ray_origin_z,
@@ -525,6 +544,59 @@ export class PathTracedScene {
                 out[out_offset + 2] += light_color.b * intensity;
 
 
+            } else if (light.isPointLight === true) {
+
+                const light_offset_x = ray_origin_x - light.position.x;
+                const light_offset_y = ray_origin_y - light.position.y;
+                const light_offset_z = ray_origin_z - light.position.z;
+
+                const distance_to_light = v3_length(light_offset_x, light_offset_y, light_offset_z);
+
+                const radius = light.radius.getValue();
+
+                if (distance_to_light > radius) {
+                    // too far
+                    continue;
+                }
+
+                const light_norm_inv = 1 / distance_to_light;
+
+                // see https://github.com/mrdoob/three.js/blob/f0a9e0cf90a2f1ba5017fcb7fd46f02748b920cf/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js#L172
+
+                const light_dir_inv_x = -light_offset_x * light_norm_inv;
+                const light_dir_inv_y = -light_offset_y * light_norm_inv;
+                const light_dir_inv_z = -light_offset_z * light_norm_inv;
+
+                const dotNL = v3_dot(
+                    ray_direction_x, ray_direction_y, ray_direction_z,
+                    light_dir_inv_x, light_dir_inv_y, light_dir_inv_z
+                );
+
+                if (dotNL <= 0) {
+                    // no contribution, facing away from the light
+                    continue;
+                }
+                ray3_array_compose(_ray_1,
+                    ray_origin_x, ray_origin_y, ray_origin_z,
+                    light_dir_inv_x, light_dir_inv_y, light_dir_inv_z
+                );
+
+                _ray_1.tMax = radius;
+
+                // check if there are any obstacles in the direction of the light
+                if (this.occluded(_ray_1)) {
+                    // light is occluded
+                    continue;
+                }
+
+                const attenuation = light_getDistanceAttenuation(distance_to_light,radius,2);
+
+                const intensity = dotNL * light.intensity.getValue()*attenuation;
+                const light_color = light.color;
+
+                out[out_offset] += light_color.r * intensity;
+                out[out_offset + 1] += light_color.g * intensity;
+                out[out_offset + 2] += light_color.b * intensity;
             }
         }
     }

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

@@ -19,6 +19,7 @@ import { array_copy } from "../../../core/collection/array/array_copy.js";
 import { is_typed_array_equals } from "../../../core/collection/array/typed/is_typed_array_equals.js";
 import { Color } from "../../../core/color/Color.js";
 import { kelvin_to_rgb } from "../../../core/color/kelvin/kelvin_to_rgb.js";
+import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
 import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_array.js";
 import { visualize_tetrahedral_mesh } from "../../../core/geom/3d/tetrahedra/visualize_tetrahedral_mesh.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
@@ -29,7 +30,6 @@ 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";
 import { delay } from "../../../core/process/delay.js";
 import ButtonView from "../../../view/elements/button/ButtonView.js";
 import { GLTFAssetLoader } from "../../asset/loaders/GLTFAssetLoader.js";
@@ -53,11 +53,10 @@ import { ShadedGeometrySystem } from "../ecs/mesh-v2/ShadedGeometrySystem.js";
 import { three_object_to_entity_composition } from "../ecs/mesh-v2/three_object_to_entity_composition.js";
 import { GizmoRenderingPlugin } from "../render/gizmo/GizmoRenderingPlugin.js";
 import { MaterialTransformer } from "./gi/material/MaterialTransformer.js";
-import { build_probes_for_scene } from "./lpv/build_probes_for_scene.js";
 import { OctahedralDepthDebuggerWidget } from "./lpv/depth/octahedral/OctahedralDepthDebuggerWidget.js";
 import { VLPDepthMapVisualisation } from "./lpv/depth/octahedral/v2/VLPDepthMapVisualisation.js";
 import { LightProbeVolume } from "./lpv/LightProbeVolume.js";
-import { LightProbeVolumeSerializationAdapter } from "./lpv/serialization/LightProbeVolumeSerializationAdapter.js";
+import { lpv_obtain_storage_cached_volume } from "./lpv/lpv_obtain_storage_cached_volume.js";
 import { lpv_visualize_probes } from "./lpv/util/lpv_visualise_probes.js";
 
 /**
@@ -203,63 +202,6 @@ function make_test_texture(t = 1) {
     return tex;
 }
 
-/**
- *
- * @param {Engine} engine
- * @param {string} path
- * @param {LightProbeVolume} volume
- * @return {Promise<LightProbeVolume>}
- */
-async function getVolume({
-                             engine,
-                             path,
-                             volume = new LightProbeVolume()
-                         }) {
-
-    volume.clear();
-
-    const key = `lpv:${path}`;
-
-    const adapter = new LightProbeVolumeSerializationAdapter();
-
-    if (await engine.storage.promiseContains(key)
-        // && false // TODO re-enable
-    ) {
-        const data = await engine.storage.promiseLoadBinary(key);
-
-        console.log(`LPV data size ${number_pretty_print(data.byteLength)} bytes`);
-
-        const buffer = BinaryBuffer.fromArrayBuffer(data);
-
-        adapter.deserialize(buffer, volume);
-
-        return volume;
-    }
-
-    const mesh_asset = await engine.assetManager.promise(path, 'model/gltf+json');
-    const mesh_bounds = mesh_asset.boundingBox;
-
-    const ecd = engine.entityManager.dataset;
-
-    await build_probes_for_scene({
-        volume,
-        engine,
-        ecd,
-        bounds: mesh_bounds,
-        density: 500
-    });
-
-    const buffer = new BinaryBuffer();
-
-    adapter.serialize(buffer, volume);
-
-    buffer.trim();
-
-    engine.storage.promiseStoreBinary(key, buffer.data)
-
-    return volume;
-}
-
 /**
  *
  * @param {EntityComponentDataset} ecd
@@ -495,7 +437,7 @@ async function main(engine) {
 
     console.time('getVolume');
     // console.profile('getVolume');
-    await getVolume({ engine, path, volume });
+    await lpv_obtain_storage_cached_volume({ engine, path, volume });
     // console.profileEnd('getVolume');
     console.timeEnd('getVolume');