X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmarker_beacon.cxx;h=41b981536a6262e6da037e66b03e5523bda64518;hb=4a94071ed78efdb6c8a9c5d44102dd48a001d920;hp=910efc56d865bbaadf3513c0b5fecd346252707b;hpb=cc27909e6fbec22f03145da10340a9b7c1b5e569;p=flightgear.git

diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx
index 910efc56d..41b981536 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$
 
@@ -29,25 +29,27 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_random.h>
+#include <simgear/misc/sg_path.hxx>
 
-#include <Aircraft/aircraft.hxx>
 #include <Navaids/navlist.hxx>
 
 #include "marker_beacon.hxx"
+#include <Sound/beacon.hxx>
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 // Constructor
 FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
-    need_update(true),
+    audio_vol(NULL),
     outer_blink(false),
     middle_blink(false),
     inner_blink(false),
     name("marker-beacon"),
     num(0),
-    _time_before_search_sec(0.0)
+    _time_before_search_sec(0.0),
+    _sgr(NULL)
 {
     SGPath path( globals->get_fg_root() );
     SGPath term = path;
@@ -61,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();
@@ -71,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 );
@@ -82,7 +83,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
 
 
 // Destructor
-FGMarkerBeacon::~FGMarkerBeacon() 
+FGMarkerBeacon::~FGMarkerBeacon()
 {
     delete term_tbl;
     delete low_tbl;
@@ -98,24 +99,37 @@ FGMarkerBeacon::init ()
 
     SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
     // Inputs
-    sound_pause = fgGetNode("/sim/sound/pause", false);
+    sound_working = fgGetNode("/sim/sound/working", true);
     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/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 );
-    audio_btn->setBoolValue( true );
-    serviceable->setBoolValue( true );
+    if (power_btn->getType() == simgear::props::NONE)
+        power_btn->setBoolValue( true );
+    if (audio_btn->getType() == simgear::props::NONE)
+        audio_btn->setBoolValue( true );
+    if (serviceable->getType() == simgear::props::NONE)
+        serviceable->setBoolValue( true );
 
-    morse.init();
-    beacon.init();
-    blink.stamp();
+    SGSoundMgr *smgr = globals->get_soundmgr();
+    _sgr = smgr->find("avionics", true);
+    _sgr->tie_to_listener();
+
+    reinit();
 }
 
+void
+FGMarkerBeacon::reinit ()
+{
+    blink.stamp();
+    outer_marker = middle_marker = inner_marker = false;
+    _time_before_search_sec = 0.0;
+}
 
 void
 FGMarkerBeacon::bind ()
@@ -124,13 +138,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);
 }
 
 
@@ -147,30 +161,33 @@ 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()) {
+            && sound_working->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;
-        current.stamp();
+        SGTimeStamp current = SGTimeStamp::now();
 
-        if ( light_on && (current - blink > 400000) ) {
+        if ( light_on && blink + SGTimeStamp::fromUSec(400000) < current ) {
             light_on = false;
-            blink.stamp();
-        } else if ( !light_on && (current - blink > 100000) ) {
+            blink = current;
+        } else if ( !light_on && blink + SGTimeStamp::fromUSec(100000) < current ) {
             light_on = true;
-            blink.stamp();
+            blink = current;
         }
 
         if ( outer_marker ) {
@@ -199,26 +216,21 @@ FGMarkerBeacon::update(double dt)
 }
 
 
-static bool check_beacon_range( double lon_rad, double lat_rad, double elev_m,
-                                FGNavRecord *b )
+static bool check_beacon_range( const SGGeod& pos,
+                                FGPositioned *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 
-    //      << endl;
-
-    double d = aircraft.distance3Dsquared( station ); // meters^2
-    // 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 = elev_m * SG_METER_TO_FEET;
-    double delev = elev_ft - b->get_elev_ft();
+    double elev_ft = pos.getElevationFt();
+    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 ...
@@ -231,7 +243,7 @@ static bool check_beacon_range( double lon_rad, double lat_rad, double elev_m,
         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
@@ -242,108 +254,126 @@ 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() 
+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;
 
     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.
     ////////////////////////////////////////////////////////////////////////
 
-    // get closest marker beacon
-    FGNavRecord *b
-	= globals->get_mkrlist()->findClosest( lon_rad, lat_rad, elev_m );
-
-    // 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( lon_rad, lat_rad, elev_m, 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" );
-    } 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();
-                if ( sound ) {
-                    sound->set_volume( 0.3 );
-                    globals->get_soundmgr()->add( sound, "outer-marker" );
+        // cout << "no marker" << endl;
+        _sgr->stop( "outer-marker" );
+        _sgr->stop( "middle-marker" );
+        _sgr->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 ( ! _sgr->exists( current_sound_name ) ) {
+                    SGSoundSample *sound = FGBeacon::instance()->get_outer();
+                    if ( sound ) {
+                        _sgr->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 ( !_sgr->is_playing(current_sound_name) ) {
+                    _sgr->play_looped( current_sound_name );
+                }
+            } else {
+                _sgr->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();
-                if ( sound ) {
-		    sound->set_volume( 0.3 );
-		    globals->get_soundmgr()->add( sound, "middle-marker" );
+        } else if ( beacon_type == MIDDLE ) {
+            middle_marker = true;
+            current_sound_name = "middle-marker";
+            // cout << "MIDDLE MARKER" << endl;
+            if ( last_beacon != MIDDLE ) {
+                if ( ! _sgr->exists( current_sound_name ) ) {
+                    SGSoundSample *sound = FGBeacon::instance()->get_middle();
+                    if ( sound ) {
+                        _sgr->add( sound, current_sound_name );
+                    }
                 }
-	    }
-        }
-        if ( audio_btn->getBoolValue() ) {
-            if ( !globals->get_soundmgr()->is_playing("middle-marker") ) {
-                globals->get_soundmgr()->play_looped( "middle-marker" );
             }
-        } 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();
-                if ( sound ) {
-		    sound->set_volume( 0.3 );
-		    globals->get_soundmgr()->add( sound, "inner-marker" );
+            if ( audio_btn->getBoolValue() ) {
+                if ( !_sgr->is_playing(current_sound_name) ) {
+                    _sgr->play_looped( current_sound_name );
                 }
-	    }
-        }
-        if ( audio_btn->getBoolValue() ) {
-            if ( !globals->get_soundmgr()->is_playing("inner-marker") ) {
-                globals->get_soundmgr()->play_looped( "inner-marker" );
+            } else {
+                _sgr->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 ( ! _sgr->exists( current_sound_name ) ) {
+                    SGSoundSample *sound = FGBeacon::instance()->get_inner();
+                    if ( sound ) {
+                        _sgr->add( sound, current_sound_name );
+                    }
+                }
+            }
+            if ( audio_btn->getBoolValue() ) {
+                if ( !_sgr->is_playing(current_sound_name) ) {
+                    _sgr->play_looped( current_sound_name );
+                }
+            } else {
+                _sgr->stop( current_sound_name );
             }
-        } else {
-            globals->get_soundmgr()->stop( "inner-marker" );
         }
+        // cout << "VOLUME " << audio_vol->getDoubleValue() << endl;
+        SGSoundSample * mkr = _sgr->find( current_sound_name );
+        if (mkr)
+            mkr->set_volume( audio_vol->getFloatValue() );
     }
 
     if ( inrange ) {