1
0
Fork 0
Commit graph

7145 commits

Author SHA1 Message Date
Durk Talsma
02712dc1ad Several Bugfixes:
* Landing AIAircraft now land properly!!!
 * Fixed problems with takeoff scheduling.
 * Untangled several vertical speed calculation algorithms.
 * No more bent-over-backwards and jump-in-the-air AI aircraft initializations.
 * Fixed intermixed target speed and target altitude during climb phase.
 * Implemented beginnings of a "line up and wait" procedure.
 * Tried to use actual runway elevation for calculating the decent profile.
2011-10-09 00:25:04 +02:00
James Turner
ef995913e1 Further NavDisplay hacking, symbol binding is working more sanely now. 2011-10-07 08:34:56 +01:00
Durk Talsma
a9ac75b9c9 Revert back to the version from sept 4. Vertical speed calculations of decending AI aircraft were messed up. 2011-10-05 21:40:47 +02:00
Torsten Dreyer
e9d24b05ca Introducing: The new navradio code (WIP)
Here comes the work-in-progres code for a new navradio
implementation. Once completed, it will replace the
old/current navradio implementation.
The new code can be activated by setting
/instrumentation/use-new-navradio=true
at startup. This disables the old navradio implementation.

Current state:
- VOR works pretty good including the new
functionality 'code of confusion'.
- LOC and GS basically work
- backward compatibility (many properties) is to be implemented
2011-10-05 15:26:41 +02:00
Mathias Froehlich
a486eebeef hla: Avoid explicit attribute update request. Is already done by simgear. 2011-10-04 20:58:46 +02:00
James Turner
c4c5cc850b Adjust cursor-setting code, for better compatibility with Cocoa-Viewer (OSG patch still required, unfortunately) 2011-10-04 09:17:56 +01:00
James Turner
1692bc749e Mac: Work-around for OSG3's Cocoa Viewer interacting badly with PUI 2011-10-04 09:14:15 +01:00
James Turner
41759b15d6 Work on the NavDisplay instrument. 2011-10-04 08:58:09 +01:00
Torsten Dreyer
5f2fff4ec4 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-10-03 22:29:48 +02:00
Durk Talsma
f2b354d9cb Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-10-03 20:57:32 +02:00
Durk Talsma
4640f5bb02 * A new algorithm for determining hold position instructions. This version still needs some finetuning, but already appears to be more solid than the old version.
* Some tweaks to the traffic scheduling algorithm.
* Misc cleanup.
2011-10-03 20:54:58 +02:00
Mathias Froehlich
40d72b3ba7 hla: use the property based interface from the property data element. 2011-10-03 13:00:25 +02:00
ThorstenB
3451012bca Make LOD properties of AI/MP aircraft run-time configurable. 2011-10-03 12:01:58 +02:00
James Turner
465557cfa7 Improve magnetic heading handling in MapWidget - following some testing at NZCH 2011-10-02 14:30:06 +01:00
Mathias Froehlich
761644c51d hla: use the new HLAFederate::processMessages() call. 2011-10-02 15:13:55 +02:00
ThorstenB
56912c17c5 adf: fix "in-range" node
"in-range" should also be false when no station is available
2011-10-02 13:24:12 +02:00
ThorstenB
558f0c2d8f multiplay manager: option to disable freeze-on-replay feature 2011-10-02 13:23:31 +02:00
ThorstenB
a6a6910653 ATCMGR: fix minor output formatting issue 2011-10-02 13:22:09 +02:00
ThorstenB
ab84ff5904 Replay upgrade, part II: Integrate flight recorder, update replay system.
Drop hard-coded replay property logic, cut ties to net_ctrls, net_fdm.
Improve replay system controls and status information.
2011-10-01 22:58:40 +02:00
ThorstenB
d64bcf0175 Replay upgrade, part I: Add new flight recorder. 2011-10-01 22:41:53 +02:00
Mathias Froehlich
7645dd3a1d hla: make use of createJoin/resignDestroy. 2011-10-01 18:37:55 +02:00
James Turner
283b26114c Fix glx shutdown to only apply on Unix & !Mac (but we should really add a proper ifdef for GLX) 2011-10-01 10:05:01 +01:00
Mathias Froehlich
978a577ea2 Ugly workaround for a crash on exit with multiple screens 2011-10-01 09:50:34 +02:00
Mathias Froehlich
af1e00ac72 clouds: remove unused bump mapping flag. 2011-10-01 09:22:44 +02:00
Anders Gidenstam
90b35f2cbe Added /scenery/events as a new MP enabled property for sharing scenery events. 2011-10-01 00:17:23 +02:00
Torsten Dreyer
478e771632 Add a localizer audio ident class
This will be needed soon in the new navradio code.
2011-09-29 00:01:44 +02:00
Christian Schmitt
ede92fce54 Fix a segfault that became apparent with a 850 apt.dat file 2011-09-28 10:18:12 +02:00
James Turner
dbda2fb95d Switch ATCmgr comm station search to filter by range in cartesian, not geodetic, space, to avoid numerical instability with extremely distant stations. 2011-09-28 09:06:31 +01:00
Erik Hofman
dbe1504858 remove a cvs conflict 2011-09-26 10:50:48 +02:00
Erik Hofman
1df7b9cdc2 JSBSim fixes. 2011-09-26 09:07:59 +02:00
Durk Talsma
b482188848 Whoops, lazy copy/paste job. 2011-09-22 22:08:20 +02:00
Durk Talsma
0fca002ab6 Bugfix: Retrieval of the next radio frequency was broken. Contributed by Adrian Musceac. 2011-09-22 21:38:37 +02:00
Durk Talsma
152fec1cb6 Patch by Torsten Dryer: Remove the Ugly global dialog variable and remove rwy as a member variable from the AIFlightPlan class. 2011-09-22 20:52:05 +02:00
Durk Talsma
e00157d4e8 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-09-22 19:09:36 +02:00
Durk Talsma
5ae207c2fc Prefetch a previously saved aircraft settings configuration file to retrieve aircraft usage and livery information. Fallback to default settings in aircraft-set.xml file if not found. 2011-09-22 19:06:26 +02:00
James Turner
54aca561b6 Fix JPEG-server builds. 2011-09-21 19:22:13 +01:00
Torsten Dreyer
fcf0371777 fix cmake conditional for event-input 2011-09-21 19:22:32 +02:00
Torsten Dreyer
d860c949e3 Merge branch 'next' of gitorious.org:fg/flightgear into next 2011-09-21 19:19:10 +02:00
James Turner
5a17ccf9eb Push aspect-ratio handling into CameraGroup, so renderer doesn't need to resize viewports each update. 2011-09-21 17:13:53 +01:00
James Turner
227b3e469c Remove indirection on viewer draw/resize code-paths. 2011-09-21 17:13:53 +01:00
James Turner
7dd8f00c42 Enable event-input for joysticks by default on Mac + Linux, in Cmake. 2011-09-21 17:13:13 +01:00
Torsten Dreyer
25707ce82e Add debug messages for real-weather runway selection 2011-09-20 16:15:47 +02:00
James Turner
563614f36c Expose route-manager WP mirror nodes on the API 2011-09-19 11:38:35 +01:00
James Turner
af6ed2ff3a Expose departure+arrival airport + runway on route-manager. 2011-09-19 11:38:35 +01:00
James Turner
28c8e6fe1c Initial hacking on nav-display instrument, derived from the wxradar code 2011-09-19 11:38:35 +01:00
James Turner
66a3a7f164 Make map widget zoom a real property, so it persists between opening and closing the dialog. 2011-09-18 12:53:40 +01:00
Erik Hofman
e1d5a52a3a resync JSBSim 2011-09-18 11:06:54 +02:00
Durk Talsma
db816deb90 Added a new startup option. By giving the command line option --parkpos=AVAILABLE you can -in principle- let FlightGear decide what the most optimal parking location is. This option does require a few properties to be set that are also needed for future ATC use. Hence, they are listed under /sim/ATC, but could move to a different location if desired.
/sim/ATC/radius should be a nummeric estimate of the size of your aircraft. A small aircraft fits into a large parking, but a large aircraft does not fit into a small parking space. Because the AI part of radius is also used for slightly different purposes (prioritizing gate assignmments, the given valuem may deviate slightly from the real aircraft size. See http:/wiki.flightgear.org/Aircraft.radii for an overview of currently used values for the redius property.
/sim/ATC/flight-type can be any one of "ga", "cargo", "gate", "mil-fighter", "mil-cargo", or "vtol". See http://wiki.flightgear.org/Interactive_traffic#A_technical_perspective for more information.
optionally, the property /sim/ATC/airline can be set set to a three letter icao airline code. By way of illustration, I will commit a number of startup preset files setting these properties shortly.

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

Also did some more finetuning to the traffic mananger routing algorithm.
2011-09-17 16:51:00 +02:00
Durk Talsma
67c604a722 Some tweaks to the AI traffic scheduling algorithm. Remove the requirement for a home port, but keep planning until we are back at the original port of departure. 2011-09-16 20:04:13 +02:00
Torsten Dreyer
0fa556d36a fix upper/lowercase typo
Just don't develop with windows. Never.
2011-09-15 22:39:47 +02:00
Torsten Dreyer
43109feb0c Some more refactoring of the radios
- wrap the ident-generating code into a class
- move dme-in-range property into dme.cxx
- move dme-ident generation into dme.cxx
- support ident-button and volume for dme idents
- use globals.get_aircraft_position instead of properties
- some minor cleanup
2011-09-15 21:28:30 +02:00
James Turner
2de3872d66 In joystick configurations, fall back to <unix> if no <mac> entry was provided, since the number is frequently identical. 2011-09-15 09:54:00 +01:00
Torsten Dreyer
9cef27f5ca Refactor morse and beacon as singleton 2011-09-13 20:12:52 +02:00
Durk Talsma
1e4b17595a -Prevent crashing the sim when starting at a gate that is not connected to the ground network. For now, just silently shut down the ATC system. 2011-09-11 21:42:29 +02:00
Erik Hofman
7e91e7e98b change file mode to 644 2011-09-11 13:19:51 +02:00
Erik Hofman
b09a2347a8 remove unused files 2011-09-11 11:44:19 +02:00
Erik Hofman
7375166c2b New version of JSBSim, a big rewrite. 2011-09-11 11:42:21 +02:00
Mathias Froehlich
549c5eccb9 cmake: Factor out common simgear dependency libs.
Factor out and use this core simgear depenency
library cmake variable.
2011-09-11 11:22:10 +02:00
Frederic Bouvier
099bfd988b fgfs and fgpanel need to be linked with the winsock library (on Windows) 2011-09-09 21:38:02 +02:00
James Turner
a5a8090d52 Cmake: Split simgear libraries into core and scene (only scene uses OSG). Fix linkage issues, and make helper binaries (yasim, terrasync) link against less stuff. 2011-09-08 13:59:40 +01:00
Mathias Froehlich
d09575e646 autotools build updated with sgthreads library 2011-09-08 00:49:23 +02:00
Csaba Halasz
938d4f3752 autotools build updated with sgthreads library 2011-09-07 22:14:36 +02:00
Durk Talsma
35abe6d0ab A number of cosmetic and/or infrastructural changes.
Traffic Manager:
	* Just continue routing until we run out of flights. This change removes one of the major requirements for setting the "Home port" field.
	* Add a time restriction requirement for the aircraft scheduler; this became necessary after removing the limited-to-home-port routing restriction.
	* Added a new field to the heuristics calculation: take into account whether an aircraft has already been used in a previous session. Rotate aircraft assignments for greater variability across sessions.
	* Added a revision number to the cache files, so that old cache results, which are no longer compatible with the new file format, are discarded.

Groundnetwork and traffic control:
	* Added a revision number to the cache files, so that old and incompatible results are discarded.
	* The caching algorithm probably didn't store the correct data for airports that were processed while the user was quite far away. This is now corrected by checking whether the cached elevation data are equal to the generic airport elevation.
AIAircraft:
	* I've been searching for the infamous aircraft bend-over-backward bug, that can occur during initialization, but to no avail yet. The only variable potentially responsible (tgt_vs) wich can explain the irregular jumping behavior, as well as the weird pitch results is initialized in AIAircraft's only constructor (through AIBase), and I can't find any situation in the ground handling code where this variable could get bizarre values. But,
	* a couple of tgt_vs. calculations appear to be completely redundant. This value was calculated twice inside the ProcessFlightplan function, and subsequently again in the updateSecondaryTargetValues function. I have removed the calculations in the process flightplan function, without any apparent side effect.
2011-09-04 20:27:36 +02:00
ThorstenB
741efe2efb Attempt to tidy up the search path mess (noticed by TorstenD)
When a model is not found in the custom scenery directories, load data
from base-package (instead of trying to access file "").
Also allow paged models to be loaded from custom scenery folders.
2011-09-04 11:09:21 +02:00
Anders Gidenstam
a2972051a9 Added an --materials-file option to select the materials file to use at startup.
The property /sim/rendering/materials-file can also be used for this purpose.
2011-09-03 21:48:50 +02:00
Durk Talsma
77e844a78d Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2011-09-03 11:40:51 +02:00
Durk Talsma
e65f53b571 Read groundnet node information from the scenery, and (optionally) write it to a cache file. Note that this mechanism should be extended, so that the cache files will be updated whenever the terrain files are changing. The current patch also uncovers a bug, in the sense that the groundnetwork destructor is never called. Presumably this is due to the way airports are allocated in flightgear. Because the ground networks are never saved, I am periodically saving the cache files; but this behavior should probably be changed later on.
The current patch incorporates work contributed by Adrian Musceac.
2011-09-03 11:26:17 +02:00
Mathias Froehlich
1c1722a2e9 Adapt to recent simgear hla/rti changes. 2011-08-31 20:02:00 +02:00
Torsten Dreyer
f835561fbe Fix typo 2011-08-31 19:54:59 +02:00
Torsten Dreyer
d83715903a Fix cmake build with SP_FDMS (missing BalloonSim.cxx) 2011-08-29 21:09:26 +02:00
Erik Hofman
1e9120a8ac Add proper conversion factor 2011-08-29 18:34:57 +02:00
Torsten Dreyer
b4400f8316 Add convenience std::string versions for fg[G|S]etXXX
Add inline wrappers functions for fgGetXXX and fgSetXXX
to make life with std::string easier
2011-08-27 17:19:36 +02:00
Torsten Dreyer
7ae9122f4e Final warning before egt_degf gets purged 2011-08-26 14:05:38 +02:00
Torsten Dreyer
54f1b83f98 refactor the realwx-controller
clean up the code and prepare for new real-weather sources
2011-08-26 09:01:31 +02:00
Torsten Dreyer
4599893fa9 fix #416: reciprocal filter broken 2011-08-25 22:25:20 +02:00
ThorstenB
cc020fe9df Avoid excessive load when no navaids are in range
When no navaid is found, '_ref_navaid_id_node->setStringValue("")' results
in a listener firing, which requests another navaid update when no navaid
is available.
=> Resulted in FGPositioned::findClosest being called in every update loop,
when no navaid was within range.
2011-08-24 23:17:05 +02:00
James Turner
557c95a5ec Change default (non-set) MP hosts to be an empty string instead of '0' 2011-08-24 09:44:52 +01:00
James Turner
51e307a742 Make errno dependency explicit, since raw_socket.hxx won't expose it, soon. 2011-08-23 10:25:17 +01:00
Torsten Dreyer
b82ea065c3 Add the frequency to the navinfo hash 2011-08-22 09:18:04 +02:00
ThorstenB
d76a0b09f8 Use SG_LOG(&strerror) instead of "perror".
Also clean-up some error messages.
2011-08-20 23:13:42 +02:00
ThorstenB
cf2236351c Avoid some useless file accesses
Empty "markers" in between scenery search paths shouldn't be
considered when building search paths.
2011-08-20 23:13:27 +02:00
ThorstenB
18983c5387 Avoid "no disk in drive" popups on Win7 systems
Stray accesses to exchangeable drives cause pop-up error boxes on
Win7 systems, blocking the entire process.
2011-08-20 23:13:17 +02:00
Torsten Dreyer
3fbbe3134a new global function for aircraft position
add a new function to get the aircraft's position instead
of reading /position/* properties
2011-08-20 08:54:47 +02:00
ThorstenB
104507ad8b #410: multiplay manager reporting errors
receive on a non-blocking socket may return 0, which does not indicate an
error - and does not mean "errno" was upated. So do not check "errno",
errors there belong to calls elsewhere...
Error message apparently triggered constantly with FG2.4.0 on Windows.
2011-08-18 22:36:44 +02:00
ThorstenB
ae6623655c #403: 2D horizontal scrolling on Mac OS
Ignore events with X-axis scrolling only (getScrollingDeltaY() == 0).
Thanks to Tatsuhiro Nishioka.
2011-08-18 21:32:24 +02:00
Curtis L. Olson
a5de08e240 Fix a couple issues with non-referenced files missing from the source
distribution (and thus breaking the build.)
2011-08-15 22:50:39 -05:00
Frederic Bouvier
1c1947eab2 Remove obsolete msvc build files 2011-08-15 19:29:27 +02:00
ThorstenB
f22a36c59c Fix replay NaN issue due to unrecorded/uninitialized data.
Replay was setting spoiler/speedbrake properties, however these were never
recorded/initialized, resulting in NaNs being introduced.
2011-08-13 16:53:47 +02:00
ThorstenB
20914e49cd Tatsuhiro Nishioka: #403, scroll up/down for Mac OS
Support osgViewer's Scroll_2D event (so far only available for Mac)
2011-08-12 23:28:57 +02:00
ThorstenB
28496bb6ac #359: jumping mouse control axis in "constrained" mouse modes
Experimental patch - let's see if this helps those who saw the issue,
otherwise we'll try a different patch...
2011-08-12 00:24:25 +02:00
ThorstenB
e9a9f8c96d Use some more logging class variety.
Stop using SG_GENERAL and SG_ALL everywhere. Using different
classes makes switching the classes really useful...
2011-08-12 00:09:26 +02:00
Vivian Meazza
ce97a1e4c5 Bugfix: Ballistic objects with "expiry" set were not instantiating correctly.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-08-11 21:46:51 +02:00
Mathias Froehlich
5093cbed43 Do not delete disabled network protocols twice. 2011-08-11 20:35:44 +02:00
Durk Talsma
cfa08438ae Merge branch 'durk-atc' into next 2011-08-10 21:42:12 +02:00
Durk Talsma
552aa5419f Some fine tuning of the ATC messages related to ground to tower transfer.
Removal of obsolete debugging messages. Let's hope I caught them all.
2011-08-10 21:39:28 +02:00
ThorstenB
5bd8828fe6 Allow bidirectional support for generic interfaces. 2011-08-10 00:05:10 +02:00
Durk Talsma
b603344d69 Merge branch 'next' into durk-atc 2011-08-09 20:09:14 +02:00
Torsten Dreyer
1e7d072eed Add LOD to each AI model
Add a LOD (range animation) to each AI model if the property
/sim/rendering/static-lod/ai is set to any number greater than
zero. AI models get loaded but only displayed when closer than
the number given in the property (in meters).
If the property is absent or it's value is less or equal 0.0
than no LOD is added to the AI model.
2011-08-09 18:02:37 +02:00
Frederic Bouvier
5e30675c70 Fix issue #398: Menubar - Help > Help opens strange path when including space character 2011-08-08 23:26:58 +02:00
Durk Talsma
8212c88969 Fix state changes related to hold position and resume taxi ATC instruction. 2011-08-08 21:50:44 +02:00