1
0
Fork 0
Commit graph

1996 commits

Author SHA1 Message Date
Mathias Froehlich
3134acca83 Add the hla stuff to the cmake build system. 2011-01-17 21:35:12 +01:00
Mathias Froehlich
70dd6279a7 Add an initial implementation of a hla module. 2011-01-17 21:35:03 +01:00
James Turner
d005cae22e Bug 254: make all the HUD related options apply to hud[1], not hud[0], so they function as expected. 2011-01-16 15:31:39 +00:00
Frederic Bouvier
d0a2fbba99 Revert joystick patch. One would have to provide a better one 2011-01-14 22:37:39 +01:00
Frederic Bouvier
4d0a6f5668 Olaf Flebbe: incorporate plib js code to fix problems with MS joysticks under Vista and 7 2011-01-14 21:32:59 +01:00
ThorstenB
4458f7ce73 Enable AI traffic for offline users and issue #248
- #248: new enable/disable-ai-traffic command-line option
- AI traffic: don't wait for METAR when real-wx-fetch disabled, to
enable AI traffic when running offline
2011-01-08 21:38:26 +01:00
Torsten Dreyer
905e796e35 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-01-03 20:20:18 +01:00
James Turner
6d3773cb40 Olaf Flebbe: Removed Boost serialization linkage on MSVC 2011-01-03 09:50:05 +00:00
Torsten Dreyer
70a525d47c Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-12-31 12:23:54 +01:00
James Turner
e97eb4db85 Reduce log-level of aircraft-dir related messages. 2010-12-30 09:38:21 +00:00
Dave Luff
07d430c129 More fixes to the ATCDCL & ATC compilation
Rename ATC/atis.[ch]xx to ATC/atis_mgr.[ch]xx, to avoid confusingly
having 2 atis.cxx and 2 atis.hxx in the source tree.  Also fix a copy
and paste error in src/ATCDCL/CMakeLists.txt.
2010-12-29 18:52:39 +00:00
Dave Luff
d6fceb3fbc Remove conditional compilation of ATCDCL
This patch removes the conditional compilation of ATCDCL, compiling both
the old and new ATC systems.  The old system only provides ATIS, AWOS and
some dialog lookups, and hence should not conflict with the new system.
2010-12-28 18:23:40 +00:00
Torsten Dreyer
a0689eedd7 Cleanup: don't unbind unknown properties 2010-12-28 12:28:26 +01:00
James Turner
2b5f50e856 WIN32/MSVC fixes from Olaf Flebbe 2010-12-27 12:44:17 +00:00
Dave Luff
86505fd8bc Fix up some include paths in main.cxx
Don't include legacy ATCmgr.hxx when it is not compiled (default).
Do include 3 paths that are necessary for main, but were only picked
up indirectly through the legacy ATC code.
2010-12-26 23:19:57 +00:00
Tim Moore
958a28b97f cmake changes for osg::CullSettings::ClearMask and Fedora
HAVE_CULLSETTINGS_CLEAR_MASK was not set, so a program to test
CLEAR_MASK was added. The Posix timer function clock_gettime is in
librt on Fedora, and probably on other systems too.
2010-12-26 00:44:02 +01:00
James Turner
a91ec5f9f9 Initial work on CMake build files, with considerable help from Olaf Flebbe. 2010-12-19 15:06:04 +00:00
James Turner
0b3829810f Don't crash if WindowBuild fails. 2010-12-11 14:29:05 +00:00
Frederic Bouvier
82b1735c64 Use a syntax MSVC can compile 2010-12-10 08:28:05 +01:00
ThorstenB
b4478b56c9 Issue #66: Non alphanumeric characters in callsign 2010-12-09 16:57:12 +01:00
ThorstenB
ca8cd763af Rid some uninitialized vectors (NaNs). 2010-12-05 23:01:57 +01:00
James Turner
b9976f7d34 Fix for bug #72 - don't init traffic manager if disabled.
Disabling the traffic-manager at runtime will prevent new flights being scheduled.
2010-12-02 20:29:28 +00:00
James Turner
55c0d3f4d6 Build without OSG implicit ref-ptr conversion 2010-12-01 23:57:18 +00:00
ThorstenB
79094e8c36 Fix bug #187: check if path cache matches fg-aircraft dirs
Check if any fg-aircraft dir changed - sequence also matters.
2010-11-29 22:48:37 +01:00
Tim Moore
27a7b98284 compilation fixes for older versions of OSG 2010-11-29 22:43:52 +01:00
Tim Moore
d38fcc9979 panoramic spherical distortion
This supports the panoramic distortion option, as found in osgViewer, in
the camera file syntax of flightgear.
2010-11-28 23:29:20 +01:00
James Turner
ce8ca7853c Fix bug #125 2010-11-24 20:57:56 +00:00
James Turner
4a25fe3adc Ignore -psn_ argument if launched as a GUI app on Mac. 2010-11-22 23:28:12 +00:00
James Turner
e0aef846e3 Fixing bug #172 - warp handling during pause. 2010-11-21 23:43:41 +00:00
ThorstenB
fabf45bfd5 Use simgear abstraction for sleeping.
Fix required for Bill's OS...
2010-11-19 15:05:12 +01:00
ThorstenB
44901ae86f Tile manager improvements
Priority scheme for tile loading/removing
Cleaner tile manager interface for AI/groundcache/...
Reduce start-up delay. Drop splash screen when inner scenery is available.
Be nice to osg loader: slow-down main loop while initial scenery is still loading.
2010-11-19 13:59:43 +01:00
ThorstenB
20b58fd9ab Set initial environment visibility (thanks to kantoon) 2010-11-19 13:47:13 +01:00
ThorstenB
ca3cabc60a Kill some unnecessary include dependencies.
Speed-up compilation when working on tilemanager.
2010-11-19 13:44:52 +01:00
Tim Moore
38e1600bed add a command to print information about visible objects in the scene 2010-11-15 00:09:52 +01:00
James Turner
86b906e84e Expose SimGear and OSG versions via properties too. 2010-11-14 22:55:55 +00:00
ThorstenB
1d8913b53e Fixed path resolution (search --fg-aircraft dirs)
Do not abort early when resource doesn't match /sim/aircraft-dir.
2010-11-14 21:06:19 +01:00
Frederic Bouvier
79ece1c22c MSVC: compile with version.h if environment variable HAVE_VERSION_H is set to 1 2010-11-14 13:28:17 +01:00
Mathias Froehlich
3d54541cad Make out of source builds again work. 2010-11-14 11:07:46 +01:00
James Turner
1dbe833579 Use updated version.h if available.
Add single fallback header if version.h is missing.
2010-11-13 18:58:55 +00:00
Christian Schmitt
0a5e86f4e6 remove old .cvsignore files 2010-11-11 01:16:29 +01:00
Torsten Dreyer
0917a5e062 Bugfix: no automatic runway selection with --parkpos= 2010-11-10 23:28:07 +01:00
Torsten Dreyer
9242f3a083 Make startup.nas obsolete
This is an ugly hack for automatic runway selection on startup based on
metar data. It's main intention is to make startup.nas obsolete and
to guarantee the same runway selection logic as used for AI traffic.

Calling presets-commit from startup.nas during the initialization
sequence caused occasional trouble and sometimes, the AI traffic
operated on the opposite runway.
2010-11-10 22:19:25 +01:00
ThorstenB
85185b56c5 Fixed hot-spot display for 3d modes
Also set left/right culling masks (standard mask no effect when 3d rendering is enabled).
2010-11-08 00:24:41 +01:00
James Turner
0cb0c59bc9 FGIO uses new SGSubsystem shutdown() logic 2010-11-06 07:22:37 +00:00
James Turner
c053de6b4c If preset-commit occurs during init, skip most re-init logic. 2010-11-02 23:19:09 +00:00
James Turner
eeaf4b13e6 Unify reset/reposition code-paths, and ensure initial state is preserved by a reset. 2010-11-02 22:45:43 +00:00
James Turner
0d6de72b57 Add headerpax-max-install-names, for Mac deployment. 2010-11-02 14:24:09 +00:00
Csaba Halasz
27782d7c8b Added null pointer check to AI subsystem tear down in FGGlobals destructor to avoid crash when using --help option 2010-10-31 00:36:54 +02:00
ThorstenB
7dd2cf19e8 Fixed some compiler warnings.
Please the compiler (gods).
2010-10-29 21:14:09 +02:00
James Turner
d1a4590721 Goodbye old HUD - and the archeology it depended upon in cockpit.cxx 2010-10-29 08:47:58 +01:00
James Turner
e9f4106bc1 Remove confusing default (missing) path from 2D panel code. 2010-10-28 13:54:45 +01:00
James Turner
c96206aafd Tweak shutdown code, chasing intermittent segfaults on shutdown. 2010-10-26 23:42:34 +01:00
Torsten Dreyer
4371a18771 resurrection of /sim/rendering/draw-otw 2010-10-26 21:20:01 +02:00
James Turner
0e53e2cbb1 PLIB net removed from FlightGear 2010-10-24 07:10:51 +01:00
James Turner
984900d84d Make v2 HUD a top-level subsystem, so it can be reinit()ed correctly. 2010-10-24 07:10:02 +01:00
James Turner
957a59e57a Investigating an intermittent shutdown crash; fix deletion of AIManager. 2010-10-23 19:09:08 +01:00
James Turner
d573cb43a0 Move three more subsystems into the init + update scheme - fixes some crashes found by papillion. 2010-10-22 16:44:37 +01:00
James Turner
f5c2c630eb Remove references to old (unused) airways code 2010-10-20 17:54:16 +01:00
James Turner
dd2eec7bd8 Airways/procedures code - add new data structures to store waypoints and
procedures, and routing algorithms, and modify the GPS, route manager and
WaypointList to use the new objects.
2010-10-20 09:02:02 +01:00
James Turner
9b2cea33e8 Remove uneccessary explicit update of FGLight 2010-10-05 23:17:32 +01:00
James Turner
0c342308eb Make MultiPlayer a well-behaved subsystem. 2010-10-05 23:17:32 +01:00
James Turner
d39841d2df Make FGAircraftModel behave like a standarrd subsystem. 2010-10-05 23:17:32 +01:00
James Turner
0beab94cb5 Make the tile-manager a well-behaved SGSubsystem 2010-10-01 19:09:19 +01:00
James Turner
1afd4e602e Get rid of FGGeneral; expose equivlanet values via properties. 2010-10-01 09:33:31 +01:00
James Turner
af4e47179e Kill off fgRequestRedraw 2010-09-30 23:13:11 +01:00
James Turner
84b45683fc Refactor exit code, so the osgViewer gets 'done'. 2010-09-30 23:13:11 +01:00
James Turner
f969504e6b Tidy fg_commands header. 2010-09-30 23:10:00 +01:00
Torsten Dreyer
5c6fe95259 Environment controller overhaul
This is the initial commit for a reworked environment controller.
The main intention is to decouple the individual modules like
metar fetch, metar properties, environment interpolation etc.
to make it easier for other weather module developers to modify
environment settings.
As a side effect, the dialogs for weather-scenario, weather-conditions,
clouds and precipitations have been merged into a single dialog
2010-09-11 16:11:35 +02:00
James Turner
7227973e2f Don't expect an 'Aircraft' sub-directory within each aircraft-dir. 2010-09-08 11:01:26 +01:00
James Turner
e8b0bb872a Register the aircraft resource provider. 2010-09-06 22:57:48 +01:00
James Turner
8330449c5f Pass current-dir into XMLSound
(and update to revised SGSoundSample ctor)
2010-09-06 09:28:28 +01:00
James Turner
a7a2cb393a Use the new Simgear ResourceManager to resolve paths. 2010-09-06 09:13:10 +01:00
Torsten Dreyer
1e43675f61 Expose some OSG DisplaySettings to the property tree 2010-09-05 11:56:38 +02:00
Torsten Dreyer
54e6757211 Autopilot is more than just an autopilot: Introducing: "property rule"
The autopilot has grown beyond being just an autopilot. It's
components, filters and controllers could be used to set property
values based on complex rules and driven from other property values.
That's why I chose to give it the name "property-rule".
This patch allows to define an arbitrary number of property rules under
a/sim/property-rule[n]/path
using the same syntax as autopilot configurations.
2010-08-18 18:50:07 +02:00
James Turner
dbd9935c52 Expose aircraft-dirs under /sim (read-only, for security) 2010-08-16 11:00:54 +01:00
Torsten Dreyer
e43456ba43 Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-08-15 20:35:14 +02:00
Torsten Dreyer
60f7d0f16c Downgrade the ridgelift to a subsystem of environment 2010-08-15 20:33:29 +02:00
James Turner
bca3494462 Support relative paths in 'loadxml' command
(relative to FG_ROOT or an aircraft dir)
2010-08-15 11:02:15 +01:00
Torsten Dreyer
bb2d1f55e9 Interpret environment variables and hostname on Windows
- Point the homedir variable to %APPDATA%/flightgear.org. This
enables .fgfsrc in this path for windows users.
- Evaluate the returncode of gethostname() to not strdup() bogus
characters on failure. Also mainly on windows.
2010-08-06 09:06:32 +02:00
James Turner
7f36caede6 Create TimeManager subsystem, and collect the time related code out of main.cxx and fg_init.cxx into it.
Remove the unfortunately named 'tmp.[cxx|hxx]', pushing the remaining code in FGLight.
(second try, with init bug fixed)
2010-08-04 09:16:37 +01:00
David Luff
53358a55bf Remove old AI system 2010-08-03 00:21:56 +01:00
James Turner
47fd8a8a2a Revert "Create TimeManager subsystem" - not quite ready for prime-time yet!
This reverts commit 50eb95dcad.
2010-08-02 00:23:36 +01:00
James Turner
50eb95dcad Create TimeManager subsystem, and collect the time related code out of main.cxx and fg_init.cxx into it.
Remove the unfortunately named 'tmp.[cxx|hxx]', pushing the remaining code in FGLight.
2010-08-01 20:33:11 +01:00
James Turner
388a0a5b6a Make saveInitialProperties smarter, and hence simplify the reset code path. 2010-08-01 19:04:20 +01:00
Durk Talsma
7c73c7d3e5 Added some stubs in the flightgear main code to eventually add a full, FGSubsystems based ATIS system that will serve as a replacement for the ATCDCL code. 2010-08-01 16:16:33 +02:00
James Turner
d9236f33b2 Remove use of simgear/screen/extensions.h. 2010-07-31 15:15:40 +01:00
James Turner
8e5f3ac8a3 Set the key SGModelLib callback to make aircraft-dir OSG loading work. 2010-07-29 01:07:32 +01:00
James Turner
ab495d1370 Add --fg-aircraft option, and aircraft dir path list. Partial support in places that load files, for respecting the setting.
Add helper to look for an aircraft branch path in multiple candidate locations.
Update the main subsystems to use the helper, and hence load from any aircraft dir.
2010-07-28 22:03:10 +01:00
James Turner
d1852430bf Make various implicit includes (via PLIB) explicit. 2010-07-28 10:25:42 +01:00
James Turner
9604908a8d Remove all (2) uses of simgear/math/vector.h from FlightGear. 2010-07-23 13:26:07 +01:00
James Turner
900fce6374 Fix issues exposed by PLIB-free SimGear. 2010-07-23 09:41:37 +01:00
James Turner
bf52c378a4 Clean up names in --show-aircraft; avoid -set.xml suffixes. 2010-07-22 01:36:32 +01:00
James Turner
c95a5db23d Rewrite --show-aircraft and --aircraft handling to share directory search code.
As a bonus, sort the --show-aircraft list case-insensitively.
2010-07-17 14:12:52 +01:00
James Turner
af3f072c21 Convert scenery path setup to use simgear::Dir 2010-07-17 14:12:52 +01:00
James Turner
2c90eb8370 Convert --show-aircraft to use simgear::Dir 2010-07-17 14:12:52 +01:00
James Turner
c32da90e5c Ensure sim/signals/fdm-initialized is only fired on a rising edge; add sim/fdm-initialized as the state value. 2010-07-13 13:47:24 +01:00
James Turner
c47d4f2f30 Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group (which is new) 2010-07-08 23:24:39 +01:00
James Turner
07d055b4de One more juggle to appease the linker gods. 2010-07-02 10:00:05 +01:00
James Turner
cfe9aaac4c Juggle fgfs link order to keep GNU ld happy. 2010-07-02 09:06:57 +01:00
James Turner
88e65f7662 aircraft.[cxx|hxx] is gone. 2010-07-01 22:56:22 +01:00
James Turner
18d42ec1af Rename reInit() method to 'resetSimulator', and document that it's hooked up to the 'reset' command. 2010-07-01 22:50:11 +01:00
James Turner
d279c394d7 Clean fg_init.hxx 2010-07-01 22:43:28 +01:00
James Turner
01e0156b5d Remove current_aircraft global, fgAIRCRAFT struct, and dead code for reading aircraft dirs. 2010-07-01 22:33:51 +01:00
James Turner
3f26d2b14b Trivial cleanup commit, to test continuous integration server. 2010-07-01 19:51:05 +01:00
James Turner
fec7cb977c Clarify warnings from fgUntie, and fix one source of such warnings, in FGInterface. 2010-07-01 02:04:16 +01:00
Durk Talsma
3c60bf6511 Make sure also not to try running AI_mgr when compiling fgfs with --disable-atcdcl. FlightGear can now actually run without segfaulting when compiled this way. 2010-06-27 10:08:26 +02:00
Torsten Dreyer
4466729987 fix assertion in sunsolver.cxx with --timeofday=xx 2010-06-26 21:58:45 +02:00
Torsten Dreyer
2e6d7e111a gcc warning fixes 2010-06-26 21:24:46 +02:00
Torsten Dreyer
e1b9d3d759 Don't crash if built with --disable-atcdcl 2010-06-26 20:24:34 +02:00
James Turner
180e524a0e Fix automake build after mainloop changes - especially, JSBSim includes. 2010-06-26 18:37:51 +01:00
James Turner
f9ec605ffb Fix ordering of aircraft-model updates against flight model. 2010-06-26 10:31:22 +01:00
James Turner
85be9be1e0 Initial work on FDM shell, and removal of cur_fdm_state 2010-06-26 10:31:22 +01:00
James Turner
4756cd4882 Wrap SGEphemeris in a subsytem/property interface, and remove from mainloop. 2010-06-26 10:31:21 +01:00
James Turner
3fbf3aa080 Make FGAircraftModel more subsystem-alike, move update to fgMainLoop. 2010-06-26 10:31:21 +01:00
Torsten Dreyer
d558b52cb6 New autopilot subsystem implementation.
Split the former single-file-implementation in xmlauto.?xx into multiple
files and use some OO techniques. Started with documentation to be used
with doxygen.
2010-06-24 17:09:33 +02:00
Tim Moore
0f8312150d Log OpenGL vendor and version string 2010-06-15 23:58:55 +02:00
Mathias Froehlich
f433f4d973 Default the screen and display number to a value >= 0 2010-06-14 22:05:15 +02:00
Tim Moore
b692a165fb Remove osgGA/MatrixManipulator include
From AndersG; the file is gone from recent OSG.
2010-06-06 23:31:47 +02:00
Torsten Dreyer
c89b18ddbd Ignore generated files
add generated files to gitignore that has also been in cvsignore
remove generated config.h-msvc* from source control
2010-06-02 11:27:16 +02:00
Tim Moore
473cea7f17 remove references to osgGA::MatrixManipulator
This class has been removed in current OSG sources.
2010-05-31 07:06:55 +02:00
James Turner
ad19acf1c6 Remove C++ autobrake code - this can all be done easier in XML now! 2010-05-29 10:36:23 +01:00
Jeff Taylor
09f3ee6351 Fix fgviewer segfault
fgviewer crashes when reading weird channel options (which it doesn't use).
Here is a patch which fixes this by adding a pointer check.
2010-05-23 20:13:09 +02:00
Tim Moore
fcb255d19e Merge branch 'ehofman/sound-reinit' into next 2010-04-12 10:02:01 +02:00
ehofman
5d0d6998d2 Don't forget to resume the sound system after reinit 2010-04-12 10:01:51 +02:00
ehofman
2b83ed9cbe allow reinitializing the sound system by setting /sim/sound/working to false at runtime. 2010-04-12 10:01:28 +02:00
Tim Moore
33aead9a21 Merge branch 'jmt/view' into next 2010-04-03 22:34:15 +02:00
jmt
bc7c3ad4c6 bug99 - Fix case where damping is enabled, but factor is 0. 2010-04-03 22:34:07 +02:00
jmt
a33745e888 Bug #99 - change viewer damping calculation, to work correctly regardless of set/recalc/update ordering per frame. 2010-04-03 22:34:00 +02:00
Tim Moore
2229af9f78 Merge branch 'ehofman/particle' into next 2010-03-28 00:35:35 +01:00
ehofman
e78c56af7d Allow particles to be frozen on pause. 2010-03-28 00:35:28 +01:00
Tim Moore
dba4a69e2c Merge branch 'torsten/commands' into next 2010-03-27 15:45:44 +01:00
torsten
5df9f6a951 Code cleanup: reuse duplicate code. 2010-03-27 15:45:25 +01:00
Tim Moore
7ee645aa20 Merge branch 'timoore/getpath-rebase' into next 2010-03-09 11:25:18 +01:00
Tim Moore
7ff80d11a0 changes for SGPropertyNode::getPath return type
It's now a std::string.
2010-03-09 11:24:45 +01:00
Tim Moore
d61d14aa91 Merge branch 'jmt/gui' 2010-02-25 12:04:58 +01:00
Tim Moore
351d1ddb5e Merge branch 'jmt/gui' into next 2010-02-17 07:41:48 +01:00
jmt
4f99561f63 Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages.
Commit split by timoore in order to apply most of it to maint branch.
2010-02-17 07:41:23 +01:00
V Meazza
00a9151b1a Add Stencil Lighting
Signed-off-by: V Meazza <vivina.meazza@lineone.net>
2010-02-10 15:54:48 +01:00
Tim Moore
fba05c527f Merge branch 'torsten/track' 2010-02-10 00:45:28 +01:00
Tim Moore
988a6771aa Merge branch 'durk/atcdcl-cond'
Conflicts:
	src/ATC/trafficcontrol.cxx
	src/Main/Makefile.am
2010-02-10 00:45:06 +01:00
Tim Moore
3e0489bd91 Merge branch 'torsten/auto' 2010-02-10 00:41:44 +01:00
durk
e54798a8e2 A couple of last-minute patched / bugfixes to mitigate the probability of collisions between user controlled aircraft and AI traffic.
* AI aircraft distance to user proximity detection works again (lat/lon were inverted).
  * The parking uses by the user aircraft is marked as such to prevent it being reused by an AI aicraft
  * AI aircraft won't receive permission for pushback until the user aircraft is at a fair distance.
2010-01-31 17:52:43 +01:00
fredb
00e9ad3055 MINGW patch from Benoît Laniel 2010-01-25 17:12:04 +01:00
durk
a023700ebe Update base package version check. 2010-01-21 06:30:35 +01:00
Tim Moore
98d8a98ef2 Merge branch 'ehofman/sound' 2010-01-13 07:30:52 +01:00
Tim Moore
a89a28c4e6 Merge branch 'ehofman/version' 2010-01-12 09:16:02 +01:00
Tim Moore
0d9f2e3c95 Merge branch 'topic/pu-crash' 2010-01-11 07:46:27 +01:00
ehofman
8e4d979aca Don't initialize the soundmanager wehn defining --disable-sound. Sound can still be enabled at runtime by setting /sim/sound/working to 'true' 2010-01-10 23:33:57 +01:00
durk
d8ae90801a Some additional changes to ensure that FlightGear at least compiles after configuring with --disable-atcdcl. Some substitution code is added in ATC/atcutils.cxx and ATC/atcutils.hxx. Note that the new code doesn't run properly yet. Instead, it is just meant to identify which parts need replacement. Getting that to work will be the next step. 2010-01-05 22:21:49 +01:00
torsten
78d8e7edfd now that there is a true track property, the magnetic track is nice to have, too. 2010-01-05 22:19:58 +01:00