#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"
_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::fromDeg(0,0)),
+ _base_pos(SGVec3d::zeros()),
+ _rotation(SGQuatd::zeros()),
_refname(random_string()),
_data(NULL),
_format(AL_FORMAT_MONO8),
}
// 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::fromDeg(0,0)),
+ _base_pos(SGVec3d::zeros()),
+ _rotation(SGQuatd::zeros()),
_refname(file),
_data(NULL),
_format(AL_FORMAT_MONO8),
_static_changed(true),
_is_file(true)
{
- SGPath samplepath( path );
- if ( strlen(file) ) {
- samplepath.append( file );
- }
- _refname = samplepath.str();
+ SGPath p = simgear::ResourceManager::instance()->findPath(file, currentDir);
+ _refname = p.str();
}
// constructor
_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::fromDeg(0,0)),
+ _base_pos(SGVec3d::zeros()),
+ _rotation(SGQuatd::zeros()),
_refname(random_string()),
_format(format),
_size(len),
_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::fromDeg(0,0)),
+ _base_pos(SGVec3d::zeros()),
+ _rotation(SGQuatd::zeros()),
_refname(random_string()),
_format(format),
_size(len),
// destructor
SGSoundSample::~SGSoundSample() {
- if (_data) free(_data);
+ if ( _data != NULL ) free(_data);
}
-void SGSoundSample::update_absolute_position() {
- // The rotation rotating from the earth centerd frame to
- // the horizontal local frame
- SGQuatd hlOr = SGQuatd::fromLonLat(_base_pos);
-
- // Compute the sounds orientation and position
- // wrt the earth centered frame - that is global coorinates
- SGQuatd sc2body = _orientation*hlOr;
-
- // This is rotates the x-forward, y-right, z-down coordinate system where
- // simulation runs into the OpenGL camera system with x-right, y-up, z-back.
- SGQuatd q(-0.5, -0.5, 0.5, 0.5);
+void SGSoundSample::update_pos_and_orientation() {
- // The cartesian position of the base sound coordinate
- SGVec3d position = SGVec3d::fromGeod(_base_pos);
+ _absolute_pos = _base_pos;
+ if (_relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) {
+ _absolute_pos += _rotation.rotate( _relative_pos );
+ }
- _absolute_pos = position + (sc2body*q).backTransform(_relative_pos);
- _orivec = toVec3f( (sc2body*q).backTransform(_direction) );
+ _orivec = SGVec3f::zeros();
+ if ( _direction[0] || _direction[1] || _direction[2] ) {
+ _orivec = toVec3f( _rotation.rotate( _direction ) );
+ }
}
string SGSoundSample::random_string() {
return rstr;
}
+SGPath SGSoundSample::file_path() const
+{
+ if (!_is_file) {
+ return SGPath();
+ }
+
+ return SGPath(_refname);
+}
+
+