1998-11-16 13:59:58 +00:00
|
|
|
if ENABLE_UNIX_SERIAL
|
2000-02-15 03:30:01 +00:00
|
|
|
SERIAL_LIBS = -lsgserial
|
1998-11-16 13:59:58 +00:00
|
|
|
else
|
|
|
|
|
SERIAL_LIBS =
|
|
|
|
|
endif
|
|
|
|
|
|
2002-02-19 15:16:08 +00:00
|
|
|
if ENABLE_NEW_ENVIRONMENT
|
|
|
|
|
WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
|
1999-10-14 20:30:54 +00:00
|
|
|
else
|
2000-02-15 03:30:01 +00:00
|
|
|
WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
|
2000-01-12 18:09:35 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if ENABLE_NETWORK_OLK
|
|
|
|
|
NETWORK_LIBS = \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Network/libNetwork.a \
|
|
|
|
|
$(top_builddir)/src/NetworkOLK/libNetworkOLK.a
|
2000-01-12 18:09:35 +00:00
|
|
|
else
|
|
|
|
|
NETWORK_LIBS = \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Network/libNetwork.a
|
1999-08-12 17:13:44 +00:00
|
|
|
endif
|
|
|
|
|
|
2001-04-11 02:47:15 +00:00
|
|
|
if WITH_THREADS
|
|
|
|
|
THREAD_LIBS = -lsgthreads
|
|
|
|
|
else
|
|
|
|
|
THREAD_LIBS =
|
|
|
|
|
endif
|
|
|
|
|
|
2001-12-28 22:29:59 +00:00
|
|
|
if ANCIENT_AUTOMAKE
|
2000-11-01 23:27:32 +00:00
|
|
|
# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
|
1999-10-30 04:27:21 +00:00
|
|
|
else
|
1999-10-30 02:37:56 +00:00
|
|
|
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
|
1999-10-30 04:27:21 +00:00
|
|
|
endif
|
1999-06-04 20:35:47 +00:00
|
|
|
|
1999-04-19 20:19:36 +00:00
|
|
|
EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
|
1998-04-03 22:09:02 +00:00
|
|
|
|
1998-08-24 20:33:48 +00:00
|
|
|
bin_PROGRAMS = fgfs
|
1998-04-03 22:09:02 +00:00
|
|
|
|
2001-07-12 17:55:44 +00:00
|
|
|
noinst_SCRIPTS = runfgfs.bat runfgfs
|
2000-09-14 17:36:39 +00:00
|
|
|
|
2001-07-12 17:55:44 +00:00
|
|
|
# bin_SCRIPTS = runfgfs
|
1998-04-03 22:09:02 +00:00
|
|
|
|
1998-08-24 20:33:48 +00:00
|
|
|
fgfs_SOURCES = \
|
2000-04-24 23:51:26 +00:00
|
|
|
main.cxx \
|
2001-06-01 17:51:20 +00:00
|
|
|
fg_commands.cxx fg_commands.hxx \
|
1998-04-22 13:25:39 +00:00
|
|
|
fg_init.cxx fg_init.hxx \
|
1999-11-19 02:10:24 +00:00
|
|
|
fg_io.cxx fg_io.hxx \
|
2001-01-05 17:38:58 +00:00
|
|
|
fg_props.cxx fg_props.hxx \
|
|
|
|
|
fgfs.cxx fgfs.hxx \
|
2000-07-07 17:27:37 +00:00
|
|
|
globals.cxx globals.hxx \
|
2002-03-12 16:29:00 +00:00
|
|
|
logger.cxx logger.hxx \
|
1998-04-24 00:49:17 +00:00
|
|
|
options.cxx options.hxx \
|
1998-07-06 02:42:02 +00:00
|
|
|
splash.cxx splash.hxx \
|
2000-10-25 22:59:02 +00:00
|
|
|
viewer.cxx viewer.hxx \
|
2000-10-26 21:51:09 +00:00
|
|
|
viewmgr.cxx viewmgr.hxx
|
1998-04-08 23:32:28 +00:00
|
|
|
|
1998-08-24 20:33:48 +00:00
|
|
|
fgfs_LDADD = \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Aircraft/libAircraft.a \
|
2001-11-07 17:55:28 +00:00
|
|
|
$(top_builddir)/src/ATC/libATC.a \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Autopilot/libAutopilot.a \
|
|
|
|
|
$(top_builddir)/src/Cockpit/libCockpit.a \
|
2002-04-07 21:13:56 +00:00
|
|
|
$(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Controls/libControls.a \
|
|
|
|
|
$(top_builddir)/src/FDM/libFlight.a \
|
|
|
|
|
$(top_builddir)/src/FDM/Balloon/libBalloon.a \
|
2000-07-24 17:27:12 +00:00
|
|
|
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
|
2001-12-01 06:22:49 +00:00
|
|
|
$(top_builddir)/src/FDM/YASim/libYASim.a \
|
2000-07-24 17:27:12 +00:00
|
|
|
$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
|
2000-03-22 22:01:33 +00:00
|
|
|
$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/GUI/libGUI.a \
|
2002-04-05 03:19:34 +00:00
|
|
|
$(top_builddir)/src/Model/libModel.a \
|
2000-04-24 23:51:26 +00:00
|
|
|
$(top_builddir)/src/Navaids/libNavaids.a \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Scenery/libScenery.a \
|
2001-03-05 22:54:20 +00:00
|
|
|
$(top_builddir)/src/Sound/libSound.a \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Airports/libAirports.a \
|
2000-01-12 18:09:35 +00:00
|
|
|
$(NETWORK_LIBS) \
|
2000-02-15 03:30:01 +00:00
|
|
|
$(top_builddir)/src/Objects/libObjects.a \
|
|
|
|
|
$(top_builddir)/src/Time/libTime.a \
|
1999-08-12 17:13:44 +00:00
|
|
|
$(WEATHER_LIBS) \
|
I'm attaching diffs to add a new FGInput module to FlightGear
(src/Input). So far, FGInput replaces most of src/Main/keyboard.cxx
(I've left a tiny stub); in the very near future, it will also take
over control of the joystick, mouse (Norm permitting), and panel
instrument interactions, so that there is a single mechanism for
configuring all input devices.
The new format should be (close to) self-explanatory by looking at the
new base-package file keyboard.xml, which is now included by
preferences.xml (I'll do the same thing for the joystick when I have a
chance). I have not managed to move all keybindings into this file
yet, but I've made a good start. I'm including Tony in the recipient
list so that he can see how bindings can use an external XML file.
This patch also adds support for multiple bindings for a single key,
special keys (i.e. keypad and function keys), and key modifiers
(shift/alt/ctrl); special keys use the PUI convention of adding 256 to
the Glut key code.
Unfortunately, everything comes with a price; in this case, I have not
yet found a general mechanism for the old (hard-coded) modal bindings,
which behaved differently depending on the autopilot state (i.e. left
rudder or move AP heading left); with my patches, this functionality
disappears, but you can still adjust the autopilot using the panel or
the GUI input dialogs.
2001-05-23 23:01:15 +00:00
|
|
|
$(top_builddir)/src/Input/libInput.a \
|
2001-03-02 23:28:51 +00:00
|
|
|
-lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
|
2001-03-01 16:32:29 +00:00
|
|
|
-lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
|
2000-07-11 20:40:12 +00:00
|
|
|
$(SERIAL_LIBS) \
|
2001-04-11 02:47:15 +00:00
|
|
|
$(THREAD_LIBS) \
|
2001-08-21 21:13:55 +00:00
|
|
|
-lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
|
2000-05-27 05:54:02 +00:00
|
|
|
-lmk4 -lz \
|
1999-06-24 20:38:31 +00:00
|
|
|
$(opengl_LIBS) \
|
|
|
|
|
$(audio_LIBS)
|
|
|
|
|
|
2001-12-28 22:29:59 +00:00
|
|
|
fgfs_CFLAGS = -DTHIS_IS_A_TEST
|
|
|
|
|
|
|
|
|
|
if OLD_AUTOMAKE
|
2000-09-20 23:27:25 +00:00
|
|
|
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
|
2001-12-28 22:29:59 +00:00
|
|
|
else
|
|
|
|
|
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
|
|
|
|
|
endif
|
Major viewer-code overhaul from Jim Wilson:
Description:
This update includes the new viewer interface as proposed by David M. and
a first pass at cleaning up the viewer/view manager code by Jim W.
Note that I have dropped Main/viewer_lookat.?xx and Main/viewer_rph.?xx and
modified the Makefile.am accordingly.
Detail of work:
Overall:
The code reads a little easier. There are still some unnecessary bits in
there and I'd like to supplement the comments in the viewer.hxx with a tiny
bit on each interface group and what the groupings mean (similar but briefer
than what you emailed me the other day). I tried not to mess up the style,
but there is an occasional inconsistency. In general I wouldn't call it done
(especially since there's no tower yet! :)), but I'd like to get this out
there so others can comment, and test.
In Viewer:
The interface as you suggested has been implemented. Basically everything
seems to work as it did visually. There is no difference that I can see in
performance, although some things might be a tiny bit faster.
I've merged the lookat and rph (pilot view) code into the recalc for the
viewer. There is still some redundancy between the two, but a lot has been
removed. In some cases I've taken some code that we'd likely want to inline
anyway and left it in there in duplicate. You'll see that the code for both
looks a little cleaner. I need to take a closer look at the rotations in
particular. I've cleaned up a little there, but I suspect more can be done
to streamline this.
The external declaration to the Quat_mat in mouse.cxx has been removed. IMHO
the quat doesn't serve any intrinsic purpose in mouse.cxx, but I'm not about
to rip it out. It would seem that there more conventional ways to get
spherical data that are just as fast. In any case all the viewer was pulling
from the quat matrix was the pitch value so I modified mouse.cxx to output to
our pitchOffset input and that works fine.
I've changed the native values to degrees from radians where appropriate.
This required a conversion from degrees to radians in a couple modules that
access the interface. Perhaps we should add interface calls that do the
conversion, e.g. a getHeadingOffset_rad() to go along with the
getHeadingOffset_deg().
On the view_offset (now headingOffset) thing there are two entry points
because of the ability to instantly switch views or to scroll to a new view
angle (by hitting the numeric keys for example). This leaves an anomaly in
the interface which should be resolved by adding "goal" settings to the
interface, e.g. a setGoalHeadingOffset_deg(), setGoalPitchOffset_deg(), etc.
Other than these two issues, the next step here will be to look at some
further optimizations, and to write support code for a tower view. That
should be fairly simple at this point. I was considering creating a
"simulated tower view" or "pedestrian view" that defaulted to a position off
to the right of whereever the plane is at the moment you switch to the tower
view. This could be a fall back when we don't have an actual tower location
at hand (as would be the case with rural airports).
ViewManager:
Basically all I did here was neaten things up by ripping out excess crap and
made it compatible as is with the new interface.
The result is that viewmanager is now ready to be developed. The two
preexisting views are still hardcoded into the view manager. The next step
would be to design configuration xml (eg /sim/view[x]/config/blahblah) that
could be used to set up as many views as we want. If we want to take the easy
way out, we might want to insist that view[0] be a pilot-view and have
viewmanager check for that.
2002-03-20 17:43:28 +00:00
|
|
|
|