Merge pull request #666 from dongho-shin/dev/fix-materialAttributeIndex

updateMaterialIndexAttribute when it needs
gkjohnson · Jul 31, 2024 · 46b395e · 46b395e
2 parents 44599eb + e8e5cc1
commit 46b395e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/core/PathTracingSceneGenerator.js b/src/core/PathTracingSceneGenerator.js
@@ -95,6 +95,7 @@ export class PathTracingSceneGenerator {
 		this._bvhWorker = null;
 		this._pendingGenerate = null;
 		this._buildAsync = false;
+		this._materialUuids = null;
 
 	}
 
@@ -176,9 +177,31 @@ export 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;
+		if ( ! needsMaterialIndexUpdate ) {
+
+			for ( let i = 0, length = materials.length; i < length; i ++ ) {
+
+				const material = materials[ i ];
+				if ( material.uuid !== this._materialUuids[ i ] ) {
+
+					needsMaterialIndexUpdate = true;
+					break;
+
+				}
+
+			}
+
+		}
+
 		const textures = getTextures( materials );
 		const { lights, iesTextures } = getLights( objects );
-		updateMaterialIndexAttribute( geometry, materials, materials );
+		if ( needsMaterialIndexUpdate ) {
+
+			updateMaterialIndexAttribute( geometry, materials, materials );
+			this._materialUuids = materials.map( material => material.uuid );
+
+		}
 
 		// only generate a new bvh if the objects used have changed
 		if ( this.generateBVH ) {
@@ -220,6 +243,7 @@ export class PathTracingSceneGenerator {
 		return {
 			bvhChanged: result.changeType !== NO_CHANGE,
 			bvh: this.bvh,
+			needsMaterialIndexUpdate,
 			lights,
 			iesTextures,
 			geometry,

diff --git a/src/core/WebGLPathTracer.js b/src/core/WebGLPathTracer.js
@@ -343,6 +343,7 @@ export class WebGLPathTracer {
 			geometry,
 			bvh,
 			bvhChanged,
+			needsMaterialIndexUpdate,
 		} = results;
 
 		this._materials = materials;
@@ -362,7 +363,11 @@ export class WebGLPathTracer {
 
 		}
 
-		material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
+		if ( needsMaterialIndexUpdate ) {
+
+			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
+
+		}
 
 		// save previously used items
 		this._previousScene = scene;

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -57,6 +57,7 @@ export interface PathTracingSceneGeneratorResult {
 	lights: Array<Light>;
 	iesTextures: Array<DataTexture>;
 	geometry: BufferGeometry;
+	needsMaterialIndexUpdate: boolean;
 	materials: Array<Material>;
 	textures: Array<Texture>;
 	objects: Array<Object3D>;