Change default exposure, adjust a few examples

crates/bevy_pbr/src/light.rs

@@ -555,7 +555,7 @@ fn calculate_cascade(
 /// # use bevy_ecs::system::ResMut;
 /// # use bevy_pbr::AmbientLight;
 /// fn setup_ambient_light(mut ambient_light: ResMut<AmbientLight>) {
-///    ambient_light.brightness = 0.3;
+///    ambient_light.brightness = 20.0;
 /// }
 /// ```
 #[derive(Resource, Clone, Debug, ExtractResource, Reflect)]
@@ -570,7 +570,7 @@ impl Default for AmbientLight {
     fn default() -> Self {
         Self {
             color: Color::rgb(1.0, 1.0, 1.0),
-            brightness: 0.05,
+            brightness: 8.0,
         }
     }
 }

crates/bevy_pbr/src/render/pbr_functions.wgsl

@@ -418,7 +418,7 @@ fn apply_fog(fog_params: mesh_view_types::Fog, input_color: vec4<f32>, fragment_
                     0.0
                 ),
                 fog_params.directional_light_exponent
-            ) * light.color.rgb;
+            ) * light.color.rgb * view_bindings::view.exposure;
         }
     }
 

crates/bevy_pbr/src/render/pbr_transmission.wgsl

@@ -42,6 +42,9 @@ fn specular_transmissive_light(world_position: vec4<f32>, frag_coord: vec3<f32>,
         background_color = fetch_transmissive_background(offset_position, frag_coord, view_z, perceptual_roughness);
     }
 
+    // Compensate for exposure, since the background color is coming from an already exposure-adjusted texture
+    background_color = vec4(background_color.rgb / view_bindings::view.exposure, background_color.a);
+
     // Dot product of the refracted direction with the exit normal (Note: We assume the exit normal is the entry normal but inverted)
     let MinusNdotT = dot(-N, T);
 

crates/bevy_render/src/camera/camera.rs

@@ -110,7 +110,7 @@ impl ExposureSettings {
 impl Default for ExposureSettings {
     fn default() -> Self {
         Self {
-            ev100: Self::EV100_OVERCAST,
+            ev100: Self::EV100_INDOOR,
         }
     }
 }
@@ -138,8 +138,8 @@ impl PhysicalCameraParameters {
 impl Default for PhysicalCameraParameters {
     fn default() -> Self {
         Self {
-            aperture_f_stops: 4.0,
-            shutter_speed_s: 1.0 / 250.0,
+            aperture_f_stops: 1.0,
+            shutter_speed_s: 1.0 / 125.0,
             sensitivity_iso: 100.0,
         }
     }

examples/3d/3d_gizmos.rs

@@ -37,7 +37,7 @@ fn setup(
     // light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
+            intensity: 250000.0,
             shadows_enabled: true,
             ..default()
         },

examples/3d/3d_scene.rs

@@ -32,7 +32,7 @@ fn setup(
     // light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
+            intensity: 250_000.0,
             shadows_enabled: true,
             ..default()
         },

examples/3d/3d_shapes.rs

@@ -64,7 +64,7 @@ fn setup(
 
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 9000.0,
+            intensity: 1500000.0,
             range: 100.,
             shadows_enabled: true,
             ..default()

examples/3d/3d_viewport_to_world.rs

@@ -61,6 +61,10 @@ fn setup(
     // light
     commands.spawn(DirectionalLightBundle {
         transform: Transform::from_translation(Vec3::ONE).looking_at(Vec3::ZERO, Vec3::Y),
+        directional_light: DirectionalLight {
+            illuminance: 2000.0,
+            ..default()
+        },
         ..default()
     });
 

examples/3d/anti_aliasing.rs

@@ -288,6 +288,7 @@ fn setup(
     // Light
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
+            illuminance: 3000.0,
             shadows_enabled: true,
             ..default()
         },
@@ -324,6 +325,7 @@ fn setup(
         EnvironmentMapLight {
             diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
             specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
+            intensity: 150.0,
         },
         FogSettings {
             color: Color::rgba_u8(43, 44, 47, 255),

examples/3d/atmospheric_fog.rs

@@ -61,6 +61,7 @@ fn setup_terrain_scene(
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
             color: Color::rgb(0.98, 0.95, 0.82),
+            illuminance: 3000.0,
             shadows_enabled: true,
             ..default()
         },

examples/3d/blend_modes.rs

@@ -174,6 +174,10 @@ fn setup(
 
     // Light
     commands.spawn(PointLightBundle {
+        point_light: PointLight {
+            intensity: 150_000.0,
+            ..default()
+        },
         transform: Transform::from_xyz(4.0, 8.0, 4.0),
         ..default()
     });

examples/3d/bloom_3d.rs

@@ -39,15 +39,15 @@ fn setup_scene(
     ));
 
     let material_emissive1 = materials.add(StandardMaterial {
-        emissive: Color::rgb_linear(13.99, 5.32, 2.0), // 4. Put something bright in a dark environment to see the effect
+        emissive: Color::rgb_linear(2300.0, 900.0, 300.0), // 4. Put something bright in a dark environment to see the effect
         ..default()
     });
     let material_emissive2 = materials.add(StandardMaterial {
-        emissive: Color::rgb_linear(2.0, 13.99, 5.32),
+        emissive: Color::rgb_linear(300.0, 2300.0, 900.0),
         ..default()
     });
     let material_emissive3 = materials.add(StandardMaterial {
-        emissive: Color::rgb_linear(5.32, 2.0, 13.99),
+        emissive: Color::rgb_linear(900.0, 300.0, 2300.0),
         ..default()
     });
     let material_non_emissive = materials.add(StandardMaterial {

examples/3d/deferred_rendering.rs

@@ -62,6 +62,7 @@ fn setup(
         EnvironmentMapLight {
             diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
             specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
+            intensity: 150.0,
         },
         DepthPrepass,
         MotionVectorPrepass,
@@ -71,6 +72,7 @@ fn setup(
 
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
+            illuminance: 4000.0,
             shadows_enabled: true,
             ..default()
         },
@@ -145,7 +147,7 @@ fn setup(
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1.0,
+            intensity: 150.0,
             radius: 0.125,
             shadows_enabled: true,
             color: sphere_color,

examples/3d/fog.rs

@@ -128,7 +128,7 @@ fn setup_pyramid_scene(
     commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(0.0, 1.0, 0.0),
         point_light: PointLight {
-            intensity: 1500.,
+            intensity: 300_000.,
             range: 100.,
             shadows_enabled: true,
             ..default()

examples/3d/generate_custom_mesh.rs

@@ -56,7 +56,7 @@ fn setup(
     // Light up the scene.
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1000.0,
+            intensity: 100_000.0,
             range: 100.0,
             ..default()
         },

examples/3d/lighting.rs

@@ -12,7 +12,11 @@ use bevy::{
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .init_resource::<Parameters>()
+        .insert_resource(Parameters(PhysicalCameraParameters {
+            aperture_f_stops: 1.0,
+            shutter_speed_s: 1.0 / 15.0,
+            sensitivity_iso: 400.0,
+        }))
         .add_systems(Startup, setup)
         .add_systems(Update, (update_exposure, movement, animate_light_direction))
         .run();
@@ -131,7 +135,7 @@ fn setup(
             // transform: Transform::from_xyz(5.0, 8.0, 2.0),
             transform: Transform::from_xyz(1.0, 2.0, 0.0),
             point_light: PointLight {
-                intensity: 1600.0, // lumens - roughly a 100W non-halogen incandescent bulb
+                intensity: 4000.0, // lumens - roughly a 300W non-halogen incandescent bulb
                 color: Color::RED,
                 shadows_enabled: true,
                 ..default()
@@ -159,7 +163,7 @@ fn setup(
             transform: Transform::from_xyz(-1.0, 2.0, 0.0)
                 .looking_at(Vec3::new(-1.0, 0.0, 0.0), Vec3::Z),
             spot_light: SpotLight {
-                intensity: 1600.0, // lumens - roughly a 100W non-halogen incandescent bulb
+                intensity: 4000.0, // lumens - roughly a 300W non-halogen incandescent bulb
                 color: Color::GREEN,
                 shadows_enabled: true,
                 inner_angle: 0.6,
@@ -191,7 +195,7 @@ fn setup(
             // transform: Transform::from_xyz(5.0, 8.0, 2.0),
             transform: Transform::from_xyz(0.0, 4.0, 0.0),
             point_light: PointLight {
-                intensity: 1600.0, // lumens - roughly a 100W non-halogen incandescent bulb
+                intensity: 4000.0, // lumens - roughly a 300W non-halogen incandescent bulb
                 color: Color::BLUE,
                 shadows_enabled: true,
                 ..default()
@@ -216,7 +220,7 @@ fn setup(
     // directional 'sun' light
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
-            illuminance: 1000.0,
+            illuminance: 100.0,
             shadows_enabled: true,
             ..default()
         },
@@ -287,7 +291,7 @@ fn setup(
 }
 
 fn update_exposure(
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<ButtonInput<KeyCode>>,
     mut parameters: ResMut<Parameters>,
     mut query: Query<&mut ExposureSettings>,
     mut text: Query<&mut Text>,

examples/3d/load_gltf.rs

@@ -25,12 +25,13 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         EnvironmentMapLight {
             diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
             specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
-            intensity: 1.0,
+            intensity: 150.0,
         },
     ));
 
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
+            illuminance: 2000.0,
             shadows_enabled: true,
             ..default()
         },

examples/3d/orthographic.rs

@@ -61,6 +61,10 @@ fn setup(
     // light
     commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(3.0, 8.0, 5.0),
+        point_light: PointLight {
+            intensity: 150_000.0,
+            ..default()
+        },
         ..default()
     });
 }

examples/3d/parallax_mapping.rs

@@ -225,7 +225,7 @@ fn setup(
         .spawn(PointLightBundle {
             transform: Transform::from_xyz(1.8, 0.7, -1.1),
             point_light: PointLight {
-                intensity: 226.0,
+                intensity: 50_000.0,
                 shadows_enabled: true,
                 ..default()
             },

examples/3d/parenting.rs

@@ -57,6 +57,10 @@ fn setup(
     // light
     commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(4.0, 5.0, -4.0),
+        point_light: PointLight {
+            intensity: 150_000.0,
+            ..default()
+        },
         ..default()
     });
     // camera

examples/3d/pbr.rs

@@ -61,7 +61,7 @@ fn setup(
     commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(50.0, 50.0, 50.0),
         point_light: PointLight {
-            intensity: 600000.,
+            intensity: 100_000_000.,
             range: 100.,
             ..default()
         },
@@ -138,7 +138,7 @@ fn setup(
         EnvironmentMapLight {
             diffuse_map: asset_server.load("environment_maps/pisa_diffuse_rgb9e5_zstd.ktx2"),
             specular_map: asset_server.load("environment_maps/pisa_specular_rgb9e5_zstd.ktx2"),
-            intensity: 1.0,
+            intensity: 150.0,
         },
     ));
 }

examples/3d/render_to_texture.rs

@@ -93,6 +93,10 @@ fn setup(
     commands.spawn((
         PointLightBundle {
             transform: Transform::from_translation(Vec3::new(0.0, 0.0, 10.0)),
+            point_light: PointLight {
+                intensity: 150_000.0,
+                ..default()
+            },
             ..default()
         },
         RenderLayers::all(),

examples/3d/shadow_biases.rs

@@ -72,7 +72,7 @@ fn setup(
             });
             builder.spawn(DirectionalLightBundle {
                 directional_light: DirectionalLight {
-                    illuminance: 100000.0,
+                    illuminance: 1500.0,
                     shadow_depth_bias: 0.0,
                     shadow_normal_bias: 0.0,
                     shadows_enabled: true,
@@ -196,15 +196,15 @@ fn toggle_light(
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 example_text.single_mut().sections[5].value = "PointLight".to_string();
-                100000000.0
+                500_000.0
             } else {
                 0.0
             };
         }
         for mut light in &mut directional_lights {
             light.illuminance = if light.illuminance == 0.0 {
                 example_text.single_mut().sections[5].value = "DirectionalLight".to_string();
-                100000.0
+                1500.0
             } else {
                 0.0
             };

examples/3d/shadow_caster_receiver.rs

@@ -98,7 +98,7 @@ fn setup(
 
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
-            illuminance: 100000.0,
+            illuminance: 1500.0,
             shadows_enabled: true,
             ..default()
         },
@@ -134,15 +134,15 @@ fn toggle_light(
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 println!("Using PointLight");
-                100000000.0
+                500_000.0
             } else {
                 0.0
             };
         }
         for mut light in &mut directional_lights {
             light.illuminance = if light.illuminance == 0.0 {
                 println!("Using DirectionalLight");
-                100000.0
+                1500.0
             } else {
                 0.0
             };

examples/3d/skybox.rs

@@ -77,7 +77,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
         CameraController::default(),
         Skybox {
             image: skybox_handle.clone(),
-            brightness: 1.0,
+            brightness: 150.0,
         },
     ));