X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmarker_beacon.cxx;h=2037211bbf8e69a24d742ec3e99a9b9e4430d430;hb=43880b201cea2b120fefd99696ae0b43227358dc;hp=32fa58c8e1ee06caac7dc952f86bef250da2692a;hpb=095efc1fcf88dd8ddad5f8c6698e702e26cc5b44;p=flightgear.git diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx index 32fa58c8e..2037211bb 100644 --- a/src/Instrumentation/marker_beacon.cxx +++ b/src/Instrumentation/marker_beacon.cxx @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -36,7 +37,7 @@ #include "marker_beacon.hxx" #include -SG_USING_STD(string); +using std::string; // Constructor @@ -62,8 +63,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : low_tbl = new SGInterpTable( low.str() ); high_tbl = new SGInterpTable( high.str() ); - int i; - for ( i = 0; i < node->nChildren(); ++i ) { + for ( int i = 0; i < node->nChildren(); ++i ) { SGPropertyNode *child = node->getChild(i); string cname = child->getName(); string cval = child->getStringValue(); @@ -72,7 +72,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : } else if ( cname == "number" ) { num = child->getIntValue(); } else { - SG_LOG( SG_INSTR, SG_WARN, + SG_LOG( SG_INSTR, SG_WARN, "Error in marker beacon config logic" ); if ( name.length() ) { SG_LOG( SG_INSTR, SG_WARN, "Section = " << name ); @@ -83,7 +83,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : // Destructor -FGMarkerBeacon::~FGMarkerBeacon() +FGMarkerBeacon::~FGMarkerBeacon() { delete term_tbl; delete low_tbl; @@ -109,9 +109,12 @@ FGMarkerBeacon::init () audio_vol = node->getChild("volume", 0, true); serviceable = node->getChild("serviceable", 0, true); - power_btn->setBoolValue( true ); - audio_btn->setBoolValue( true ); - serviceable->setBoolValue( true ); + if (power_btn->getType() == SGPropertyNode::NONE) + power_btn->setBoolValue( true ); + if (audio_btn->getType() == SGPropertyNode::NONE) + audio_btn->setBoolValue( true ); + if (serviceable->getType() == SGPropertyNode::NONE) + serviceable->setBoolValue( true ); morse.init(); beacon.init(); @@ -128,13 +131,13 @@ FGMarkerBeacon::bind () branch = "/instrumentation/" + name; fgTie((branch + "/inner").c_str(), this, - &FGMarkerBeacon::get_inner_blink); + &FGMarkerBeacon::get_inner_blink); fgTie((branch + "/middle").c_str(), this, - &FGMarkerBeacon::get_middle_blink); + &FGMarkerBeacon::get_middle_blink); fgTie((branch + "/outer").c_str(), this, - &FGMarkerBeacon::get_outer_blink); + &FGMarkerBeacon::get_outer_blink); } @@ -151,19 +154,25 @@ FGMarkerBeacon::unbind () // Update the various nav values based on position and valid tuned in navs -void -FGMarkerBeacon::update(double dt) +void +FGMarkerBeacon::update(double dt) { need_update = false; + // On timeout, scan again, this needs to run every iteration no + // matter what the power or serviceable state. If power is turned + // off or the unit becomes unserviceable while a beacon sound is + // playing, the search() routine still needs to be called so the + // sound effect can be properly disabled. + + _time_before_search_sec -= dt; + if ( _time_before_search_sec < 0 ) { + search(); + } + if ( has_power() && serviceable->getBoolValue() && !sound_pause->getBoolValue()) { - // On timeout, scan again - _time_before_search_sec -= dt; - if ( _time_before_search_sec < 0 ) { - search(); - } // marker beacon blinking bool light_on = ( outer_blink || middle_blink || inner_blink ); SGTimeStamp current; @@ -204,26 +213,20 @@ FGMarkerBeacon::update(double dt) static bool check_beacon_range( const SGGeod& pos, - FGNavRecord *b ) + FGPositioned *b ) { - SGVec3d aircraft = SGVec3d::fromGeod(pos); - SGVec3d station = b->get_cart(); - // cout << " aircraft = " << aircraft << " station = " << station - // << endl; - - SGVec3d tmp = station - aircraft; - double d = dot(tmp, tmp); - // cout << " distance = " << d << " (" - // << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER + double d = distSqr(b->cart(), SGVec3d::fromGeod(pos)); + // cout << " distance = " << d << " (" + // << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER // * FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER // << ")" << endl; - - // cout << " range = " << sqrt(d) << endl; + + //std::cout << " range = " << sqrt(d) << std::endl; // cout << "elev = " << elev * SG_METER_TO_FEET // << " current->get_elev() = " << current->get_elev() << endl; double elev_ft = pos.getElevationFt(); - double delev = elev_ft - b->get_elev_ft(); + double delev = elev_ft - b->elevation(); // max range is the area under r = 2.4 * alt or r^2 = 4000^2 - alt^2 // whichever is smaller. The intersection point is 1538 ... @@ -236,7 +239,7 @@ static bool check_beacon_range( const SGGeod& pos, maxrange2 = 0.0; } maxrange2 *= SG_FEET_TO_METER * SG_FEET_TO_METER; // convert to meter^2 - // cout << "delev = " << delev << " maxrange = " << maxrange << endl; + //std::cout << "delev = " << delev << " maxrange = " << sqrt(maxrange2) << std::endl; // match up to twice the published range so we can model // reduced signal strength @@ -247,10 +250,22 @@ static bool check_beacon_range( const SGGeod& pos, } } -// Update current nav/adf radio stations based on current postition -void FGMarkerBeacon::search() +class BeaconFilter : public FGPositioned::Filter { +public: + virtual FGPositioned::Type minType() const { + return FGPositioned::OM; + } + + virtual FGPositioned::Type maxType() const { + return FGPositioned::IM; + } +}; + +// Update current nav/adf radio stations based on current postition +void FGMarkerBeacon::search() +{ // reset search time _time_before_search_sec = 1.0; @@ -264,44 +279,39 @@ void FGMarkerBeacon::search() // Beacons. //////////////////////////////////////////////////////////////////////// - // get closest marker beacon - FGNavRecord *b - = globals->get_mkrlist()->findClosest( pos.getLongitudeRad(), - pos.getLatitudeRad(), - pos.getElevationM() ); - - // cout << "marker beacon = " << b << " (" << b->get_type() << ")" << endl; + // get closest marker beacon - within a 1nm cutoff + BeaconFilter filter; + FGPositionedRef b = FGPositioned::findClosest(pos, 1.0, &filter); fgMkrBeacType beacon_type = NOBEACON; bool inrange = false; if ( b != NULL ) { - if ( b->get_type() == 7 ) { + if ( b->type() == FGPositioned::OM ) { beacon_type = OUTER; - } else if ( b->get_type() == 8 ) { + } else if ( b->type() == FGPositioned::MM ) { beacon_type = MIDDLE; - } else if ( b->get_type() == 9 ) { + } else if ( b->type() == FGPositioned::IM ) { beacon_type = INNER; } - inrange = check_beacon_range( pos, b ); - // cout << " inrange = " << inrange << endl; + inrange = check_beacon_range( pos, b.ptr() ); } outer_marker = middle_marker = inner_marker = false; if ( b == NULL || !inrange || !has_power() || !serviceable->getBoolValue() ) { - // cout << "no marker" << endl; - globals->get_soundmgr()->stop( "outer-marker" ); - globals->get_soundmgr()->stop( "middle-marker" ); - globals->get_soundmgr()->stop( "inner-marker" ); + // cout << "no marker" << endl; + globals->get_soundmgr()->stop( "outer-marker" ); + globals->get_soundmgr()->stop( "middle-marker" ); + globals->get_soundmgr()->stop( "inner-marker" ); } else { string current_sound_name; if ( beacon_type == OUTER ) { - outer_marker = true; + outer_marker = true; current_sound_name = "outer-marker"; - // cout << "OUTER MARKER" << endl; + // cout << "OUTER MARKER" << endl; if ( last_beacon != OUTER ) { if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { SGSoundSample *sound = beacon.get_outer(); @@ -318,16 +328,16 @@ void FGMarkerBeacon::search() globals->get_soundmgr()->stop( current_sound_name ); } } else if ( beacon_type == MIDDLE ) { - middle_marker = true; + middle_marker = true; current_sound_name = "middle-marker"; - // cout << "MIDDLE MARKER" << endl; - if ( last_beacon != MIDDLE ) { - if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { - SGSoundSample *sound = beacon.get_middle(); + // cout << "MIDDLE MARKER" << endl; + if ( last_beacon != MIDDLE ) { + if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { + SGSoundSample *sound = beacon.get_middle(); if ( sound ) { - globals->get_soundmgr()->add( sound, current_sound_name ); + globals->get_soundmgr()->add( sound, current_sound_name ); } - } + } } if ( audio_btn->getBoolValue() ) { if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) { @@ -337,16 +347,16 @@ void FGMarkerBeacon::search() globals->get_soundmgr()->stop( current_sound_name ); } } else if ( beacon_type == INNER ) { - inner_marker = true; + inner_marker = true; current_sound_name = "inner-marker"; - // cout << "INNER MARKER" << endl; - if ( last_beacon != INNER ) { - if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { - SGSoundSample *sound = beacon.get_inner(); + // cout << "INNER MARKER" << endl; + if ( last_beacon != INNER ) { + if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { + SGSoundSample *sound = beacon.get_inner(); if ( sound ) { - globals->get_soundmgr()->add( sound, current_sound_name ); + globals->get_soundmgr()->add( sound, current_sound_name ); } - } + } } if ( audio_btn->getBoolValue() ) { if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) {