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] - Rebase of existing PBR work #1554

Closed
wants to merge 58 commits into from
Closed

[Merged by Bors] - Rebase of existing PBR work #1554

wants to merge 58 commits into from
+520 −131

Commits on Mar 19, 2021

  1. semi working pbr.

    @StarArawn @cart
    StarArawn authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    13c552a View commit details
    Browse the repository at this point in the history

  2. More changes.

    @StarArawn @cart
    StarArawn authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    cc1a4ba View commit details
    Browse the repository at this point in the history

  3. Removed unused vars.

    @StarArawn @cart
    StarArawn authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    8975234 View commit details
    Browse the repository at this point in the history

  4. example/pbr added, example/msaa restored to a simple box

    @IngmarBitter @cart
    IngmarBitter authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    13d1629 View commit details
    Browse the repository at this point in the history

  5. to fix: spheres appear in default color, not the one specified in the… 

    … material
    @IngmarBitter @cart
    IngmarBitter authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    13a9baa View commit details
    Browse the repository at this point in the history

  6. vary key PBR parameters on a grid of spheres to show the effect

    @IngmarBitter @cart
    IngmarBitter authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    5ef2912 View commit details
    Browse the repository at this point in the history

  7. Improve example PBR parameter calculation

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    5a5e1ae View commit details
    Browse the repository at this point in the history

  8. Remove unused variable and comments

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    1a2e022 View commit details
    Browse the repository at this point in the history

  9. Use from_xyz

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    0ebeb11 View commit details
    Browse the repository at this point in the history

  10. Correct default roughness/metallic

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f8c3c7c View commit details
    Browse the repository at this point in the history

  11. Add perceptualRoughness->roughness and clamping

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    96dce66 View commit details
    Browse the repository at this point in the history

  12. Remove commented code

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    c9cc858 View commit details
    Browse the repository at this point in the history

  13. Reorder fields

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    56dd585 View commit details
    Browse the repository at this point in the history

  14. whitespace

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    314b64f View commit details
    Browse the repository at this point in the history

  15. Use world position

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    e55ff3e View commit details
    Browse the repository at this point in the history

  16. Rework, fix and document

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    3b3e33a View commit details
    Browse the repository at this point in the history

  17. Rename albedo->base_color, pbr->roughness/metallic

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    dd9f2bc View commit details
    Browse the repository at this point in the history

  18. Add reflectance material property

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f8e744d View commit details
    Browse the repository at this point in the history

  19. Add .clang-format for GLSL

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    08afa11 View commit details
    Browse the repository at this point in the history

  20. Document standard PBR properties

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    81523f8 View commit details
    Browse the repository at this point in the history

  21. Add comment to base_color_factor mentioning albedo

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    177ece9 View commit details
    Browse the repository at this point in the history

  22. Swizzle using .rgb for colors

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    d1c2e41 View commit details
    Browse the repository at this point in the history

  23. Document attenuation and light accumulation 

    Add physically correct 1/4PI
    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f0a8cbf View commit details
    Browse the repository at this point in the history

  24. Fix #ifdef STANDARDMATERIAL_BASE_COLOR_TEXTURE

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f6f15f8 View commit details
    Browse the repository at this point in the history

  25. Add reinhard_luminance tonemapping

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    0944cd8 View commit details
    Browse the repository at this point in the history

  26. Fix examples by adding light radius of 20.0

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    2c3e5e5 View commit details
    Browse the repository at this point in the history

  27. Fix wireframe example

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    b989da5 View commit details
    Browse the repository at this point in the history

  28. Rename light.radius to light.range

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    c2c965c View commit details
    Browse the repository at this point in the history

  29. Adjust comments

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    ac7a88e View commit details
    Browse the repository at this point in the history

  30. Remove 1/4PI term

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    da36141 View commit details
    Browse the repository at this point in the history

  31. Add most basic ambient term

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    2f6ccce View commit details
    Browse the repository at this point in the history

  32. Disable gamma correction

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    917d1cf View commit details
    Browse the repository at this point in the history

  33. Add PBR parameter newtypes/enums for CPU remapping

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    a3fb860 View commit details
    Browse the repository at this point in the history

  34. Use gold in pbr example

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    07f2f9f View commit details
    Browse the repository at this point in the history

  35. Revert "Add PBR parameter newtypes/enums for CPU remapping" 

    This reverts commit eaaa172.
    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f720ffc View commit details
    Browse the repository at this point in the history

  36. Add comment about not using mix

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    85a695e View commit details
    Browse the repository at this point in the history

  37. Fix bad commit

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    79a4d0a View commit details
    Browse the repository at this point in the history

  38. Hoist NdotV out of light loop

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    c57e56d View commit details
    Browse the repository at this point in the history

  39. Move light closer in pbr example

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    4b358ba View commit details
    Browse the repository at this point in the history

  40. Better ambient term

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    fdc07ab View commit details
    Browse the repository at this point in the history

  41. Remove unused imports

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    aaafa67 View commit details
    Browse the repository at this point in the history

  42. Remove unused import

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    39c6b28 View commit details
    Browse the repository at this point in the history

  43. Fix failing test

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    c3d1085 View commit details
    Browse the repository at this point in the history

  44. Premultiply light color by intensity

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    0eb6a1b View commit details
    Browse the repository at this point in the history

  45. Calculate buffer_size once

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    2dad217 View commit details
    Browse the repository at this point in the history

  46. Extend default light range, simplifying examples

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    ca2b45a View commit details
    Browse the repository at this point in the history

  47. Added additional comment to roughness default

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    9826371 View commit details
    Browse the repository at this point in the history

  48. Remove _factor from StandardMaterial properties

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    25b14dc View commit details
    Browse the repository at this point in the history

  49. Remove .clang-format

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    23bd4b3 View commit details
    Browse the repository at this point in the history

  50. Remove forward in pipeline naming

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    1666f45 View commit details
    Browse the repository at this point in the history

  51. Clear and consistent input/output naming

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    97d034a View commit details
    Browse the repository at this point in the history

  52. Add PBR example to example README.md

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    f623307 View commit details
    Browse the repository at this point in the history

  53. Remove unused v_Position and clean up

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    20984af View commit details
    Browse the repository at this point in the history

  54. Remove comment about 'aspirational' name pbr

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    9cbb811 View commit details
    Browse the repository at this point in the history

  55. Uncomment //unused float in pbr.frag

    @mtsr @cart
    mtsr authored and cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    36d5608 View commit details
    Browse the repository at this point in the history

  56. Add camera position and update shaders

    @cart
    cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    1d4d606 View commit details
    Browse the repository at this point in the history

  57. increase default intensity

    @cart
    cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    5f47748 View commit details
    Browse the repository at this point in the history

  58. rename "pipeline" to "pbr_pipeline"

    @cart
    cart committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    243b7dc View commit details
    Browse the repository at this point in the history