FGViewer::recalcLookFrom turned out to be an excellent source of information for...

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 39cfdfe00e8fff15b20c054eb08b6b6fc2f0a0b4..45b303a19735588c2ee51c81b54c6415b09763c5 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -41,8 +41,8 @@
 static double _snd_inv(double v)   { return (v == 0) ? 1e99 : 1/v; }
 static double _snd_abs(double v)   { return (v >= 0) ? v : -v; }
 static double _snd_sqrt(double v)  { return sqrt(fabs(v)); }
-static double _snd_log10(double v) { return log10(fabs(v)); }
-static double _snd_log(double v)   { return log(fabs(v)); }
+static double _snd_log10(double v) { return log10(fabs(v)+1e-9); }
+static double _snd_log(double v)   { return log(fabs(v)+1e-9); }
 // static double _snd_sqr(double v)   { return v*v; }
 // static double _snd_pow3(double v)  { return v*v*v; }
 
@@ -101,9 +101,6 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
 
    } else {
       _mode = SGXmlSound::ONCE;
-
-      if ( strcmp(mode_str, "") )
-         SG_LOG(SG_GENERAL,SG_INFO, "Unknown sound mode for '" << _name << "', default to 'once'");
    }
 
    _property = root->getNode(node->getStringValue("property", ""), true);
@@ -246,9 +243,9 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
    float outer_gain = 0.0;
    prop = node->getChild("orientation");
    if ( prop != NULL ) {
-      dir = SGVec3d(-prop->getDoubleValue("x", 0.0),
-                    -prop->getDoubleValue("y", 0.0),
-                    -prop->getDoubleValue("z", 0.0));
+      dir = SGVec3d(prop->getDoubleValue("y", 0.0),
+                    prop->getDoubleValue("z", 0.0),
+                    prop->getDoubleValue("x", 0.0));
       inner = prop->getDoubleValue("inner-angle", 360.0);
       outer = prop->getDoubleValue("outer-angle", 360.0);
       outer_gain = prop->getDoubleValue("outer-gain", 0.0);