1
0
Fork 0
Commit graph

6499 commits

Author SHA1 Message Date
Torsten Dreyer
4371a18771 resurrection of /sim/rendering/draw-otw 2010-10-26 21:20:01 +02:00
Erik Hofman
68f5429048 Sync with JSBSim cvs + Anders' patch to get it working with FlightGear. 2010-10-26 09:48:56 +02:00
Torsten Dreyer
657cd883d7 Compile again, replace clib strXXX with std::string 2010-10-25 14:48:56 +02:00
James Turner
e5abcb1d4e Merge commit 'refs/merge-requests/9' of git://gitorious.org/fg/flightgear into integration/merge9
Conflicts:
	src/GUI/new_gui.cxx
2010-10-25 09:12:21 +01:00
ThorstenB
d61e992d76 Fix occasional start-up crash when reading GUI XMLs.
_dialog_props holds SGSharedPtrs (pointers managed by reference counters).
Explicitly casting the object to an unmanaged SGPropertyNode* and deleting it
may cause heap corruption, since the following assignment "_dialog_props[..] = ..."
also tries to delete the (already deleted) object.
2010-10-24 21:36:15 +02:00
Anders Gidenstam
d7440d8fc5 src/Network/jpg-httpd.cxx: Include C++ C headers instead of plain C headers. 2010-10-24 15:22:06 +02:00
James Turner
987c1bdfda Automake build fixes for PLIB net/ul removal. 2010-10-24 11:04:14 +01:00
James Turner
db4b84bc5c Convert nasal directory() helper to use simgear::Dir 2010-10-24 07:10:51 +01:00
James Turner
7ccba95b9c Remove direct uses of PLIB ulXXX functions 2010-10-24 07:10:51 +01:00
James Turner
0e53e2cbb1 PLIB net removed from FlightGear 2010-10-24 07:10:51 +01:00
James Turner
984900d84d Make v2 HUD a top-level subsystem, so it can be reinit()ed correctly. 2010-10-24 07:10:02 +01:00
James Turner
957a59e57a Investigating an intermittent shutdown crash; fix deletion of AIManager. 2010-10-23 19:09:08 +01:00
James Turner
3464eef711 Make the v2 HUD support reinit(), so HUDs can be reloaded at runtime. 2010-10-22 19:11:24 +01:00
James Turner
d573cb43a0 Move three more subsystems into the init + update scheme - fixes some crashes found by papillion. 2010-10-22 16:44:37 +01:00
James Turner
f5c2c630eb Remove references to old (unused) airways code 2010-10-20 17:54:16 +01:00
James Turner
fe16732783 Fix Win32 compilation - avoid SID name clash with windows.h 2010-10-20 13:13:05 +01:00
James Turner
308fd1b112 Automake build fixes for airways commit. 2010-10-20 11:48:06 +01:00
James Turner
dd2eec7bd8 Airways/procedures code - add new data structures to store waypoints and
procedures, and routing algorithms, and modify the GPS, route manager and
WaypointList to use the new objects.
2010-10-20 09:02:02 +01:00
James Turner
0d7769ae72 Search aircraft dirs when loading AI models. Thanks to Thorsten Brehm for the catch. 2010-10-20 00:07:54 +01:00
James Turner
94a3471956 Merge commit 'refs/merge-requests/7' of git://gitorious.org/fg/flightgear into topics/merge7 2010-10-19 09:05:51 +01:00
James Turner
6251814604 Use a property listener on the root, to observe property creation, and thus lazily update the MP property map. Fixes bug 164, and probably many latent MP missing-property issues. 2010-10-18 00:58:35 +01:00
Torsten Dreyer
9f9e86a61e remove leftover debugging stuff 2010-10-12 15:26:00 +02:00
Torsten Dreyer
06fb956f2c Fix timing issue on startup for auto runway selection
The automatic runway selection code in startup.nas depends
on a valid metar before /sim/signals/nasal-dir-initialized
is fired. If the METAR arrives after that signal, no automatic
runway selection is performed. This patch waits for a METAR
on the first update() loop of the subsystem.
2010-10-11 21:21:53 +02:00
Torsten Dreyer
b9f2f432b3 Merge commit 'refs/merge-requests/8' of git://gitorious.org/fg/flightgear into merge-predictor-fix 2010-10-09 16:06:18 +02:00
Tim Moore
f901dac2ac replace GLU functions with OSG functionality 2010-10-08 23:48:01 +02:00
Thorsten Brehm
a4f1139fcd Fixed autopilot/Predictor.
Signature of Predictor::configure must match AnalogComponent::configure,
otherwise the inherited method isn't overridden.
=> predictor couldn't be configured.
=> speed predictor rules in "generic-autopilot-helper.xml" weren't working.
2010-10-08 21:41:09 +02:00
James Turner
9b2cea33e8 Remove uneccessary explicit update of FGLight 2010-10-05 23:17:32 +01:00
James Turner
0c342308eb Make MultiPlayer a well-behaved subsystem. 2010-10-05 23:17:32 +01:00
James Turner
d39841d2df Make FGAircraftModel behave like a standarrd subsystem. 2010-10-05 23:17:32 +01:00
Thorsten Brehm
a1137ed940 Another GPWS fix: terrain clearance filter must be reset on reset/reposition.
Queue of recent altitude samples must be cleared on reset/reposition to avoid nuisance alerts...
2010-10-05 22:34:23 +02:00
Thorsten Brehm
9be636555c Fixed navradio when shutting down/restarting nav receiver.
"nav-loc" and "has_gs" properties were not updated when nav receiver was rebooted.

Shutting down the nav receiver clears all nav outputs (including "nav-loc" and "has_gs").
=> When nav receiver is powered again, all outputs must be updated.
=> "nav-loc" and "has_gs" are only updated when active nav station changes.
=> old nav station must be cleared on shutdown to enforce update on nav reboot...
2010-10-05 22:34:08 +02:00
Torsten Dreyer
9ffaf11aa5 Autopilot: fix initialization of digital filters 2010-10-05 14:29:36 +02:00
Tim Moore
dba471519f Thorsten Brem's patches for bug 122
Fixes teleporting problems and disappearing tiles.
2010-10-03 08:35:12 +02:00
James Turner
3b410152f0 Merge commit 'refs/merge-requests/6' of git://gitorious.org/fg/flightgear into torsten/mkviii 2010-10-02 19:16:48 +01:00
Thorsten Brehm
e7b58d48e3 Fix wxradar to use path resolution
make it work with the new "multiple aircraft dir" feature
2010-10-02 00:40:24 +02:00
James Turner
0beab94cb5 Make the tile-manager a well-behaved SGSubsystem 2010-10-01 19:09:19 +01:00
James Turner
6963a6c2e4 Kill off the general.hxx header 2010-10-01 09:35:37 +01:00
James Turner
1afd4e602e Get rid of FGGeneral; expose equivlanet values via properties. 2010-10-01 09:33:31 +01:00
James Turner
af4e47179e Kill off fgRequestRedraw 2010-09-30 23:13:11 +01:00
James Turner
84b45683fc Refactor exit code, so the osgViewer gets 'done'. 2010-09-30 23:13:11 +01:00
James Turner
582c1e8df8 Tidy new_gui header 2010-09-30 23:10:00 +01:00
James Turner
f969504e6b Tidy fg_commands header. 2010-09-30 23:10:00 +01:00
Csaba Halasz
29afc299fd Merge commit 'refs/merge-requests/5' of git://gitorious.org/fg/flightgear into next 2010-09-30 23:54:35 +02:00
Thorsten Brehm
c7423cbcea - Fixed mk-viii sound sample loader: missing "/".
- Fixed triggering of debug assertion "altitude_callout_voice != NULL" when
  altitude callouts were delayed by higher priority warnings.
- Fixed performance bug: MK_VIII::IOHandler::TerrainClearanceFilter::update
  sucked CPU time (top #12 in profiler), due to complex "moving average"
  calculation on a queue of hundreds/thousands of altitude samples.
  Also, pausing the sim caused this queue to grow excessively (by one sample
  per update loop) => resuming the sim after pausing it for a long time
  resulted in the TerrainClearanceFilter sucking even more CPU time...
  => Number of altitude samples is now limited to 5 samples/sim-time-second
  (still more than enough to calculate a stable average).
2010-09-30 23:18:13 +02:00
Csaba Halasz
5a2d948c6f Add missing initializer in AIBallistic.cxx 2010-09-30 13:07:42 +02:00
Vivian Meazza
abd1d983c6 Rationalize methods.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-30 01:08:50 +02:00
Vivian Meazza
2b95158704 Add coefficients configurable at runtime, and bugfix.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-30 01:06:19 +02:00
Vivian Meazza
a5eba61c2a Remove unneeded variable.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-30 01:05:59 +02:00
Csaba Halasz
5000d212ec Merged commit from Vivian Meazza: Rationalize methods (ea85e50c2093942164bbc02f371a0c05b259f9f4) 2010-09-30 01:05:04 +02:00
Csaba Halasz
141186a358 Merge branch 'next' into vivian
Conflicts:

	src/AIModel/AIBallistic.cxx
	src/AIModel/AIBase.cxx
2010-09-30 00:45:13 +02:00
Vivian Meazza
10866851de Add join manoeuvre/command to AIWingman. Rationalize more methods. Fix some more bugs 2010-09-30 00:34:15 +02:00
Thorsten Brehm
c71fcbf10d Simplified pointer-aliasing patch.
Removed introduction of a new union and reused existing one.
2010-09-28 08:50:54 +02:00
Thorsten Brehm
5a7f838ff2 Fixed all type-casts violating the strict-aliasing rule.
=> Removes compiler warnings and optimization problems.
2010-09-27 23:48:20 +02:00
Torsten Dreyer
5ed04a6227 Ignore outdated METAR for realwx 2010-09-27 18:59:26 +02:00
Durk Talsma
df00df3feb - Fix compiler warnings. 2010-09-27 17:48:38 +02:00
James Turner
d5e0bc3b89 Thorsten Brehm:
* Fixed segfault when GPWS finds a matching airport but no suitable runway.
* Fixed several sim deadlocks when GPWS alerts trigger at "strange"
heights (e.g. initial alert height is -5ft or 1e-29...).
* Avoid repitition of GPWS alerts below 30ft, i.e. avoid excessive
repitition when plane becomes airborne at bumpy landings.
2010-09-20 09:06:30 +01:00
Erik Hofman
08a42cb164 Sync. with JSBSim CVS 2010-09-19 11:18:13 +02:00
Erik Hofman
4b8fde057b Sync. with JSBSim CVS 2010-09-19 11:16:29 +02:00
Anders Gidenstam
cf4d0fb0e3 Restored src/AIModel/AIShip.hxx to unix line endings. The last step of
rebasing merge-request #6 for inclusion.
2010-09-17 22:03:00 +02:00
Vivian Meazza
474789269b Bugfix - untie property.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
00f26994b2 Add <name> tag so that AIWingman or other suitable AI Object can be attached.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
1dc3ecf016 Make AI Objects of type Wingman, Escort, and GroundVehicle able to be stationed or formated to any AI Object type which can be named - Carrier, Ship, Tanker, Wingman etc.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
f08012d14f Remove debugging statement.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:44:58 +02:00
Vivian Meazza
b22960ffff Associate submodels with parent AI Objects.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:17:56 +02:00
Vivian Meazza
2758f07df0 Use AIBase method setParentNode() vice the local method.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:17:56 +02:00
Vivian Meazza
afbc360eed Add callsign for consitency.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:06:35 +02:00
Vivian Meazza
c7e864cee9 Move methods "setParentNode()" etc. to make them available to all AI Objects.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:06:35 +02:00
Vivian Meazza
b4fbde72b2 Enable Ballistic objects to be slaved to any AI Object.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-17 21:06:35 +02:00
Torsten Dreyer
a5017f218f Fix mean nasal bug when calling setprop("foo")
Reported on the forum from Thorsten Renk and analyzed by
Hooray, fixes this issue:
var x="/test/X";
var y="/test/Y";

setprop(x,100); # sets x=100
setprop(y); # sets x=0

setprop(x,100);
setprop(200); # sets x=200

by checking for at least 2 parameters for setprop
2010-09-13 22:15:50 +02:00
Torsten Dreyer
31a807563b Fix static initialization order trouble on OSX 2010-09-13 21:21:10 +02:00
Erik Hofman
f75656ea59 Allow for scenery de-saturation 2010-09-12 11:06:14 +02:00
Torsten Dreyer
f3af5ae5dc Be a bit more descriptive on "PT_vs_hpt: ran out of layers"
Please enter the commit message for your changes. Lines starting
2010-09-11 21:33:17 +02:00
Torsten Dreyer
814daa3365 Environment bugfix: don't write unchanged cloud coverages
Only write out changes of the cloud layer to avoid regeneration
of the cloud layers if nothing has changed
2010-09-11 21:23:11 +02:00
Torsten Dreyer
1a3eddbbcd Keep MSVC happy with the Environment updates 2010-09-11 20:32:37 +02:00
Torsten Dreyer
5c6fe95259 Environment controller overhaul
This is the initial commit for a reworked environment controller.
The main intention is to decouple the individual modules like
metar fetch, metar properties, environment interpolation etc.
to make it easier for other weather module developers to modify
environment settings.
As a side effect, the dialogs for weather-scenario, weather-conditions,
clouds and precipitations have been merged into a single dialog
2010-09-11 16:11:35 +02:00
Csaba Halasz
fdbfd6fd0b Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next
Conflicts:

	src/MultiPlayer/multiplaymgr.cxx
2010-09-09 00:48:17 +02:00
James Turner
7227973e2f Don't expect an 'Aircraft' sub-directory within each aircraft-dir. 2010-09-08 11:01:26 +01:00
James Turner
e8b0bb872a Register the aircraft resource provider. 2010-09-06 22:57:48 +01:00
James Turner
18a5a2a144 Fix one more place to use path resolution
(and hence work with multiple aircraft dirs)
Thanks to Jentron for the catch.
2010-09-06 16:10:58 +01:00
James Turner
8330449c5f Pass current-dir into XMLSound
(and update to revised SGSoundSample ctor)
2010-09-06 09:28:28 +01:00
James Turner
a7a2cb393a Use the new Simgear ResourceManager to resolve paths. 2010-09-06 09:13:10 +01:00
James Turner
8a97ed354d Fix submodel code to work with multiple aircraft dirs. 2010-09-06 09:12:25 +01:00
Torsten Dreyer
1e43675f61 Expose some OSG DisplaySettings to the property tree 2010-09-05 11:56:38 +02:00
Durk Talsma
aba57077fd Issue a warning when finding duplicate tail numbers. Note that this is far from a fatal error, but does interfere with the startup heuristics data collection mechanism. 2010-09-03 12:32:55 +02:00
Durk Talsma
8112ff5842 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-09-03 10:57:27 +02:00
Durk Talsma
558582b58d * A few new features to allow database management and traffic pattern developement:
--prop:/sim/traffic-manager/dumpdata=true: dumps the currently loaded datafile to the console for inspection.
  --prop:/sim/traffic-manager/datafile=/path/to/somefile.xml: Skips autoscanning and reads traffic only from the specified xml file.
  --prop:/sim/traffic-manager/datafile=/path/to/somefile.conf: Slips autoscanning and reads traffic from a plain text file, as described on the forum/wiki

* Removed the use of pointers for heuristics calculations, as urged by Frederic Bouvier
* Fixed domain error in proportion calculation during loading, resulting in random skipping of aircraft, as reported by Jorg van der Venne.
2010-09-03 10:47:05 +02:00
Anders Gidenstam
a9062080b0 Restored line endings in src/MultiPlayer/multiplaymgr.cxx.
Please check that the line endings are not messed up before mergeing.
2010-09-02 20:07:34 +02:00
Anders Gidenstam
95a7e177d7 Restored line endings in src/AIModel/AIMultiplayer.cxx.
Please check that the line endings are not messed up before mergeing.
2010-09-02 19:46:44 +02:00
Vivian Meazza
2cdc9f6461 Merge branch 'next' of D:\Git_New\flightgear into next 2010-09-02 09:27:18 +01:00
Vivian Meazza
9018d65c52 Add contrail as a standard property
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-02 09:25:53 +01:00
Vivian Meazza
bc12f0be21 Walk the AImodels property tree only once at init, rather than at update. Should have a beneficial effect on frame rate, but in practice makes no discernible improvement. It is cleaner code though.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-02 09:24:45 +01:00
Csaba Halasz
d8165470c3 Merge commit 'refs/merge-requests/6' of git@gitorious.org:fg/flightgear into next 2010-08-31 22:39:34 +02:00
Durk Talsma
800352e26f - Whoops, missed committing this tiny but fatal-if-not-included change. 2010-08-31 16:57:07 +02:00
Durk Talsma
eb45d524a8 Provide an initial heuristic for airports for which we haven't collected any usage data yet. 2010-08-31 13:21:30 +02:00
Durk Talsma
f2bca353ad Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-08-30 21:15:17 +02:00
Durk Talsma
b090d3dabc Enable the collection of AI aircraft position statistics. This will allow for a dramatic speedup of the establishment of AI traffic after program initialization. 2010-08-30 21:13:16 +02:00
Vivian Meazza
792cb2701f Add tanker property to list of standard properties
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-30 17:16:30 +01:00
Vivian Meazza
118036cdda Make the parameter isTanker controllable
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-30 17:15:34 +01:00
Vivian Meazza
8ca420ec53 Merge branch 'next' of D:\Git_New\flightgear into next 2010-08-30 09:49:42 +01:00
Durk Talsma
9197057784 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-08-29 19:28:57 +02:00