Examples: Updated exposure in examples using ACESFilmicToneMapping.

mrdoob · Jun 21, 2020 · da8dad4 · da8dad4
1 parent d5df717
commit da8dad4
Show file tree

Hide file tree

Showing 26 changed files with 20 additions and 22 deletions.
diff --git a/examples/screenshots/webgl_loader_gltf_extensions.jpg b/examples/screenshots/webgl_loader_gltf_extensions.jpg
diff --git a/examples/screenshots/webgl_materials_car.jpg b/examples/screenshots/webgl_materials_car.jpg
diff --git a/examples/screenshots/webgl_materials_envmaps_exr.jpg b/examples/screenshots/webgl_materials_envmaps_exr.jpg
diff --git a/examples/screenshots/webgl_materials_envmaps_hdr.jpg b/examples/screenshots/webgl_materials_envmaps_hdr.jpg
diff --git a/examples/screenshots/webgl_materials_envmaps_hdr_nodes.jpg b/examples/screenshots/webgl_materials_envmaps_hdr_nodes.jpg
diff --git a/examples/screenshots/webgl_materials_envmaps_pmrem_nodes.jpg b/examples/screenshots/webgl_materials_envmaps_pmrem_nodes.jpg
diff --git a/examples/screenshots/webgl_materials_physical_clearcoat.jpg b/examples/screenshots/webgl_materials_physical_clearcoat.jpg
diff --git a/examples/screenshots/webgl_materials_physical_transparency.jpg b/examples/screenshots/webgl_materials_physical_transparency.jpg
diff --git a/examples/screenshots/webgl_materials_variations_physical.jpg b/examples/screenshots/webgl_materials_variations_physical.jpg
diff --git a/examples/screenshots/webgl_materials_variations_standard.jpg b/examples/screenshots/webgl_materials_variations_standard.jpg
diff --git a/examples/screenshots/webgl_pmrem_test.jpg b/examples/screenshots/webgl_pmrem_test.jpg
diff --git a/examples/screenshots/webgl_shaders_sky.jpg b/examples/screenshots/webgl_shaders_sky.jpg
diff --git a/examples/screenshots/webgl_tonemapping.jpg b/examples/screenshots/webgl_tonemapping.jpg
diff --git a/examples/webgl_loader_gltf.html b/examples/webgl_loader_gltf.html
@@ -87,7 +87,6 @@
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 1;
 				renderer.outputEncoding = THREE.sRGBEncoding;
 				container.appendChild( renderer.domElement );
 

diff --git a/examples/webgl_loader_gltf_extensions.html b/examples/webgl_loader_gltf_extensions.html
@@ -150,7 +150,6 @@
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.outputEncoding = THREE.sRGBEncoding;
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 1.25;
 				renderer.physicallyCorrectLights = true;
 				document.body.appendChild( renderer.domElement );
 

diff --git a/examples/webgl_materials_car.html b/examples/webgl_materials_car.html
@@ -60,7 +60,7 @@
 				renderer.setAnimationLoop( render );
 				renderer.outputEncoding = THREE.sRGBEncoding;
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 1.25;
+				renderer.toneMappingExposure = 0.85;
 				container.appendChild( renderer.domElement );
 
 				window.addEventListener( 'resize', onWindowResize, false );
@@ -71,7 +71,7 @@
 				//
 
 				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 0.1, 100 );
-				camera.position.set( 3.5, 2, - 4.5 );
+				camera.position.set( 4.25, 1.4, - 4.5 );
 
 				controls = new OrbitControls( camera, container );
 				controls.target.set( 0, 0.5, 0 );
@@ -128,6 +128,8 @@
 
 				// Car
 
+				var shadow = new THREE.TextureLoader().load( 'models/gltf/ferrari_ao.png' );
+
 				var dracoLoader = new DRACOLoader();
 				dracoLoader.setDecoderPath( 'js/libs/draco/gltf/' );
 
@@ -156,16 +158,15 @@
 					);
 
 					// shadow
-					var texture = new THREE.TextureLoader().load( 'models/gltf/ferrari_ao.png' );
-					var shadow = new THREE.Mesh(
+					var mesh = new THREE.Mesh(
 						new THREE.PlaneBufferGeometry( 0.655 * 4, 1.3 * 4 ),
 						new THREE.MeshBasicMaterial( {
-							map: texture, blending: THREE.MultiplyBlending, toneMapped: false, transparent: true
+							map: shadow, blending: THREE.MultiplyBlending, toneMapped: false, transparent: true
 						} )
 					);
-					shadow.rotation.x = - Math.PI / 2;
-					shadow.renderOrder = 2;
-					carModel.add( shadow );
+					mesh.rotation.x = - Math.PI / 2;
+					mesh.renderOrder = 2;
+					carModel.add( mesh );
 
 					scene.add( carModel );
 

diff --git a/examples/webgl_materials_envmaps_exr.html b/examples/webgl_materials_envmaps_exr.html
@@ -25,7 +25,7 @@
 				envMap: 'EXR',
 				roughness: 0.0,
 				metalness: 0.0,
-				exposure: 2.0,
+				exposure: 1.0,
 				debug: false,
 			};
 

diff --git a/examples/webgl_materials_envmaps_hdr.html b/examples/webgl_materials_envmaps_hdr.html
@@ -28,7 +28,7 @@
 				envMap: 'HDR',
 				roughness: 0.0,
 				metalness: 0.0,
-				exposure: 2.0,
+				exposure: 1.0,
 				debug: false
 			};
 

diff --git a/examples/webgl_materials_envmaps_hdr_nodes.html b/examples/webgl_materials_envmaps_hdr_nodes.html
@@ -30,7 +30,7 @@
 				envMap: 'HDR',
 				roughness: 0.0,
 				metalness: 0.0,
-				exposure: 2.0,
+				exposure: 1.0,
 				nodes: true,
 				animate: true,
 				debug: false

diff --git a/examples/webgl_materials_envmaps_pmrem_nodes.html b/examples/webgl_materials_envmaps_pmrem_nodes.html
@@ -52,7 +52,7 @@
 			var params = {
 				roughness: 0.0,
 				metalness: 0.0,
-				exposure: 2.0,
+				exposure: 1.0,
 				intensity: 1.0,
 				animate: true,
 				debug: false

diff --git a/examples/webgl_materials_physical_clearcoat.html b/examples/webgl_materials_physical_clearcoat.html
@@ -176,7 +176,7 @@
 				//
 
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 2;
+				renderer.toneMappingExposure = 1.25;
 
 				//
 

diff --git a/examples/webgl_materials_variations_physical.html b/examples/webgl_materials_variations_physical.html
@@ -159,7 +159,7 @@
 
 				renderer.outputEncoding = THREE.sRGBEncoding;
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 1;
+				renderer.toneMappingExposure = 0.75;
 
 				//
 

diff --git a/examples/webgl_materials_variations_standard.html b/examples/webgl_materials_variations_standard.html
@@ -164,7 +164,7 @@
 
 				renderer.outputEncoding = THREE.sRGBEncoding;
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 1;
+				renderer.toneMappingExposure = 0.75;
 
 				//
 

diff --git a/examples/webgl_pmrem_test.html b/examples/webgl_pmrem_test.html
@@ -46,7 +46,6 @@
 
 				// tonemapping
 				renderer.toneMapping = THREE.ACESFilmicToneMapping;
-				renderer.toneMappingExposure = 1.75;
 
 				document.body.appendChild( renderer.domElement );
 

diff --git a/examples/webgl_shaders_sky.html b/examples/webgl_shaders_sky.html
@@ -39,9 +39,9 @@
 
 				var effectController = {
 					turbidity: 10,
-					rayleigh: 2,
+					rayleigh: 3,
 					mieCoefficient: 0.005,
-					mieDirectionalG: 0.8,
+					mieDirectionalG: 0.7,
 					inclination: 0.49, // elevation / inclination
 					azimuth: 0.25, // Facing front,
 					exposure: renderer.toneMappingExposure
@@ -71,7 +71,7 @@
 
 				var gui = new GUI();
 
-				gui.add( effectController, "turbidity", 1.0, 20.0, 0.1 ).onChange( guiChanged );
+				gui.add( effectController, "turbidity", 0.0, 20.0, 0.1 ).onChange( guiChanged );
 				gui.add( effectController, "rayleigh", 0.0, 4, 0.001 ).onChange( guiChanged );
 				gui.add( effectController, "mieCoefficient", 0.0, 0.1, 0.001 ).onChange( guiChanged );
 				gui.add( effectController, "mieDirectionalG", 0.0, 1, 0.001 ).onChange( guiChanged );

diff --git a/examples/webgl_tonemapping.html b/examples/webgl_tonemapping.html
@@ -28,7 +28,7 @@
 			var gui, guiExposure = null;
 
 			var params = {
-				exposure: 1.5,
+				exposure: 1.0,
 				toneMapping: 'ACESFilmic'
 			};