42 lines
1.2 KiB
C++
42 lines
1.2 KiB
C++
$NetBSD: patch-src_lib_astro_solarsystem.cpp,v 1.2 2019/11/24 03:41:55 markd Exp $
|
|
|
|
Avoid 'sun' definition.
|
|
|
|
--- src/lib/astro/solarsystem.cpp.orig 2019-11-04 06:55:40.000000000 +0000
|
|
+++ src/lib/astro/solarsystem.cpp
|
|
@@ -431,7 +431,7 @@ void SolarSystem::updateSolar()
|
|
|
|
const double ae = 23454.77992; // 149597870.0/6378.14 = 1AE -> Earth Radii
|
|
double dt, eps2;
|
|
- Sun200 sun;
|
|
+ Sun200 msun;
|
|
Moon200 moon;
|
|
Plan200 pln;
|
|
Vec3 coff, r1, v1;
|
|
@@ -442,7 +442,7 @@ void SolarSystem::updateSolar()
|
|
// get positions in ecliptic coordinates of date
|
|
dt = ss_time + ss_del_tdut/86400.0;
|
|
dt = julcent (dt);
|
|
- ss_rs = sun.position(dt);
|
|
+ ss_rs = msun.position(dt);
|
|
ss_rm = moon.position(dt)/ae;
|
|
ss_pmer = pln.Mercury(dt);
|
|
ss_pven = pln.Venus(dt);
|
|
@@ -1515,7 +1515,7 @@ Vec3 SolarSystem::SnPos (double &ep2, do
|
|
// return the apparent position of the Sun
|
|
// and the Nutation ep2 value and the ecliptic longitude of the Sun els
|
|
|
|
- Sun200 sun;
|
|
+ Sun200 msun;
|
|
Mat3 mx;
|
|
Vec3 rs, s;
|
|
double t;
|
|
@@ -1523,7 +1523,7 @@ Vec3 SolarSystem::SnPos (double &ep2, do
|
|
t = ss_time + ss_del_tdut/86400.0;
|
|
t = julcent (t);
|
|
|
|
- rs = sun.position(t);
|
|
+ rs = msun.position(t);
|
|
s = carpol(rs);
|
|
els = s[1];
|
|
|