Change light defaults & fix light examples #11581

doonv · 2024-01-28T14:51:01Z

Objective

Solution

Fix the examples, add a few constants to make setting light values easier, and change the default lighting settings to be more realistic. (Now designed for an overcast day instead of an indoor environment)

I did not include any example-related changes in here.

Changelogs (not including breaking changes)

bevy_pbr

Added light_consts module (included in prelude), which contains common lux and lumen values for lights.
Added AmbientLight::NONE constant, which is an ambient light with a brightness of 0.
Added non-EV100 variants for ExposureSettings's EV100 constants, which allow easier construction of an ExposureSettings from a EV100 constant.

Breaking changes

bevy_pbr

The several default lighting values were changed:

PointLight's default intensity is now 2000.0
SpotLight's default intensity is now 2000.0
DirectionalLight's default illuminance is now light_consts::lux::OVERCAST_DAY (1000.)
AmbientLight's default brightness is now 20.0

mockersf · 2024-01-28T15:10:14Z

to fix #11577, you should also change the defaults so that the default values for lights work with the default values for exposure

doonv · 2024-01-28T15:13:53Z

you should also change the defaults so that the default values for lights work with the default values for exposure

I can't really, the default camera's exposure is designed for full sunlight while the point lights act similarly to real lightbulbs. And because of that the point lights are really dim. Theres nothing I can really do to make everything look good without compromising on realism or visual quality.

alice-i-cecile

I really like the addition of the human-scale constants. I can give these examples a look before the release to give you the final approval if needed too,

mockersf · 2024-01-28T15:43:07Z

you should also change the defaults so that the default values for lights work with the default values for exposure

I can't really, the default camera's exposure is designed for full sunlight while the point lights act similarly to real lightbulbs. And because of that the point lights are really dim. Theres nothing I can really do to make everything look good without compromising on realism or visual quality.

The default ExposureSettings is EV100_INDOOR, is that full sunlight?

bevy/crates/bevy_render/src/camera/camera.rs

Lines 116 to 122 in 397d111

 impl Default for ExposureSettings { 

 fn default() -> Self { 

 Self { 

 ev100: Self::EV100_INDOOR, 

 } 

 } 

 }

If the default exposure is for the full sunlight, then the default directional light should be full sunlight, and the one used in examples. otherwise we should change the default exposure to be indoor so that it works correctly with point light, and use point lights in the examples

the default for exposure and for lights should make sense together, and be used in examples

doonv · 2024-01-28T15:52:34Z

ah my bad, I just assumed it would be for full sunlight (why else would the point lights be that bright).

doonv · 2024-01-28T15:53:20Z

I do think we should use EV100_OVERCAST instead, as it's more a middleground between indoor lighting and outdoor lighting

mockersf · 2024-01-28T16:51:57Z

I do think we should use EV100_OVERCAST instead, as it's more a middleground between indoor lighting and outdoor lighting

no strong opinion on my side, as long as the defaults make sense together 🙂

alice-i-cecile · 2024-01-28T19:21:05Z

I like the overcast as a default, and agreed that we should ensure all of our default values look sensible together.

github-actions · 2024-01-28T19:47:53Z

It looks like your PR is a breaking change, but you didn't provide a migration guide.

Could you add some context on what users should update when this change get released in a new version of Bevy?
It will be used to help writing the migration guide for the version. Putting it after a ## Migration Guide will help it get automatically picked up by our tooling.

crates/bevy_pbr/src/light.rs

GitGhillie

I don't have time to fully review this PR right now (the consts seem like a good addition though) but I do know some examples still need adjusting. Here's a list of all the examples with lights that I know of:

Examples list

Category Name
3d 3d_gizmos
3d 3d_scene
3d 3d_shapes
3d 3d_viewport_to_world
3d anti_aliasing
3d atmospheric_fog
3d blend_modes
3d bloom_3d
3d deferred_rendering
3d fog
3d generate_custom_mesh
3d lighting
3d lines
3d load_gltf
3d orthographic
3d parallax_mapping
3d parenting
3d pbr
3d render_to_texture
3d shadow_biases
3d shadow_caster_receiver
3d skybox
3d spherical_area_lights
3d split_screen
3d spotlight
3d ssao
3d tonemapping
3d transmission
3d transparency_3d
3d two_passes
3d update_gltf_scene
3d vertex_colors
3d wireframe
animation animated_fox
animation animated_transform
animation cubic_curve
animation custom_skinned_mesh
animation gltf_skinned_mesh
animation morph_targets
asset asset_loading
asset hot_asset_reloading
audio spatial_audio_3d
ecs iter_combinations
games alien_cake_addict
mobile bevy_mobile_example
shader array_texture
shader extended_material
shader post_processing
shader shader_material_screenspace_texture
shader shader_prepass
stress_tests many_cubes
stress_tests many_foxes
stress_tests many_lights
tools scene_viewer
ui render_to_texture
transforms 3d_rotation
transforms scale
transforms transform
transforms translation
window low_power
window multiple_windows
window screenshot

GitGhillie · 2024-01-29T22:34:35Z

For those who haven't seen it this was the reasoning behind changing the default exposure to indoors: #8407 (comment)
But in the end the default exposure is pretty much arbitrary + small effort to add ExposureSettings::INDOOR so I don't have a strong opinion there

crates/bevy_pbr/src/light.rs

doonv · 2024-01-30T11:24:09Z

For those who haven't seen it this was the reasoning behind changing the default exposure to indoors: #8407 (comment) But in the end the default exposure is pretty much arbitrary + small effort to add ExposureSettings::INDOOR so I don't have a strong opinion there

I like the reasoning used there, so I think I'll revert the change and use INDOOR again.

GitGhillie · 2024-02-02T16:46:03Z

While I think this PR is a step in the right direction if I follow the steps listed here I'm not sure it actually fixes #11577. Maybe there is a deeper issue? Edit: Or the distances to the pointlights before this PR were just large

doonv · 2024-02-02T17:15:14Z

The deeper issue is that the examples are trying to use point lights as a sun, instead of a DirectionalLight. And obviously your average bulb light isn't as powerful as the sun.

JMS55 · 2024-02-05T05:58:43Z

What's the current state of this PR?

doonv · 2024-02-05T11:02:49Z

What's the current state of this PR?

Ready to merge I think. But I might have missed examples outside of the 3d examples. I'll check the other examples later.

GitGhillie

Looks good to me overall, just some minor notes here and there.

I do feel like the directional lights make the examples look less appealing in general. See for example cubic_curve where the ground plane turns from a nice gradient to a single color:

Not sure how I feel about it yet. Not a blocker though!

crates/bevy_pbr/src/light.rs

examples/3d/bloom_3d.rs

examples/3d/fog.rs

examples/3d/lightmaps.rs

examples/3d/spherical_area_lights.rs

examples/3d/transmission.rs

examples/3d/transparency_3d.rs

examples/3d/wireframe.rs

fintelia · 2024-02-13T22:28:15Z

crates/bevy_render/src/camera/camera.rs

+ pub const INDOOR: Self = Self {
+ ev100: Self::EV100_INDOOR,
+ };
+
 pub const EV100_SUNLIGHT: f32 = 15.0;
 pub const EV100_OVERCAST: f32 = 12.0;
 pub const EV100_INDOOR: f32 = 7.0;


Might be worth creating several constants for indoor lighting. The linked wikipedia article says:

Sports events, stage shows, and the like = 8–9
Offices and work areas = 7–8
Home interiors = 5–7

I kind of like the current granularity. Something like "office" feels too specific to be correct. All of these will be +- 2 or 3. Anyone manually setting exposure will likely be doing it artistically / without exact constants anyway.

cart · 2024-02-14T22:01:22Z

I do feel like the directional lights make the examples look less appealing in general. See for example cubic_curve where the ground plane turns from a nice gradient to a single color:

I do agree with this. I think (for now) I'll revert these in most cases in the interest of render quality. Both the shadows and shading take a quality / interest-level hit.

# Objective After adding configurable exposure, we set the default ev100 value to `7` (indoor). This brought us out of sync with Blender's configuration and defaults. This PR changes the default to `9.7` (bright indoor or very overcast outdoors), as I calibrated in #11577. This feels like a very reasonable default. The other changes generally center around tweaking Bevy's lighting defaults and examples to play nicely with this number, alongside a few other tweaks and improvements. Note that for artistic reasons I have reverted some examples, which changed to directional lights in #11581, back to point lights. Fixes #11577 --- ## Changelog - Changed `Exposure::ev100` from `7` to `9.7` to better match Blender - Renamed `ExposureSettings` to `Exposure` - `Camera3dBundle` now includes `Exposure` for discoverability - Bumped `FULL_DAYLIGHT ` and `DIRECT_SUNLIGHT` to represent the middle-to-top of those ranges instead of near the bottom - Added new `AMBIENT_DAYLIGHT` constant and set that as the new `DirectionalLight` default illuminance. - `PointLight` and `SpotLight` now have a default `intensity` of 1,000,000 lumens. This makes them actually useful in the context of the new "semi-outdoor" exposure and puts them in the "cinema lighting" category instead of the "common household light" category. They are also reasonably close to the Blender default. - `AmbientLight` default has been bumped from `20` to `80`. ## Migration Guide - The increased `Exposure::ev100` means that all existing 3D lighting will need to be adjusted to match (DirectionalLights, PointLights, SpotLights, EnvironmentMapLights, etc). Or alternatively, you can adjust the `Exposure::ev100` on your cameras to work nicely with your current lighting values. If you are currently relying on default intensity values, you might need to change the intensity to achieve the same effect. Note that in Bevy 0.12, point/spot lights had a different hard coded ev100 value than directional lights. In Bevy 0.13, they use the same ev100, so if you have both in your scene, the _scale_ between these light types has changed and you will likely need to adjust one or both of them.

doonv added 6 commits January 28, 2024 16:39

Add DirectionLight lux constants

3bbdd76

Fix lighting example

db05883

Fix pbr example

2d1e535

Fix wireframe example

04e78a6

Fix vertex_colors example

bca8c95

Fix DirectionLight constants

42cd628

alice-i-cecile added this to the 0.13 milestone Jan 28, 2024

alice-i-cecile reviewed Jan 28, 2024

View reviewed changes

A lot more examples

082abdb

alice-i-cecile requested a review from JMS55 January 28, 2024 16:20

Change default and fix even more examples

4d6ed12

doonv added 5 commits January 28, 2024 23:45

Even more examples

d272614

All the other examples

3f17501

Dont delete config_fast_builds.toml

6d7bbe5

another oopsie

1d6bdc7

oopsie 3

87500db

doonv changed the title ~~Fix light examples~~ Change light defaults & fix light examples Jan 29, 2024

doonv marked this pull request as ready for review January 29, 2024 13:58

IceSentry reviewed Jan 29, 2024

View reviewed changes

crates/bevy_pbr/src/light.rs Show resolved Hide resolved

GitGhillie suggested changes Jan 29, 2024

View reviewed changes

mockersf reviewed Jan 30, 2024

View reviewed changes

crates/bevy_pbr/src/light.rs Outdated Show resolved Hide resolved

mockersf reviewed Jan 30, 2024

View reviewed changes

crates/bevy_pbr/src/light.rs Outdated Show resolved Hide resolved

doonv added 2 commits January 30, 2024 20:23

Revert light changes with fixed examples

8b4d41f

format

1cdea53

doonv added 3 commits February 9, 2024 19:48

Fix all other examples

c986477

Remove screenshot

7d1930e

Merge https:/bevyengine/bevy into fix-light-examples

8de95d8

GitGhillie reviewed Feb 12, 2024

View reviewed changes

Apply suggestions

c4fe31a

doonv requested a review from GitGhillie February 13, 2024 21:45

Tweak lighting

01a5578

GitGhillie mentioned this pull request Feb 13, 2024

default point lights seems wrong after exposure #11577

Closed

GitGhillie approved these changes Feb 13, 2024

View reviewed changes

fintelia reviewed Feb 13, 2024

View reviewed changes

cart approved these changes Feb 14, 2024

View reviewed changes

cart added this pull request to the merge queue Feb 14, 2024

Merged via the queue into bevyengine:main with commit dc9b486 Feb 14, 2024
23 checks passed

BD103 mentioned this pull request Feb 14, 2024

Increase intensity of point light in async_compute example #11857

Closed

cart mentioned this pull request Feb 15, 2024

New Exposure and Lighting Defaults (and calibrate examples) #11868

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change light defaults & fix light examples #11581

Change light defaults & fix light examples #11581

doonv commented Jan 28, 2024 •

edited

Loading

mockersf commented Jan 28, 2024

doonv commented Jan 28, 2024

alice-i-cecile left a comment

mockersf commented Jan 28, 2024 •

edited

Loading

doonv commented Jan 28, 2024

doonv commented Jan 28, 2024

mockersf commented Jan 28, 2024

alice-i-cecile commented Jan 28, 2024

github-actions bot commented Jan 28, 2024

GitGhillie left a comment

GitGhillie commented Jan 29, 2024 •

edited

Loading

doonv commented Jan 30, 2024

GitGhillie commented Feb 2, 2024 •

edited

Loading

doonv commented Feb 2, 2024 •

edited

Loading

JMS55 commented Feb 5, 2024

doonv commented Feb 5, 2024

GitGhillie left a comment

fintelia Feb 13, 2024

cart Feb 14, 2024

cart commented Feb 14, 2024

Change light defaults & fix light examples #11581

Change light defaults & fix light examples #11581

Conversation

doonv commented Jan 28, 2024 • edited Loading

Objective

Solution

Changelogs (not including breaking changes)

bevy_pbr

Breaking changes

bevy_pbr

mockersf commented Jan 28, 2024

doonv commented Jan 28, 2024

alice-i-cecile left a comment

Choose a reason for hiding this comment

mockersf commented Jan 28, 2024 • edited Loading

doonv commented Jan 28, 2024

doonv commented Jan 28, 2024

mockersf commented Jan 28, 2024

alice-i-cecile commented Jan 28, 2024

github-actions bot commented Jan 28, 2024

GitGhillie left a comment

Choose a reason for hiding this comment

GitGhillie commented Jan 29, 2024 • edited Loading

doonv commented Jan 30, 2024

GitGhillie commented Feb 2, 2024 • edited Loading

doonv commented Feb 2, 2024 • edited Loading

JMS55 commented Feb 5, 2024

doonv commented Feb 5, 2024

GitGhillie left a comment

Choose a reason for hiding this comment

fintelia Feb 13, 2024

Choose a reason for hiding this comment

cart Feb 14, 2024

Choose a reason for hiding this comment

cart commented Feb 14, 2024

doonv commented Jan 28, 2024 •

edited

Loading

mockersf commented Jan 28, 2024 •

edited

Loading

GitGhillie commented Jan 29, 2024 •

edited

Loading

GitGhillie commented Feb 2, 2024 •

edited

Loading

doonv commented Feb 2, 2024 •

edited

Loading