fly/flightgear
1
0
Fork 0
Code Activity

Minor tweaks.

Browse source
This commit is contained in:
curt 1998-02-01 03:39:53 +00:00
parent ce3fa54da6
commit b2e8448645
6 changed files with 74 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Main/fg_init.c
View file

@ -109,12 +109,30 @@ void fgInitSubsystems( void ) {
FG_Runway_altitude = 3234.5; FG_Runway_altitude = 3234.5;
FG_Runway_heading = 102.0 * DEG_TO_RAD; FG_Runway_heading = 102.0 * DEG_TO_RAD;
/* Initial Position at (P13) GLOBE airport */ /* Initial Position at (P13) Globe, AZ */
FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD; FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD;
FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD; FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD;
FG_Runway_altitude = (3234.5 + 300); FG_Runway_altitude = (3234.5 + 300);
FG_Altitude = FG_Runway_altitude + 3.758099; FG_Altitude = FG_Runway_altitude + 3.758099;
/* Initial Position at (E81) Superior, AZ */
/* FG_Longitude = ( -111.1270650 ) * DEG_TO_RAD; */
/* FG_Latitude = ( 33.2778339 ) * DEG_TO_RAD; */
/* FG_Runway_altitude = (2646 + 500); */
/* FG_Altitude = FG_Runway_altitude + 3.758099; */
/* Initial Position at (TUS) Tucson, AZ */
/* FG_Longitude = ( -110.9412597 ) * DEG_TO_RAD; */
/* FG_Latitude = ( 32.1162439 ) * DEG_TO_RAD; */
/* FG_Runway_altitude = (2641 + 0); */
/* FG_Altitude = FG_Runway_altitude + 3.758099; */
/* Initial Position at near Anchoraze, AK */
/* FG_Longitude = ( -150.00 ) * DEG_TO_RAD; */
/* FG_Latitude = ( 61.17 ) * DEG_TO_RAD; */
/* FG_Runway_altitude = (2641 + 07777); */
/* FG_Altitude = FG_Runway_altitude + 3.758099; */
/* Initial Position at (SEZ) SEDONA airport */ /* Initial Position at (SEZ) SEDONA airport */
/* FG_Longitude = (-111.7884614 + 0.02) * DEG_TO_RAD; */ /* FG_Longitude = (-111.7884614 + 0.02) * DEG_TO_RAD; */
/* FG_Latitude = ( 34.8486289 - 0.04) * DEG_TO_RAD; */ /* FG_Latitude = ( 34.8486289 - 0.04) * DEG_TO_RAD; */
@ -296,9 +314,12 @@ void fgInitSubsystems( void ) {
/* $Log$ /* $Log$
/* Revision 1.36 1998/01/31 00:43:13 curt /* Revision 1.37 1998/02/01 03:39:54 curt
/* Added MetroWorks patches from Carmen Volpe. /* Minor tweaks.
/* /*
* Revision 1.36 1998/01/31 00:43:13 curt
* Added MetroWorks patches from Carmen Volpe.
*
* Revision 1.35 1998/01/27 00:47:57 curt * Revision 1.35 1998/01/27 00:47:57 curt
* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
* system and commandline/config file processing code. * system and commandline/config file processing code.

10
Scenery/obj.c
View file

@ -77,8 +77,7 @@ GLint fgObjLoad(char *path, struct fgCartesianPoint *ref, double *radius) {
if ( (f = fopen(path, "r")) == NULL ) { if ( (f = fopen(path, "r")) == NULL ) {
fgPrintf(FG_TERRAIN, FG_ALERT, "Cannot open file: %s\n", path); fgPrintf(FG_TERRAIN, FG_ALERT, "Cannot open file: %s\n", path);
/* exit(-1); */ return(-1);
return(0);
} }
tile = xglGenLists(1); tile = xglGenLists(1);
@ -355,9 +354,12 @@ GLint fgObjLoad(char *path, struct fgCartesianPoint *ref, double *radius) {
/* $Log$ /* $Log$
/* Revision 1.21 1998/01/31 00:43:25 curt /* Revision 1.22 1998/02/01 03:39:54 curt
/* Added MetroWorks patches from Carmen Volpe. /* Minor tweaks.
/* /*
* Revision 1.21 1998/01/31 00:43:25 curt
* Added MetroWorks patches from Carmen Volpe.
*
* Revision 1.20 1998/01/29 00:51:39 curt * Revision 1.20 1998/01/29 00:51:39 curt
* First pass at tile cache, dynamic tile loading and tile unloading now works. * First pass at tile cache, dynamic tile loading and tile unloading now works.
* *

11
Scenery/tilecache.c
View file

@ -118,7 +118,9 @@ void fgTileCacheEntryFree( int index ) {
tile_cache[index].tile_bucket.y ); tile_cache[index].tile_bucket.y );
/* Load the appropriate area and get the display list pointer */ /* Load the appropriate area and get the display list pointer */
xglDeleteLists( tile_cache[index].display_list, 1 ); if ( tile_cache[index].display_list >= 0 ) {
xglDeleteLists( tile_cache[index].display_list, 1 );
}
} }
@ -192,9 +194,12 @@ int fgTileCacheNextAvail( void ) {
/* $Log$ /* $Log$
/* Revision 1.6 1998/01/31 00:43:26 curt /* Revision 1.7 1998/02/01 03:39:55 curt
/* Added MetroWorks patches from Carmen Volpe. /* Minor tweaks.
/* /*
* Revision 1.6 1998/01/31 00:43:26 curt
* Added MetroWorks patches from Carmen Volpe.
*
* Revision 1.5 1998/01/29 00:51:39 curt * Revision 1.5 1998/01/29 00:51:39 curt
* First pass at tile cache, dynamic tile loading and tile unloading now works. * First pass at tile cache, dynamic tile loading and tile unloading now works.
* *

21
Scenery/tilemgr.c
View file

@ -198,20 +198,25 @@ void fgTileMgrRender( void ) {
/* fgPrintf( FG_TERRAIN, FG_DEBUG, "Index = %d\n", index); */ /* fgPrintf( FG_TERRAIN, FG_DEBUG, "Index = %d\n", index); */
fgTileCacheEntryInfo(index, &display_list, &local_ref ); fgTileCacheEntryInfo(index, &display_list, &local_ref );
xglPushMatrix(); if ( display_list >= 0 ) {
xglTranslatef(local_ref.x - scenery.center.x, xglPushMatrix();
local_ref.y - scenery.center.y, xglTranslatef(local_ref.x - scenery.center.x,
local_ref.z - scenery.center.z); local_ref.y - scenery.center.y,
xglCallList(display_list); local_ref.z - scenery.center.z);
xglPopMatrix(); xglCallList(display_list);
xglPopMatrix();
}
} }
} }
/* $Log$ /* $Log$
/* Revision 1.11 1998/01/31 00:43:27 curt /* Revision 1.12 1998/02/01 03:39:55 curt
/* Added MetroWorks patches from Carmen Volpe. /* Minor tweaks.
/* /*
* Revision 1.11 1998/01/31 00:43:27 curt
* Added MetroWorks patches from Carmen Volpe.
*
* Revision 1.10 1998/01/29 00:51:40 curt * Revision 1.10 1998/01/29 00:51:40 curt
* First pass at tile cache, dynamic tile loading and tile unloading now works. * First pass at tile cache, dynamic tile loading and tile unloading now works.
* *

9
Simulator/Makefile
View file

@ -74,11 +74,13 @@ source-zip: clean
scenery-tar: scenery-tar:
(cd ../..; \ (cd ../..; \
$(TAR) cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery) $(TAR) cvzf scenery-$(FG_VERSION).tar.gz FlightGear/Scenery/*.dat \
FlightGear/Scenery/*/*/*.obj)
scenery-zip: scenery-zip:
(cd ../..; \ (cd ../..; \
zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery) zip -r scenery-$(FG_VERSION).zip FlightGear/Scenery/*.dat \
FlightGear/Scenery/*/*/*.obj)
bin-tar: all bin-tar: all
cp Main/fg-$(FG_VERSION) README Thanks runfg .. cp Main/fg-$(FG_VERSION) README Thanks runfg ..
@ -102,6 +104,9 @@ bin-zip:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.40 1998/02/01 03:39:53 curt
# Minor tweaks.
#
# Revision 1.39 1998/01/27 00:47:41 curt # Revision 1.39 1998/01/27 00:47:41 curt
# Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message # Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
# system and commandline/config file processing code. # system and commandline/config file processing code.

21
Time/fg_time.c
View file

@ -190,10 +190,18 @@ double sidereal_course(struct tm *gmt, time_t now, double lng) {
start = mktime(&mt); start = mktime(&mt);
/* printf("start1 = %ld\n", start); /* printf("start1 = %ld\n", start);
fgPrintf( FG_EVENT, FG_DEBUG, "start2 = %s", ctime(&start)); fgPrintf( FG_EVENT, FG_DEBUG, "start2 = %s", ctime(&start));
fgPrintf( FG_EVENT, FG_DEBUG, "start3 = %ld\n", start); */ fgPrintf( FG_EVENT, FG_DEBUG, "start3 = %ld\n", start); */
#ifndef __CYGWIN32__
daylight = mt.tm_isdst; daylight = mt.tm_isdst;
#else
/* Yargs ... I'm just hardcoding this arbitrarily so it doesn't
* jump around */
daylight = 0;
fgPrintf( FG_EVENT, FG_WARN,
"no daylight savings info ... being hardcoded to %d\n", daylight);
#endif
#ifdef USE_FTIME #ifdef USE_FTIME
ftime(&current); ftime(&current);
@ -302,10 +310,13 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
/* $Log$ /* $Log$
/* Revision 1.31 1998/01/27 00:48:06 curt /* Revision 1.32 1998/02/01 03:39:56 curt
/* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message /* Minor tweaks.
/* system and commandline/config file processing code.
/* /*
* Revision 1.31 1998/01/27 00:48:06 curt
* Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
* system and commandline/config file processing code.
*
* Revision 1.30 1998/01/21 21:11:35 curt * Revision 1.30 1998/01/21 21:11:35 curt
* Misc. tweaks. * Misc. tweaks.
* *