Merge branch 'jmt/magvar' into next

[simgear.git] / simgear / sound / sample_openal.cxx

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 5c20c1c9493a4180428ebff8bf1d9e27b0c88f7e..16291d7da918bd15dd51c35853710e86cf2e04ec 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -31,7 +31,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/math/SGQuat.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include "soundmgr_openal.hxx"
 #include "sample_openal.hxx"
@@ -48,10 +48,9 @@ SGSoundSample::SGSoundSample() :
     _direction(SGVec3d::zeros()),
     _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
-    _rotation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
-    _base_offs(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
     _data(NULL),
     _format(AL_FORMAT_MONO8),
@@ -84,10 +83,9 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) :
     _direction(SGVec3d::zeros()),
     _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
-    _rotation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
-    _base_offs(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(file),
     _data(NULL),
     _format(AL_FORMAT_MONO8),
@@ -126,10 +124,9 @@ SGSoundSample::SGSoundSample( const unsigned char** data,
     _direction(SGVec3d::zeros()),
     _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
-    _rotation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
-    _base_offs(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
     _format(format),
     _size(len),
@@ -163,10 +160,9 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
     _direction(SGVec3d::zeros()),
     _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
-    _rotation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
     _base_pos(SGVec3d::zeros()),
-    _base_offs(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
     _format(format),
     _size(len),
@@ -196,21 +192,20 @@ SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
 
 // destructor
 SGSoundSample::~SGSoundSample() {
-    if (_data) free(_data);
+    if ( _data != NULL ) free(_data);
 }
 
 void SGSoundSample::update_pos_and_orientation() {
 
-    _absolute_pos = _base_pos - _base_offs;
-    if ( _relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
-        _absolute_pos += _rotation.backTransform(_relative_pos);
+    _absolute_pos = _base_pos;
+    if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
+       _absolute_pos += _rotation.rotate( _relative_pos );
     }
 
+    _orivec = SGVec3f::zeros();
     if ( _direction[0] || _direction[1] || _direction[2] ) {
-        _orivec = toVec3f( _rotation.rotate(_direction) );
+        _orivec = toVec3f( _rotation.rotate( _direction ) );
     }
-    else
-        _orivec = SGVec3f::zeros();
 }
 
 string SGSoundSample::random_string() {