diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp index 371187ab..32afda9e 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp @@ -8,7 +8,9 @@ #include "Pool/GlobalAssetPool.h" #include "Utils/StringUtils.h" +#include #include +#include #include #include #include @@ -113,7 +115,43 @@ unsigned int GetAliasSubListCount(const unsigned int startRow, const ParsedCsv& return count; } -bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& row) +float DbsplToLinear(const float dbsplValue) +{ + return std::pow(10.0f, (dbsplValue - 100.0f) / 20.0f); +} + +float CentToHertz(const float cents) +{ + return std::pow(2.0f, cents / 1200.0f); +} + +bool ReadColumnVolumeDbspl(const float dbsplValue, const char* colName, const unsigned rowIndex, uint16_t& value) +{ + if (dbsplValue < 0.0f || dbsplValue > 100.0f) + { + std::cerr << std::format("Invalid value for row {} col '{}' - {} [0.0, 100.0]\n", rowIndex + 1, colName, dbsplValue); + return false; + } + + value = static_cast(DbsplToLinear(dbsplValue) * static_cast(std::numeric_limits::max())); + + return true; +} + +bool ReadColumnPitchCents(const float centValue, const char* colName, const unsigned rowIndex, uint16_t& value) +{ + if (centValue < -2400.0f || centValue > 1200.0f) + { + std::cerr << std::format("Invalid value for row {} col '{}' - {} [-2400.0, 1200.0]\n", rowIndex + 1, colName, centValue); + return false; + } + + value = static_cast(CentToHertz(centValue) * static_cast(std::numeric_limits::max())); + + return true; +} + +bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& row, const unsigned int rowNum) { memset(alias, 0, sizeof(SndAlias)); @@ -141,26 +179,42 @@ 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"); + if (!ReadColumnVolumeDbspl(row.GetValueFloat("vol_min"), "vol_min", rowNum, alias->volMin)) + return false; + + if (!ReadColumnVolumeDbspl(row.GetValueFloat("vol_max"), "vol_max", rowNum, alias->volMax)) + return false; + + if (!ReadColumnVolumeDbspl(row.GetValueFloat("pitch_min"), "pitch_min", rowNum, alias->pitchMin)) + return false; + + if (!ReadColumnVolumeDbspl(row.GetValueFloat("pitch_max"), "pitch_max", rowNum, alias->pitchMax)) + return false; + 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"); alias->maxPriorityThreshold = row.GetValueIntmaxPriorityThreshold)>("max_priority_threshold"); alias->probability = row.GetValueIntprobability)>("probability"); alias->startDelay = row.GetValueIntstartDelay)>("start_delay"); - alias->reverbSend = row.GetValueIntreverbSend)>("reverb_send"); - alias->centerSend = row.GetValueIntcenterSend)>("center_send"); + + if (!ReadColumnVolumeDbspl(row.GetValueFloat("reverb_send"), "reverb_send", rowNum, alias->reverbSend)) + return false; + + if (!ReadColumnVolumeDbspl(row.GetValueFloat("center_send"), "center_send", rowNum, alias->centerSend)) + return false; + alias->envelopMin = row.GetValueIntenvelopMin)>("envelop_min"); alias->envelopMax = row.GetValueIntenvelopMax)>("envelop_max"); - alias->envelopPercentage = row.GetValueIntenvelopPercentage)>("envelop_percentage"); + + if (!ReadColumnVolumeDbspl(row.GetValueFloat("envelop_percentage"), "envelop_percentage", rowNum, alias->envelopPercentage)) + return false; + alias->occlusionLevel = row.GetValueIntocclusionLevel)>("occlusion_level"); alias->fluxTime = row.GetValueIntfluxTime)>("move_time"); alias->futzPatch = row.GetValueIntfutzPatch)>("futz"); @@ -292,7 +346,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..d2afe546 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,36 @@ class AssetDumperSndBank::Internal } } + static float LinearToDbspl(float linear) + { + linear = std::max(linear, 0.0000152879f); + + const auto db = 20.0f * std::log10(linear); + if (db > -95.0f) + return db + 100.0f; + + return 0; + } + + static float HertzToCents(const float hertz) + { + return 1200.0f * std::log2(hertz); + } + + static void WriteColumnVolumeLinear(CsvOutputStream& stream, const uint16_t value) + { + const auto linear = static_cast(value) / static_cast(std::numeric_limits::max()); + const auto dbSpl = std::clamp(LinearToDbspl(linear), 0.0f, 100.0f); + stream.WriteColumn(std::format("{:.3g}", dbSpl)); + } + + static void WriteColumnPitchHertz(CsvOutputStream& stream, const uint16_t value) + { + const auto hertz = static_cast(value) / static_cast(std::numeric_limits::max()); + const auto cents = std::clamp(HertzToCents(hertz), -2400.0f, 1200.0f); + stream.WriteColumn(std::format("{:.4g}", cents)); + } + static void WriteAliasToFile(CsvOutputStream& stream, const SndAlias* alias, const std::optional maybeFormat, const SndBank* bank) { // name @@ -247,10 +278,10 @@ class AssetDumperSndBank::Internal stream.WriteColumn(SOUND_GROUPS[alias->flags.volumeGroup]); // vol_min - stream.WriteColumn(std::to_string(alias->volMin)); + WriteColumnVolumeLinear(stream, alias->volMin); // vol_max - stream.WriteColumn(std::to_string(alias->volMax)); + WriteColumnVolumeLinear(stream, alias->volMax); // team_vol_mod stream.WriteColumn(""); @@ -289,10 +320,10 @@ class AssetDumperSndBank::Internal stream.WriteColumn(SOUND_LIMIT_TYPES[alias->flags.entityLimitType]); // pitch_min - stream.WriteColumn(std::to_string(alias->pitchMin)); + WriteColumnPitchHertz(stream, alias->pitchMin); // pitch_max - stream.WriteColumn(std::to_string(alias->pitchMax)); + WriteColumnPitchHertz(stream, alias->pitchMax); // team_pitch_mod stream.WriteColumn(""); @@ -328,7 +359,7 @@ class AssetDumperSndBank::Internal stream.WriteColumn(std::to_string(alias->startDelay)); // reverb_send - stream.WriteColumn(std::to_string(alias->reverbSend)); + WriteColumnVolumeLinear(stream, alias->reverbSend); // duck stream.WriteColumn(FindNameForDuck(alias->duck, bank)); @@ -340,7 +371,7 @@ class AssetDumperSndBank::Internal stream.WriteColumn(alias->flags.panType == SA_PAN_2D ? "2d" : "3d"); // center_send - stream.WriteColumn(std::to_string(alias->centerSend)); + WriteColumnVolumeLinear(stream, alias->centerSend); // envelop_min stream.WriteColumn(std::to_string(alias->envelopMin)); @@ -349,7 +380,7 @@ class AssetDumperSndBank::Internal stream.WriteColumn(std::to_string(alias->envelopMax)); // envelop_percentage - stream.WriteColumn(std::to_string(alias->envelopPercentage)); + WriteColumnVolumeLinear(stream, alias->envelopPercentage); // occlusion_level stream.WriteColumn(std::to_string(alias->occlusionLevel));