three-gpu-pathtracer 0.0.23 → 0.0.24

package/build/index.umd.cjs

@@ -279,7 +279,20 @@
 				const attr = geometry.getAttribute( key );
 	 			if ( ! skip ) {
 
-					copyAttributeContents( attr, targetAttribute, offset );
+					if ( key === 'color' && targetAttribute.itemSize !== attr.itemSize ) {
+
+						// make sure the color attribute is aligned with itemSize 3 to 4
+						for ( let index = offset, l = attr.count; index < l; index ++ ) {
+
+							attr.setXYZW( index, targetAttribute.getX( index ), targetAttribute.getY( index ), targetAttribute.getZ( index ), 1.0 );
+
+						}
+
+					} else {
+
+						copyAttributeContents( attr, targetAttribute, offset );
+
+					}
 
 				}
 
@@ -1317,6 +1330,7 @@
 			this._bvhWorker = null;
 			this._pendingGenerate = null;
 			this._buildAsync = false;
+			this._materialUuids = null;
 
 		}
 
@@ -1398,12 +1412,29 @@
 			// 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$1( materials );
 			const { lights, iesTextures } = getLights$1( objects );
-
-			if ( result.changeType !== NO_CHANGE ) {
+			if ( needsMaterialIndexUpdate ) {
 
 				updateMaterialIndexAttribute( geometry, materials, materials );
+				this._materialUuids = materials.map( material => material.uuid );
 
 			}
 
@@ -1447,6 +1478,7 @@
 			return {
 				bvhChanged: result.changeType !== NO_CHANGE,
 				bvh: this.bvh,
+				needsMaterialIndexUpdate,
 				lights,
 				iesTextures,
 				geometry,
@@ -2874,7 +2906,7 @@
 
 	}
 
-	const MATERIAL_PIXELS = 45;
+	const MATERIAL_PIXELS = 47;
 	const MATERIAL_STRIDE = MATERIAL_PIXELS * 4;
 
 	class MaterialFeatures {
@@ -3299,6 +3331,9 @@
 				// specularIntensityMap transform 43
 				index += writeTextureMatrixToArray( m, 'specularIntensityMap', floatArray, index );
 
+				// alphaMap transform 45
+				index += writeTextureMatrixToArray( m, 'alphaMap', floatArray, index );
+
 			}
 
 			// check if the contents have changed
@@ -4378,6 +4413,7 @@
 		mat3 iridescenceThicknessMapTransform;
 		mat3 specularColorMapTransform;
 		mat3 specularIntensityMapTransform;
+		mat3 alphaMapTransform;
 
 	};
 
@@ -4398,7 +4434,7 @@
 
 	Material readMaterialInfo( sampler2D tex, uint index ) {
 
-		uint i = index * 45u;
+		uint i = index * uint( MATERIAL_PIXELS );
 
 		vec4 s0 = texelFetch1D( tex, i + 0u );
 		vec4 s1 = texelFetch1D( tex, i + 1u );
@@ -4497,6 +4533,7 @@
 		m.iridescenceThicknessMapTransform = m.iridescenceThicknessMap == - 1 ? mat3( 1.0 ) : readTextureTransform( tex, firstTextureTransformIdx + 24u );
 		m.specularColorMapTransform = m.specularColorMap == - 1 ? mat3( 1.0 ) : readTextureTransform( tex, firstTextureTransformIdx + 26u );
 		m.specularIntensityMapTransform = m.specularIntensityMap == - 1 ? mat3( 1.0 ) : readTextureTransform( tex, firstTextureTransformIdx + 28u );
+		m.alphaMapTransform = m.alphaMap == - 1 ? mat3( 1.0 ) : readTextureTransform( tex, firstTextureTransformIdx + 30u );
 
 		return m;
 
@@ -6263,7 +6300,7 @@
 // returns whether the given material is a fog material or not
 bool isMaterialFogVolume( sampler2D materials, uint materialIndex ) {
 
-	uint i = materialIndex * 45u;
+	uint i = materialIndex * uint( MATERIAL_PIXELS );
 	vec4 s14 = texelFetch1D( materials, i + 14u );
 	return bool( int( s14.b ) & 4 );
 
@@ -6493,7 +6530,8 @@ bool bvhIntersectFogVolumeHit(
 				// alphaMap
 				if ( material.alphaMap != - 1 ) {
 
-					albedo.a *= texture2D( textures, vec3( uv, material.alphaMap ) ).x;
+					vec3 uvPrime = material.alphaMapTransform * vec3( uv, 1 );
+					albedo.a *= texture2D( textures, vec3( uvPrime.xy, material.alphaMap ) ).x;
 
 				}
 
@@ -6635,7 +6673,7 @@ bool bvhIntersectFogVolumeHit(
 			vec3 shapeUVW= rand3( 1 );
 			int blades = physicalCamera.apertureBlades;
 			float anamorphicRatio = physicalCamera.anamorphicRatio;
-			vec2 apertureSample = blades == 0 ? sampleCircle( shapeUVW.xy ) : sampleRegularPolygon( blades, shapeUVW );
+			vec2 apertureSample = sampleAperture( blades, shapeUVW );
 			apertureSample *= physicalCamera.bokehSize * 0.5 * 1e-3;
 
 			// rotate the aperture shape
@@ -6805,7 +6843,8 @@ bool bvhIntersectFogVolumeHit(
 		// alphaMap
 		if ( material.alphaMap != - 1 ) {
 
-			albedo.a *= texture2D( textures, vec3( uv, material.alphaMap ) ).x;
+			vec3 uvPrime = material.alphaMapTransform * vec3( uv, 1 );
+			albedo.a *= texture2D( textures, vec3( uvPrime.xy, material.alphaMap ) ).x;
 
 		}
 
@@ -7220,6 +7259,7 @@ bool bvhIntersectFogVolumeHit(
 					ATTR_TANGENT: 1,
 					ATTR_UV: 2,
 					ATTR_COLOR: 3,
+					MATERIAL_PIXELS: MATERIAL_PIXELS,
 				},
 
 				uniforms: {
@@ -8796,7 +8836,7 @@ bool bvhIntersectFogVolumeHit(
 			}
 
 			// update scene environment
-			material.environmentIntensity = scene.environmentIntensity ?? 1;
+			material.environmentIntensity = scene.environment !== null ? ( scene.environmentIntensity ?? 1 ) : 0;
 			material.environmentRotation.makeRotationFromEuler( scene.environmentRotation ).invert();
 			if ( this._previousEnvironment !== scene.environment ) {
 
@@ -8816,10 +8856,6 @@ bool bvhIntersectFogVolumeHit(
 
 					}
 
-				} else {
-
-					material.environmentIntensity = 0;
-
 				}
 
 			}
@@ -8837,6 +8873,7 @@ bool bvhIntersectFogVolumeHit(
 				geometry,
 				bvh,
 				bvhChanged,
+				needsMaterialIndexUpdate,
 			} = results;
 
 			this._materials = materials;
@@ -8854,6 +8891,10 @@ bool bvhIntersectFogVolumeHit(
 					geometry.attributes.color,
 				);
 
+			}
+
+			if ( needsMaterialIndexUpdate ) {
+
 				material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 
 			}
@@ -8984,8 +9025,8 @@ bool bvhIntersectFogVolumeHit(
 
 		dispose() {
 
-			this._renderQuad.dispose();
-			this._renderQuad.material.dispose();
+			this._quad.dispose();
+			this._quad.material.dispose();
 			this._pathTracer.dispose();
 
 		}