X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fxmlsound.cxx;h=54f3e4b1bcca7c0ed76c2e2cc7d5a2bf63aabd7e;hb=ea513d392e050578fcc017e0c888a3374f0dcead;hp=6aa93b28a35dfcfc09327ba3120781bcfda1874b;hpb=dcb95d131bc6aef1abe25d1f415e309f06e52436;p=simgear.git diff --git a/simgear/sound/xmlsound.cxx b/simgear/sound/xmlsound.cxx index 6aa93b28..54f3e4b1 100644 --- a/simgear/sound/xmlsound.cxx +++ b/simgear/sound/xmlsound.cxx @@ -21,57 +21,52 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif + #include -#ifdef SG_HAVE_STD_INCLUDES -# include -#else -# include -#endif #include #include #include -#include +#include #include "xmlsound.hxx" -#define LOG_ABS(x) (((x) > 1) ? (x) : (((x) < -1) ? -(x) : 0)) // 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 fast_log10( LOG_ABS(v) ); } -static double _snd_log(double v) { return fast_log( LOG_ABS(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), _active(false), _name(""), _mode(SGXmlSound::ONCE), _prev_value(0), _dt_play(0.0), _dt_stop(0.0), + _delay(0.0), _stopping(0.0) { } @@ -81,23 +76,21 @@ SGXmlSound::~SGXmlSound() if (_sample) _sample->stop(); - delete _condition; - _volume.clear(); _pitch.clear(); } 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") ) { @@ -110,7 +103,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr, _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); @@ -122,12 +115,14 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr, 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 kids = node->getChildren("volume"); + std::vector 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}; @@ -176,7 +171,7 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr, } - 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); // @@ -234,57 +229,44 @@ SGXmlSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr, // // 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); + SGVec3f offset_pos = SGVec3f::zeros(); + SGPropertyNode_ptr prop = node->getChild("position"); + if ( prop != NULL ) { + offset_pos[0] = prop->getDoubleValue("x", 0.0); + offset_pos[1] = -prop->getDoubleValue("y", 0.0); + offset_pos[2] = prop->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); + 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 = 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 // - _mgr = sndmgr; - if ( (_sample = _mgr->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", "") ); - - _mgr->add( _sample, _name ); - } - - _sample->set_offset_pos( offset_pos ); - _sample->set_orientation(dir, inner, outer, outer_gain); - _sample->set_volume(v); + _sgrp = sgrp; + _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_reference_dist( reference_dist ); _sample->set_max_dist( max_dist ); - _sample->set_pitch(p); + _sample->set_volume( v ); + _sample->set_pitch( p ); + _sgrp->add( _sample, _name ); } void @@ -298,6 +280,11 @@ SGXmlSound::update (double dt) 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 && @@ -308,9 +295,10 @@ SGXmlSound::update (double dt) ) ) { - 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(); @@ -327,8 +315,7 @@ SGXmlSound::update (double dt) } // - // 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)) { @@ -339,16 +326,19 @@ SGXmlSound::update (double dt) _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 @@ -426,15 +416,15 @@ SGXmlSound::update (double dt) // // Change sample state // + + 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 ); - 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 ); // @@ -448,9 +438,9 @@ SGXmlSound::update (double dt) 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;