Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exposure settings (adopted) #11347

Merged
merged 59 commits into from
Jan 16, 2024
Merged

Exposure settings (adopted) #11347

Changes from 3 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
432c427
Implement basic exposure settings
superdump Apr 16, 2023
8fa78a9
WIP: Test exposure settings in lighting example
superdump Apr 16, 2023
cbeed57
Merge commit 'af0323a55e9cbfe28262fd500fbe21f8cf4c8ee4' into exposure…
JMS55 Aug 22, 2023
0cfbfd7
Rebase fixes
JMS55 Aug 22, 2023
ef62d30
Switch ExposureSettings to hold an EV100 value, improve example.
JMS55 Aug 22, 2023
f5c4166
Misc
JMS55 Aug 22, 2023
ce69ab2
Apply PR feedback
JMS55 Aug 23, 2023
e144815
Add brightness control to Skybox
JMS55 Aug 23, 2023
56bb844
Apply exposure to skybox
JMS55 Aug 23, 2023
4dd2ede
Add EnvironmentMapLight::brightness
JMS55 Aug 23, 2023
64bcfa8
Add misc todo
JMS55 Aug 23, 2023
f9e0730
Misc rename, example fixes
JMS55 Aug 23, 2023
c42824e
Docs
JMS55 Aug 23, 2023
71860bb
Fix shader
JMS55 Aug 26, 2023
7dc7966
Merge commit '02025eff0b25bb8c18103dbafc33a764e1989ad4' into exposure…
JMS55 Sep 1, 2023
f78a0af
Merge pull request #32 from JMS55/exposure_jms
superdump Sep 1, 2023
f0ee3d6
Merge commit '35073cf7aa9eaf748e167c103921a6764fcedfb1' into exposure…
JMS55 Oct 14, 2023
7544e2f
Merge commit 'f0ee3d6aa53b6e03229dccee44eeadc1bf03a351' into exposure…
JMS55 Oct 14, 2023
0e37bed
Merge commit 'ca1874e6c612d73306173065242aaaa8733c9b20' into exposure…
JMS55 Dec 15, 2023
e325da3
Rebase fixes
JMS55 Dec 15, 2023
ac2c148
Input -> ButtonInput
GitGhillie Dec 16, 2023
b1c0ddd
Change default exposure to indoor
GitGhillie Dec 16, 2023
540ab66
Adjust a few examples
GitGhillie Dec 16, 2023
d04ad9a
Adjust PhysicalCameraParameters to an exposure of roughly 7 as well
GitGhillie Dec 16, 2023
dc61b42
adjust lighting example by changing the initial exposure
GitGhillie Dec 16, 2023
479223a
increase point light intensity in lighting example
GitGhillie Dec 17, 2023
6cf0423
Adjust default ambient light
GitGhillie Dec 18, 2023
f67e704
Adjust 3d examples
GitGhillie Dec 18, 2023
2d2f95d
Adjust some more 3d examples
GitGhillie Dec 19, 2023
81e7c25
Adjust some more 3d examples part 3
GitGhillie Dec 20, 2023
418ec05
Adjust some more 3d examples part 4
GitGhillie Dec 25, 2023
ec1ddfb
Adjust some more 3d examples part 5
GitGhillie Dec 26, 2023
a7e0831
Adjust some more 3d examples part 6
GitGhillie Dec 26, 2023
ad4fe6d
Merge commit '8067e46049f222d37ac394745805bad98979980f' into exposure…
JMS55 Dec 28, 2023
e969d5e
Compensate for exposure after fetching transmission background color
coreh Dec 29, 2023
f743dce
Adjust transmission example
coreh Dec 29, 2023
874ea8c
Remove `ColorGrading` exposure as a workaround for `EnvironmentMapLig…
coreh Dec 29, 2023
0d4006e
Also tweak look of emissive flame in transmission example
coreh Dec 29, 2023
edfb721
Adjust some more 3d examples part 7
GitGhillie Dec 30, 2023
404a98d
Merge pull request #1 from coreh/exposure_jms
GitGhillie Dec 31, 2023
5f92b44
Adjust some more 3d examples part 8
GitGhillie Jan 4, 2024
9968173
Adjust some more 3d examples part 9 (fin)
GitGhillie Jan 4, 2024
bbd6532
fmt
GitGhillie Jan 4, 2024
a6d9076
Take exposure into account for directional light influence in fog
coreh Jan 6, 2024
c276a80
Merge pull request #2 from coreh/exposure-fog-fix
GitGhillie Jan 6, 2024
012d33e
Merge commit 'c276a80e3df0ca13bf38154f3d6b2667b96af7c1' into exposure…
JMS55 Jan 14, 2024
da12108
Merge commit '8a523de8db28bfdc5b2a4c67c2022cc957075de6' into exposure…
JMS55 Jan 14, 2024
e00f0ad
Fix doc
JMS55 Jan 14, 2024
5cd197b
Fix example keycodes
JMS55 Jan 14, 2024
d892d5d
Update crates/bevy_render/src/camera/camera.rs
JMS55 Jan 14, 2024
07ccccd
Format
JMS55 Jan 14, 2024
24c9953
Update crates/bevy_render/src/camera/camera.rs
JMS55 Jan 15, 2024
2a52b6a
Update crates/bevy_render/src/camera/camera.rs
JMS55 Jan 15, 2024
fab6f87
Improve doc comment
JMS55 Jan 15, 2024
fd91b58
Fix lightmaps example
atlv24 Jan 16, 2024
cc11b23
Merge pull request #20 from rodolphito/exposure
JMS55 Jan 16, 2024
e0f3e9c
more fixing ...
atlv24 Jan 16, 2024
55444b4
Fix fix fix
atlv24 Jan 16, 2024
a7b22be
Merge pull request #21 from rodolphito/exposure2
JMS55 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions examples/3d/lightmaps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fn main() {
.add_plugins(DefaultPlugins)
.insert_resource(AmbientLight {
color: Color::WHITE,
brightness: 0.2,
brightness: 0.0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a (non-zero) default value for the ambient light? Because it doesn't seem like inserting a light with brightness set to zero should actually do much of anything

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the default is 0.005 or something. If you don't want any ambient light (using lightmaps or IBL instead), then you need to override it to be 0 like this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it has a non-zero default. https://github.com/bevyengine/bevy/blob/main/crates/bevy_pbr/src/light.rs#L550

})
.add_systems(Startup, setup)
.add_systems(Update, add_lightmaps_to_meshes)
Expand Down Expand Up @@ -36,9 +36,15 @@ fn add_lightmaps_to_meshes(
(With<Handle<Mesh>>, Without<Lightmap>),
>,
) {
let exposure = 250.0;
for (entity, name, material) in meshes.iter() {
if &**name == "Light" {
materials.get_mut(material).unwrap().emissive = Color::WHITE * exposure;
continue;
}

if &**name == "large_box" {
materials.get_mut(material).unwrap().lightmap_exposure = 120.0;
materials.get_mut(material).unwrap().lightmap_exposure = exposure;
commands.entity(entity).insert(Lightmap {
image: asset_server.load("lightmaps/CornellBox-Large.zstd.ktx2"),
..default()
Expand All @@ -47,7 +53,7 @@ fn add_lightmaps_to_meshes(
}

if &**name == "small_box" {
materials.get_mut(material).unwrap().lightmap_exposure = 120.0;
materials.get_mut(material).unwrap().lightmap_exposure = exposure;
commands.entity(entity).insert(Lightmap {
image: asset_server.load("lightmaps/CornellBox-Small.zstd.ktx2"),
..default()
Expand All @@ -56,7 +62,7 @@ fn add_lightmaps_to_meshes(
}

if name.starts_with("cornell_box") {
materials.get_mut(material).unwrap().lightmap_exposure = 120.0;
materials.get_mut(material).unwrap().lightmap_exposure = exposure;
commands.entity(entity).insert(Lightmap {
image: asset_server.load("lightmaps/CornellBox-Box.zstd.ktx2"),
..default()
Expand Down