From 7efed5347542eb6cdf713da7f2bf68dec7464089 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sun, 1 Nov 2009 14:53:36 +0000
Subject: [PATCH] proper sound orientation(?) and comment out velocity since it
 messes with OpenAL in such a way that volume doesn't work properly anymore

---
 src/Main/viewmgr.cxx  | 6 ++----
 src/Model/acmodel.cxx | 7 ++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Main/viewmgr.cxx b/src/Main/viewmgr.cxx
index 5a9b7a20f..60cfdb437 100644
--- a/src/Main/viewmgr.cxx
+++ b/src/Main/viewmgr.cxx
@@ -304,10 +304,8 @@ FGViewMgr::update (double dt)
   smgr->set_position_offset( offs );
   smgr->set_position_geod( loop_view->getPosition() );
 
-  SGQuatd orient = SGQuatd::fromYawPitchRollDeg( loop_view->getHeading_deg(),
-                                                 loop_view->getPitch_deg(),
-                                                 loop_view->getRoll_deg() );
-  smgr->set_orientation( orient, loop_view->getViewOrientationOffset() );
+  smgr->set_orientation( loop_view->getViewOrientation(),
+                         loop_view->getViewOrientationOffset() );
 
   // get the model velocity
   SGVec3f velocity = SGVec3f::zeros();
diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 6d0d32049..3b5ccfb13 100644
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -126,21 +126,22 @@ FGAircraftModel::update (double dt)
   // update model's audio sample values
   _fx->set_position_geod( _aircraft->getPosition() );
 
-  SGQuatd orient = SGQuatd::fromYawPitchRollDeg(-_heading->getDoubleValue(),
+  SGQuatd orient = SGQuatd::fromYawPitchRollDeg(_heading->getDoubleValue(),
                                                 _pitch->getDoubleValue(),
                                                 _roll->getDoubleValue());
   _fx->set_orientation( orient );
  
+#if 0
   SGVec3d vel = SGVec3d( _speed_n->getFloatValue(),
                          _speed_e->getFloatValue(),
                          _speed_d->getFloatValue() );
   if ( vel[0] || vel[1] || vel[2] ) {
-    SGQuatd hlOr = SGQuatd::fromLonLat( _aircraft->getPosition() );
     SGQuatd q(-0.5, -0.5, 0.5, 0.5);
-    _velocity = toVec3f( (hlOr*q).backTransform( vel ) );
+    _velocity = toVec3f( q.backTransform( vel ) );
   }
   else
       _velocity = SGVec3f::zeros();
+#endif
   _fx->set_velocity( _velocity );
 }