From e9ee8471a9c6de4a3fcffbff13c7506e26e5be33 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 28 Apr 1998 01:18:59 +0000 Subject: [PATCH] Type-ified fgTIME and fgVIEW --- Astro/moon.cxx | 9 ++++++--- Astro/moon.hxx | 11 +++++++---- Astro/orbits.cxx | 13 ++++++++----- Astro/orbits.hxx | 15 +++++++++------ Astro/planets.cxx | 9 ++++++--- Astro/planets.hxx | 11 +++++++---- Astro/sky.cxx | 9 ++++++--- Astro/stars.cxx | 11 +++++++---- Astro/stars.hxx | 10 +++++++--- Astro/sun.cxx | 13 ++++++++----- 10 files changed, 71 insertions(+), 40 deletions(-) diff --git a/Astro/moon.cxx b/Astro/moon.cxx index 04b358e1..c774b3ee 100644 --- a/Astro/moon.cxx +++ b/Astro/moon.cxx @@ -57,7 +57,7 @@ static GLint moon = 0; ----------------------------------------------------------------*/ struct CelestialCoord fgCalculateMoon(struct OrbElements params, struct OrbElements sunParams, - struct fgTIME t) + fgTIME t) { struct CelestialCoord geocCoord, topocCoord; @@ -216,9 +216,12 @@ void fgMoonRender( void ) { /* $Log$ -/* Revision 1.3 1998/04/25 22:06:24 curt -/* Edited cvs log messages in source files ... bad bad bad! +/* Revision 1.4 1998/04/28 01:18:59 curt +/* Type-ified fgTIME and fgVIEW /* + * Revision 1.3 1998/04/25 22:06:24 curt + * Edited cvs log messages in source files ... bad bad bad! + * * Revision 1.2 1998/04/24 00:45:00 curt * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" * Fixed a bug when generating sky colors. diff --git a/Astro/moon.hxx b/Astro/moon.hxx index 22e665a5..af635ce9 100644 --- a/Astro/moon.hxx +++ b/Astro/moon.hxx @@ -46,7 +46,7 @@ void fgMoonRender( void ); struct CelestialCoord fgCalculateMoon(struct OrbElements Params, struct OrbElements sunParams, - struct fgTIME t); + fgTIME t); extern struct OrbElements pltOrbElements[9]; @@ -55,10 +55,13 @@ extern struct OrbElements pltOrbElements[9]; /* $Log$ -/* Revision 1.2 1998/04/24 00:45:00 curt -/* Wrapped "#include " in "#ifdef HAVE_CONFIG_H" -/* Fixed a bug when generating sky colors. +/* Revision 1.3 1998/04/28 01:19:00 curt +/* Type-ified fgTIME and fgVIEW /* + * Revision 1.2 1998/04/24 00:45:00 curt + * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" + * Fixed a bug when generating sky colors. + * * Revision 1.1 1998/04/22 13:21:28 curt * C++ - ifing the code a bit. * diff --git a/Astro/orbits.cxx b/Astro/orbits.cxx index a865f058..df8f94d0 100644 --- a/Astro/orbits.cxx +++ b/Astro/orbits.cxx @@ -41,7 +41,7 @@ struct OrbElements pltOrbElements[9]; -double fgCalcActTime(struct fgTIME t) +double fgCalcActTime(fgTIME t) { return (t.mjd - 36523.5); } @@ -111,7 +111,7 @@ int fgReadOrbElements(struct OrbElements *dest, FILE *src) } -int fgSolarSystemInit(struct fgTIME t) +int fgSolarSystemInit(fgTIME t) { fgGENERAL *g; char path[80]; @@ -152,7 +152,7 @@ int fgSolarSystemInit(struct fgTIME t) } -void fgSolarSystemUpdate(struct OrbElements *planet, struct fgTIME t) +void fgSolarSystemUpdate(struct OrbElements *planet, fgTIME t) { double actTime; @@ -170,9 +170,12 @@ void fgSolarSystemUpdate(struct OrbElements *planet, struct fgTIME t) /* $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/28 01:19:00 curt +/* Type-ified fgTIME and fgVIEW /* + * 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:01 curt * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" * Fixed a bug when generating sky colors. diff --git a/Astro/orbits.hxx b/Astro/orbits.hxx index d0cd4a98..1d8e8705 100644 --- a/Astro/orbits.hxx +++ b/Astro/orbits.hxx @@ -77,21 +77,24 @@ struct CelestialCoord { double fgCalcEccAnom(double M, double e); -double fgCalcActTime(struct fgTIME t); +double fgCalcActTime(fgTIME t); int fgReadOrbElements (struct OrbElements *dest, FILE * src); -int fgSolarSystemInit(struct fgTIME t); -void fgSolarSystemUpdate(struct OrbElements *planets, struct fgTIME t); +int fgSolarSystemInit(fgTIME t); +void fgSolarSystemUpdate(struct OrbElements *planets, fgTIME t); #endif /* _ORBITS_HXX */ /* $Log$ -/* Revision 1.2 1998/04/24 00:45:01 curt -/* Wrapped "#include " in "#ifdef HAVE_CONFIG_H" -/* Fixed a bug when generating sky colors. +/* Revision 1.3 1998/04/28 01:19:01 curt +/* Type-ified fgTIME and fgVIEW /* + * Revision 1.2 1998/04/24 00:45:01 curt + * Wrapped "#include " in "#ifdef HAVE_CONFIG_H" + * Fixed a bug when generating sky colors. + * * Revision 1.1 1998/04/22 13:21:30 curt * C++ - ifing the code a bit. * diff --git a/Astro/planets.cxx b/Astro/planets.cxx index 890c1295..f4ef433e 100644 --- a/Astro/planets.cxx +++ b/Astro/planets.cxx @@ -47,7 +47,7 @@ GLint planets = 0; struct CelestialCoord fgCalculatePlanet(struct OrbElements planet, struct OrbElements theSun, - struct fgTIME t, int idx) + fgTIME t, int idx) { struct CelestialCoord result; @@ -210,9 +210,12 @@ void fgPlanetsRender( void ) { /* $Log$ -/* Revision 1.4 1998/04/26 05:10:01 curt -/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +/* Revision 1.5 1998/04/28 01:19:01 curt +/* Type-ified fgTIME and fgVIEW /* + * 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! * diff --git a/Astro/planets.hxx b/Astro/planets.hxx index b83a270b..9076b0ff 100644 --- a/Astro/planets.hxx +++ b/Astro/planets.hxx @@ -33,8 +33,8 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet, - struct OrbElements theSun, - struct fgTIME t, int idx); + struct OrbElements theSun, + fgTIME t, int idx); void fgPlanetsInit( void ); @@ -45,9 +45,12 @@ void fgPlanetsRender( void ); /* $Log$ -/* Revision 1.1 1998/04/22 13:21:32 curt -/* C++ - ifing the code a bit. +/* Revision 1.2 1998/04/28 01:19:02 curt +/* Type-ified fgTIME and fgVIEW /* + * Revision 1.1 1998/04/22 13:21:32 curt + * C++ - ifing the code a bit. + * * Revision 1.5 1998/04/21 17:02:31 curt * Prepairing for C++ integration. * diff --git a/Astro/sky.cxx b/Astro/sky.cxx index 4f9e219b..caedbf73 100644 --- a/Astro/sky.cxx +++ b/Astro/sky.cxx @@ -261,7 +261,7 @@ void fgSkyInit( void ) { void fgSkyRender( void ) { fgFLIGHT *f; fgLIGHT *l; - struct fgVIEW *v; + 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.4 1998/04/26 05:10:01 curt -/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +/* Revision 1.5 1998/04/28 01:19:02 curt +/* Type-ified fgTIME and fgVIEW /* + * 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! * diff --git a/Astro/stars.cxx b/Astro/stars.cxx index 11de4126..a7ba50f3 100644 --- a/Astro/stars.cxx +++ b/Astro/stars.cxx @@ -223,9 +223,9 @@ int fgStarsInit( void ) { /* Draw the Stars */ void fgStarsRender( void ) { fgFLIGHT *f; - struct fgVIEW *v; + fgVIEW *v; fgLIGHT *l; - struct fgTIME *t; + fgTIME *t; int i; f = current_aircraft.flight; @@ -260,9 +260,12 @@ void fgStarsRender( void ) { /* $Log$ -/* Revision 1.4 1998/04/26 05:10:02 curt -/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +/* Revision 1.5 1998/04/28 01:19:03 curt +/* Type-ified fgTIME and fgVIEW /* + * 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! * diff --git a/Astro/stars.hxx b/Astro/stars.hxx index e38d8f01..678e2d8f 100644 --- a/Astro/stars.hxx +++ b/Astro/stars.hxx @@ -42,17 +42,21 @@ int fgStarsInit( void ); /* Draw the Stars */ void fgStarsRender( void ); + extern struct OrbElements pltOrbElements[9]; -extern struct fgTIME cur_time_params; +extern fgTIME cur_time_params; #endif /* _STARS_HXX */ /* $Log$ -/* Revision 1.1 1998/04/22 13:21:35 curt -/* C++ - ifing the code a bit. +/* Revision 1.2 1998/04/28 01:19:03 curt +/* Type-ified fgTIME and fgVIEW /* + * Revision 1.1 1998/04/22 13:21:35 curt + * C++ - ifing the code a bit. + * * Revision 1.5 1998/04/21 17:02:33 curt * Prepairing for C++ integration. * diff --git a/Astro/sun.cxx b/Astro/sun.cxx index 6b9b85e4..f802b768 100644 --- a/Astro/sun.cxx +++ b/Astro/sun.cxx @@ -76,7 +76,7 @@ void fgCalcSunPos(struct OrbElements params) struct CelestialCoord fgCalculateSun (struct OrbElements params, - struct fgTIME t) + fgTIME t) { struct CelestialCoord result; double xe, ye, ze, ecl, actTime; @@ -105,8 +105,8 @@ struct CelestialCoord fgCalculateSun (struct OrbElements params, /* Initialize the Sun */ void fgSunInit( void ) { fgLIGHT *l; - struct fgTIME *t; - struct fgVIEW *v; + fgTIME *t; + fgVIEW *v; float xSun, ySun, zSun; /* GLfloat color[4] = { 1.00, 1.00, 1.00, 1.00 }; */ @@ -192,9 +192,12 @@ void fgSunRender( void ) { /* $Log$ -/* Revision 1.4 1998/04/26 05:10:02 curt -/* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. +/* Revision 1.5 1998/04/28 01:19:04 curt +/* Type-ified fgTIME and fgVIEW /* + * 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! * -- 2.39.5