X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FTime%2Ffg_time.cxx;h=297c28f53e8cc7a207ae4316c79cdd3bc3d8bf10;hb=7a16ec4fb4e1663902f5022812291f01d7e37ee3;hp=0b7cee42d659e92b52eeb341fbed646520d3d9aa;hpb=37220833ed5c2c3621b7ea482cf4b0f63431cd9a;p=flightgear.git

diff --git a/src/Time/fg_time.cxx b/src/Time/fg_time.cxx
index 0b7cee42d..297c28f53 100644
--- a/src/Time/fg_time.cxx
+++ b/src/Time/fg_time.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#include <Include/compiler.h>
+#include <simgear/compiler.h>
 
 #ifdef FG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -49,18 +49,20 @@
 #  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
 #endif
 
-#include <Debug/logstream.hxx>
-#include <Astro/sky.hxx>
-#include <Astro/solarsystem.hxx>
+#include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/magvar/magvar.hxx>
+#include <simgear/misc/fgpath.hxx>
+
 #include <FDM/flight.hxx>
-#include <Include/fg_constants.h>
 #include <Main/options.hxx>
-#include <Misc/fgpath.hxx>
 #include <Time/light.hxx>
 
 #include "fg_time.hxx"
 #include "timezone.h"
 #include "lowleveltime.h"
+#include "moonpos.hxx"
+#include "sunpos.hxx"
 
 
 #define DEGHR(x)        ((x)/15.)
@@ -100,7 +102,7 @@ FGTime::~FGTime()
 void FGTime::updateLocal()
 {
   FGInterface* f;
-  f = current_aircraft.fdm_state;
+  f = cur_fdm_state;
   time_t currGMT;
   time_t aircraftLocalTime;
   GeoCoord location(RAD_TO_DEG * f->get_Latitude(),
@@ -121,8 +123,7 @@ void FGTime::updateLocal()
 
 // Initialize the time dependent variables (maybe I'll put this in the
 // constructor later)
-void FGTime::init(const FGInterface& f) 
-{
+void FGTime::init( double lon, double lat ) {
     FG_LOG( FG_EVENT, FG_INFO, "Initializing Time" );
     gst_diff = -9999.0;
     FG_LOG( FG_EVENT, FG_DEBUG, 
@@ -142,8 +143,7 @@ void FGTime::init(const FGInterface& f)
     // printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
     // printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
     // time_t tmp = cur_time;
-    GeoCoord location(RAD_TO_DEG * f.get_Latitude(), 
-		      RAD_TO_DEG * f.get_Longitude());
+    GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
 
     GeoCoord* nearestTz = tzContainer->getNearest(location);
 
@@ -337,8 +337,7 @@ double FGTime::sidereal_course(double lng)
 
 
 // Update time variables such as gmt, julian date, and sidereal time
-void FGTime::update(const FGInterface& f) 
-{
+void FGTime::update( double lon, double lat, double alt_m ) {
     double gst_precise, gst_course;
 
     FG_LOG( FG_EVENT, FG_DEBUG, "Updating time" );
@@ -389,17 +388,24 @@ void FGTime::update(const FGInterface& f)
       
 	gst_diff = gst_precise - gst_course;
 
-	lst = sidereal_course(-(f.get_Longitude() * RAD_TO_DEG)) + gst_diff;
+	lst = sidereal_course(-(lon * RAD_TO_DEG)) + gst_diff;
     } else {
 	// course + difference should drift off very slowly
-	gst = sidereal_course( 0.00                              ) + gst_diff;
-	lst = sidereal_course( -(f.get_Longitude() * RAD_TO_DEG)) + gst_diff;
+	gst = sidereal_course( 0.00 ) + gst_diff;
+	lst = sidereal_course( -(lon * RAD_TO_DEG)) + gst_diff;
     }
+
+    // Calculate local magnetic variation
+    double field[6];
+    // cout << "alt_m = " << alt_m << endl;
+    magvar = SGMagVar( lat, lon, alt_m / 1000.0, jd, field );
+    magdip = atan(field[5]/pow(field[3]*field[3]+field[4]*field[4],0.5));
+
     FG_LOG( FG_EVENT, FG_DEBUG,
 	    "  Current lon=0.00 Sidereal Time = " << gst );
     FG_LOG( FG_EVENT, FG_DEBUG,
 	    "  Current LOCAL Sidereal Time = " << lst << " (" 
-	    << sidereal_precise(-(f.get_Longitude() * RAD_TO_DEG)) 
+	    << sidereal_precise(-(lon * RAD_TO_DEG)) 
 	    << ") (diff = " << gst_diff << ")" );
 }
 
@@ -530,10 +536,9 @@ char* FGTime::format_time( const struct tm* p, char* buf )
 
 // Force an update of the sky and lighting parameters
 void FGTime::local_update_sky_and_lighting_params( void ) {
-    // fgSunInit();
-    SolarSystem::theSolarSystem->rebuild();
+    fgUpdateSunPos();
+    fgUpdateMoonPos();
     cur_light_params.Update();
-    fgSkyColorsInit();
 }