-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 05daf15 Author: LAGonauta <[email protected]> Date: Mon Dec 4 21:20:25 2023 -0500 Add basic settings manager So cvars are not sprinkled on the codebase
- Loading branch information
Showing
12 changed files
with
187 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #pragma once | ||
|
|
||
| #include "Enums/XFiWorkaround.hpp" | ||
| #include "Enums/OccluderType.hpp" | ||
|
|
||
| namespace MetaAudio | ||
| { | ||
| class SettingsManager final | ||
| { | ||
| public: | ||
| void Init(const cl_enginefunc_t& engFuncs); | ||
|
|
||
| bool NoSound(); | ||
|
|
||
| bool OcclusionEnabled(); | ||
| bool OcclusionFade(); | ||
|
|
||
| bool ReverbEnabled(); | ||
| size_t ReverbType(); | ||
| size_t ReverbUnderwaterType(); | ||
|
|
||
| bool SoundShow(); | ||
|
|
||
| float DopplerFactor(); | ||
|
|
||
| float Volume(); | ||
|
|
||
| OccluderType Occluder(); | ||
|
|
||
| XFiWorkaround XfiWorkaround(); | ||
| }; | ||
| } | ||
|
|
||
| #ifndef _METAAUDIO_SETTINGS_MANAGER_ | ||
| #define _METAAUDIO_SETTINGS_MANAGER_ | ||
| extern MetaAudio::SettingsManager settings; | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #pragma once | ||
|
|
||
| namespace MetaAudio | ||
| { | ||
| enum class OccluderType | ||
| { | ||
| GoldSrc, | ||
| SteamAudio | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #pragma once | ||
|
|
||
| namespace MetaAudio | ||
| { | ||
| enum class XFiWorkaround | ||
| { | ||
| Disabled, | ||
| Timer, | ||
| Streaming | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| #include "snd_local.h" | ||
| #include "Config/SettingsManager.hpp" | ||
| #include "dynamic_steamaudio.h" | ||
|
|
||
| extern MetaAudio::SteamAudio gSteamAudio; | ||
|
|
||
| namespace MetaAudio | ||
| { | ||
| //engine cvars | ||
| static cvar_t* nosound = nullptr; | ||
| static cvar_t* snd_show = nullptr; | ||
| static cvar_t* sxroom_off = nullptr; | ||
| static cvar_t* sxroom_type = nullptr; | ||
| static cvar_t* sxroomwater_type = nullptr; | ||
| static cvar_t* volume = nullptr; | ||
|
|
||
| //active control | ||
| static cvar_t* al_doppler = nullptr; | ||
| static cvar_t* al_occluder = nullptr; | ||
| static cvar_t* al_occlusion = nullptr; | ||
| static cvar_t* al_occlusion_fade = nullptr; | ||
| static cvar_t* al_xfi_workaround = nullptr; | ||
|
|
||
| static constexpr char* DEFAULT_XFI_WORKAROUND = "0"; // Disabled | ||
| static constexpr char* DEFAULT_OCCLUDER = "0"; // GoldSrc | ||
| static constexpr char* DEFAULT_OCCLUSION = "1"; | ||
| static constexpr char* DEFAULT_OCCLUSION_FADE = "1"; | ||
| static constexpr char* DEFAULT_DOPPLER_FACTOR = "0.3"; | ||
|
|
||
| void SettingsManager::Init(const cl_enginefunc_t& engFuncs) | ||
| { | ||
| if (al_xfi_workaround == nullptr) al_xfi_workaround = engFuncs.pfnRegisterVariable("al_xfi_workaround", DEFAULT_XFI_WORKAROUND, FCVAR_EXTDLL); | ||
| if (al_doppler == nullptr) al_doppler = engFuncs.pfnRegisterVariable("al_doppler", DEFAULT_DOPPLER_FACTOR, FCVAR_EXTDLL); | ||
| if (gSteamAudio.iplCleanup != nullptr && al_occluder == nullptr) al_occluder = engFuncs.pfnRegisterVariable("al_occluder", DEFAULT_OCCLUDER, FCVAR_EXTDLL); | ||
| if (al_occlusion == nullptr) al_occlusion = engFuncs.pfnRegisterVariable("al_occlusion", DEFAULT_OCCLUSION, FCVAR_EXTDLL); | ||
| if (al_occlusion_fade == nullptr) al_occlusion_fade = engFuncs.pfnRegisterVariable("al_occlusion_fade", DEFAULT_OCCLUSION_FADE, FCVAR_EXTDLL); | ||
|
|
||
| if (!gEngfuncs.CheckParm("-nosound", NULL)) | ||
| { | ||
| if (nosound == nullptr) nosound = engFuncs.pfnGetCvarPointer("nosound"); | ||
| if (volume == nullptr) volume = engFuncs.pfnGetCvarPointer("volume"); | ||
| if (sxroomwater_type == nullptr) sxroomwater_type = engFuncs.pfnGetCvarPointer("waterroom_type"); | ||
| if (sxroom_type == nullptr) sxroom_type = engFuncs.pfnGetCvarPointer("room_type"); | ||
| if (sxroom_off == nullptr) sxroom_off = engFuncs.pfnGetCvarPointer("room_off"); | ||
| if (snd_show == nullptr) snd_show = engFuncs.pfnGetCvarPointer("snd_show"); | ||
| } | ||
| } | ||
|
|
||
| bool SettingsManager::NoSound() | ||
| { | ||
| return nosound == nullptr || static_cast<bool>(nosound->value); | ||
| } | ||
|
|
||
| bool SettingsManager::SoundShow() | ||
| { | ||
| return static_cast<bool>(snd_show->value); | ||
| } | ||
|
|
||
| float SettingsManager::DopplerFactor() | ||
| { | ||
| return al_doppler->value; | ||
| } | ||
|
|
||
| float SettingsManager::Volume() | ||
| { | ||
| return volume->value; | ||
| } | ||
|
|
||
| bool SettingsManager::ReverbEnabled() | ||
| { | ||
| return !static_cast<bool>(sxroom_off->value); | ||
| } | ||
|
|
||
| size_t SettingsManager::ReverbType() | ||
| { | ||
| return static_cast<size_t>(sxroom_type->value); | ||
| } | ||
|
|
||
| size_t SettingsManager::ReverbUnderwaterType() | ||
| { | ||
| return static_cast<size_t>(sxroomwater_type->value); | ||
| } | ||
|
|
||
| XFiWorkaround SettingsManager::XfiWorkaround() | ||
| { | ||
| return static_cast<XFiWorkaround>(al_xfi_workaround->value); | ||
| } | ||
|
|
||
| OccluderType SettingsManager::Occluder() | ||
| { | ||
| return al_occluder == nullptr ? OccluderType::GoldSrc : static_cast<OccluderType>(al_occluder->value); | ||
| } | ||
|
|
||
| bool SettingsManager::OcclusionEnabled() | ||
| { | ||
| return static_cast<bool>(al_occlusion->value); | ||
| } | ||
|
|
||
| bool SettingsManager::OcclusionFade() | ||
| { | ||
| return static_cast<bool>(al_occlusion_fade->value); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.