Don't restore initial screen geometry because there is nothing in fg_os* to resize...

[flightgear.git] / src / Time / sunsolver.cxx

diff --git a/src/Time/sunsolver.cxx b/src/Time/sunsolver.cxx
index b0d0d5c4f57fe187a440d73bd1626c7d52fd27ff..8a1a78e586df1b9d76bb805f1c286ffc74db0db9 100644 (file)
--- a/src/Time/sunsolver.cxx
+++ b/src/Time/sunsolver.cxx
@@ -4,7 +4,7 @@
  *
  * Written by Curtis Olson, started September 2003.
  *
- * Copyright (C) 2003  Curtis L. Olson  - curt@flightgear.org
+ * Copyright (C) 2003  Curtis L. Olson  - http://www.flightgear.org/~curt
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,20 +18,36 @@
  *
  * 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$
  */
 
+#ifdef HAVE_CONFIG_H
+#      include <config.h>
+#endif
+
+#ifdef SG_HAVE_STD_INCLUDES
+#  include <cmath>
+// #  include <cstdio>
+#  include <ctime>
+#  ifdef macintosh
+     SG_USING_STD(time_t);
+#  endif
+#else
+#  include <math.h>
+// #  include <stdio.h>
+#  include <time.h>
+#endif
 
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
+#include <simgear/ephemeris/ephemeris.hxx>
 #include <simgear/timing/sg_time.hxx>
 
 #include <Main/globals.hxx>
 
-#include "sunpos.hxx"
-
+#include "tmp.hxx"
 #include "sunsolver.hxx"
 
 
@@ -39,6 +55,42 @@ static const time_t day_secs = 86400;
 static const time_t half_day_secs = day_secs / 2;
 static const time_t step_secs = 60;
 
+/* given a particular time expressed in side real time at prime
+ * meridian (GST), compute position on the earth (lat, lon) such that
+ * sun is directly overhead.  (lat, lon are reported in radians */
+
+void fgSunPositionGST(double gst, double *lon, double *lat) {
+    /* time_t  ssue;           seconds since unix epoch */
+    /* double *lat;            (return) latitude        */
+    /* double *lon;            (return) longitude       */
+
+    /* double lambda; */
+    double alpha, delta;
+    double tmp;
+
+    double beta = globals->get_ephem()->get_sun()->getLat();
+    double r = globals->get_ephem()->get_sun()->getDistance();
+    double xs = globals->get_ephem()->get_sun()->getxs();
+    double ys = globals->get_ephem()->get_sun()->getys();
+    double ye = globals->get_ephem()->get_sun()->getye();
+    double ze = globals->get_ephem()->get_sun()->getze();
+    alpha = atan2(ys - tan(beta)*ze/ys, xs);
+    delta = asin(sin(beta)*ye/ys + cos(beta)*ze);
+
+    // tmp = alpha - (SGD_2PI/24)*GST(ssue);
+    tmp = alpha - (SGD_2PI/24)*gst;
+    if (tmp < -SGD_PI) {
+        do tmp += SGD_2PI;
+        while (tmp < -SGD_PI);
+    } else if (tmp > SGD_PI) {
+        do tmp -= SGD_2PI;
+        while (tmp < -SGD_PI);
+    }
+
+    *lon = tmp;
+    *lat = delta;
+}
+
 static double sun_angle( const SGTime &t, sgVec3 world_up,
                          double lon_rad, double lat_rad ) {
     sgVec3 nup, nsun;
@@ -47,18 +99,13 @@ static double sun_angle( const SGTime &t, sgVec3 world_up,
     SG_LOG( SG_EVENT, SG_DEBUG, "  Updating Sun position" );
     SG_LOG( SG_EVENT, SG_DEBUG, "  Gst = " << t.getGst() );
 
-    double sun_lon, sun_gd_lat, sun_gc_lat, sl_radius;
+    double sun_lon, sun_gd_lat;
     fgSunPositionGST( t.getGst(), &sun_lon, &sun_gd_lat );
-
-    sgGeodToGeoc(sun_gd_lat, 0.0, &sl_radius, &sun_gc_lat);
-
-    p = Point3D( sun_lon, sun_gc_lat, sl_radius );
-    Point3D sunpos = sgPolarToCart3d(p);
+    Point3D sunpos = sgGeodToCart(Point3D(sun_lon, sun_gd_lat, 0));
 
     SG_LOG( SG_EVENT, SG_DEBUG, "    t.cur_time = " << t.get_cur_time() );
     SG_LOG( SG_EVENT, SG_DEBUG, 
-           "    Sun Geodetic lat = " << sun_gd_lat
-           << " Geocentric lat = " << sun_gc_lat );
+           "    Sun Geodetic lat = " << sun_gd_lat );
 
     // calculate the sun's relative angle to local up
     sgCopyVec3( nup, world_up );