Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/

diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c
index fe3fc150bd7006816692775c87abd2095847ff98..c0b7628eff493f02c0db57e1fcefa4aa66e52d6e 100644 (file)
--- a/Main/GLUTmain.c
+++ b/Main/GLUTmain.c
@@ -40,17 +40,17 @@
 #include "../Include/general.h"
 
 #include "../Aircraft/aircraft.h"
+#include "../Astro/moon.h"
+#include "../Astro/sky.h"
+#include "../Astro/stars.h"
+#include "../Astro/sun.h"
 #include "../Cockpit/cockpit.h"
 #include "../Joystick/joystick.h"
 #include "../Math/fg_geodesy.h"
 #include "../Math/mat3.h"
 #include "../Math/polar.h"
 #include "../Scenery/mesh.h"
-#include "../Scenery/moon.h"
 #include "../Scenery/scenery.h"
-#include "../Scenery/sky.h"
-#include "../Scenery/stars.h"
-#include "../Scenery/sun.h"
 #include "../Time/event.h"
 #include "../Time/fg_time.h"
 #include "../Time/fg_timer.h"
@@ -628,9 +628,12 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.44  1997/12/30 22:22:31  curt
-/* Further integration of event manager.
+/* Revision 1.45  1998/01/07 03:18:55  curt
+/* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
 /*
+ * Revision 1.44  1997/12/30 22:22:31  curt
+ * Further integration of event manager.
+ *
  * Revision 1.43  1997/12/30 20:47:43  curt
  * Integrated new event manager with subsystem initializations.
  *

diff --git a/Main/Makefile b/Main/Makefile
index 6755ea934d2b3f5f275988bd1a2995e221484bf5..4b4f620f6de1debc737292eb2f3d334a79d2c0b7 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -26,7 +26,7 @@
 
 CFILES = fg_init.c views.c $(INTERFACE_FILES)
 OFILES = $(CFILES:.c=.o)
-AFILES = ../Aircraft/libAircraft.a ../Cockpit/libCockpit.a \
+AFILES = ../Aircraft/libAircraft.a ../Astro/libAstro.a ../Cockpit/libCockpit.a \
        ../Controls/libControls.a ../Flight/libFlight.a \
        ../Joystick/libJoystick.a ../Flight/LaRCsim/libLaRCsim.a \
        ../Flight/Slew/libSlew.a ../Scenery/libScenery.a \
@@ -84,6 +84,9 @@ views.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.40  1998/01/07 03:18:57  curt
+# Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
+#
 # Revision 1.39  1997/12/17 23:13:35  curt
 # Began working on rendering a sky.
 #

diff --git a/Main/depend b/Main/depend
index eb76cabe4ab43330325868815837af7edb846d3c..22f08083d19c8cdb67a934ebee9d1ab2bbfbb0a2 100644 (file)
--- a/Main/depend
+++ b/Main/depend
@@ -6,38 +6,6 @@ GLUTkey.o: GLUTkey.c ../XGL/xgl.h GLUTkey.h views.h ../Include/types.h \
  ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
  ../Aircraft/../Controls/controls.h \
  ../Aircraft/../Controls/../Include/limits.h ../Weather/weather.h
-GLUTmain.o: GLUTmain.c ../XGL/xgl.h GLUTkey.h fg_init.h views.h \
- ../Include/types.h ../Flight/flight.h ../Flight/Slew/slew.h \
- ../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
- ../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Include/constants.h \
- ../Include/general.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Cockpit/cockpit.h \
- ../Cockpit/hud.h ../Cockpit/../Aircraft/aircraft.h \
- ../Cockpit/../Flight/flight.h ../Cockpit/../Controls/controls.h \
- ../Joystick/joystick.h ../Math/fg_geodesy.h ../Math/polar.h \
- ../Math/../Include/types.h ../Scenery/mesh.h ../Scenery/moon.h \
- ../Scenery/orbits.h ../Scenery/../Time/fg_time.h ../Scenery/scenery.h \
- ../Scenery/../Include/types.h ../Scenery/sky.h ../Scenery/stars.h \
- ../Scenery/sun.h ../Time/fg_timer.h ../Time/sunpos.h \
- ../Weather/weather.h
-fg_init.o: fg_init.c fg_init.h views.h ../Include/types.h \
- ../Flight/flight.h ../Flight/Slew/slew.h \
- ../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
- ../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
- ../Time/../Flight/flight.h ../Include/constants.h \
- ../Include/general.h ../Aircraft/aircraft.h \
- ../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
- ../Aircraft/../Controls/../Include/limits.h ../Cockpit/cockpit.h \
- ../Cockpit/hud.h ../Cockpit/../Aircraft/aircraft.h \
- ../Cockpit/../Flight/flight.h ../Cockpit/../Controls/controls.h \
- ../Joystick/joystick.h ../Math/fg_random.h ../Scenery/mesh.h \
- ../Scenery/moon.h ../Scenery/orbits.h ../Scenery/../Time/fg_time.h \
- ../Scenery/scenery.h ../Scenery/../Include/types.h ../Scenery/sky.h \
- ../Scenery/stars.h ../Scenery/sun.h ../Time/sunpos.h \
- ../Weather/weather.h
-probdemo.o: probdemo.c ../XGL/xgl.h
 views.o: views.c views.h ../Include/types.h ../Flight/flight.h \
  ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
  ../Flight/LaRCsim/../flight.h ../Math/mat3.h ../Time/fg_time.h \

diff --git a/Main/fg_init.c b/Main/fg_init.c
index 7e35e9203afda633cc45dd0a419c3ac9c0139110..20ecbb1bbfc29cbd28808e32213432f3f2932978 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -34,15 +34,15 @@
 #include "../Include/general.h"
 
 #include "../Aircraft/aircraft.h"
+#include "../Astro/moon.h"
+#include "../Astro/sky.h"
+#include "../Astro/stars.h"
+#include "../Astro/sun.h"
 #include "../Cockpit/cockpit.h"
 #include "../Joystick/joystick.h"
 #include "../Math/fg_random.h"
 #include "../Scenery/mesh.h"
-#include "../Scenery/moon.h"
 #include "../Scenery/scenery.h"
-#include "../Scenery/sky.h"
-#include "../Scenery/stars.h"
-#include "../Scenery/sun.h"
 #include "../Time/event.h"
 #include "../Time/fg_time.h"
 #include "../Time/sunpos.h"
@@ -267,9 +267,12 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.27  1998/01/05 18:44:35  curt
-/* Add an option to advance/decrease time from keyboard.
+/* Revision 1.28  1998/01/07 03:18:58  curt
+/* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
 /*
+ * Revision 1.27  1998/01/05 18:44:35  curt
+ * Add an option to advance/decrease time from keyboard.
+ *
  * Revision 1.26  1997/12/30 23:09:04  curt
  * Tweaking initialization sequences.
  *