@woosh/meep-engine 3.0.1 → 3.1.0

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

@@ -1 +1 @@
-{"version":3,"file":"populate_path_traced_scene_from_ecd.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/populate_path_traced_scene_from_ecd.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,+GAkDC"}
+{"version":3,"file":"populate_path_traced_scene_from_ecd.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/populate_path_traced_scene_from_ecd.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,+GAkDC"}

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

@@ -1,64 +1,74 @@
-import { assert } from "../../../../core/assert.js";
-import { Transform } from "../../../ecs/transform/Transform.js";
-import { Light } from "../../ecs/light/Light.js";
-import { LightType } from "../../ecs/light/LightType.js";
-import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
-import { DirectionalLight } from "../../render/forward_plus/model/DirectionalLight.js";
-import { PointLight } from "../../render/forward_plus/model/PointLight.js";
-
-/**
- *
- * @param {EntityComponentDataset} ecd
- * @param {PathTracedScene} scene
- */
-export function populate_path_traced_scene_from_ecd(ecd, scene) {
-    assert.defined(ecd, 'ecd');
-    assert.defined(scene, 'scene');
-
-    ecd.traverseEntities([ShadedGeometry, Transform],
-        /**
-         *
-         * @param {ShadedGeometry} sg
-         * @param {Transform} transform
-         */
-        (sg, transform) => {
-
-            scene.createMesh(sg.geometry, sg.material, transform.matrix)
-
-        });
-
-
-    ecd.traverseEntities([Light, Transform],
-        /**
-         *
-         * @param {Light} light
-         * @param {Transform} transform
-         */
-        (light, transform) => {
-
-            const type = light.type.getValue();
-            if (type === LightType.DIRECTION) {
-
-                const l = new DirectionalLight();
-
-                l.color.copy(light.color);
-                l.direction.copy(transform.forward);
-                l.intensity.copy(light.intensity);
-
-                scene.addLight(l);
-
-            }else if(type === LightType.POINT){
-
-                const l = new PointLight();
-
-                l.color.copy(light.color);
-                l.position.copy(transform.position);
-                l.intensity.copy(light.intensity);
-                l.radius.copy(light.distance);
-
-                scene.addLight(l);
-
-            }
-
-        });
+import { assert } from "../../../../core/assert.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { Light } from "../../ecs/light/Light.js";
+import { LightType } from "../../ecs/light/LightType.js";
+import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
+import { DirectionalLight } from "../../render/forward_plus/model/DirectionalLight.js";
+import { PointLight } from "../../render/forward_plus/model/PointLight.js";
+
+/**
+ * Fill a traced scene from the entities of a dataset.
+ *
+ * **Two pieces are missing for this to work under Shade, and both are features rather than
+ * omissions** (D62). A `ShadedGeometry` placed by `shade_node_to_entity_composition` holds a
+ * `MeshletGeometry`, whose triangles are quantized inside meshlet pages —
+ * `geometry_build_from_meshlet_geometry` decodes one into the `Geometry` `createMesh` wants, and
+ * who holds that decode is undecided. And it holds a `ShadeMaterial`, where the tracer integrates
+ * against its own `StandardMaterial`; the three path had a converter for exactly that step and
+ * Shade has no twin of it yet. A component carrying a `Geometry` and handed a `StandardMaterial`
+ * goes through as it stands.
+ *
+ * @param {EntityComponentDataset} ecd
+ * @param {PathTracedScene} scene
+ */
+export function populate_path_traced_scene_from_ecd(ecd, scene) {
+    assert.defined(ecd, 'ecd');
+    assert.defined(scene, 'scene');
+
+    ecd.traverseEntities([ShadedGeometry, Transform],
+        /**
+         *
+         * @param {ShadedGeometry} sg
+         * @param {Transform} transform
+         */
+        (sg, transform) => {
+
+            scene.createMesh(sg.geometry, sg.material, transform.matrix)
+
+        });
+
+
+    ecd.traverseEntities([Light, Transform],
+        /**
+         *
+         * @param {Light} light
+         * @param {Transform} transform
+         */
+        (light, transform) => {
+
+            const type = light.type.getValue();
+            if (type === LightType.DIRECTION) {
+
+                const l = new DirectionalLight();
+
+                l.color.copy(light.color);
+                l.direction.copy(transform.forward);
+                l.intensity.copy(light.intensity);
+
+                scene.addLight(l);
+
+            }else if(type === LightType.POINT){
+
+                const l = new PointLight();
+
+                l.color.copy(light.color);
+                l.position.copy(transform.position);
+                l.intensity.copy(light.intensity);
+                l.radius.copy(light.distance);
+
+                scene.addLight(l);
+
+            }
+
+        });
 }

package/src/engine/graphics/sh3/path_tracer/texture/sample_material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sample_material.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/path_tracer/texture/sample_material.js"],"names":[],"mappings":"AA8CA;;;;;;;GAOG;AACH,qCANW,MAAM,EAAE,sCAER,MAAM,KACN,MAAM,KACN,MAAM,QA4FhB"}
+{"version":3,"file":"sample_material.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/path_tracer/texture/sample_material.js"],"names":[],"mappings":"AA+CA;;;;;;;GAOG;AACH,qCANW,MAAM,EAAE,sCAER,MAAM,KACN,MAAM,KACN,MAAM,QAwFhB"}

package/src/engine/graphics/sh3/path_tracer/texture/sample_material.js

@@ -1,3 +1,4 @@
+import { StandardAttributes } from "../../../../../shade/renderer/geometry/StandardAttributes.js";
 import { compute_binary_data_type_from_typed_array } from "../../../../../core/collection/array/typed/compute_binary_data_type_from_typed_array.js";
 import { v3_distance_sqr } from "../../../../../core/geom/vec3/v3_distance_sqr.js";
 import { v3_multiply } from "../../../../../core/geom/vec3/v3_multiply.js";
@@ -31,7 +32,7 @@ function sample_color_attribute(
     index_0, index_1, index_2,
     u, v
 ) {
-    const color_array = color_attribute.array;
+    const color_array = color_attribute.data;
     sample_triangle_attribute(color, 0, index_0, index_1, index_2, color_array, color_attribute.itemSize, u, v);
 
     const type = compute_binary_data_type_from_typed_array(color_array);
@@ -61,8 +62,7 @@ export function sample_material(
 
     const material = mesh.material;
     const geometry = mesh.geometry;
-    const index_attribute = geometry.getIndex();
-    const index_array = index_attribute.array;
+    const index_array = geometry.index.data;
 
 
     // sample surface normal
@@ -72,19 +72,17 @@ export function sample_material(
     const index_1 = index_array[index_offset + 1];
     const index_2 = index_array[index_offset + 2];
 
-    const normal_attribute = geometry.getAttribute('normal');
+    const normal_attribute = geometry.getAttribute(StandardAttributes.Normal);
 
     if (normal_attribute !== undefined) {
         // vertex normals are present, use those
-        const normal_array = normal_attribute.array;
-
-        sample_triangle_attribute(out, 3, index_0, index_1, index_2, normal_array, 3, u, v);
+        sample_triangle_attribute(out, 3, index_0, index_1, index_2, normal_attribute.data, 3, u, v);
 
     } else {
-        const position_attribute = geometry.getAttribute('position');
+        const position_attribute = geometry.getAttribute(StandardAttributes.Position);
 
         // copy hit normal
-        geometry_construct_triangle_normal(out, 3, index_0, index_1, index_2, position_attribute.array);
+        geometry_construct_triangle_normal(out, 3, index_0, index_1, index_2, position_attribute.data);
     }
 
     // transform normal to world space via the normal matrix (correct under non-uniform scale);
@@ -92,11 +90,10 @@ export function sample_material(
     v3_matrix3_rotate(out, 3, out[3], out[4], out[5], mesh.normal_matrix);
 
     // sample texture coordinates for THIS hit; must be computed before any texture is sampled
-    const uv_attribute = geometry.getAttribute('uv');
+    const uv_attribute = geometry.getAttribute(StandardAttributes.TextureCoordinates0);
 
     if (uv_attribute !== undefined) {
-        const uv_array = uv_attribute.array;
-        sample_triangle_attribute(texture_uv, 0, index_0, index_1, index_2, uv_array, 2, u, v);
+        sample_triangle_attribute(texture_uv, 0, index_0, index_1, index_2, uv_attribute.data, 2, u, v);
     } else {
         // default texture uv
         texture_uv[0] = 0;
@@ -122,7 +119,7 @@ export function sample_material(
         out[5] = scratch_m3[2] * normal[0] + scratch_m3[5] * normal[1] + scratch_m3[8] * normal[2];
     }
 
-    const color_attribute = geometry.getAttribute('color');
+    const color_attribute = geometry.getAttribute(StandardAttributes.Color);
 
     if (color_attribute !== undefined) {
         sample_color_attribute(color, color_attribute, index_0, index_1, index_2, u, v);

package/src/engine/graphics/shadows/vsm.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsm.glsl.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/shadows/vsm.glsl.js"],"names":[],"mappings":"AAIA,oFAIE;AAEF,0zCA8BE"}
+{"version":3,"file":"vsm.glsl.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/shadows/vsm.glsl.js"],"names":[],"mappings":"AAMA,oFAIE;AAEF,0zCA8BE"}

package/src/engine/graphics/shadows/vsm.glsl.js

@@ -1,41 +1,43 @@
-/*
-Taken from three.js r134
- */
-
-export const vertex = /* glsl */`
-void main() {
-	gl_Position = vec4( position, 1.0 );
-}
-`;
-
-export const fragment = /* glsl */`
-uniform sampler2D shadow_pass;
-uniform vec2 resolution;
-uniform float radius;
-#include <packing>
-void main() {
-	const float samples = float( VSM_SAMPLES );
-	float mean = 0.0;
-	float squared_mean = 0.0;
-	// This seems totally useless but it's a crazy work around for a Adreno compiler bug
-	// float depth = unpackRGBAToDepth( texture2D( shadow_pass, ( gl_FragCoord.xy ) / resolution ) );
-	float uvStride = samples <= 1.0 ? 0.0 : 2.0 / ( samples - 1.0 );
-	float uvStart = samples <= 1.0 ? 0.0 : - 1.0;
-	for ( float i = 0.0; i < samples; i ++ ) {
-		float uvOffset = uvStart + i * uvStride;
-		#ifdef HORIZONTAL_PASS
-			vec2 distribution = unpackRGBATo2Half( texture2D( shadow_pass, ( gl_FragCoord.xy + vec2( uvOffset, 0.0 ) * radius ) / resolution ) );
-			mean += distribution.x;
-			squared_mean += distribution.y * distribution.y + distribution.x * distribution.x;
-		#else
-			float depth = unpackRGBAToDepth( texture2D( shadow_pass, ( gl_FragCoord.xy + vec2( 0.0, uvOffset ) * radius ) / resolution ) );
-			mean += depth;
-			squared_mean += depth * depth;
-		#endif
-	}
-	mean = mean / samples;
-	squared_mean = squared_mean / samples;
-	float std_dev = sqrt( squared_mean - mean * mean );
-	gl_FragColor = pack2HalfToRGBA( vec2( mean, std_dev ) );
-}
-`;
+/*
+ Taken from three.js r134, verbatim: the two-pass VSM shadow blur.
+
+ Derived from three.js (https://github.com/mrdoob/three.js), Copyright (c) 2010-2024 three.js authors, MIT licence.
+*/
+
+export const vertex = /* glsl */`
+void main() {
+	gl_Position = vec4( position, 1.0 );
+}
+`;
+
+export const fragment = /* glsl */`
+uniform sampler2D shadow_pass;
+uniform vec2 resolution;
+uniform float radius;
+#include <packing>
+void main() {
+	const float samples = float( VSM_SAMPLES );
+	float mean = 0.0;
+	float squared_mean = 0.0;
+	// This seems totally useless but it's a crazy work around for a Adreno compiler bug
+	// float depth = unpackRGBAToDepth( texture2D( shadow_pass, ( gl_FragCoord.xy ) / resolution ) );
+	float uvStride = samples <= 1.0 ? 0.0 : 2.0 / ( samples - 1.0 );
+	float uvStart = samples <= 1.0 ? 0.0 : - 1.0;
+	for ( float i = 0.0; i < samples; i ++ ) {
+		float uvOffset = uvStart + i * uvStride;
+		#ifdef HORIZONTAL_PASS
+			vec2 distribution = unpackRGBATo2Half( texture2D( shadow_pass, ( gl_FragCoord.xy + vec2( uvOffset, 0.0 ) * radius ) / resolution ) );
+			mean += distribution.x;
+			squared_mean += distribution.y * distribution.y + distribution.x * distribution.x;
+		#else
+			float depth = unpackRGBAToDepth( texture2D( shadow_pass, ( gl_FragCoord.xy + vec2( 0.0, uvOffset ) * radius ) / resolution ) );
+			mean += depth;
+			squared_mean += depth * depth;
+		#endif
+	}
+	mean = mean / samples;
+	squared_mean = squared_mean / samples;
+	float std_dev = sqrt( squared_mean - mean * mean );
+	gl_FragColor = pack2HalfToRGBA( vec2( mean, std_dev ) );
+}
+`;

package/src/engine/graphics/texture/computeThreeTextureInternalFormatFromDataType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeThreeTextureInternalFormatFromDataType.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/computeThreeTextureInternalFormatFromDataType.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,kEAJW,cAAc,iBACd,MAAM,GACJ,MAAM,GAAC,MAAM,cAAc,CAqCvC;+BA5C8B,6CAA6C"}
+{"version":3,"file":"computeThreeTextureInternalFormatFromDataType.d.ts","sourceRoot":"","sources":["../../../../../src/engine/graphics/texture/computeThreeTextureInternalFormatFromDataType.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,kEAJW,cAAc,iBACd,MAAM,GACJ,MAAM,uBAAqB,CAqCvC;+BA5C8B,6CAA6C"}

package/src/engine/graphics3/WaterSystem3.js

@@ -226,7 +226,7 @@ export class WaterSystem3 extends System {
          past the terrain the height map clamps — which is what lets the shore line continue instead
          of stopping at the boundary.
 
-         `Water.updateShaderForTerrain` states the same thing as a UV transform,
+         The three path stated the same thing as a UV transform,
          `(uv - 0.25) * (WATER_SIZE / terrain_size)`, and the two agree by construction: world
          position is `(u - 0.25) * WATER_SIZE`, and terrain uv is that over the terrain's own size.
         */

package/src/engine/physics/fluid/ecs/FluidObstacleSystem.d.ts

@@ -64,11 +64,11 @@ export class FluidObstacleSystem extends System<any> {
     /**
      * @param {FluidComponent} fluid
      */
-    static "__#349@#refresh_masks"(fluid: FluidComponent): void;
+    static "__#348@#refresh_masks"(fluid: FluidComponent): void;
     /**
      * @param {FluidComponent} fluid
      */
-    static "__#349@#clear_field"(fluid: FluidComponent): void;
+    static "__#348@#clear_field"(fluid: FluidComponent): void;
     /**
      * Mark every cell of `fluid` whose centre lies within `inflation` of the
      * posed shape as solid. Iteration is clipped to the shape's world AABB
@@ -80,7 +80,7 @@ export class FluidObstacleSystem extends System<any> {
      * @param {number} inflation       world-units SDF threshold
      * @param {Float64Array} point     length-3 scratch
      */
-    static "__#349@#voxelize"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array): void;
+    static "__#348@#voxelize"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array): void;
     /**
      * Write the obstacle's translation velocity onto every face of every cell
      * it voxelized — the moving-wall boundary condition. Runs AFTER the mask
@@ -100,7 +100,7 @@ export class FluidObstacleSystem extends System<any> {
      * @param {number} wvy
      * @param {number} wvz
      */
-    static "__#349@#stamp_wall_velocity"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array, wvx: number, wvy: number, wvz: number): void;
+    static "__#348@#stamp_wall_velocity"(fluid: FluidComponent, posed: PosedShape3D, aabb: Float64Array, inflation: number, point: Float64Array, wvx: number, wvy: number, wvz: number): void;
     constructor();
     dependencies: (typeof FluidObstacle)[];
     components_used: (ResourceAccessSpecification<typeof Transform> | ResourceAccessSpecification<typeof RigidBody> | ResourceAccessSpecification<typeof Collider> | ResourceAccessSpecification<typeof FluidComponent> | ResourceAccessSpecification<typeof FluidObstacle>)[];