fly/flightgear
1
0
Fork 0
Code Activity
10949 commits 1 branch 0 tags 41 MiB
Commit graph

2228 commits

Author SHA1 Message Date
Mathias Froehlich
742f0eb939 Fix compile past last simgear change. 2012-03-03 14:05:43 +01:00
ThorstenB
da73dd97d3 Clean-up cmake (linker) dependencies. 2012-02-24 22:23:15 +01:00
Torsten Dreyer
62dfa8cc64 new command: property-interpolate 
exposes the SGInterpolator to <binding><command>
formerly only accessible via Nasal
 2012-02-02 22:17:34 +01:00
Torsten Dreyer
72483d565b initialize the heading-indicator/offset-deg in it's class 
Don't initialize the offset in the main loop but in
the init method of the implementing class. This ensures
it gets initialized if you instantiate more than one
heading-indicator and does not initialize the property for
unsused heading-indicators (no more stray heading-indicator-fg
property anymore).
 2012-02-01 22:24:06 +01:00
ThorstenB
5f6012802f Use existing define to supply version number. 2012-01-31 21:42:37 +01:00
ThorstenB
3e08e5ecfe Minor clean-up. 2012-01-29 10:34:11 +01:00
ThorstenB
477e621633 #561: normalize to [0-360[ 2012-01-22 19:15:25 +01:00
ThorstenB
90ce4ec93d Clean-up: move autosave.xml loading code to proper method 2012-01-17 23:49:25 +01:00
Torsten Dreyer
3bfee87bba bump version number to 2.7.0 2012-01-17 08:36:20 +01:00
Torsten Dreyer
979fc9785b bump version number to 2.6.0 2012-01-17 07:46:52 +01:00
ThorstenB
0b6579e0e4 Fix a minor warning. 
System complains about "system" call's result being ignored.
 2012-01-12 22:14:17 +01:00
ThorstenB
6f4a090770 #199: fix issue with relative paths 
Relative paths don't work with FG. Since we Linux users just love
command-lines and often do use relative paths, make sure to convert them
before use.
 2012-01-12 22:14:17 +01:00
Mathias Froehlich
db241f3e10 Handle unset texture-compression property correctly. 2012-01-08 20:19:36 +01:00
ThorstenB
484d3c61f8 #561, clean-up using normalizePeriodic. Thanks to Hyde & James. 2012-01-07 08:17:34 +01:00
James Turner
a0bfa25aa7 Tweak the app-data path on Mac, after discussion with Tat. 2012-01-05 22:10:19 +00:00
ThorstenB
23cdb0d302 #561: keep magnetic heading within limits when mag-variation is negative 
Thanks to Hyde!
 2012-01-04 00:00:10 +01:00
ThorstenB
dac00efbc7 Fix some compiler warnings. 
Comment out unused code.
 2012-01-02 23:16:17 +01:00
ThorstenB
229d9273d7 #545 related: User settings not saved when window was closed 
via the window buttons instead of pressing ESC or using menu exit.
(More code should be moved after the 2.6 release)
 2011-12-30 00:39:31 +01:00
Mathias Froehlich
48b4596a5f Make the use of the compressed internal format a configuration option. 2011-12-29 12:24:04 +01:00
Erik Hofman
cbdd89493f properly add librt when clock_gettime is used 2011-12-24 11:34:35 +01:00
ThorstenB
b575446b36 Add some debug messages to help analyzing #385. 2011-12-17 15:26:50 +01:00
ThorstenB
dcaf3d9aea Avoid spamming the log output 
Stop printing "State == Running" debug messages in every update loop
(makes "--log-level=debug" a lot more usable)
 2011-12-17 15:22:50 +01:00
ThorstenB
d47342a5a4 Add --log-class option, improve logging classes. 
Replace SG_GENERAL by more specific log classes in many places.
Allow "," to separate logging classes (using "|" is odd on the
command-line).
Also add new option to make logging more useful for developers.
You can use:
  --log-level=debug --log-class=environment
to only get environment debug messages, or
  --log-level=debug --log-class=sound,ai
to only get debug messages related to the sound or AI subsystem.
 2011-12-11 14:06:17 +01:00
Frederic Bouvier
14b76a1d63 Multiple --atlas options are valid (one for Atlas, one for Terrasync) 2011-12-11 13:12:18 +01:00
ThorstenB
07aa70dce9 sound: fix sound-buffer-in-use issue 
FGFX objects must be dereferenced early enough, and sound manager must be
removed late enough - otherwise openal complains about resources being
still in use when tryin to remove buffers.
Also: do not create FGFX objects for AI/MP aircraft, when AI sound is
disabled.
 2011-12-04 17:18:02 +01:00
ThorstenB
9933a7cb4a cmake: add support for Torsten's UDev EventInput 
(Hopefully meeting Torsten's quality expectations)
 2011-12-04 14:37:25 +01:00
ThorstenB
32c4cfa768 Fix shared library build for metar executable 2011-11-30 21:45:22 +01:00
James Turner
f054f15693 Fixes for linking with shared SimGear. 2011-11-29 10:24:33 +00:00
ThorstenB
e1c1a28288 Introduce some structure in fgMainLoop. 
- Move some code to sub functions.
- Make sound manager a subsystem-manager member (and make sure it's
still processed last).
 2011-11-20 16:21:15 +01:00
ThorstenB
339c57e0b2 Adapt path of performance-monitor properties. 2011-11-19 22:37:13 +01:00
James Turner
a05ea36acb Restructure GUI code, isolate PLIB in source files, to ease future refactoring and alternative GUI layers. 2011-11-19 20:25:51 +00:00
ThorstenB
4b2506d709 Add new performance monitoring subsystem. 
Rename some subsystems for naming consistency.
 2011-11-19 15:37:49 +01:00
James Turner
85924cf953 Fix some Windows std:: namespace issues. 2011-11-13 21:27:55 +00:00
Mathias Froehlich
42fb9b8e9f Consolidate the different ReaderWriterOptions classes. 2011-11-13 18:34:53 +01:00
James Turner
f51d58686a Fix http://code.google.com/p/flightgear-bugs/issues/detail?id=484, further compatibility with previous options processing ordering. 2011-11-10 09:15:41 +00:00
James Turner
c1eca1ff6b Refactor SGSky handling and ownership - sink into Renderer, remove global variable 'the sky', and hence clean up main loop and subsystem creation a little more. 2011-11-05 17:11:52 +00:00
James Turner
a4a8d08392 JPEG-server support, in the CMake world. 2011-11-05 17:11:39 +00:00
James Turner
daf644d600 Revert my code-cleanup, causing startup crashes, bah. 2011-11-04 12:02:43 +00:00
James Turner
ecced6be78 Fewer static properties in the main loop, minor code tidying. 2011-11-04 09:40:09 +00:00
Anders Gidenstam
cc1ab5b8b5 src/Main/options.cxx: It is rather common to have two --multiplay arguments. 2011-11-02 20:35:37 +01:00
James Turner
70b4f38ebc Goodbye automake. 2011-11-01 11:15:53 +00:00
James Turner
e3037b638f Restore options *processing* order (which is now distinct from *parsing* order), to resolve issues when distinct but internally overlapping options are specified, e.g. for initial position or time. 2011-10-31 13:08:58 +00:00
ThorstenB
c697c3cc3d Fix stupid compile-time switch issue... 
... introduced by recent commit.
 2011-10-30 20:49:48 +01:00
ThorstenB
acdf0dc469 Clean-up date/time option parser. 
Add range checks and provide error messages.
Extend time offset to 64bit - so we're safe for 2038-01-19 (and the next
couple of millions years beyond...).
Support partial date/time strings, such as --start-date-gmt=2011 or
--start-date-gmt=:::12:00:00
 2011-10-30 14:48:53 +01:00
Mathias Froehlich
2a4657c609 Fix returning reference to temporary. 2011-10-30 10:31:41 +01:00
ThorstenB
b6695cd3fa Configure font in osg StatsHandler for OSG3. 
OSG3 relies on "fonts/arial.ttf" being available. FG doesn't provide it -
so it's not necessarily available everywhere (not here). Use one of our
txf fonts instead.
 2011-10-29 21:58:11 +02:00
Curtis L. Olson
f59a0611f2 Add OPTION_MULTI to several more options that could potentially be used 
multiple times to write/read data to more than one source.
 2011-10-29 10:34:06 -05:00
Mathias Froehlich
49b82663e2 Forward resize events to the stats handler. 2011-10-29 14:12:08 +02:00
James Turner
facf4c12d4 Make various protocols support multiple definitions, with the new options parsing code. 2011-10-29 11:15:45 +01:00
Mathias Froehlich
0bd7078c42 Make use of SGTimeStamp for sleep* 2011-10-28 17:01:50 +02:00
James Turner
956ba8845b Fix Mac crashing on exit - link order determines library load order at runtime, and both ALUT and OpenAL.framework (on Mac) define the alut symbols. Fix the order so we always use ALUT.framework for the alut symbols. 2011-10-28 15:09:10 +01:00
James Turner
16a54a4409 Change a hot-spot in the AI code, to use cartesian instead of geodetic math. 2011-10-26 17:26:11 +01:00
Mathias Froehlich
fea00cc9f8 Add seamless view muliscreen configuration. 
Add a new way to configure multi screen systems.
The new version allows easier configuration of displays
that need to fit at the edges as well as configurations
where the screens match at reference points.
This kind of screen configuration will again zoom.
 2011-10-23 16:40:13 +02:00
Mathias Froehlich
ad660380c2 Add fixed-near-far camera config parameter. 
If set to true, the decision about the near and far
planes in the viewer are still adapted to not clip away
everything before the configured near plane.
 2011-10-23 16:40:13 +02:00
James Turner
e50ff87300 Relocate appData fgfsrc loading prior to init of fg-root, so we can specify --fg-root that way. 2011-10-21 16:49:15 +01:00
James Turner
e1be74902a Fix automake linkage of metar utility. 2011-10-21 14:15:40 +01:00
James Turner
1b3ea65b5e Hold an owning ref to the HTTTP request. 2011-10-21 12:58:19 +01:00
James Turner
c5cbc57895 Bring metar helper into CMake world, and use new HTTP code. 2011-10-21 12:48:42 +01:00
James Turner
b1b4b7ecf4 Fix (nearly) all the std:: namespace violations in headers, in preparation for fixing SGsmplstat.hxx to *not* do a 'using namespace std'. 2011-10-17 17:41:59 +01:00
James Turner
3d861475f7 Fix two issues caught by the German QA department ;) 2011-10-17 17:39:47 +01:00
James Turner
0f5d27c10e Detect and read a config file in FG_HOME - allows nicer tweaking of settings on Mac/Windows for people with Terminal/cmd.exe phobia :) 2011-10-16 21:54:47 +01:00
James Turner
407a495546 Automate TerraSync integration with the scenery / dir creation. Now can be used with only --enable-terrasync (and some patience) 2011-10-16 21:46:27 +01:00
James Turner
3d0254f6ec Allow aircraft-dir option to override aircraft search logic completely. 2011-10-16 21:15:54 +01:00
James Turner
ccb21d4c0c And keep platforms other than my beloved OS-X working too ;) 2011-10-16 19:58:22 +01:00
James Turner
6adb42078e Refactor fg-home computation, use Library/Application Support on Mac. 2011-10-16 19:55:04 +01:00
James Turner
0431822e2a Fix Unix build. 2011-10-16 19:17:23 +01:00
James Turner
b1c7495fec Restructure option/config handling code, to avoid multiple scans & parses for special options (fg-root/fg-aircraft/aircraft). Push most of the code into a new Options class, inside options.cxx, and clean up various call-sites as a result. 2011-10-16 18:35:40 +01:00
Torsten Dreyer
7431c14ba6 don't use uninitialized variables 2011-10-09 21:37:52 +02:00
ThorstenB
30e2db94b1 Add generic "open-browser" command to show URLs or local HTML/text pages. 
Replace deprecated "old-help-dialog" command with generic "open-browser".
Can also be used to add links to aircraft manuals in the menubar (local
file or http) , i.e.
<binding>
    <command>open-browser</command>
    <path>Aircraft/ogeL/FlightManual.html</path>
</binding>
 2011-10-09 12:37:43 +02:00
James Turner
c4c5cc850b Adjust cursor-setting code, for better compatibility with Cocoa-Viewer (OSG patch still required, unfortunately) 2011-10-04 09:17:56 +01:00
James Turner
1692bc749e Mac: Work-around for OSG3's Cocoa Viewer interacting badly with PUI 2011-10-04 09:14:15 +01:00
ThorstenB
ab84ff5904 Replay upgrade, part II: Integrate flight recorder, update replay system. 
Drop hard-coded replay property logic, cut ties to net_ctrls, net_fdm.
Improve replay system controls and status information.
 2011-10-01 22:58:40 +02:00
Mathias Froehlich
af1e00ac72 clouds: remove unused bump mapping flag. 2011-10-01 09:22:44 +02:00
Durk Talsma
b482188848 Whoops, lazy copy/paste job. 2011-09-22 22:08:20 +02:00
Durk Talsma
e00157d4e8 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-09-22 19:09:36 +02:00
Durk Talsma
5ae207c2fc Prefetch a previously saved aircraft settings configuration file to retrieve aircraft usage and livery information. Fallback to default settings in aircraft-set.xml file if not found. 2011-09-22 19:06:26 +02:00
James Turner
54aca561b6 Fix JPEG-server builds. 2011-09-21 19:22:13 +01:00
Torsten Dreyer
d860c949e3 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-09-21 19:19:10 +02:00
James Turner
5a17ccf9eb Push aspect-ratio handling into CameraGroup, so renderer doesn't need to resize viewports each update. 2011-09-21 17:13:53 +01:00
James Turner
227b3e469c Remove indirection on viewer draw/resize code-paths. 2011-09-21 17:13:53 +01:00
Torsten Dreyer
25707ce82e Add debug messages for real-weather runway selection 2011-09-20 16:15:47 +02:00
Durk Talsma
db816deb90 Added a new startup option. By giving the command line option --parkpos=AVAILABLE you can -in principle- let FlightGear decide what the most optimal parking location is. This option does require a few properties to be set that are also needed for future ATC use. Hence, they are listed under /sim/ATC, but could move to a different location if desired. 
/sim/ATC/radius should be a nummeric estimate of the size of your aircraft. A small aircraft fits into a large parking, but a large aircraft does not fit into a small parking space. Because the AI part of radius is also used for slightly different purposes (prioritizing gate assignmments, the given valuem may deviate slightly from the real aircraft size. See http:/wiki.flightgear.org/Aircraft.radii for an overview of currently used values for the redius property.
/sim/ATC/flight-type can be any one of "ga", "cargo", "gate", "mil-fighter", "mil-cargo", or "vtol". See http://wiki.flightgear.org/Interactive_traffic#A_technical_perspective for more information.
optionally, the property /sim/ATC/airline can be set set to a three letter icao airline code. By way of illustration, I will commit a number of startup preset files setting these properties shortly.

Also did some more finetuning to the traffic mananger routing algorithm can be any one of "ga", "cargo", "gate", "mil-fighter", "mil-cargo", or "vtol". See http://wiki.flightgear.org/Interactive_traffic#A_technical_perspective for more information.
optionally, the property /sim/ATC/airline can be set set to a three letter icao airline code. By way of illustration, I will commit a number of startup preset files setting these properties shortly.

Also did some more finetuning to the traffic mananger routing algorithm.
 2011-09-17 16:51:00 +02:00
Erik Hofman
7375166c2b New version of JSBSim, a big rewrite. 2011-09-11 11:42:21 +02:00
Mathias Froehlich
549c5eccb9 cmake: Factor out common simgear dependency libs. 
Factor out and use this core simgear depenency
library cmake variable.
 2011-09-11 11:22:10 +02:00
Frederic Bouvier
099bfd988b fgfs and fgpanel need to be linked with the winsock library (on Windows) 2011-09-09 21:38:02 +02:00
Mathias Froehlich
d09575e646 autotools build updated with sgthreads library 2011-09-08 00:49:23 +02:00
Csaba Halasz
938d4f3752 autotools build updated with sgthreads library 2011-09-07 22:14:36 +02:00
Anders Gidenstam
a2972051a9 Added an --materials-file option to select the materials file to use at startup. 
The property /sim/rendering/materials-file can also be used for this purpose.
 2011-09-03 21:48:50 +02:00
Mathias Froehlich
1c1722a2e9 Adapt to recent simgear hla/rti changes. 2011-08-31 20:02:00 +02:00
Torsten Dreyer
f835561fbe Fix typo 2011-08-31 19:54:59 +02:00
Torsten Dreyer
b4400f8316 Add convenience std::string versions for fg[G|S]etXXX 
Add inline wrappers functions for fgGetXXX and fgSetXXX
to make life with std::string easier
 2011-08-27 17:19:36 +02:00
James Turner
557c95a5ec Change default (non-set) MP hosts to be an empty string instead of '0' 2011-08-24 09:44:52 +01:00
ThorstenB
18983c5387 Avoid "no disk in drive" popups on Win7 systems 
Stray accesses to exchangeable drives cause pop-up error boxes on
Win7 systems, blocking the entire process.
 2011-08-20 23:13:17 +02:00
Torsten Dreyer
3fbbe3134a new global function for aircraft position 
add a new function to get the aircraft's position instead
of reading /position/* properties
 2011-08-20 08:54:47 +02:00
ThorstenB
ae6623655c #403: 2D horizontal scrolling on Mac OS 
Ignore events with X-axis scrolling only (getScrollingDeltaY() == 0).
Thanks to Tatsuhiro Nishioka.
 2011-08-18 21:32:24 +02:00
ThorstenB
20914e49cd Tatsuhiro Nishioka: #403, scroll up/down for Mac OS 
Support osgViewer's Scroll_2D event (so far only available for Mac)
 2011-08-12 23:28:57 +02:00
ThorstenB
e9a9f8c96d Use some more logging class variety. 
Stop using SG_GENERAL and SG_ALL everywhere. Using different
classes makes switching the classes really useful...
 2011-08-12 00:09:26 +02:00
Mathias Froehlich
5093cbed43 Do not delete disabled network protocols twice. 2011-08-11 20:35:44 +02:00
ThorstenB
d3c06bd19b #389: NumPad keys not working when NumLock is off 
Map keys to something useful when NumLock is off (arrow keys etc),
since keycode was completely ignored (out of range) otherwise
 2011-08-07 18:24:13 +02:00
ThorstenB
c4dc12ec94 Improved CMake support for libsvn 
Don't detect libsvn without APR.
When installed, enable libsvn support by default (same as for automake).
When enabled, provide libsvn to fgfs.
gitignore temporary CMake files
 2011-08-04 18:59:46 +02:00
ThorstenB
b0a4299d46 #232: early propagation of "point sprites for runway lights" switch 
Property value is required early during initialization since the feature
isn't run-time configurable. Disable run-time calls since it has no effect.
 2011-07-31 13:33:11 +02:00
James Turner
6c52a5ac85 Fixes for include-file flattening - condition.hxx no longer pulls in props or props_io 2011-07-30 10:47:28 +01:00
Torsten Dreyer
62e46b09a5 fix for #381:fgfs -h -v throws error with no --fg-root 
Because there is no help without fgdata,
be a little more verbose with the error message and
give the user at least a hint about what might help.
 2011-07-28 22:52:40 +02:00
Mathias Froehlich
b3ad524cec Try to fix using an own cull visitor with osg 3. 2011-07-28 18:23:54 +02:00
Durk Talsma
5228053f7f Merge branch 'next' into durk-atc 2011-07-24 08:44:22 +02:00
James Turner
7abf7c5748 CMake header support for XCode/Visual Studio 2011-07-19 07:58:03 +01:00
Torsten Dreyer
c6d5b6ebdb Partial fix for #228: ambiguous navaid-names 
This fixes at least the startup process.
If an ambigous fix name was presented with --vor=ID or --ndb=ID
present a list of matching records along with frequency and
position in the console to give the user the chance to pick
the correct one by adding the frequency with --vor-frequency=nnn.nn

It does not yes solve the issue when the user relocates using the
GUI dialog. This requires some GUI and Nasal hacking along with a
new Nasal helper function "navaidinfo".
 2011-07-18 11:09:43 +02:00
Torsten Dreyer
1cf7e78ae5 Fix compile for 32bit (handleFPE() undeclared) 2011-07-17 22:15:57 +02:00
Torsten Dreyer
eab9a65ebc Fix some gcc warnings 2011-07-17 19:31:28 +02:00
Torsten Dreyer
c238f86637 Bump to version 2.5.0 2011-07-17 11:07:07 +02:00
Torsten Dreyer
172c635f03 Bump version to 2.4.0 2011-07-17 10:47:27 +02:00
ThorstenB
dcc8d22f7c Don't crash on exit, when initialization was aborted. 
Some errors cause fgfs to abort/exit before "controls" is set.
 2011-07-13 21:52:29 +02:00
ThorstenB
ccd6a094f1 Avoid creation of stray "/null" property nodes. 
"property-assign" command had a side-effect of creating stray "/null"
nodes when assigning a value (since "getprop2" always creates some node).
 2011-07-10 21:25:16 +02:00
ThorstenB
cbc048b801 Fix minor DME frequency issue. 
DME frequency value should be double - not string.
 2011-07-10 12:52:45 +02:00
ThorstenB
4fd1e219a4 #348 related: More places where missing files were not reported properly 
Whenever resolving a (relative) path to an absolute path with
'resolve_maybe_aircraft_path', check if the result is empty and report original
(relative) path as missing. Otherwise no or a meaningless message is
issued ("File '' not found.").
 2011-07-03 13:06:41 +02:00
Durk Talsma
f8a8805e2d Merge branch 'next' into durk-atc 2011-07-01 22:20:40 +02:00
ThorstenB
1ebab94710 #358: Missing option to disable AI scenarios 
--ai-scenario=... can only add/enable another scenario.
Introduce --disable-ai-scenarios option to disable all scenarios (can be
used by external launchers, GUIs etc)
Also provide error instead of debug message when a scenario cannot be loaded.
 2011-06-26 16:08:19 +02:00
Frederic Bouvier
523f7f4cb7 Trying to fix compilation failure on Linux and Mac 2011-06-25 10:05:38 +02:00
Frederic Bouvier
243acb61c8 Fix issue #354: updateCameras reset viewport size to its initial value on OSG 3.0 2011-06-25 09:22:51 +02:00
ThorstenB
e19c49a273 Enable parameter for new command-line option. 2011-06-22 20:01:31 +02:00
ThorstenB
88f7c05274 Introduce "PRESERVE" flag to protect properties on sim reset. 
Some specific properties need protection and shouldn't be restored to their
original values on sim-reset.
 2011-06-12 20:31:56 +02:00
ThorstenB
505d4c5219 Do not reset persistent properties on sim-reset. 
Fixed ugly sim-reset issue: Persistent properties (USERARCHIVE attribute)
are retained across sim sessions (when restarting the sim). So they should
also be retained on sim-resets (without the need to first exit/restart
the sim to make them really persistent).
Also, avoid warning due to read-only properties.
 2011-06-12 13:53:14 +02:00
ThorstenB
ee40e8ae3f Introduce terrasync subsystem. 
Fix tile reloading issue.
 2011-06-12 00:44:07 +02:00
ThorstenB
db7112c20b Remove stray space 
Thanks to Vivian - make MSVC9 happy again.
 2011-06-06 19:53:21 +02:00
Durk Talsma
808c4c635d Merge branch 'next' into durk-atc 2011-06-05 10:06:35 +02:00
ThorstenB
bc9ffe96c2 Minor error message formatting. 2011-06-04 17:55:37 +02:00
ThorstenB
a2c768c7cd Fix crash when display/screen number invalid 
getScreenResolution shouldn't be called before the safety check.
Fixes commit ba7d8b8155
 2011-06-04 17:55:12 +02:00
Torsten Dreyer
0774ca000a Anticipating v2.4.0 - bump fgdata version to 2.3.0 2011-06-04 15:53:38 +02:00
Durk Talsma
348ff2ec23 Merge branch 'next' into durk-atc 
Merge with next.
Conflicts:
	src/Airports/dynamics.cxx
	src/Airports/dynamics.hxx
 2011-06-03 09:31:04 +02:00
James Turner
fc7e9740c3 Improvements to exposing FGPositioned via commands - support frequency searches. 2011-06-01 23:55:04 +01:00
Durk Talsma
63708fb0df Merge branch 'next' into durk-atc 2011-06-01 22:11:17 +02:00
ThorstenB
ba7d8b8155 Ensure window position is 0,0 for multi-display setups with fullscreen mode 
Fix an issue introduced by commit 863551a932
for multi-display setups.
Some code clean-up.
 2011-06-01 21:31:48 +02:00
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