fly/flightgear
1
0
Fork 0
Code Activity

Working on scenery management system.

Browse source
This commit is contained in:
curt 1997-06-29 21:19:16 +00:00
parent 7460b99c30
commit ab2f98cd43
5 changed files with 49 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LaRCsim/navion_engine.c
View file

@ -73,8 +73,8 @@ void engine( SCALAR dt, int init )
/* F_X_engine = Throttle[3]*813.4/0.2; */ /* original code */ /* F_X_engine = Throttle[3]*813.4/0.2; */ /* original code */
/* F_Z_engine = Throttle[3]*11.36/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_X_engine = Throttle[3]*813.4/0.88;
F_Z_engine = Throttle[3]*11.36/0.85; F_Z_engine = Throttle[3]*11.36/0.88;
Throttle_pct = Throttle[3]; Throttle_pct = Throttle[3];
} }

55
Main/GLmain.c
View file

@ -71,13 +71,13 @@ static GLfloat win_ratio = 1.0;
static GLfloat sun_vec[4] = {-3.0, 1.0, 2.0, 0.0 }; static GLfloat sun_vec[4] = {-3.0, 1.0, 2.0, 0.0 };
/* temporary hack */ /* temporary hack */
extern struct mesh *mesh_ptr; /* extern struct mesh *mesh_ptr; */
/* Function prototypes */ /* Function prototypes */
GLint fgSceneryCompile(); /* GLint fgSceneryCompile_OLD(); */
static void fgSceneryDraw(); /* static void fgSceneryDraw_OLD(); */
/* pointer to scenery structure */ /* pointer to scenery structure */
static GLint scenery, runway; /* static GLint scenery, runway; */
/* Another hack */ /* Another hack */
double fogDensity = 2000.0; double fogDensity = 2000.0;
@ -214,7 +214,7 @@ static void fgUpdateVisuals( void ) {
/* glLoadIdentity(); */ /* glLoadIdentity(); */
/* draw scenery */ /* draw scenery */
fgSceneryDraw(); fgSceneryRender();
#ifdef GLUT #ifdef GLUT
glutSwapBuffers(); glutSwapBuffers();
@ -285,25 +285,25 @@ void fgInitTimeDepCalcs() {
* Scenery management routines * Scenery management routines
**************************************************************************/ **************************************************************************/
static void fgSceneryInit() { /* static void fgSceneryInit_OLD() { */
/* make scenery */ /* make scenery */
scenery = fgSceneryCompile(); /* scenery = fgSceneryCompile_OLD();
runway = fgRunwayHack(0.69, 53.07); runway = fgRunwayHack_OLD(0.69, 53.07);
} } */
/* create the scenery */ /* create the scenery */
GLint fgSceneryCompile() { /* GLint fgSceneryCompile_OLD() {
GLint scenery; GLint scenery;
scenery = mesh2GL(mesh_ptr); scenery = mesh2GL(mesh_ptr_OLD);
return(scenery); return(scenery);
} }
*/
/* hack in a runway */ /* 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 concrete[4] = { 0.5, 0.5, 0.5, 1.0 };
static GLfloat line[4] = { 0.9, 0.9, 0.9, 1.0 }; static GLfloat line[4] = { 0.9, 0.9, 0.9, 1.0 };
int i; int i;
@ -312,9 +312,9 @@ GLint fgRunwayHack(double width, double length) {
runway = glGenLists(1); runway = glGenLists(1);
glNewList(runway, GL_COMPILE); glNewList(runway, GL_COMPILE);
*/
/* draw concrete */ /* draw concrete */
glBegin(GL_POLYGON); /* glBegin(GL_POLYGON);
glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, concrete ); glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, concrete );
glNormal3f(0.0, 0.0, 1.0); 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);
glVertex3d(length, -width/2.0, 0.0); glVertex3d(length, -width/2.0, 0.0);
glEnd(); glEnd();
*/
/* draw center line */ /* 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); line_len = length / ( 2 * num_lines + 1);
printf("line_len = %.3f\n", line_len); printf("line_len = %.3f\n", line_len);
line_width_2 = 0.02; line_width_2 = 0.02;
@ -345,10 +345,10 @@ GLint fgRunwayHack(double width, double length) {
return(runway); return(runway);
} }
*/
/* draw the scenery */ /* draw the scenery */
static void fgSceneryDraw() { /*static void fgSceneryDraw_OLD() {
static float z = 32.35; static float z = 32.35;
glPushMatrix(); glPushMatrix();
@ -363,10 +363,10 @@ static void fgSceneryDraw() {
glPopMatrix(); glPopMatrix();
} }
*/
/* What should we do when we have nothing else to do? How about get /* 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 void fgMainLoop( void ) {
static int remainder = 0; static int remainder = 0;
int elapsed, multi_loop; int elapsed, multi_loop;
@ -468,8 +468,10 @@ int main( int argc, char *argv[] ) {
FG_Runway_heading = 102.0 * DEG_TO_RAD; FG_Runway_heading = 102.0 * DEG_TO_RAD;
/* Initial Position */ /* Initial Position */
FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD; /* FG_Latitude = ( 120070.41 / 3600.0 ) * DEG_TO_RAD;
FG_Longitude = ( -398391.28 / 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; FG_Altitude = FG_Runway_altitude + 3.758099;
printf("Initial position is: (%.4f, %.4f, %.2f)\n", FG_Latitude, printf("Initial position is: (%.4f, %.4f, %.2f)\n", FG_Latitude,
@ -578,9 +580,12 @@ int main( int argc, char *argv[] ) {
/* $Log$ /* $Log$
/* Revision 1.24 1997/06/26 22:14:53 curt /* Revision 1.25 1997/06/29 21:19:17 curt
/* Beginning work on a scenery management system. /* 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 * Revision 1.23 1997/06/26 19:08:33 curt
* Restructuring make, adding automatic "make dep" support. * Restructuring make, adding automatic "make dep" support.
* *

7
Main/Makefile
View file

@ -24,14 +24,14 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TARGET=fgfs0 TARGET=fg0
CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
OFILES = $(CFILES:.c=.o) OFILES = $(CFILES:.c=.o)
AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \ AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \ ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
../Flight/Slew/libSlew.a ../mat3/libmat3.a \ ../Flight/Slew/libSlew.a ../mat3/libmat3.a \
../Scenery/ParseVRML/libParseVRML.a ../Scenery/libScenery.a \ ../Scenery/libScenery.a \
../Timer/libTimer.a ../Timer/libTimer.a
@ -76,6 +76,9 @@ mesh2GL.o:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $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 # Revision 1.19 1997/06/27 21:38:09 curt
# Working on Makefile structure. # Working on Makefile structure.
# #

16
Main/mesh2GL.c
View file

@ -24,12 +24,7 @@
**************************************************************************/ **************************************************************************/
#ifdef GLUT #include <GL/glut.h>
#include <GL/glut.h>
#elif TIGER
/* assumes -I/usr/include/mesa in compile command */
#include "gltk.h"
#endif
#include "../Scenery/mesh.h" #include "../Scenery/mesh.h"
#include "../mat3/mat3.h" #include "../mat3/mat3.h"
@ -46,6 +41,8 @@ GLint mesh2GL(struct mesh *m) {
int i, j, istep, jstep, iend, jend; int i, j, istep, jstep, iend, jend;
float temp; float temp;
printf("In mesh2GL(), generating GL call list.\n");
istep = jstep = 25; /* Detail level 1 -- 1200 ... */ istep = jstep = 25; /* Detail level 1 -- 1200 ... */
mesh = glGenLists(1); mesh = glGenLists(1);
@ -108,9 +105,12 @@ GLint mesh2GL(struct mesh *m) {
/* $Log$ /* $Log$
/* Revision 1.21 1997/06/21 17:12:54 curt /* Revision 1.22 1997/06/29 21:19:17 curt
/* Capitalized subdirectory names. /* 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 * Revision 1.20 1997/06/18 04:10:32 curt
* A couple more runway tweaks ... * A couple more runway tweaks ...
* *

5
Simulator/Makefile
View file

@ -27,7 +27,7 @@
include make.inc include make.inc
SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn Scenery/ParseVRML SUBSUBDIRS = Flight/LaRCsim Flight/Slew
SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
MAIN = OpenGL MAIN = OpenGL
@ -58,6 +58,9 @@ tar: clean
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $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 # Revision 1.13 1997/06/28 00:49:02 curt
# Tweaking Makefile structure .. # Tweaking Makefile structure ..
# #