From: curt Date: Wed, 7 Jan 1998 03:31:25 +0000 (+0000) Subject: Miscellaneous tweaks. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bebb590b9ccfd50bdcfe95d7c9a7d3d6f0b13598;p=flightgear.git Miscellaneous tweaks. --- diff --git a/Astro/depend b/Astro/depend index a948633f1..223726e34 100644 --- a/Astro/depend +++ b/Astro/depend @@ -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 \ diff --git a/Cockpit/depend b/Cockpit/depend index 1e0cb8cc7..d5e9f450e 100644 --- a/Cockpit/depend +++ b/Cockpit/depend @@ -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 diff --git a/Main/depend b/Main/depend index 22f08083d..6161b48d0 100644 --- a/Main/depend +++ b/Main/depend @@ -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 \ diff --git a/Scenery/depend b/Scenery/depend index 6ac39183e..f07a0043f 100644 --- a/Scenery/depend +++ b/Scenery/depend @@ -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 diff --git a/Scenery/mesh.c b/Scenery/mesh.c index c2535a32e..cdecfb701 100644 --- a/Scenery/mesh.c +++ b/Scenery/mesh.c @@ -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. * diff --git a/Time/depend b/Time/depend index 04cc3f244..d9a27d3e7 100644 --- a/Time/depend +++ b/Time/depend @@ -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