fly/flightgear
1
0
Fork 0
Code Activity

Updated to reflect changing interfaces in other "modules."

Browse source
This commit is contained in:
curt 1997-05-29 02:33:23 +00:00
parent c994ed7feb
commit d8e9c999f9
3 changed files with 25 additions and 13 deletions

20
Main/GLmain.c
View file

@ -61,7 +61,7 @@ static GLint mesh;
double fogDensity = 2000.0; double fogDensity = 2000.0;
/* Another hack */ /* Another hack */
#define DEFAULT_MODEL_HZ 120 #define DEFAULT_MODEL_HZ 20
double Simtime; double Simtime;
int Overrun; int Overrun;
int model_dt; int model_dt;
@ -224,7 +224,7 @@ static void fgSceneryDraw() {
* ready for the next move?*/ * ready for the next move?*/
static void fgMainLoop( void ) static void fgMainLoop( void )
{ {
slew_update(); fgSlewUpdate();
aircraft_debug(1); aircraft_debug(1);
fgUpdateVisuals(); fgUpdateVisuals();
@ -288,9 +288,9 @@ int main( int argc, char *argv[] ) {
fgInitVisuals(); fgInitVisuals();
/* Set initial position and slew parameters */ /* Set initial position and slew parameters */
/* slew_init(-398391.3, 120070.4, 244, 3.1415); */ /* GLOBE Airport */ /* fgSlewInit(-398391.3, 120070.4, 244, 3.1415); */ /* GLOBE Airport */
/* slew_init(-335340,162540, 15, 4.38); */ /* fgSlewInit(-335340,162540, 15, 4.38); */
slew_init(-398673.28,120625.64, 53, 4.38); fgSlewInit(-398673.28,120625.64, 53, 4.38);
/* build all objects */ /* build all objects */
fgSceneryInit(); fgSceneryInit();
@ -339,10 +339,14 @@ int main( int argc, char *argv[] ) {
/* $Log$ /* $Log$
/* Revision 1.4 1997/05/27 17:44:31 curt /* Revision 1.5 1997/05/29 02:33:23 curt
/* Renamed & rearranged variables and routines. Added some initial simple /* Updated to reflect changing interfaces in other "modules."
/* timer/alarm routines so the flight model can be updated on a regular interval.
/* /*
* Revision 1.4 1997/05/27 17:44:31 curt
* Renamed & rearranged variables and routines. Added some initial simple
* timer/alarm routines so the flight model can be updated on a regular
* interval.
*
* Revision 1.3 1997/05/23 15:40:25 curt * Revision 1.3 1997/05/23 15:40:25 curt
* Added GNU copyright headers. * Added GNU copyright headers.
* Fog now works! * Fog now works!

6
Main/Makefile
View file

@ -66,7 +66,8 @@ LIBS = $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
AFILES = ../flight/libflight.a ../aircraft/libaircraft.a ../scenery/libscenery.a AFILES = ../flight/libflight.a ../flight/slew/libslew.a \
../aircraft/libaircraft.a ../scenery/libscenery.a
@ -102,6 +103,9 @@ mesh2GL.o: mesh2GL.c ../scenery/mesh.h
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $Log$
# Revision 1.6 1997/05/29 02:33:23 curt
# Updated to reflect changing interfaces in other "modules."
#
# Revision 1.5 1997/05/27 17:44:32 curt # Revision 1.5 1997/05/27 17:44:32 curt
# Renamed & rearranged variables and routines. Added some initial simple # Renamed & rearranged variables and routines. Added some initial simple
# timer/alarm routines so the flight model can be updated on a regular interval. # timer/alarm routines so the flight model can be updated on a regular interval.

12
Main/mesh2GL.c
View file

@ -59,7 +59,7 @@ GLint mesh2GL(struct mesh *m) {
int i, j, istep, jstep, iend, jend; int i, j, istep, jstep, iend, jend;
float temp; float temp;
istep = jstep = 5; /* Detail level 1 - 1200 ... */ istep = jstep = 4; /* Detail level 1 -- 1200 ... */
mesh = glGenLists(1); mesh = glGenLists(1);
glNewList(mesh, GL_COMPILE); glNewList(mesh, GL_COMPILE);
@ -119,10 +119,14 @@ GLint mesh2GL(struct mesh *m) {
/* $Log$ /* $Log$
/* Revision 1.6 1997/05/27 17:44:32 curt /* Revision 1.7 1997/05/29 02:33:24 curt
/* Renamed & rearranged variables and routines. Added some initial simple /* Updated to reflect changing interfaces in other "modules."
/* timer/alarm routines so the flight model can be updated on a regular interval.
/* /*
* Revision 1.6 1997/05/27 17:44:32 curt
* Renamed & rearranged variables and routines. Added some initial simple
* timer/alarm routines so the flight model can be updated on a regular
* interval.
*
* Revision 1.5 1997/05/24 01:45:32 curt * Revision 1.5 1997/05/24 01:45:32 curt
* Fixed surface normals for triangle mesh. * Fixed surface normals for triangle mesh.
* *