1
0
Fork 0

Beginning to integrate Tile management subsystem.

This commit is contained in:
curt 1998-01-08 02:22:01 +00:00
parent da32f5b051
commit b712d46418
5 changed files with 30 additions and 18 deletions

View file

@ -8,17 +8,6 @@ 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 \

View file

@ -18,3 +18,13 @@ 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

View file

@ -51,6 +51,7 @@
#include "../Math/polar.h"
#include "../Scenery/mesh.h"
#include "../Scenery/scenery.h"
#include "../Scenery/tilemgr.h"
#include "../Time/event.h"
#include "../Time/fg_time.h"
#include "../Time/fg_timer.h"
@ -514,6 +515,9 @@ static void fgMainLoop( void ) {
/* fgAircraftOutputCurrent(a); */
/* see if we need to load any new scenery tiles */
fgTileMgrUpdate();
/* Process/manage pending events */
fgEventProcess();
@ -628,9 +632,12 @@ int main( int argc, char *argv[] ) {
/* $Log$
/* Revision 1.45 1998/01/07 03:18:55 curt
/* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
/* Revision 1.46 1998/01/08 02:22:06 curt
/* Beginning to integrate Tile management subsystem.
/*
* Revision 1.45 1998/01/07 03:18:55 curt
* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
*
* Revision 1.44 1997/12/30 22:22:31 curt
* Further integration of event manager.
*

View file

@ -34,9 +34,10 @@ fg_init.o: fg_init.c fg_init.h views.h ../Include/types.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
../Math/fg_random.h ../Scenery/tilemgr.h ../Scenery/mesh.h \
../Scenery/scenery.h ../Scenery/../Include/types.h ../Time/event.h \
../Time/sunpos.h ../Weather/weather.h
probdemo.o: probdemo.c ../XGL/xgl.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 \

View file

@ -43,6 +43,7 @@
#include "../Math/fg_random.h"
#include "../Scenery/mesh.h"
#include "../Scenery/scenery.h"
#include "../Scenery/tilemgr.h"
#include "../Time/event.h"
#include "../Time/fg_time.h"
#include "../Time/sunpos.h"
@ -223,6 +224,7 @@ void fgInitSubsystems( void ) {
fgSkyInit();
/* Initialize the Scenery Management subsystem */
fgTileMgrInit();
fgSceneryInit();
/* Tell the Scenery Management system where we are so it can load
@ -267,9 +269,12 @@ void fgInitSubsystems( void ) {
/* $Log$
/* Revision 1.28 1998/01/07 03:18:58 curt
/* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
/* Revision 1.29 1998/01/08 02:22:08 curt
/* Beginning to integrate Tile management subsystem.
/*
* Revision 1.28 1998/01/07 03:18:58 curt
* Moved astronomical stuff from .../Src/Scenery to .../Src/Astro/
*
* Revision 1.27 1998/01/05 18:44:35 curt
* Add an option to advance/decrease time from keyboard.
*