1
0
Fork 0
Commit graph

10222 commits

Author SHA1 Message Date
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
Torsten Dreyer
6b7e8aafa9 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-04-14 17:38:56 +02:00
Torsten Dreyer
d88dcba5e8 Add fgpanel to the automake build system 2011-04-14 15:33:36 +02:00
Torsten Dreyer
06bd56a8e8 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-04-14 11:42:15 +02:00
Torsten Dreyer
f44dd24462 Initial commit of the fgpanel code
fgpanel is basically the stripped down 2D-Panel code from
FlightGear. It is designed as a standalone lightweight panel
rendering engine to draw 2d panels on a lowcost computer/graphic card
without 3d acceleration at reasonablel framerates.

Patches for inclusion into the build system will follow.
2011-04-14 11:11:17 +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
Torsten Dreyer
4a63946e94 Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next 2011-04-03 20:42:20 +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