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

Fix position calculation of sound samples

Browse Source 
Signed-off-by: Erik Hofman <erik@ehofman.com>
This commit is contained in:
onox
2015-05-18 11:46:16 +02:00
committed by Erik Hofman
parent f19cf6d56a
commit 0369d1f506
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/sample_group.cxx
+7 -4
View File
@@ -401,8 +401,9 @@ void SGSampleGroup::set_volume( float vol )
// set the source position and orientation of all managed sounds // set the source position and orientation of all managed sounds
void SGSampleGroup::update_pos_and_orientation() { void SGSampleGroup::update_pos_and_orientation() {
SGVec3d position = SGVec3d::fromGeod(_base_pos) - _smgr->get_position(); SGVec3d base_position = SGVec3d::fromGeod(_base_pos);
SGVec3d smgr_position = _smgr->get_position();
SGQuatd hlOr = SGQuatd::fromLonLat(_base_pos); SGQuatd hlOr = SGQuatd::fromLonLat(_base_pos);
SGQuatd ec2body = hlOr*_orientation; SGQuatd ec2body = hlOr*_orientation;
@@ -418,12 +419,14 @@ void SGSampleGroup::update_pos_and_orientation() {
sample->set_master_volume( _volume ); sample->set_master_volume( _volume );
sample->set_orientation( _orientation ); sample->set_orientation( _orientation );
sample->set_rotation( ec2body ); sample->set_rotation( ec2body );
sample->set_position( position ); sample->set_position(base_position);
sample->set_velocity( velocity ); sample->set_velocity( velocity );
// Test if a sample is farther away than max distance, if so // Test if a sample is farther away than max distance, if so
// stop the sound playback and free it's source. // stop the sound playback and free it's source.
if (!_tied_to_listener) { if (!_tied_to_listener) {
sample->update_pos_and_orientation();
SGVec3d position = sample->get_position() - smgr_position;
float max2 = sample->get_max_dist() * sample->get_max_dist(); float max2 = sample->get_max_dist() * sample->get_max_dist();
float dist2 = position[0]*position[0] float dist2 = position[0]*position[0]
+ position[1]*position[1] + position[2]*position[2]; + position[1]*position[1] + position[2]*position[2];
@@ -449,7 +452,7 @@ void SGSampleGroup::update_sample_config( SGSoundSample *sample )
} else { } else {
sample->update_pos_and_orientation(); sample->update_pos_and_orientation();
orientation = sample->get_orientation(); orientation = sample->get_orientation();
position = sample->get_position(); position = sample->get_position() - _smgr->get_position();
velocity = sample->get_velocity(); velocity = sample->get_velocity();
} }