Oops, ALUT 1.0 requires a little more work than expected.

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

diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx
index 4e866b85e7f0c76320cc7a9277aef9f585e71f56..fbb4504ac1de562574b2e8a3886dcc4fb827c6b3 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();
@@ -247,6 +244,25 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
        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
    //
@@ -260,6 +276,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    }
 
    _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 );