// 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
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
+#ifdef HAVE_CONFIG_H
+# include <simgear_config.h>
+#endif
+
#include <simgear/compiler.h>
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cmath>
-#else
-# include <math.h>
-#endif
#include <string.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/props/condition.hxx>
-#include <simgear/math/fastmath.hxx>
+#include <simgear/math/SGMath.hxx>
#include "xmlsound.hxx"
// static double _snd_lin(double v) { return v; }
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 (v < 0) ? sqrt(-v) : sqrt(v); }
-static double _snd_log10(double v) { return (v < 1) ? 0 : fast_log10(v); }
-static double _snd_log(double v) { return (v < 1) ? 0 : fast_log(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_sqr(double v) { return v*v; }
// static double _snd_pow3(double v) { return v*v*v; }
static const struct {
- char *name;
+ const char *name;
double (*fn)(double);
} __sound_fn[] = {
-// {"lin", _snd_lin},
{"inv", _snd_inv},
{"abs", _snd_abs},
{"sqrt", _snd_sqrt},
{"log", _snd_log10},
{"ln", _snd_log},
-// {"sqr", _snd_sqr},
-// {"pow3", _snd_pow3},
{"", NULL}
};
SGXmlSound::SGXmlSound()
: _sample(NULL),
- _condition(NULL),
- _property(NULL),
_active(false),
_name(""),
_mode(SGXmlSound::ONCE),
_prev_value(0),
_dt_play(0.0),
_dt_stop(0.0),
+ _delay(0.0),
_stopping(0.0)
{
}
SGXmlSound::~SGXmlSound()
{
- _sample->stop();
-
- if (_property)
- delete _property;
-
- if (_condition)
- delete _condition;
+ if (_sample)
+ _sample->stop();
_volume.clear();
_pitch.clear();
- delete _sample;
}
void
-SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
- const string &path)
+SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node,
+ SGSampleGroup *sgrp, const string &path)
{
//
// set global sound properties
//
-
+
_name = node->getStringValue("name", "");
- SG_LOG(SG_GENERAL, SG_INFO, "Loading sound information for: " << _name );
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Loading sound information for: " << _name );
const char *mode_str = node->getStringValue("mode", "");
if ( !strcmp(mode_str, "looped") ) {
_mode = SGXmlSound::ONCE;
if ( strcmp(mode_str, "") )
- SG_LOG(SG_GENERAL,SG_INFO, " Unknown sound mode, default to 'once'");
+ SG_LOG(SG_GENERAL,SG_INFO, "Unknown sound mode for '" << _name << "', default to 'once'");
}
_property = root->getNode(node->getStringValue("property", ""), true);
SG_LOG(SG_GENERAL, SG_WARN,
" Neither a condition nor a property specified");
+ _delay = node->getDoubleValue("delay-sec", 0.0);
+
//
// set volume properties
//
unsigned int i;
float v = 0.0;
- vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
+ std::vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) {
_snd_prop volume = {NULL, NULL, NULL, 1.0, 0.0, 0.0, 0.0, false};
//
// Relative position
//
- sgVec3 offset_pos;
- sgSetVec3( offset_pos, 0.0, 0.0, 0.0 );
+ SGVec3f offset_pos = SGVec3f::zeros();
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[1] = -pos->getDoubleValue("y", 0.0);
offset_pos[2] = pos->getDoubleValue("z", 0.0);
}
+ //
+ // Orientation
+ //
+ SGVec3f dir = SGVec3f::zeros();
+ float inner, outer, outer_gain;
+ 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 );
-
- _mgr->add( _sample, _name );
+ _sgrp = sgrp;
+ if ( (_sample = _sgrp->find(_name)) == NULL ) {
+ // 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", "") );
+ _sgrp->add( _sample, _name );
}
- _sample->set_offset_pos( offset_pos );
- _sample->set_volume(v);
+ _sample->set_relative_position( offset_pos );
+ _sample->set_orientation( dir );
+ _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);
}
if (_property)
curr_value = _property->getDoubleValue();
+ // If a condition is defined, test whether it is FALSE,
+ // else
+ // if a property is defined then test if it's value is FALSE
+ // or if the mode is IN_TRANSIT then
+ // test whether the current value matches the previous value.
if ( // Lisp, anyone?
(_condition && !_condition->test()) ||
(!_condition && _property &&
)
)
{
- if ((_mode != SGXmlSound::IN_TRANSIT) || (_stopping > MAX_TRANSIT_TIME)) {
+ if ((_mode != SGXmlSound::IN_TRANSIT) || (_stopping > MAX_TRANSIT_TIME))
+ {
if (_sample->is_playing()) {
- SG_LOG(SG_GENERAL, SG_INFO, "Stopping audio after " << _dt_play
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Stopping audio after " << _dt_play
<< " sec: " << _name );
_sample->stop();
}
//
- // If the mode is ONCE and the sound is still playing,
- // we have nothing to do anymore.
+ // mode is ONCE and the sound is still playing?
//
if (_active && (_mode == SGXmlSound::ONCE)) {
_dt_play += dt;
}
- return;
+ } else {
+
+ //
+ // Update the playing time, cache the current value and
+ // clear the delay timer.
+ //
+ _dt_play += dt;
+ _prev_value = curr_value;
+ _stopping = 0.0;
}
- //
- // Update the playing time, cache the current value and
- // clear the delay timer.
- //
- _dt_play += dt;
- _prev_value = curr_value;
- _stopping = 0.0;
+ if (_dt_play < _delay)
+ return;
//
// Update the volume
//
// Change sample state
//
- _sample->set_pitch( pitch_offset + pitch );
- _sample->set_volume( volume_offset + volume );
-#if 0
- if ((pitch_offset + pitch) > 2.0)
- cout << "WARNING: Pitch higher than 2.0 for configuration for '" << _name << "'"<< endl;
-#endif
- if ((volume_offset + volume ) > 1.0)
- cout << "WARNING: Volume larger than 1.0 for configuration for '" << _name << "'" << endl;
+ double vol = volume_offset + volume;
+ if (vol > 1.0) {
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Sound volume too large for '"
+ << _name << "': " << vol << " -> clipping to 1.0");
+ vol = 1.0;
+ }
+ _sample->set_volume(vol);
+ _sample->set_pitch( pitch_offset + pitch );
//
else
_sample->play(true);
- SG_LOG(SG_GENERAL, SG_INFO, "Playing audio after " << _dt_stop
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Playing audio after " << _dt_stop
<< " sec: " << _name);
- SG_LOG(SG_GENERAL, SG_BULK,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Playing " << ((_mode == ONCE) ? "once" : "looped"));
_active = true;