Merge pull request #539 from gkjohnson/fixes

Fixes

Author: gkjohnson

package-lock.json

@@ -42,7 +42,7 @@
     "rollup": "^2.70.0",
     "simple-git": "^3.10.0",
     "three": "^0.160.0",
-    "three-mesh-bvh": "0.7.2",
+    "three-mesh-bvh": "0.7.3",
     "yargs": "^17.5.1"
   },
   "peerDependencies": {

package.json

@@ -309,7 +309,10 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 					// inverse environment rotation
 					envRotation3x3 = mat3( environmentRotation );
 					invEnvRotation3x3 = inverse( envRotation3x3 );
-					lightsDenom = environmentIntensity == 0.0 && lights.count != 0u ? float( lights.count ) : float( lights.count + 1u );
+					lightsDenom =
+						( environmentIntensity == 0.0 || envMapInfo.totalSum == 0.0 ) && lights.count != 0u ?
+							float( lights.count ) :
+							float( lights.count + 1u );
 
 					// final color
 					gl_FragColor = vec4( 0, 0, 0, 1 );

src/materials/pathtracing/PhysicalPathTracingMaterial.js

@@ -43,7 +43,7 @@ export const directLightContributionGLSL = /*glsl*/`
 
 			}
 
-		} else {
+		} else if ( envMapInfo.totalSum != 0.0 && environmentIntensity != 0.0 ) {
 
 			// find a sample in the environment map to include in the contribution
 			vec3 envColor, envDirection;

src/materials/pathtracing/glsl/directLightContribution.glsl.js

@@ -26,10 +26,17 @@ export const equirectSamplingGLSL = /* glsl */`
 	// samples the color given env map with CDF and returns the pdf of the direction
 	float sampleEquirect( vec3 direction, inout vec3 color ) {
 
+		float totalSum = envMapInfo.totalSum;
+		if ( totalSum == 0.0 ) {
+
+			color = vec3( 0.0 );
+			return 1.0;
+
+		}
+
 		vec2 uv = equirectDirectionToUv( direction );
 		color = texture2D( envMapInfo.map, uv ).rgb;
 
-		float totalSum = envMapInfo.totalSum;
 		float lum = luminance( color );
 		ivec2 resolution = textureSize( envMapInfo.map, 0 );
 		float pdf = lum / totalSum;

src/shader/sampling/equirectSampling.glsl.js

@@ -58,7 +58,7 @@ export class LightsInfoUniformStruct {
 			let index = 0;
 
 			// initialize to 0
-			for ( let p = 0; p < LIGHT_PIXELS; p ++ ) {
+			for ( let p = 0; p < LIGHT_PIXELS * 4; p ++ ) {
 
 				floatArray[ baseIndex + p ] = 0;
 

src/uniforms/LightsInfoUniformStruct.js

@@ -186,7 +186,7 @@ export class MaterialsTexture extends DataTexture {
 
 		let index = 0;
 		const pixelCount = materials.length * MATERIAL_PIXELS;
-		const dimension = Math.ceil( Math.sqrt( pixelCount ) );
+		const dimension = Math.ceil( Math.sqrt( pixelCount ) ) || 1;
 		const { threeCompatibilityTransforms, image, features } = this;
 
 		// get the list of textures with unique sources