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

Jump to bottom

[Merged by Bors] - Bloom #6397

Closed
wants to merge 33 commits into from
Closed

[Merged by Bors] - Bloom #6397

wants to merge 33 commits into from

Commits on Mar 20, 2022

  1. add separate tonemapping and upscaling pass

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    3a86a0e View commit details
    Browse the repository at this point in the history

  2. return rendered-to texture view as output

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    315ef6f View commit details
    Browse the repository at this point in the history

  3. create bind group in tonemapping/upscaling node to enable customization

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    cf014e8 View commit details
    Browse the repository at this point in the history

  4. make hdr configurable

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    babcbb2 View commit details
    Browse the repository at this point in the history

  5. add UpscalingPipelineKey

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    21ba00d View commit details
    Browse the repository at this point in the history

  6. add bloom node

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    08e4ff2 View commit details
    Browse the repository at this point in the history

  7. make bloom spheres sometimes non-emissive

    @jakobhellermann
    jakobhellermann committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    3ab3c4f View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. Merge commit '838b318863a4d9374e16c8b46dce8be53519c88f' into bloom-no… 

    …de-new
    @JMS55
    JMS55 committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    c056271 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

  1. Small cleanup

    @JMS55
    JMS55 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    33198fb View commit details
    Browse the repository at this point in the history

  2. Initial bloom shader cleanup/port

    @JMS55
    JMS55 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    19bec71 View commit details
    Browse the repository at this point in the history

  3. Bloom WIP

    @JMS55
    JMS55 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    57782c8 View commit details
    Browse the repository at this point in the history

  4. Bloom fixes

    @JMS55
    JMS55 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    cfd8ac4 View commit details
    Browse the repository at this point in the history

  5. Fix wrong texture binding

    @JMS55
    JMS55 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    584575e View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. Document example a little more

    @JMS55
    JMS55 committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    2c33c96 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. Add intensity and reorganize

    @cart
    cart committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    17c401d View commit details
    Browse the repository at this point in the history

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

    @cart
    cart committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    7b87364 View commit details
    Browse the repository at this point in the history

  3. Add MSAA support

    @cart
    cart committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    fd5b01a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from cart/bloom-tweaks 

    Bloom tweaks
    @JMS55
    JMS55 committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    4584aa3 View commit details
    Browse the repository at this point in the history

  5. Resolve Bloom Clippy

    @cart
    cart committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    1fd95b8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from cart/bloom-tweaks 

    Resolve Bloom Clippy
    @JMS55
    JMS55 committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    7792070 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. support for camera_2d

    @DGriffin91
    DGriffin91 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    04346c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from DGriffin91/bloom-node-new 

    support for camera_2d
    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    cea7545 View commit details
    Browse the repository at this point in the history

  3. Bloom cleanup, move to core_pipeline

    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    7a17524 View commit details
    Browse the repository at this point in the history

  4. Add bloom example controls

    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    8aad516 View commit details
    Browse the repository at this point in the history

  5. Tweak bloom example

    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    d82813b View commit details
    Browse the repository at this point in the history

  6. Merge commit '157f2c1584a7b535b07fdb43871cab7fed643ad1' into bloom-no… 

    …de-new
    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    acdf2da View commit details
    Browse the repository at this point in the history

  7. Merge commit 'e6a016458768312e72ad669e49cd082a389272a3' into bloom-no… 

    …de-new
    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    feabf64 View commit details
    Browse the repository at this point in the history

  8. Improve bloom example controls

    @JMS55
    JMS55 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    87a5b77 View commit details
    Browse the repository at this point in the history

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

    @cart
    cart committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    48ed761 View commit details
    Browse the repository at this point in the history

  10. Apply suggestions from code review

    @cart
    cart committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    fa80a08 View commit details
    Browse the repository at this point in the history

  11. Update Cargo.toml

    @cart
    cart committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    b84f768 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. Update Cargo.toml 

    Co-authored-by: François <mockersf@gmail.com>
    @JMS55 @mockersf
    JMS55 and mockersf committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    f7fd53f View commit details
    Browse the repository at this point in the history

  2. Add bloom example to readme

    @JMS55
    JMS55 committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    8559e67 View commit details
    Browse the repository at this point in the history