Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for fading sounds

Browse Source
This commit is contained in:
Louis Pearson
2019-08-31 02:30:23 -06:00
parent 9dc1f8f549
commit 447cfec19f
6 changed files with 146 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
voxygen/src/menu/main/mod.rs
View File

@ -3,7 +3,7 @@ mod start_singleplayer;
mod ui;
use super::char_selection::CharSelectionState;
use crate::{window::Event, Direction, GlobalState, PlayState, PlayStateResult};
use crate::{audio::fader::Fader, window::Event, Direction, GlobalState, PlayState, PlayStateResult};
use client_init::{ClientInit, Error as InitError};
use common::{clock::Clock, comp};
use log::warn;
@ -34,7 +34,8 @@ impl PlayState for MainMenuState {
// Used for client creation.
let mut client_init: Option<ClientInit> = None;
global_state.audio.play_sound("voxygen.audio.soundtrack.veloren_title_tune-3".to_string());
let music = global_state.audio.play_sound("voxygen.audio.soundtrack.veloren_title_tune-3".to_string());
global_state.audio.stop_channel(music, Fader::fade_out(10.0));
loop {
// Handle window events.
@ -78,7 +79,7 @@ impl PlayState for MainMenuState {
}
// Maintain global_state
global_state.maintain();
global_state.maintain(clock.get_last_delta().as_secs_f32());
// Maintain the UI.
for event in self.main_menu_ui.maintain(global_state) {