Updates to the test utilies.

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 9fe4fdb1e92b407a169ed165e3c1165c23a2a02a..54f3e4b1bcca7c0ed76c2e2cc7d5a2bf63aabd7e 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -171,7 +171,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
 
    }
 
-   float reference_dist = node->getDoubleValue("reference-dist", 500.0);
+   float reference_dist = node->getDoubleValue("reference-dist", 50.0);
    float max_dist = node->getDoubleValue("max-dist", 3000.0);
  
    //
@@ -240,20 +240,20 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    //
    // Orientation
    //
-   SGVec3f dir = SGVec3f::zeros();
-   float inner, outer, outer_gain;
-   inner = outer = 360.0;
-   outer_gain = 0.0;
+   SGVec3d dir = SGVec3d::zeros();
+   float inner = 360.0;
+   float outer = 360.0;
+   float outer_gain = 0.0;;
    prop = node->getChild("orientation");
    if ( prop != NULL ) {
-      dir[0] = prop->getDoubleValue("x", 0.0);
-      dir[1] = -prop->getDoubleValue("y", 0.0);
-      dir[2] = prop->getDoubleValue("z", 0.0);
+      dir = SGVec3d(-prop->getDoubleValue("x", 0.0),
+                    -prop->getDoubleValue("y", 0.0),
+                    -prop->getDoubleValue("z", 0.0));
       inner = prop->getDoubleValue("inner-angle", 360.0);
       outer = prop->getDoubleValue("outer-angle", 360.0);
       outer_gain = prop->getDoubleValue("outer-gain", 0.0);
    }
-   
+
    //
    // Initialize the sample
    //
@@ -261,11 +261,11 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    _sample = new SGSoundSample( path.c_str(), node->getStringValue("path", ""));
    _sample->set_relative_position( offset_pos );
    _sample->set_direction( dir );
-   _sample->set_audio_cone(inner, outer, outer_gain);
+   _sample->set_audio_cone( inner, outer, outer_gain );
    _sample->set_reference_dist( reference_dist );
    _sample->set_max_dist( max_dist );
-   _sample->set_volume(v);
-   _sample->set_pitch(p);
+   _sample->set_volume( v );
+   _sample->set_pitch( p );
    _sgrp->add( _sample, _name );
 }