1
0
Fork 0
Commit graph

1996 commits

Author SHA1 Message Date
Durk Talsma
f9a5f921a4 Merge branch 'next' into durk-atc
Resolving merge conflicts indicated below.
Conflicts:
	src/ATC/CMakeLists.txt
	src/ATC/Makefile.am
	src/Main/fg_init.cxx
2011-06-01 20:46:34 +02:00
James Turner
2b967608a0 Expose FGPositioned data via property tree, and make comm-stations a real FGPositioned subclass. 2011-06-01 17:45:22 +01:00
Durk Talsma
de1564d83e Merge branch 'next' into durk-atc 2011-05-31 20:38:42 +02:00
ThorstenB
863551a932 fix #142: initial window position
Be (at least a bit) smarter with initial x/y position
Also some minor type/comment issues.
2011-05-29 18:46:11 +02:00
James Turner
9c983359aa Move all MP code in src/MultiPlayer.
Allow the subsystem to be (re-)inited at runtime.
2011-05-29 00:04:30 +01:00
James Turner
a32ef9f391 Fix yet another subtle resize problem I introduced, which upset PUI. This code is terribly fragile - yuck. Thanks to papillion 81 for tracking down the issue, 2011-05-28 21:20:06 +01:00
James Turner
1b4e5e1b91 Unfortunately, the view code relies on resize being called each frame ... bah. Fixes startup aspect ratio for the moment. 2011-05-25 12:18:07 +01:00
James Turner
436abe1e62 Factor timeofday command into the TimeManager 2011-05-25 12:13:25 +01:00
James Turner
5bae2e3d37 Merge branch 'refs/heads/topics/loadfp' into next 2011-05-25 11:51:33 +01:00
James Turner
fe1bedad32 Make --flight-plan option delegate to the route-manager loadRoute code, and hence support XML flight-plans. 2011-05-25 08:21:45 +01:00
James Turner
c09c0e6941 First attempt at support for loading airport XML files via a command 2011-05-25 00:03:51 +01:00
James Turner
0ec9a9492f Minor cleanup of resize() handler, while tracing down an OS-X Windowing issue. 2011-05-24 23:56:44 +01:00
ThorstenB
bdeeab8453 #323: Bad init sequence could segfault
Oops, early window event callbacks could trigger issues on some systems.
Fixes an issue caused by my commit 473d1447c3
2011-05-22 22:56:51 +02:00
ThorstenB
dd9d82d941 Some minor splash screen status improvements. 2011-05-22 18:32:15 +02:00
ThorstenB
51bb633e55 Bugfix for #106: main view port aspect-ratio broken when 2D panels are moved
Seems the hack was necessary for the pre-OSG display only. Or the feature
is broken since OSG port altogether. But it caused issues for 3D and 2D
cockpits when /sim/virtual-cockpit wasn't enabled. => Removing for now.
2011-05-22 18:32:15 +02:00
ThorstenB
2a9f87e42c Fixed blocked splash-screen on sim reset
Fixes Commit 9a3fb418e4
2011-05-21 17:12:37 +02:00
ThorstenB
9a3fb418e4 Fixed #321: --enable-clock-freeze freezed the splash screen
Splash screen effect must use system time - not freezable sim time
2011-05-21 14:54:38 +02:00
ThorstenB
87647b40cb Fix win-compile for new pause command. 2011-05-21 14:07:03 +02:00
ThorstenB
53a954d631 New "pause" fgcommand.
Original property-rules in keyboard.xml toggled master and clock freeze
independently - which caused issues when only one property was true. New
command toggles both properties consistently.
2011-05-21 13:27:09 +02:00
ThorstenB
473d1447c3 Minor renderer clean-up & performance bits.
Use non-static methods so we can use member variables.
2011-05-21 13:24:23 +02:00
ThorstenB
2088a61f2f Revert "make clearcolor black, so that space is dark instead of gray."
This reverts commit b36b33f716.

See #316: Caused issues with sky becoming black in dense fog.
Also: when the fog issue is solved, we could configure the constant
(black) clear color once only (during init), no need to do it in every
loop. Also, entire "if (skyblend) { ... } else {..}" was redundant,
since "if" and "else" clauses were all identical - and the "clearColor"
variables were unused. => Once the fog issue is solved, we can easily
improve the clearColor configuration here.
2011-05-21 09:16:21 +02:00
ThorstenB
9bd00a62fa Continuous replay: use correct replay duration
(LinuxTag live hacking...)
2011-05-14 10:19:51 +02:00
Torsten Dreyer
76ea9a7968 Remove unused class SGEnviro
This class and their source files visual_enviro.[h|c]xx were
unused since OSG transition. It's only functionality was to
keep a variable for the enable-state of rendering of precipitation.
This has now been moved to SGPrecipitation.
This patch also removes all references to this class and
visual_enviro.hxx. Wxradar needs a new implementation for cloud
echoes which probably should be part of fgclouds.

See also SimGear commit 4e6159aa07f2817c09fad72db64d713e47f6f3da
2011-05-06 14:12:17 +02:00
Curtis L. Olson
e81479d857 Bruce Hellstrom @ ATC Flight Sim.
New module contributed: AV400WSim.
Supports communication with external (aka real) Garmin 400/500 WAAS flight
sim units.  Includes changes to options.cxx and fg_io.cxx to support
invoking and configuring the new module.
2011-05-03 11:12:55 -05:00
Frederic Bouvier
aae1b5494f Remove vim swap file 2011-04-19 22:32:23 +02:00
ThorstenB
e42a8f597c Automatic tower positioning
New "auto-position" switch to always use closest tower for tower-view.
Exposes new "/sim/airport/closest-airport-id" property.
Display closest airport on groundradar by default.
2011-04-18 22:54:33 +02:00
ThorstenB
9c3571da5f ADF2 support
New "--adf2" option.
Also introducing "--adf1" for consistency, while keeping legacy "--adf".
2011-04-17 17:35:31 +02:00
Erik Hofman
b36b33f716 Lauri Peltonen: make clearcolor black, so that space is dark instead of gray. 2011-04-16 11:35:56 +02:00
ThorstenB
82f6d29f9f Improve OSG caching.
Ensure property tree is provided early to modellib.
To disable: --prop:sim/rendering/cache=0 (enabled by default)
(also requires simgear update)
2011-04-03 19:13:51 +02:00
Durk Talsma
b9b2d9386c Merge branch 'next' into durk-atc 2011-04-03 17:25:29 +02:00
Durk Talsma
960f6881c9 Merge branch 'next' into durk-atc 2011-04-19 18:02:30 +02:00
Durk Talsma
ee9a5cf73d Merge branch 'next' into durk-atc 2011-04-17 10:21:09 +02:00
Durk Talsma
49677f512b Merge branch 'next' into durk-atc 2011-04-04 20:33:41 +02:00
Durk Talsma
52b0baace1 adding changed files for previous commit. 2011-04-03 17:58:16 +02:00
ThorstenB
4141b80b0c fix #296: FDMshell+TankProperties not bound after sim reset
Well, when we need to unbind something temporarily, it's wise to really
bind it again...
2011-03-29 23:31:59 +02:00
ThorstenB
38226af24e Improve timing statistics
Enable/disable and print statistics at run-time.
Configurable intervals and filters.
2011-03-23 23:09:02 +01:00
ThorstenB
5ace4e9632 Fix reset during replay issue
Need to properly reset the replay manager's states on sim reset.
Also remove obsolete method.
2011-03-22 21:02:57 +01:00
ThorstenB
b6d70d2c71 Replay improvements
Clear replay buffers on sim reset.
Allow instant replay to be activated properly when sim is paused.
2011-03-20 15:03:47 +01:00
ThorstenB
f6fde388a2 Untie all TiedPropertyLists before destruction.
Untieing needs to be done prior to the destruction of the object which
aggregated the TiedPropertyList. So the TiedPropertyLists destructor can't
untie the properties automatically (and it doesn't). So, do some manual
clean-up.
2011-03-07 19:38:48 +01:00
Torsten Dreyer
1050a35d92 prepare for subsystem_mgr.hxx no longer including props.hxx
subsystem_mgr.hxx will soon no longer include props.hxx since it
does not (need to) know about properties at all.
2011-02-27 12:53:47 +01:00
Torsten Dreyer
6c3035af60 allow proxy to set as an url 2011-02-20 17:14:30 +01:00
Torsten Dreyer
3ccfdac8fe use http_proxy environment variable 2011-02-20 11:42:21 +01:00
ThorstenB
7bc9749d91 Support scenery reloading (needs simgear update).
TileMgr subsystem reinit: remove all scenery tiles from scenegraph and
clear cache (simgear update required).
"normal" sim resets: no TileMgr reset is needed (avoid reloading scenery).
2011-02-13 19:26:55 +01:00
ThorstenB
45f526aca5 Minor output format issue. 2011-02-13 19:26:32 +01:00
ThorstenB
07fe929288 Fixed helicopter view.
Corrected the new panning check: panning rotates around the y-axis,
so the x- or z-axis need an offset != 0 (not x-/y-axis).
2011-02-01 19:23:05 +01:00
ThorstenB
91d001ff4e Fix viewer issue with Tower and Chase View.
When looking _at_ a model with an x,y offset of 0,
then the view heading has no effect. So, force heading offset property
to 0 to keep other property consumers from running incorrect calculations.
=> Trying to rotate the heading offset in Tower/Chase view no longer
rotates the blue sky around the aircraft, though the viewer itself
isn't rotating anything.
2011-01-30 17:35:07 +01:00
Frederic Bouvier
86bb7f39f9 Ignore a generated file 2011-01-28 20:15:43 +01:00
Frederic Bouvier
511e10142d Cmake: use different icons for 32-bit and 64-bit executables 2011-01-28 19:34:49 +01:00
Frederic Bouvier
0807cf3ae6 Cmake: set an icon to the Windows executable 2011-01-28 19:30:27 +01:00
Torsten Dreyer
e86cecf470 Fix bug #253, at least partially
make options
--wind=nnn@mm
--visibility
--visibility-miles
--ceiling
--turbulence
work again. These options now write properties in the
/environment/config/presets
branch. The values will be applied in the property-rules
in FGDATA/Environment/interpolator.xml
2011-01-19 19:36:04 +01:00
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