three-gpu-pathtracer 0.0.5 → 0.0.6

package/package.json

@@ -1,60 +1,68 @@
-{
-  "name": "three-gpu-pathtracer",
-  "version": "0.0.5",
-  "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.141.0"
-  },
-  "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

@@ -1,111 +1,119 @@
-import { BufferGeometry } from 'three';
-import { StaticGeometryGenerator, MeshBVH } from 'three-mesh-bvh';
-import { setCommonAttributes, getGroupMaterialIndicesAttribute } from '../utils/GeometryPreparationUtils.js';
-
-export class DynamicPathTracingSceneGenerator {
-
-	get initialized() {
-
-		return Boolean( this.bvh );
-
-	}
-
-	constructor( scene ) {
-
-		this.objects = Array.isArray( scene ) ? scene : [ scene ];
-		this.bvh = null;
-		this.geometry = new BufferGeometry();
-		this.materials = null;
-		this.textures = null;
-		this.staticGeometryGenerator = new StaticGeometryGenerator( scene );
-
-	}
-
-	reset() {
-
-		this.bvh = null;
-		this.geometry.dispose();
-		this.geometry = new BufferGeometry();
-		this.materials = null;
-		this.textures = null;
-		this.staticGeometryGenerator = new StaticGeometryGenerator( this.objects );
-
-	}
-
-	dispose() {}
-
-	generate() {
-
-		const { objects, staticGeometryGenerator, geometry } = this;
-		if ( this.bvh === null ) {
-
-			const attributes = [ 'position', 'normal', 'tangent', 'uv' ];
-
-			for ( let i = 0, l = objects.length; i < l; i ++ ) {
-
-				objects[ i ].traverse( c => {
-
-					if ( c.isMesh ) {
-
-						const normalMapRequired = ! ! c.material.normalMap;
-						setCommonAttributes( c.geometry, { attributes, normalMapRequired } );
-
-					}
-
-				} );
-
-			}
-
-			const textureSet = new Set();
-			const materials = staticGeometryGenerator.getMaterials();
-			materials.forEach( material => {
-
-				for ( const key in material ) {
-
-					const value = material[ key ];
-					if ( value && value.isTexture ) {
-
-						textureSet.add( value );
-
-					}
-
-				}
-
-			} );
-
-			staticGeometryGenerator.attributes = attributes;
-			staticGeometryGenerator.generate( geometry );
-
-			const materialIndexAttribute = getGroupMaterialIndicesAttribute( geometry, materials, materials );
-			geometry.setAttribute( 'materialIndex', materialIndexAttribute );
-			geometry.clearGroups();
-
-			this.bvh = new MeshBVH( geometry );
-			this.materials = materials;
-			this.textures = Array.from( textureSet );
-
-			return {
-				bvh: this.bvh,
-				materials: this.materials,
-				textures: this.textures,
-				objects,
-			};
-
-		} else {
-
-			const { bvh } = this;
-			staticGeometryGenerator.generate( geometry );
-			bvh.refit();
-			return {
-				bvh: this.bvh,
-				materials: this.materials,
-				textures: this.textures,
-				objects,
-			};
-
-		}
-
-	}
-
-
-}
+import { BufferGeometry } from 'three';
+import { StaticGeometryGenerator, MeshBVH } from 'three-mesh-bvh';
+import { setCommonAttributes, getGroupMaterialIndicesAttribute } from '../utils/GeometryPreparationUtils.js';
+
+export class DynamicPathTracingSceneGenerator {
+
+	get initialized() {
+
+		return Boolean( this.bvh );
+
+	}
+
+	constructor( 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 );
+
+	}
+
+	reset() {
+
+		this.bvh = null;
+		this.geometry.dispose();
+		this.geometry = new BufferGeometry();
+		this.materials = null;
+		this.textures = null;
+		this.lights = [];
+		this.staticGeometryGenerator = new StaticGeometryGenerator( this.objects );
+
+	}
+
+	dispose() {}
+
+	generate() {
+
+		const { objects, staticGeometryGenerator, geometry } = this;
+		if ( this.bvh === null ) {
+
+			const attributes = [ 'position', 'normal', 'tangent', 'uv' ];
+
+			for ( let i = 0, l = objects.length; i < l; i ++ ) {
+
+				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();
+			materials.forEach( material => {
+
+				for ( const key in material ) {
+
+					const value = material[ key ];
+					if ( value && value.isTexture ) {
+
+						textureSet.add( value );
+
+					}
+
+				}
+
+			} );
+
+			staticGeometryGenerator.attributes = attributes;
+			staticGeometryGenerator.generate( geometry );
+
+			const materialIndexAttribute = getGroupMaterialIndicesAttribute( geometry, materials, materials );
+			geometry.setAttribute( 'materialIndex', materialIndexAttribute );
+			geometry.clearGroups();
+
+			this.bvh = new MeshBVH( geometry );
+			this.materials = materials;
+			this.textures = Array.from( textureSet );
+
+			return {
+				lights: this.lights,
+				bvh: this.bvh,
+				materials: this.materials,
+				textures: this.textures,
+				objects,
+			};
+
+		} else {
+
+			const { bvh } = this;
+			staticGeometryGenerator.generate( geometry );
+			bvh.refit();
+			return {
+				lights: this.lights,
+				bvh: this.bvh,
+				materials: this.materials,
+				textures: this.textures,
+				objects,
+			};
+
+		}
+
+	}
+
+
+}