fly/flightgear
1
0
Fork 0
Code Activity

Miscellaneous tweaks.

Browse source
This commit is contained in:
curt 1998-01-07 03:31:25 +00:00
parent ecd729cf47
commit bebb590b9c
6 changed files with 54 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Astro/depend
View file

@ -1,14 +1,3 @@
astro.o: astro.c ../XGL/xgl.h astro.h stars.h moon.h orbits.h \
../Time/fg_time.h ../Time/../Include/types.h \
../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \
../Time/../Flight/LaRCsim/ls_interface.h \
../Time/../Flight/LaRCsim/../flight.h planets.h sun.h \
../Include/constants.h ../Include/general.h ../Main/views.h \
../Main/../Include/types.h ../Main/../Flight/flight.h \
../Main/../Math/mat3.h ../Main/../Time/fg_time.h \
../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../Include/limits.h
moon.o: moon.c ../XGL/xgl.h orbits.h ../Time/fg_time.h \
../Time/../Include/types.h ../Time/../Flight/flight.h \
../Time/../Flight/Slew/slew.h \
@ -19,6 +8,17 @@ moon.o: moon.c ../XGL/xgl.h orbits.h ../Time/fg_time.h \
../Include/general.h ../Main/views.h ../Main/../Include/types.h \
../Main/../Flight/flight.h ../Main/../Math/mat3.h \
../Main/../Time/fg_time.h
old_astro.o: old_astro.c ../XGL/xgl.h old_astro.h stars.h moon.h \
orbits.h ../Time/fg_time.h ../Time/../Include/types.h \
../Time/../Flight/flight.h ../Time/../Flight/Slew/slew.h \
../Time/../Flight/LaRCsim/ls_interface.h \
../Time/../Flight/LaRCsim/../flight.h planets.h sun.h \
../Include/constants.h ../Include/general.h ../Main/views.h \
../Main/../Include/types.h ../Main/../Flight/flight.h \
../Main/../Math/mat3.h ../Main/../Time/fg_time.h \
../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../Include/limits.h
orbits.o: orbits.c orbits.h ../Time/fg_time.h \
../Time/../Include/types.h ../Time/../Flight/flight.h \
../Time/../Flight/Slew/slew.h \

10
Cockpit/depend
View file

@ -18,13 +18,3 @@ hud.o: hud.c hud.h ../Aircraft/aircraft.h \
../Scenery/scenery.h ../Scenery/../Include/types.h ../Math/mat3.h \
../Math/polar.h ../Math/../Include/types.h ../Time/fg_timer.h \
../Math/fg_random.h ../Weather/weather.h
test.o: test.c test.h ../Aircraft/aircraft.h \
../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \
../Aircraft/../Flight/LaRCsim/ls_interface.h \
../Aircraft/../Flight/LaRCsim/../flight.h \
../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../Include/limits.h ../Flight/flight.h \
../Controls/controls.h ../Include/constants.h ../Scenery/mesh.h \
../Scenery/scenery.h ../Scenery/../Include/types.h ../Math/mat3.h \
../Math/polar.h ../Math/../Include/types.h ../Time/fg_timer.h \
../Math/fg_random.h ../Weather/weather.h

31
Main/depend
View file

@ -6,6 +6,37 @@ GLUTkey.o: GLUTkey.c ../XGL/xgl.h GLUTkey.h views.h ../Include/types.h \
../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \
../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../Include/limits.h ../Weather/weather.h
GLUTmain.o: GLUTmain.c ../XGL/xgl.h GLUTkey.h fg_init.h views.h \
../Include/types.h ../Flight/flight.h ../Flight/Slew/slew.h \
../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
../Time/../Flight/flight.h ../Include/constants.h \
../Include/general.h ../Aircraft/aircraft.h \
../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../Include/limits.h ../Astro/moon.h \
../Astro/orbits.h ../Astro/../Time/fg_time.h ../Astro/sky.h \
../Astro/stars.h ../Astro/sun.h ../Cockpit/cockpit.h ../Cockpit/hud.h \
../Cockpit/../Aircraft/aircraft.h ../Cockpit/../Flight/flight.h \
../Cockpit/../Controls/controls.h ../Joystick/joystick.h \
../Math/fg_geodesy.h ../Math/polar.h ../Math/../Include/types.h \
../Scenery/mesh.h ../Scenery/scenery.h ../Scenery/../Include/types.h \
../Time/event.h ../Time/fg_timer.h ../Time/sunpos.h \
../Weather/weather.h
fg_init.o: fg_init.c fg_init.h views.h ../Include/types.h \
../Flight/flight.h ../Flight/Slew/slew.h \
../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
../Math/mat3.h ../Time/fg_time.h ../Time/../Include/types.h \
../Time/../Flight/flight.h ../Include/constants.h \
../Include/general.h ../Aircraft/aircraft.h \
../Aircraft/../Flight/flight.h ../Aircraft/../Controls/controls.h \
../Aircraft/../Controls/../Include/limits.h ../Astro/moon.h \
../Astro/orbits.h ../Astro/../Time/fg_time.h ../Astro/sky.h \
../Astro/stars.h ../Astro/sun.h ../Cockpit/cockpit.h ../Cockpit/hud.h \
../Cockpit/../Aircraft/aircraft.h ../Cockpit/../Flight/flight.h \
../Cockpit/../Controls/controls.h ../Joystick/joystick.h \
../Math/fg_random.h ../Scenery/mesh.h ../Scenery/scenery.h \
../Scenery/../Include/types.h ../Time/event.h ../Time/sunpos.h \
../Weather/weather.h
views.o: views.c views.h ../Include/types.h ../Flight/flight.h \
../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \
../Flight/LaRCsim/../flight.h ../Math/mat3.h ../Time/fg_time.h \

2
Scenery/depend
View file

@ -7,3 +7,5 @@ mesh.o: mesh.c ../Include/constants.h ../Include/types.h \
../Math/polar.h ../Math/../Include/types.h mesh.h common.h scenery.h
obj.o: obj.c ../XGL/xgl.h obj.h scenery.h ../Include/types.h \
../Math/mat3.h
scenery.o: scenery.c ../XGL/xgl.h ../Include/general.h obj.h scenery.h \
../Include/types.h

13
Scenery/mesh.c
View file

@ -227,7 +227,7 @@ double mesh_altitude(double lon, double lat) {
/* printf(" zA = %.2f zB = %.2f\n", zA, zB); */
if ( dx > EPSILON ) {
if ( dx > FG_EPSILON ) {
elev = dy * (zB - zA) / dx + zA;
} else {
elev = zA;
@ -259,7 +259,7 @@ double mesh_altitude(double lon, double lat) {
/* printf(" zA = %.2f zB = %.2f\n", zA, zB );
printf(" xB - xA = %.2f\n", eg.col_step * dy / eg.row_step); */
if ( dy > EPSILON ) {
if ( dy > FG_EPSILON ) {
elev = dx * (zB - zA) / dy + zA;
} else {
elev = zA;
@ -396,10 +396,13 @@ GLint mesh_to_OpenGL(struct MESH *m) {
/* $Log$
/* Revision 1.24 1997/12/15 23:54:59 curt
/* Add xgl wrappers for debugging.
/* Generate terrain normals on the fly.
/* Revision 1.25 1998/01/07 03:31:27 curt
/* Miscellaneous tweaks.
/*
* Revision 1.24 1997/12/15 23:54:59 curt
* Add xgl wrappers for debugging.
* Generate terrain normals on the fly.
*
* Revision 1.23 1997/10/30 12:38:44 curt
* Working on new scenery subsystem.
*

4
Time/depend
View file

@ -4,8 +4,7 @@ fg_time.o: fg_time.c fg_time.h ../Include/types.h ../Flight/flight.h \
../Flight/LaRCsim/../flight.h ../Include/constants.h \
../Time/fg_time.h
fg_timer.o: fg_timer.c fg_timer.h
scheduler.o: scheduler.c
sidereal.o: sidereal.c ../Include/constants.h
sptest.o: sptest.c sunpos.h ../Include/types.h ../Include/constants.h
sunpos.o: sunpos.c sunpos.h ../Include/types.h fg_time.h \
../Flight/flight.h ../Flight/Slew/slew.h \
../Flight/LaRCsim/ls_interface.h ../Flight/LaRCsim/../flight.h \
@ -13,4 +12,5 @@ sunpos.o: sunpos.c sunpos.h ../Include/types.h fg_time.h \
../Main/../Flight/flight.h ../Main/../Math/mat3.h \
../Main/../Time/fg_time.h ../Math/fg_geodesy.h ../Math/mat3.h \
../Math/polar.h ../Math/../Include/types.h
test_event.o: test_event.c event.h
ttest.o: ttest.c