From e88c915206501d89021b591a73fb2d2f3ccb2868 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 10 Oct 2000 17:19:17 +0000 Subject: [PATCH] A bit of file renaming to avoid problems with MSVC++ --- simgear/ephemeris/Makefile.am | 8 ++++---- simgear/ephemeris/ephemeris.cxx | 2 +- simgear/ephemeris/ephemeris.hxx | 8 ++++---- simgear/ephemeris/{moon.cxx => moonpos.cxx} | 20 +++++++++---------- simgear/ephemeris/{moon.hxx => moonpos.hxx} | 17 ++++++++-------- simgear/ephemeris/{stars.cxx => stardata.cxx} | 4 ++-- simgear/ephemeris/{stars.hxx => stardata.hxx} | 2 +- 7 files changed, 31 insertions(+), 30 deletions(-) rename simgear/ephemeris/{moon.cxx => moonpos.cxx} (93%) rename simgear/ephemeris/{moon.hxx => moonpos.hxx} (90%) rename simgear/ephemeris/{stars.cxx => stardata.cxx} (97%) rename simgear/ephemeris/{stars.hxx => stardata.hxx} (97%) diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am index 4f6c4ed7..a119f964 100644 --- a/simgear/ephemeris/Makefile.am +++ b/simgear/ephemeris/Makefile.am @@ -8,11 +8,11 @@ include_HEADERS = \ jupiter.hxx \ mars.hxx \ mercury.hxx \ - moon.hxx \ + moonpos.hxx \ neptune.hxx \ saturn.hxx \ star.hxx \ - stars.hxx \ + stardata.hxx \ uranus.hxx \ venus.hxx @@ -22,12 +22,12 @@ libsgephem_a_SOURCES = \ jupiter.cxx \ mars.cxx \ mercury.cxx \ - moon.cxx \ + moonpos.cxx \ neptune.cxx \ pluto.hxx \ saturn.cxx \ star.cxx \ - stars.cxx \ + stardata.cxx \ uranus.cxx \ venus.cxx diff --git a/simgear/ephemeris/ephemeris.cxx b/simgear/ephemeris/ephemeris.cxx index 77bf3ef6..95ac3402 100644 --- a/simgear/ephemeris/ephemeris.cxx +++ b/simgear/ephemeris/ephemeris.cxx @@ -29,7 +29,7 @@ // Constructor SGEphemeris::SGEphemeris( const string &path ) { our_sun = new Star; - moon = new Moon; + moon = new MoonPos; mercury = new Mercury; venus = new Venus; mars = new Mars; diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx index 64c0b73b..5b4f7a10 100644 --- a/simgear/ephemeris/ephemeris.hxx +++ b/simgear/ephemeris/ephemeris.hxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -45,13 +45,13 @@ #include #include #include -#include +#include class SGEphemeris { Star *our_sun; - Moon *moon; + MoonPos *moon; Mercury *mercury; Venus *venus; Mars *mars; @@ -91,7 +91,7 @@ public: } // moon - inline Moon *get_moon() const { return moon; } + inline MoonPos *get_moon() const { return moon; } inline double getMoonRightAscension() const { return moon->getRightAscension(); } diff --git a/simgear/ephemeris/moon.cxx b/simgear/ephemeris/moonpos.cxx similarity index 93% rename from simgear/ephemeris/moon.cxx rename to simgear/ephemeris/moonpos.cxx index 1226e165..c0fb5753 100644 --- a/simgear/ephemeris/moon.cxx +++ b/simgear/ephemeris/moonpos.cxx @@ -1,5 +1,5 @@ /************************************************************************** - * moon.cxx + * moonpos.cxx * Written by Durk Talsma. Originally started October 1997, for distribution * with the FlightGear project. Version 2 was written in August and * September 1998. This code is based upon algorithms and data kindly @@ -36,18 +36,18 @@ // #include -#include "moon.hxx" +#include "moonpos.hxx" /************************************************************************* - * Moon::Moon(double mjd) - * Public constructor for class Moon. Initializes the orbital elements and + * MoonPos::MoonPos(double mjd) + * Public constructor for class MoonPos. Initializes the orbital elements and * sets up the moon texture. * Argument: The current time. - * the hard coded orbital elements for Moon are passed to + * the hard coded orbital elements for MoonPos are passed to * CelestialBody::CelestialBody(); ************************************************************************/ -Moon::Moon(double mjd) : +MoonPos::MoonPos(double mjd) : CelestialBody(125.1228, -0.0529538083, 5.1454, 0.00000, 318.0634, 0.1643573223, @@ -57,7 +57,7 @@ Moon::Moon(double mjd) : { } -Moon::Moon() : +MoonPos::MoonPos() : CelestialBody(125.1228, -0.0529538083, 5.1454, 0.00000, 318.0634, 0.1643573223, @@ -68,18 +68,18 @@ Moon::Moon() : } -Moon::~Moon() +MoonPos::~MoonPos() { } /***************************************************************************** - * void Moon::updatePosition(double mjd, Star *ourSun) + * void MoonPos::updatePosition(double mjd, Star *ourSun) * this member function calculates the actual topocentric position (i.e.) * the position of the moon as seen from the current position on the surface * of the moon. ****************************************************************************/ -void Moon::updatePosition(double mjd, double lst, double lat, Star *ourSun) +void MoonPos::updatePosition(double mjd, double lst, double lat, Star *ourSun) { double eccAnom, ecl, actTime, diff --git a/simgear/ephemeris/moon.hxx b/simgear/ephemeris/moonpos.hxx similarity index 90% rename from simgear/ephemeris/moon.hxx rename to simgear/ephemeris/moonpos.hxx index 94958d6d..96092b9f 100644 --- a/simgear/ephemeris/moon.hxx +++ b/simgear/ephemeris/moonpos.hxx @@ -1,5 +1,5 @@ /************************************************************************** - * moon.hxx + * moonpos.hxx * Written by Durk Talsma. Originally started October 1997, for distribution * with the FlightGear project. Version 2 was written in August and * September 1998. This code is based upon algorithms and data kindly @@ -22,8 +22,8 @@ * * $Id$ **************************************************************************/ -#ifndef _MOON_HXX_ -#define _MOON_HXX_ +#ifndef _MOONPOS_HXX_ +#define _MOONPOS_HXX_ #include @@ -31,7 +31,8 @@ #include #include -class Moon : public CelestialBody + +class MoonPos : public CelestialBody { private: @@ -49,12 +50,12 @@ private: public: - Moon(double mjd); - Moon(); - ~Moon(); + MoonPos(double mjd); + MoonPos(); + ~MoonPos(); void updatePosition(double mjd, double lst, double lat, Star *ourSun); // void newImage(); }; -#endif // _MOON_HXX_ +#endif // _MOONPOS_HXX_ diff --git a/simgear/ephemeris/stars.cxx b/simgear/ephemeris/stardata.cxx similarity index 97% rename from simgear/ephemeris/stars.cxx rename to simgear/ephemeris/stardata.cxx index 413dee66..3804988e 100644 --- a/simgear/ephemeris/stars.cxx +++ b/simgear/ephemeris/stardata.cxx @@ -1,4 +1,4 @@ -// stars.cxx -- manage star data +// stardata.cxx -- manage star data // // Written by Curtis Olson, started March 2000. // @@ -25,7 +25,7 @@ #include #include -#include "stars.hxx" +#include "stardata.hxx" #ifdef _MSC_VER FG_USING_STD(getline); diff --git a/simgear/ephemeris/stars.hxx b/simgear/ephemeris/stardata.hxx similarity index 97% rename from simgear/ephemeris/stars.hxx rename to simgear/ephemeris/stardata.hxx index 24f1c503..0f9f7ae7 100644 --- a/simgear/ephemeris/stars.hxx +++ b/simgear/ephemeris/stardata.hxx @@ -1,4 +1,4 @@ -// stars.hxx -- manage star data +// stardata.hxx -- manage star data // // Written by Curtis Olson, started March 2000. // -- 2.39.5