@woosh/meep-engine 2.109.0 → 2.109.1

package/src/engine/graphics/sh3/fromCubeRenderTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fromCubeRenderTarget.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/sh3/fromCubeRenderTarget.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,2CALW,UAAU,YACV,MAAM,aAAa,oBACnB,MAAM,qBAAqB,GAC1B,YAAY,CAuIvB"}
+{"version":3,"file":"fromCubeRenderTarget.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/sh3/fromCubeRenderTarget.js"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,2CALW,UAAU,YACV,MAAM,aAAa,oBACnB,MAAM,qBAAqB,GAC1B,YAAY,CAgIvB"}

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

@@ -1,7 +1,11 @@
 import { sh3_basis_at } from "../../../core/geom/3d/sphere/harmonics/sh3_basis_at.js";
 import { sh3_dering_optimize_positive } from "../../../core/geom/3d/sphere/harmonics/sh3_dering_optimize_positive.js";
+import { sh3_vector_accumulate } from "../../../core/geom/3d/sphere/harmonics/sh3_vector_accumulate.js";
+import { vector_scale_array } from "../../../core/geom/vec/vector_scale_array.js";
 import { v3_length_sqr } from "../../../core/geom/vec3/v3_length_sqr.js";
 
+const scratch_color = new Float32Array(3);
+
 /**
  *
  * @param {Uint8Array} data
@@ -110,20 +114,17 @@ export function fromCubeRenderTarget(
             // 0.003921 constant value is 1/255, a conversion value from UINT8 to normalized float
             const weight_conv = weight * 0.00392156862745098;
 
-            const color_r = data[i] * weight_conv;
-            const color_g = data[i + 1] * weight_conv;
-            const color_b = data[i + 2] * weight_conv;
+            scratch_color[0] = data[i] * weight_conv;
+            scratch_color[1] = data[i + 1] * weight_conv;
+            scratch_color[2] = data[i + 2] * weight_conv;
 
             // accumulate
-            for (let j = 0; j < 9; j++) {
-
-                const j3 = j * 3;
-
-                coefficients[j3] += sh_basis[j] * color_r;
-                coefficients[j3 + 1] += sh_basis[j] * color_g;
-                coefficients[j3 + 2] += sh_basis[j] * color_b;
-
-            }
+            sh3_vector_accumulate(
+                coefficients, 0,
+                sh_basis, 0,
+                scratch_color, 0,
+                3
+            );
 
         }
 
@@ -132,11 +133,7 @@ export function fromCubeRenderTarget(
     // normalize
     const norm = (4 * Math.PI) / total_weight;
 
-    for (let j = 0; j < 27; j++) {
-
-        coefficients[j] *= norm;
-
-    }
+    vector_scale_array(coefficients, 0, coefficients, 0, 27, norm);
 
     sh3_dering_optimize_positive(coefficients, 0, coefficients, 0, 3);
 

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

@@ -40,11 +40,11 @@ export class LightProbeVolume {
     bake(ecd: EntityComponentDataset): TaskGroup;
     /**
      *
-     * @param {EntityComponentDataset} ecd
      * @param {number} size
      * @param {boolean} shadow
+     * @returns {EntityNode}
      */
-    visualize_probes({ ecd, size, shadow }: EntityComponentDataset): void;
+    visualize_probes({ size, shadow }: number): EntityNode;
     /**
      *
      * @param {EntityComponentDataset} ecd
@@ -62,4 +62,5 @@ export class LightProbeVolume {
 }
 import { TetrahedralMesh } from "../../../../core/geom/3d/tetrahedra/TetrahedralMesh.js";
 import TaskGroup from "../../../../core/process/task/TaskGroup.js";
+import { EntityNode } from "../../../ecs/parent/EntityNode.js";
 //# sourceMappingURL=LightProbeVolume.d.ts.map

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":"AA4DA;IAGI,sBAEC;IAGG,mBAAqB;IAErB,wBAAmC;IAEnC,oBAAsB;IAEtB,iBAAiB;IAGrB,cAQC;IAED;;;OAGG;IACH,4BAEC;IAED,oBAEC;IAED,uBAEC;IAMD,uBAEC;IAND,oBAEC;IAMD;;;;;OAKG;IACH,aAJW,MAAM,KACN,MAAM,KACN,MAAM,QAchB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAIhB;IAED;;OAEG;IACH,mBAaC;IAGD;;;;OAIG;IACH,mCAHa,SAAS,CA8CrB;IAED;;;;;OAKG;IACH,sEAWC;IAED;;;;;OAKG;IACH,sEAkBC;IAED;;;;OAIG;IACH,oCAFa,SAAS,CAKrB;;CACJ;gCAhQ+B,wDAAwD;sBAClE,4CAA4C"}
+{"version":3,"file":"LightProbeVolume.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/LightProbeVolume.js"],"names":[],"mappings":"AA6DA;IAGI,sBAEC;IAGG,mBAAqB;IAErB,wBAAmC;IAEnC,oBAAsB;IAEtB,iBAAiB;IAGrB,cAQC;IAED;;;OAGG;IACH,4BAEC;IAED,oBAEC;IAED,uBAEC;IAMD,uBAEC;IAND,oBAEC;IAMD;;;;;OAKG;IACH,aAJW,MAAM,KACN,MAAM,KACN,MAAM,QAchB;IAED;;;;;OAKG;IACH,mBAJW,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAIhB;IAED;;OAEG;IACH,mBAaC;IAGD;;;;OAIG;IACH,mCAHa,SAAS,CA8CrB;IAED;;;;;OAKG;IACH,mCAJW,MAAM,GAEJ,UAAU,CAsBtB;IAED;;;;;OAKG;IACH,sEAkBC;IAED;;;;OAIG;IACH,oCAFa,SAAS,CAKrB;;CACJ;gCA1Q+B,wDAAwD;sBAClE,4CAA4C;2BAKvC,mCAAmC"}

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

@@ -12,11 +12,12 @@ 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 Entity from "../../../ecs/Entity.js";
+import { EntityNode } from "../../../ecs/parent/EntityNode.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { DrawMode } from "../../ecs/mesh-v2/DrawMode.js";
 import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
 import { ShadedGeometryFlags } from "../../ecs/mesh-v2/ShadedGeometryFlags.js";
-import { visualise_spherical_harmonic_sphere } from "../visualise_spherical_harmonic_sphere.js";
+import { sh3_make_shaded_geometry } from "../visualise_spherical_harmonic_sphere.js";
 import { PathTracerProbeRenderer } from "./PathTracerProbeRenderer.js";
 
 
@@ -210,21 +211,30 @@ export class LightProbeVolume {
 
     /**
      *
-     * @param {EntityComponentDataset} ecd
      * @param {number} size
      * @param {boolean} shadow
+     * @returns {EntityNode}
      */
-    visualize_probes({ ecd, size = 0.2, shadow = false }) {
+    visualize_probes({ size = 0.2, shadow = false }) {
+        const parent = new EntityNode();
+        parent.entity.add(new Transform());
+
         for (let i = 0; i < this.__length; i++) {
-            visualise_spherical_harmonic_sphere({
-                size,
-                position: this.__positions,
-                position_offset: i * 3,
-                sh: this.__probe_data,
-                sh_offset: i * 3 * 9,
-                shadow: shadow
-            }).build(ecd);
+            const probe_node = new EntityNode();
+
+
+            probe_node.entity.add(new Transform());
+            probe_node.entity.add(
+                sh3_make_shaded_geometry(this.__probe_data, i * 3 * 9, shadow)
+            );
+
+            probe_node.transform.position.fromArray(this.__positions, i * 3);
+            probe_node.transform.scale.setScalar(size);
+
+            parent.addChild(probe_node);
         }
+
+        return parent;
     }
 
     /**

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,qBAAmB;IACnB,qBAAyB;IAEzB,uBAA6B;IAE7B,iFA2CC;IASD,4BAsCC;CACJ;8BA3G6B,oBAAoB;2BADvB,8BAA8B;gCADzB,mCAAmC"}
+{"version":3,"file":"PathTracerProbeRenderer.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/lpv/PathTracerProbeRenderer.js"],"names":[],"mappings":"AAyBA;IACI,mBAA0B;IAC1B,qBAAmB;IACnB,qBAAyB;IAEzB,uBAA6B;IAE7B,iFAkCC;IASD,4BAsCC;CACJ;8BAlG6B,oBAAoB;2BADvB,8BAA8B;gCADzB,mCAAmC"}

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

@@ -3,7 +3,9 @@ import { sh3_basis_at } from "../../../../core/geom/3d/sphere/harmonics/sh3_basi
 import {
     sh3_dering_optimize_positive
 } from "../../../../core/geom/3d/sphere/harmonics/sh3_dering_optimize_positive.js";
+import { sh3_vector_accumulate } from "../../../../core/geom/3d/sphere/harmonics/sh3_vector_accumulate.js";
 import { randomPointOnSphere } from "../../../../core/geom/random/randomPointOnSphere.js";
+import { vector_scale_array } from "../../../../core/geom/vec/vector_scale_array.js";
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { Light } from "../../ecs/light/Light.js";
@@ -47,26 +49,17 @@ export class PathTracerProbeRenderer extends ProbeRenderer {
             sh3_basis_at(ray[3], ray[4], ray[5], sh_basis);
 
             // accumulate
-            for (let j = 0; j < 9; j++) {
-
-                const j3 = j * 3;
-
-                const projected_coefficient = sh_basis[j];
-
-                coefficients[j3] += projected_coefficient * sampled_irradiance[0];
-                coefficients[j3 + 1] += projected_coefficient * sampled_irradiance[1];
-                coefficients[j3 + 2] += projected_coefficient * sampled_irradiance[2];
-
-            }
+            sh3_vector_accumulate(
+                coefficients, 0,
+                sh_basis, 0,
+                sampled_irradiance, 0, 3
+            );
         }
 
         // Area of a unit sphere is (4*PI)
-
         const normalization_weight = (4 * Math.PI) / this.sample_count;
 
-        for (let i = 0; i < 27; i++) {
-            coefficients[i] *= normalization_weight;
-        }
+        vector_scale_array(coefficients, 0, coefficients, 0, 27, normalization_weight);
 
         sh3_dering_optimize_positive(coefficients, 0, coefficients, 0, 3);
 

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

@@ -368,13 +368,13 @@ async function main(engine) {
     // const path = 'data/models/samples/cyberpunk_bike/scene.gltf';
     // const path = 'data/models/samples/sd_macross_city_standoff_diorama/scene.gltf';
     // const path = 'data/models/Slaughter Mech/Slaugter Mech.gltf';
-    const path = 'data/models/samples/gi_box_01/model.glb';
     // const path = 'data/models/samples/gi_box_01/model-thick-1.glb';
     // const path = 'data/models/sibenik/3-window-less/model.gltf';
     // 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/samples/the_attic_environment/scene1.gltf';
-    // const path = 'data/models/sponza-pbr/gltf/sponza.glb';
+    const path = 'data/models/sponza-pbr/gltf/sponza.glb';
+    // const path = 'data/models/samples/gi_box_01/model.glb';
 
     const mesh_asset = await engine.assetManager.promise(path, 'model/gltf+json');
     const gltf = mesh_asset.gltf;
@@ -483,7 +483,9 @@ async function main(engine) {
     transformer.update();
 
 
-    volume.visualize_probes({ ecd, size: model_footprint * 0.002 });
+    const probe_viz = volume.visualize_probes({ size: model_footprint * 0.002 });
+    probe_viz.build(ecd);
+
     // volume.visualize_mesh({ ecd, opacity: 0.5 });
 
     const gui = new GUI();
@@ -497,6 +499,19 @@ async function main(engine) {
         }
     }, "capture_camera");
 
+    gui.add({
+        get probe_vis() {
+            return probe_viz.isBuilt
+        },
+        set probe_vis(v){
+            if(v){
+                probe_viz.build(ecd);
+            }else{
+                probe_viz.destroy();
+            }
+        }
+    }, "probe_vis").name("Visualise Probes");
+
 
     // mesh_entity.addEventListener(SGMeshEvents.AssetLoaded, build);
     //
@@ -511,6 +526,7 @@ new EngineHarness().initialize({
             shadowResolution: 8192
         }));
         config.addSystem(new SGMeshSystem(engine));
+        config.addSystem(new TransformAttachmentSystem());
         config.addSystem(new GUIElementSystem(engine.gui.view, engine));
         config.addSystem(new ViewportPositionSystem(engine.gui.view.size));
 

package/src/engine/graphics/sh3/visualise_spherical_harmonic_sphere.d.ts

@@ -1,3 +1,11 @@
+/**
+ *
+ * @param {number[]} sh
+ * @param {number} sh_offset
+ * @param {boolean} shadow
+ * @returns {ShadedGeometry}
+ */
+export function sh3_make_shaded_geometry(sh: number[], sh_offset: number, shadow: boolean): ShadedGeometry;
 /**
  *
  * @param {number} [size]
@@ -6,8 +14,10 @@
  * @param [position_offset]
  * @param sh
  * @param [sh_offset]
+ * @param {Entity} [entity]
  * @return {Entity}
  */
-export function visualise_spherical_harmonic_sphere({ size, shadow, position, position_offset, sh, sh_offset }?: number): Entity;
+export function visualise_spherical_harmonic_sphere({ size, shadow, position, position_offset, sh, sh_offset, entity }?: number): Entity;
+import { ShadedGeometry } from "../ecs/mesh-v2/ShadedGeometry.js";
 import Entity from "../../ecs/Entity.js";
 //# sourceMappingURL=visualise_spherical_harmonic_sphere.d.ts.map

package/src/engine/graphics/sh3/visualise_spherical_harmonic_sphere.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visualise_spherical_harmonic_sphere.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/sh3/visualise_spherical_harmonic_sphere.js"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AACH,iHARW,MAAM,GAML,MAAM,CAoCjB;mBApDkB,qBAAqB"}
+{"version":3,"file":"visualise_spherical_harmonic_sphere.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/sh3/visualise_spherical_harmonic_sphere.js"],"names":[],"mappings":"AASA;;;;;;GAMG;AACH,6CALW,MAAM,EAAE,aACR,MAAM,UACN,OAAO,GACL,cAAc,CAmB1B;AAED;;;;;;;;;;GAUG;AACH,yHATW,MAAM,GAOL,MAAM,CA0BjB;+BAnE8B,kCAAkC;mBAF9C,qBAAqB"}

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

@@ -7,6 +7,32 @@ import { SH3VisualisationMaterial } from "./SH3VisualisationMaterial.js";
 
 const geometry = new OctahedronBufferGeometry(1, 5);
 
+/**
+ *
+ * @param {number[]} sh
+ * @param {number} sh_offset
+ * @param {boolean} shadow
+ * @returns {ShadedGeometry}
+ */
+export function sh3_make_shaded_geometry(sh, sh_offset, shadow) {
+    const mat = new SH3VisualisationMaterial();
+
+    const uniform_value = mat.uniforms.sh.value;
+    for (let i = 0; i < 9; i++) {
+        uniform_value[i].fromArray(sh, sh_offset + i * 3);
+    }
+
+    const shadedGeometry = ShadedGeometry.from(geometry, mat);
+
+    // prevent instanced rendering
+    shadedGeometry.setFlag(ShadedGeometryFlags.DrawMethodLocked);
+
+    shadedGeometry.writeFlag(ShadedGeometryFlags.ReceiveShadow, shadow);
+    shadedGeometry.writeFlag(ShadedGeometryFlags.CastShadow, shadow);
+
+    return shadedGeometry;
+}
+
 /**
  *
  * @param {number} [size]
@@ -15,6 +41,7 @@ const geometry = new OctahedronBufferGeometry(1, 5);
  * @param [position_offset]
  * @param sh
  * @param [sh_offset]
+ * @param {Entity} [entity]
  * @return {Entity}
  */
 export function visualise_spherical_harmonic_sphere({
@@ -23,25 +50,13 @@ export function visualise_spherical_harmonic_sphere({
                                                         position,
                                                         position_offset = 0,
                                                         sh,
-                                                        sh_offset = 0
+                                                        sh_offset = 0,
+                                                        entity = new Entity()
                                                     }) {
 
-    const mat = new SH3VisualisationMaterial();
+    const shadedGeometry = sh3_make_shaded_geometry(sh, sh_offset, shadow);
 
-    const uniform_value = mat.uniforms.sh.value;
-    for (let i = 0; i < 9; i++) {
-        uniform_value[i].fromArray(sh, sh_offset + i * 3);
-    }
-
-    const shadedGeometry = ShadedGeometry.from(geometry, mat);
-
-    // prevent instanced rendering
-    shadedGeometry.setFlag(ShadedGeometryFlags.DrawMethodLocked);
-
-    shadedGeometry.writeFlag(ShadedGeometryFlags.ReceiveShadow, shadow);
-    shadedGeometry.writeFlag(ShadedGeometryFlags.CastShadow, shadow);
-
-    return new Entity()
+    entity
         .add(Transform.fromJSON({
             position: {
                 x: position[position_offset],
@@ -51,4 +66,6 @@ export function visualise_spherical_harmonic_sphere({
             scale: size
         }))
         .add(shadedGeometry);
+
+    return entity;
 }

package/src/engine/sound/material/detector/terrain/TerrainSoundMaterialSurfaceDetector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainSoundMaterialSurfaceDetector.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/sound/material/detector/terrain/TerrainSoundMaterialSurfaceDetector.js"],"names":[],"mappings":"AAWA;IACI,cAyBC;IArBG;;;OAGG;IACH,WAFU,iCAAiC,CAExB;IAEnB;;;;OAIG;IACH,kBAAqB;IAGrB;;;;OAIG;IACH,oBAAiD;IAIrD,uCAUC;IAED;;;OAGG;IACH,mCAuBC;IAED;;;;OAIG;IACH,8BAHW,MAAM,mDAUhB;IAED,wDAyBC;CACJ;6CAxH4C,oCAAoC"}
+{"version":3,"file":"TerrainSoundMaterialSurfaceDetector.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/sound/material/detector/terrain/TerrainSoundMaterialSurfaceDetector.js"],"names":[],"mappings":"AAWA;IACI,cAyBC;IArBG;;;OAGG;IACH,WAFU,iCAAiC,CAExB;IAEnB;;;;OAIG;IACH,kBAAqB;IAGrB;;;;OAIG;IACH,oBAAiD;IAIrD,uCAUC;IAED;;;OAGG;IACH,mCAuBC;IAED;;;;OAIG;IACH,8BAHW,MAAM,mDAUhB;IAED,wDAyBC;CACJ;6CAjH4C,oCAAoC"}

package/src/engine/sound/material/detector/terrain/TerrainSoundMaterialSurfaceDetector.js

@@ -1,11 +1,11 @@
-import { SoundMaterialSurfaceDetector } from "../SoundMaterialSurfaceDetector.js";
+import { assert } from "../../../../../core/assert.js";
+import { vector_normalize } from "../../../../../core/geom/vec/vector_normalize.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
-import { SoundMaterialComposition } from "../../concrete/SoundMaterialComposition.js";
+import { deserializeSoundMaterialFromJSON } from "../../concrete/json/deserializeSoundMaterialFromJSON.js";
 import { SilentSoundMaterial } from "../../concrete/SilentSoundMaterial.js";
 import { SingleSoundMaterial } from "../../concrete/SingleSoundMaterial.js";
-import { deserializeSoundMaterialFromJSON } from "../../concrete/json/deserializeSoundMaterialFromJSON.js";
-import { assert } from "../../../../../core/assert.js";
-import { vector_nd_normalize } from "../../../../../core/math/vector_nd_normalize.js";
+import { SoundMaterialComposition } from "../../concrete/SoundMaterialComposition.js";
+import { SoundMaterialSurfaceDetector } from "../SoundMaterialSurfaceDetector.js";
 
 const v2_temp = new Vector2();
 
@@ -112,7 +112,7 @@ export class TerrainSoundMaterialSurfaceDetector extends SoundMaterialSurfaceDet
 
         }
 
-        vector_nd_normalize(this.__composite.weights, this.__composite.weights, layer_count);
+        vector_normalize(this.__composite.weights, this.__composite.weights, layer_count);
 
         const additions = this.__composite.computeInteractionSounds(result, 0, interaction);
 

package/src/core/math/vector_nd_dot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vector_nd_dot.d.ts","sourceRoot":"","sources":["../../../../src/core/math/vector_nd_dot.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,iCALW,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,KAClC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,KAClC,MAAM,GACL,MAAM,CAUjB"}

package/src/core/math/vector_nd_normalize.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vector_nd_normalize.d.ts","sourceRoot":"","sources":["../../../../src/core/math/vector_nd_normalize.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,4CAJW,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,QAClC,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,WAClC,MAAM,QAoBhB"}

package/src/core/math/vector_nd_normalize.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=vector_nd_normalize.spec.d.ts.map

package/src/core/math/vector_nd_normalize.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vector_nd_normalize.spec.d.ts","sourceRoot":"","sources":["../../../../src/core/math/vector_nd_normalize.spec.js"],"names":[],"mappings":""}