add a missing character.

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 3899be7c746106e906762a1f842b8c026ca52902..3e27b82b4933b57e4d60d7d7186241c9bd78913e 100644 (file)
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -3,7 +3,7 @@
 // Started by Erik Hofman, February 2002
 // (Reuses some code from  fg_fx.cxx created by David Megginson)
 //
-// Copyright (C) 2002  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2002  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -80,11 +80,8 @@ SGXmlSound::~SGXmlSound()
 {
     _sample->stop();
 
-    if (_property)
-        delete _property;
-
-    if (_condition)
-        delete _condition;
+    delete _property;
+    delete _condition;
 
     _volume.clear();
     _pitch.clear();
@@ -235,18 +232,56 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
       p += pitch.offset;
    }
 
+   //
+   // Relative position
+   //
+   sgVec3 offset_pos;
+   sgSetVec3( offset_pos, 0.0, 0.0, 0.0 );
+   SGPropertyNode_ptr pos = node->getChild("position");
+   if ( pos != NULL ) {
+       offset_pos[0] = pos->getDoubleValue("x", 0.0);
+       offset_pos[1] = pos->getDoubleValue("y", 0.0);
+       offset_pos[2] = pos->getDoubleValue("z", 0.0);
+   }
+
+   //
+   // Orientation
+   //
+   sgVec3 dir;
+   float inner, outer, outer_gain;
+   sgSetVec3( dir, 0.0, 0.0, 0.0 );
+   inner = outer = 360.0;
+   outer_gain = 0.0;
+   pos = node->getChild("orientation");
+   if ( pos != NULL ) {
+      dir[0] = pos->getDoubleValue("x", 0.0);
+      dir[1] = pos->getDoubleValue("y", 0.0);
+      dir[2] = pos->getDoubleValue("z", 0.0);
+      inner = pos->getDoubleValue("inner-angle", 360.0);
+      outer = pos->getDoubleValue("outer-angle", 360.0);
+      outer_gain = pos->getDoubleValue("outer-gain", 0.0);
+   }
+   
    //
    // Initialize the sample
    //
    _mgr = sndmgr;
    if ( (_sample = _mgr->find(_name)) == NULL ) {
-       _sample = new SGSoundSample( path.c_str(),
-                                    node->getStringValue("path", ""),
-                                    true );
+       // FIXME: Does it make sense to overwrite a previous entry's
+       // configuration just because a new entry has the same name?
+       // Note that we can't match on identical "path" because we the
+       // new entry could be at a different location with different
+       // configuration so we need a new sample which creates a new
+       // "alSource".  The semantics of what is going on here seems
+       // confused and needs to be thought through more carefully.
+        _sample = new SGSoundSample( path.c_str(),
+                                    node->getStringValue("path", "") );
 
        _mgr->add( _sample, _name );
    }
 
+   _sample->set_offset_pos( offset_pos );
+   _sample->set_orientation(dir, inner, outer, outer_gain);
    _sample->set_volume(v);
    _sample->set_reference_dist( reference_dist );
    _sample->set_max_dist( max_dist );
@@ -393,7 +428,14 @@ SGXmlSound::update (double dt)
    // Change sample state
    //
    _sample->set_pitch( pitch_offset + pitch );
-   _sample->set_volume( volume_offset + volume );
+   if ((volume_offset + volume ) > 1.0)
+   {
+      _sample->set_volume( 1.0 );
+      SG_LOG(SG_GENERAL, SG_WARN,
+             "Volume larger than 1.0 in configuration for '" << _name
+              << "', clipping.");
+   } else 
+      _sample->set_volume( volume_offset + volume );
 
 
    //