FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tons of little changes to clean up the code and to remove fatal errors

Browse Source 
when building with the c++ compiler.
This commit is contained in:
curt
2009-09-15 18:31:28 +02:00
committed by Tim Moore
parent fdda5da598
commit b6b503a190
9 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Astro/depend
+11
View File
@@ -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 \
Astro/moon.c
+8 -4
View File
@@ -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++
*
Astro/moon.h
+8 -4
View File
@@ -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.
Astro/sky.c
+10 -6
View File
@@ -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.
*
Astro/sky.h
+9 -5
View File
@@ -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.
*
Astro/stars.c
+8 -4
View File
@@ -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.
*
Astro/stars.h
+8 -4
View File
@@ -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.
Astro/sun.c
+8 -4
View File
@@ -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.
*
Astro/sun.h
+8 -4
View File
@@ -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.