X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fsample_openal.cxx;h=3c9cb864ad81403fc1d06794c3722046bde1d35f;hb=bcb320b537b6f7e5e3724e8a30d309322171eb43;hp=91b08527b712554d44d50b8b11f2247fb3daf15e;hpb=5f9befebaed1c185a196acd709b2677247461a0f;p=simgear.git

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 91b08527..3c9cb864 100644
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -27,11 +27,13 @@
 #endif
 
 #include <stdlib.h>	// rand()
+#include <cstring>
 
 #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 <simgear/misc/ResourceManager.hxx>
 
 #include "soundmgr_openal.hxx"
 #include "sample_openal.hxx"
@@ -46,10 +48,11 @@ SGSoundSample::SGSoundSample() :
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
-    _velocity(SGVec3d::zeros()),
+    _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
-    _base_pos(SGGeod()),
+    _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
     _data(NULL),
     _format(AL_FORMAT_MONO8),
@@ -76,14 +79,17 @@ SGSoundSample::SGSoundSample() :
 }
 
 // constructor
-SGSoundSample::SGSoundSample( const char *path, const char *file ) :
+SGSoundSample::SGSoundSample(const char *file, const SGPath& currentDir) :
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
-    _velocity(SGVec3d::zeros()),
+    _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
-    _base_pos(SGGeod()),
+    _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
+    _refname(file),
+    _data(NULL),
     _format(AL_FORMAT_MONO8),
     _size(0),
     _freq(0),
@@ -105,28 +111,22 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) :
     _static_changed(true),
     _is_file(true)
 {
-    SGPath samplepath( path );
-    if ( strlen(file) ) {
-        samplepath.append( file );
-    }
-    _refname = samplepath.str();
-
-     SG_LOG( SG_GENERAL, SG_DEBUG, "From file sounds sample = "
-            << samplepath.str() );
+    SGPath p = simgear::ResourceManager::instance()->findPath(file, currentDir);
+    _refname = p.str();
 }
 
 // constructor
-SGSoundSample::SGSoundSample( std::auto_ptr<unsigned char>& data,
+SGSoundSample::SGSoundSample( const unsigned char** data,
                               int len, int freq, int format ) :
     _absolute_pos(SGVec3d::zeros()),
     _relative_pos(SGVec3d::zeros()),
     _direction(SGVec3d::zeros()),
-    _velocity(SGVec3d::zeros()),
+    _velocity(SGVec3f::zeros()),
     _orientation(SGQuatd::zeros()),
     _orivec(SGVec3f::zeros()),
-    _base_pos(SGGeod()),
+    _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
     _refname(random_string()),
-    _data(data.release()),
     _format(format),
     _size(len),
     _freq(freq),
@@ -149,52 +149,82 @@ SGSoundSample::SGSoundSample( std::auto_ptr<unsigned char>& data,
     _is_file(false)
 {
     SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" );
+    _data = (unsigned char*)*data; *data = NULL;
 }
 
-
-// destructor
-SGSoundSample::~SGSoundSample() {
-}
-
-void SGSoundSample::set_orientation( const SGQuatd& ori ) {
-    _orientation = ori;
-    update_absolute_position();
-    _changed = true;
+// constructor
+SGSoundSample::SGSoundSample( void** data, int len, int freq, int format ) :
+    _absolute_pos(SGVec3d::zeros()),
+    _relative_pos(SGVec3d::zeros()),
+    _direction(SGVec3d::zeros()),
+    _velocity(SGVec3f::zeros()),
+    _orientation(SGQuatd::zeros()),
+    _orivec(SGVec3f::zeros()),
+    _base_pos(SGVec3d::zeros()),
+    _rotation(SGQuatd::zeros()),
+    _refname(random_string()),
+    _format(format),
+    _size(len),
+    _freq(freq),
+    _valid_buffer(false),
+    _buffer(SGSoundMgr::NO_BUFFER),
+    _valid_source(false),
+    _source(SGSoundMgr::NO_SOURCE),
+    _inner_angle(360.0),
+    _outer_angle(360.0),
+    _outer_gain(0.0),
+    _pitch(1.0),
+    _volume(1.0),
+    _master_volume(1.0),
+    _reference_dist(500.0),
+    _max_dist(3000.0),
+    _loop(AL_FALSE),
+    _playing(false),
+    _changed(true),
+    _static_changed(true),
+    _is_file(false)
+{
+    SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" );
+    _data = (unsigned char*)*data; *data = NULL;
 }
 
-void SGSoundSample::set_direction( const SGVec3d& dir ) {
-    _direction = dir;
-    update_absolute_position();
-    _changed = true;
-}
 
-void SGSoundSample::set_relative_position( const SGVec3f& pos ) {
-    _relative_pos = toVec3d(pos);
-    update_absolute_position();
-    _changed = true;
+// destructor
+SGSoundSample::~SGSoundSample() {
+    if ( _data != NULL ) free(_data);
 }
 
-void SGSoundSample::set_position( const SGGeod& pos ) {
-    _base_pos = pos;
-    update_absolute_position();
-    _changed = true;
-}
+void SGSoundSample::update_pos_and_orientation() {
 
-void SGSoundSample::update_absolute_position() {
-    SGQuatd orient = SGQuatd::fromLonLat(_base_pos) * _orientation;
-    _orivec = -toVec3f(orient.rotate(-SGVec3d::e1()));
+    _absolute_pos = _base_pos;
+    if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
+       _absolute_pos += _rotation.rotate( _relative_pos );
+    }
 
-    orient = SGQuatd::fromRealImag(0, _relative_pos) * _orientation;
-    _absolute_pos = -SGVec3d::fromGeod(_base_pos); // -orient.rotate(SGVec3d::e1());
+    _orivec = SGVec3f::zeros();
+    if ( _direction[0] || _direction[1] || _direction[2] ) {
+        _orivec = toVec3f( _rotation.rotate( _direction ) );
+    }
 }
 
 string SGSoundSample::random_string() {
       static const char *r = "0123456789abcdefghijklmnopqrstuvwxyz"
                              "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-      string rstr;
+      string rstr = "System generated name: ";
       for (int i=0; i<10; i++) {
           rstr.push_back( r[rand() % strlen(r)] );
       }
 
       return rstr;
 }
+
+SGPath SGSoundSample::file_path() const
+{
+  if (!_is_file) {
+    return SGPath();
+  }
+  
+  return SGPath(_refname);
+}
+
+