SL-11445 Couple small fixes

master
Andrey Kleshchev 2020-02-04 16:19:20 +02:00
parent 192aee0f19
commit e76f25d25f
5 changed files with 9 additions and 7 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.bak
*.diff
*.orig
*.patch
*.pyc
*.rej
*.swp

View File

@ -27,7 +27,7 @@ if (FMODSTUDIO)
debug fmodL
optimized fmod)
elseif (LINUX)
set(FMODEX_LIBRARY
set(FMODSTUDIO_LIBRARY
debug fmodL
optimized fmod)
endif (WINDOWS)

View File

@ -105,9 +105,10 @@ void LLListener_FMODSTUDIO::commitDeferredChanges()
void LLListener_FMODSTUDIO::setRolloffFactor(F32 factor)
{
//An internal FMODEx optimization skips 3D updates if there have not been changes to the 3D sound environment.
//An internal FMOD optimization skips 3D updates if there have not been changes to the 3D sound environment.
// (this was true for FMODex, looks to be still true for FMOD STUDIO)
//Sadly, a change in rolloff is not accounted for, thus we must touch the listener properties as well.
//In short: Changing the position ticks a dirtyflag inside fmodex, which makes it not skip 3D processing next update call.
//In short: Changing the position ticks a dirtyflag inside fmod, which makes it not skip 3D processing next update call.
if (mRolloffFactor != factor)
{
LLVector3 pos = mVelocity - LLVector3(0.f, 0.f, .1f);

View File

@ -70,4 +70,4 @@ private:
};
#endif // LL_STREAMINGAUDIO_FMODEX_H
#endif // LL_STREAMINGAUDIO_FMODSTUDIO_H

View File

@ -16167,7 +16167,7 @@
<key>FMODExProfilerEnable</key>
<map>
<key>Comment</key>
<string>Enable profiler tool if using FMOD Ex</string>
<string>Enable profiler tool if using FMOD Ex or FMOD Studio</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -16178,7 +16178,7 @@
<key>FMODExDecodeBufferSize</key>
<map>
<key>Comment</key>
<string>Sets the streaming decode buffer size (in milliseconds)</string>
<string>Sets the streaming decode buffer size (in milliseconds) for FMOD Ex or FMOD Studio</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -16189,7 +16189,7 @@
<key>FMODExStreamBufferSize</key>
<map>
<key>Comment</key>
<string>Sets the streaming buffer size (in milliseconds)</string>
<string>Sets the streaming buffer size (in milliseconds) for FMOD Ex or FMOD Studio</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>