From 4a487175c90b256f9bf73b421d8da64441f1ceab Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 26 Apr 1998 05:10:00 +0000 Subject: [PATCH] "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. --- Astro/planets.cxx | 9 ++++++--- Astro/sky.cxx | 11 +++++++---- Astro/stars.cxx | 9 ++++++--- Astro/sun.cxx | 9 ++++++--- Main/GLUTmain.cxx | 9 ++++++--- Main/fg_init.cxx | 5 ++++- Main/views.cxx | 11 +++++++---- Simulator/Todo | 4 ++++ Time/light.cxx | 5 ++++- Time/sunpos.cxx | 5 ++++- 10 files changed, 54 insertions(+), 23 deletions(-) diff --git a/Astro/planets.cxx b/Astro/planets.cxx index cf1616d68..890c1295e 100644 --- a/Astro/planets.cxx +++ b/Astro/planets.cxx @@ -143,7 +143,7 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet, void fgPlanetsInit( void ) { - struct fgLIGHT *l; + fgLIGHT *l; int i; struct CelestialCoord pltPos; double magnitude; @@ -210,9 +210,12 @@ void fgPlanetsRender( void ) { /* $Log$ -/* Revision 1.3 1998/04/25 22:06:25 curt -/* Edited cvs log messages in source files ... bad bad bad! +/* Revision 1.4 1998/04/26 05:10:01 curt +/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. /* + * Revision 1.3 1998/04/25 22:06:25 curt + * Edited cvs log messages in source files ... bad bad bad! + * * Revision 1.2 1998/04/24 00:45:02 curt * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" * Fixed a bug when generating sky colors. diff --git a/Astro/sky.cxx b/Astro/sky.cxx index 829671ed7..4f9e219bc 100644 --- a/Astro/sky.cxx +++ b/Astro/sky.cxx @@ -113,7 +113,7 @@ void fgSkyVerticesInit( void ) { /* (Re)calculate the sky colors at each vertex */ void fgSkyColorsInit( void ) { - struct fgLIGHT *l; + fgLIGHT *l; float sun_angle, diff; float outer_param[3], outer_amt[3], outer_diff[3]; float middle_param[3], middle_amt[3], middle_diff[3]; @@ -260,7 +260,7 @@ void fgSkyInit( void ) { /* Draw the Sky */ void fgSkyRender( void ) { fgFLIGHT *f; - struct fgLIGHT *l; + fgLIGHT *l; struct fgVIEW *v; float /* inner_color[4], middle_color[4], diff, */ east_dot, dot, angle; int i; @@ -373,9 +373,12 @@ void fgSkyRender( void ) { /* $Log$ -/* Revision 1.3 1998/04/25 22:06:25 curt -/* Edited cvs log messages in source files ... bad bad bad! +/* Revision 1.4 1998/04/26 05:10:01 curt +/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. /* + * Revision 1.3 1998/04/25 22:06:25 curt + * Edited cvs log messages in source files ... bad bad bad! + * * Revision 1.2 1998/04/24 00:45:03 curt * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" * Fixed a bug when generating sky colors. diff --git a/Astro/stars.cxx b/Astro/stars.cxx index 3f2c95396..11de41264 100644 --- a/Astro/stars.cxx +++ b/Astro/stars.cxx @@ -224,7 +224,7 @@ int fgStarsInit( void ) { void fgStarsRender( void ) { fgFLIGHT *f; struct fgVIEW *v; - struct fgLIGHT *l; + fgLIGHT *l; struct fgTIME *t; int i; @@ -260,9 +260,12 @@ void fgStarsRender( void ) { /* $Log$ -/* Revision 1.3 1998/04/25 22:06:26 curt -/* Edited cvs log messages in source files ... bad bad bad! +/* Revision 1.4 1998/04/26 05:10:02 curt +/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. /* + * Revision 1.3 1998/04/25 22:06:26 curt + * Edited cvs log messages in source files ... bad bad bad! + * * Revision 1.2 1998/04/24 00:45:03 curt * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" * Fixed a bug when generating sky colors. diff --git a/Astro/sun.cxx b/Astro/sun.cxx index dc2fad3cd..6b9b85e49 100644 --- a/Astro/sun.cxx +++ b/Astro/sun.cxx @@ -104,7 +104,7 @@ struct CelestialCoord fgCalculateSun (struct OrbElements params, /* Initialize the Sun */ void fgSunInit( void ) { - struct fgLIGHT *l; + fgLIGHT *l; struct fgTIME *t; struct fgVIEW *v; float xSun, ySun, zSun; @@ -192,9 +192,12 @@ void fgSunRender( void ) { /* $Log$ -/* Revision 1.3 1998/04/25 22:06:26 curt -/* Edited cvs log messages in source files ... bad bad bad! +/* Revision 1.4 1998/04/26 05:10:02 curt +/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. /* + * Revision 1.3 1998/04/25 22:06:26 curt + * Edited cvs log messages in source files ... bad bad bad! + * * Revision 1.2 1998/04/24 00:45:04 curt * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" * Fixed a bug when generating sky colors. diff --git a/Main/GLUTmain.cxx b/Main/GLUTmain.cxx index f38accd9d..9d49992bb 100644 --- a/Main/GLUTmain.cxx +++ b/Main/GLUTmain.cxx @@ -183,7 +183,7 @@ const int DefaultViewMode = HUD_VIEW; // fgInitVisuals() -- Initialize various GL/view parameters static void fgInitVisuals( void ) { - struct fgLIGHT *l; + fgLIGHT *l; struct fgWEATHER *w; l = &cur_light_params; @@ -213,7 +213,7 @@ static void fgInitVisuals( void ) { // Update the view volume, position, and orientation static void fgUpdateViewParams( void ) { fgFLIGHT *f; - struct fgLIGHT *l; + fgLIGHT *l; // struct fgTIME *t; struct fgVIEW *v; @@ -316,7 +316,7 @@ static void fgUpdateInstrViewParams( void ) { // Update all Visuals (redraws anything graphics related) static void fgRenderFrame( void ) { - struct fgLIGHT *l; + fgLIGHT *l; fgOPTIONS *o; struct fgTIME *t; struct fgVIEW *v; @@ -693,6 +693,9 @@ extern "C" { // $Log$ +// Revision 1.7 1998/04/26 05:10:02 curt +// "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +// // Revision 1.6 1998/04/25 22:06:30 curt // Edited cvs log messages in source files ... bad bad bad! // diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx index 85f00b2c5..206cd8210 100644 --- a/Main/fg_init.cxx +++ b/Main/fg_init.cxx @@ -189,7 +189,7 @@ int fgInitSubsystems( void ) { double cur_elev; fgFLIGHT *f; - struct fgLIGHT *l; + fgLIGHT *l; struct fgTIME *t; struct fgVIEW *v; @@ -369,6 +369,9 @@ int fgInitSubsystems( void ) { // $Log$ +// Revision 1.6 1998/04/26 05:10:03 curt +// "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +// // Revision 1.5 1998/04/25 22:06:30 curt // Edited cvs log messages in source files ... bad bad bad! // diff --git a/Main/views.cxx b/Main/views.cxx index b3b2754f3..bdaa8d031 100644 --- a/Main/views.cxx +++ b/Main/views.cxx @@ -101,8 +101,8 @@ void fgViewUpdate(fgFLIGHT *f, struct fgVIEW *v, fgLIGHT *l) { LOCAL[2][3] = 0.0; LOCAL[3][0] = LOCAL[3][1] = LOCAL[3][2] = LOCAL[3][3] = 0.0; LOCAL[3][3] = 1.0; - printf("LaRCsim LOCAL matrix\n"); - MAT3print(LOCAL, stdout); + // printf("LaRCsim LOCAL matrix\n"); + // MAT3print(LOCAL, stdout); #ifdef OLD_LOCAL_TO_BODY_CODE // old code to calculate LOCAL matrix calculated from Phi, @@ -127,8 +127,8 @@ void fgViewUpdate(fgFLIGHT *f, struct fgVIEW *v, fgLIGHT *l) { /* printf("Yaw matrix\n"); MAT3print(TMP, stdout); */ MAT3mult(LOCAL, R, TMP); - printf("FG derived LOCAL matrix\n"); - MAT3print(LOCAL, stdout); + // printf("FG derived LOCAL matrix\n"); + // MAT3print(LOCAL, stdout); #endif // OLD_LOCAL_TO_BODY_CODE // Derive the local UP transformation matrix based on *geodetic* @@ -200,6 +200,9 @@ void fgViewUpdate(fgFLIGHT *f, struct fgVIEW *v, fgLIGHT *l) { // $Log$ +// Revision 1.5 1998/04/26 05:10:04 curt +// "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +// // Revision 1.4 1998/04/25 22:04:53 curt // Use already calculated LaRCsim values to create the roll/pitch/yaw // transformation matrix (we call it LOCAL) diff --git a/Simulator/Todo b/Simulator/Todo index 8a76acbfc..abff3932e 100644 --- a/Simulator/Todo +++ b/Simulator/Todo @@ -2,6 +2,10 @@ | Todo -------------------------------------------------------------------------- +4/25/98 - Physically check if airport list overruns array size when loading. + +4/25/98 - Do a better job of translating scenery tiles towards (0,0,0) + 4/25/98 - Roll all of Time/sunpos.cxx into Astro/sun.cxx 4/25/98 - Overhaul view parameter generation ... see if we can piggy diff --git a/Time/light.cxx b/Time/light.cxx index d38e6f8c2..5177645ea 100644 --- a/Time/light.cxx +++ b/Time/light.cxx @@ -94,7 +94,7 @@ void fgLightInit( void ) { // update lighting parameters based on current sun position void fgLightUpdate( void ) { - struct fgLIGHT *l; + fgLIGHT *l; struct fgTIME *t; struct fgVIEW *v; /* if the 4th field is 0.0, this specifies a direction ... */ @@ -158,6 +158,9 @@ void fgLightUpdate( void ) { // $Log$ +// Revision 1.3 1998/04/26 05:10:04 curt +// "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +// // Revision 1.2 1998/04/24 00:52:30 curt // Wrapped "#include " in "#ifdef HAVE_CONFIG_H" // Fog color fixes. diff --git a/Time/sunpos.cxx b/Time/sunpos.cxx index 58ea77843..996764224 100644 --- a/Time/sunpos.cxx +++ b/Time/sunpos.cxx @@ -272,7 +272,7 @@ void fgSunPosition(time_t ssue, double *lon, double *lat) { // update the cur_time_params structure with the current sun position void fgUpdateSunPos( void ) { - struct fgLIGHT *l; + fgLIGHT *l; struct fgTIME *t; struct fgVIEW *v; MAT3vec nup, nsun, v0; @@ -346,6 +346,9 @@ void fgUpdateSunPos( void ) { // $Log$ +// Revision 1.5 1998/04/26 05:10:05 curt +// "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +// // Revision 1.4 1998/04/25 22:06:34 curt // Edited cvs log messages in source files ... bad bad bad! // -- 2.39.2