# 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 <cmath>
+#include <ctime>
+#include <cassert>
-#include <simgear/math/point3d.hxx>
-#include <simgear/math/sg_geodesy.hxx>
-#include <simgear/ephemeris/ephemeris.hxx>
+#include <simgear/math/SGMath.hxx>
#include <simgear/timing/sg_time.hxx>
#include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
-#include "tmp.hxx"
#include "sunsolver.hxx"
/* 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;
+ SGPropertyNode* sun = fgGetNode("/ephemeris/sun");
+ assert(sun);
+ double xs = sun->getDoubleValue("xs");
+ //double ys = sun->getDoubleValue("ys");
+ double ye = sun->getDoubleValue("ye");
+ double ze = sun->getDoubleValue("ze");
+ double ra = atan2(ye, xs);
+ double dec = atan2(ze, sqrt(xs * xs + ye * ye));
+
+ tmp = ra - (SGD_2PI/24)*gst;
if (tmp < -SGD_PI) {
do tmp += SGD_2PI;
while (tmp < -SGD_PI);
}
*lon = tmp;
- *lat = delta;
+ *lat = dec;
}
-static double sun_angle( const SGTime &t, sgVec3 world_up,
+static double sun_angle( const SGTime &t, const SGVec3d& world_up,
double lon_rad, double lat_rad ) {
- sgVec3 nup, nsun;
- Point3D p, rel_sunpos;
-
SG_LOG( SG_EVENT, SG_DEBUG, " Updating Sun position" );
SG_LOG( SG_EVENT, SG_DEBUG, " Gst = " << t.getGst() );
- double sun_lon, sun_gd_lat;
- fgSunPositionGST( t.getGst(), &sun_lon, &sun_gd_lat );
- Point3D sunpos = sgGeodToCart(Point3D(sun_lon, sun_gd_lat, 0));
+ double sun_lon, sun_gc_lat;
+ fgSunPositionGST( t.getGst(), &sun_lon, &sun_gc_lat );
+ SGVec3d sunpos = SGVec3d::fromGeoc(SGGeoc::fromRadM(sun_lon, sun_gc_lat,
+ SGGeodesy::EQURAD));
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 );
+ " Sun Geocentric lat = " << sun_gc_lat );
// calculate the sun's relative angle to local up
- sgCopyVec3( nup, world_up );
- sgSetVec3( nsun, sunpos.x(), sunpos.y(), sunpos.z() );
- sgNormalizeVec3(nup);
- sgNormalizeVec3(nsun);
+ SGVec3d nup = normalize(world_up);
+ SGVec3d nsun = normalize(sunpos);
// cout << "nup = " << nup[0] << "," << nup[1] << ","
// << nup[2] << endl;
// cout << "nsun = " << nsun[0] << "," << nsun[1] << ","
// << nsun[2] << endl;
- double sun_angle = acos( sgScalarProductVec3 ( nup, nsun ) );
+ double sun_angle = acos( dot( nup, nsun ) );
double sun_angle_deg = sun_angle * SG_RADIANS_TO_DEGREES;
while ( sun_angle_deg < -180 ) { sun_angle += 360; }
SG_LOG( SG_EVENT, SG_DEBUG, "sun angle relative to current location = "
{
// cout << "location = " << lon_rad * SG_RADIANS_TO_DEGREES << ", "
// << lat_rad * SG_RADIANS_TO_DEGREES << endl;
- Point3D geod( lon_rad, lat_rad, 0 );
- Point3D tmp = sgGeodToCart( geod );
- sgVec3 world_up;
- sgSetVec3( world_up, tmp.x(), tmp.y(), tmp.z() );
+ SGVec3d world_up = SGVec3d::fromGeod(SGGeod::fromRad(lon_rad, lat_rad));
SGTime t = SGTime( lon_rad, lat_rad, "", 0 );
double best_diff = 180.0;