FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport the OpenAL Doppler fixes

Browse Source
This commit is contained in:
Erik Hofman
2020-04-13 10:11:41 +02:00
parent 7a773f30e6
commit fcd8ebb8a3
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/sample_group.cxx
-4
View File
@@ -353,10 +353,6 @@ void SGSampleGroup::update_sample_config( SGSoundSample *sample )
velocity = sample->get_velocity(); velocity = sample->get_velocity();
} }
if (_smgr->bad_doppler_effect()) {
velocity *= 100.0f;
}
#if 0 #if 0
if (length(position) > 20000) if (length(position) > 20000)
printf("%s source and listener distance greater than 20km!\n", printf("%s source and listener distance greater than 20km!\n",
simgear/sound/soundmgr_openal.cxx
+15 -6
View File
@@ -50,6 +50,7 @@ using std::vector;
#define MAX_SOURCES 128 #define MAX_SOURCES 128
#define SPEED_OF_SOUND 340.4f
#ifndef ALC_ALL_DEVICES_SPECIFIER #ifndef ALC_ALL_DEVICES_SPECIFIER
# define ALC_ALL_DEVICES_SPECIFIER 0x1013 # define ALC_ALL_DEVICES_SPECIFIER 0x1013
@@ -218,8 +219,8 @@ void SGSoundMgr::init()
alListenerfv( AL_POSITION, SGVec3f::zeros().data() ); alListenerfv( AL_POSITION, SGVec3f::zeros().data() );
alListenerfv( AL_VELOCITY, SGVec3f::zeros().data() ); alListenerfv( AL_VELOCITY, SGVec3f::zeros().data() );
alDopplerFactor(1.0); alDopplerFactor(1.0f);
alDopplerVelocity(340.3); // speed of sound in meters per second. alDopplerVelocity(SPEED_OF_SOUND);
// gain = AL_REFERENCE_DISTANCE / (AL_REFERENCE_DISTANCE + // gain = AL_REFERENCE_DISTANCE / (AL_REFERENCE_DISTANCE +
// AL_ROLLOFF_FACTOR * (distance - AL_REFERENCE_DISTANCE)); // AL_ROLLOFF_FACTOR * (distance - AL_REFERENCE_DISTANCE));
@@ -248,8 +249,10 @@ void SGSoundMgr::init()
_renderer = (const char *)alGetString(AL_RENDERER); _renderer = (const char *)alGetString(AL_RENDERER);
if (_vendor == "Creative Labs Inc.") { if (_vendor == "Creative Labs Inc.") {
alDopplerFactor(100.0f);
_bad_doppler = true; _bad_doppler = true;
} else if (_vendor == "OpenAL Community" && _renderer == "OpenAL Soft") { } else if (_vendor == "OpenAL Community" && _renderer == "OpenAL Soft") {
alDopplerFactor(100.0f);
_bad_doppler = true; _bad_doppler = true;
} }
@@ -392,14 +395,20 @@ if (isNaN(toVec3f(_velocity).data())) printf("NaN in listener velocity\n");
SGVec3d velocity = SGVec3d::zeros(); SGVec3d velocity = SGVec3d::zeros();
if ( _velocity[0] || _velocity[1] || _velocity[2] ) { if ( _velocity[0] || _velocity[1] || _velocity[2] ) {
velocity = hlOr.backTransform(_velocity*SG_FEET_TO_METER); velocity = hlOr.backTransform(_velocity*SG_FEET_TO_METER);
}
if ( _bad_doppler ) { if ( _bad_doppler ) {
velocity *= 100.0f; double fact = 100.0;
double mag = length( velocity );
if (mag > SPEED_OF_SOUND) {
fact *= SPEED_OF_SOUND / mag;
}
alDopplerFactor(fact);
}
} }
alListenerfv( AL_VELOCITY, toVec3f(velocity).data() ); alListenerfv( AL_VELOCITY, toVec3f(velocity).data() );
// alDopplerVelocity(340.3); // TODO: altitude dependent // alDopplerVelocity(SPEED_OF_SOUND);
testForError("update"); testForError("update");
_changed = false; _changed = false;
} }