1
0
Fork 0
Commit graph

7142 commits

Author SHA1 Message Date
Torsten Dreyer
d45bfbf225 Fix #220, Ctrl-U no longer working for YASim
Set model-state's position from properties so it can be manipulated
from the property tree.
2011-07-05 17:33:11 +02:00
Anders Gidenstam
69905cc45b Fixed faulty frame transformation of moment of inertia.
Thanks to Jon for finding the problem.
2011-07-03 22:06:54 +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
Erik Hofman
18eff91839 Update to sync with JSBSim CVS, small bug fixes. 2011-07-01 08:21:06 +02:00
Torsten Dreyer
279fbdc837 Fix #357: Enabling "fixes" on map dialog crashes FG
This happened for fixes with names shorter than 5 characters.
range check added, which operator[] does not perform.
2011-06-28 12:51:00 +02:00
ThorstenB
b2c03e4efc #178: improve normalization issue (avoid loops altogether)
thanks to Torsten
2011-06-26 19:05:28 +02:00
ThorstenB
68dec9af2d #178 related: avoid sim from freezing when FDM goes wild 2011-06-26 16:18:36 +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
ThorstenB
c19664291f #221, #242: Fix/work-around for AI traffic issues
Move the disable-HOT feature from the MP aircraft to the a/c base class,
disable HOT for all AIaircraft, since that's a fix/work-around for
#242: AI aircraft respect the user a/c only when HOT is _disabled_ for them
#221: AI aircraft don't stack at parking positions when HOT is disabled
Also generally disables HOT for ballistic and other models (suggested by vivian),
allowing it for ship/carrier models only.
2011-06-25 20:44:44 +02:00
James Turner
029d2b00eb Tone down some log output for the release, especially related to airways/navaid loading. 2011-06-25 16:18:07 +01: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
cd20c6073c #346 related: missing status message for property server
Provide same start-up status message as for other protocols.
2011-06-20 22:50:07 +02:00
Erik Hofman
fac1525fde Removed useless divisions - As a side effect, it removes the risk of divisions by zero 2011-06-19 10:34:21 +02:00
Erik Hofman
02eb2ac2e1 Improved the calcs during trimming after a suggestion from Dennis 2011-06-18 17:50:47 +02:00
Erik Hofman
1dbc2c0f7a Fixed switch parsing and message 2011-06-17 14:16:49 +02:00
Erik Hofman
ec454158fe sync with JSBSim CVS 2011-06-17 09:26:52 +02:00
ThorstenB
702d323a39 issue #127: make screen shots work with OSG multi-threading
Make sure actual snap shot is executed in graphics context.
(Revert the revert :) - since the basic issue in simgear is solved now)
(patch requires simgear+fgdata update!)
2011-06-13 20:31:27 +02:00
ThorstenB
25fdbebd57 Revert "issue #127: make screen shots work with OSG multi-threading"
This reverts commit b4d90150c5.
2011-06-13 00:52:43 +02:00
ThorstenB
9d7ec8f238 Martin Spott: Fix special FDM define for CMake. 2011-06-13 00:46:50 +02:00
ThorstenB
826784eb18 Martin Spott: Add CMake DBus support for event driven input.
Tested on Linux only, please improve if you see fit.
2011-06-13 00:45:40 +02:00
ThorstenB
76ffb086eb Betrand Coconnier: fix for issue #220 for JSBSim a/c
Modifying /position/altitude-ft did not change a/c position
2011-06-12 21:04:16 +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
d767fe1696 Avoid compiler warning. 2011-06-12 13:45:10 +02:00
ThorstenB
ee40e8ae3f Introduce terrasync subsystem.
Fix tile reloading issue.
2011-06-12 00:44:07 +02:00
Torsten Dreyer
bad5fbf66a Use computed gravity instead of hardcoded value 2011-06-08 20:17:40 +02:00
Torsten Dreyer
f52cf4e3b8 Merge commit 'refs/merge-requests/11' of git://gitorious.org/fg/flightgear into vivian 2011-06-08 20:12:53 +02:00
ThorstenB
db7112c20b Remove stray space
Thanks to Vivian - make MSVC9 happy again.
2011-06-06 19:53:21 +02:00
Vivian Meazza
8b6779aa96 Bugfix: set life timer to 0 on instantiation and when ballistic object dies.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-06-06 09:32:00 +01:00
Mathias Froehlich
d21924770f Avoid crashing in hla initialization failure. 2011-06-05 13:45:40 +02:00
Erik Hofman
afca14c372 add a sanity check for the overcast property 2011-06-05 10:26:55 +02:00
Erik Hofman
8f3cdc9404 Add a /rendering/scene/overcast option to color the skydome gray in case of overcast 2011-06-05 10:20:16 +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
c9bb9f6044 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-06-04 15:58:54 +02:00
Torsten Dreyer
0774ca000a Anticipating v2.4.0 - bump fgdata version to 2.3.0 2011-06-04 15:53:38 +02:00
Erik Hofman
8b72e13d2f As torten explains: it is probably not a good idea to ti /environment/relative-humidity since the FGEnvironment ties to this property too 2011-06-04 15:39:45 +02:00
Erik Hofman
c346bcee77 Add the /rendering/scene/scattering property to allow the weather system to contoll the amount of light scattering (or absorption) of the fog 2011-06-04 13:11:56 +02:00
Torsten Dreyer
f28ddb0b5a Fix bug#333 2D clouds sometimes not visible with material shaders are disabled
Only draw 3d clouds if enabled and shader-effects are true.
Remove the property-tie for 3dclouds-enabled and use a change listener
instead which also listens for changes of the shader-effects property.
2011-06-03 22:05:43 +02:00
Durk Talsma
2f3faf4b8a Compilation error fixes following merge with next. 2011-06-03 10:02:18 +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
d5f81f0eac Push some of the ATIS logic into AirportDynamics, in preparation for ATIS being owned by the airport 2011-06-02 23:28:40 +01:00
James Turner
b0985c6b02 Fix for bug 331, cmake was missing mkfifo() check. Thanks to Olaf Flebbe for the catch! 2011-06-02 23:01:17 +01:00
ThorstenB
370645e593 Olaf Flebbe: #332, Improve Nasal's "systime" method
Use gettimeofday for determine time, rather than time() and gettimeofday()
2011-06-02 23:53:42 +02:00
James Turner
5572c53a7e Minor tweaks to positioned find commands. 2011-06-02 00:33:47 +01: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
ThorstenB
aeb4bc3672 Fix Linux build (automake)
CMake guys: please don't forget automake (yet)! ;-)
2011-06-01 21:01:50 +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
Frederic Bouvier
bff1f29fe8 Fix Linux build 2011-06-01 20:28:31 +02:00
Frederic Bouvier
f1a3cedb2f Fix win32 build 2011-06-01 20:25:53 +02:00
Curtis L. Olson
08ff6e2e2e Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-06-01 12:04:59 -05: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
Curtis L. Olson
1d8dd81f90 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-06-01 11:19:19 -05:00
James Turner
2bdaebb7d9 Make basic route-manager commands be real SGCommands 2011-06-01 00:04:25 +01:00
Torsten Dreyer
e61d37a7a3 Remove some unused code 2011-05-31 20:58:22 +02:00
Torsten Dreyer
3a11f8ae28 remove inclusion of useless stdio.h 2011-05-31 20:39:32 +02:00
Durk Talsma
de1564d83e Merge branch 'next' into durk-atc 2011-05-31 20:38:42 +02:00
Torsten Dreyer
61f2b98e8f Compute gravitational acceleration
Compute gravitational acceleration based on the formula of
Somigliana corrected for altitude and provide the value
in property /environment/gravitational-acceleration-mps2
2011-05-31 15:28:32 +02:00
Torsten Dreyer
170df65081 Don't declare static functions in header file 2011-05-31 10:35:42 +02:00
Torsten Dreyer
2add898d90 Remove 'using namespace std' directive 2011-05-31 10:12:07 +02:00
Curtis L. Olson
6dc891de34 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-30 13:08:59 -05: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
ThorstenB
3c8a80d968 Deterministic loading sequence for Nasal scripts
Avoid loading Nasal scripts in (random) file system order
2011-05-29 18:44:15 +02:00
Frederic Bouvier
11bb6ef146 Fix linux build - auto_ptr<> needs <memory> 2011-05-29 09:34:56 +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
ThorstenB
0d0b5c616c Bertrand Coconnier: bug fix for #184, JSBSim: command line arguments
1. The atmospheric properties of FG are not yet initialized when
JSBSim is initialized.
-> patch is quite basic and there may exist smarter ways to initialize
properly the environment before the FDM.
2. The Euler angles were initialized after the velocities.
3. The glide slope and rate of climb were ignored. Fixes all FDMs (YASim,
UIUC, JSBSim, etc.)
4. Some properties were instructed to re-use their previous value while
they should not.
5. Some bugs existed in JSBSim trim code. -> This bug has already been
fixed in JSBSim but the corresponding patch has not yet been applied to FG.
2011-05-29 00:05:33 +02:00
ThorstenB
b4d90150c5 issue #127: make screen shots work with OSG multi-threading
Make sure actual snap shot is executed in graphics context.
(patch requires simgear+fgdata update!)
2011-05-28 23:27:46 +02: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
ThorstenB
be1117f782 fixed #308: "Reload input" did not respect joysticks.xml
Predefined joystick information must be maintained on "reload input".
2011-05-28 11:16:03 +02:00
Curtis L. Olson
cbec277ed4 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-27 15:14:42 -05:00
James Turner
4bfa9cac85 Used the simgear strutils helper, fixing a corner-case ThorstenB spotted. 2011-05-26 20:18:27 +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
Vivian Meazza
a6cc487b74 Add the capability of switching slaved objects at runtime.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-05-24 19:45:08 +02: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
James Turner
b357dd7ac3 Remove remaining use of fabsf() from the code, avoid an OSG header issue on OS-X. 2011-05-22 16:30:18 +01:00
ThorstenB
f82caf49a3 Fix #109: Seg faults caused by wxradar with ARC display mode (aerostar700)
Fixes an ugly issue with OSG overwriting memory/stack. wxradar triggered
the issue in display mode "ARC" - since it configured a display mask (12
vertices) but all vertices were immediately removed again ("_vertices->clear()").
Issue is fixed, mask now working - however the mask wasn't even properly
aligned for the display (probably never worked since OSG port). The display
mask is only really required for weather display - so disabling for now.
2011-05-22 11:02:15 +02:00
Curtis L. Olson
df796a4899 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-21 11:15:06 -05:00
ThorstenB
2a9f87e42c Fixed blocked splash-screen on sim reset
Fixes Commit 9a3fb418e4
2011-05-21 17:12:37 +02:00
Curtis L. Olson
8b17f2b20a Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-05-21 09:06:20 -05: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
James Turner
59fe23dcb3 Change occurrences of fabsf to fabs - part of tracking down an osg/Math issue on Mac with XCode4 2011-05-21 13:41:43 +01: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
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