From d0694b34cdaa98c44acc9c9d94630504f7d3336d Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 11 Feb 1998 02:50:34 +0000 Subject: [PATCH] Minor changes. --- Main/GLUTmain.c | 18 ++++++++++++------ Main/fg_init.c | 15 +++++++++------ Scenery/tilemgr.c | 9 +++++++-- Simulator/Done | 6 ++++++ Simulator/Todo | 3 --- Simulator/commondefs | 2 +- 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Main/GLUTmain.c b/Main/GLUTmain.c index 95208878b..2f89d20d6 100644 --- a/Main/GLUTmain.c +++ b/Main/GLUTmain.c @@ -490,14 +490,17 @@ static void fgMainLoop( void ) { /* Calculate model iterations needed */ elapsed = fgGetTimeInterval(); - fgPrintf( FG_ALL, FG_BULK, "Time interval is = %d, previous remainder is = %d\n", + fgPrintf( FG_ALL, FG_BULK, + "Time interval is = %d, previous remainder is = %d\n", elapsed, remainder); - fgPrintf( FG_ALL, FG_BULK, "--> Frame rate is = %.2f\n", 1000.0 / (float)elapsed); + fgPrintf( FG_ALL, FG_BULK, + "--> Frame rate is = %.2f\n", 1000.0 / (float)elapsed); elapsed += remainder; - multi_loop = ((float)elapsed * 0.001) * DEFAULT_MODEL_HZ; + multi_loop = (int)(((float)elapsed * 0.001) * DEFAULT_MODEL_HZ); remainder = elapsed - ((multi_loop*1000) / DEFAULT_MODEL_HZ); - fgPrintf( FG_ALL, FG_BULK, "Model iterations needed = %d, new remainder = %d\n", + fgPrintf( FG_ALL, FG_BULK, + "Model iterations needed = %d, new remainder = %d\n", multi_loop, remainder); /* Run flight model */ @@ -647,9 +650,12 @@ int main( int argc, char *argv[] ) { #endif /* $Log$ -/* Revision 1.59 1998/02/09 22:56:54 curt -/* Removed "depend" files from cvs control. Other minor make tweaks. +/* Revision 1.60 1998/02/11 02:50:40 curt +/* Minor changes. /* + * Revision 1.59 1998/02/09 22:56:54 curt + * Removed "depend" files from cvs control. Other minor make tweaks. + * * Revision 1.58 1998/02/09 15:07:49 curt * Minor tweaks. * diff --git a/Main/fg_init.c b/Main/fg_init.c index 2957d4b06..0e997dad4 100644 --- a/Main/fg_init.c +++ b/Main/fg_init.c @@ -181,10 +181,10 @@ void fgInitSubsystems( void ) { /* FG_Altitude = FG_Runway_altitude + 3.758099; */ /* Initial Position: (GCN) Grand Canyon Airport, AZ */ - /* FG_Longitude = ( -112.1469647 ) * DEG_TO_RAD; */ - /* FG_Latitude = ( 35.9523539 ) * DEG_TO_RAD; */ - /* FG_Runway_altitude = 6606.0; */ - /* FG_Altitude = FG_Runway_altitude + 3.758099; */ + FG_Longitude = ( -112.1469647 ) * DEG_TO_RAD; + FG_Latitude = ( 35.9523539 ) * DEG_TO_RAD; + FG_Runway_altitude = 6606.0; + FG_Altitude = FG_Runway_altitude + 3.758099; /* A random test position */ /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */ @@ -334,9 +334,12 @@ void fgInitSubsystems( void ) { /* $Log$ -/* Revision 1.42 1998/02/09 22:56:58 curt -/* Removed "depend" files from cvs control. Other minor make tweaks. +/* Revision 1.43 1998/02/11 02:50:40 curt +/* Minor changes. /* + * Revision 1.42 1998/02/09 22:56:58 curt + * Removed "depend" files from cvs control. Other minor make tweaks. + * * Revision 1.41 1998/02/09 15:07:50 curt * Minor tweaks. * diff --git a/Scenery/tilemgr.c b/Scenery/tilemgr.c index cba507a96..3887282e4 100644 --- a/Scenery/tilemgr.c +++ b/Scenery/tilemgr.c @@ -202,6 +202,8 @@ void fgTileMgrRender( void ) { index = fgTileCacheExists(&p); fgTileCacheEntryInfo(index, &display_list, &scenery.center ); + printf("Current bucket = %d %d %d %d\n", p.lon, p.lat, p.x, p.y ); + for ( i = 0; i < FG_LOCAL_X_Y; i++ ) { index = tiles[i]; /* fgPrintf( FG_TERRAIN, FG_DEBUG, "Index = %d\n", index); */ @@ -222,9 +224,12 @@ void fgTileMgrRender( void ) { /* $Log$ -/* Revision 1.14 1998/02/09 21:30:19 curt -/* Fixed a nagging problem with terrain tiles not "quite" matching up perfectly. +/* Revision 1.15 1998/02/11 02:50:44 curt +/* Minor changes. /* + * Revision 1.14 1998/02/09 21:30:19 curt + * Fixed a nagging problem with terrain tiles not "quite" matching up perfectly. + * * Revision 1.13 1998/02/07 15:29:46 curt * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss * diff --git a/Simulator/Done b/Simulator/Done index 5737f626b..969943718 100644 --- a/Simulator/Done +++ b/Simulator/Done @@ -2,6 +2,12 @@ | Done -------------------------------------------------------------------------- +2/9/98 - Fixed a problem with terrain tiles not quite matching up perfectly. + +2/2/98 - Fix warning when compiling with c++ ... also successfully built + with cygnus-g++. There should be nothing holding us back from + using C++. + 1/30/98 - remove Scenery/geometry.c and Scenery/mesh.c 1/28/98 - Dynamic unloading of scenery. diff --git a/Simulator/Todo b/Simulator/Todo index 12f907c9b..a44205402 100644 --- a/Simulator/Todo +++ b/Simulator/Todo @@ -4,9 +4,6 @@ 12/29/97 - View frustum culling -1/21/98 - Fix warning when compiling with c++ ... still can't build - with cygnus-g++ - 1/5/98 - Create a development "roadmap" 12/30/97 - fix winding problem with tri-strips in obj.c (invert normals) diff --git a/Simulator/commondefs b/Simulator/commondefs index 38fb0dcb9..7846ca5c1 100644 --- a/Simulator/commondefs +++ b/Simulator/commondefs @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- FG_VERSION_MAJOR = 0 -FG_VERSION_MINOR = 32 +FG_VERSION_MINOR = 33 FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR) -- 2.39.5