X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fsample_group.cxx;h=a5d19641d385e86097f7a20cccbf6069ac37c4bb;hb=145a7fa1467c028f80e141a324950b2c47e34b7b;hp=fb2f31f05393f97e321ceb1d64b1b02b260853d0;hpb=fdfdfedf01776fafa4d769b93e95585e018a00d4;p=simgear.git diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx index fb2f31f0..a5d19641 100644 --- a/simgear/sound/sample_group.cxx +++ b/simgear/sound/sample_group.cxx @@ -1,54 +1,47 @@ +// sample_group.cxx -- Manage a group of samples relative to a base position +// +// Written for the new SoundSystem by Erik Hofman, October 2009 +// +// 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 +// published by the Free Software Foundation; either version 2 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +// $Id$ + #ifdef HAVE_CONFIG_H # include #endif #include -#if defined (__APPLE__) -# ifdef __GNUC__ -# if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 ) -// # include -inline int (isnan)(double r) { return !(r <= 0 || r >= 0); } -# else - // any C++ header file undefines isinf and isnan - // so this should be included before - // the functions are STILL in libm (libSystem on mac os x) -extern "C" int isnan (double); -extern "C" int isinf (double); -# endif -# else -// inline int (isinf)(double r) { return isinf(r); } -// inline int (isnan)(double r) { return isnan(r); } -# endif -#endif - -#if defined (__FreeBSD__) -# if __FreeBSD_version < 500000 - extern "C" { - inline int isnan(double r) { return !(r <= 0 || r >= 0); } - } -# endif -#endif - -#if defined (__CYGWIN__) -# include -#endif - -#if defined(__MINGW32__) -# define isnan(x) _isnan(x) -#endif - #include "soundmgr_openal.hxx" #include "sample_group.hxx" +bool isNaN(float *v) { + return (isnan(v[0]) || isnan(v[1]) || isnan(v[2])); +} + SGSampleGroup::SGSampleGroup () : _smgr(NULL), _refname(""), _active(false), + _pause(false), _tied_to_listener(false), _velocity(SGVec3d::zeros()), - _position(SGGeod()), - _orientation(SGQuatd::zeros()) + _orientation(SGQuatd::zeros()), + _position(SGGeod()) { _samples.clear(); } @@ -57,10 +50,11 @@ SGSampleGroup::SGSampleGroup ( SGSoundMgr *smgr, const string &refname ) : _smgr(smgr), _refname(refname), _active(false), + _pause(false), _tied_to_listener(false), _velocity(SGVec3d::zeros()), - _position(SGGeod()), - _orientation(SGQuatd::zeros()) + _orientation(SGQuatd::zeros()), + _position(SGGeod()) { _smgr->add(this, refname); _samples.clear(); @@ -87,9 +81,35 @@ SGSampleGroup::~SGSampleGroup () void SGSampleGroup::update( double dt ) { - if ( !_active ) return; + if ( !_active || _pause ) return; + + testForALError("start of update!!\n"); + + // Delete any OpenAL buffers that might still be in use. + unsigned int size = _removed_samples.size(); + for (unsigned int i=0; iis_valid_source() ) { + if ( sample->is_looping() ) { + sample->no_valid_source(); + _smgr->release_source( sample->get_source() ); + } + else + alGetSourcei( sample->get_source(), AL_SOURCE_STATE, &result ); + } - // testForALError("start of update!!\n"); + if ( result == AL_STOPPED ) { + ALuint buffer = sample->get_buffer(); + alDeleteBuffers( 1, &buffer ); + testForALError("buffer remove"); + _removed_samples.erase( _removed_samples.begin()+i ); + size--; + continue; + } + i++; + } sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_end = _samples.end(); @@ -104,7 +124,6 @@ void SGSampleGroup::update( double dt ) { continue; // start playing the sample - ALboolean looping = sample->get_looping() ? AL_TRUE : AL_FALSE; ALuint buffer = sample->get_buffer(); ALuint source = _smgr->request_source(); if (alIsSource(source) == AL_TRUE && alIsBuffer(buffer) == AL_TRUE) @@ -117,9 +136,10 @@ void SGSampleGroup::update( double dt ) { sample->set_source( source ); update_sample_config( sample ); - alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE ); + ALboolean looping = sample->is_looping() ? AL_TRUE : AL_FALSE; alSourcei( source, AL_LOOPING, looping ); - alSourcef( source, AL_ROLLOFF_FACTOR, 1.2 ); + alSourcef( source, AL_ROLLOFF_FACTOR, 1.0 ); + alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE ); alSourcePlay( source ); testForALError("sample play"); } else { @@ -133,10 +153,10 @@ void SGSampleGroup::update( double dt ) { if ( !sample->is_playing() ) { // a request to stop playing the sound has been filed. - sample->no_valid_source(); sample->stop(); + sample->no_valid_source(); _smgr->release_source( sample->get_source() ); - } else { + } else if ( _smgr->has_changed() ) { update_sample_config( sample ); } @@ -149,9 +169,11 @@ void SGSampleGroup::update( double dt ) { alGetSourcei( source, AL_SOURCE_STATE, &result ); if ( result == AL_STOPPED ) { // sample is stoped because it wasn't looping - sample->no_valid_source(); sample->stop(); + sample->no_valid_source(); _smgr->release_source( source ); + _smgr->release_buffer( sample ); + remove( sample->get_sample_name() ); } } testForALError("update"); @@ -159,7 +181,7 @@ void SGSampleGroup::update( double dt ) { } // add a sound effect, return true if successful -bool SGSampleGroup::add( SGSoundSample *sound, const string& refname ) { +bool SGSampleGroup::add( SGSharedPtr sound, const string& refname ) { sample_map_iterator sample_it = _samples.find( refname ); if ( sample_it != _samples.end() ) { @@ -181,9 +203,9 @@ bool SGSampleGroup::remove( const string &refname ) { return false; } - // remove the sources buffer - _smgr->release_buffer( sample_it->second ); - _samples.erase( refname ); + if ( sample_it->second->is_valid_buffer() ) + _removed_samples.push_back( sample_it->second ); + _samples.erase( sample_it ); return true; } @@ -218,15 +240,14 @@ SGSoundSample *SGSampleGroup::find( const string &refname ) { void SGSampleGroup::suspend () { - _active = false; + _pause = true; sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_end = _samples.end(); for ( ; sample_current != sample_end; ++sample_current ) { SGSoundSample *sample = sample_current->second; if ( sample->is_valid_source() && sample->is_playing() ) { - unsigned int source = sample->get_source(); - alSourcePause( source ); + alSourcePause( sample->get_source() ); } } testForALError("suspend"); @@ -242,12 +263,11 @@ SGSampleGroup::resume () SGSoundSample *sample = sample_current->second; if ( sample->is_valid_source() && sample->is_playing() ) { - unsigned int source = sample->get_source(); - alSourcePlay( source ); + alSourcePlay( sample->get_source() ); } } testForALError("resume"); - _active = true; + _pause = false; } @@ -288,7 +308,7 @@ bool SGSampleGroup::stop( const string& refname ) { } // set source velocity of all managed sounds -void SGSampleGroup::set_velocity( SGVec3d &vel ) { +void SGSampleGroup::set_velocity( const SGVec3f &vel ) { if ( isnan(vel[0]) || isnan(vel[1]) || isnan(vel[2]) ) { SG_LOG( SG_GENERAL, SG_ALERT, "NAN's found in SampleGroup velocity"); @@ -307,7 +327,7 @@ void SGSampleGroup::set_velocity( SGVec3d &vel ) { } // set the source position of all managed sounds -void SGSampleGroup::set_position( SGGeod pos ) { +void SGSampleGroup::set_position( const SGGeod& pos ) { sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_end = _samples.end(); @@ -320,7 +340,7 @@ void SGSampleGroup::set_position( SGGeod pos ) { // set the source orientation of all managed sounds -void SGSampleGroup::set_orientation( SGQuatd ori ) { +void SGSampleGroup::set_orientation( const SGQuatd& ori ) { if (_orientation != ori) { sample_map_iterator sample_current = _samples.begin(); @@ -348,35 +368,46 @@ void SGSampleGroup::set_volume( float vol ) } void SGSampleGroup::update_sample_config( SGSoundSample *sample ) { - if ( sample->is_valid_source() ) { - unsigned int source = sample->get_source(); - - if ( _tied_to_listener && _smgr->has_changed() ) { - alSourcefv( source, AL_POSITION, _smgr->get_position().data() ); - alSourcefv( source, AL_DIRECTION, _smgr->get_direction().data() ); - alSourcefv( source, AL_VELOCITY, _smgr->get_velocity().data() ); - } else { - alSourcefv( source, AL_POSITION, sample->get_position() ); - alSourcefv( source, AL_DIRECTION, sample->get_orientation() ); - alSourcefv( source, AL_VELOCITY, sample->get_velocity() ); - } - testForALError("position and orientation"); - - alSourcef( source, AL_PITCH, sample->get_pitch() ); - alSourcef( source, AL_GAIN, sample->get_volume() ); - testForALError("pitch and gain"); - - if ( sample->has_static_data_changed() ) { - alSourcef( source, AL_CONE_INNER_ANGLE, sample->get_innerangle() ); - alSourcef( source, AL_CONE_OUTER_ANGLE, sample->get_outerangle() ); - alSourcef( source, AL_CONE_OUTER_GAIN, sample->get_outergain() ); - testForALError("audio cone"); - - alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() ); - alSourcef( source, AL_REFERENCE_DISTANCE, - sample->get_reference_dist() ); - testForALError("distance rolloff"); - } + SGVec3f orientation, velocity; + SGVec3d position; + + if ( _tied_to_listener ) { + orientation = _smgr->get_direction(); + position = _smgr->get_position(); + velocity = _smgr->get_velocity(); + } else { + sample->update_absolute_position(); + orientation = sample->get_orientation(); + position = sample->get_position(); + velocity = sample->get_velocity(); + } + + if (dist(position, _smgr->get_position()) > 10000) + printf("source and listener distance greater than 20km!\n"); + if (isNaN(toVec3f(position).data())) printf("NaN in source position\n"); + if (isNaN(orientation.data())) printf("NaN in source orientation\n"); + if (isNaN(velocity.data())) printf("NaN in source velocity\n"); + + unsigned int source = sample->get_source(); + alSourcefv( source, AL_POSITION, toVec3f(position).data() ); + alSourcefv( source, AL_VELOCITY, velocity.data() ); + alSourcefv( source, AL_DIRECTION, orientation.data() ); + testForALError("position and orientation"); + + alSourcef( source, AL_PITCH, sample->get_pitch() ); + alSourcef( source, AL_GAIN, sample->get_volume() ); + testForALError("pitch and gain"); + + if ( sample->has_static_data_changed() ) { + alSourcef( source, AL_CONE_INNER_ANGLE, sample->get_innerangle() ); + alSourcef( source, AL_CONE_OUTER_ANGLE, sample->get_outerangle() ); + alSourcef( source, AL_CONE_OUTER_GAIN, sample->get_outergain() ); + testForALError("audio cone"); + + alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() ); + alSourcef( source, AL_REFERENCE_DISTANCE, + sample->get_reference_dist() ); + testForALError("distance rolloff"); } }