2002-02-19 15:16:08 +00:00
|
|
|
if ENABLE_NEW_ENVIRONMENT
|
|
|
|
|
WEATHER_DIR = Environment
|
2000-02-15 06:12:40 +00:00
|
|
|
else
|
|
|
|
|
WEATHER_DIR = WeatherCM
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if ENABLE_NETWORK_OLK
|
|
|
|
|
NETWORK_DIRS = Network NetworkOLK
|
|
|
|
|
else
|
|
|
|
|
NETWORK_DIRS = Network
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
SUBDIRS = \
|
|
|
|
|
Include \
|
|
|
|
|
Aircraft \
|
|
|
|
|
Airports \
|
2001-11-07 17:55:28 +00:00
|
|
|
ATC \
|
2000-02-15 06:12:40 +00:00
|
|
|
Autopilot \
|
|
|
|
|
Cockpit \
|
|
|
|
|
Controls \
|
|
|
|
|
FDM \
|
|
|
|
|
GUI \
|
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
|
|
|
Input \
|
2000-04-21 04:20:35 +00:00
|
|
|
Navaids \
|
2000-02-15 06:12:40 +00:00
|
|
|
$(NETWORK_DIRS) \
|
|
|
|
|
Objects \
|
|
|
|
|
Scenery \
|
2001-03-05 22:54:20 +00:00
|
|
|
Sound \
|
2000-02-15 06:12:40 +00:00
|
|
|
Time \
|
|
|
|
|
$(WEATHER_DIR) \
|
|
|
|
|
Main
|