fly/flightgear
1
0
Fork 0
Code Activity

Minor tweaks.

Browse source
This commit is contained in:
curt 1997-07-21 14:45:01 +00:00
parent a136c87441
commit f8c740ee35
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Main/GLmain.c
View file

@ -135,7 +135,7 @@ static void fgUpdateViewParams() {
/* Tell GL we are about to modify the projection parameters */ /* Tell GL we are about to modify the projection parameters */
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
gluPerspective(45.0, 1.0/win_ratio, 0.1, 200000.0); gluPerspective(45.0, 1.0/win_ratio, 0.001, 2000.0);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
@ -183,7 +183,7 @@ static void fgUpdateViewParams() {
printf("View pos = %.4f, %.4f, %.4f\n", view_pos.y, view_pos.z, printf("View pos = %.4f, %.4f, %.4f\n", view_pos.y, view_pos.z,
FG_Altitude * FEET_TO_METER); FG_Altitude * FEET_TO_METER);
gluLookAt(view_pos.y, view_pos.z, FG_Altitude*FEET_TO_METER * 0.0011, gluLookAt(view_pos.y, view_pos.z, FG_Altitude*FEET_TO_METER * 0.001,
view_pos.y + fwrd_view[0], view_pos.z + fwrd_view[1], view_pos.y + fwrd_view[0], view_pos.z + fwrd_view[1],
FG_Altitude*FEET_TO_METER * 0.001 + fwrd_view[2], FG_Altitude*FEET_TO_METER * 0.001 + fwrd_view[2],
up[0], up[1], up[2]); up[0], up[1], up[2]);
@ -390,10 +390,10 @@ static void fgMainLoop( void ) {
* eventually */ * eventually */
rough_elev = mesh_altitude(FG_Longitude * RAD_TO_ARCSEC, rough_elev = mesh_altitude(FG_Longitude * RAD_TO_ARCSEC,
FG_Latitude * RAD_TO_ARCSEC); FG_Latitude * RAD_TO_ARCSEC);
printf("Ground elevation is about %.2f meters here.\n", rough_elev); printf("Ground elevation is %.2f meters here.\n", rough_elev);
/* FG_Runway_altitude = rough_elev * METER_TO_FEET; */ /* FG_Runway_altitude = rough_elev * METER_TO_FEET; */
if ( FG_Altitude * FEET_TO_METER < rough_elev ) { if ( FG_Altitude * FEET_TO_METER < rough_elev + 3.758099) {
/* set this here, otherwise if we set runway height above our /* set this here, otherwise if we set runway height above our
current height we get a really nasty bounce. */ current height we get a really nasty bounce. */
FG_Runway_altitude = FG_Altitude - 3.758099; FG_Runway_altitude = FG_Altitude - 3.758099;
@ -621,9 +621,12 @@ int printf (const char *format, ...) {
/* $Log$ /* $Log$
/* Revision 1.38 1997/07/19 23:04:47 curt /* Revision 1.39 1997/07/21 14:45:01 curt
/* Added an initial weather section. /* Minor tweaks.
/* /*
* Revision 1.38 1997/07/19 23:04:47 curt
* Added an initial weather section.
*
* Revision 1.37 1997/07/19 22:34:02 curt * Revision 1.37 1997/07/19 22:34:02 curt
* Moved PI definitions to ../constants.h * Moved PI definitions to ../constants.h
* Moved random() stuff to ../Utils/ and renamed fg_random() * Moved random() stuff to ../Utils/ and renamed fg_random()

15
Main/mesh2GL.c
View file

@ -43,8 +43,8 @@
void mesh_make_test_object(double lon, double lat) { void mesh_make_test_object(double lon, double lat) {
struct fgCartesianPoint origin; struct fgCartesianPoint origin;
double elev; double elev;
double b = 0.25; double b = 0.01;
double h = 0.50; double h = 0.05;
static GLfloat color[4] = { 1.0, 0.25, 0.25, 1.0 }; static GLfloat color[4] = { 1.0, 0.25, 0.25, 1.0 };
glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color ); glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color );
@ -185,7 +185,7 @@ GLint mesh2GL(struct mesh *m) {
} }
*/ */
for ( i = 0; i < 200; i++ ) { for ( i = 0; i < 400; i++ ) {
randx = fg_random() * 3600.0; randx = fg_random() * 3600.0;
randy = fg_random() * 3600.0; randy = fg_random() * 3600.0;
@ -200,10 +200,13 @@ GLint mesh2GL(struct mesh *m) {
/* $Log$ /* $Log$
/* Revision 1.37 1997/07/19 22:34:03 curt /* Revision 1.38 1997/07/21 14:45:02 curt
/* Moved PI definitions to ../constants.h /* Minor tweaks.
/* Moved random() stuff to ../Utils/ and renamed fg_random()
/* /*
* Revision 1.37 1997/07/19 22:34:03 curt
* Moved PI definitions to ../constants.h
* Moved random() stuff to ../Utils/ and renamed fg_random()
*
* Revision 1.36 1997/07/18 23:41:25 curt * Revision 1.36 1997/07/18 23:41:25 curt
* Tweaks for building with Cygnus Win32 compiler. * Tweaks for building with Cygnus Win32 compiler.
* *

9
Simulator/constants.h
View file

@ -62,7 +62,7 @@
#define ARCSEC_TO_RAD 4.84813681109535993589e-06 #define ARCSEC_TO_RAD 4.84813681109535993589e-06
/* Radians to arc seconds */ /* (rad*3600*180)/pi = arcsec */ /* Radians to arc seconds */ /* (rad*3600*180)/pi = arcsec */
#define RAD_TO_ARCSEC 2035752.03952618601852 #define RAD_TO_ARCSEC 206264.806247096355156
/* Feet to Meters */ /* Feet to Meters */
#define FEET_TO_METER 0.3048 #define FEET_TO_METER 0.3048
@ -79,9 +79,12 @@
/* $Log$ /* $Log$
/* Revision 1.5 1997/07/19 23:04:46 curt /* Revision 1.6 1997/07/21 14:45:01 curt
/* Added an initial weather section. /* Minor tweaks.
/* /*
* Revision 1.5 1997/07/19 23:04:46 curt
* Added an initial weather section.
*
* Revision 1.4 1997/07/19 22:37:03 curt * Revision 1.4 1997/07/19 22:37:03 curt
* Added various PI definitions. * Added various PI definitions.
* *