Changed #ifdef FILE_H to #ifdef _FILE_H

[flightgear.git] / Main / fg_init.c

diff --git a/Main/fg_init.c b/Main/fg_init.c
index 7e35e9203afda633cc45dd0a419c3ac9c0139110..9b95510bb4e3f2ed9cccd97eb4e3ca02cdaf9e77 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -27,26 +27,27 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fg_init.h"
-#include "views.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/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"
-#include "../Weather/weather.h"
+#include <Main/fg_init.h>
+#include <Main/views.h>
+
+#include <Include/constants.h>
+#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/scenery.h>
+#include <Scenery/tilemgr.h>
+#include <Time/event.h>
+#include <Time/fg_time.h>
+#include <Time/sunpos.h>
+#include <Weather/weather.h>
 
 
 extern int show_hud;             /* HUD state */
@@ -109,18 +110,43 @@ void fgInitSubsystems( void ) {
     FG_Runway_altitude = 3234.5;
     FG_Runway_heading = 102.0 * DEG_TO_RAD;
 
-    /* Initial Position at GLOBE airport */
+    /* Initial Position at (P13) GLOBE airport */
     FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD;
     FG_Latitude  = (  120070.41 / 3600.0 ) * DEG_TO_RAD;
+    FG_Runway_altitude = (3234.5 + 300);
     FG_Altitude = FG_Runway_altitude + 3.758099;
     
+    /* Initial Position at (SEZ) SEDONA airport */
+    /* FG_Longitude = (-111.7884614 + 0.02) * DEG_TO_RAD; */
+    /* FG_Latitude  = (  34.8486289 - 0.04) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = (4827 + 800); */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+        
+    /* Initial Position at (HSP) Hot Springs, VA */
+    /* FG_Longitude = (-79.8338964 + 0.02) * DEG_TO_RAD; */
+    /* FG_Latitude  = ( 37.9514564 + 0.05) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = (792 + 1500); */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+    
+    /* Initial Position at (ANE) Anoka County airport */
+    /* FG_Longitude = -93.2113889 * DEG_TO_RAD; */
+    /* FG_Latitude  = 45.145 * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 912; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+    
     /* Initial Position north of the city of Globe */
-    /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
+    /* FGto do the install_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 Posisition near where I used to live in Globe, AZ */
+    /* FG_Longitude = ( -398757.6 / 3600.0 ) * DEG_TO_RAD; */
+    /* FG_Latitude  = (  120160.0 / 3600.0 ) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 5000.0; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+
     /* Initial Position: 10125 Jewell St. NE */
     /* FG_Longitude = ( -93.15 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  45.15 ) * DEG_TO_RAD; */
@@ -129,10 +155,8 @@ void fgInitSubsystems( void ) {
     /* 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", 
+     printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
           FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, 
           FG_Altitude * FEET_TO_METER);
 
@@ -223,11 +247,13 @@ void fgInitSubsystems( void ) {
     fgSkyInit();
 
     /* Initialize the Scenery Management subsystem */
-    fgSceneryInit();
+    fgTileMgrInit();
+    /* fgSceneryInit(); */
 
     /* Tell the Scenery Management system where we are so it can load
      * the correct scenery data */
-    fgSceneryUpdate(FG_Latitude, FG_Longitude, FG_Altitude);
+    fgTileMgrUpdate();
+    /* fgSceneryUpdate(FG_Latitude, FG_Longitude, FG_Altitude); */
 
     /* I'm just sticking this here for now, it should probably move 
      * eventually */
@@ -267,9 +293,33 @@ 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.34  1998/01/22 02:59:37  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.33  1998/01/21 21:11:34  curt
+ * Misc. tweaks.
+ *
+ * Revision 1.32  1998/01/19 19:27:08  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.31  1998/01/19 18:40:32  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.30  1998/01/13 00:23:09  curt
+ * Initial changes to support loading and management of scenery tiles.  Note,
+ * there's still a fair amount of work left to be done.
+ *
+ * Revision 1.29  1998/01/08 02:22:08  curt
+ * Beginning to integrate Tile management subsystem.
+ *
+ * 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.
  *