"struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd.
This commit is contained in:
parent
aa6f7608d7
commit
4a487175c9
10 changed files with 54 additions and 23 deletions
|
@ -143,7 +143,7 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
|
||||||
|
|
||||||
void fgPlanetsInit( void )
|
void fgPlanetsInit( void )
|
||||||
{
|
{
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
int i;
|
int i;
|
||||||
struct CelestialCoord pltPos;
|
struct CelestialCoord pltPos;
|
||||||
double magnitude;
|
double magnitude;
|
||||||
|
@ -210,9 +210,12 @@ void fgPlanetsRender( void ) {
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
/* $Log$
|
||||||
/* Revision 1.3 1998/04/25 22:06:25 curt
|
/* Revision 1.4 1998/04/26 05:10:01 curt
|
||||||
/* Edited cvs log messages in source files ... bad bad bad!
|
/* "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
|
* Revision 1.2 1998/04/24 00:45:02 curt
|
||||||
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
||||||
* Fixed a bug when generating sky colors.
|
* Fixed a bug when generating sky colors.
|
||||||
|
|
|
@ -113,7 +113,7 @@ void fgSkyVerticesInit( void ) {
|
||||||
|
|
||||||
/* (Re)calculate the sky colors at each vertex */
|
/* (Re)calculate the sky colors at each vertex */
|
||||||
void fgSkyColorsInit( void ) {
|
void fgSkyColorsInit( void ) {
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
float sun_angle, diff;
|
float sun_angle, diff;
|
||||||
float outer_param[3], outer_amt[3], outer_diff[3];
|
float outer_param[3], outer_amt[3], outer_diff[3];
|
||||||
float middle_param[3], middle_amt[3], middle_diff[3];
|
float middle_param[3], middle_amt[3], middle_diff[3];
|
||||||
|
@ -260,7 +260,7 @@ void fgSkyInit( void ) {
|
||||||
/* Draw the Sky */
|
/* Draw the Sky */
|
||||||
void fgSkyRender( void ) {
|
void fgSkyRender( void ) {
|
||||||
fgFLIGHT *f;
|
fgFLIGHT *f;
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
float /* inner_color[4], middle_color[4], diff, */ east_dot, dot, angle;
|
float /* inner_color[4], middle_color[4], diff, */ east_dot, dot, angle;
|
||||||
int i;
|
int i;
|
||||||
|
@ -373,9 +373,12 @@ void fgSkyRender( void ) {
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
/* $Log$
|
||||||
/* Revision 1.3 1998/04/25 22:06:25 curt
|
/* Revision 1.4 1998/04/26 05:10:01 curt
|
||||||
/* Edited cvs log messages in source files ... bad bad bad!
|
/* "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
|
* Revision 1.2 1998/04/24 00:45:03 curt
|
||||||
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
||||||
* Fixed a bug when generating sky colors.
|
* Fixed a bug when generating sky colors.
|
||||||
|
|
|
@ -224,7 +224,7 @@ int fgStarsInit( void ) {
|
||||||
void fgStarsRender( void ) {
|
void fgStarsRender( void ) {
|
||||||
fgFLIGHT *f;
|
fgFLIGHT *f;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgTIME *t;
|
struct fgTIME *t;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -260,9 +260,12 @@ void fgStarsRender( void ) {
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
/* $Log$
|
||||||
/* Revision 1.3 1998/04/25 22:06:26 curt
|
/* Revision 1.4 1998/04/26 05:10:02 curt
|
||||||
/* Edited cvs log messages in source files ... bad bad bad!
|
/* "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
|
* Revision 1.2 1998/04/24 00:45:03 curt
|
||||||
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
||||||
* Fixed a bug when generating sky colors.
|
* Fixed a bug when generating sky colors.
|
||||||
|
|
|
@ -104,7 +104,7 @@ struct CelestialCoord fgCalculateSun (struct OrbElements params,
|
||||||
|
|
||||||
/* Initialize the Sun */
|
/* Initialize the Sun */
|
||||||
void fgSunInit( void ) {
|
void fgSunInit( void ) {
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgTIME *t;
|
struct fgTIME *t;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
float xSun, ySun, zSun;
|
float xSun, ySun, zSun;
|
||||||
|
@ -192,9 +192,12 @@ void fgSunRender( void ) {
|
||||||
|
|
||||||
|
|
||||||
/* $Log$
|
/* $Log$
|
||||||
/* Revision 1.3 1998/04/25 22:06:26 curt
|
/* Revision 1.4 1998/04/26 05:10:02 curt
|
||||||
/* Edited cvs log messages in source files ... bad bad bad!
|
/* "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
|
* Revision 1.2 1998/04/24 00:45:04 curt
|
||||||
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
||||||
* Fixed a bug when generating sky colors.
|
* Fixed a bug when generating sky colors.
|
||||||
|
|
|
@ -183,7 +183,7 @@ const int DefaultViewMode = HUD_VIEW;
|
||||||
|
|
||||||
// fgInitVisuals() -- Initialize various GL/view parameters
|
// fgInitVisuals() -- Initialize various GL/view parameters
|
||||||
static void fgInitVisuals( void ) {
|
static void fgInitVisuals( void ) {
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgWEATHER *w;
|
struct fgWEATHER *w;
|
||||||
|
|
||||||
l = &cur_light_params;
|
l = &cur_light_params;
|
||||||
|
@ -213,7 +213,7 @@ static void fgInitVisuals( void ) {
|
||||||
// Update the view volume, position, and orientation
|
// Update the view volume, position, and orientation
|
||||||
static void fgUpdateViewParams( void ) {
|
static void fgUpdateViewParams( void ) {
|
||||||
fgFLIGHT *f;
|
fgFLIGHT *f;
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
// struct fgTIME *t;
|
// struct fgTIME *t;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
|
|
||||||
|
@ -316,7 +316,7 @@ static void fgUpdateInstrViewParams( void ) {
|
||||||
|
|
||||||
// Update all Visuals (redraws anything graphics related)
|
// Update all Visuals (redraws anything graphics related)
|
||||||
static void fgRenderFrame( void ) {
|
static void fgRenderFrame( void ) {
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
fgOPTIONS *o;
|
fgOPTIONS *o;
|
||||||
struct fgTIME *t;
|
struct fgTIME *t;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
|
@ -693,6 +693,9 @@ extern "C" {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $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
|
// Revision 1.6 1998/04/25 22:06:30 curt
|
||||||
// Edited cvs log messages in source files ... bad bad bad!
|
// Edited cvs log messages in source files ... bad bad bad!
|
||||||
//
|
//
|
||||||
|
|
|
@ -189,7 +189,7 @@ int fgInitSubsystems( void ) {
|
||||||
double cur_elev;
|
double cur_elev;
|
||||||
|
|
||||||
fgFLIGHT *f;
|
fgFLIGHT *f;
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgTIME *t;
|
struct fgTIME *t;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
|
|
||||||
|
@ -369,6 +369,9 @@ int fgInitSubsystems( void ) {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $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
|
// Revision 1.5 1998/04/25 22:06:30 curt
|
||||||
// Edited cvs log messages in source files ... bad bad bad!
|
// Edited cvs log messages in source files ... bad bad bad!
|
||||||
//
|
//
|
||||||
|
|
|
@ -101,8 +101,8 @@ void fgViewUpdate(fgFLIGHT *f, struct fgVIEW *v, fgLIGHT *l) {
|
||||||
LOCAL[2][3] = 0.0;
|
LOCAL[2][3] = 0.0;
|
||||||
LOCAL[3][0] = LOCAL[3][1] = LOCAL[3][2] = LOCAL[3][3] = 0.0;
|
LOCAL[3][0] = LOCAL[3][1] = LOCAL[3][2] = LOCAL[3][3] = 0.0;
|
||||||
LOCAL[3][3] = 1.0;
|
LOCAL[3][3] = 1.0;
|
||||||
printf("LaRCsim LOCAL matrix\n");
|
// printf("LaRCsim LOCAL matrix\n");
|
||||||
MAT3print(LOCAL, stdout);
|
// MAT3print(LOCAL, stdout);
|
||||||
|
|
||||||
#ifdef OLD_LOCAL_TO_BODY_CODE
|
#ifdef OLD_LOCAL_TO_BODY_CODE
|
||||||
// old code to calculate LOCAL matrix calculated from Phi,
|
// 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");
|
/* printf("Yaw matrix\n");
|
||||||
MAT3print(TMP, stdout); */
|
MAT3print(TMP, stdout); */
|
||||||
MAT3mult(LOCAL, R, TMP);
|
MAT3mult(LOCAL, R, TMP);
|
||||||
printf("FG derived LOCAL matrix\n");
|
// printf("FG derived LOCAL matrix\n");
|
||||||
MAT3print(LOCAL, stdout);
|
// MAT3print(LOCAL, stdout);
|
||||||
#endif // OLD_LOCAL_TO_BODY_CODE
|
#endif // OLD_LOCAL_TO_BODY_CODE
|
||||||
|
|
||||||
// Derive the local UP transformation matrix based on *geodetic*
|
// Derive the local UP transformation matrix based on *geodetic*
|
||||||
|
@ -200,6 +200,9 @@ void fgViewUpdate(fgFLIGHT *f, struct fgVIEW *v, fgLIGHT *l) {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $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
|
// Revision 1.4 1998/04/25 22:04:53 curt
|
||||||
// Use already calculated LaRCsim values to create the roll/pitch/yaw
|
// Use already calculated LaRCsim values to create the roll/pitch/yaw
|
||||||
// transformation matrix (we call it LOCAL)
|
// transformation matrix (we call it LOCAL)
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
| Todo
|
| 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 - Roll all of Time/sunpos.cxx into Astro/sun.cxx
|
||||||
|
|
||||||
4/25/98 - Overhaul view parameter generation ... see if we can piggy
|
4/25/98 - Overhaul view parameter generation ... see if we can piggy
|
||||||
|
|
|
@ -94,7 +94,7 @@ void fgLightInit( void ) {
|
||||||
|
|
||||||
// update lighting parameters based on current sun position
|
// update lighting parameters based on current sun position
|
||||||
void fgLightUpdate( void ) {
|
void fgLightUpdate( void ) {
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgTIME *t;
|
struct fgTIME *t;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
/* if the 4th field is 0.0, this specifies a direction ... */
|
/* if the 4th field is 0.0, this specifies a direction ... */
|
||||||
|
@ -158,6 +158,9 @@ void fgLightUpdate( void ) {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $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
|
// Revision 1.2 1998/04/24 00:52:30 curt
|
||||||
// Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
// Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
|
||||||
// Fog color fixes.
|
// Fog color fixes.
|
||||||
|
|
|
@ -272,7 +272,7 @@ void fgSunPosition(time_t ssue, double *lon, double *lat) {
|
||||||
|
|
||||||
// update the cur_time_params structure with the current sun position
|
// update the cur_time_params structure with the current sun position
|
||||||
void fgUpdateSunPos( void ) {
|
void fgUpdateSunPos( void ) {
|
||||||
struct fgLIGHT *l;
|
fgLIGHT *l;
|
||||||
struct fgTIME *t;
|
struct fgTIME *t;
|
||||||
struct fgVIEW *v;
|
struct fgVIEW *v;
|
||||||
MAT3vec nup, nsun, v0;
|
MAT3vec nup, nsun, v0;
|
||||||
|
@ -346,6 +346,9 @@ void fgUpdateSunPos( void ) {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $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
|
// Revision 1.4 1998/04/25 22:06:34 curt
|
||||||
// Edited cvs log messages in source files ... bad bad bad!
|
// Edited cvs log messages in source files ... bad bad bad!
|
||||||
//
|
//
|
||||||
|
|
Loading…
Add table
Reference in a new issue