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

allow extensions to StandardMaterial #7820

Merged
merged 42 commits into from
Oct 17, 2023
Merged

allow extensions to StandardMaterial #7820

merged 42 commits into from
Oct 17, 2023

Commits on Feb 25, 2023

  1. initial

    @robtfm
    robtfm committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    62b5f57 View commit details
    Browse the repository at this point in the history

  2. example pages

    @robtfm
    robtfm committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    846a222 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. cleanup and comments

    @robtfm
    robtfm committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    4b10ec8 View commit details
    Browse the repository at this point in the history

  2. doc link

    @robtfm
    robtfm committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    63efd52 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Merge branch 'main' into pr/robtfm/7820

    @robtfm
    robtfm committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    7d7d2c9 View commit details
    Browse the repository at this point in the history

  2. update changes for main

    @robtfm
    robtfm committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    df29752 View commit details
    Browse the repository at this point in the history

  3. separate pbr_input creation, lighting and postproc

    @robtfm
    robtfm committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    d033064 View commit details
    Browse the repository at this point in the history

  4. add mesh_vertex_output_pbr_input

    @robtfm
    robtfm committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    b2994df View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Merge branch 'bevyengine:main' into extended_material

    @robtfm
    robtfm authored Aug 28, 2023
    Configuration menu
    Copy the full SHA
    1464986 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Merge remote-tracking branch 'upstream/main' into pr/robtfm/7820

    @robtfm
    robtfm committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    268a36d View commit details
    Browse the repository at this point in the history

  2. fix merge

    @robtfm
    robtfm committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    6eedd44 View commit details
    Browse the repository at this point in the history

  3. fmt

    @robtfm
    robtfm committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    bc59293 View commit details
    Browse the repository at this point in the history

  4. rename shader

    @robtfm
    robtfm committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    500a04d View commit details
    Browse the repository at this point in the history

  5. !bevy_internal

    @robtfm
    robtfm committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    8fef9e3 View commit details
    Browse the repository at this point in the history

  6. cmon ci

    @robtfm
    robtfm committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    b087fb0 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. rename pbr_input constructors

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    198be2e View commit details
    Browse the repository at this point in the history

  2. StandardMaterialExtension trait

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    b128207 View commit details
    Browse the repository at this point in the history

  3. ci

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    019809f View commit details
    Browse the repository at this point in the history

  4. Update crates/bevy_pbr/src/render/pbr_fragment.wgsl 

    Co-authored-by: Robert Swain <[email protected]>
    @robtfm @superdump
    robtfm and superdump authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    2d3776d View commit details
    Browse the repository at this point in the history

  5. Update crates/bevy_pbr/src/render/pbr_fragment.wgsl 

    Co-authored-by: Robert Swain <[email protected]>
    @robtfm @superdump
    robtfm and superdump authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    608c4a8 View commit details
    Browse the repository at this point in the history

  6. Update crates/bevy_pbr/src/render/pbr_fragment.wgsl 

    Co-authored-by: Robert Swain <[email protected]>
    @robtfm @superdump
    robtfm and superdump authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    9da0ed5 View commit details
    Browse the repository at this point in the history

  7. Update crates/bevy_pbr/src/render/pbr_fragment.wgsl 

    Co-authored-by: Robert Swain <[email protected]>
    @robtfm @superdump
    robtfm and superdump authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    fa0518e View commit details
    Browse the repository at this point in the history

  8. Update crates/bevy_pbr/src/render/pbr_fragment.wgsl 

    Co-authored-by: Robert Swain <[email protected]>
    @robtfm @superdump
    robtfm and superdump authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    c070b2e View commit details
    Browse the repository at this point in the history

  9. newline

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    68362e6 View commit details
    Browse the repository at this point in the history

  10. make the base material generic

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    299f695 View commit details
    Browse the repository at this point in the history

  11. clarify scope of in_shader_post_processing

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    272cc57 View commit details
    Browse the repository at this point in the history

  12. review comments

    @robtfm
    robtfm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    5e31b78 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. main pass post lighting processing

    @robtfm
    robtfm committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    dd168e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge remote-tracking branch 'upstream/main' into pr/robtfm/7820

    @robtfm
    robtfm committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    a378697 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2023

  1. Merge remote-tracking branch 'upstream/main' into pr/robtfm/7820

    @robtfm
    robtfm committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    ad01723 View commit details
    Browse the repository at this point in the history

  2. update for deferred

    @robtfm
    robtfm committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    f4db213 View commit details
    Browse the repository at this point in the history

  3. no bervy_internal in examples

    @robtfm
    robtfm committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    488df37 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into pr/robtfm/7820

    @robtfm
    robtfm committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    92acb32 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Robert Swain <[email protected]>
    @robtfm @superdump
    robtfm and superdump authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a11133e View commit details
    Browse the repository at this point in the history

  2. pbr_input_from_vertex_output

    @robtfm
    robtfm committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    f83c085 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Merge remote-tracking branch 'upstream/main' into pr/robtfm/7820

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    0f6e2cd View commit details
    Browse the repository at this point in the history

  2. fix merge

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    e705816 View commit details
    Browse the repository at this point in the history

  3. use pbrinput.*material*.flags for unlit

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    34fd384 View commit details
    Browse the repository at this point in the history

  4. more deferred fixes

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    9d97e8d View commit details
    Browse the repository at this point in the history

  5. remove debug

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    3d42dc8 View commit details
    Browse the repository at this point in the history

  6. reword a comment

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    aadeef5 View commit details
    Browse the repository at this point in the history

  7. fmt

    @robtfm
    robtfm committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    9365007 View commit details
    Browse the repository at this point in the history