42a5ee93d7
Synced to CVS 19:36 EDT 2002-04-10 (after this evenings JSMsim and Base package updates). Description: Added FGLocation class which is new home for calculating matrix rotations. Viewer can now be configured to access rotations created by the model rather than repeating the same calculations again. Changed model initialization for the time being so that its location data is available for the viewer (currently required by other subsystems). At some point we can move this back to fg_init along with the viewer initialization. Seperated the update from the draw function in the model code. The viewer code needs the same matrix data, and moving the update portion at this time does not increase the number of matrix math iterations. Moved the model draw so that it always appears "in front" of lights and clouds. Reogranized viewer update routine for using the FGLocation class and simplified some more tasks. The routine is fairly easy to follow now, with the steps ordered and spelled out in comments. Viewmgr only updates the current (visible) view now, with the exception of an old reference to "chase view" that will be corrected in forthcoming changes. Also will be doing some work on the viewmgr outputs. Model is now clears the z-buffer in all modes. This will be changed with the next viewmgr update. The only side effect is that models always disappear when over 5km distant from the eye point (can't really see them anyway:-)). Other than a flag to indicate "internal" view I don't anticipate the configuration interface for viewmgr/views will be changed a lot for now. It is close to done. The next viewmgr update will however rework the outputs so may change location. This code will run with the previous version of preferences.xml, but will run faster with the newer version. I am attaching a preferences.xml that should not be commited before the code. All the changes are in the /sim/view section and should show a simpler view configuration that references model locations. Note that I've added a 2nd tower view in "lookfrom" mode for illustration purposes. You can look around using the mouse. You may want to remove that or comment it out.
99 lines
2.5 KiB
Makefile
99 lines
2.5 KiB
Makefile
if ENABLE_UNIX_SERIAL
|
|
SERIAL_LIBS = -lsgserial
|
|
else
|
|
SERIAL_LIBS =
|
|
endif
|
|
|
|
if ENABLE_NEW_ENVIRONMENT
|
|
WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
|
|
else
|
|
WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
|
|
endif
|
|
|
|
if ENABLE_NETWORK_OLK
|
|
NETWORK_LIBS = \
|
|
$(top_builddir)/src/Network/libNetwork.a \
|
|
$(top_builddir)/src/NetworkOLK/libNetworkOLK.a
|
|
else
|
|
NETWORK_LIBS = \
|
|
$(top_builddir)/src/Network/libNetwork.a
|
|
endif
|
|
|
|
if WITH_THREADS
|
|
THREAD_LIBS = -lsgthreads
|
|
else
|
|
THREAD_LIBS =
|
|
endif
|
|
|
|
if ANCIENT_AUTOMAKE
|
|
# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
|
|
else
|
|
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
|
|
endif
|
|
|
|
EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
|
|
|
|
bin_PROGRAMS = fgfs
|
|
|
|
noinst_SCRIPTS = runfgfs.bat runfgfs
|
|
|
|
# bin_SCRIPTS = runfgfs
|
|
|
|
fgfs_SOURCES = \
|
|
main.cxx \
|
|
fg_commands.cxx fg_commands.hxx \
|
|
fg_init.cxx fg_init.hxx \
|
|
fg_io.cxx fg_io.hxx \
|
|
fg_props.cxx fg_props.hxx \
|
|
fgfs.cxx fgfs.hxx \
|
|
globals.cxx globals.hxx \
|
|
logger.cxx logger.hxx \
|
|
options.cxx options.hxx \
|
|
splash.cxx splash.hxx \
|
|
viewer.cxx viewer.hxx \
|
|
viewmgr.cxx viewmgr.hxx \
|
|
location.cxx location.hxx
|
|
|
|
fgfs_LDADD = \
|
|
$(top_builddir)/src/Aircraft/libAircraft.a \
|
|
$(top_builddir)/src/ATC/libATC.a \
|
|
$(top_builddir)/src/Autopilot/libAutopilot.a \
|
|
$(top_builddir)/src/Cockpit/libCockpit.a \
|
|
$(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
|
|
$(top_builddir)/src/Controls/libControls.a \
|
|
$(top_builddir)/src/FDM/libFlight.a \
|
|
$(top_builddir)/src/FDM/Balloon/libBalloon.a \
|
|
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
|
|
$(top_builddir)/src/FDM/YASim/libYASim.a \
|
|
$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
|
|
$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
|
|
$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
|
|
$(top_builddir)/src/GUI/libGUI.a \
|
|
$(top_builddir)/src/Model/libModel.a \
|
|
$(top_builddir)/src/Navaids/libNavaids.a \
|
|
$(top_builddir)/src/Scenery/libScenery.a \
|
|
$(top_builddir)/src/Sound/libSound.a \
|
|
$(top_builddir)/src/Airports/libAirports.a \
|
|
$(NETWORK_LIBS) \
|
|
$(top_builddir)/src/Objects/libObjects.a \
|
|
$(top_builddir)/src/Time/libTime.a \
|
|
$(WEATHER_LIBS) \
|
|
$(top_builddir)/src/Input/libInput.a \
|
|
-lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
|
|
-lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
|
|
$(SERIAL_LIBS) \
|
|
$(THREAD_LIBS) \
|
|
-lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
|
|
-lmk4 -lz \
|
|
$(opengl_LIBS) \
|
|
$(audio_LIBS)
|
|
|
|
fgfs_CFLAGS = -DTHIS_IS_A_TEST
|
|
|
|
if OLD_AUTOMAKE
|
|
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
|
|
else
|
|
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
|
|
endif
|
|
|
|
|