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.

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

[Merged by Bors] - Initial tonemapping options #7594

Closed
wants to merge 88 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
b50ab5e
setup initial tonemapping options
DGriffin91 Feb 10, 2023
12c1d45
exr support, more tonemapping, initial test scene
DGriffin91 Feb 12, 2023
a716ef8
add AgX
DGriffin91 Feb 12, 2023
5284938
improve test scene, make methods selectable
DGriffin91 Feb 12, 2023
7300d3e
improve test scenes
DGriffin91 Feb 12, 2023
e77346a
disable grading, fix exmaple test patterns
DGriffin91 Feb 12, 2023
74a8eaf
update example descriptions, tweak settings
DGriffin91 Feb 12, 2023
cd2234b
add blender filmic
DGriffin91 Feb 13, 2023
68a333e
use include_bytes for luts image
DGriffin91 Feb 13, 2023
0c3bf82
make tonemapping work in main pass and sprites
DGriffin91 Feb 14, 2023
95ad250
use 3d LUTs
DGriffin91 Feb 14, 2023
3c6b223
remove bindings from sprite/mesh2d, make tonemapping work in custom t…
DGriffin91 Feb 14, 2023
b628e9a
remove tonemapping bindings from sprite wgsl
DGriffin91 Feb 14, 2023
bf3a340
add basic color grading controls
DGriffin91 Feb 14, 2023
8edb5c2
fix ci stuff, clean up tonemapping code
DGriffin91 Feb 15, 2023
69b3efa
Merge remote-tracking branch 'origin' into tonemap_options
DGriffin91 Feb 15, 2023
d6cf573
merge in main
DGriffin91 Feb 15, 2023
a63ae5a
improve tonemapping example
DGriffin91 Feb 15, 2023
bdb52c8
update sbdt2
DGriffin91 Feb 15, 2023
7cd3a38
misc nits
DGriffin91 Feb 15, 2023
a3405c1
use exr for sbdt2 for now
DGriffin91 Feb 15, 2023
c6dbd4a
remove pr 7564 task pool stuff
DGriffin91 Feb 15, 2023
4535489
use ktx2 for luts, update naming
DGriffin91 Feb 16, 2023
16904fe
remove exr from default features
DGriffin91 Feb 16, 2023
6630c15
WIP tonemapping example refactor
JMS55 Feb 16, 2023
dad817f
update ACES to base implementation without white parameter
DGriffin91 Feb 16, 2023
bfa26d9
More WIP tonemap example
JMS55 Feb 16, 2023
53c810b
Add reset color grading
JMS55 Feb 16, 2023
7b6e43f
Add back matched color grading
JMS55 Feb 16, 2023
3866632
Rename ACES
JMS55 Feb 16, 2023
3d9bebf
Update crates/bevy_core_pipeline/src/tonemapping/mod.rs
JMS55 Feb 16, 2023
2488305
Merge pull request #1 from JMS55/tonemap_options
DGriffin91 Feb 16, 2023
fd85e9d
Revert "Tonemapping example refactor "
DGriffin91 Feb 16, 2023
291ce1f
Merge pull request #2 from DGriffin91/revert-1-tonemap_options
DGriffin91 Feb 16, 2023
afe9ad5
Fix bug
JMS55 Feb 16, 2023
1dac246
Fix bugfix
JMS55 Feb 16, 2023
f128b53
Add reset to scene default vs regular default
JMS55 Feb 16, 2023
7890cc4
Fix mixmatched keys
JMS55 Feb 16, 2023
314bf50
Save color grading per method
JMS55 Feb 16, 2023
0f14b42
Chnage controls
JMS55 Feb 16, 2023
e07121d
Merge branch 'tonemap_options' into tonemap_options
DGriffin91 Feb 16, 2023
315379b
Merge pull request #4 from JMS55/tonemap_options
DGriffin91 Feb 16, 2023
79b5e19
tweak example
DGriffin91 Feb 16, 2023
de00f72
move around entities
DGriffin91 Feb 16, 2023
60b3281
remove TonemappingMethod, make Dither separate Component
DGriffin91 Feb 16, 2023
2011fca
fix crash on arrow up, bring back hide option
DGriffin91 Feb 16, 2023
964cf81
build-example-pages
DGriffin91 Feb 16, 2023
f7b8a94
fix sprite/mesh2d
DGriffin91 Feb 17, 2023
510fda5
improve hide ui ui
DGriffin91 Feb 17, 2023
51c028c
fix ci/clippy errors
DGriffin91 Feb 17, 2023
77f1c28
Merge remote-tracking branch 'origin/main' into tonemap_options
DGriffin91 Feb 17, 2023
cf27b91
improve texture sample exclusion logic
DGriffin91 Feb 17, 2023
e461f83
fix color sweep shader
DGriffin91 Feb 17, 2023
6ebc9aa
remove old godot aces code
DGriffin91 Feb 17, 2023
959748d
update tony_mc_mapface file and attribution
DGriffin91 Feb 17, 2023
5a46cb0
add info for creating luts
DGriffin91 Feb 18, 2023
feabb2a
use ACES Fitted name everywhere
DGriffin91 Feb 18, 2023
d9780d2
add docstring for debanding dither
DGriffin91 Feb 18, 2023
2b2a1bb
Merge branch 'tonemap_options' of https://github.com/DGriffin91/bevy …
DGriffin91 Feb 18, 2023
6412a32
rename Dither component to DebandDither
DGriffin91 Feb 18, 2023
51695a4
remove rgb_to_srgb_simple
DGriffin91 Feb 18, 2023
5e2846f
use tone_mapping for sprite
DGriffin91 Feb 18, 2023
d8a30ac
use tone_mapping for mesh2d and color material
DGriffin91 Feb 18, 2023
c06fc0b
capitalize Tonemapping in Cargo.toml
DGriffin91 Feb 18, 2023
66cb51b
reuse cube mesh
DGriffin91 Feb 18, 2023
43dad10
ColorGrading definitions
DGriffin91 Feb 18, 2023
2053b6a
Tonemapping descriptions
DGriffin91 Feb 18, 2023
25d0d68
update tonemapping descriptions
DGriffin91 Feb 18, 2023
4cbbe25
fix color sweep x offset and add description
DGriffin91 Feb 18, 2023
8acf28b
description for continuous_hue
DGriffin91 Feb 18, 2023
a26b71d
update SomewhatBoringDisplayTransform description
DGriffin91 Feb 18, 2023
647436a
fix dithering nan issue
DGriffin91 Feb 18, 2023
b3a260d
Reset all with space/enter
DGriffin91 Feb 18, 2023
ff38ae7
automatic links for doc check
DGriffin91 Feb 18, 2023
173d3e9
component definitions
DGriffin91 Feb 18, 2023
a354928
TonemappingLuts doc string
DGriffin91 Feb 18, 2023
d0e891e
PipelineKey spacing
DGriffin91 Feb 18, 2023
c336932
ColorGrading doc string
DGriffin91 Feb 18, 2023
2cef295
fix ifdef spacing
DGriffin91 Feb 18, 2023
86e3e09
revert pi precision
DGriffin91 Feb 18, 2023
2530b0c
tonemapping doc string
DGriffin91 Feb 18, 2023
1507b7d
ImageFormat::Exr -> ImageFormat::OpenExr
DGriffin91 Feb 18, 2023
819e768
use full path for camera doc
DGriffin91 Feb 18, 2023
ec8355f
make including luts a default feature
DGriffin91 Feb 18, 2023
cfd37da
keep detection of tonemapping change on the node
DGriffin91 Feb 19, 2023
2b342e9
Update crates/bevy_core_pipeline/src/tonemapping/mod.rs
DGriffin91 Feb 19, 2023
abf5056
Update crates/bevy_core_pipeline/src/tonemapping/tonemapping_shared.wgsl
DGriffin91 Feb 19, 2023
d50e9be
Apply suggestions from code review
DGriffin91 Feb 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tonemapping doc string
  • Loading branch information
DGriffin91 committed Feb 18, 2023
commit 2530b0c846ce79ea0a2bd8c73312c5342213e23d
2 changes: 1 addition & 1 deletion crates/bevy_core_pipeline/src/tonemapping/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ pub struct TonemappingPipeline {
texture_bind_group: BindGroupLayout,
}

/// Optionally enables a tonemapping shader that maps the high dynamic range (HDR) image data into a low dynamic range (LDR) image for a given [`Camera`] entity.
/// Optionally enables a tonemapping shader that attempts to map linear input stimulus into a perceptually uniform image for a given [`Camera`] entity.
#[derive(
Component,
Debug,
Expand Down