pass the float pointer to the isNaN function instead of the SGVec3 type

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

diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index 8bd5eb9b9f5c81b3f134d964198d796be465ccd8..a5d19641d385e86097f7a20cccbf6069ac37c4bb 100644 (file)
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -29,6 +29,10 @@
 #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(""),
@@ -85,9 +89,17 @@ void SGSampleGroup::update( double dt ) {
     unsigned int size = _removed_samples.size();
     for (unsigned int i=0; i<size; ) {
         SGSoundSample *sample = _removed_samples[i];
-        ALint result;
+        ALint result = AL_STOPPED;
+
+        if ( sample->is_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 );
+        }
 
-        alGetSourcei( sample->get_source(), AL_SOURCE_STATE, &result );
         if ( result == AL_STOPPED ) {
             ALuint buffer = sample->get_buffer();
             alDeleteBuffers( 1, &buffer );
@@ -124,7 +136,7 @@ void SGSampleGroup::update( double dt ) {
                 sample->set_source( source );
                 update_sample_config( sample );
 
-                ALboolean looping = sample->get_looping() ? AL_TRUE : AL_FALSE;
+                ALboolean looping = sample->is_looping() ? AL_TRUE : AL_FALSE;
                 alSourcei( source, AL_LOOPING, looping );
                 alSourcef( source, AL_ROLLOFF_FACTOR, 1.0 );
                 alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE );
@@ -144,7 +156,7 @@ void SGSampleGroup::update( double dt ) {
                 sample->stop();
                 sample->no_valid_source();
                 _smgr->release_source( sample->get_source() );
-            } else  {
+            } else if ( _smgr->has_changed() ) {
                 update_sample_config( sample );
             }
 
@@ -296,7 +308,7 @@ bool SGSampleGroup::stop( const string& refname ) {
 }
 
 // set source velocity of all managed sounds
-void SGSampleGroup::set_velocity( const 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");
@@ -356,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_VELOCITY, _smgr->get_velocity().data() );
-            alSourcefv( source, AL_DIRECTION, _smgr->get_direction().data() );
-        } else {
-            alSourcefv( source, AL_POSITION, sample->get_position() );
-            alSourcefv( source, AL_VELOCITY, sample->get_velocity() );
-            alSourcefv( source, AL_DIRECTION, sample->get_orientation() );
-        }
-        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");
     }
 }