Incorporated Durk's Astro/ tweaks. Includes unifying the sun position

[simgear.git] / Astro / orbits.h

diff --git a/Astro/orbits.h b/Astro/orbits.h
index daf99dc27b0f463b5310e52b3f9c155262a8ff1a..377c416604c9aa263986df96df96cea1e913abf4 100644 (file)
--- a/Astro/orbits.h
+++ b/Astro/orbits.h
@@ -23,8 +23,8 @@
  **************************************************************************/
 
 
-#ifndef ORBITS_H
-#define ORBITS_H
+#ifndef _ORBITS_H
+#define _ORBITS_H
 
 
 #include <stdio.h>
@@ -34,14 +34,17 @@
 
 
 
-#define STANDARDEPOCH 2000
-#define PIOVER180      1.74532925199433E-002
+//#define STANDARDEPOCH 2000
 
-struct SunPos {
+typedef struct {
     double xs;
     double ys;
     double dist;
-};
+    double lonSun;
+} fgSUNPOS;
+
+extern fgSUNPOS solarPosition;
+
 
 struct OrbElements {
     double NFirst;             /* longitude of the ascending node first part */
@@ -68,23 +71,37 @@ struct CelestialCoord {
 };
 
 
-double fgDegToRad(double angle);
 double fgCalcEccAnom(double M, double e);
 double fgCalcActTime(struct fgTIME t);
 
-void fgReadOrbElements(struct OrbElements *dest, FILE *src);
-void fgSolarSystemInit(struct fgTIME t);
+int fgReadOrbElements (struct OrbElements *dest, FILE * src);
+int  fgSolarSystemInit(struct fgTIME t);
 void fgSolarSystemUpdate(struct OrbElements *planets, struct fgTIME t);
 
 
-#endif /* ORBITS_H */
+#endif /* _ORBITS_H */
 
 
 /* $Log$
-/* Revision 1.2  1998/01/19 19:26:58  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.6  1998/02/23 19:07:55  curt
+/* Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
+/* calculation code between sun display, and other FG sections that use this
+/* for things like lighting.
 /*
+ * Revision 1.5  1998/02/12 21:59:35  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.4  1998/02/02 20:53:22  curt
+ * To version 0.29
+ *
+ * Revision 1.3  1998/01/22 02:59:27  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.2  1998/01/19 19:26:58  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.1  1998/01/07 03:16:17  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *