@woosh/meep-engine 2.106.1 → 2.108.0

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

@@ -38,6 +38,7 @@ import { DirectionalLight } from "../../render/forward_plus/model/DirectionalLig
 import { sampler2d_scale } from "../../texture/sampler/resize/sampler2d_scale.js";
 import { Sampler2D } from "../../texture/sampler/Sampler2D.js";
 import sampler2D2Canvas from "../../texture/sampler/Sampler2D2Canvas.js";
+import { PathTracedScene } from "./PathTracedScene.js";
 import { PathTracer } from "./PathTracer.js";
 
 document.body.style.margin = 0;
@@ -71,45 +72,11 @@ vCanvas.css({
  * How many rays to use per-pixel
  * @type {number}
  */
-const PIXEL_SAMPLE_COUNT = 64;
+const PIXEL_SAMPLE_COUNT = 256;
 
+const scene = new PathTracedScene();
 const pt = new PathTracer();
 
-const gltfLoader = new GLTFLoader();
-// const gltf_url = 'data/models/LowPolyTownshipSet/Town_Hall/model.gltf';
-// const gltf_url = 'data/models/road_bike/road_bike.gltf';
-// const gltf_url = 'data/models/sponza-pbr/gltf/sponza.glb';
-// const gltf_url = 'data/models/sibenik/model.gltf';
-// gltfLoader.load(gltf_url, (gltf) => {
-//
-//     gltf.scene.updateMatrixWorld();
-//
-//     gltf.scene.traverse(m => {
-//
-//         if (m.isMesh) {
-//
-//             pt.addMesh(
-//                 m.geometry,
-//                 m.material,
-//                 m.matrixWorld.elements
-//             );
-//
-//         }
-//     });
-//
-//     trace_image(vCanvas);
-// });
-
-//
-// pt.addMesh(
-//     new TorusKnotBufferGeometry(1, 0.3, 128, 128),
-//     new MeshStandardMaterial({ color: '#FF0000' }),
-//     Transform.fromJSON({
-//         scale: 0.5
-//     }).matrix
-// );
-//
-
 function make_sun({
                       temperature = 5000, // around clear-sky day
                       color = '#FFFFFF',
@@ -193,20 +160,20 @@ function promise_gltf(url) {
 
 /**
  *
- * @param {PathTracer} pt
+ * @param {PathTracedScene} scene
  * @param {THREE.Camera} camera
  * @param {string} url
  * @param zoom
  * @return {Promise<void>}
  */
-async function prepare_scene_gltf(pt, camera, url, zoom = 1) {
+async function prepare_scene_gltf(scene, camera, url, zoom = 1) {
     const gltf = await promise_gltf(url);
 
 
     const ground_material = new MeshStandardMaterial({
         color: '#ffceae'
     });
-    pt.addMesh(new PlaneBufferGeometry(), ground_material, Transform.fromJSON({
+    scene.addMesh(new PlaneBufferGeometry(), ground_material, Transform.fromJSON({
         position: new Vector3(0, 0, 0),
         scale: 5000,
         rotation: Quaternion.fromEulerAngles(-Math.PI / 2, 0, 0)
@@ -217,7 +184,7 @@ async function prepare_scene_gltf(pt, camera, url, zoom = 1) {
 
     gltf.scene.traverse((m) => {
         if (m.isMesh) {
-            pt.addMesh(m.geometry, m.material, m.matrixWorld.elements);
+            scene.addMesh(m.geometry, m.material, m.matrixWorld.elements);
         }
     });
 
@@ -228,7 +195,7 @@ async function prepare_scene_gltf(pt, camera, url, zoom = 1) {
 
     box3.getBoundingSphere(sphere);
 
-    pt.addLight(make_sun());
+    scene.addLight(make_sun());
 
     camera.position.set(1, 1.3, 1)
         .normalize()
@@ -239,11 +206,11 @@ async function prepare_scene_gltf(pt, camera, url, zoom = 1) {
 
 /**
  *
- * @param {PathTracer} pt
+ * @param {PathTracedScene} scene
  * @param {THREE.Camera} camera
  * @return {Promise<void>}
  */
-async function prepare_scene_lucy(pt, camera) {
+async function prepare_scene_lucy(scene, camera) {
 
 
     const lucy_geom = await promise_ply("data/models/stanford/Lucy100k.ply")
@@ -251,7 +218,7 @@ async function prepare_scene_lucy(pt, camera) {
     const lucy_material = new MeshStandardMaterial({
         color: '#95c9ff'
     });
-    pt.addMesh(lucy_geom, lucy_material, Transform.fromJSON({
+    scene.addMesh(lucy_geom, lucy_material, Transform.fromJSON({
         position: new Vector3(0, 0, 0),
         scale: 1,
         // rotation: Quaternion.fromEulerAngles(-Math.PI / 2, 0, 0)
@@ -260,14 +227,14 @@ async function prepare_scene_lucy(pt, camera) {
     const ground_material = new MeshStandardMaterial({
         color: '#ffceae'
     });
-    pt.addMesh(new PlaneBufferGeometry(), ground_material, Transform.fromJSON({
+    scene.addMesh(new PlaneBufferGeometry(), ground_material, Transform.fromJSON({
         position: new Vector3(0, -800, 0),
         scale: 5000,
         rotation: Quaternion.fromEulerAngles(-Math.PI / 2, 0, 0)
     }).matrix);
 
 
-    pt.addLight(make_sun());
+    scene.addLight(make_sun());
 
     camera.position.set(0, 0, -2300);
     camera.lookAt(0, 0, 0);
@@ -287,7 +254,7 @@ async function prepare_scene_rtiow(pt, camera) {
     const ground_material = new MeshStandardMaterial({
         color: '#ffffff'
     });
-    pt.addMesh(new PlaneBufferGeometry(), ground_material, Transform.fromJSON({
+    scene.addMesh(new PlaneBufferGeometry(), ground_material, Transform.fromJSON({
         position: new Vector3(0, 0, 0),
         scale: 50,
         rotation: Quaternion.fromEulerAngles(-Math.PI / 2, 0, 0)
@@ -314,7 +281,7 @@ async function prepare_scene_rtiow(pt, camera) {
         const mat = new Float32Array(16);
         mat4.fromRotationTranslationScale(mat, [0, 0, 0, 1], center, [radius, radius, radius])
 
-        pt.addMesh(sphere_geo, material, mat);
+        scene.addMesh(sphere_geo, material, mat);
 
         spheres.push([
             center[0],
@@ -379,7 +346,7 @@ async function prepare_scene_rtiow(pt, camera) {
     }
 
 
-    pt.addLight(make_sun());
+    scene.addLight(make_sun());
 
     camera.position.set(13, 2, 3);
     camera.lookAt(0, 0, 0);
@@ -392,9 +359,10 @@ async function prepare_scene_rtiow(pt, camera) {
  * @param {Sampler2D} target
  * @param {PathTracer} pt
  * @param {Camera} camera
+ * @param {PathTracedScene} scene
  * @param {{current:number, total:number}} progress
  */
-function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
+function* render(target, pt, camera, scene, progress = { current: 0, total: 0 }) {
     const random = seededRandom(0);
 
     // update camera
@@ -476,7 +444,7 @@ function* render(target, pt, camera, progress = { current: 0, total: 0 }) {
                             ray_direction.x, ray_direction.y, ray_direction.z
                         );
 
-                        pt.path_trace(pixel_color, ray, Infinity, 3, random);
+                        pt.path_trace(pixel_color, ray, Infinity, 3, 7, random, scene);
 
                         pixel_accummulation[0] += pixel_color[0];
                         pixel_accummulation[1] += pixel_color[1];
@@ -528,12 +496,12 @@ async function start_renderer(camera) {
     const path = 'data/models/pica_pica/pica_pica.gltf';
     // const path = 'data/models/road_bike/road_bike.gltf'; //large CAD-type model
 
-    // await prepare_scene_lucy(pt, camera);
+    // await prepare_scene_lucy(scene, camera);
     // await prepare_scene_rtiow(pt, camera);
     // await prepare_scene_sphere_01(pt, camera);
-    await prepare_scene_gltf(pt, camera, path);
+    await prepare_scene_gltf(scene, camera, path);
 
-    await pt.build();
+    await scene.build();
     // pt.optimize();
 
     const pixelRatio = 1;
@@ -548,7 +516,7 @@ async function start_renderer(camera) {
     function make_render_task() {
         const progress_v = { current: 0, total: 0 };
 
-        const it = render(scaled_rt, pt, camera, progress_v);
+        const it = render(scaled_rt, pt, camera, scene, progress_v);
 
         return new Task({
             name: 'render',
@@ -577,9 +545,9 @@ async function start_renderer(camera) {
         const t = make_render_task();
 
 
-        const vProgress =makeSimpleTaskProgressView({
+        const vProgress = makeSimpleTaskProgressView({
             task: t,
-            size:vContainer.size,
+            size: vContainer.size,
             localization: loc
         })
 
@@ -632,7 +600,7 @@ vCanvas.el.addEventListener(MouseEvents.Click, (evt) => {
 
     const out = [];
 
-    pt.trace(out, ray, 0, Infinity);
+    scene.trace(out, ray, 0, Infinity);
 
     console.log(pointer, out, ray, pt);
 

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

@@ -1 +1 @@
-{"version":3,"file":"random_in_hemisphere.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/random_in_hemisphere.js"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,+DALW,MAAM,EAAE,iBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QA8BhB"}
+{"version":3,"file":"random_in_hemisphere.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/random_in_hemisphere.js"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,+DALW,MAAM,EAAE,iBACR,MAAM,UACN,MAAM,EAAE,iBACR,MAAM,QAoChB"}

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

@@ -8,7 +8,13 @@ import { v3_dot } from "../../../../core/geom/vec3/v3_dot.js";
  * @param {number[]} normal
  * @param {number} normal_offset
  */
-export function random_in_hemisphere(random, result, result_offset, normal, normal_offset) {
+export function random_in_hemisphere(
+    random,
+    result,
+    result_offset,
+    normal,
+    normal_offset
+) {
     const nx = normal[normal_offset + 0];
     const ny = normal[normal_offset + 1];
     const nz = normal[normal_offset + 2];

package/src/engine/graphics/sh3/path_tracer/sample_triangle_attribute.d.ts

@@ -5,10 +5,10 @@
  * @param {number} a vertex index 0
  * @param {number} b vertex index 0
  * @param {number} c vertex index 0
- * @param {number[]} attribute_array
+ * @param {number[]|ArrayLike<number>|Float32Array} attribute_array
  * @param {number} dimensions
  * @param {number} u Barycentric coordinate
  * @param {number} v Barycentric coordinate
  */
-export function sample_triangle_attribute(out: number[], out_offset: number, a: number, b: number, c: number, attribute_array: number[], dimensions: number, u: number, v: number): void;
+export function sample_triangle_attribute(out: number[], out_offset: number, a: number, b: number, c: number, attribute_array: number[] | ArrayLike<number> | Float32Array, dimensions: number, u: number, v: number): void;
 //# sourceMappingURL=sample_triangle_attribute.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sample_triangle_attribute.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/sample_triangle_attribute.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,+CAVW,MAAM,EAAE,cACR,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,mBACN,MAAM,EAAE,cACR,MAAM,KACN,MAAM,KACN,MAAM,QAwBhB"}
+{"version":3,"file":"sample_triangle_attribute.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/sample_triangle_attribute.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,+CAVW,MAAM,EAAE,cACR,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,mBACN,MAAM,EAAE,GAAC,UAAU,MAAM,CAAC,GAAC,YAAY,cACvC,MAAM,KACN,MAAM,KACN,MAAM,QAwBhB"}

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

@@ -5,7 +5,7 @@
  * @param {number} a vertex index 0
  * @param {number} b vertex index 0
  * @param {number} c vertex index 0
- * @param {number[]} attribute_array
+ * @param {number[]|ArrayLike<number>|Float32Array} attribute_array
  * @param {number} dimensions
  * @param {number} u Barycentric coordinate
  * @param {number} v Barycentric coordinate

package/src/engine/graphics/sh3/path_tracer/texture/SoftwareTextureCache.d.ts

@@ -0,0 +1,3 @@
+export class SoftwareTextureCache {
+}
+//# sourceMappingURL=SoftwareTextureCache.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SoftwareTextureCache.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/path_tracer/texture/SoftwareTextureCache.js"],"names":[],"mappings":"AAAA;CAEC"}

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

@@ -0,0 +1,3 @@
+export class SoftwareTextureCache{
+
+}

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

@@ -0,0 +1 @@
+{"version":3,"file":"apply_texture_clamping_to_coordinate.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/path_tracer/texture/apply_texture_clamping_to_coordinate.js"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,+DAJW,MAAM,KACN,MAAM,GACL,MAAM,CAcjB"}

package/src/engine/graphics/sh3/path_tracer/{apply_texture_clamping_to_coordinate.js → texture/apply_texture_clamping_to_coordinate.js}

@@ -1,5 +1,5 @@
 import { ClampToEdgeWrapping, RepeatWrapping } from "three";
-import { clamp01 } from "../../../../core/math/clamp01.js";
+import { clamp01 } from "../../../../../core/math/clamp01.js";
 
 /**
  *
@@ -10,7 +10,7 @@ import { clamp01 } from "../../../../core/math/clamp01.js";
 export function apply_texture_clamping_to_coordinate(clamping, v) {
 
     switch (clamping) {
-        case  RepeatWrapping:
+        case RepeatWrapping:
             return v % 1;
         case ClampToEdgeWrapping:
             return clamp01(v);

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

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {number[]} out
+ * @param {PathTracedMesh} mesh
+ * @param {Map<number, Sampler2D>} textures
+ * @param {number} primitive_id
+ * @param {number} u
+ * @param {number} v
+ */
+export function sample_material(out: number[], mesh: PathTracedMesh, textures: Map<number, Sampler2D>, primitive_id: number, u: number, v: number): void;
+//# sourceMappingURL=sample_material.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sample_material.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/path_tracer/texture/sample_material.js"],"names":[],"mappings":"AASA;;;;;;;;GAQG;AACH,qCAPW,MAAM,EAAE,kCAER,IAAI,MAAM,YAAY,gBACtB,MAAM,KACN,MAAM,KACN,MAAM,QAqEhB"}

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

@@ -0,0 +1,86 @@
+import { vec3 } from "gl-matrix";
+import { array_copy } from "../../../../../core/collection/array/array_copy.js";
+import { transform_normal_m4 } from "../ray_hit_apply_transform.js";
+import { sample_triangle_attribute } from "../sample_triangle_attribute.js";
+import { sample_texture } from "./sample_texture.js";
+
+const texture_uv = [0, 0];
+const color = [1, 1, 1];
+
+/**
+ *
+ * @param {number[]} out
+ * @param {PathTracedMesh} mesh
+ * @param {Map<number, Sampler2D>} textures
+ * @param {number} primitive_id
+ * @param {number} u
+ * @param {number} v
+ */
+export function sample_material(
+    out,
+    mesh, textures,
+    primitive_id,
+    u, v
+) {
+
+    const geometry = mesh.geometry;
+    const index_attribute = geometry.getIndex();
+    const index_array = index_attribute.array;
+
+
+    // sample surface normal
+    const index_offset = primitive_id * 3;
+
+    const index_0 = index_array[index_offset];
+    const index_1 = index_array[index_offset + 1];
+    const index_2 = index_array[index_offset + 2];
+
+    const normal_attribute = geometry.getAttribute('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);
+
+        // apply transform
+        transform_normal_m4(out, 3, out, 3, mesh.transform);
+    } else {
+        // copy hit normal
+        array_copy(hit, 3, out, 3, 3);
+    }
+
+
+    const uv_attribute = geometry.getAttribute('uv');
+
+    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);
+    } else {
+        // default texture uv
+        texture_uv[0] = 0;
+        texture_uv[1] = 0;
+    }
+
+    const material = mesh.material;
+
+    if (material.isMeshStandardMaterial) {
+        const material_color = material.color;
+
+        out[0] *= material_color.r;
+        out[1] *= material_color.g;
+        out[2] *= material_color.b;
+
+        const diffuse_map = material.map;
+
+        if (diffuse_map !== null) {
+            const sampler2D = textures.get(diffuse_map.id);
+
+            sample_texture(color, sampler2D, diffuse_map, texture_uv[0], texture_uv[1]);
+
+            vec3.multiply(out, out, color);
+        }
+    } else {
+        // unsupported
+    }
+}

package/src/engine/graphics/sh3/path_tracer/texture/sample_texture.d.ts

@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {number[]|Float32Array} out
+ * @param {Sampler2D} sampler
+ * @param {Texture} texture
+ * @param {number} u
+ * @param {number} v
+ */
+export function sample_texture(out: number[] | Float32Array, sampler: Sampler2D, texture: Texture, u: number, v: number): void;
+//# sourceMappingURL=sample_texture.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sample_texture.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/sh3/path_tracer/texture/sample_texture.js"],"names":[],"mappings":"AAaA;;;;;;;GAOG;AACH,oCANW,MAAM,EAAE,GAAC,YAAY,2CAGrB,MAAM,KACN,MAAM,QAoChB"}

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

@@ -0,0 +1,56 @@
+import {
+    LinearEncoding,
+    LinearFilter,
+    LinearMipmapLinearFilter,
+    NearestFilter,
+    NearestMipMapLinearFilter,
+    sRGBEncoding,
+    UnsignedByteType
+} from "three";
+import { linear_to_sRGB } from "../../../../../core/color/sRGB/linear_to_sRGB.js";
+import { vec3_uint8_to_float } from "../vec3_uint8_to_float.js";
+import { apply_texture_clamping_to_coordinate } from "./apply_texture_clamping_to_coordinate.js";
+
+/**
+ *
+ * @param {number[]|Float32Array} out
+ * @param {Sampler2D} sampler
+ * @param {Texture} texture
+ * @param {number} u
+ * @param {number} v
+ */
+export function sample_texture(out, sampler, texture, u, v) {
+    // TODO apply texture matrix transform
+
+    const _u = apply_texture_clamping_to_coordinate(texture.wrapS, u);
+    const _v = apply_texture_clamping_to_coordinate(texture.wrapT, v);
+
+    const magFilter = texture.magFilter;
+
+    switch (magFilter) {
+        default:
+        case NearestFilter:
+        case NearestMipMapLinearFilter:
+            sampler.sampleNearestUV(_u, _v, out);
+            break;
+
+        case LinearFilter:
+        case LinearMipmapLinearFilter:
+
+            sampler.sampleBilinearUV(_u, _v, out);
+            break;
+    }
+
+    if (texture.type === UnsignedByteType) {
+        vec3_uint8_to_float(out, out);
+    }
+
+    const texture_encoding = texture.encoding;
+
+    if (texture_encoding === LinearEncoding) {
+        // nothing
+    } else if (texture_encoding === sRGBEncoding) {
+        // convert value to sRGB
+        linear_to_sRGB(out, 0, out, 0);
+    }
+}