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

Fix fog color being inaccurate #10226

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Fix fog color being inaccurate #10226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c033d
Fix fog color being inaccurate
rafalh Oct 22, 2023
ea6359b
Adjust fog configuration in examples
rafalh Oct 23, 2023
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
28 changes: 20 additions & 8 deletions crates/bevy_pbr/src/render/fog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,33 @@ pub fn prepare_fog(
match &fog.falloff {
FogFalloff::Linear { start, end } => GpuFog {
mode: GPU_FOG_MODE_LINEAR,
base_color: fog.color.into(),
directional_light_color: fog.directional_light_color.into(),
base_color: fog.color.as_linear_rgba_f32().into(),
directional_light_color: fog
.directional_light_color
.as_linear_rgba_f32()
.into(),
directional_light_exponent: fog.directional_light_exponent,
be: Vec3::new(*start, *end, 0.0),
..Default::default()
},
FogFalloff::Exponential { density } => GpuFog {
mode: GPU_FOG_MODE_EXPONENTIAL,
base_color: fog.color.into(),
directional_light_color: fog.directional_light_color.into(),
base_color: fog.color.as_linear_rgba_f32().into(),
directional_light_color: fog
.directional_light_color
.as_linear_rgba_f32()
.into(),
directional_light_exponent: fog.directional_light_exponent,
be: Vec3::new(*density, 0.0, 0.0),
..Default::default()
},
FogFalloff::ExponentialSquared { density } => GpuFog {
mode: GPU_FOG_MODE_EXPONENTIAL_SQUARED,
base_color: fog.color.into(),
directional_light_color: fog.directional_light_color.into(),
base_color: fog.color.as_linear_rgba_f32().into(),
directional_light_color: fog
.directional_light_color
.as_linear_rgba_f32()
.into(),
directional_light_exponent: fog.directional_light_exponent,
be: Vec3::new(*density, 0.0, 0.0),
..Default::default()
Expand All @@ -92,8 +101,11 @@ pub fn prepare_fog(
inscattering,
} => GpuFog {
mode: GPU_FOG_MODE_ATMOSPHERIC,
base_color: fog.color.into(),
directional_light_color: fog.directional_light_color.into(),
base_color: fog.color.as_linear_rgba_f32().into(),
directional_light_color: fog
.directional_light_color
.as_linear_rgba_f32()
.into(),
directional_light_exponent: fog.directional_light_exponent,
be: *extinction,
bi: *inscattering,
Expand Down
4 changes: 2 additions & 2 deletions examples/3d/atmospheric_fog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ fn setup_camera_fog(mut commands: Commands) {
..default()
},
FogSettings {
color: Color::rgba(0.1, 0.2, 0.4, 1.0),
directional_light_color: Color::rgba(1.0, 0.95, 0.75, 0.5),
color: Color::rgba(0.35, 0.48, 0.66, 1.0),
directional_light_color: Color::rgba(1.0, 0.95, 0.85, 0.5),
directional_light_exponent: 30.0,
falloff: FogFalloff::from_visibility_colors(
15.0, // distance in world units up to which objects retain visibility (>= 5% contrast)
Expand Down
2 changes: 1 addition & 1 deletion examples/3d/fog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn setup_camera_fog(mut commands: Commands) {
commands.spawn((
Camera3dBundle::default(),
FogSettings {
color: Color::rgba(0.05, 0.05, 0.05, 1.0),
color: Color::rgba(0.25, 0.25, 0.25, 1.0),
falloff: FogFalloff::Linear {
start: 5.0,
end: 20.0,
Expand Down