X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fsample_openal.cxx;h=4be9d8113f02c9c068afd605e3c7926d58bded95;hb=6ccad915373fe367f8d63eb69282146054d0a401;hp=917f0596dade294c8d7993bfbdd89cc03bb8c58f;hpb=e2e1524454d94db9e1b8cf591f337ca0a5fd06da;p=simgear.git diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx index 917f0596..4be9d811 100644 --- a/simgear/sound/sample_openal.cxx +++ b/simgear/sound/sample_openal.cxx @@ -1,8 +1,10 @@ -// sample.cxx -- Sound sample encapsulation class +// sample_openal.cxx -- Audio sample encapsulation class // // Written by Curtis Olson, started April 2004. +// Modified to match the new SoundSystem by Erik Hofman, October 2009 // // Copyright (C) 2004 Curtis L. Olson - http://www.flightgear.org/~curt +// Copyright (C) 2009 Erik Hofman // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -24,6 +26,8 @@ # include #endif +#include // rand() + #include #include #include @@ -39,12 +43,14 @@ // empty constructor SGSoundSample::SGSoundSample() : - _absolute_pos(SGVec3d::zeros().data()), - _relative_pos(SGVec3f::zeros().data()), - _base_pos(SGVec3d::zeros().data()), - _direction(SGVec3f::zeros().data()), - _velocity(SGVec3f::zeros().data()), - _sample_name(""), + _absolute_pos(SGVec3d::zeros()), + _relative_pos(SGVec3d::zeros()), + _direction(SGVec3d::zeros()), + _velocity(SGVec3f::zeros()), + _orientation(SGQuatd::zeros()), + _orivec(SGVec3f::zeros()), + _base_pos(SGGeod::fromDeg(0,0)), + _refname(random_string()), _data(NULL), _format(AL_FORMAT_MONO8), _size(0), @@ -71,11 +77,15 @@ SGSoundSample::SGSoundSample() : // constructor SGSoundSample::SGSoundSample( const char *path, const char *file ) : - _absolute_pos(SGVec3d::zeros().data()), - _relative_pos(SGVec3f::zeros().data()), - _base_pos(SGVec3d::zeros().data()), - _direction(SGVec3f::zeros().data()), - _velocity(SGVec3f::zeros().data()), + _absolute_pos(SGVec3d::zeros()), + _relative_pos(SGVec3d::zeros()), + _direction(SGVec3d::zeros()), + _velocity(SGVec3f::zeros()), + _orientation(SGQuatd::zeros()), + _orivec(SGVec3f::zeros()), + _base_pos(SGGeod::fromDeg(0,0)), + _refname(file), + _data(NULL), _format(AL_FORMAT_MONO8), _size(0), _freq(0), @@ -101,20 +111,55 @@ SGSoundSample::SGSoundSample( const char *path, const char *file ) : if ( strlen(file) ) { samplepath.append( file ); } - _sample_name = samplepath.str(); + _refname = samplepath.str(); +} - SG_LOG( SG_GENERAL, SG_DEBUG, "From file sounds sample = " - << samplepath.str() ); +// constructor +SGSoundSample::SGSoundSample( const unsigned char** 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(SGGeod::fromDeg(0,0)), + _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; } // constructor -SGSoundSample::SGSoundSample( unsigned char *data, int len, int freq, int format ) : - _absolute_pos(SGVec3d::zeros().data()), - _relative_pos(SGVec3f::zeros().data()), - _base_pos(SGVec3d::zeros().data()), - _direction(SGVec3f::zeros().data()), - _velocity(SGVec3f::zeros().data()), - _data(data), +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(SGGeod::fromDeg(0,0)), + _refname(random_string()), _format(format), _size(len), _freq(freq), @@ -136,41 +181,51 @@ SGSoundSample::SGSoundSample( unsigned char *data, int len, int freq, int format _static_changed(true), _is_file(false) { - _sample_name = "unknown, data supplied by caller"; SG_LOG( SG_GENERAL, SG_DEBUG, "In memory sounds sample" ); + _data = (unsigned char*)*data; *data = NULL; } // destructor SGSoundSample::~SGSoundSample() { + if (_data) free(_data); +} + +void SGSoundSample::update_pos_and_orientation() { + // 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 = hlOr*_orientation; + + // 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); + + // The cartesian position of the sounds base location + SGVec3d position = SGVec3d::fromGeod(_base_pos); + + _absolute_pos = position; #if 0 - if (_data != NULL) { - delete[] _data; - _data = NULL; + if ( _relative_pos[0] || _relative_pos[1] || _relative_pos[2] ) { + _absolute_pos += (sc2body*q).backTransform(_relative_pos); } #endif + if ( _direction[0] || _direction[1] || _direction[2] ) { + _orivec = toVec3f( (sc2body*q).backTransform(_direction) ); + } } -void SGSoundSample::set_base_position( SGVec3d pos ) { - _base_pos = pos; - update_absolute_position(); - _changed = true; -} - -void SGSoundSample::set_relative_position( SGVec3f pos ) { - _relative_pos = pos; - update_absolute_position(); - _changed = true; -} +string SGSoundSample::random_string() { + static const char *r = "0123456789abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + string rstr = "System generated name: "; + for (int i=0; i<10; i++) { + rstr.push_back( r[rand() % strlen(r)] ); + } -void SGSoundSample::set_orientation( SGVec3f dir ) { - _direction = dir; - update_absolute_position(); - _changed = true; + return rstr; } -void SGSoundSample::update_absolute_position() { - SGQuatf orient = SGQuatf::fromAngleAxis(_direction); - SGVec3f modified_relative_pos = orient.transform(_relative_pos); - _absolute_pos = _base_pos + toVec3d(modified_relative_pos); -}