fly/flightgear
1
0
Fork 0
Code Activity

minor tweaks.

Browse source
This commit is contained in:
curt 1997-11-15 18:16:34 +00:00
parent 91aef7cb1c
commit b1cf1fcee0
4 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Main/GLUTmain.c
View file

@ -108,7 +108,7 @@ static void fgInitVisuals() {
glEnable( GL_DEPTH_TEST ); glEnable( GL_DEPTH_TEST );
/* glFrontFace(GL_CW); */ /* glFrontFace(GL_CW); */
glEnable( GL_CULL_FACE ); /* glEnable( GL_CULL_FACE ); */
/* If enabled, normal vectors specified with glNormal are scaled /* If enabled, normal vectors specified with glNormal are scaled
to unit length after transformation. See glNormal. */ to unit length after transformation. See glNormal. */
@ -143,8 +143,7 @@ static void fgUpdateViewParams() {
struct VIEW *v; struct VIEW *v;
double x_2, x_4, x_8, x_10; double x_2, x_4, x_8, x_10;
double ambient, diffuse, sky; double ambient, diffuse, sky;
/* GLfloat color[4] = { 1.0, 1.0, 0.50, 1.0 };*/ GLfloat color[4] = { 1.0, 1.0, 0.50, 1.0 };
GLfloat color[4] = { 1.0, 0.0, 0.00, 1.0 };
GLfloat amb[3], diff[3], fog[4], clear[4]; GLfloat amb[3], diff[3], fog[4], clear[4];
f = &current_aircraft.flight; f = &current_aircraft.flight;
@ -578,9 +577,12 @@ int main( int argc, char *argv[] ) {
/* $Log$ /* $Log$
/* Revision 1.22 1997/10/30 12:38:41 curt /* Revision 1.23 1997/11/15 18:16:34 curt
/* Working on new scenery subsystem. /* minor tweaks.
/* /*
* Revision 1.22 1997/10/30 12:38:41 curt
* Working on new scenery subsystem.
*
* Revision 1.21 1997/09/23 00:29:38 curt * Revision 1.21 1997/09/23 00:29:38 curt
* Tweaks to get things to compile with gcc-win32. * Tweaks to get things to compile with gcc-win32.
* *

9
Main/fg_init.c
View file

@ -101,7 +101,7 @@ void fgInitSubsystems( void ) {
FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD; FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD;
FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD; FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD;
FG_Altitude = FG_Runway_altitude + 3.758099; FG_Altitude = FG_Runway_altitude + 3.758099;
FG_Altitude = 20000; FG_Altitude = 10000;
/* Initial Position north of the city of Globe */ /* Initial Position north of the city of Globe */
/* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */ /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
@ -224,9 +224,12 @@ void fgInitSubsystems( void ) {
/* $Log$ /* $Log$
/* Revision 1.11 1997/10/30 12:38:42 curt /* Revision 1.12 1997/11/15 18:16:35 curt
/* Working on new scenery subsystem. /* minor tweaks.
/* /*
* Revision 1.11 1997/10/30 12:38:42 curt
* Working on new scenery subsystem.
*
* Revision 1.10 1997/10/25 03:24:23 curt * Revision 1.10 1997/10/25 03:24:23 curt
* Incorporated sun, moon, and star positioning code contributed by Durk Talsma. * Incorporated sun, moon, and star positioning code contributed by Durk Talsma.
* *

24
Scenery/obj.c
View file

@ -144,7 +144,6 @@ GLint fgObjLoad(char *path) {
glVertex3d(nodes[n1][0] - ref.x, nodes[n1][1] - ref.y, glVertex3d(nodes[n1][0] - ref.x, nodes[n1][1] - ref.y,
nodes[n1][2] - ref.z); nodes[n1][2] - ref.z);
if ( dot_prod > 0 ) {
glNormal3d(normals[n2][0], normals[n2][1], normals[n2][2]); glNormal3d(normals[n2][0], normals[n2][1], normals[n2][2]);
glVertex3d(nodes[n2][0] - ref.x, nodes[n2][1] - ref.y, glVertex3d(nodes[n2][0] - ref.x, nodes[n2][1] - ref.y,
nodes[n2][2] - ref.z); nodes[n2][2] - ref.z);
@ -152,16 +151,6 @@ GLint fgObjLoad(char *path) {
glNormal3d(normals[n3][0], normals[n3][1], normals[n3][2]); glNormal3d(normals[n3][0], normals[n3][1], normals[n3][2]);
glVertex3d(nodes[n3][0] - ref.x, nodes[n3][1] - ref.y, glVertex3d(nodes[n3][0] - ref.x, nodes[n3][1] - ref.y,
nodes[n3][2] - ref.z); nodes[n3][2] - ref.z);
} else {
printf("Reversing\n");
glNormal3d(normals[n3][0], normals[n3][1], normals[n3][2]);
glVertex3d(nodes[n3][0] - ref.x, nodes[n3][1] - ref.y,
nodes[n3][2] - ref.z);
glNormal3d(normals[n2][0], normals[n2][1], normals[n2][2]);
glVertex3d(nodes[n2][0] - ref.x, nodes[n2][1] - ref.y,
nodes[n2][2] - ref.z);
}
if ( n4 > 0 ) { if ( n4 > 0 ) {
glNormal3d(normals[n4][0], normals[n4][1], normals[n4][2]); glNormal3d(normals[n4][0], normals[n4][1], normals[n4][2]);
@ -227,12 +216,15 @@ GLint fgObjLoad(char *path) {
/* $Log$ /* $Log$
/* Revision 1.4 1997/11/14 00:26:49 curt /* Revision 1.5 1997/11/15 18:16:39 curt
/* Transform scenery coordinates earlier in pipeline when scenery is being /* minor tweaks.
/* created, not when it is being loaded. Precalculate normals for each node
/* as average of the normals of each containing polygon so Garoude shading is
/* now supportable.
/* /*
* Revision 1.4 1997/11/14 00:26:49 curt
* Transform scenery coordinates earlier in pipeline when scenery is being
* created, not when it is being loaded. Precalculate normals for each node
* as average of the normals of each containing polygon so Garoude shading is
* now supportable.
*
* Revision 1.3 1997/10/31 04:49:12 curt * Revision 1.3 1997/10/31 04:49:12 curt
* Tweaking vertex orders. * Tweaking vertex orders.
* *

17
Time/fg_time.c
View file

@ -230,9 +230,9 @@ void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
static long int warp = 0; static long int warp = 0;
/* get current Unix calendar time (in seconds) */ /* get current Unix calendar time (in seconds) */
warp += 60; warp += 20;
/* warp = 0; */ /* warp = 0; */
t->cur_time = time(NULL) + 43200; t->cur_time = time(NULL) + 4 * 60 * 60;
t->cur_time += warp; t->cur_time += warp;
printf("Current Unix calendar time = %ld warp = %ld\n", t->cur_time, warp); printf("Current Unix calendar time = %ld warp = %ld\n", t->cur_time, warp);
@ -284,12 +284,15 @@ void fgTimeUpdate(struct FLIGHT *f, struct fgTIME *t) {
/* $Log$ /* $Log$
/* Revision 1.9 1997/11/14 00:26:50 curt /* Revision 1.10 1997/11/15 18:16:42 curt
/* Transform scenery coordinates earlier in pipeline when scenery is being /* minor tweaks.
/* created, not when it is being loaded. Precalculate normals for each node
/* as average of the normals of each containing polygon so Garoude shading is
/* now supportable.
/* /*
* Revision 1.9 1997/11/14 00:26:50 curt
* Transform scenery coordinates earlier in pipeline when scenery is being
* created, not when it is being loaded. Precalculate normals for each node
* as average of the normals of each containing polygon so Garoude shading is
* now supportable.
*
* Revision 1.8 1997/10/25 03:30:08 curt * Revision 1.8 1997/10/25 03:30:08 curt
* Misc. tweaks. * Misc. tweaks.
* *