paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Improve sound attenuation so that zooming out actually reduce the sound level.

Browse Source 
Patch by: @Samulis
Differential Revision: https://code.wildfiregames.com/D3108
This was SVN commit r24382.
This commit is contained in:
Stan 2020-12-13 00:04:17 +00:00
parent aa3bd08513
commit 876f6d5e50
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/mods/public/gui/credits/texts/programming.json
View File

@ -217,6 +217,7 @@
{ "nick": "sacha_vrand", "name": "Sacha Vrand" },
{ "nick": "SafaAlfulaij" },
{ "name": "Samuel Guarnieri" },
{ "nick": "Samulis", "name": "Sam Gossner" },
{ "nick": "Sandarac" },
{ "nick": "sanderd17", "name": "Sander Deryckere" },
{ "nick": "sathyam", "name": "Sathyam Vellal" },

16
source/soundmanager/scripting/SoundGroup.cpp
View File

@ -38,6 +38,10 @@
extern CGame *g_Game;
#if CONFIG2_AUDIO
constexpr ALfloat DEFAULT_ROLLOFF = 0.7f;
constexpr ALfloat MAX_ROLLOFF = 0.9f;
/**
* Low randomness, quite-a-lot-faster-than-std::mt19937 random number generator.
* It matches the interface of UniformRandomBitGenerator for use in std::shuffle.
@ -143,7 +147,7 @@ float CSoundGroup::RadiansOffCenter(const CVector3D& position, bool& onScreen, f
else
{
if (x < 0 || x > screenWidth)
itemRollOff = 0.5;
itemRollOff = MAX_ROLLOFF;
answer = radianCap * (x * 2 / screenWidth - 1);
}
@ -158,7 +162,7 @@ float CSoundGroup::RadiansOffCenter(const CVector3D& position, bool& onScreen, f
}
else if (y < 0 || y > screenHeight)
{
itemRollOff = 0.5;
itemRollOff = MAX_ROLLOFF;
}
return answer;
@ -175,7 +179,7 @@ void CSoundGroup::UploadPropertiesAndPlay(size_t index, const CVector3D& positio
return;
bool isOnscreen = false;
ALfloat itemRollOff = 0.1f;
ALfloat itemRollOff = DEFAULT_ROLLOFF;
float offset = RadiansOffCenter(position, isOnscreen, itemRollOff);
if (!isOnscreen && !TestFlag(eDistanceless) && !TestFlag(eOmnipresent))
@ -198,19 +202,15 @@ void CSoundGroup::UploadPropertiesAndPlay(size_t index, const CVector3D& positio
if (!TestFlag(eOmnipresent))
{
CVector3D origin = g_Game->GetView()->GetCamera()->GetOrientation().GetTranslation();
float sndDist = origin.Y;
float itemDist = (position - origin).Length();
if (sndDist * 2 < itemDist)
sndDist = itemDist;
if (TestFlag(eDistanceless))
itemRollOff = 0;
if (sndData->IsStereo())
LOGWARNING("OpenAL: stereo sounds can't be positioned: %s", sndData->GetFileName().string8());
hSound->SetLocation(CVector3D(sndDist * sin(offset), 0, -sndDist * cos(offset)));
hSound->SetLocation(CVector3D(itemDist * sin(offset), 0, -itemDist * cos(offset)));
hSound->SetRollOff(itemRollOff);
}