X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FTime%2Fsunpos.cxx;h=c436b1b7d25b8089523c007f3f5c905f595a309c;hb=d4aea052469604c8e05a3825a614266decf6ab27;hp=a79d7d2600648e03d54a00c6baf7af53d94c8cd1;hpb=0ffa19cd32c02405d0e740393b37f4009ed5a312;p=flightgear.git

diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx
index a79d7d260..c436b1b7d 100644
--- a/src/Time/sunpos.cxx
+++ b/src/Time/sunpos.cxx
@@ -40,12 +40,12 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
 #  include <cstdio>
 #  include <ctime>
-#  ifdef MACOS
-     FG_USING_STD(time_t);
+#  ifdef macintosh
+     SG_USING_STD(time_t);
 #  endif
 #else
 #  include <math.h>
@@ -56,22 +56,20 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/vector.hxx>
-#include <simgear/timing/sg_time.hxx>
 
-#include <Main/views.hxx>
+#include <Main/globals.hxx>
+#include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
+#include <Time/light.hxx>
 
 #include "sunpos.hxx"
 
-// extern SolarSystem *solarSystem;
-extern FGEphemeris *ephem;
-
-#undef E
-#define MeanObliquity (23.440592*(FG_2PI/360))
+// #undef E // should no longer be needed
+#define MeanObliquity (23.440592*(SGD_2PI/360))
 
 static void   ecliptic_to_equatorial(double, double, double *, double *);
 static double julian_date(int, int, int);
@@ -111,7 +109,7 @@ static double julian_date(int y, int m, int d) {
 
     /* lazy test to ensure gregorian calendar */
     if (y < 1583) {
-	FG_LOG( FG_EVENT, FG_ALERT, 
+	SG_LOG( SG_EVENT, SG_ALERT, 
 		"WHOOPS! Julian dates only valid for 1582 oct 15 or later" );
     }
 
@@ -192,15 +190,15 @@ void fgSunPosition(time_t ssue, double *lon, double *lat) {
      * every ten minutes. (Comment added by Durk Talsma).
      ************************************************************************/
 
-    ecliptic_to_equatorial( ephem->get_sun()->getLon(),
+    ecliptic_to_equatorial( globals->get_ephem()->get_sun()->getLon(),
 			    0.0, &alpha, &delta );
-    tmp = alpha - (FG_2PI/24)*GST(ssue);
-    if (tmp < -FG_PI) {
-	do tmp += FG_2PI;
-	while (tmp < -FG_PI);
-    } else if (tmp > FG_PI) {
-	do tmp -= FG_2PI;
-	while (tmp < -FG_PI);
+    tmp = alpha - (SGD_2PI/24)*GST(ssue);
+    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;
@@ -224,18 +222,18 @@ static void fgSunPositionGST(double gst, double *lon, double *lat) {
     /* lambda = sun_ecliptic_longitude(ssue); */
     /* ecliptic_to_equatorial(lambda, 0.0, &alpha, &delta); */
     //ecliptic_to_equatorial (solarPosition.lonSun, 0.0, &alpha, &delta);
-    ecliptic_to_equatorial( ephem->get_sun()->getLon(),
-			    ephem->get_sun()->getLat(),
+    ecliptic_to_equatorial( globals->get_ephem()->get_sun()->getLon(),
+			    globals->get_ephem()->get_sun()->getLat(),
 			    &alpha, &delta );
 
-//    tmp = alpha - (FG_2PI/24)*GST(ssue);
-    tmp = alpha - (FG_2PI/24)*gst;	
-    if (tmp < -FG_PI) {
-	do tmp += FG_2PI;
-	while (tmp < -FG_PI);
-    } else if (tmp > FG_PI) {
-	do tmp -= FG_2PI;
-	while (tmp < -FG_PI);
+//    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;
@@ -246,28 +244,35 @@ static void fgSunPositionGST(double gst, double *lon, double *lat) {
 // update the cur_time_params structure with the current sun position
 void fgUpdateSunPos( void ) {
     fgLIGHT *l;
-    SGTime *t;
-    FGView *v;
-    sgVec3 nup, nsun, v0, surface_to_sun;
+    FGViewer *v;
+    sgVec3 nup, nsun;
     Point3D p, rel_sunpos;
     double dot, east_dot;
     double sun_gd_lat, sl_radius;
 
+    // vector in cartesian coordinates from current position to the
+    // postion on the earth's surface the sun is directly over
+    sgVec3 to_sun;
+
+    // surface direction to go to head towards sun
+    sgVec3 surface_to_sun;
+
     l = &cur_light_params;
-    t = SGTime::cur_time_params;
-    v = &current_view;
+    SGTime *t = globals->get_time_params();
+    v = globals->get_current_view();
 
-    FG_LOG( FG_EVENT, FG_INFO, "  Updating Sun position" );
+    SG_LOG( SG_EVENT, SG_INFO, "  Updating Sun position" );
+    SG_LOG( SG_EVENT, SG_INFO, "  Gst = " << t->getGst() );
 
     fgSunPositionGST(t->getGst(), &l->sun_lon, &sun_gd_lat);
 
-    fgGeodToGeoc(sun_gd_lat, 0.0, &sl_radius, &l->sun_gc_lat);
+    sgGeodToGeoc(sun_gd_lat, 0.0, &sl_radius, &l->sun_gc_lat);
 
     p = Point3D( l->sun_lon, l->sun_gc_lat, sl_radius );
-    l->fg_sunpos = fgPolarToCart3d(p);
+    l->fg_sunpos = sgPolarToCart3d(p);
 
-    FG_LOG( FG_EVENT, FG_INFO, "    t->cur_time = " << t->get_cur_time() );
-    FG_LOG( FG_EVENT, FG_INFO, 
+    SG_LOG( SG_EVENT, SG_INFO, "    t->cur_time = " << t->get_cur_time() );
+    SG_LOG( SG_EVENT, SG_INFO, 
 	    "    Sun Geodetic lat = " << sun_gd_lat
 	    << " Geocentric lat = " << l->sun_gc_lat );
 
@@ -284,7 +289,7 @@ void fgUpdateSunPos( void ) {
     //      << ","<< l->sun_vec[2] << endl;
 
     // calculate the sun's relative angle to local up
-    sgCopyVec3( nup, v->get_local_up() );
+    sgCopyVec3( nup, v->get_world_up() );
     sgSetVec3( nsun, l->fg_sunpos.x(), l->fg_sunpos.y(), l->fg_sunpos.z() );
     sgNormalizeVec3(nup);
     sgNormalizeVec3(nsun);
@@ -294,27 +299,25 @@ void fgUpdateSunPos( void ) {
     //      << nsun[2] << endl;
 
     l->sun_angle = acos( sgScalarProductVec3 ( nup, nsun ) );
-    cout << "sun angle relative to current location = " << l->sun_angle << endl;
+    SG_LOG( SG_EVENT, SG_INFO, "sun angle relative to current location = "
+	    << l->sun_angle );
     
     // calculate vector to sun's position on the earth's surface
-    rel_sunpos = l->fg_sunpos - (v->get_view_pos() + scenery.center);
-    v->set_to_sun( rel_sunpos.x(), rel_sunpos.y(), rel_sunpos.z() );
+    Point3D vp( v->get_view_pos()[0],
+		v->get_view_pos()[1],
+		v->get_view_pos()[2] );
+    rel_sunpos = l->fg_sunpos - ( vp + scenery.get_center() );
+    sgSetVec3( to_sun, rel_sunpos.x(), rel_sunpos.y(), rel_sunpos.z() );
     // printf( "Vector to sun = %.2f %.2f %.2f\n",
     //         v->to_sun[0], v->to_sun[1], v->to_sun[2]);
 
-    // make a vector to the current view position
-    Point3D view_pos = v->get_view_pos();
-    sgSetVec3( v0, view_pos.x(), view_pos.y(), view_pos.z() );
-
     // Given a vector from the view position to the point on the
     // earth's surface the sun is directly over, map into onto the
     // local plane representing "horizontal".
 
-    sgmap_vec_onto_cur_surface_plane( v->get_local_up(), v0, v->get_to_sun(), 
-				      surface_to_sun );
+    sgmap_vec_onto_cur_surface_plane( v->get_world_up(), v->get_view_pos(),
+				      to_sun, surface_to_sun );
     sgNormalizeVec3(surface_to_sun);
-    v->set_surface_to_sun( surface_to_sun[0], surface_to_sun[1], 
-			   surface_to_sun[2] );
     // cout << "(sg) Surface direction to sun is "
     //   << surface_to_sun[0] << "," 
     //   << surface_to_sun[1] << ","
@@ -322,9 +325,10 @@ void fgUpdateSunPos( void ) {
     // cout << "Should be close to zero = " 
     //   << sgScalarProductVec3(nup, surface_to_sun) << endl;
 
-    // calculate the angle between v->surface_to_sun and
-    // v->surface_east.  We do this so we can sort out the acos()
-    // ambiguity.  I wish I could think of a more efficient way ... :-(
+    // calculate the angle between surface_to_sun and
+    // v->get_surface_east().  We do this so we can sort out the
+    // acos() ambiguity.  I wish I could think of a more efficient
+    // way. :-(
     east_dot = sgScalarProductVec3( surface_to_sun, v->get_surface_east() );
     // cout << "  East dot product = " << east_dot << endl;
 
@@ -340,7 +344,7 @@ void fgUpdateSunPos( void ) {
 	l->sun_rotation = -acos(dot);
     }
     // cout << "  Sky needs to rotate = " << angle << " rads = "
-    //      << angle * RAD_TO_DEG << " degrees." << endl;
+    //      << angle * SGD_RADIANS_TO_DEGREES << " degrees." << endl;
 }