toggling hud toggles bloom setting
This commit is contained in:
parent
ba28b9470d
commit
872142946c
|
@ -1,6 +1,7 @@
|
||||||
use crate::{settings, actor, audio};
|
use crate::{settings, actor, audio};
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
|
use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
|
||||||
|
use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings};
|
||||||
use std::collections::VecDeque;
|
use std::collections::VecDeque;
|
||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
|
|
||||||
|
@ -202,6 +203,7 @@ fn update(
|
||||||
mut query: Query<&mut Text, With<GaugesText>>,
|
mut query: Query<&mut Text, With<GaugesText>>,
|
||||||
query_all_actors: Query<&actor::Actor>,
|
query_all_actors: Query<&actor::Actor>,
|
||||||
) {
|
) {
|
||||||
|
// TODO only when hud is actually on
|
||||||
if timer.0.tick(time.delta()).just_finished() {
|
if timer.0.tick(time.delta()).just_finished() {
|
||||||
let player = player.get_single();
|
let player = player.get_single();
|
||||||
if player.is_ok() {
|
if player.is_ok() {
|
||||||
|
@ -236,20 +238,25 @@ fn handle_input(
|
||||||
keyboard_input: Res<ButtonInput<KeyCode>>,
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
||||||
mut settings: ResMut<settings::Settings>,
|
mut settings: ResMut<settings::Settings>,
|
||||||
mut query: Query<&mut Visibility, With<GaugesText>>,
|
mut query: Query<&mut Visibility, With<GaugesText>>,
|
||||||
|
mut query_bloomsettings: Query<&mut BloomSettings>,
|
||||||
mut evwriter: EventWriter<audio::AudioSwitchEvent>,
|
mut evwriter: EventWriter<audio::AudioSwitchEvent>,
|
||||||
mut evwriter_togglemusic: EventWriter<audio::ToggleMusicEvent>,
|
mut evwriter_togglemusic: EventWriter<audio::ToggleMusicEvent>,
|
||||||
) {
|
) {
|
||||||
if keyboard_input.just_pressed(settings.key_togglehud) {
|
if keyboard_input.just_pressed(settings.key_togglehud) {
|
||||||
for mut vis in &mut query {
|
for mut vis in &mut query {
|
||||||
|
if let Ok(mut bloomsettings) = query_bloomsettings.get_single_mut() {
|
||||||
if *vis == Visibility::Inherited {
|
if *vis == Visibility::Inherited {
|
||||||
*vis = Visibility::Hidden;
|
*vis = Visibility::Hidden;
|
||||||
settings.hud_active = false;
|
settings.hud_active = false;
|
||||||
|
bloomsettings.composite_mode = BloomCompositeMode::EnergyConserving;
|
||||||
} else {
|
} else {
|
||||||
*vis = Visibility::Inherited;
|
*vis = Visibility::Inherited;
|
||||||
settings.hud_active = true;
|
settings.hud_active = true;
|
||||||
|
bloomsettings.composite_mode = BloomCompositeMode::Additive;
|
||||||
}
|
}
|
||||||
evwriter.send(audio::AudioSwitchEvent());
|
evwriter.send(audio::AudioSwitchEvent());
|
||||||
evwriter_togglemusic.send(audio::ToggleMusicEvent());
|
evwriter_togglemusic.send(audio::ToggleMusicEvent());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ impl Plugin for OutFlyPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn setup(
|
fn setup(
|
||||||
//mut commands: Commands,
|
|
||||||
mut windows: Query<&mut Window, With<PrimaryWindow>>
|
mut windows: Query<&mut Window, With<PrimaryWindow>>
|
||||||
) {
|
) {
|
||||||
for mut window in &mut windows {
|
for mut window in &mut windows {
|
||||||
|
|
|
@ -13,6 +13,7 @@ const MARS_SIZE: f32 = 10.0;
|
||||||
const SUN_SIZE: f32 = 5000.0;
|
const SUN_SIZE: f32 = 5000.0;
|
||||||
const ASTRONAUT_SIZE: f32 = 5.0;
|
const ASTRONAUT_SIZE: f32 = 5.0;
|
||||||
|
|
||||||
|
const SUN_BRIGHTNESS: f32 = 1e5;
|
||||||
const SKYBOX_BRIGHTNESS: f32 = 300.0;
|
const SKYBOX_BRIGHTNESS: f32 = 300.0;
|
||||||
|
|
||||||
const ASSET_CUBEMAP: &str = "textures/stars_cubemap.png";
|
const ASSET_CUBEMAP: &str = "textures/stars_cubemap.png";
|
||||||
|
@ -147,7 +148,7 @@ pub fn setup(
|
||||||
|
|
||||||
// Add THE SUN
|
// Add THE SUN
|
||||||
let hydrogenfusion_handle = materials.add(StandardMaterial {
|
let hydrogenfusion_handle = materials.add(StandardMaterial {
|
||||||
emissive: Color::rgb_linear(1e6, 0.9e6, 1e6),
|
emissive: Color::rgb_linear(SUN_BRIGHTNESS, 0.9 * SUN_BRIGHTNESS, SUN_BRIGHTNESS),
|
||||||
..default()
|
..default()
|
||||||
});
|
});
|
||||||
commands.spawn(PbrBundle {
|
commands.spawn(PbrBundle {
|
||||||
|
|
Loading…
Reference in a new issue