Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Cockpit / navcom.cxx

diff --git a/src/Cockpit/navcom.cxx b/src/Cockpit/navcom.cxx
index 1fe7b3882c23cf9c0776acd2a67f9db60ba0bd4f..5a87b7461b20cfc2577935e664e86e7a5d2230d5 100644 (file)
--- a/src/Cockpit/navcom.cxx
+++ b/src/Cockpit/navcom.cxx
@@ -336,7 +336,7 @@ FGNavCom::update(double dt)
             nav_gs_dist = sqrt( dist );
             // cout << nav_gs_dist;
 
-            Point3D tmp( nav_gs_x, nav_gs_y, nav_gs_z );
+            // Point3D tmp( nav_gs_x, nav_gs_y, nav_gs_z );
             // cout << " (" << aircraft.distance3D( tmp ) << ")" << endl;
 
             // wgs84 heading to glide slope (to determine sign of distance)
@@ -410,7 +410,7 @@ FGNavCom::update(double dt)
        if ( power_btn && (bus_power->getDoubleValue() > 1.0)
              && nav_ident_btn && audio_btn )
         {
-           FGSimpleSound *sound;
+           SGSimpleSound *sound;
            sound = globals->get_soundmgr()->find( nav_fx_name );
             if ( sound != NULL ) {
                 sound->set_volume( nav_vol_btn );
@@ -507,22 +507,22 @@ void FGNavCom::search()
             double tlon, tlat, taz;
             geo_direct_wgs_84 ( 0.0, nav_gslat, nav_gslon, nav_radial + 90,  
                                 100.0, &tlat, &tlon, &taz );
-            cout << nav_gslon << "," << nav_gslat << "  "
-                 << tlon << "," << tlat << "  (" << nav_elev << ")" << endl;
+            // cout << nav_gslon << "," << nav_gslat << "  "
+            //      << tlon << "," << tlat << "  (" << nav_elev << ")" << endl;
             Point3D p1 = sgGeodToCart( Point3D(tlon*SGD_DEGREES_TO_RADIANS,
                                                tlat*SGD_DEGREES_TO_RADIANS,
                                                nav_elev*SG_FEET_TO_METER) );
-            cout << nav_gs_x << "," << nav_gs_y << "," << nav_gs_z << endl;
-            cout << p1 << endl;
+            // cout << nav_gs_x << "," << nav_gs_y << "," << nav_gs_z << endl;
+            // cout << p1 << endl;
             sgdSetVec3( gs_base_vec,
                         p1.x()-nav_gs_x, p1.y()-nav_gs_y, p1.z()-nav_gs_z );
-            cout << gs_base_vec[0] << "," << gs_base_vec[1] << ","
-                 << gs_base_vec[2] << endl;
+            // cout << gs_base_vec[0] << "," << gs_base_vec[1] << ","
+            //      << gs_base_vec[2] << endl;
 
            if ( globals->get_soundmgr()->exists( nav_fx_name ) ) {
                globals->get_soundmgr()->remove( nav_fx_name );
            }
-           FGSimpleSound *sound;
+           SGSimpleSound *sound;
            sound = morse.make_ident( nav_trans_ident, LO_FREQUENCY );
            sound->set_volume( 0.3 );
            globals->get_soundmgr()->add( sound, nav_fx_name );
@@ -572,7 +572,7 @@ void FGNavCom::search()
            if ( globals->get_soundmgr()->exists( nav_fx_name ) ) {
                globals->get_soundmgr()->remove( nav_fx_name );
            }
-           FGSimpleSound *sound;
+           SGSimpleSound *sound;
            sound = morse.make_ident( nav_trans_ident, LO_FREQUENCY );
            sound->set_volume( 0.3 );
            if ( globals->get_soundmgr()->add( sound, nav_fx_name ) ) {