forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

color_grading: update UI when camera settings changed (#13589)

Browse Source 
# Objective

- In #13542 I broke example `color_grading`: the UI is not updated to
reflect changed camera settings
- Fixes #13590.

## Solution

- Update the UI when changing color grading
This commit is contained in:
François Mockers 2024-05-31 08:42:05 +02:00 committed by GitHub
parent 31955cc78b
commit cf7d810980
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/3d/color_grading.rs
View File

@ -568,11 +568,11 @@ fn update_ui_state(
mut buttons: Query<(&mut UiImage, &mut BorderColor, &ColorGradingOptionWidget)>, mut buttons: Query<(&mut UiImage, &mut BorderColor, &ColorGradingOptionWidget)>,
mut button_text: Query<(&mut Text, &ColorGradingOptionWidget), Without<HelpText>>, mut button_text: Query<(&mut Text, &ColorGradingOptionWidget), Without<HelpText>>,
mut help_text: Query<&mut Text, With<HelpText>>, mut help_text: Query<&mut Text, With<HelpText>>,
cameras: Query<&ColorGrading>, cameras: Query<Ref<ColorGrading>>,
currently_selected_option: Res<SelectedColorGradingOption>, currently_selected_option: Res<SelectedColorGradingOption>,
) { ) {
// Exit early if the UI didn't change // Exit early if the UI didn't change
if !currently_selected_option.is_changed() { if !currently_selected_option.is_changed() && !cameras.single().is_changed() {
return; return;
} }
@ -587,10 +587,12 @@ fn update_ui_state(
} }
} }
let value_label = cameras let value_label = cameras.iter().next().map(|color_grading| {
.iter() format!(
.next() "{:.3}",
.map(|color_grading| format!("{:.3}", currently_selected_option.get(color_grading))); currently_selected_option.get(color_grading.as_ref())
)
});
// Update the buttons. // Update the buttons.
for (mut text, widget) in button_text.iter_mut() { for (mut text, widget) in button_text.iter_mut() {
@ -642,7 +644,8 @@ fn adjust_color_grading_option(
delta += OPTION_ADJUSTMENT_SPEED; delta += OPTION_ADJUSTMENT_SPEED;
} }
for mut color_grading in cameras.iter_mut() { if delta != 0.0 {
let mut color_grading = cameras.single_mut();
let new_value = currently_selected_option.get(&color_grading) + delta; let new_value = currently_selected_option.get(&color_grading) + delta;
currently_selected_option.set(&mut color_grading, new_value); currently_selected_option.set(&mut color_grading, new_value);
} }