From b6b503a1907f942a0c12187c5d5329204c125b23 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 19 Jan 1998 18:40:15 +0000 Subject: [PATCH] Tons of little changes to clean up the code and to remove fatal errors when building with the c++ compiler. --- Astro/depend | 11 +++++++++++ Astro/moon.c | 12 ++++++++---- Astro/moon.h | 12 ++++++++---- Astro/sky.c | 16 ++++++++++------ Astro/sky.h | 14 +++++++++----- Astro/stars.c | 12 ++++++++---- Astro/stars.h | 12 ++++++++---- Astro/sun.c | 12 ++++++++---- Astro/sun.h | 12 ++++++++---- 9 files changed, 78 insertions(+), 35 deletions(-) diff --git a/Astro/depend b/Astro/depend index f73a2539..223726e3 100644 --- a/Astro/depend +++ b/Astro/depend @@ -8,6 +8,17 @@ moon.o: moon.c ../XGL/xgl.h orbits.h ../Time/fg_time.h \ ../Include/general.h ../Main/views.h ../Main/../Include/types.h \ ../Main/../Flight/flight.h ../Main/../Math/mat3.h \ ../Main/../Time/fg_time.h +old_astro.o: old_astro.c ../XGL/xgl.h old_astro.h stars.h moon.h \ + orbits.h ../Time/fg_time.h ../Time/../Include/types.h \ + ../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \ + ../Time/../Flight/LaRCsim/ls_interface.h \ + ../Time/../Flight/LaRCsim/../flight.h planets.h sun.h \ + ../Include/constants.h ../Include/general.h ../Main/views.h \ + ../Main/../Include/types.h ../Main/../Flight/flight.h \ + ../Main/../Math/mat3.h ../Main/../Time/fg_time.h \ + ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \ + ../Aircraft/../Controls/controls.h \ + ../Aircraft/../Controls/../Include/limits.h orbits.o: orbits.c orbits.h ../Time/fg_time.h \ ../Time/../Include/types.h ../Time/../Flight/flight.h \ ../Time/../Flight/Slew/slew.h \ diff --git a/Astro/moon.c b/Astro/moon.c index aa99c92d..227743e9 100644 --- a/Astro/moon.c +++ b/Astro/moon.c @@ -257,7 +257,7 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params, } -void fgMoonInit() { +void fgMoonInit( void ) { struct fgLIGHT *l; static int dl_exists = 0; @@ -298,7 +298,7 @@ void fgMoonInit() { /* Draw the moon */ -void fgMoonRender() { +void fgMoonRender( void ) { struct fgLIGHT *l; GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 }; @@ -320,9 +320,13 @@ void fgMoonRender() { /* $Log$ -/* Revision 1.1 1998/01/07 03:16:16 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:16 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:16 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.16 1998/01/06 01:20:24 curt * Tweaks to help building with MSVC++ * diff --git a/Astro/moon.h b/Astro/moon.h index c4d21ed2..90a94f98 100644 --- a/Astro/moon.h +++ b/Astro/moon.h @@ -36,10 +36,10 @@ /* Initialize the Moon Display management Subsystem */ -void fgMoonInit(); +void fgMoonInit( void ); /* Draw the Stars */ -void fgMoonRender(); +void fgMoonRender( void ); struct CelestialCoord fgCalculateMoon(struct OrbElements Params, struct OrbElements sunParams, @@ -51,9 +51,13 @@ extern struct OrbElements pltOrbElements[9]; /* $Log$ -/* Revision 1.1 1998/01/07 03:16:16 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:17 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:16 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.4 1997/12/11 04:43:56 curt * Fixed sun vector and lighting problems. I thing the moon is now lit * correctly. diff --git a/Astro/sky.c b/Astro/sky.c index 4de37c73..a7a7b098 100644 --- a/Astro/sky.c +++ b/Astro/sky.c @@ -72,7 +72,7 @@ static float outer_color[12][4]; /* Calculate the sky structure vertices */ -void fgSkyVerticesInit() { +void fgSkyVerticesInit( void ) { float theta; int i; @@ -101,7 +101,7 @@ void fgSkyVerticesInit() { /* (Re)calculate the sky colors at each vertex */ -void fgSkyColorsInit() { +void fgSkyColorsInit( void ) { struct fgLIGHT *l; float sun_angle, diff; float outer_param[3], outer_amt[3], outer_diff[3]; @@ -224,7 +224,7 @@ void fgSkyColorsInit() { /* Initialize the sky structure and colors */ -void fgSkyInit() { +void fgSkyInit( void ) { printf("Initializing the sky\n"); fgSkyVerticesInit(); @@ -236,7 +236,7 @@ void fgSkyInit() { /* Draw the Sky */ -void fgSkyRender() { +void fgSkyRender( void ) { struct fgFLIGHT *f; struct fgLIGHT *l; struct fgVIEW *v; @@ -329,9 +329,13 @@ void fgSkyRender() { /* $Log$ -/* Revision 1.1 1998/01/07 03:16:19 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:17 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:19 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.11 1997/12/30 22:22:38 curt * Further integration of event manager. * diff --git a/Astro/sky.h b/Astro/sky.h index 7ba4863e..0479a4b9 100644 --- a/Astro/sky.h +++ b/Astro/sky.h @@ -25,19 +25,23 @@ /* (Re)generate the display list */ -void fgSkyInit(); +void fgSkyInit( void ); /* (Re)calculate the sky colors at each vertex */ -void fgSkyColorsInit(); +void fgSkyColorsInit( void ); /* Draw the Sky */ -void fgSkyRender(); +void fgSkyRender( void ); /* $Log$ -/* Revision 1.1 1998/01/07 03:16:19 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:17 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:19 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.2 1997/12/22 23:45:49 curt * First stab at sunset/sunrise sky glow effects. * diff --git a/Astro/stars.c b/Astro/stars.c index 6d3d4a53..711a9a06 100644 --- a/Astro/stars.c +++ b/Astro/stars.c @@ -56,7 +56,7 @@ /* Initialize the Star Management Subsystem */ -void fgStarsInit() { +void fgStarsInit( void ) { FILE *fd; struct fgGENERAL *g; struct CelestialCoord pltPos; @@ -237,7 +237,7 @@ void fgStarsInit() { /* Draw the Stars */ -void fgStarsRender() { +void fgStarsRender( void ) { struct fgFLIGHT *f; struct fgVIEW *v; struct fgLIGHT *l; @@ -276,9 +276,13 @@ void fgStarsRender() { /* $Log$ -/* Revision 1.1 1998/01/07 03:16:20 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:18 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:20 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.24 1997/12/30 22:22:39 curt * Further integration of event manager. * diff --git a/Astro/stars.h b/Astro/stars.h index 19524e12..b08ffda9 100644 --- a/Astro/stars.h +++ b/Astro/stars.h @@ -33,10 +33,10 @@ #define FG_MIN_STAR_MAG 0.738750 /* magnitude of weakest star we'll display */ /* Initialize the Star Management Subsystem */ -void fgStarsInit(); +void fgStarsInit( void ); /* Draw the Stars */ -void fgStarsRender(); +void fgStarsRender( void ); extern struct OrbElements pltOrbElements[9]; extern struct fgTIME cur_time_params; @@ -44,9 +44,13 @@ extern struct fgTIME cur_time_params; /* $Log$ -/* Revision 1.1 1998/01/07 03:16:20 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:18 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:20 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.6 1997/10/25 03:18:29 curt * Incorporated sun, moon, and planet position and rendering code contributed * by Durk Talsma. diff --git a/Astro/sun.c b/Astro/sun.c index 43e2c353..2c89ae3c 100644 --- a/Astro/sun.c +++ b/Astro/sun.c @@ -94,7 +94,7 @@ struct CelestialCoord fgCalculateSun(struct OrbElements params, struct fgTIME t) /* Initialize the Sun */ -void fgSunInit() { +void fgSunInit( void ) { static int dl_exists = 0; printf(" Initializing the Sun\n"); @@ -126,7 +126,7 @@ void fgSunInit() { /* Draw the Sun */ -void fgSunRender() { +void fgSunRender( void ) { struct fgVIEW *v; struct fgTIME *t; struct fgLIGHT *l; @@ -190,9 +190,13 @@ void fgSunRender() { /* $Log$ -/* Revision 1.1 1998/01/07 03:16:20 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:18 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:20 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.12 1998/01/05 18:44:36 curt * Add an option to advance/decrease time from keyboard. * diff --git a/Astro/sun.h b/Astro/sun.h index 260101f7..9683462c 100644 --- a/Astro/sun.h +++ b/Astro/sun.h @@ -31,19 +31,23 @@ struct SunPos fgCalcSunPos(struct OrbElements sunParams); extern struct OrbElements pltOrbElements[9]; /* Initialize the Sun */ -void fgSunInit(); +void fgSunInit( void ); /* Draw the Sun */ -void fgSunRender(); +void fgSunRender( void ); #endif /* SUN_H */ /* $Log$ -/* Revision 1.1 1998/01/07 03:16:21 curt -/* Moved from .../Src/Scenery/ to .../Src/Astro/ +/* Revision 1.2 1998/01/19 18:40:19 curt +/* Tons of little changes to clean up the code and to remove fatal errors +/* when building with the c++ compiler. /* + * Revision 1.1 1998/01/07 03:16:21 curt + * Moved from .../Src/Scenery/ to .../Src/Astro/ + * * Revision 1.3 1997/12/11 04:43:56 curt * Fixed sun vector and lighting problems. I thing the moon is now lit * correctly. -- 2.39.5