X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fephemeris%2Fmercury.cxx;h=7ed8b1f53b533bd3d0ba1b5b709e587fde452f03;hb=a0bdec284624820feb0a96a06c0c38e2f07d5e4e;hp=e100dd98994deec171885b23f99835695bf9023a;hpb=29e3a4e231b38cb4ce8a7a817a2fe993e5442b48;p=simgear.git diff --git a/simgear/ephemeris/mercury.cxx b/simgear/ephemeris/mercury.cxx index e100dd98..7ed8b1f5 100644 --- a/simgear/ephemeris/mercury.cxx +++ b/simgear/ephemeris/mercury.cxx @@ -5,19 +5,20 @@ * September 1998. This code is based upon algorithms and data kindly * provided by Mr. Paul Schlyter. (pausch@saaf.se). * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Library General Public License for more details. * - * 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. + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. * * $Id$ **************************************************************************/ @@ -30,31 +31,40 @@ #include "mercury.hxx" /************************************************************************* - * Mercury::Mercury(FGTime *t) + * Mercury::Mercury(double mjd) * Public constructor for class Mercury * Argument: The current time. * the hard coded orbital elements for Mercury are passed to * CelestialBody::CelestialBody(); ************************************************************************/ -Mercury::Mercury(FGTime *t) : +Mercury::Mercury(double mjd) : CelestialBody (48.33130, 3.2458700E-5, 7.0047, 5.00E-8, 29.12410, 1.0144400E-5, 0.3870980, 0.000000, 0.205635, 5.59E-10, - 168.6562, 4.09233443680, t) + 168.6562, 4.09233443680, mjd) +{ +} +Mercury::Mercury() : + CelestialBody (48.33130, 3.2458700E-5, + 7.0047, 5.00E-8, + 29.12410, 1.0144400E-5, + 0.3870980, 0.000000, + 0.205635, 5.59E-10, + 168.6562, 4.09233443680) { } /************************************************************************* - * void Mercury::updatePosition(FGTime *t, Star *ourSun) + * void Mercury::updatePosition(double mjd, Star *ourSun) * * calculates the current position of Mercury, by calling the base class, * CelestialBody::updatePosition(); The current magnitude is calculated using * a Mercury specific equation *************************************************************************/ -void Mercury::updatePosition(FGTime *t, Star *ourSun) +void Mercury::updatePosition(double mjd, Star *ourSun) { - CelestialBody::updatePosition(t, ourSun); + CelestialBody::updatePosition(mjd, ourSun); magnitude = -0.36 + 5*log10( r*R ) + 0.027 * FV + 2.2E-13 * pow(FV, 6); }