[Merged by Bors] - Bloom by JMS55 · Pull Request #6397 · bevyengine/bevy

JMS55 · 2022-10-28T17:40:25Z

Objective

Adds a bloom pass for HDR-enabled Camera3ds.
Supersedes (and all credit due to!) Add bloom postprocessing based on #2876 #3430 and Add HDR and bloom to Pipelined rendering #2876

Solution

A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together.
Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component.

Changelog

Added a core_pipeline::bloom::BloomSettings component.
Added BloomNode that runs between the main pass and tonemapping.
Added a BloomPlugin that is loaded as part of CorePipelinePlugin.
Added a bloom example project.

…de-new

IceSentry

First review pass looked good, but I didn't have time to go really deep.

crates/bevy_pbr/src/bloom/bloom.wgsl

crates/bevy_pbr/src/bloom/mod.rs

JMS55 · 2022-10-28T18:43:42Z

Should we add the BloomPlugin by default as part of PbrPlugin btw? It's something I carried over from the previous PR, unsure how I feel about it.

cart · 2022-10-28T20:27:50Z

I think the bloom plugin should be added by default, but disabled by default in the bloom settings (edit: or rather ... cameras should not have bloom enabled by default). The functionality should be compiled in, but it should have zero cost when disabled.

JMS55 · 2022-10-28T20:39:35Z

Ok, that's kinda what we have now. Note that it won't be entirely 0 cost, as there's still the plugin registration and pipeline creation at startup, and probably the node running (and then immediately returning).

Something else I've realized: I'm not sure I'm handling viewport sizes correctly. I need to test this on one of the examples that have different viewport vs window/texture sizes.

Bloom tweaks

Resolve Bloom Clippy

jakobhellermann

Haven't reviewed the render code but it's great to see this come together. Left a few comments, otherwise this looks good superficially.

crates/bevy_pbr/src/bloom/bloom.wgsl

crates/bevy_pbr/src/bloom/mod.rs

examples/3d/bloom.rs

cart

Once the build is fixed I think this is good to go.

crates/bevy_core_pipeline/src/bloom/mod.rs

cart · 2022-11-03T22:54:53Z

bors r+

# Objective - Adds a bloom pass for HDR-enabled Camera3ds. - Supersedes (and all credit due to!) #3430 and #2876 ![image](https://user-images.githubusercontent.com/47158642/198698783-228edc00-20b5-4218-a613-331ccd474f38.png) ## Solution - A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together. - Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component. --- ## Changelog - Added a `core_pipeline::bloom::BloomSettings` component. - Added `BloomNode` that runs between the main pass and tonemapping. - Added a `BloomPlugin` that is loaded as part of CorePipelinePlugin. - Added a bloom example project. Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com> Co-authored-by: DGriffin91 <github@dgdigital.net>

Cargo.toml

examples/3d/bloom.rs

bors · 2022-11-03T23:11:15Z

Canceled.

cart · 2022-11-03T23:11:50Z

bors r+

# Objective - Adds a bloom pass for HDR-enabled Camera3ds. - Supersedes (and all credit due to!) #3430 and #2876 ![image](https://user-images.githubusercontent.com/47158642/198698783-228edc00-20b5-4218-a613-331ccd474f38.png) ## Solution - A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together. - Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component. --- ## Changelog - Added a `core_pipeline::bloom::BloomSettings` component. - Added `BloomNode` that runs between the main pass and tonemapping. - Added a `BloomPlugin` that is loaded as part of CorePipelinePlugin. - Added a bloom example project. Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com> Co-authored-by: DGriffin91 <github@dgdigital.net>

cart · 2022-11-03T23:12:40Z

bors r-

bors · 2022-11-03T23:12:42Z

Canceled.

cart · 2022-11-03T23:13:20Z

Just realized we can't enable the bloom example on WASM because it multisamples by default (and hdr multisampling isn't supported on wasm)

Cargo.toml

cart · 2022-11-03T23:13:58Z

bors r+

# Objective - Adds a bloom pass for HDR-enabled Camera3ds. - Supersedes (and all credit due to!) #3430 and #2876 ![image](https://user-images.githubusercontent.com/47158642/198698783-228edc00-20b5-4218-a613-331ccd474f38.png) ## Solution - A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together. - Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component. --- ## Changelog - Added a `core_pipeline::bloom::BloomSettings` component. - Added `BloomNode` that runs between the main pass and tonemapping. - Added a `BloomPlugin` that is loaded as part of CorePipelinePlugin. - Added a bloom example project. Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com> Co-authored-by: DGriffin91 <github@dgdigital.net>

bors · 2022-11-03T23:16:39Z

Build failed:

check-missing-examples-in-docs

Cargo.toml

Co-authored-by: François <mockersf@gmail.com>

mockersf · 2022-11-04T01:24:32Z

bors retry

# Objective - Adds a bloom pass for HDR-enabled Camera3ds. - Supersedes (and all credit due to!) #3430 and #2876 ![image](https://user-images.githubusercontent.com/47158642/198698783-228edc00-20b5-4218-a613-331ccd474f38.png) ## Solution - A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together. - Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component. --- ## Changelog - Added a `core_pipeline::bloom::BloomSettings` component. - Added `BloomNode` that runs between the main pass and tonemapping. - Added a `BloomPlugin` that is loaded as part of CorePipelinePlugin. - Added a bloom example project. Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com> Co-authored-by: DGriffin91 <github@dgdigital.net>

bors · 2022-11-04T01:33:25Z

Canceled.

mockersf · 2022-11-04T01:33:54Z

bors r+

# Objective - Adds a bloom pass for HDR-enabled Camera3ds. - Supersedes (and all credit due to!) #3430 and #2876 ![image](https://user-images.githubusercontent.com/47158642/198698783-228edc00-20b5-4218-a613-331ccd474f38.png) ## Solution - A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together. - Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component. --- ## Changelog - Added a `core_pipeline::bloom::BloomSettings` component. - Added `BloomNode` that runs between the main pass and tonemapping. - Added a `BloomPlugin` that is loaded as part of CorePipelinePlugin. - Added a bloom example project. Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com> Co-authored-by: DGriffin91 <github@dgdigital.net>

bors · 2022-11-04T01:50:40Z

Pull request successfully merged into main.

Build succeeded:

# Objective - Adds a bloom pass for HDR-enabled Camera3ds. - Supersedes (and all credit due to!) bevyengine#3430 and bevyengine#2876 ![image](https://user-images.githubusercontent.com/47158642/198698783-228edc00-20b5-4218-a613-331ccd474f38.png) ## Solution - A threshold is applied to isolate emissive samples, and then a series of downscale and upscaling passes are applied and composited together. - Bloom is applied to 2d or 3d Cameras with hdr: true and a BloomSettings component. --- ## Changelog - Added a `core_pipeline::bloom::BloomSettings` component. - Added `BloomNode` that runs between the main pass and tonemapping. - Added a `BloomPlugin` that is loaded as part of CorePipelinePlugin. - Added a bloom example project. Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com> Co-authored-by: DGriffin91 <github@dgdigital.net>

jakobhellermann and others added 14 commits March 20, 2022 13:19

add separate tonemapping and upscaling pass

3a86a0e

return rendered-to texture view as output

315ef6f

create bind group in tonemapping/upscaling node to enable customization

cf014e8

make hdr configurable

babcbb2

add UpscalingPipelineKey

21ba00d

add bloom node

08e4ff2

make bloom spheres sometimes non-emissive

3ab3c4f

Merge commit '838b318863a4d9374e16c8b46dce8be53519c88f' into bloom-no…

c056271

…de-new

Small cleanup

33198fb

Initial bloom shader cleanup/port

19bec71

Bloom WIP

57782c8

Bloom fixes

cfd8ac4

Fix wrong texture binding

584575e

Document example a little more

2c33c96

alice-i-cecile added C-Feature A new feature, making something new possible A-Rendering Drawing game state to the screen labels Oct 28, 2022

alice-i-cecile mentioned this pull request Oct 28, 2022

Add bloom postprocessing based on #2876 #3430

Closed

IceSentry reviewed Oct 28, 2022

View reviewed changes

crates/bevy_pbr/src/bloom/bloom.wgsl Outdated Show resolved Hide resolved

crates/bevy_pbr/src/bloom/bloom.wgsl Outdated Show resolved Hide resolved

crates/bevy_pbr/src/bloom/bloom.wgsl Outdated Show resolved Hide resolved

crates/bevy_pbr/src/bloom/mod.rs Show resolved Hide resolved

cart added 3 commits November 2, 2022 01:20

Add intensity and reorganize

17c401d

Merge remote-tracking branch 'origin/main' into pr/JMS55/6397

7b87364

Add MSAA support

fd5b01a

cart added this to the Bevy 0.9 milestone Nov 2, 2022

Merge pull request #1 from cart/bloom-tweaks

4584aa3

Bloom tweaks

cart marked this pull request as ready for review November 2, 2022 20:51

cart and others added 2 commits November 2, 2022 14:00

Resolve Bloom Clippy

1fd95b8

Merge pull request #2 from cart/bloom-tweaks

7792070

Resolve Bloom Clippy

jakobhellermann approved these changes Nov 2, 2022

View reviewed changes

crates/bevy_pbr/src/bloom/bloom.wgsl Outdated Show resolved Hide resolved

crates/bevy_pbr/src/bloom/mod.rs Outdated Show resolved Hide resolved

examples/3d/bloom.rs Outdated Show resolved Hide resolved

cart approved these changes Nov 3, 2022

View reviewed changes

crates/bevy_core_pipeline/src/bloom/mod.rs Show resolved Hide resolved

Update crates/bevy_core_pipeline/src/bloom/mod.rs

48ed761

cart reviewed Nov 3, 2022

View reviewed changes

Cargo.toml Show resolved Hide resolved

cart reviewed Nov 3, 2022

View reviewed changes

examples/3d/bloom.rs Show resolved Hide resolved

Apply suggestions from code review

fa80a08

cart reviewed Nov 3, 2022

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

Update Cargo.toml

b84f768

mockersf reviewed Nov 4, 2022

View reviewed changes

Cargo.toml Show resolved Hide resolved

Update Cargo.toml

f7fd53f

Co-authored-by: François <mockersf@gmail.com>

Add bloom example to readme

8559e67

bors bot changed the title ~~Bloom~~ [Merged by Bors] - Bloom Nov 4, 2022

bors bot closed this Nov 4, 2022

Uh oh!

Conversation

JMS55 commented Oct 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Objective

Solution

Changelog

Uh oh!

IceSentry left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JMS55 commented Oct 28, 2022

Uh oh!

cart commented Oct 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JMS55 commented Oct 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jakobhellermann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cart left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cart commented Nov 3, 2022

Uh oh!

Uh oh!

Uh oh!

bors bot commented Nov 3, 2022

Uh oh!

cart commented Nov 3, 2022

Uh oh!

cart commented Nov 3, 2022

Uh oh!

bors bot commented Nov 3, 2022

Uh oh!

cart commented Nov 3, 2022

Uh oh!

Uh oh!

cart commented Nov 3, 2022

Uh oh!

bors bot commented Nov 3, 2022

Uh oh!

Uh oh!

mockersf commented Nov 4, 2022

Uh oh!

bors bot commented Nov 4, 2022

Uh oh!

mockersf commented Nov 4, 2022

Uh oh!

bors bot commented Nov 4, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

JMS55 commented Oct 28, 2022 •

edited

Loading

cart commented Oct 28, 2022 •

edited

Loading

JMS55 commented Oct 28, 2022 •

edited

Loading