-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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.
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
HDR Rendering #7017
Merged
HDR Rendering #7017
Changes from 67 commits
Commits
Show all changes
107 commits
Select commit
Hold shift + click to select a range
a5ef38b
HDR WIP. Add Reinhard tonemapping. [ci skip]
bagnell f0ddfd8
Output sun texture to floating point texture.
bagnell 6882ea6
Actually render to float texture. [ci skip]
bagnell 1698aad
Bloom WIP. [ci skip].
bagnell e003b9e
Testing different blur.
bagnell 0cd0862
Revert shaders. Use another bright pass filter WIP. [ci skip]
bagnell adbf667
Add different tonemappers WIP. [ci skip]
bagnell 095c1af
Merge branch 'master' into hdr
bagnell 7d48a5f
Fix after merge.
bagnell 06d89eb
Merge branch 'master' into hdr
bagnell 4d47dcc
Auto exposure WIP. [ci skip]
bagnell 6496236
Gamma correction.
bagnell 3b1fc7e
Auto exposure WIP. [ci skip]
bagnell 7ebf78c
Auto exposure WIP. [ci skip]
bagnell 2ac1f32
Fix auto exposure flicker. [ci skip]
bagnell 6d59847
Merge branch 'master' into hdr
bagnell 4386f78
Clean up.
bagnell 8cf28a6
Modify tonemapping constants, globe, fog, and atmosphere
ggetz 0b0b5d5
Merge branch 'master' into hdr
bagnell 8aee74a
Tweak fog appearance"
ggetz c5124fe
Fix auto exposure decimation.
bagnell bf29856
Fix blend with previous frame luminance.
bagnell 5992e84
Bloom WIP. [ci skip]
bagnell 8c14a73
Correct gamma correction for glTF 2.0 models, billboards, and materia…
bagnell f815fe9
Fix remaining gamma correction issues.
bagnell a909eae
Merge branch 'master' into hdr
bagnell 1cc7708
Modify sun lighting. Option to use camera as light source.
bagnell bfa7ee4
Tweak gamma to neutral and modify ACES values
ggetz 8b1ac52
Better mapping constants, sun color is white-blue
ggetz 4d1188f
Merge branch 'master' into hdr
bagnell 8667a71
Merge branch 'atmosphere' into hdr-atmosphere
bagnell d851ce5
Fix after merge.
bagnell 95bb621
Merge branch 'atmosphere' into hdr-atmosphere
bagnell ad648f3
Compute the atmosphere color per-fragment for smoother night-day tran…
bagnell 33a7b40
Merge branch 'master' into hdr
bagnell 5794f95
Merge branch 'atmosphere' into hdr-atmosphere
bagnell ea441c4
Merge branch 'hdr' into hdr-atmosphere
bagnell 17efa5a
Merge branch 'float-linear' into hdr
bagnell 187e8cb
Merge branch 'hdr' into hdr-atmosphere
bagnell 37a4e00
Merge branch 'master' into hdr
bagnell 97d31b8
Merge branch 'hdr' into hdr-atmosphere
bagnell e8ffa88
Merge branch 'atmosphere' into hdr-atmosphere
bagnell 09a791b
Merge branch 'float-linear' into hdr
bagnell da3bce1
Add ability to change the tonemapping operator, but keep it private f…
bagnell 2d888fe
Switch back to using half-floats.
bagnell 129e50e
Clean up auto-exposure usage.
bagnell 1e2bcd3
Revert bloom changes for now. [ci skip]
bagnell 2bb0043
Add doc. [ci skip]
bagnell 6056feb
Merge branch 'remove-deprecated-fxaa' into hdr
bagnell 51e8523
Fix sun extending beyond texture.
bagnell 9353d45
Use half-floats when supported.
bagnell a6f2e72
Add flag for HDR (need to modify shaders). Clean up phong lighting.
bagnell 84ecd4b
Clean up shaders.
bagnell 1dc42bc
Add HDR derived commands to add an HDR define when supported. Otherwi…
bagnell 9e39ad8
Fix gamma correction when HDR is disabled.
bagnell b9c9073
Pass globe eye position when HDR enabled.
bagnell effe4d7
Merge branch 'master' into hdr
bagnell 6a6ca8a
Update CHANGES.md after merge.
bagnell dd357da
Merge branch 'atmosphere' into hdr
bagnell 132b933
Fix some tests and a copy-paste error.
bagnell bc0856d
Merge branch 'atmosphere' into hdr
bagnell bbde12b
Fix after merge.
bagnell 2dbfe37
More fixes after merge.
bagnell 42ad8d9
Updates for derived command from scene re-work.
bagnell fb5d165
Merge branch 'master' into hdr
bagnell 5a0802f
Fixes after merge.
bagnell fb950f8
Updates from review.
bagnell ec4712b
Merge branch 'master' into hdr
bagnell 0fcf8c5
Fix gamma correction for PerInstanceColorAppearance.
bagnell 594a9b4
Fix some issues with gamma correction.
bagnell 998f3e2
Fix glTF 1.0 model gamma correction.
bagnell 209ec90
Fix globe day/night shading.
bagnell 260c0e6
Fix point cloud gamma correction.
bagnell f72afd3
Update imagery contrast.
bagnell 4d911f8
Fix background color gamma correction.
bagnell 7cada27
Fix shadows and a typo.
bagnell d4ca95f
Merge branch 'master' into hdr
bagnell b0541b0
Fix picking and another typo.
bagnell b8144a9
Fix tests.
bagnell 7b011f1
Fix DOF.
bagnell faf1904
Update doc.
bagnell 4051515
Merge branch 'master' into hdr
bagnell 15dbe1e
Fix typo after merge.
bagnell 2066481
Merge branch 'master' into hdr
bagnell 0019163
Make czm_sunColor a Cartesian3.
bagnell bd5cb7f
Add automatic uniforms tests.
bagnell aeb9abd
Fix toggling HDR.
bagnell 8d0f552
Fix crash when toggling HDR because globe tile resources were destroyed.
bagnell 6dac90e
Add tonemapping tests and an HDR test.
bagnell 2741e35
Merge branch 'master' into hdr
bagnell 55bfbe3
Fix test.
bagnell 44d53e5
Fix failing WebGL stub test.
bagnell c33ad4b
Merge branch 'master' into hdr
bagnell fba7324
Fix gamma correct for billboard color.
bagnell 6184f61
Gamma correct 3D Tiles styling color.
bagnell 25efa79
Fix composite material example.
bagnell fa12020
Merge branch 'master' into hdr
bagnell f82229a
Update CHANGES.md.
bagnell 3088019
Globe HDR visual tweaks
lilleyse c6cb009
Merge branch 'master' into hdr
bagnell a98c9c6
Merge branch 'master' into hdr
lilleyse 4c33a68
Fix gamma correction on some 3D Tiles.
bagnell 6f27325
Fix IE crash by removing const expression.
bagnell 8492d35
Update for models with KHR_techniques_webgl from review.
bagnell 171ccb2
Update from review.
bagnell 7a062bc
Fix issue with cached glTFs.
bagnell ac63b95
Fix extra gamma correct.
bagnell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is alpha used for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I put this in to pack an additional intensity above 1. We should probably expose this at the scene level API as a separate property for clarity.