X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmarker_beacon.cxx;h=854a4ebb9018ec6c084a5ff222bd115893c20c14;hb=ef52b23e3a1aaf44d1a2283c920a70367960abff;hp=78f19358dbca5630204a66a705bd0543791e87bb;hpb=1c2c76709e1b85bd0e9805e747177a080345e07f;p=flightgear.git

diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx
index 78f19358d..854a4ebb9 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$
 
@@ -46,7 +46,8 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
     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;
@@ -97,10 +98,11 @@ 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);
     serviceable = node->getChild("serviceable", 0, true);
@@ -112,6 +114,8 @@ FGMarkerBeacon::init ()
     morse.init();
     beacon.init();
     blink.stamp();
+
+    outer_marker = middle_marker = inner_marker = false;
 }
 
 
@@ -150,7 +154,8 @@ 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;
@@ -196,15 +201,16 @@ 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() );
+    SGVec3d aircraft = SGVec3d::fromGeod(pos);
+    SGVec3d station = b->get_cart();
     // cout << "    aircraft = " << aircraft << " station = " << station 
     //      << endl;
 
-    double d = aircraft.distance3Dsquared( station ); // meters^2
+    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
@@ -214,7 +220,7 @@ static bool check_beacon_range( double lon_rad, double lat_rad, double elev_m,
 
     // 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
@@ -248,9 +254,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 +264,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 +280,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;
     }
 
@@ -290,8 +298,10 @@ void FGMarkerBeacon::search()
         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" );
+                if ( sound ) {
+                    sound->set_volume( 0.3 );
+                    globals->get_soundmgr()->add( sound, "outer-marker" );
+                }
             }
         }
         if ( audio_btn->getBoolValue() ) {
@@ -307,8 +317,10 @@ void FGMarkerBeacon::search()
 	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 ( sound ) {
+		    sound->set_volume( 0.3 );
+		    globals->get_soundmgr()->add( sound, "middle-marker" );
+                }
 	    }
         }
         if ( audio_btn->getBoolValue() ) {
@@ -324,8 +336,10 @@ void FGMarkerBeacon::search()
 	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 ( sound ) {
+		    sound->set_volume( 0.3 );
+		    globals->get_soundmgr()->add( sound, "inner-marker" );
+                }
 	    }
         }
         if ( audio_btn->getBoolValue() ) {