mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'treeco/fix-audio-panic' into 'master'
Fix Rodio panic See merge request veloren/veloren!4420
This commit is contained in:
commit
95cddc6b63
@ -23,7 +23,7 @@ use vek::*;
|
|||||||
|
|
||||||
use crate::hud::Subtitle;
|
use crate::hud::Subtitle;
|
||||||
|
|
||||||
#[derive(Default, Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Listener {
|
pub struct Listener {
|
||||||
pub pos: Vec3<f32>,
|
pub pos: Vec3<f32>,
|
||||||
pub ori: Vec3<f32>,
|
pub ori: Vec3<f32>,
|
||||||
@ -32,6 +32,17 @@ pub struct Listener {
|
|||||||
ear_right_rpos: Vec3<f32>,
|
ear_right_rpos: Vec3<f32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Listener {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
pos: Default::default(),
|
||||||
|
ori: Default::default(),
|
||||||
|
ear_left_rpos: Vec3::unit_x(),
|
||||||
|
ear_right_rpos: -Vec3::unit_x(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Holds information about the system audio devices and internal channels used
|
/// Holds information about the system audio devices and internal channels used
|
||||||
/// for sfx and music playback. An instance of `AudioFrontend` is used by
|
/// for sfx and music playback. An instance of `AudioFrontend` is used by
|
||||||
/// Voxygen's [`GlobalState`](../struct.GlobalState.html#structfield.audio) to
|
/// Voxygen's [`GlobalState`](../struct.GlobalState.html#structfield.audio) to
|
||||||
|
Loading…
Reference in New Issue
Block a user