1
0
Fork 0
Commit graph

7047 commits

Author SHA1 Message Date
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
9f13c49d29 issue #316: panning not working when center-on-aircraft enabled
Panning feature looked broken to some users since auto-center is enabled
by default which blocks panning. center-on-aircraft is now disabled
automatically when view is panned.
2011-05-20 19:48:05 +02:00
Curtis L. Olson
800ac5a188 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-16 09:05:52 -05:00
ThorstenB
9bd00a62fa Continuous replay: use correct replay duration
(LinuxTag live hacking...)
2011-05-14 10:19:51 +02:00
ThorstenB
6c3cd27a57 Looped replay feature
New option for continuously repeated replay
(LinuxTag FlightGear demo mode :) )
2011-05-14 09:17:51 +02:00
Torsten Dreyer
13db36f679 Replace round by simgear::SGMiscd::roundToInt()
to make it compile again under MSVC (sigh)
2011-05-08 20:34:35 +02:00
Curtis L. Olson
e174561c67 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-08 09:22:17 -05:00
Torsten Dreyer
209a93c4ea Expose JSBSim turbulence models 2011-05-08 15:50:33 +02:00
Durk Talsma
6ee1d7411b Simple FlightPlan generation and execution for the user aircraft: This will allow ATC guided taxiing to the runway. 2011-05-07 10:03:27 +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
6f37568da9 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-05 14:18:46 -05:00
Curtis L. Olson
a482465659 Fix a problem with the YASim turbulence model. This change has been
coordinated with and approved by Andy.

The lattice(x,y) arguments were being "WRAP()'d" but the WRAP() function
didn't make sense.  Instead it was forcing the value to zero if it was
greater than the wrap limit.  This was creating large areas of constant
values in the perlin noise maps which resulted in a "constant" turbulence
vector over time -- which is just weird.

Andy couldn't see any reason why the values should be wrapped and couldn't
remember any reason why the WRAP() function was set up like it was.

Andy wanted me to make sure and mention that he was INSANE when he wrote that
code (but now he's sane ... err, mostly.)
2011-05-05 14:13:18 -05:00
ThorstenB
83052e1656 #310: c++ header dependency
Header's dependency is to <cstring> not <memory>. <memory> itself had
dependency to <cstring> for earlier GCC version though.
2011-05-04 21:34:15 +02:00
Curtis L. Olson
11686cfb49 Hopefully add AV400WSim.cxx to the cmake system (not tested) since I use
autoconf/make.
2011-05-03 12:27:25 -05: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
Durk Talsma
81c0e0b3df Merge branch 'next' into durk-atc 2011-04-29 20:46:54 +02:00
Durk Talsma
17fececa9f Some more work on AI/ATC user interaction integration:
* Update AI aircraft object based on user position.
* Process flightplan
* Don't try to update the radar information for AIAircraft that don't have a valid manager pointer
2011-04-29 20:44:05 +02:00
Stuart Buchanan
65607d4a7b Add x-offset-m and y-offset-m to move-cloud command. 2011-04-24 20:48:18 +01:00
Torsten Dreyer
94828f8acd Merge commit 'refs/merge-requests/1554' of git://gitorious.org/fg/flightgear into merge-requests/1554 2011-04-23 11:34:49 +02:00
Erik Hofman
3e1aba3b2a Sync. with JSBSim CVS, now properly 2011-04-23 10:17:31 +02:00
Stuart Buchanan
202e957154 Further updates to 3D clouds 2011-04-22 21:06:28 +01:00
Stuart Buchanan
0becb0df2b Merge branch 'next' of git://gitorious.org/fg/flightgear
Conflicts:
	src/Environment/environment_mgr.cxx
2011-04-21 20:55:49 +01:00
Stuart Buchanan
38af5a2a07 Improved 3D cloud support 2011-04-21 20:43:05 +01: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
2cf249fb7e Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2011-04-16 11:36:55 +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
0c500d4fc4 Wish #304: MapWidget's center-on-aircraft button should be sticky
Thanks to Victhor Foster for the idea.
2011-04-16 10:53:09 +02:00
ThorstenB
fb52b013f0 Clear OSG object cache on scenery reload
Scenery reload (menu: Debug-> Reload Scenery) also needs to clear the OSG
object cache, otherwise scenery isn't really reloaded from disk.
2011-04-15 21:34:44 +02:00
ThorstenB
dc76290d6e Minor file mode issue. 2011-04-15 00:20:06 +02:00
ThorstenB
7f5a0e3518 Adrian Musceac: #303, YASim solver settings
The internal solver of YASim which computes drag and lift
coefficients now actually uses the values configured in
the XML input file for approach fuel, cruise fuel and cruise
glide angle.
2011-04-15 00:15:18 +02:00
ThorstenB
1456635c55 Fixed minor memory leak on joystick reload. 2011-04-13 21:30:11 +02:00
Anders Gidenstam
8513a057f3 Fixed some memory leaks. Thanks to Andreas Gaeb for reporting. 2011-04-13 21:06:54 +02:00
Erik Hofman
05a2eff317 One step ahead of JSBSim CVS. 2011-04-11 10:06:57 +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
7e604f22a7 * Added a pure virtual render() function to FGATController that can be used to implement traffic visualization
* Allow position and intentions to be monitored and updated by the Startup controller
* Added a "parent" pointer to the startup controller to allow communication with the groundnetwork.
* Implemented a render() function for the Startup controller
* Renamed "FGGroundNetwork::getRenderNode() to FGGroundnetwork::render()
2011-04-26 19:18:28 +02:00
Durk Talsma
960f6881c9 Merge branch 'next' into durk-atc 2011-04-19 18:02:30 +02:00
Durk Talsma
a7ccae9fca More work on AI/ATC integration:
- Fixed a bug in AI aircraft ground steering code: When aircraft were not moving, the value of headingchangeRate kept increasing to insane levels. Although this was clamped to a maximum of 30 degrees per second, the initial rate could still push the aircraft in the wrong direction. In practice, this bug would be visible when an AI aicraft would be pushed back, when it tended to veer to the right.
 - Make sure that the aircraft slows down well ahead of the pushback point. This change ensures that the AC will actually reach the pushback point. It also ensures a slightly tighter steering range.
 - AI ground steering rate is tuned to 30 degrees per second at a nominal taxispeed of 15. I now modulate the heading adjustment rate by manipulating the adjustment using a non-linear function (the sqrt). This allows for a slightly tighter turn radius at speeds < 15 and slightly looser turns at speeds > 15.
 - The AI Flightplan generation code can return false. This can be used to determine whether any additional AI aircraft may be created. Currently, the function returns false when no more parkings are available. This should limit the build-up of huge AIAircraft tower stacks.
 - The ground network can now graphically display all aircraft actitivy on the ground network by using a virtual marker system.
2011-04-19 18:01:24 +02:00
Durk Talsma
ee9a5cf73d Merge branch 'next' into durk-atc 2011-04-17 10:21:09 +02:00
Durk Talsma
65e87bf2f8 Added some code to visualize the ground networks. 2011-04-17 10:19:58 +02:00
Durk Talsma
e16f772e54 Merge branch 'next' into durk-atc 2011-04-15 19:40:44 +02:00
Durk Talsma
fa842a42b6 Added a small and simple dialogbox that allows the user to issue ATC commands. 2011-04-15 19:32:21 +02:00
Durk Talsma
3bd4e99d81 Merge branch 'next' into durk-atc 2011-04-14 17:53:38 +02:00
Durk Talsma
dee72d3434 * First test scenario to get user ATC interaction working. 2011-04-14 17:51:46 +02:00
Durk Talsma
c597f72158 Added some interface function to traffic manager related classes and added a traffic record that mimicks the users aircraft's traffic intentions. 2011-04-12 23:28:48 +02:00
Durk Talsma
493661a2dc Small step forward: Ensure that traffic information is appropriately updated. 2011-04-11 22:23:53 +02:00
Durk Talsma
416ba93a41 Merge branch 'next' into durk-atc 2011-04-11 20:51:16 +02:00
Durk Talsma
819e6a04fa Some more work on AI/ATC interaction.
* Added an AIAircraft that is shadowing the user aircraft's behavior, in terms of AI / ATC interactions
* Set up a shadow AI FlightPlan that is used for tracking the user's aircraft.
2011-04-10 12:46:00 +02:00
Durk Talsma
e04d2f8ba9 Assigned an ATC controller to the user's Aircraft and change the comm1 radio frequency according to the frequency relevant to the current scenario. 2011-04-10 08:58:48 +02:00
Durk Talsma
3455079060 Added a simple dialog, just as proof-of-principle. 2011-04-06 19:48:54 +02:00
Durk Talsma
ff4004b261 Some further testing of the ATC Dialog infrastructure. 2011-04-05 18:13:11 +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
Durk Talsma
48bb176e87 Start of adding interaction between the user controlled aircraft and AI traffic, by means of ATC.
* Started transfering the ATC infrastructure to be driven by it's own subsystem
* Changed the bahavior of the "'" key so that it is no longer driven by ATCDCL, but it now triggered by the new subsystem based ATC module.
2011-04-03 17:39:35 +02:00
ThorstenB
93180eb004 On-demand loading of Nasal modules.
Load a module whenever its /nasal/foo/enabled flag is set,
even if it was disabled at start-up. Also expose a property if it was
successfully loaded.
2011-04-03 15:30:25 +02:00
ThorstenB
731e803223 Minor clean-up (fixed renamed subsystems) 2011-04-02 15:15:59 +02:00
ThorstenB
298f832d43 Support optional Nasal modules in fgdata/Nasal/MyModuleFoo
- Allow structuring generic Nasal sources into modules (i.e. support
  separate source folders for multiplayer/local weather/... sources)
- Option to enable/disable loading of generic Nasal modules (i.e we only
  need to load stuff that is really needed/enabled).
- Provide basic loading sequence: subfolders are strictly loaded _after_
  the base directory. So submodules can rely on .nas-scripts like math.nas,
  io.nas, debug.nas, ... to be already loaded - dropping the need for
  awkward listeners/timers to delay module initialization (loading order
  within Nasal/*.nas is still random)
2011-04-02 15:15:59 +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
7ec9d036d6 Renaming / more consistent naming. 2011-03-28 00:30:23 +02:00
ThorstenB
dca2132087 New property reporting worst-case frame latency.
Shows maximum latency of any frame within the last second.
2011-03-28 00:16:27 +02:00
ThorstenB
d7798a7cc2 Slightly brighter blue color level for map widget
Almost couldn't see the new blue color on my screen.
Enjoy the blues... :)
2011-03-27 11:32:41 +02:00
Stuart Buchanan
23971c17aa Improve display of shipping in map widget. 2011-03-26 11:02:00 +00:00
ThorstenB
d051b800cc Minor replay issues
restore most recent frame
2011-03-24 23:41:12 +01:00
ThorstenB
3a90186341 Minor replay issues
When disabling replay: don't clear buffers and restore most recent frame
2011-03-24 23:30:09 +01:00
ThorstenB
11320e6b00 Bertrand Coconnier: Fix instant replay with JSBSim aircraft (bug #294)
Avoid re-trim to be triggered by property listeners during instant
replay (when the FDM is suspended).
2011-03-23 23:52:36 +01: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
b4c47b06d5 Drop unnecessary include dependency.
Make Csaba happy...
2011-03-23 22:50:56 +01:00
ThorstenB
189457f2af Minor namespace issue
using "using" in the .cxx now :)
2011-03-23 22:49:18 +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
Torsten Dreyer
0114fd962e Fix broken tank properties. More verbose generic protocol error messages 2011-03-22 18:00:55 +01:00
ThorstenB
991beb0b5e replay/FDM shell subsystem refactoring
Move final bits of replay code to where it belongs.
Use subsystem suspend/resume for FDM shell during instant replay.
2011-03-21 23:07:05 +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
Erik Hofman
51a6302f48 Make sure Include/config.h gets found which is located in /src 2011-03-19 16:04:32 +01:00
ThorstenB
befc533398 More virtual destructors. 2011-03-19 15:02:17 +01:00
ThorstenB
4b74636d04 Avoid nuisance sound effects after sim-reset. 2011-03-19 14:51:39 +01:00
ThorstenB
badec14d27 Cut&paste voiceplayer into a separate module.
GPWS and TCAS are now completely separate - but use the same voice player.
2011-03-09 23:49:25 +01:00
ThorstenB
59f2328551 Used tied property list. 2011-03-09 23:10:55 +01:00
ThorstenB
b3d59ed563 Fixed an property tieing issue on sim reset.
Oops, my commit f6fde388a2 untied the
tank properties also on reset - should also re-tie them after the
reset then...
2011-03-09 23:02:19 +01:00
ThorstenB
18ada05d41 Fix navreceiver to make DME work with ILS signals.
Property "dme-in-range" should also work with ILS signals, which include
a DME. The nav database (dme_list) doesn't have separate entries for
"ILS-DME" (unlike for "VOR-DME"), so searching a DME by frequency didn't
work for ILS.
=> "instrumentation/nav[*]/dme-in-range" can now be used to enable/disable
cockpit DME displays.
2011-03-09 22:04:03 +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
ThorstenB
4761a3cdcf Fix another (tiny) memory leak.
SGCloudField::addCloud does *not* keep a reference to SGNewCloud - so we
only need a temporary object. Also adapt to changed addCloud interface
to make things a little more obvious.
2011-03-07 19:38:48 +01:00
Csaba Halasz
ae8438333c Quick fix for ascii generic input line separator problem 2011-03-06 02:38:39 +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
ThorstenB
645ef8036a TCAS clean-up.
Change default voice samples.
2011-02-25 21:12:35 +01:00
ThorstenB
f6b9c5b908 Make AIplanes respond to TCAS RAs. 2011-02-25 21:12:35 +01:00
ThorstenB
27a0ff5442 Added tracker stage to TCAS.
Added relative/absolte altitude display mode to wxradar.
2011-02-25 21:12:35 +01:00
ThorstenB
0f7f7fce6b Expose vertical speed for MP planes
vertical speed of MP planes was always 0,
calculate their (average) vertical speed since
it's required for TCAS and TCAS display
2011-02-25 21:12:35 +01:00
ThorstenB
b6eba5ce65 New TCAS display mode for wxradar.
- new mode to display traffic in TCAS-style
- select symbols according to TCAS-threat level
2011-02-25 21:12:35 +01:00
ThorstenB
bdd931aed9 Introduce new TCAS instrument
- implements a TCAS II v7.0
2011-02-25 21:12:35 +01:00
ThorstenB
dd7c88b8cb Make voiceplayer independent
- former mk-viii voiceplayer is now an independent FGVoicePlayer
- voiceplayer still sits in mk-viii module for now
- add option to configure location/prefix of voice samples
- add pause/resume to voiceplayer
2011-02-25 21:12:34 +01:00
Torsten Dreyer
f938a23d7c clear two gcc warnings 2011-02-25 20:46:18 +01:00
Torsten Dreyer
6c3035af60 allow proxy to set as an url 2011-02-20 17:14:30 +01:00
Torsten Dreyer
e5fb1f281f Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-02-20 12:06:41 +01:00
Torsten Dreyer
3ccfdac8fe use http_proxy environment variable 2011-02-20 11:42:21 +01:00
ThorstenB
6cd0e5aac4 Merge remote branch 'origin/releases/2.2.0' into next 2011-02-19 12:00:43 +01:00
ThorstenB
118d8fbca5 #84: John Denker: Set correct file modes
Sources shouldn't be executable.
2011-02-19 11:55:43 +01:00
Torsten Dreyer
556885e553 remove unused code and use code from simgear 2011-02-19 11:23:36 +01:00
ThorstenB
3c3f3a096e John Denker: move branch cut and apply clamps
fixed un-normalized outputs
2011-02-16 19:53:10 +01:00
John Denker
214919da20 More accurate, more symmetrical computation of tangent vector. 2011-02-16 19:44:23 +01:00
John Denker
02f42b8816 fix up some comments 2011-02-16 19:44:14 +01:00
John Denker
54fb3b64d0 Implement gs-direct-deg property.
Useful when posing aircraft for pictures, not quite on glideslope.
2011-02-16 19:34:38 +01:00
ThorstenB
8962477cfa Fix huge multiplayer memory leak.
Almost all FGPropertyData elements received via MP were leaked.
Property data is now cleanly deallocated in the FGExternalMotionData destructor.
Thanks to Jester for reporting rising mem consumption in MP mode.
2011-02-16 00:49:00 +01:00
Tim Moore
9c98258ab0 Merge branch 'releases/2.2.0' into next
Conflicts:
	CMakeModules/FindSvnClient.cmake
	src/FDM/JSBSim/JSBSim.cxx
2011-02-15 13:26:24 +01:00
Tim Moore
c5366cceb6 accomodate changes to osgDB::DatabasePager interface
The change was introduced in OSG SVN revision 12080. Note: that
revision has a bug that causes fgfs to crash. The bug is fixed in
revision 12170.
2011-02-15 12:42:53 +01:00
Torsten Dreyer
df370549c3 Warning fixes for MSVC 2011-02-14 22:11:56 +01:00
Torsten Dreyer
5ec361ae06 Fix wrong throttle-position on init (trim) 2011-02-14 21:01:48 +01:00
Torsten Dreyer
a1acd92a1c gcc warning fixes 2011-02-14 20:58:54 +01:00
Torsten Dreyer
ddd04d91ca TankProperties: don't allow negative values 2011-02-14 20:45:59 +01:00
Torsten Dreyer
fff48bdd6a Refactor controls.cxx: use simgear functions
- use TiedPropertyList
- use SG_CLAMP_RANGE
2011-02-14 20:44:20 +01:00
Torsten Dreyer
03aac3de8b Refactor ridgelift: use simgear::TiedPropertyList 2011-02-14 20:26:39 +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
4a351fdd8b Update tile loader options whenever its config properties change
New listener for tile-loader properties.
2011-02-13 19:26:44 +01:00
ThorstenB
45f526aca5 Minor output format issue. 2011-02-13 19:26:32 +01:00
ThorstenB
526cd9fa6e Avoid crash and/or long delay on shutdown in METAR loader.
Catching loader thread on subsystem destruction is too late, since it
depends on other subsystems (which are destroyed earlier).
=> Need to stop & join thread during subsystem shutdown.
Also changed loader sleep logic - to avoid excessive delays (up to
30 seconds) on shutdown.
(Issues mostly happened when running offline with realwx enabled.)
2011-02-13 18:44:56 +01:00
ThorstenB
ae320ca46c Avoid crash and/or long delay on shutdown in METAR loader.
Catching loader thread on subsystem destruction is too late, since it
depends on other subsystems (which are destroyed earlier).
=> Need to stop & join thread during subsystem shutdown.
Also changed loader sleep logic - to avoid excessive delays (up to
30 seconds) on shutdown.
(Issues mostly happened when running offline with realwx enabled.)
2011-02-13 16:54:08 +01:00
Torsten Dreyer
c7cccd8758 TankProperty: a bugfix and a new properties
- Fix initial number of TankProperty instances (thanks to Csaba)
- Add new property for unusable fuel and compute "empty" state
2011-02-12 21:36:58 +01:00
Torsten Dreyer
94d870d930 Support more than eight tanks
I was naive enough to think that no aircraft ever uses more
than eight tanks. Csabe proved me wrong and came up with a
fix - Thanks.
2011-02-08 21:23:02 +01:00
Torsten Dreyer
fcf1709df6 Fix the tank properties if no content was defined in fg 2011-02-06 22:08:46 +01:00
Torsten Dreyer
717ffe584f Unified handling of (fuel-)tank properties
Ensure consistent properties for all fuel tanks
2011-02-06 17:33:31 +01:00
ThorstenB
591ef4ab01 Fixed incomplete merge of JSBSim.cxx
Commit 287cc74965 wasn't merged to release/2.2.0
properly by Commit b649f97b19.
2011-02-06 16:46:36 +01:00
Torsten Dreyer
d1b35578c8 Move tiedpropertylist from flightgear to simgear 2011-02-06 15:44:09 +01:00
ThorstenB
ac71778319 Bertrand Coconnier: updated fix for #204 and #222: JSBSim reset
Use shared property pointers instead of path strings, adapt method
names to JSBSim style, catch all property ties, proper error handling
when tieing failed.
2011-02-06 15:34:32 +01:00
ThorstenB
6b6d7059de Improved fix for #204 and #222: JSBSim::unbind() needs to untie _all_ its properties
Extends and partially reverts commit 287cc74965
Previous fix did not consider properties outside the /fdm/jsbsim branch.
FGPropertyManager now keeps track of all its tied properties - and provides
a method to cleanly untie them again.
2011-02-06 15:34:16 +01:00
ThorstenB
68728c9449 Betrand Coconnier: fix bugs #47,#184: roll/pitch/speed via command-line
Specifying initial roll, pitch and speed should be working again.
2011-02-06 15:33:49 +01:00
ThorstenB
b649f97b19 Fix for bug #204 and #222 by Bertrand Coconnier; NaNs (bug #222) were basically generated because the method JSBSim::unbind() was not implemented in JSBSim.cxx. 2011-02-06 15:33:27 +01:00
ThorstenB
0d233c0dfc Bertrand Coconnier: updated fix for #204 and #222: JSBSim reset
Use shared property pointers instead of path strings, adapt method
names to JSBSim style, catch all property ties, proper error handling
when tieing failed.
2011-02-06 15:16:58 +01:00
ThorstenB
ad8d46ba64 Improved fix for #204 and #222: JSBSim::unbind() needs to untie _all_ its properties
Extends and partially reverts commit 287cc74965
Previous fix did not consider properties outside the /fdm/jsbsim branch.
FGPropertyManager now keeps track of all its tied properties - and provides
a method to cleanly untie them again.
2011-02-05 17:49:26 +01:00
ThorstenB
edfc06119a Not reported by cppcheck: fix another memory leak :)
Extends/changes commit 687be04678
to fix a related second leak (with "model").
2011-02-04 19:38:22 +01:00
ThorstenB
133cfbfa7f Fixed several compiler warnings
uninitialized or unused variables, init sequence, ...
2011-02-02 22:05:54 +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
Frederic Bouvier
6bb8e69b92 Initialize class member in AIFlightPlan 2011-01-30 21:20:50 +01:00
Frederic Bouvier
a853af5b0e Reported by cppcheck: fix an incorrect usage of iterators 2011-01-30 21:17:20 +01:00
Frederic Bouvier
687be04678 Reported by cppcheck: fix a memory leak 2011-01-30 21:17:19 +01:00
Frederic Bouvier
95a5326c4e Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2011-01-30 21:16:57 +01:00
Frederic Bouvier
257e3390c9 Detect joystick disconnection 2011-01-30 21:14:32 +01:00
ThorstenB
67978f92e5 Proposed fix for #251: Waypoint handling
Do not consider destination/runway waypoints as done, when these
are far away - even if the course is off by > 90 degrees.
2011-01-30 18:18:41 +01:00
ThorstenB
f68f300bb3 Proposed fix for #251: Waypoint handling
Do not consider destination/runway waypoints as done, when these
are far away - even if the course is off by > 90 degrees.
2011-01-30 18:05:53 +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
ThorstenB
32b69f823a Betrand Coconnier: fix bugs #47,#184: roll/pitch/speed via command-line
Specifying initial roll, pitch and speed should be working again.
2011-01-30 16:05:28 +01:00
Erik Hofman
287cc74965 Fix for bug #204 and #222 by Bertrand Coconnier; NaNs (bug #222) were basically generated because the method JSBSim::unbind() was not implemented in JSBSim.cxx. 2011-01-30 11:04:37 +01:00
James Turner
2ea7f87ae1 Andreas Gaeb: make input (joystick) re-init work. 2011-01-29 16:05:02 +00: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
James Turner
53e8fbfcbb Andreas Gaeb: fix #222 (JSBSIm reset problems) 2011-01-25 00:27:56 +00:00
James Turner
4f364af6d1 Andreas Gaeb: fix #222 (JSBSIm reset problems) 2011-01-25 00:26:07 +00:00
James Turner
c2458a17bf Re-apply fix for #204, crash on JSBSim reset 2011-01-25 00:25:43 +00:00
James Turner
4b494b1d08 Re-apply partial fix for #222, JSBsim crash-on-reset 2011-01-25 00:25:23 +00:00
Torsten Dreyer
6cb4fbcf0a Bugfix: reset transparency of non fog/mist/haze layers 2011-01-24 19:44:51 +01:00
Torsten Dreyer
8fe3d6c8e8 Bugfix: reset transparency of non fog/mist/haze layers 2011-01-24 19:41:56 +01:00
Torsten Dreyer
b085649f20 Code cleanup, no functional change 2011-01-23 21:51:07 +01:00
ThorstenB
e64b382397 Report stopped MP transmission at higher log level,
it's too important to be a "debug only" message.
2011-01-23 19:01:43 +01:00
ThorstenB
ee26505e28 Added sanity checks to MP receive/send.
Stop invalid data (NaN values) from being sent or received via MP.
2011-01-23 19:01:43 +01:00
ThorstenB
5268b3c6ed Report stopped MP transmission at higher log level,
it's too important to be a "debug only" message.
2011-01-23 15:24:28 +01:00
Erik Hofman
5402ab5a1b Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2011-01-23 15:14:57 +01:00
Erik Hofman
4a817a6307 Sync. with JSBSim CVS 2011-01-23 15:14:01 +01:00
ThorstenB
feab53b462 Added sanity checks to MP receive/send.
Stop invalid data (NaN values) from being sent or received via MP.
2011-01-23 15:07:09 +01:00
ThorstenB
59d06d130d Make route editing sane.
Drag&drop, insert and remove now update the current waypoint as expected.
2011-01-23 10:45:31 +00:00
ThorstenB
7f846d20c7 Make route editing sane.
Drag&drop, insert and remove now update the current waypoint as expected.
2011-01-23 00:45:06 +01:00
ThorstenB
d365689d5c Fix crash in GPS module.
Fixes crash on exit (during property untie). Also potential run-time crash.
2011-01-22 00:03:07 +01:00
ThorstenB
f32656b2a5 Fix crash in GPS module.
Fixes crash on exit (during property untie). Also potential run-time crash.
2011-01-21 23:44:23 +01:00
Torsten Dreyer
ac4d22628e remove debug message spam 2011-01-21 20:44:35 +01:00
ThorstenB
99ee9a1bbb GPWS: avoid "altitude_callout_voice != NULL" assertion
Properly remember which active alerts were already voiced.
Added NULL-pointer safety check
2011-01-21 20:20:22 +01:00
ThorstenB
fab1284f83 GPWS: avoid "altitude_callout_voice != NULL" assertion
Properly remember which active alerts were already voiced.
Added NULL-pointer safety check
2011-01-21 19:55:42 +01:00
Torsten Dreyer
258a4436aa Fix bug 255, support turbulence to weather menu 2011-01-21 19:01:32 +01:00
Torsten Dreyer
5fc0be8820 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-21 19:01:27 +01:00
Torsten Dreyer
a81103341e Fix bug 255, support turbulence to weather menu 2011-01-21 10:35:04 +01:00
James Turner
d227258b3b Lazy caching of magvar on waypoints. Not used yet, but soon. 2011-01-20 08:49:09 +00:00
James Turner
7cbb3a10ed Expand route-manager waypoint info, to support smarter FMS functions. 2011-01-20 00:39:42 +00:00
James Turner
54ef43878f Fix bug 259 - don't override existing airport/runway in initPos 2011-01-19 23:58:00 +00: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
John Denker
f025c65c60 Fix ADF bugs ... including still driving the needle when power off.
ADF bug fixes from John Denker.  Changes from current behaviour are:
* Include the power button in the electrical checks
* Raise the required input voltage from 1V to 8V
* Don't reset the heading to 90 degrees when out of range or no power
  (heading is now only reset to 90 in ANT or TEST mode)
2011-01-18 22:12:29 +00: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
Torsten Dreyer
4e3a2a2c1c EventInput(Linux): experimental initial read of values
First test of reading the button state and axes positions
on initialization of the device.
2011-01-17 20:27:03 +01:00
Torsten Dreyer
2ba4f3ddad Autopilot: use SimGear function 2011-01-17 20:18:17 +01:00
Dave Luff
8691d2fe54 Revert "Minor edit."
This reverts commit 6596f62dd0.
I think I was wrong!
2011-01-16 20:20:55 +00:00
ThorstenB
5ec5c34255 Minor update
Missed this place during code clean-up
2011-01-16 17:45:39 +01:00
ThorstenB
4043e79774 AI traffic performance boost for busy airports
Stop ground elevation (scenery) checks for stationary AI aircraft.
2011-01-16 17:45:39 +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
Dave Luff
6596f62dd0 Minor edit.
I don't think these 2 lines are required - true is set as the default value above.
2011-01-15 14:27:08 +00:00
John Denker
3dd75394af Fix ADF bugs ... including still driving the needle when power off.
ADF bug fixes from John Denker.  Changes from current behaviour are:
* Include the power button in the electrical checks
* Raise the required input voltage from 1V to 8V
* Don't reset the heading to 90 degrees when out of range or no power
  (heading is now only reset to 90 in ANT or TEST mode)
2011-01-15 13:32:01 +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
4ec8b1e57f Include plib ul 2011-01-14 22:09:21 +01:00
Frederic Bouvier
47624c1a4f More joystick code fixes 2011-01-14 22:07:13 +01:00
Frederic Bouvier
ab686ab8d4 It looks like it was not the last mac js code that was committed in the first place 2011-01-14 22:03:15 +01:00
Frederic Bouvier
bb6d1b14c5 Fix a typo in the Mac js code 2011-01-14 21:52:36 +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
James Turner
c2a3d24ef3 Make the Nasal NaN check less aggressive - still SG_ALERT, but return nil instead of terminating the Nasal script completely. 2011-01-14 20:05:58 +00:00
James Turner
664817b0a7 Make the Nasal NaN check less aggressive - still SG_ALERT, but return nil instead of terminating the Nasal script completely. 2011-01-14 20:04:20 +00:00
ThorstenB
867508def8 Minor update
Missed this place during code clean-up
2011-01-10 21:19:51 +01:00
ThorstenB
6ff61836fe AI traffic performance boost for busy airports
Stop ground elevation (scenery) checks for stationary AI aircraft.
2011-01-10 20:53:46 +01:00
James Turner
5deec69e00 First attempt at libsvn support in terrasync with CMake
- not yet working!
2011-01-09 00:15:29 +00:00
ThorstenB
8efe895355 Added several include files, thanks to Roland Haeder
Added includes missing for some compiler/platform.
2011-01-08 22:34:43 +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
8cab5f9e60 Make mouse buttons work again. 2011-01-08 12:50:55 +01:00
Torsten Dreyer
8a08507282 MouseInput: invert y-accel property
Syd Adams:  It could be inverted with nasal for use,
but it feels more natural with positive /forward , negative /
back.
2011-01-08 09:11:46 +01:00
Torsten Dreyer
0361f136fe MouseInput: Add accel-x and accel-y
Syd Adams:
Is there any interest in mouse acceleration properties, besides myself ?

Obviously there is. Some code cleanup comes with it.
2011-01-07 21:05:17 +01:00
Curtis L. Olson
7fb8114feb Add code to draw AI ships on the map widget (useful for carrier ops.)
An AI Tanker requested from the AI menu has an id of -2, so change the code to
only ignore AI models with an ID of -1.
2011-01-07 13:05:47 -06:00
Torsten Dreyer
9337584df0 METAR: enable reports from multiple stations
This patch enables multiple MetarProperties instances tied to the
property tree. For each node's value of /environment/realwx/metar
one MetarProperties instance is created and tied to the property
tree named there. (See FGDATA/Environment/environment.xml for details)

At least one instance will be created to provice backward compatibility
to the existing live-data weather system. This instance (tied to
/environment/metar) fetches a METAR for the nearest airport at a regular
schedule. All other instances fetch a report for airports named in the
property station-id. It re-reads the report every 15 minutes, the
remaining time until the next fetch will be scheduled is in the property
time-to-live. This property can be written to, to extend the live of
this report or schedule an immediate reload by setting it's value to zero.

This patch also provides magnetic variation for the station's location.
2011-01-07 13:11:06 +01:00
Torsten Dreyer
5cdfe3d7a5 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-01-07 09:07:56 +01:00
Dave Luff
f7c487fd4e ATIS: revert to using inches globally by default.
Revert to using inches globally by default, unless the user sets the
property /sim/atc/use-millibars.  Whilst this is therefore wrong by
default, it is probably the best thing in the short term since
FlightGear's altimeter dialog and the altimeters on the default
aircraft set using inches.
2011-01-05 20:12:18 +00:00
Dave Luff
dd690909af ATIS improvements from John Denker
Primarily an improvment to the internationalisation.  Previously the ATIS considered
the world as either the UK or the rest of the world.  Now it considers it as US+Canada
or the rest of the world.  This is much more consistent with global usage of pressure
units as either inches or millibars, which is the most important difference.  Also
some other tweaks and cleanups.
2011-01-05 00:27:18 +00:00
Torsten Dreyer
c859833c63 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-01-04 17:21:47 +01:00
James Turner
b5d2e734d1 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2011-01-03 21:48:11 +00:00
Frederic Bouvier
d70c394cda Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2011-01-03 22:47:40 +01:00
James Turner
4b7ce32387 Remove some legacy declarations from navrecord 2011-01-03 21:47:24 +00:00
Frederic Bouvier
670fa26f7e Cmake: more windows tweaks 2011-01-03 22:47:11 +01:00
James Turner
7ab8c72cf1 Fix bug #236, tower elevation was wrong with custom-scenery-data. 2011-01-03 21:26:09 +00:00
Torsten Dreyer
905e796e35 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-01-03 20:20:18 +01:00
James Turner
7d58b44f73 Alexey Varjat: Add ILS data to GUI/MapWidget 2011-01-03 17:29:24 +00:00
James Turner
6d3773cb40 Olaf Flebbe: Removed Boost serialization linkage on MSVC 2011-01-03 09:50:05 +00:00
Dave Luff
2cb67b06b7 ATIS fixes from John Denker 2011-01-03 01:19:01 +00:00
Torsten Dreyer
3f6285965c Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-01-02 21:09:59 +01:00
James Turner
4428b7358c Fixed CMake version.h, config.h creation 2011-01-01 21:46:16 +00:00
James Turner
4d1d215ded version.h support in CMake builds. 2011-01-01 18:24:53 +00:00
James Turner
d4d70200eb Better fix for bug #204; bind after all engines are loaded. 2011-01-01 16:08:17 +00:00
James Turner
738d653745 Work-around for bug #222 - delete the units/WOW property on init.
Another cleanup
2011-01-01 16:08:06 +00:00
Torsten Dreyer
70a525d47c Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-12-31 12:23:54 +01:00
Dave Luff
1758c11889 ATIS: Slight tweak
Add a slight gap between the end of the time and the start of the weather
2010-12-31 00:15:17 +00:00
Frederic Bouvier
445306cac7 Win32 fix 2010-12-30 19:07:49 +01:00
Dave Luff
c4ae902d75 ATIS: evaluate airport abbreviations case-insensitively
The apt.dat file contains inconsistent case for many airport name abbreviations,
e.g. MUNI/Muni and intl/Intl.  Evaluate the abbreviations in lower-case when
expanding them in order to avoid missing any.
2010-12-30 16:24:43 +00:00
Dave Luff
9a987a3709 ATIS fixes/refactoring from John Denker
Some fixes, and refactoring of the lexicon and abbreviation remapping
into headers where it can be picked up by the scripts that generate
the voice files.
2010-12-30 16:24:43 +00:00
James Turner
e97eb4db85 Reduce log-level of aircraft-dir related messages. 2010-12-30 09:38:21 +00:00
Frederic Bouvier
92be000dbd Merge branch 'next' of git://gitorious.org/fg/flightgear into next 2010-12-29 23:58:18 +01:00
Frederic Bouvier
4eb0634c9a Space change to trigger a rebuild on Hudson 2010-12-29 23:55:01 +01:00
James Turner
6fd33dd2c3 Fix bug #204, and help with bug #222 - delete all
properties under /fdm/jsbsim when deleting the JSBSim interface.
2010-12-29 22:46:35 +00:00
ThorstenB
6eadcb8dfc Fixed AIplane vertical speed.
Fixed reversed fps-fpm conversion.
2010-12-29 21:17:46 +01: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
9dd0d403ea Merge branch 'next' of gitorious.org:fg/flightgear into atcdcl 2010-12-28 21:01:53 +00:00
Dave Luff
4042385a21 ATIS fixes from John Denker 2010-12-28 20:47:33 +00:00
Dave Luff
58f46bbe18 ATCDCL: Initialisation order fixes from John Denker. 2010-12-28 19:13:31 +00:00
Dave Luff
7d3d22f6c2 ATCDCL: Remove some unused cruft. 2010-12-28 19:05:44 +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
James Turner
ce2a112639 When attempting to pass a NaN between Nasal and property nodes, catch this. 2010-12-28 11:58:03 +00:00
Torsten Dreyer
a0689eedd7 Cleanup: don't unbind unknown properties 2010-12-28 12:28:26 +01:00
Dave Luff
b26705d3be Remove more code only concerned with the depreciated interactive ATC/AI 2010-12-27 21:54:20 +00:00
Dave Luff
f3cfddfd92 Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-12-27 19:25:43 +00:00
Dave Luff
a3433fbc6c Remove legacy interactive tower and ground control
Also includes some whitespace cleanup of the remaining legacy ATC code.
2010-12-27 19:24:03 +00:00
Torsten Dreyer
e1858b14b6 GlobalWeather: don't crash
Don't crash when flying into METAR generated weather
reporting fog/mist/haze and clear sky
2010-12-27 14:24:44 +01:00
James Turner
a0d1a5cb10 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-12-27 12:45:07 +00:00
James Turner
2b5f50e856 WIN32/MSVC fixes from Olaf Flebbe 2010-12-27 12:44:17 +00:00
Dave Luff
4c288398cb Removed legacy interactive approach ATC 2010-12-27 11:39:07 +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
Torsten Dreyer
ded664e89e bugfix: set signal-quality-norm to zero if off or unserviceable 2010-12-23 22:16:55 +01:00