From ab2f98cd4344d72a278a7408ad0ebaa5cfccbec1 Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 29 Jun 1997 21:19:16 +0000 Subject: [PATCH] Working on scenery management system. --- LaRCsim/navion_engine.c | 4 +-- Main/GLmain.c | 55 ++++++++++++++++++++++------------------- Main/Makefile | 7 ++++-- Main/mesh2GL.c | 16 ++++++------ Simulator/Makefile | 5 +++- 5 files changed, 49 insertions(+), 38 deletions(-) diff --git a/LaRCsim/navion_engine.c b/LaRCsim/navion_engine.c index 2110275ea..73fda9fd0 100644 --- a/LaRCsim/navion_engine.c +++ b/LaRCsim/navion_engine.c @@ -73,8 +73,8 @@ void engine( SCALAR dt, int init ) /* F_X_engine = Throttle[3]*813.4/0.2; */ /* original code */ /* F_Z_engine = Throttle[3]*11.36/0.2; */ /* original code */ - F_X_engine = Throttle[3]*813.4/0.85; - F_Z_engine = Throttle[3]*11.36/0.85; + F_X_engine = Throttle[3]*813.4/0.88; + F_Z_engine = Throttle[3]*11.36/0.88; Throttle_pct = Throttle[3]; } diff --git a/Main/GLmain.c b/Main/GLmain.c index cbda0ae57..4a243cb89 100644 --- a/Main/GLmain.c +++ b/Main/GLmain.c @@ -71,13 +71,13 @@ static GLfloat win_ratio = 1.0; static GLfloat sun_vec[4] = {-3.0, 1.0, 2.0, 0.0 }; /* temporary hack */ -extern struct mesh *mesh_ptr; +/* extern struct mesh *mesh_ptr; */ /* Function prototypes */ -GLint fgSceneryCompile(); -static void fgSceneryDraw(); +/* GLint fgSceneryCompile_OLD(); */ +/* static void fgSceneryDraw_OLD(); */ /* pointer to scenery structure */ -static GLint scenery, runway; +/* static GLint scenery, runway; */ /* Another hack */ double fogDensity = 2000.0; @@ -214,7 +214,7 @@ static void fgUpdateVisuals( void ) { /* glLoadIdentity(); */ /* draw scenery */ - fgSceneryDraw(); + fgSceneryRender(); #ifdef GLUT glutSwapBuffers(); @@ -285,25 +285,25 @@ void fgInitTimeDepCalcs() { * Scenery management routines **************************************************************************/ -static void fgSceneryInit() { +/* static void fgSceneryInit_OLD() { */ /* make scenery */ - scenery = fgSceneryCompile(); - runway = fgRunwayHack(0.69, 53.07); -} +/* scenery = fgSceneryCompile_OLD(); + runway = fgRunwayHack_OLD(0.69, 53.07); +} */ /* create the scenery */ -GLint fgSceneryCompile() { +/* GLint fgSceneryCompile_OLD() { GLint scenery; - scenery = mesh2GL(mesh_ptr); + scenery = mesh2GL(mesh_ptr_OLD); return(scenery); } - +*/ /* hack in a runway */ -GLint fgRunwayHack(double width, double length) { +/* GLint fgRunwayHack_OLD(double width, double length) { static GLfloat concrete[4] = { 0.5, 0.5, 0.5, 1.0 }; static GLfloat line[4] = { 0.9, 0.9, 0.9, 1.0 }; int i; @@ -312,9 +312,9 @@ GLint fgRunwayHack(double width, double length) { runway = glGenLists(1); glNewList(runway, GL_COMPILE); - + */ /* draw concrete */ - glBegin(GL_POLYGON); +/* glBegin(GL_POLYGON); glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, concrete ); glNormal3f(0.0, 0.0, 1.0); @@ -323,9 +323,9 @@ GLint fgRunwayHack(double width, double length) { glVertex3d(length, width/2.0, 0.0); glVertex3d(length, -width/2.0, 0.0); glEnd(); - + */ /* draw center line */ - glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, line ); +/* glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, line ); line_len = length / ( 2 * num_lines + 1); printf("line_len = %.3f\n", line_len); line_width_2 = 0.02; @@ -345,10 +345,10 @@ GLint fgRunwayHack(double width, double length) { return(runway); } - +*/ /* draw the scenery */ -static void fgSceneryDraw() { +/*static void fgSceneryDraw_OLD() { static float z = 32.35; glPushMatrix(); @@ -363,10 +363,10 @@ static void fgSceneryDraw() { glPopMatrix(); } - +*/ /* What should we do when we have nothing else to do? How about get - * ready for the next move?*/ + * ready for the next move and update the display? */ static void fgMainLoop( void ) { static int remainder = 0; int elapsed, multi_loop; @@ -468,8 +468,10 @@ int main( int argc, char *argv[] ) { FG_Runway_heading = 102.0 * DEG_TO_RAD; /* Initial Position */ - FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD; - FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD; + /* FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD; + FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD; */ + FG_Latitude = 0.0; + FG_Longitude = 0.0; FG_Altitude = FG_Runway_altitude + 3.758099; printf("Initial position is: (%.4f, %.4f, %.2f)\n", FG_Latitude, @@ -578,9 +580,12 @@ int main( int argc, char *argv[] ) { /* $Log$ -/* Revision 1.24 1997/06/26 22:14:53 curt -/* Beginning work on a scenery management system. +/* Revision 1.25 1997/06/29 21:19:17 curt +/* Working on scenery management system. /* + * Revision 1.24 1997/06/26 22:14:53 curt + * Beginning work on a scenery management system. + * * Revision 1.23 1997/06/26 19:08:33 curt * Restructuring make, adding automatic "make dep" support. * diff --git a/Main/Makefile b/Main/Makefile index 08f2d0272..38b540977 100644 --- a/Main/Makefile +++ b/Main/Makefile @@ -24,14 +24,14 @@ #--------------------------------------------------------------------------- -TARGET=fgfs0 +TARGET=fg0 CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c OFILES = $(CFILES:.c=.o) AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \ ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \ ../Flight/Slew/libSlew.a ../mat3/libmat3.a \ - ../Scenery/ParseVRML/libParseVRML.a ../Scenery/libScenery.a \ + ../Scenery/libScenery.a \ ../Timer/libTimer.a @@ -76,6 +76,9 @@ mesh2GL.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.20 1997/06/29 21:19:17 curt +# Working on scenery management system. +# # Revision 1.19 1997/06/27 21:38:09 curt # Working on Makefile structure. # diff --git a/Main/mesh2GL.c b/Main/mesh2GL.c index 64a3a2841..91d9744ce 100644 --- a/Main/mesh2GL.c +++ b/Main/mesh2GL.c @@ -24,12 +24,7 @@ **************************************************************************/ -#ifdef GLUT - #include -#elif TIGER - /* assumes -I/usr/include/mesa in compile command */ - #include "gltk.h" -#endif +#include #include "../Scenery/mesh.h" #include "../mat3/mat3.h" @@ -46,6 +41,8 @@ GLint mesh2GL(struct mesh *m) { int i, j, istep, jstep, iend, jend; float temp; + printf("In mesh2GL(), generating GL call list.\n"); + istep = jstep = 25; /* Detail level 1 -- 1200 ... */ mesh = glGenLists(1); @@ -108,9 +105,12 @@ GLint mesh2GL(struct mesh *m) { /* $Log$ -/* Revision 1.21 1997/06/21 17:12:54 curt -/* Capitalized subdirectory names. +/* Revision 1.22 1997/06/29 21:19:17 curt +/* Working on scenery management system. /* + * Revision 1.21 1997/06/21 17:12:54 curt + * Capitalized subdirectory names. + * * Revision 1.20 1997/06/18 04:10:32 curt * A couple more runway tweaks ... * diff --git a/Simulator/Makefile b/Simulator/Makefile index 800ff5f39..f714a71a7 100644 --- a/Simulator/Makefile +++ b/Simulator/Makefile @@ -27,7 +27,7 @@ include make.inc -SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn Scenery/ParseVRML +SUBSUBDIRS = Flight/LaRCsim Flight/Slew SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer MAIN = OpenGL @@ -58,6 +58,9 @@ tar: clean #--------------------------------------------------------------------------- # $Log$ +# Revision 1.14 1997/06/29 21:19:16 curt +# Working on scenery management system. +# # Revision 1.13 1997/06/28 00:49:02 curt # Tweaking Makefile structure .. # -- 2.39.2