X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmarker_beacon.cxx;h=012f1c9847d6a1c8044c133dbca0a15f4dab6867;hb=4ce94a0ec44de6aa5c426a24bda310cf26a76045;hp=78f19358dbca5630204a66a705bd0543791e87bb;hpb=1c2c76709e1b85bd0e9805e747177a080345e07f;p=flightgear.git diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx index 78f19358d..012f1c984 100644 --- a/src/Instrumentation/marker_beacon.cxx +++ b/src/Instrumentation/marker_beacon.cxx @@ -16,7 +16,7 @@ // // 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$ @@ -41,12 +41,14 @@ SG_USING_STD(string); // Constructor FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : + audio_vol(NULL), need_update(true), outer_blink(false), middle_blink(false), inner_blink(false), name("marker-beacon"), - num(0) + num(0), + _time_before_search_sec(0.0) { SGPath path( globals->get_fg_root() ); SGPath term = path; @@ -70,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 ); @@ -81,7 +83,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : // Destructor -FGMarkerBeacon::~FGMarkerBeacon() +FGMarkerBeacon::~FGMarkerBeacon() { delete term_tbl; delete low_tbl; @@ -97,12 +99,14 @@ FGMarkerBeacon::init () SGPropertyNode *node = fgGetNode(branch.c_str(), num, true ); // Inputs + sound_pause = fgGetNode("/sim/sound/pause", false); lon_node = fgGetNode("/position/longitude-deg", true); lat_node = fgGetNode("/position/latitude-deg", true); alt_node = fgGetNode("/position/altitude-ft", true); - bus_power = fgGetNode("/systems/electrical/outputs/navcom[0]", true); + bus_power = fgGetNode("/systems/electrical/outputs/nav[0]", true); power_btn = node->getChild("power-btn", 0, true); audio_btn = node->getChild("audio-btn", 0, true); + audio_vol = node->getChild("volume", 0, true); serviceable = node->getChild("serviceable", 0, true); power_btn->setBoolValue( true ); @@ -112,6 +116,8 @@ FGMarkerBeacon::init () morse.init(); beacon.init(); blink.stamp(); + + outer_marker = middle_marker = inner_marker = false; } @@ -122,13 +128,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); } @@ -145,18 +151,19 @@ 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; - if ( has_power() && serviceable->getBoolValue() ) { + if ( has_power() && serviceable->getBoolValue() + && !sound_pause->getBoolValue()) { - // On timeout, scan again - _time_before_search_sec -= dt; - if ( _time_before_search_sec < 0 ) { - search(); - } + // 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; @@ -196,25 +203,26 @@ FGMarkerBeacon::update(double dt) } -static bool check_beacon_range( double lon_rad, double lat_rad, double elev_m, +static bool check_beacon_range( const SGGeod& pos, FGNavRecord *b ) { - Point3D aircraft = sgGeodToCart( Point3D(lon_rad, lat_rad, elev_m) ); - Point3D station = Point3D( b->get_x(), b->get_y(), b->get_z() ); - // cout << " aircraft = " << aircraft << " station = " << station + SGVec3d aircraft = SGVec3d::fromGeod(pos); + SGVec3d station = b->get_cart(); + // cout << " aircraft = " << aircraft << " station = " << station // << endl; - double d = aircraft.distance3Dsquared( station ); // meters^2 - // cout << " distance = " << d << " (" - // << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER + SGVec3d tmp = station - aircraft; + double d = dot(tmp, tmp); + // 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; // cout << "elev = " << elev * SG_METER_TO_FEET // << " current->get_elev() = " << current->get_elev() << endl; - double elev_ft = elev_m * SG_METER_TO_FEET; + double elev_ft = pos.getElevationFt(); double delev = elev_ft - b->get_elev_ft(); // max range is the area under r = 2.4 * alt or r^2 = 4000^2 - alt^2 @@ -240,7 +248,7 @@ static bool check_beacon_range( double lon_rad, double lat_rad, double elev_m, } // Update current nav/adf radio stations based on current postition -void FGMarkerBeacon::search() +void FGMarkerBeacon::search() { // reset search time @@ -248,9 +256,9 @@ void FGMarkerBeacon::search() static fgMkrBeacType last_beacon = NOBEACON; - double lon_rad = lon_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS; - double lat_rad = lat_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS; - double elev_m = alt_node->getDoubleValue() * SG_FEET_TO_METER; + SGGeod pos = SGGeod::fromDegFt(lon_node->getDoubleValue(), + lat_node->getDoubleValue(), + alt_node->getDoubleValue()); //////////////////////////////////////////////////////////////////////// // Beacons. @@ -258,7 +266,9 @@ void FGMarkerBeacon::search() // get closest marker beacon FGNavRecord *b - = globals->get_mkrlist()->findClosest( lon_rad, lat_rad, elev_m ); + = globals->get_mkrlist()->findClosest( pos.getLongitudeRad(), + pos.getLatitudeRad(), + pos.getElevationM() ); // cout << "marker beacon = " << b << " (" << b->get_type() << ")" << endl; @@ -272,7 +282,7 @@ void FGMarkerBeacon::search() } else if ( b->get_type() == 9 ) { beacon_type = INNER; } - inrange = check_beacon_range( lon_rad, lat_rad, elev_m, b ); + inrange = check_beacon_range( pos, b ); // cout << " inrange = " << inrange << endl; } @@ -280,61 +290,76 @@ void FGMarkerBeacon::search() 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" ); - } else if ( beacon_type == OUTER ) { - outer_marker = true; - // cout << "OUTER MARKER" << endl; - if ( last_beacon != OUTER ) { - if ( ! globals->get_soundmgr()->exists( "outer-marker" ) ) { - SGSoundSample *sound = beacon.get_outer(); - sound->set_volume( 0.3 ); - globals->get_soundmgr()->add( sound, "outer-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; + current_sound_name = "outer-marker"; + // cout << "OUTER MARKER" << endl; + if ( last_beacon != OUTER ) { + if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { + SGSoundSample *sound = beacon.get_outer(); + if ( sound ) { + globals->get_soundmgr()->add( sound, current_sound_name ); + } + } } - } - if ( audio_btn->getBoolValue() ) { - if ( !globals->get_soundmgr()->is_playing("outer-marker") ) { - globals->get_soundmgr()->play_looped( "outer-marker" ); + if ( audio_btn->getBoolValue() ) { + if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) { + globals->get_soundmgr()->play_looped( current_sound_name ); + } + } else { + globals->get_soundmgr()->stop( current_sound_name ); } - } else { - globals->get_soundmgr()->stop( "outer-marker" ); - } - } else if ( beacon_type == MIDDLE ) { - middle_marker = true; - // cout << "MIDDLE MARKER" << endl; - if ( last_beacon != MIDDLE ) { - if ( ! globals->get_soundmgr()->exists( "middle-marker" ) ) { - SGSoundSample *sound = beacon.get_middle(); - sound->set_volume( 0.3 ); - globals->get_soundmgr()->add( sound, "middle-marker" ); - } - } - if ( audio_btn->getBoolValue() ) { - if ( !globals->get_soundmgr()->is_playing("middle-marker") ) { - globals->get_soundmgr()->play_looped( "middle-marker" ); + } else if ( beacon_type == MIDDLE ) { + 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(); + if ( sound ) { + globals->get_soundmgr()->add( sound, current_sound_name ); + } + } } - } else { - globals->get_soundmgr()->stop( "middle-marker" ); - } - } else if ( beacon_type == INNER ) { - inner_marker = true; - // cout << "INNER MARKER" << endl; - if ( last_beacon != INNER ) { - if ( ! globals->get_soundmgr()->exists( "inner-marker" ) ) { - SGSoundSample *sound = beacon.get_inner(); - sound->set_volume( 0.3 ); - globals->get_soundmgr()->add( sound, "inner-marker" ); - } - } - if ( audio_btn->getBoolValue() ) { - if ( !globals->get_soundmgr()->is_playing("inner-marker") ) { - globals->get_soundmgr()->play_looped( "inner-marker" ); + if ( audio_btn->getBoolValue() ) { + if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) { + globals->get_soundmgr()->play_looped( current_sound_name ); + } + } else { + globals->get_soundmgr()->stop( current_sound_name ); + } + } else if ( beacon_type == INNER ) { + 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(); + if ( sound ) { + globals->get_soundmgr()->add( sound, current_sound_name ); + } + } + } + if ( audio_btn->getBoolValue() ) { + if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) { + globals->get_soundmgr()->play_looped( current_sound_name ); + } + } else { + globals->get_soundmgr()->stop( current_sound_name ); } - } else { - globals->get_soundmgr()->stop( "inner-marker" ); } + // cout << "VOLUME " << audio_vol->getDoubleValue() << endl; + SGSoundSample * mkr = globals->get_soundmgr()->find( current_sound_name ); + if (mkr) + mkr->set_volume( audio_vol->getDoubleValue() ); } if ( inrange ) {