math: Move lerp function into SGMisc.

[simgear.git] / simgear / ephemeris / ephemeris.cxx

diff --git a/simgear/ephemeris/ephemeris.cxx b/simgear/ephemeris/ephemeris.cxx
index 1469c28f1fc0c6e68f62b9137d7508edbaf0b6a9..a05481bdfde8d1bf938a5ec30d348c02c8b92b07 100644 (file)
--- a/simgear/ephemeris/ephemeris.cxx
+++ b/simgear/ephemeris/ephemeris.cxx
@@ -3,43 +3,88 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
-// 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.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#include <iostream>
 
 #include "ephemeris.hxx"
 
 
 // Constructor
-FGEphemeris::FGEphemeris( void ) {
+SGEphemeris::SGEphemeris( const std::string &path ) {
     our_sun = new Star;
+    moon = new MoonPos;
+    mercury = new Mercury;
+    venus = new Venus;
+    mars = new Mars;
+    jupiter = new Jupiter;
+    saturn = new Saturn;
+    uranus = new Uranus;
+    neptune = new Neptune;
+    nplanets = 7;
+    for ( int i = 0; i < nplanets; ++i )
+      planets[i] = SGVec3d::zeros();
+    stars = new SGStarData( SGPath(path) );
 }
 
 
 // Destructor
-FGEphemeris::~FGEphemeris( void ) {
+SGEphemeris::~SGEphemeris( void ) {
     delete our_sun;
+    delete moon;
+    delete mercury;
+    delete venus;
+    delete mars;
+    delete jupiter;
+    delete saturn;
+    delete uranus;
+    delete neptune;
+    delete stars;
 }
 
 
 // Update (recalculate) the positions of all objects for the specified
 // time
-void FGEphemeris::update( FGTime *t ) {
-    our_sun->updatePosition( t );
+void SGEphemeris::update( double mjd, double lst, double lat ) {
+    // update object positions
+    our_sun->updatePosition( mjd );
+    moon->updatePosition( mjd, lst, lat, our_sun );
+    mercury->updatePosition( mjd, our_sun );
+    venus->updatePosition( mjd, our_sun );
+    mars->updatePosition( mjd, our_sun );
+    jupiter->updatePosition( mjd, our_sun );
+    saturn->updatePosition( mjd, our_sun );
+    uranus->updatePosition( mjd, our_sun );
+    neptune->updatePosition( mjd, our_sun );
+
+    // update planets list
+    nplanets = 7;
+    mercury->getPos( &planets[0][0], &planets[0][1], &planets[0][2] );
+    venus  ->getPos( &planets[1][0], &planets[1][1], &planets[1][2] );
+    mars   ->getPos( &planets[2][0], &planets[2][1], &planets[2][2] );
+    jupiter->getPos( &planets[3][0], &planets[3][1], &planets[3][2] );
+    saturn ->getPos( &planets[4][0], &planets[4][1], &planets[4][2] );
+    uranus ->getPos( &planets[5][0], &planets[5][1], &planets[5][2] );
+    neptune->getPos( &planets[6][0], &planets[6][1], &planets[6][2] );
 }