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] - Add Distance and Atmospheric Fog support #6412

Closed
wants to merge 79 commits into from
Closed

[Merged by Bors] - Add Distance and Atmospheric Fog support #6412

wants to merge 79 commits into from

Commits on Oct 29, 2022

  1. Add fog support to bevy_pbr

    @coreh
    coreh committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    014a9cb View commit details
    Browse the repository at this point in the history

  2. Add flag to StandardMaterial to disable fog

    @coreh
    coreh committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    6458025 View commit details
    Browse the repository at this point in the history

  3. Add fog documentation

    @coreh
    coreh committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    dfbd7f6 View commit details
    Browse the repository at this point in the history

  4. Fix example code that's failing on CI

    @coreh
    coreh committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    d7afc3e View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2022

  1. Add additional fog documentation

    @coreh
    coreh committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    fb588a5 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2022

  1. Make Fog a Component instead of a Resource 

    Allowing independent per-camera configuration
    @coreh
    coreh committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    0d2afb9 View commit details
    Browse the repository at this point in the history

  2. Consolidate fog-related setup into FogPlugin

    @coreh
    coreh committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    8855bdd View commit details
    Browse the repository at this point in the history

  3. Fix example code that's failing on CI

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

Commits on Nov 2, 2022

  1. Remove FogMode::Off

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

  2. Add Fog example

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

  3. Fix clippy issues

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

Commits on Nov 3, 2022

  1. Apply feedback on example and fix mismatched variable names

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

  2. Add controls table to example module documentation

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

  3. Add semicolon

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

  4. Merge branch 'main' into fog

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

  5. Rename fog component and falloff enum, for consistency and reusability

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

  6. Add initial implementation of atmospheric fog and directional light s… 

    …cattering
    @coreh
    coreh committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    6d2a41a View commit details
    Browse the repository at this point in the history

  7. Fix documentation broken/missing links

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

  8. Fix example code now that there are more fog settings

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

  9. Fix clippy issue

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

Commits on Nov 4, 2022

  1. Fix the spelling of the word ‘exponent’

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    5d8f708 View commit details
    Browse the repository at this point in the history

  2. Use Time::elapsed_seconds() and Time::delta_seconds()

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

  3. Improve documentation, in response to PR feedback

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

  4. Improve GpuFog documentation comments

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    48295a0 View commit details
    Browse the repository at this point in the history

  5. Optimize/cleanup shader code

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    7a88d0e View commit details
    Browse the repository at this point in the history

  6. Take directional light colors into account for scattering

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    50f0f50 View commit details
    Browse the repository at this point in the history

  7. Rename scattering_color to directional_light_color

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    00226a3 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into fog

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

  9. Merge branch 'main' into fog

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

  10. Add atmospheric fog example

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

  11. Fix clippy issue

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    270dcd9 View commit details
    Browse the repository at this point in the history

  12. Add methods for more easily configuring atmospheric fog

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    8ecba3b View commit details
    Browse the repository at this point in the history

  13. Use new visibility helper method in atmospheric fog example

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    68447a2 View commit details
    Browse the repository at this point in the history

  14. Improve documentation

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

  15. Use Vec3 instead of Color for extinction and inscattering

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

  16. Improve documentation

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

  17. Add convenience methods for FogFalloff::ExponentialSquared

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

  18. Tweaks to documentation formatting and punctuation

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

  19. Improve documentation

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

  20. Remove misleading note about exponential density values

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

  21. Fix clippy issue

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

  22. Remove now-unnecessary UI camera

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    73ad380 View commit details
    Browse the repository at this point in the history

  23. Add comments explaining values

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

  24. Fix documentation tests

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    92dac89 View commit details
    Browse the repository at this point in the history

  25. Update examples/README.md

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    256fce6 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'main' into fog

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

  27. Use positive fog_enabled flag (instead of no_fog)

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    50a41cd View commit details
    Browse the repository at this point in the history

  28. Add minor clarification that this is the color obtained after extinction

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

  29. Rename result to fog_color in shader

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

  30. Fix search and replace mishap

    @coreh
    coreh committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    11f1bb5 View commit details
    Browse the repository at this point in the history

  31. Use names consistent with documentation

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

  32. Move fog to outside of pbr(), so that it applies to unlit materials

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

Commits on Nov 6, 2022

  1. Merge branch 'main' into fog

    @coreh
    coreh committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    e3b65c8 View commit details
    Browse the repository at this point in the history

  2. Add controls table and move system to last

    @coreh
    coreh committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    036fbd3 View commit details
    Browse the repository at this point in the history

  3. Improve documentation

    @coreh
    coreh committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    9f3b0c4 View commit details
    Browse the repository at this point in the history

  4. Use “glow” instead of “halo” in explanation 

    Turns out “halo” is a specific, actual atmospheric effect (caused by ice crystals)
we might want to support in the future.
    @coreh
    coreh committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    49a3f1e View commit details
    Browse the repository at this point in the history

  5. Improve documentation

    @coreh
    coreh committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    f9056c0 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. Fix constants typo in documentation comments

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

Commits on Nov 9, 2022

  1. Fix additional constant typos

    @coreh
    coreh committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    e123574 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. Merge branch 'main' into fog

    @coreh
    coreh committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    2664ca1 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2022

  1. Reduce sky size, fixing (floating point precision?) flicker in WASM /… 

    … Firefox
    @coreh
    coreh committed Nov 20, 2022
    Configuration menu
    Copy the full SHA
    d54dce2 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Merge branch 'main' into fog

    @coreh
    coreh committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    ccfb0ce View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. Break up long lines in WGSL shaders for readability 

    Co-authored-by: Robert Swain <robert.swain@gmail.com>
    @coreh @superdump
    coreh and superdump committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    6ab1188 View commit details
    Browse the repository at this point in the history

  2. Remove incorrect claim that extinction factor is ‘unitless’ from docu… 

    …mentation
    @coreh
    coreh committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    f44e381 View commit details
    Browse the repository at this point in the history

  3. Improve documentation wording 

    Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com>
    @coreh @JMS55
    coreh and JMS55 committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    aa3fef7 View commit details
    Browse the repository at this point in the history

  4. Increase font size in fog examples

    @coreh
    coreh committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    f1cebd2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into fog

    @coreh
    coreh committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    f9ceb4c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2023

  1. Merge branch 'main' into fog

    @coreh
    coreh committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    820a6b1 View commit details
    Browse the repository at this point in the history

  2. Make sure apply_fog() function is not defined during normal prepass 

    Otherwise the shader will fail compilation, since the `fog` uniform, defined in
`bevy_pbr::mesh_view_bindings` will not be available, since that file is not imported
by the prepass shader. (but `bevy_pbr::pbr_functions` is)
    @coreh
    coreh committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    cd11d43 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fog

    @coreh
    coreh committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    df77ce3 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Fix code for creating exponential squared fog 

    Both math and enum variants were off

Co-authored-by: robtfm <50659922+robtfm@users.noreply.github.com>
    @coreh @robtfm
    coreh and robtfm committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    15afdfb View commit details
    Browse the repository at this point in the history

  2. Remove unused KOSCHMIEDER_CONTRAST_THRESHOLD constant 

    Co-authored-by: robtfm <50659922+robtfm@users.noreply.github.com>
    @coreh @robtfm
    coreh and robtfm committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    c4eb571 View commit details
    Browse the repository at this point in the history

  3. Tweak wording, remove trailing whitespace

    @coreh
    coreh committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    28f4fb0 View commit details
    Browse the repository at this point in the history

  4. Reorder GpuFog fields for better struct packing 

    Hopefully reducing GPU-side memory consumption and improving transfer speeds

Co-authored-by: Robert Swain <robert.swain@gmail.com>
    @coreh @superdump
    coreh and superdump committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    8b99f6f View commit details
    Browse the repository at this point in the history

  5. Extract repeated scattering code into function

    @coreh
    coreh committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    1e3ab2c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into fog

    @coreh
    coreh committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    5fd6a42 View commit details
    Browse the repository at this point in the history

  7. Properly configure cascade shadow map for scene

    @coreh
    coreh committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    8c4d4e9 View commit details
    Browse the repository at this point in the history

  8. Use multiplication instead of pow() with 2.0 

    That way it's slightly faster if the compiler doesn't optimize it

Co-authored-by: Robert Swain <robert.swain@gmail.com>
    @coreh @superdump
    coreh and superdump committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    4608dbd View commit details
    Browse the repository at this point in the history

  9. Pass fragment and view positions and calculate view_to_world in `ap… 

    …ply_fog()`

Thus simplifying future replacement of `apply_fog()` function for non-uniform (e.g. height-based) fogs.
    @coreh
    coreh committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    fee838d View commit details
    Browse the repository at this point in the history