fly/flightgear
1
0
Fork 0
Code Activity

Use actual position of view for sound manager

Browse source 
Signed-off-by: Erik Hofman <erik@ehofman.com>
This commit is contained in:
onox 2015-05-15 09:29:23 +02:00 • committed by Erik Hofman
parent e76a6df909
commit 3037cd8149
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Sound/soundmanager.cxx
View file

@ -71,9 +71,10 @@ void FGSoundManager::init()
_device_name = fgGetNode("/sim/sound/device-name");
_currentView = fgGetNode("sim/current-view");
_viewPosLon = fgGetNode("sim/current-view/viewer-lon-deg");
_viewPosLat = fgGetNode("sim/current-view/viewer-lat-deg");
_viewPosElev = fgGetNode("sim/current-view/viewer-elev-ft");
_viewX = _currentView->getNode("viewer-x-m", true);
_viewY = _currentView->getNode("viewer-y-m", true);
_viewZ = _currentView->getNode("viewer-z-m", true);
_velocityNorthFPS = fgGetNode("velocities/speed-north-fps", true);
_velocityEastFPS = fgGetNode("velocities/speed-east-fps", true);
@ -172,12 +173,12 @@ void FGSoundManager::update(double dt)
}
if (enabled)
{
SGGeod viewPosGeod(SGGeod::fromDegFt(_viewPosLon->getDoubleValue(),
_viewPosLat->getDoubleValue(),
_viewPosElev->getDoubleValue()));
SGVec3d cartPos = SGVec3d::fromGeod(viewPosGeod);
SGVec3d cartPos(_viewX->getDoubleValue(),
_viewY->getDoubleValue(),
_viewZ->getDoubleValue());
SGGeod geodPos = SGGeod::fromCart(cartPos);
set_position(cartPos, viewPosGeod);
set_position(cartPos, geodPos);
SGQuatd viewOrientation;
for (int i=0; i<4; ++i) {

2
src/Sound/soundmanager.hxx
View file

@ -55,7 +55,7 @@ private:
bool _is_initialized, _enabled;
SGPropertyNode_ptr _sound_working, _sound_enabled, _volume, _device_name;
SGPropertyNode_ptr _currentView;
SGPropertyNode_ptr _viewPosLon, _viewPosLat, _viewPosElev;
SGPropertyNode_ptr _viewX, _viewY, _viewZ;
SGPropertyNode_ptr _velocityNorthFPS, _velocityEastFPS, _velocityDownFPS;
SGPropertyNode_ptr _viewXoffset, _viewYoffset, _viewZoffset;
std::auto_ptr<Listener> _listener;