three-gpu-pathtracer 0.0.26 → 0.0.28

package/README.md

@@ -2,6 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/three-gpu-pathtracer.svg?style=flat-square)](https://www.npmjs.com/package/three-gpu-pathtracer)
 [![build](https://img.shields.io/github/actions/workflow/status/gkjohnson/three-gpu-pathtracer/node.js.yml?style=flat-square&label=build&branch=main)](https://github.com/gkjohnson/three-gpu-pathtracer/actions)
+[![docs](https://img.shields.io/badge/docs-API-blue?style=flat-square)](https://gkjohnson.github.io/tools/docs/three-gpu-pathtracer/)
 [![github](https://flat.badgen.net/badge/icon/github?icon=github&label)](https://github.com/gkjohnson/three-gpu-pathtracer/)
 [![twitter](https://flat.badgen.net/badge/twitter/@garrettkjohnson/?icon&label)](https://twitter.com/garrettkjohnson)
 [![sponsors](https://img.shields.io/github/sponsors/gkjohnson?style=flat-square&color=1da1f2)](https://github.com/sponsors/gkjohnson/)
@@ -103,7 +104,9 @@ scene.environment = blurredEnvMap;
 
 # API
 
-See [API.md](./src/webgpu/API.md) for the WebGPU API documentation.
+See the [docs site](https://gkjohnson.github.io/tools/docs/three-gpu-pathtracer/) for the WebGPU API documentation.
+
+The same documentation is also available as markdown in [API.md](./src/webgpu/API.md).
 
 # Gotchas
 
@@ -111,7 +114,6 @@ See [API.md](./src/webgpu/API.md) for the WebGPU API documentation.
 - SpotLights, DirectionalLights, and PointLights are only supported with MIS.
 - Only MeshStandardMaterial and MeshPhysicalMaterial are supported.
 - Emissive materials are supported but do not take advantage of MIS.
-- "Upscaling" does not currently work with a transparent background.
 
 # Screenshots
 

package/build/index.module.js

@@ -1,4 +1,4 @@
-import { BufferAttribute, BufferGeometry, Matrix4, Vector3, Vector4, Matrix3, MeshBasicMaterial, Mesh, ShaderMaterial, NoBlending, Vector2, WebGLRenderTarget, FloatType, RGBAFormat, NearestFilter, PerspectiveCamera, DataUtils, HalfFloatType, Source, DataTexture, LinearFilter, RepeatWrapping, RedFormat, ClampToEdgeWrapping, Quaternion, DataArrayTexture, DoubleSide, BackSide, FrontSide, Color, WebGLArrayRenderTarget, UnsignedByteType, NoToneMapping, RGFormat, NormalBlending, Spherical, EquirectangularReflectionMapping, LinearMipMapLinearFilter, Clock, Scene, AdditiveBlending, Camera, SpotLight, RectAreaLight, PMREMGenerator, MeshStandardMaterial, TangentSpaceNormalMap } from 'three';
+import { BufferAttribute, BufferGeometry, Matrix4, Vector3, Vector4, Matrix3, MeshBasicMaterial, Mesh, ShaderMaterial, NoBlending, Vector2, WebGLRenderTarget, FloatType, RGBAFormat, NearestFilter, PerspectiveCamera, DataUtils, HalfFloatType, TextureSource, DataTexture, LinearFilter, RepeatWrapping, RedFormat, ClampToEdgeWrapping, Quaternion, DataArrayTexture, DoubleSide, BackSide, FrontSide, Color, WebGLArrayRenderTarget, UnsignedByteType, NoToneMapping, RGFormat, NormalBlending, Spherical, EquirectangularReflectionMapping, LinearMipMapLinearFilter, Clock, Scene, AdditiveBlending, Camera, SpotLight, RectAreaLight, PMREMGenerator, MeshStandardMaterial, TangentSpaceNormalMap } from 'three';
 import { SAH, MeshBVH, FloatVertexAttributeTexture, MeshBVHUniformStruct, UIntVertexAttributeTexture, BVHShaderGLSL } from 'three-mesh-bvh';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
 
@@ -1410,7 +1410,7 @@ class PathTracingSceneGenerator {
 		// generate the geometry
 		const result = staticGeometryGenerator.generate( geometry );
 		const materials = result.materials;
-		let needsMaterialIndexUpdate = result.changeType !== NO_CHANGE || this._materialUuids === null || this._materialUuids.length !== length;
+		let needsMaterialIndexUpdate = result.changeType !== NO_CHANGE || this._materialUuids === null || this._materialUuids.length !== materials.length;
 		if ( ! needsMaterialIndexUpdate ) {
 
 			for ( let i = 0, length = materials.length; i < length; i ++ ) {
@@ -2110,7 +2110,7 @@ function colorToLuminance( r, g, b ) {
 function preprocessEnvMap( envMap, targetType = HalfFloatType ) {
 
 	const map = envMap.clone();
-	map.source = new Source( { ...map.image } );
+	map.source = new TextureSource( { ...map.image } );
 	const { width, height, data } = map.image;
 
 	// TODO: is there a simple way to avoid cloning and adjusting the env map data here?
@@ -2379,12 +2379,15 @@ class EquirectHdrInfoUniform {
 
 		this.totalSum = totalSumValue;
 		this.map = map;
+		this.cdfMarginal = cdfMarginal;
+		this.cdfConditional = cdfConditional;
 
 	}
 
 }
 
 const LIGHT_PIXELS = 6;
+const VISIBLE_TO_CAMERA_OFFSET = 11;
 const RECT_AREA_LIGHT = 0;
 const CIRC_AREA_LIGHT = 1;
 const SPOT_LIGHT = 2;
@@ -2465,7 +2468,7 @@ class LightsInfoUniformStruct {
 
 				type = SPOT_LIGHT;
 
-			} else if ( l.isDirectionalLight ) {
+			} else if ( l.isDirectionalLight || l.isSunLight ) {
 
 				type = DIR_LIGHT;
 
@@ -2590,8 +2593,22 @@ class LightsInfoUniformStruct {
 				floatArray[ baseIndex + ( index ++ ) ] = target.y;
 				floatArray[ baseIndex + ( index ++ ) ] = target.z;
 
+			} else if ( l.isSunLight ) {
+
+				// the sun has no target and shines from its position toward the origin
+				target.setFromMatrixPosition( l.matrixWorld ).normalize();
+
+				// sample 3
+				// u vector
+				floatArray[ baseIndex + ( index ++ ) ] = target.x;
+				floatArray[ baseIndex + ( index ++ ) ] = target.y;
+				floatArray[ baseIndex + ( index ++ ) ] = target.z;
+
 			}
 
+			// whether camera rays see the light
+			floatArray[ baseIndex + VISIBLE_TO_CAMERA_OFFSET ] = l.visibleToCameraRays ? 1 : 0;
+
 		}
 
 		this.count = lights.length;
@@ -2892,7 +2909,8 @@ function getLights( scene ) {
 			c.isRectAreaLight ||
 			c.isSpotLight ||
 			c.isPointLight ||
-			c.isDirectionalLight
+			c.isDirectionalLight ||
+			c.isSunLight
 		) {
 
 			lights.push( c );