Add xgl wrappers for debugging.

[flightgear.git] / Main / fg_init.c

diff --git a/Main/fg_init.c b/Main/fg_init.c
index 4c97095ac804742586cd2283f801016948d871d0..7edcb27cee2dd4c5c189324f9cb1c9ebd92d132c 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -30,16 +30,16 @@
 #include "fg_init.h"
 #include "views.h"
 
-#include "../constants.h"
-#include "../general.h"
+#include "../Include/constants.h"
+#include "../Include/general.h"
 
 #include "../Aircraft/aircraft.h"
 #include "../Cockpit/cockpit.h"
 #include "../Joystick/joystick.h"
 #include "../Math/fg_random.h"
 #include "../Scenery/mesh.h"
+#include "../Scenery/astro.h"
 #include "../Scenery/scenery.h"
-#include "../Scenery/stars.h"
 #include "../Time/fg_time.h"
 #include "../Time/sunpos.h"
 #include "../Weather/weather.h"
@@ -51,7 +51,7 @@ extern int show_hud;             /* HUD state */
 /* General house keeping initializations */
 
 void fgInitGeneral( void ) {
-    struct GENERAL *g;
+    struct fgGENERAL *g;
 
     g = &general;
 
@@ -75,9 +75,9 @@ void fgInitGeneral( void ) {
 void fgInitSubsystems( void ) {
     double cur_elev;
 
-    struct FLIGHT *f;
+    struct fgFLIGHT *f;
     struct fgTIME *t;
-    struct VIEW *v;
+    struct fgVIEW *v;
 
     f = &current_aircraft.flight;
     t = &cur_time_params;
@@ -99,11 +99,12 @@ void fgInitSubsystems( void ) {
     FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD;
     FG_Latitude  = (  120070.41 / 3600.0 ) * DEG_TO_RAD;
     FG_Altitude = FG_Runway_altitude + 3.758099;
-    /* FG_Altitude = 20000; */
     
     /* Initial Position north of the city of Globe */
     /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  120625.64 / 3600.0 ) * DEG_TO_RAD; */
+    /* FG_Longitude = ( -397867.44 / 3600.0 ) * DEG_TO_RAD; */
+    /* FG_Latitude  = (  119548.21 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Altitude = 0.0 + 3.758099; */
 
     /* Initial Position: 10125 Jewell St. NE */
@@ -111,8 +112,11 @@ void fgInitSubsystems( void ) {
     /* FG_Latitude  = (  45.15 ) * DEG_TO_RAD; */
     /* FG_Altitude = FG_Runway_altitude + 3.758099; */
 
-    FG_Longitude = ( -583200.00 / 3600.0 ) * DEG_TO_RAD;
-    FG_Latitude  = (  110808.41 / 3600.0 ) * DEG_TO_RAD;
+    /* A random test position */
+    /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */
+    /* FG_Latitude  = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
+    FG_Runway_altitude = 4000.0;
+    FG_Altitude = FG_Runway_altitude + 3.758099;
 
     printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
           FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, 
@@ -127,7 +131,6 @@ void fgInitSubsystems( void ) {
     FG_Phi   = -2.658474E-06;
     FG_Theta =  7.401790E-03;
     FG_Psi   =  270.0 * DEG_TO_RAD;
-    /* FG_Psi   =  0.0 * DEG_TO_RAD; */
 
     /* Initial Angular B rates */
     FG_P_body = 7.206685E-05;
@@ -173,8 +176,8 @@ void fgInitSubsystems( void ) {
        exit( 1 );
     }
 
-    /* Initialize the Stars subsystem  */
-    fgStarsInit();
+    /* Initialize Astronomical Objects */
+    fgAstroInit();
 
     /* Initialize the Scenery Management subsystem */
     fgSceneryInit();
@@ -215,9 +218,42 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.8  1997/09/22 14:44:20  curt
-/* Continuing to try to align stars correctly.
+/* Revision 1.18  1997/12/15 23:54:49  curt
+/* Add xgl wrappers for debugging.
+/* Generate terrain normals on the fly.
 /*
+ * Revision 1.17  1997/12/15 20:59:09  curt
+ * Misc. tweaks.
+ *
+ * Revision 1.16  1997/12/12 19:52:48  curt
+ * Working on lightling and material properties.
+ *
+ * Revision 1.15  1997/12/11 04:43:55  curt
+ * Fixed sun vector and lighting problems.  I thing the moon is now lit
+ * correctly.
+ *
+ * Revision 1.14  1997/12/10 22:37:47  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
+ * Revision 1.13  1997/11/25 19:25:32  curt
+ * Changes to integrate Durk's moon/sun code updates + clean up.
+ *
+ * Revision 1.12  1997/11/15 18:16:35  curt
+ * minor tweaks.
+ *
+ * Revision 1.11  1997/10/30 12:38:42  curt
+ * Working on new scenery subsystem.
+ *
+ * Revision 1.10  1997/10/25 03:24:23  curt
+ * Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
+ *
+ * Revision 1.9  1997/09/23 00:29:39  curt
+ * Tweaks to get things to compile with gcc-win32.
+ *
+ * Revision 1.8  1997/09/22 14:44:20  curt
+ * Continuing to try to align stars correctly.
+ *
  * Revision 1.7  1997/09/16 15:50:30  curt
  * Working on star alignment and time issues.
  *