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

Tonemapping example refactor #1

Merged
merged 6 commits into from
Feb 16, 2023
Merged

Tonemapping example refactor #1

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6630c15
WIP tonemapping example refactor
JMS55 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
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
8 changes: 4 additions & 4 deletions crates/bevy_core_pipeline/src/tonemapping/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ pub struct TonemappingPipeline {
#[reflect(FromReflect)]
pub enum TonemappingMethod {
None,
/// Suffers from lots hue shifting, brights don't desaturate naturally.
/// Suffers from lots hue of shifting, brights don't desaturate naturally.
JMS55 marked this conversation as resolved.
Show resolved Hide resolved
Reinhard,
/// Old bevy default. Suffers from hue shifting, brights don't desaturate much at all.
ReinhardLuminance,
/// Bad
Aces,
ACES,
/// Very Good
AgX,
/// Also good
Expand Down Expand Up @@ -123,7 +123,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
TonemappingMethod::ReinhardLuminance => {
shader_defs.push("TONEMAP_METHOD_REINHARD_LUMINANCE".into());
}
TonemappingMethod::Aces => shader_defs.push("TONEMAP_METHOD_ACES".into()),
TonemappingMethod::ACES => shader_defs.push("TONEMAP_METHOD_ACES".into()),
TonemappingMethod::AgX => shader_defs.push("TONEMAP_METHOD_AGX".into()),
TonemappingMethod::SomewhatBoringDisplayTransform => {
shader_defs.push("TONEMAP_METHOD_SOMEWHAT_BORING_DISPLAY_TRANSFORM".into())
Expand Down Expand Up @@ -264,7 +264,7 @@ pub fn get_lut_bindings<'a>(
TonemappingMethod::None
| TonemappingMethod::Reinhard
| TonemappingMethod::ReinhardLuminance
| TonemappingMethod::Aces
| TonemappingMethod::ACES
| TonemappingMethod::AgX
| TonemappingMethod::SomewhatBoringDisplayTransform => &tonemapping_luts.agx,
TonemappingMethod::TonyMcMapface => &tonemapping_luts.tony_mc_mapface,
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_pbr/src/material.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ pub fn queue_material_meshes<M: Material>(
TonemappingMethod::ReinhardLuminance => {
MeshPipelineKey::TONEMAP_METHOD_REINHARD_LUMINANCE
}
TonemappingMethod::Aces => MeshPipelineKey::TONEMAP_METHOD_ACES,
TonemappingMethod::ACES => MeshPipelineKey::TONEMAP_METHOD_ACES,
TonemappingMethod::AgX => MeshPipelineKey::TONEMAP_METHOD_AGX,
TonemappingMethod::SomewhatBoringDisplayTransform => {
MeshPipelineKey::TONEMAP_METHOD_SOMEWHAT_BORING_DISPLAY_TRANSFORM
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_sprite/src/mesh2d/material.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ pub fn queue_material2d_meshes<M: Material2d>(
TonemappingMethod::ReinhardLuminance => {
Mesh2dPipelineKey::TONEMAP_METHOD_REINHARD_LUMINANCE
}
TonemappingMethod::Aces => Mesh2dPipelineKey::TONEMAP_METHOD_ACES,
TonemappingMethod::ACES => Mesh2dPipelineKey::TONEMAP_METHOD_ACES,
TonemappingMethod::AgX => Mesh2dPipelineKey::TONEMAP_METHOD_AGX,
TonemappingMethod::SomewhatBoringDisplayTransform => {
Mesh2dPipelineKey::TONEMAP_METHOD_SOMEWHAT_BORING_DISPLAY_TRANSFORM
Expand Down
Loading