From ebfed08114e16f000fa03158355cca73b58fd986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 11 Nov 2022 00:47:15 +0100 Subject: [PATCH 1/5] use 0.3 by default for intensity --- crates/bevy_core_pipeline/src/bloom/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs index b710d8d8344c5..4e17a8643b1e6 100644 --- a/crates/bevy_core_pipeline/src/bloom/mod.rs +++ b/crates/bevy_core_pipeline/src/bloom/mod.rs @@ -159,7 +159,7 @@ impl Default for BloomSettings { threshold: 1.0, knee: 0.1, scale: 1.0, - intensity: 1.0, + intensity: 0.3, } } } From 76a028ac1d6ba4e61c6b53b8d97727c72cf0a856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 11 Nov 2022 00:48:20 +0100 Subject: [PATCH 2/5] reduce mip levels Co-Authored-By: Robert Swain <302146+superdump@users.noreply.github.com> --- crates/bevy_core_pipeline/src/bloom/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs index 4e17a8643b1e6..d1abdeb25065f 100644 --- a/crates/bevy_core_pipeline/src/bloom/mod.rs +++ b/crates/bevy_core_pipeline/src/bloom/mod.rs @@ -805,5 +805,5 @@ fn queue_bloom_bind_groups( } fn calculate_mip_count(min_view: u32) -> u32 { - ((min_view as f32).log2().round() as u32 - 1).max(1) + ((min_view as f32).log2().round() as u32 - 3).max(1) } From 988b5daaac4c075e424bb3195acd675f0e131865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 11 Nov 2022 01:00:30 +0100 Subject: [PATCH 3/5] avoid underflow Co-Authored-By: JMS55 <47158642+JMS55@users.noreply.github.com> --- crates/bevy_core_pipeline/src/bloom/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs index d1abdeb25065f..71e955ac57f21 100644 --- a/crates/bevy_core_pipeline/src/bloom/mod.rs +++ b/crates/bevy_core_pipeline/src/bloom/mod.rs @@ -805,5 +805,5 @@ fn queue_bloom_bind_groups( } fn calculate_mip_count(min_view: u32) -> u32 { - ((min_view as f32).log2().round() as u32 - 3).max(1) + ((min_view as f32).log2().round() as i32 - 3).max(1) as u32 } From 43d0d227cb26ad308d7457de33106ffbff739ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 11 Nov 2022 01:09:00 +0100 Subject: [PATCH 4/5] keep the default at 1.0 Co-Authored-By: JMS55 <47158642+JMS55@users.noreply.github.com> --- crates/bevy_core_pipeline/src/bloom/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs index 71e955ac57f21..005f463b58bf0 100644 --- a/crates/bevy_core_pipeline/src/bloom/mod.rs +++ b/crates/bevy_core_pipeline/src/bloom/mod.rs @@ -159,7 +159,7 @@ impl Default for BloomSettings { threshold: 1.0, knee: 0.1, scale: 1.0, - intensity: 0.3, + intensity: 1.0, } } } @@ -655,7 +655,7 @@ fn prepare_bloom_uniforms( threshold: settings.threshold, knee: settings.knee, scale: settings.scale * scale, - intensity: settings.intensity, + intensity: settings.intensity / 3.0, }; let index = bloom_uniforms.uniforms.push(uniform); Some((entity, (BloomUniformIndex(index)))) From 6eeb1a8c1d6505cda1d5f25bb480aef3a294c8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 11 Nov 2022 09:37:17 +0100 Subject: [PATCH 5/5] default to 0.3 --- crates/bevy_core_pipeline/src/bloom/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/bevy_core_pipeline/src/bloom/mod.rs b/crates/bevy_core_pipeline/src/bloom/mod.rs index 005f463b58bf0..f94232ec156e0 100644 --- a/crates/bevy_core_pipeline/src/bloom/mod.rs +++ b/crates/bevy_core_pipeline/src/bloom/mod.rs @@ -149,7 +149,7 @@ pub struct BloomSettings { /// Scale used when upsampling (default: 1.0). pub scale: f32, - /// Intensity of the bloom effect (default: 1.0). + /// Intensity of the bloom effect (default: 0.3). pub intensity: f32, } @@ -159,7 +159,7 @@ impl Default for BloomSettings { threshold: 1.0, knee: 0.1, scale: 1.0, - intensity: 1.0, + intensity: 0.3, } } } @@ -655,7 +655,7 @@ fn prepare_bloom_uniforms( threshold: settings.threshold, knee: settings.knee, scale: settings.scale * scale, - intensity: settings.intensity / 3.0, + intensity: settings.intensity, }; let index = bloom_uniforms.uniforms.push(uniform); Some((entity, (BloomUniformIndex(index))))