From 0ea55810ab2d1a500236a0b6483608838c56ba44 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Tue, 1 Oct 2024 14:29:28 -0700 Subject: [PATCH] Dump and load correct volume and pitch values for T6 sound aliases --- src/Common/Game/T6/CommonT6.h | 3 + .../T6/AssetLoaders/AssetLoaderSoundBank.cpp | 63 +++++++++++++++++-- .../T6/AssetDumpers/AssetDumperSndBank.cpp | 32 ++++++++-- 3 files changed, 88 insertions(+), 10 deletions(-) diff --git a/src/Common/Game/T6/CommonT6.h b/src/Common/Game/T6/CommonT6.h index f32c9d97..dd65a968 100644 --- a/src/Common/Game/T6/CommonT6.h +++ b/src/Common/Game/T6/CommonT6.h @@ -3,12 +3,15 @@ #include "T6.h" #include +#include namespace T6 { class Common { public: + static constexpr double AMP_RATIO = 100000.0 / std::numeric_limits::max(); + static constexpr int Com_HashKey(const char* str, const int maxLen) { if (str == nullptr) diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp index 371187ab..22f62131 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp @@ -8,6 +8,7 @@ #include "Pool/GlobalAssetPool.h" #include "Utils/StringUtils.h" +#include #include #include #include @@ -113,7 +114,17 @@ unsigned int GetAliasSubListCount(const unsigned int startRow, const ParsedCsv& return count; } -bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& row) +double DecibelsToAmp(double decibels) +{ + return std::pow(10.0, decibels / 20.0); +} + +double CentsToHertz(double cents) +{ + return std::numeric_limits::max() * std::pow(2, cents / 1200.0); +} + +bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& row, const unsigned int rowNum) { memset(alias, 0, sizeof(SndAlias)); @@ -141,15 +152,55 @@ bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& alias->duck = Common::SND_HashName(row.GetValue("duck").data()); - alias->volMin = row.GetValueIntvolMin)>("vol_min"); - alias->volMax = row.GetValueIntvolMax)>("vol_max"); + const auto volMinDecibels = row.GetValueFloat("vol_min"); + + if (volMinDecibels < 0.0f || volMinDecibels > 100.0f) + { + std::cerr << std::format("Invalid value for row {} col 'vol_min' - {} [0.0, 100.0]\n", rowNum + 1, volMinDecibels); + return false; + } + + const auto volMinAmp = static_cast(std::round(DecibelsToAmp(volMinDecibels) / T6::Common::AMP_RATIO)); + alias->volMin = volMinAmp; + + const auto volMaxDecibels = row.GetValueFloat("vol_max"); + + if (volMaxDecibels < 0.0f || volMaxDecibels > 100.0f) + { + std::cerr << std::format("Invalid value for row {} col 'vol_max' - {} [0.0, 100.0]\n", rowNum + 1, volMaxDecibels); + return false; + } + + const auto volMaxAmp = static_cast(std::round(DecibelsToAmp(volMaxDecibels) / T6::Common::AMP_RATIO)); + alias->volMax = volMaxAmp; + + const auto pitchMinCents = row.GetValueFloat("pitch_min"); + + if (pitchMinCents < -2400.0f || pitchMinCents > 1200.0f) + { + std::cerr << std::format("Invalid value for row {} col 'pitch_min' - {} [-2400.0, 1200.0]\n", rowNum + 1, pitchMinCents); + return false; + } + + const auto pitchMinHertz = static_cast(std::round(CentsToHertz(pitchMinCents))); + alias->pitchMin = pitchMinHertz; + + const auto pitchMaxCents = row.GetValueFloat("pitch_max"); + + if (pitchMaxCents < -2400.0f || pitchMaxCents > 1200.0f) + { + std::cerr << std::format("Invalid value for row {} col 'pitch_max' - {} [-2400.0, 1200.0]\n", rowNum + 1, pitchMaxCents); + return false; + } + + const auto pitchMaxHertz = static_cast(std::round(CentsToHertz(pitchMaxCents))); + alias->pitchMax = pitchMaxHertz; + alias->distMin = row.GetValueIntdistMin)>("dist_min"); alias->distMax = row.GetValueIntdistMax)>("dist_max"); alias->distReverbMax = row.GetValueIntdistReverbMax)>("dist_reverb_max"); alias->limitCount = row.GetValueIntlimitCount)>("limit_count"); alias->entityLimitCount = row.GetValueIntentityLimitCount)>("entity_limit_count"); - alias->pitchMin = row.GetValueIntpitchMin)>("pitch_min"); - alias->pitchMax = row.GetValueIntpitchMax)>("pitch_max"); alias->minPriority = row.GetValueIntminPriority)>("min_priority"); alias->maxPriority = row.GetValueIntmaxPriority)>("max_priority"); alias->minPriorityThreshold = row.GetValueIntminPriorityThreshold)>("min_priority_threshold"); @@ -292,7 +343,7 @@ bool LoadSoundAliasList( // list are next to each other in the file for (auto i = 0u; i < subListCount; i++) { - if (!LoadSoundAlias(memory, &sndBank->alias[listIndex].head[i], aliasCsv[row])) + if (!LoadSoundAlias(memory, &sndBank->alias[listIndex].head[i], aliasCsv[row], row)) return false; // if this asset is loaded instead of stream, increment the loaded count for later diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp index d37b4905..e2617377 100644 --- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp +++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp @@ -7,6 +7,7 @@ #include "Sound/WavWriter.h" #include "nlohmann/json.hpp" +#include #include #include #include @@ -225,6 +226,21 @@ class AssetDumperSndBank::Internal } } + static double AmpToDecibels(double amp) + { + if (amp == 0.0) + { + return 0.0; + } + + return 20.0 * std::log10(amp); + } + + static double HertzToCents(double hertz) + { + return 1200.0 * std::log2(hertz / std::numeric_limits::max()); + } + static void WriteAliasToFile(CsvOutputStream& stream, const SndAlias* alias, const std::optional maybeFormat, const SndBank* bank) { // name @@ -247,10 +263,14 @@ class AssetDumperSndBank::Internal stream.WriteColumn(SOUND_GROUPS[alias->flags.volumeGroup]); // vol_min - stream.WriteColumn(std::to_string(alias->volMin)); + const auto volMinAmp = alias->volMin * T6::Common::AMP_RATIO; + const auto volMinDecibels = static_cast(std::round(AmpToDecibels(volMinAmp))); + stream.WriteColumn(std::to_string(volMinDecibels)); // vol_max - stream.WriteColumn(std::to_string(alias->volMax)); + const auto volMaxAmp = alias->volMax * T6::Common::AMP_RATIO; + const auto volMaxDecibels = static_cast(std::round(AmpToDecibels(volMaxAmp))); + stream.WriteColumn(std::to_string(volMaxDecibels)); // team_vol_mod stream.WriteColumn(""); @@ -289,10 +309,14 @@ class AssetDumperSndBank::Internal stream.WriteColumn(SOUND_LIMIT_TYPES[alias->flags.entityLimitType]); // pitch_min - stream.WriteColumn(std::to_string(alias->pitchMin)); + const auto pitchMinHertz = alias->pitchMin; + const auto pitchMinCents = static_cast(std::round(HertzToCents(pitchMinHertz))); + stream.WriteColumn(std::to_string(pitchMinCents)); // pitch_max - stream.WriteColumn(std::to_string(alias->pitchMax)); + const auto pitchMaxHertz = alias->pitchMax; + const auto pitchMaxCents = static_cast(std::round(HertzToCents(pitchMaxHertz))); + stream.WriteColumn(std::to_string(pitchMaxCents)); // team_pitch_mod stream.WriteColumn("");