diff --git a/src/hud.rs b/src/hud.rs index 96b4eba..38688d6 100644 --- a/src/hud.rs +++ b/src/hud.rs @@ -194,7 +194,6 @@ fn setup( mut commands: Commands, settings: Res, asset_server: Res, - mut ambient_light: ResMut, mut ew_updateoverlays: EventWriter, ) { let visibility = if settings.hud_active { @@ -370,13 +369,6 @@ fn setup( )); skeleton::load("selectagon", &mut entitycmd, &*asset_server); - // AR-related things - ambient_light.brightness = if settings.hud_active { - AMBIENT_LIGHT_AR - } else { - AMBIENT_LIGHT - }; - ew_updateoverlays.send(UpdateOverlayVisibility); } @@ -654,7 +646,6 @@ fn handle_input( mut ew_togglemusic: EventWriter, mut ew_target: EventWriter, mut ew_updateoverlays: EventWriter, - mut ambient_light: ResMut, q_objects: Query<(Entity, &Transform), (With, Without, Without, Without)>, q_camera: Query<&Transform, With>, ) { @@ -665,11 +656,6 @@ fn handle_input( } if keyboard_input.just_pressed(settings.key_togglehud) { settings.hud_active ^= true; - if settings.hud_active { - ambient_light.brightness = AMBIENT_LIGHT_AR; - } else { - ambient_light.brightness = AMBIENT_LIGHT; - } ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch)); ew_togglemusic.send(audio::ToggleMusicEvent()); ew_updateoverlays.send(UpdateOverlayVisibility); @@ -815,6 +801,7 @@ fn update_poi_overlays ( fn update_overlay_visibility( mut q_marker: Query<&mut Visibility, With>, mut q_hudelement: Query<&mut Visibility, (With, Without)>, + mut ambient_light: ResMut, er_target: EventReader, settings: Res, ) { @@ -832,4 +819,10 @@ fn update_overlay_visibility( for mut vis in &mut q_hudelement { *vis = show_hud; } + + ambient_light.brightness = if settings.hud_active { + AMBIENT_LIGHT_AR + } else { + AMBIENT_LIGHT + }; }