tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SoundSystem Improvements (#3697)

Browse Source 
* Refactor all audio to use the new SoundSystem.

* Update submodule

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Acruid
2021-03-21 09:12:03 -07:00
committed by GitHub
parent d4030edff6
commit 9459400002
104 changed files with 401 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs
View File

@@ -2,7 +2,6 @@
using Content.Client.Interfaces;
using Content.Shared.Audio;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Content.Shared;
using Robust.Shared.Audio;
using Robust.Shared.Configuration;
@@ -13,6 +12,7 @@ using Robust.Shared.Random;
using Robust.Client;
using Robust.Client.State;
using Content.Client.State;
using Robust.Shared.Player;
namespace Content.Client.GameObjects.EntitySystems
{
@@ -25,9 +25,7 @@ namespace Content.Client.GameObjects.EntitySystems
[Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IBaseClient _client = default!;
[Dependency] private readonly IClientGameTicker _clientGameTicker = default!;
private AudioSystem _audioSystem = default!;
private SoundCollectionPrototype _ambientCollection = default!;
private AudioParams _ambientParams = new(-10f, 1, "Master", 0, 0, AudioMixTarget.Stereo, true, 0f);
@@ -40,8 +38,6 @@ namespace Content.Client.GameObjects.EntitySystems
{
base.Initialize();
_audioSystem = Get<AudioSystem>();
_ambientCollection = _prototypeManager.Index<SoundCollectionPrototype>("AmbienceBase");
_configManager.OnValueChanged(CCVars.AmbienceBasicEnabled, AmbienceCVarChanged);
@@ -130,7 +126,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
EndAmbience();
var file = _robustRandom.Pick(_ambientCollection.PickFiles);
_ambientStream = _audioSystem.Play(file, _ambientParams);
_ambientStream = SoundSystem.Play(Filter.Local(), file, _ambientParams);
}
private void EndAmbience()
@@ -174,7 +170,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
return;
}
_lobbyStream = _audioSystem.Play(file, _lobbyParams);
_lobbyStream = SoundSystem.Play(Filter.Local(), file, _lobbyParams);
}
private void EndLobbyMusic()