three-gpu-pathtracer 0.0.3 → 0.0.6

package/package.json

@@ -1,60 +1,68 @@
-{
-  "name": "three-gpu-pathtracer",
-  "version": "0.0.3",
-  "description": "Path tracing renderer and utilities for three.js built on top of three-mesh-bvh.",
-  "module": "src/index.js",
-  "main": "build/index.umd.cjs",
-  "type": "module",
-  "sideEffects": false,
-  "files": [
-    "src/*",
-    "build/*"
-  ],
-  "keywords": [
-    "webgl",
-    "threejs",
-    "performance",
-    "geometry",
-    "graphics",
-    "mesh",
-    "renderer",
-    "raytracing",
-    "bvh",
-    "three-js",
-    "path-tracing",
-    "three-mesh-bvh",
-    "rtx"
-  ],
-  "dependencies": {
-    "three-mesh-bvh": "^0.5.10"
-  },
-  "devDependencies": {
-    "eslint": "^7.32.0",
-    "eslint-config-mdcs": "^5.0.0",
-    "parcel": "^2.4.0",
-    "process": "^0.11.10",
-    "rollup": "^2.70.0",
-    "three": "^0.139.2"
-  },
-  "peerDependencies": {
-    "three": "^0.139.2",
-    "xatlas-web": "^0.1.0"
-  },
-  "scripts": {
-    "start": "cd example && parcel serve ./*.html --dist-dir ./dev-bundle/ --no-cache --no-hmr",
-    "build-examples": "cd example && parcel build ./*.html --dist-dir ./bundle/ --public-url . --no-cache --no-content-hash",
-    "build": "rollup -c",
-    "lint": "eslint \"./src/**/*.{js,ts}\" \"./example/*.js\"",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/gkjohnson/three-gpu-pathtracer.git"
-  },
-  "author": "Garrett Johnson <garrett.kjohnson@gmail.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/gkjohnson/three-gpu-pathtracer/issues"
-  },
-  "homepage": "https://github.com/gkjohnson/three-gpu-pathtracer#readme"
-}
+{
+  "name": "three-gpu-pathtracer",
+  "version": "0.0.6",
+  "description": "Path tracing renderer and utilities for three.js built on top of three-mesh-bvh.",
+  "module": "src/index.js",
+  "main": "build/index.umd.cjs",
+  "type": "module",
+  "sideEffects": false,
+  "files": [
+    "src/*",
+    "build/*"
+  ],
+  "keywords": [
+    "webgl",
+    "threejs",
+    "performance",
+    "geometry",
+    "graphics",
+    "mesh",
+    "renderer",
+    "raytracing",
+    "bvh",
+    "three-js",
+    "path-tracing",
+    "three-mesh-bvh",
+    "rtx"
+  ],
+  "dependencies": {
+    "three-mesh-bvh": "^0.5.10"
+  },
+  "devDependencies": {
+    "eslint": "^7.32.0",
+    "eslint-config-mdcs": "^5.0.0",
+    "node-fetch": "^3.2.9",
+    "parcel": "^2.4.0",
+    "pixelmatch": "^5.3.0",
+    "pngjs": "^6.0.0",
+    "process": "^0.11.10",
+    "puppeteer": "^15.4.0",
+    "rollup": "^2.70.0",
+    "simple-git": "^3.10.0",
+    "three": "^0.141.0",
+    "yargs": "^17.5.1"
+  },
+  "peerDependencies": {
+    "three": "^0.139.2",
+    "xatlas-web": "^0.1.0"
+  },
+  "scripts": {
+    "start": "cd example && parcel serve ./*.html --dist-dir ./dev-bundle/ --no-cache --no-hmr",
+    "build-examples": "cd example && parcel build ./*.html --dist-dir ./bundle/ --public-url . --no-cache --no-content-hash",
+    "update-screenshots": "node ./scripts/push-screenshots.js",
+    "screenshot-diff": "node ./scripts/regression-test.js",
+    "build": "rollup -c",
+    "lint": "eslint \"./src/**/*.{js,ts}\" \"./example/*.js\"",
+    "prepublishOnly": "npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gkjohnson/three-gpu-pathtracer.git"
+  },
+  "author": "Garrett Johnson <garrett.kjohnson@gmail.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/gkjohnson/three-gpu-pathtracer/issues"
+  },
+  "homepage": "https://github.com/gkjohnson/three-gpu-pathtracer#readme"
+}

package/src/core/DynamicPathTracingSceneGenerator.js

@@ -12,11 +12,12 @@ export class DynamicPathTracingSceneGenerator {
 
 	constructor( scene ) {
 
-		this.scene = scene;
+		this.objects = Array.isArray( scene ) ? scene : [ scene ];
 		this.bvh = null;
 		this.geometry = new BufferGeometry();
 		this.materials = null;
 		this.textures = null;
+		this.lights = [];
 		this.staticGeometryGenerator = new StaticGeometryGenerator( scene );
 
 	}
@@ -28,7 +29,8 @@ export class DynamicPathTracingSceneGenerator {
 		this.geometry = new BufferGeometry();
 		this.materials = null;
 		this.textures = null;
-		this.staticGeometryGenerator = new StaticGeometryGenerator( this.scene );
+		this.lights = [];
+		this.staticGeometryGenerator = new StaticGeometryGenerator( this.objects );
 
 	}
 
@@ -36,20 +38,29 @@ export class DynamicPathTracingSceneGenerator {
 
 	generate() {
 
-		const { scene, staticGeometryGenerator, geometry } = this;
+		const { objects, staticGeometryGenerator, geometry } = this;
 		if ( this.bvh === null ) {
 
 			const attributes = [ 'position', 'normal', 'tangent', 'uv' ];
-			scene.traverse( c => {
 
-				if ( c.isMesh ) {
+			for ( let i = 0, l = objects.length; i < l; i ++ ) {
 
-					const normalMapRequired = ! ! c.material.normalMap;
-					setCommonAttributes( c.geometry, { attributes, normalMapRequired } );
+				objects[ i ].traverse( c => {
 
-				}
+					if ( c.isMesh ) {
 
-			} );
+						const normalMapRequired = ! ! c.material.normalMap;
+						setCommonAttributes( c.geometry, { attributes, normalMapRequired } );
+
+					} else if ( c.isRectAreaLight || c.isSpotLight ) {
+
+						this.lights.push( c );
+
+					}
+
+				} );
+
+			}
 
 			const textureSet = new Set();
 			const materials = staticGeometryGenerator.getMaterials();
@@ -80,10 +91,11 @@ export class DynamicPathTracingSceneGenerator {
 			this.textures = Array.from( textureSet );
 
 			return {
+				lights: this.lights,
 				bvh: this.bvh,
 				materials: this.materials,
 				textures: this.textures,
-				scene,
+				objects,
 			};
 
 		} else {
@@ -92,10 +104,11 @@ export class DynamicPathTracingSceneGenerator {
 			staticGeometryGenerator.generate( geometry );
 			bvh.refit();
 			return {
+				lights: this.lights,
 				bvh: this.bvh,
 				materials: this.materials,
 				textures: this.textures,
-				scene,
+				objects,
 			};
 
 		}

package/src/core/PathTracingRenderer.js

@@ -24,6 +24,7 @@ function* renderTask() {
 
 			blendMaterial.opacity = 1 / ( this.samples + 1 );
 			material.blending = NoBlending;
+			material.opacity = 1;
 
 		} else {
 
@@ -48,6 +49,27 @@ function* renderTask() {
 				material.cameraWorldMatrix.copy( camera.matrixWorld );
 				material.invProjectionMatrix.copy( camera.projectionMatrixInverse );
 
+				// Perspective camera (default)
+				let cameraType = 0;
+
+				// An orthographic projection matrix will always have the bottom right element == 1
+				// And a perspective projection matrix will always have the bottom right element == 0
+				if ( camera.projectionMatrix.elements[ 15 ] > 0 ) {
+
+					// Orthographic
+					cameraType = 1;
+
+				}
+
+				if ( camera.isEquirectCamera ) {
+
+					// Equirectangular
+					cameraType = 2;
+
+				}
+
+				material.setDefine( 'CAMERA_TYPE', cameraType );
+
 				const ogRenderTarget = _renderer.getRenderTarget();
 				const ogAutoClear = _renderer.autoClear;
 

package/src/core/PathTracingSceneGenerator.js

@@ -6,44 +6,60 @@ export class PathTracingSceneGenerator {
 
 	prepScene( scene ) {
 
+		scene = Array.isArray( scene ) ? scene : [ scene ];
+
 		const meshes = [];
-		scene.traverse( c => {
+		const lights = [];
+
+		for ( let i = 0, l = scene.length; i < l; i ++ ) {
+
+			scene[ i ].traverse( c => {
+
+				if ( c.isSkinnedMesh || c.isMesh && c.morphTargetInfluences ) {
 
-			if ( c.isSkinnedMesh || c.isMesh && c.morphTargetInfluences ) {
+					const generator = new StaticGeometryGenerator( c );
+					generator.applyWorldTransforms = false;
+					const mesh = new Mesh(
+						generator.generate(),
+						c.material,
+					);
+					mesh.matrixWorld.copy( c.matrixWorld );
+					mesh.matrix.copy( c.matrixWorld );
+					mesh.matrix.decompose( mesh.position, mesh.quaternion, mesh.scale );
+					meshes.push( mesh );
 
-				const generator = new StaticGeometryGenerator( c );
-				generator.applyWorldTransforms = false;
-				const mesh = new Mesh(
-					generator.generate(),
-					c.material,
-				);
-				mesh.matrixWorld.copy( c.matrixWorld );
-				mesh.matrix.copy( c.matrixWorld );
-				mesh.matrix.decompose( mesh.position, mesh.quaternion, mesh.scale );
-				meshes.push( mesh );
+				} else if ( c.isMesh ) {
 
-			} else if ( c.isMesh ) {
+					meshes.push( c );
 
-				meshes.push( c );
+				} else if ( c.isRectAreaLight || c.isSpotLight ) {
 
-			}
+					lights.push( c );
 
-		} );
+				}
 
-		return mergeMeshes( meshes, {
-			attributes: [ 'position', 'normal', 'tangent', 'uv' ],
-		} );
+			} );
+
+		}
+
+		return {
+			...mergeMeshes( meshes, {
+				attributes: [ 'position', 'normal', 'tangent', 'uv' ],
+			} ),
+			lights,
+		};
 
 	}
 
 	generate( scene, options = {} ) {
 
-		const { materials, textures, geometry } = this.prepScene( scene );
+		const { materials, textures, geometry, lights } = this.prepScene( scene );
 		const bvhOptions = { strategy: SAH, ...options, maxLeafTris: 1 };
 		return {
 			scene,
 			materials,
 			textures,
+			lights,
 			bvh: new MeshBVH( geometry, bvhOptions ),
 		};
 

package/src/index.js

@@ -3,17 +3,25 @@ export * from './core/PathTracingRenderer.js';
 export * from './core/PathTracingSceneGenerator.js';
 export * from './core/DynamicPathTracingSceneGenerator.js';
 export * from './core/MaterialReducer.js';
-export * from './core/PhysicalCamera.js';
+
+// objects
+export * from './objects/PhysicalCamera.js';
+export * from './objects/EquirectCamera.js';
+export * from './objects/PhysicalSpotLight.js';
+export * from './objects/ShapedAreaLight.js';
 
 // uniforms
 export * from './uniforms/MaterialsTexture.js';
 export * from './uniforms/RenderTarget2DArray.js';
 export * from './uniforms/EquirectHdrInfoUniform.js';
 export * from './uniforms/PhysicalCameraUniform.js';
+export * from './uniforms/LightsInfoUniformStruct.js';
+export * from './uniforms/IESProfilesTexture.js';
 
 // utils
 export * from './utils/GeometryPreparationUtils.js';
 export * from './utils/BlurredEnvMapGenerator.js';
+export * from './utils/IESLoader.js';
 
 // materials
 export * from './materials/MaterialBase.js';