Nodes: Only use PMREM for background when blurriness is configured. (#…

…29089) * Nodes: Only use PMREM for background when blurriness is used. * E2E: Update screenshots. * CubeRenderTarget: Fix MRT support. * E2E: Update screenshot.
mrdoob · Aug 8, 2024 · 94a841b · 94a841b
1 parent f71cb7a
commit 94a841b
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 2 deletions.
diff --git a/examples/screenshots/webgpu_clearcoat.jpg b/examples/screenshots/webgpu_clearcoat.jpg
diff --git a/examples/screenshots/webgpu_cubemap_adjustments.jpg b/examples/screenshots/webgpu_cubemap_adjustments.jpg
diff --git a/examples/screenshots/webgpu_cubemap_dynamic.jpg b/examples/screenshots/webgpu_cubemap_dynamic.jpg
diff --git a/examples/screenshots/webgpu_lightprobe.jpg b/examples/screenshots/webgpu_lightprobe.jpg
diff --git a/examples/screenshots/webgpu_loader_gltf.jpg b/examples/screenshots/webgpu_loader_gltf.jpg
diff --git a/examples/screenshots/webgpu_loader_gltf_iridescence.jpg b/examples/screenshots/webgpu_loader_gltf_iridescence.jpg
diff --git a/examples/screenshots/webgpu_loader_gltf_sheen.jpg b/examples/screenshots/webgpu_loader_gltf_sheen.jpg
diff --git a/examples/screenshots/webgpu_loader_materialx.jpg b/examples/screenshots/webgpu_loader_materialx.jpg
diff --git a/examples/screenshots/webgpu_materials_basic.jpg b/examples/screenshots/webgpu_materials_basic.jpg
diff --git a/examples/screenshots/webgpu_materials_envmaps.jpg b/examples/screenshots/webgpu_materials_envmaps.jpg
diff --git a/examples/screenshots/webgpu_materials_transmission.jpg b/examples/screenshots/webgpu_materials_transmission.jpg
diff --git a/examples/screenshots/webgpu_mrt.jpg b/examples/screenshots/webgpu_mrt.jpg
diff --git a/examples/screenshots/webgpu_parallax_uv.jpg b/examples/screenshots/webgpu_parallax_uv.jpg
diff --git a/examples/screenshots/webgpu_postprocessing_3dlut.jpg b/examples/screenshots/webgpu_postprocessing_3dlut.jpg
diff --git a/src/renderers/common/CubeRenderTarget.js b/src/renderers/common/CubeRenderTarget.js
@@ -54,8 +54,14 @@ class CubeRenderTarget extends WebGLCubeRenderTarget {
 		if ( texture.minFilter === LinearMipmapLinearFilter ) texture.minFilter = LinearFilter;
 
 		const camera = new CubeCamera( 1, 10, this );
+
+		const currentMRT = renderer.getMRT();
+		renderer.setMRT( null );
+
 		camera.update( renderer, scene );
 
+		renderer.setMRT( currentMRT );
+
 		texture.minFilter = currentMinFilter;
 		texture.currentGenerateMipmaps = currentGenerateMipmaps;
 

diff --git a/src/renderers/common/nodes/Nodes.js b/src/renderers/common/nodes/Nodes.js
@@ -1,6 +1,7 @@
 import DataMap from '../DataMap.js';
 import ChainMap from '../ChainMap.js';
 import NodeBuilderState from './NodeBuilderState.js';
+import { cubeMapNode } from '../../../nodes/utils/CubeMapNode.js';
 import { NodeFrame, objectGroup, renderGroup, frameGroup, cubeTexture, texture, rangeFog, densityFog, reference, viewportBottomLeft, normalWorld, pmremTexture, viewportTopLeft } from '../../../nodes/Nodes.js';
 
 import { EquirectangularReflectionMapping, EquirectangularRefractionMapping } from '../../../constants.js';
@@ -264,13 +265,35 @@ class Nodes extends DataMap {
 
 		if ( background ) {
 
-			if ( sceneData.background !== background ) {
+			const forceUpdate = ( scene.backgroundBlurriness === 0 && sceneData.backgroundBlurriness > 0 ) || ( scene.backgroundBlurriness > 0 && sceneData.backgroundBlurriness === 0 );
+
+			if ( sceneData.background !== background || forceUpdate ) {
 
 				let backgroundNode = null;
 
 				if ( background.isCubeTexture === true || ( background.mapping === EquirectangularReflectionMapping || background.mapping === EquirectangularRefractionMapping ) ) {
 
-					backgroundNode = pmremTexture( background, normalWorld );
+					if ( scene.backgroundBlurriness > 0 ) {
+
+						backgroundNode = pmremTexture( background, normalWorld );
+
+					} else {
+
+						let envMap;
+
+						if ( background.isCubeTexture === true ) {
+
+							envMap = cubeTexture( background );
+
+						} else {
+
+							envMap = texture( background );
+
+						}
+
+						backgroundNode = cubeMapNode( envMap );
+
+					}
 
 				} else if ( background.isTexture === true ) {
 
@@ -284,6 +307,7 @@ class Nodes extends DataMap {
 
 				sceneData.backgroundNode = backgroundNode;
 				sceneData.background = background;
+				sceneData.backgroundBlurriness = scene.backgroundBlurriness;
 
 			}