1
0
Fork 0
Commit graph

6805 commits

Author SHA1 Message Date
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
Durk Talsma
467513cbaf Major update to the AI code:
* New features
    - More realistic descent paths
    - Separation during descent and approach
    - ATC approach controller (still silent)
    - inbound traffic flow will start immediately
  * Bug fixes
    - Properly handle vertical speed when on ground
    - Departing aircraft now wait for taxiclerance before moving
    - Traffic manager waits for proper weather initialization
    - Fixed instabilities in the preferential runway usage code
    - Fine tuning of waypoint following code.
2010-08-29 19:25:34 +02:00
Vivian Meazza
9e44be1df7 Merge branch 'next' of D:\Git_New\flightgear into next
Conflicts:
	src/AIModel/AIBallistic.cxx
2010-08-29 00:08:50 +01:00
Vivian Meazza
dff8099994 Major update of Ballistic objects and submodels. Introduce submodels slaved to AI Objects. Remove deprecated code. Try to increase framerate. Use quaternion calculations for Initial Conditions.
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-29 00:00:09 +01:00
Torsten Dreyer
c41364983e fix double binding bug in autopilotgroup and naming error 2010-08-26 18:51:46 +02:00
Torsten Dreyer
fed62b13dd Downgrade two autopilot SG_LOG alerts to warnings 2010-08-25 20:43:43 +02:00
Torsten Dreyer
0d6329e3e7 Don't segfault on missing boundary table 2010-08-24 20:32:41 +02:00
Torsten Dreyer
8a00bce145 property-rules might be read from fg-root 2010-08-23 22:27:39 +02:00
Torsten Dreyer
11016dbe84 Oups - terrainsamplers header was modified, too 2010-08-23 17:52:19 +02:00
Torsten Dreyer
b2f8238696 Some terrainsampler improvements
- use max. computation time instead of max computations per frame
- restart computation of an area only after significant movememt
- let the area move with a heading and a speed
2010-08-23 17:47:57 +02:00
Frederic Bouvier
52ac173257 Merge commit 'refs/merge-requests/1551' of git://gitorious.org/fg/flightgear into stuartb/modelcallsign 2010-08-21 14:54:08 +02:00
Frederic Bouvier
f10f126352 Line endings ? 2010-08-21 14:53:03 +02:00
Torsten Dreyer
54e6757211 Autopilot is more than just an autopilot: Introducing: "property rule"
The autopilot has grown beyond being just an autopilot. It's
components, filters and controllers could be used to set property
values based on complex rules and driven from other property values.
That's why I chose to give it the name "property-rule".
This patch allows to define an arbitrary number of property rules under
a/sim/property-rule[n]/path
using the same syntax as autopilot configurations.
2010-08-18 18:50:07 +02:00
James Turner
ae50c054a9 Fix crashes (activating the route-manager) with a default GPS. 2010-08-16 17:10:12 +01:00
James Turner
dbd9935c52 Expose aircraft-dirs under /sim (read-only, for security) 2010-08-16 11:00:54 +01:00
Torsten Dreyer
e43456ba43 Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-08-15 20:35:14 +02:00
Torsten Dreyer
60f7d0f16c Downgrade the ridgelift to a subsystem of environment 2010-08-15 20:33:29 +02:00
James Turner
2e69930c7d Expose path resolver to Nasal. 2010-08-15 11:02:27 +01:00
James Turner
bca3494462 Support relative paths in 'loadxml' command
(relative to FG_ROOT or an aircraft dir)
2010-08-15 11:02:15 +01:00
Torsten Dreyer
10eadf0c6e First step into implementing the local-weather system
This is the first part of the local-weather implementation
of Thorsten Renk, currently written entirly in Nasal. Here
comes the terrain-sampling subsystem as a first step. It is
not (yet) included in the build process which will be
performed when the system has a little matured.
2010-08-14 22:42:31 +02:00
James Turner
8d5021f670 Make ident/name searches on FGPositioned case-insensitive (for the GPS, especially) 2010-08-14 20:24:30 +01:00
James Turner
ae7342ebe7 Fix issue identified by AndersG - don't load 2.5D panels for MP aircraft, only the main aircraft. 2010-08-14 19:50:22 +01:00
James Turner
a363da9274 Really fix bug 146 - angle units confusiuon. 2010-08-14 19:29:02 +01:00
James Turner
6266491aea Candidate fix for bug 146, view_direction computed incorrectly. 2010-08-14 19:24:48 +01:00
James Turner
dae7e961c9 Merge branch 'topics/bug150' into next 2010-08-14 19:17:23 +01:00
James Turner
57cb0a809b Fix bug 150 (airports not found in GPS search)
Overhaul and simplify the GPS search logic based
on experience and testing with the API. Also fix
search-by-name, which was broken.
2010-08-14 19:16:28 +01:00
Vivian Meazza
ad3fae9039 Merge branch 'next' of D:\Git_New\flightgear into next 2010-08-14 13:47:03 +01:00
Vivian Meazza
72c5a314e6 Add aubmodels to AI objects
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-14 13:39:30 +01:00
Erik Hofman
63b3f802ec sync again 2010-08-14 14:09:58 +02:00
James Turner
71fbacc6dc Thorsten Brehm: GPWS: Fixed permanent blocking of lower prio warnings
Only block callouts which were actually issued to the pilot. When
multiple callouts trigger at the same time, allow lower prio warnings
to be issued once the higher prio ones are resolved.
=> Gear/flap warnings are now working reliably (no longer blocked
permanently when altitude callouts are enabled).
2010-08-14 10:23:13 +01:00
Torsten Dreyer
bc31bdbbbb use simgear::strutils::rpad() instead of strncpy() 2010-08-12 13:03:26 +02:00
James Turner
025b94f099 Even more std::string fixes. 2010-08-09 09:40:20 +01:00
James Turner
f467ba3609 One more std::string fixup. 2010-08-09 09:16:28 +01:00
James Turner
19360a8425 Fix 'using std::' abuses 2010-08-09 08:36:20 +01:00
James Turner
239fea1b54 Even more imlicit includes becoming explicit. 2010-08-07 14:07:17 +01:00
James Turner
cc7a9d4727 Make even more implict includes explicit. 2010-08-07 13:00:33 +01:00
Torsten Dreyer
bb2d1f55e9 Interpret environment variables and hostname on Windows
- Point the homedir variable to %APPDATA%/flightgear.org. This
enables .fgfsrc in this path for windows users.
- Evaluate the returncode of gethostname() to not strdup() bogus
characters on failure. Also mainly on windows.
2010-08-06 09:06:32 +02:00
Torsten Dreyer
1aa484aee5 Fix segfault on invalid command line arguments
If FlightGear terminated before the FDM was instantiated it crashed.
2010-08-06 08:44:34 +02:00
Erik Hofman
1d91468ddc Fix a startup offset problem 2010-08-04 10:22:26 +02:00
James Turner
7f36caede6 Create TimeManager subsystem, and collect the time related code out of main.cxx and fg_init.cxx into it.
Remove the unfortunately named 'tmp.[cxx|hxx]', pushing the remaining code in FGLight.
(second try, with init bug fixed)
2010-08-04 09:16:37 +01:00
Anders Gidenstam
756e719b20 src/Model/panelnode.cxx: Do not leave dangling pointers behind. 2010-08-03 20:58:48 +02:00
Erik Hofman
0d0751e37c Sync. with JSBSim CVS. 2010-08-03 09:51:13 +02:00
Frederic Bouvier
61a81e855d Merge commit 'refs/merge-requests/1552' of git://gitorious.org/fg/flightgear into vivian/contrails 2010-08-03 08:27:57 +02:00
David Luff
53358a55bf Remove old AI system 2010-08-03 00:21:56 +01:00
Vivian Meazza
63ec4f3f6c Merge branch 'next' of D:\Git_New\flightgear into next 2010-08-02 09:04:40 +01:00
James Turner
47fd8a8a2a Revert "Create TimeManager subsystem" - not quite ready for prime-time yet!
This reverts commit 50eb95dcad.
2010-08-02 00:23:36 +01:00
James Turner
c61a14afdd Once again, I forgot that we bind() subsystems *before* init(). 2010-08-01 23:50:52 +01:00
Vivian Meazza
724cdac335 Merge branch 'next' of D:\Git_New\flightgear into next 2010-08-01 23:25:55 +01:00
James Turner
50eb95dcad Create TimeManager subsystem, and collect the time related code out of main.cxx and fg_init.cxx into it.
Remove the unfortunately named 'tmp.[cxx|hxx]', pushing the remaining code in FGLight.
2010-08-01 20:33:11 +01:00
James Turner
7aba4333a2 Reset - instruments can be re-inited now (reloads XML files) 2010-08-01 19:04:31 +01:00
James Turner
388a0a5b6a Make saveInitialProperties smarter, and hence simplify the reset code path. 2010-08-01 19:04:20 +01:00
Frederic Bouvier
b60cf04c1e Fix MSVC compilation 2010-08-01 18:43:28 +02:00
Frederic Bouvier
461b5fe00b Compile with MSVC10 2010-08-01 18:07:18 +02:00
Durk Talsma
40480eb2b4 Because the new code is a stub, it really ought to be doing nothing, not even print debug information. :-) 2010-08-01 16:24:11 +02:00
Durk Talsma
7c73c7d3e5 Added some stubs in the flightgear main code to eventually add a full, FGSubsystems based ATIS system that will serve as a replacement for the ATCDCL code. 2010-08-01 16:16:33 +02:00
Durk Talsma
92a69d6d0a Silence a debug message that was accidentally left open. 2010-08-01 16:13:52 +02:00
Vivian Meazza
d317428257 More tidying
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-01 14:50:03 +01:00
Vivian Meazza
740195dc63 Merge branch 'next' of D:\Git_New\flightgear into next 2010-08-01 14:48:18 +01:00
Vivian Meazza
6a7ec168e5 Tidy up for commit
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-01 10:47:40 +01:00
James Turner
5c507beba2 Fix up Win32 GUI code after simgear/screen cleanup; deprecated dialog code going away. 2010-07-31 16:56:07 +01:00
James Turner
d9236f33b2 Remove use of simgear/screen/extensions.h. 2010-07-31 15:15:40 +01:00
Durk Talsma
314f3c5718 Properly compile kln89 code without reliance on ATCDCL. 2010-07-31 13:35:22 +02:00
Frederic Bouvier
ab09078767 Disable ATCDCL and fix replacement layer 2010-07-31 09:25:17 +02:00
James Turner
cba5066a6b Thorsten: EGPWS fixes!
* Fix issue #139, uninitialized variable causing sim deadlock in MK_VIII::Mode5Handler::get_soft_bias
* Fix more uninitialized variables sometimes causing warnings not to work.
* Fix some warnings only working on a single approach (missing reset).
* EGPWS self-test can now be triggered more than once (missing reset).
* Implement configuration options for attitude and altitude input selection.
2010-07-30 09:20:36 +01:00
James Turner
4c7fb6c91b Removes some references (in comments / disabled code) to Point3D 2010-07-30 09:07:24 +01:00
James Turner
8e5f3ac8a3 Set the key SGModelLib callback to make aircraft-dir OSG loading work. 2010-07-29 01:07:32 +01:00
Vivian Meazza
a61f34667f Merge branch 'work4' into next
Conflicts:
	src/Environment/environment_mgr.cxx

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-28 22:39:07 +01:00
Vivian Meazza
da8251d1a4 Experimental bugfix for particle wind
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-28 22:22:04 +01:00
Vivian Meazza
adf17287ab Add "expiry" parameter and other changes to implement persistent contrails using Ballistic objects
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-28 22:20:50 +01:00
James Turner
ab495d1370 Add --fg-aircraft option, and aircraft dir path list. Partial support in places that load files, for respecting the setting.
Add helper to look for an aircraft branch path in multiple candidate locations.
Update the main subsystems to use the helper, and hence load from any aircraft dir.
2010-07-28 22:03:10 +01:00
James Turner
d1852430bf Make various implicit includes (via PLIB) explicit. 2010-07-28 10:25:42 +01:00
Durk Talsma
2f4b6d2168 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-07-27 20:21:31 +02:00
Torsten Dreyer
ff408dc540 (Re)allow duplicate names for A/P stages
Don't ignore autpilot stages with duplicate names but rename
the dups to a unique name by adding '_' plus a sequence number.
2010-07-24 17:17:33 +02:00
Durk Talsma
a49d553ea8 Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-07-24 09:21:06 +02:00
Durk Talsma
7313b8f1df - Trying to improve waypoint following. 2010-07-24 09:19:37 +02:00
Cutis L. Olson
aa16a1e12a Call the new particle wind setting function with wind direction and speed.
The particle wind setting method then takes care of whatever logic and
transformations are requred to convert to the proper OSG coordinate system.
2010-07-23 12:37:17 -05:00
James Turner
9604908a8d Remove all (2) uses of simgear/math/vector.h from FlightGear. 2010-07-23 13:26:07 +01:00
James Turner
900fce6374 Fix issues exposed by PLIB-free SimGear. 2010-07-23 09:41:37 +01:00
James Turner
bf52c378a4 Clean up names in --show-aircraft; avoid -set.xml suffixes. 2010-07-22 01:36:32 +01:00
James Turner
8dd39e773e Thorsten: work around crashes when re-positioning, in the ATC-DCL code. 2010-07-22 00:31:29 +01:00
Torsten Dreyer
da02c09ec0 Bugfix: set temp and dewpoint from the gui
This fix (re)enables the setting of temperature and
dewpoint from the weather-conditions dialog and other
sources for various altitude layers. These temperatures
are reduced to the corresponding sea level temperatures
according to ICAO standard atmosphere which is the inverse
function of the calculation of temperature at altitude based
on sea-level-temperature.
Note: this only works for the troposphere.
2010-07-20 22:56:15 +02:00
Durk Talsma
10366f4f1b Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-07-18 15:46:38 +02:00
Torsten Dreyer
8a1223ab27 Bugfix: wrong interpolation of winds aloft
Fix a bug reported by Jacob Burbach.
Environment interpolation did not work above layer 1
A potential division by zero is also included
2010-07-17 18:49:31 +02:00
James Turner
c95a5db23d Rewrite --show-aircraft and --aircraft handling to share directory search code.
As a bonus, sort the --show-aircraft list case-insensitively.
2010-07-17 14:12:52 +01:00
James Turner
af3f072c21 Convert scenery path setup to use simgear::Dir 2010-07-17 14:12:52 +01:00
James Turner
2c90eb8370 Convert --show-aircraft to use simgear::Dir 2010-07-17 14:12:52 +01:00
Erik Hofman
913726cb0e adjust gamma based on time of day 2010-07-17 15:02:06 +02:00
Vivian Meazza
6310fdd9c5 Remove range criteria, add sub-submodels to any depth, and add expiry criteria
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-07-16 23:05:05 +01:00
Erik Hofman
d6e6f85452 don't forget to update the Makefile 2010-07-16 12:31:59 +02:00
Erik Hofman
0b86f8f63c Sync with JSBSim CVS 2010-07-16 11:05:59 +02:00
Erik Hofman
7053b45c8c Sync with JSBSim CVS 2010-07-16 08:00:21 +02:00
James Turner
93c6d15e19 Merge branch 'topics/bug141' into next 2010-07-13 20:50:17 +01:00
Torsten Dreyer
e0d30cc412 Compute /position/altitude-agl-ft in MagicCarpet FDM
Add the same computation of /position/altitude-agl-ft for
the magic carpet fdm as it is used in the ufo fdm. This
property is used in the environment controller to interpolate
between the individual weather-condition layers.
2010-07-13 21:11:49 +02:00
James Turner
c32da90e5c Ensure sim/signals/fdm-initialized is only fired on a rising edge; add sim/fdm-initialized as the state value. 2010-07-13 13:47:24 +01:00
Durk Talsma
5c5c52cb9c Merge branch 'next' of git@gitorious.org:fg/flightgear into next 2010-07-09 07:42:44 +02:00
James Turner
c47d4f2f30 Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group (which is new) 2010-07-08 23:24:39 +01:00
Durk Talsma
74549784b4 Whoops, forgot to add this file. 2010-07-04 21:00:36 +02:00
Durk Talsma
b78bf2e9e6 Make sure that takeoff distance calculations are done in the correct frame of reference. Additionally, add some experimental lead-in distance clipping code (although the latter needs more sophistication, because it leads to a considerable increase of spinning around waypoints when on ground. 2010-07-04 20:57:25 +02:00
James Turner
07d055b4de One more juggle to appease the linker gods. 2010-07-02 10:00:05 +01:00
James Turner
cfe9aaac4c Juggle fgfs link order to keep GNU ld happy. 2010-07-02 09:06:57 +01:00
James Turner
37054a4960 Include of aircraft.hxx that slipped under the radar, oops. 2010-07-02 01:03:10 +01:00
James Turner
061699daa7 And removal of the actual files. 2010-07-01 23:15:58 +01:00
James Turner
88e65f7662 aircraft.[cxx|hxx] is gone. 2010-07-01 22:56:22 +01:00
James Turner
18d42ec1af Rename reInit() method to 'resetSimulator', and document that it's hooked up to the 'reset' command. 2010-07-01 22:50:11 +01:00
James Turner
d279c394d7 Clean fg_init.hxx 2010-07-01 22:43:28 +01:00
James Turner
01e0156b5d Remove current_aircraft global, fgAIRCRAFT struct, and dead code for reading aircraft dirs. 2010-07-01 22:33:51 +01:00
James Turner
3f26d2b14b Trivial cleanup commit, to test continuous integration server. 2010-07-01 19:51:05 +01:00
James Turner
fec7cb977c Clarify warnings from fgUntie, and fix one source of such warnings, in FGInterface. 2010-07-01 02:04:16 +01:00
Torsten Dreyer
c3b9676e22 One more try to fix the Windows build 2010-06-29 17:42:04 +02:00
Torsten Dreyer
598d46529f Fix three bugs in the new autopilot code
- Respect the global inverted flag in the get_output() method
- Check the clock state before processing the static R/S inputs
- Emit debug output only on a state change
2010-06-28 18:20:30 +02:00
Torsten Dreyer
bed15f5315 One more fix for a working windows build. 2010-06-28 13:53:17 +02:00
James Turner
14be21ea5c Add license / copyright info to newly added files. 2010-06-27 20:34:00 +01:00
Torsten Dreyer
f6ea868804 Fix build on Windows
Add missing includes.
Thanks to Alan Teeder
2010-06-27 15:02:59 +02:00
Durk Talsma
3c60bf6511 Make sure also not to try running AI_mgr when compiling fgfs with --disable-atcdcl. FlightGear can now actually run without segfaulting when compiled this way. 2010-06-27 10:08:26 +02:00
Torsten Dreyer
4466729987 fix assertion in sunsolver.cxx with --timeofday=xx 2010-06-26 21:58:45 +02:00
Torsten Dreyer
2e6d7e111a gcc warning fixes 2010-06-26 21:24:46 +02:00
Torsten Dreyer
f7d0a7bd39 config.h-msvc* restoration
As sugested by Frederic, remove the .in files and their reference in
configure.ac, and remove the target files from .gitignore
2010-06-26 20:52:29 +02:00
Torsten Dreyer
e1b9d3d759 Don't crash if built with --disable-atcdcl 2010-06-26 20:24:34 +02:00
James Turner
c04d97b259 LFSGlass was accidently ommitted from the cur_fdm_state removal process. 2010-06-26 18:44:58 +01:00
James Turner
180e524a0e Fix automake build after mainloop changes - especially, JSBSim includes. 2010-06-26 18:37:51 +01:00
James Turner
a0588272dc Merge branch 'topics/mainloop' into next 2010-06-26 15:30:00 +01:00
James Turner
4a948f5955 Remove uses of the global FDM interface in the cockpit/HUD code. 2010-06-26 14:21:16 +01:00
James Turner
f9ec605ffb Fix ordering of aircraft-model updates against flight model. 2010-06-26 10:31:22 +01:00
James Turner
4be1661305 Automake updates. 2010-06-26 10:31:22 +01:00
James Turner
85be9be1e0 Initial work on FDM shell, and removal of cur_fdm_state 2010-06-26 10:31:22 +01:00
James Turner
4756cd4882 Wrap SGEphemeris in a subsytem/property interface, and remove from mainloop. 2010-06-26 10:31:21 +01:00
James Turner
3fbf3aa080 Make FGAircraftModel more subsystem-alike, move update to fgMainLoop. 2010-06-26 10:31:21 +01:00
Erik Hofman
de3afcce99 gcc issues 'format not a string literal and no format arguments' when running -Werror, trick gcc into thinking everything is alright. 2010-06-26 09:36:48 +02:00
Torsten Dreyer
610777ac53 Move the flipflop implementations into the correct namespace 2010-06-25 21:17:13 +02:00
Torsten Dreyer
0a50c16052 Some more src docs for the A/P implementation. 2010-06-25 21:09:37 +02:00
Torsten Dreyer
47c956b516 Some code documentation added to the A/P flip flop implementation 2010-06-25 11:06:00 +02:00
Torsten Dreyer
d558b52cb6 New autopilot subsystem implementation.
Split the former single-file-implementation in xmlauto.?xx into multiple
files and use some OO techniques. Started with documentation to be used
with doxygen.
2010-06-24 17:09:33 +02:00
Mathias Froehlich
721ae71cd7 Use simgear abstraction instead of directly osg for the AIBase class. 2010-06-16 07:00:18 +02:00
Tim Moore
0f8312150d Log OpenGL vendor and version string 2010-06-15 23:58:55 +02:00
Mathias Froehlich
f433f4d973 Default the screen and display number to a value >= 0 2010-06-14 22:05:15 +02:00
Tim Moore
b692a165fb Remove osgGA/MatrixManipulator include
From AndersG; the file is gone from recent OSG.
2010-06-06 23:31:47 +02:00
Torsten Dreyer
6993cd0153 Ignore generated files config.h-msvcXX 2010-06-02 11:49:22 +02:00
Torsten Dreyer
c89b18ddbd Ignore generated files
add generated files to gitignore that has also been in cvsignore
remove generated config.h-msvc* from source control
2010-06-02 11:27:16 +02:00
Torsten Dreyer
8c15899837 Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-06-01 22:10:00 +02:00
Torsten Dreyer
253b14a1cb Code cleanup, inherit JK, D and T from RS and a bugfix for the logic element
- reuse code
- undeclared inputs default to false where applicable
- remove unused tInput
- JK, D and T FF now inherit from RS with dominant R input, so they all
have a R and a S input to preset the output
- fix the nonfunctional <inverted> element of the logic element
2010-06-01 22:08:42 +02:00
Tim Moore
473cea7f17 remove references to osgGA::MatrixManipulator
This class has been removed in current OSG sources.
2010-05-31 07:06:55 +02:00
Mathias Froehlich
917524160b Fix some uninitialized value warnings. 2010-05-29 17:25:02 +02:00
Mathias Froehlich
721566a6e7 Fix some more unitialized value warnings. 2010-05-29 17:17:49 +02:00
Mathias Froehlich
1114c49165 Fix an uninitialized value valgrind warning. 2010-05-29 16:32:38 +02:00
Mathias Froehlich
a565e90c4f Fix an uninitialized value valgrind warning. 2010-05-29 16:31:58 +02:00
Mathias Froehlich
9626805a09 Fix an uninitialized value valgrind warning. 2010-05-29 16:31:05 +02:00
James Turner
be30c2d53b Merge branch 'topics/removeab' into next 2010-05-29 10:37:20 +01:00
James Turner
ad19acf1c6 Remove C++ autobrake code - this can all be done easier in XML now! 2010-05-29 10:36:23 +01:00
Torsten Dreyer
54c964aed5 Respect different behaviour of RS and SR flip flops
No more invalid states here.
According to IEC 61131, RS flip flop have dominant reset and SR have
dominant set. This is now implemented.
2010-05-27 22:22:01 +02:00
James Turner
321bbeb2e8 Allow 'property' as well as 'prop' to be used in XMLauto <enable> blocks. 2010-05-27 15:20:37 +01:00
James Turner
1d0e9d268a Support <expression> in autopilot inputs, as well as property and value. 2010-05-26 19:30:33 +01:00
Stuart Buchanan
1a29f4499a Export the AI object callsign on ballistic impact. 2010-05-24 21:16:46 +01:00
Torsten Dreyer
386aefe693 Merge branch 'next' of gitorious.org:fg/flightgear into next 2010-05-24 12:01:30 +02:00
Torsten Dreyer
9e35d18f2e Add RS, JK, D and T flip flops as components
Flip flops are useful items for data latches and can be used to implement
pushbuttons, glideslope locks etc.
Check http://en.wikipedia.org/wiki/Flip-flop_(electronics)
and http://wiki.flightgear.org/index.php/Autopilot_Configuration_Reference
for details
2010-05-24 11:57:55 +02:00
Jeff Taylor
09f3ee6351 Fix fgviewer segfault
fgviewer crashes when reading weird channel options (which it doesn't use).
Here is a patch which fixes this by adding a pointer check.
2010-05-23 20:13:09 +02:00
Torsten Dreyer
a060fe3acf Stuart Buchanan:
A small patch to allow the user to ignore specific
MP aircraft on a per-MP instance basis by setting
"controls/invisible". This
property name was chosen for consistency with the existing property
for AIBallistic objects.
2010-05-20 21:25:37 +02:00
James Turner
38687c9e06 Avoid a crash with out-of-sync airport runway usage and runway definitions. 2010-05-19 23:25:39 +01:00
James Turner
4f89bf7c48 Merge commit 'official/next' into next 2010-05-11 21:08:11 +01:00
James Turner
db60ab08fa Bug 131, crash with invalid ICAO in the ATCDCL code, replaced an assert with a guard. 2010-05-11 21:06:56 +01:00
Durk Talsma
c64f195523 Just a tiny (cosmetic) change to get some hands on experience with git. 2010-05-11 21:15:23 +02:00
James Turner
45fbd8008d Support ICAO identifiers with more than four characters, in the AirportsList. 2010-05-09 11:11:52 +01:00
James Turner
8ee27f283e Add .gitignore files for automake/configure artefacts. 2010-05-06 13:18:55 +01:00
Tim Moore
11a371b313 Merge branch 'mathias/math' into next 2010-05-05 17:02:37 +02:00
frohlich
1797f4cb3e Use methods from SGMath when possible.
Modified Files:
	src/Airports/apt_loader.cxx src/Navaids/positioned.cxx
	src/Navaids/positioned.hxx
2010-05-05 17:02:27 +02:00
Tim Moore
8f056da618 Merge branch 'jmt/gps'
Conflicts:
	src/Instrumentation/gps.cxx
	src/Instrumentation/navradio.cxx
2010-05-05 16:55:25 +02:00
Tim Moore
50415490e6 Merge branch 'ehofman/atc' into next 2010-05-05 12:03:24 +02:00
ehofman
78ab0dbe59 tie ATIS to the listener position and orientation 2010-05-05 12:03:17 +02:00
Tim Moore
664bb77d95 Merge branch 'jmt/gps' into next 2010-05-05 12:02:16 +02:00
jmt
1222e9b094 Fix a crash if startup fails before the navradio is inited. 2010-05-05 12:02:07 +02:00
Tim Moore
e800461f8a Merge branch 'durk/ai-atc' into next 2010-05-05 12:00:55 +02:00
fredb
1df4cd3f8c setState doesn't return a value 2010-05-05 12:00:47 +02:00
Tim Moore
362eb3b670 Merge branch 'durk/ai-atc' into next 2010-05-05 11:59:47 +02:00
durk
e004e43553 Expanded ATC communication between AI aircraft and Airport ground control. 2010-05-05 11:59:37 +02:00
Tim Moore
d35b8db13f Merge branch 'durk/traffic' 2010-04-25 23:07:16 +02:00
Tim Moore
f5c871c8b3 Merge branch 'ehofman/generic' 2010-04-25 23:06:36 +02:00
Tim Moore
6f9987aae7 Merge branch 'vivian/tachy' 2010-04-25 23:05:36 +02:00
Tim Moore
2bd897df8e Merge branch 'jmt/navradio' 2010-04-25 23:04:51 +02:00
Tim Moore
eca715f687 Merge branch 'jmt/track-bug' 2010-04-25 23:04:24 +02:00
Tim Moore
7563ece882 Merge branch 'vivian/mp' 2010-04-25 23:03:48 +02:00
Tim Moore
c4e6431aa4 Merge branch 'ehofman/particle' 2010-04-25 23:03:35 +02:00
Tim Moore
0d45920098 Merge branch 'jmt/gps' into next 2010-04-25 18:31:19 +02:00
jmt
3419b28919 MapWidget: fix a crash on uninitialized. 2010-04-25 09:00:41 +02:00
Tim Moore
4fae1160d4 Merge branch 'torsten/proplist' into next 2010-04-19 12:22:48 +02:00
Tim Moore
3e4a592282 Move using declaration out of header file 2010-04-19 12:22:30 +02:00
Tim Moore
0f9f092412 Merge branch 'torsten/proplist' into next 2010-04-19 10:20:13 +02:00
torsten
a464d1b2b2 use simgear::PropertyList instead of std::vector<SGPropertyNode_ptr> 2010-04-19 10:20:03 +02:00
Tim Moore
98e6b8212a Merge branch 'torsten/auto' 2010-04-19 10:19:42 +02:00
Tim Moore
6e11c83c0a Merge branch 'torsten/local-weather' into next 2010-04-19 10:08:58 +02:00
torsten
d356f73785 Support for the local weather system from Thorsten Renk 2010-04-19 10:08:41 +02:00
Tim Moore
8b57675aef Merge branch 'torsten/metar' 2010-04-19 10:07:46 +02:00
Tim Moore
0447581255 Merge branch 'jmt/gps' into next 2010-04-19 09:56:39 +02:00
torsten
0750d8a6d4 gps warning fix (xxx will be initialized after yyy) 2010-04-19 09:56:32 +02:00
Tim Moore
323fb790e7 Merge branch 'jmt/gps' into next 2010-04-19 09:52:43 +02:00
jmt
8ffa65a821 Route-file saving. 2010-04-19 09:52:32 +02:00
jmt
3270a610f8 Support loading plain-text routes, and stop aggressively using the cruise altitude when loading waypoints. 2010-04-19 09:52:17 +02:00
Tim Moore
98cbcb5a2e Merge branch 'ehofman/atc-sound' into next 2010-04-19 09:51:02 +02:00
fredb
09f8ab61cf Initialise v1 to avoid a segfault on exit 2010-04-19 09:50:49 +02:00
Tim Moore
fcb255d19e Merge branch 'ehofman/sound-reinit' into next 2010-04-12 10:02:01 +02:00
ehofman
5d0d6998d2 Don't forget to resume the sound system after reinit 2010-04-12 10:01:51 +02:00
ehofman
2b83ed9cbe allow reinitializing the sound system by setting /sim/sound/working to false at runtime. 2010-04-12 10:01:28 +02:00
Tim Moore
97a2515443 Merge branch 'ehofman/atc-sound' into next 2010-04-12 09:49:43 +02:00
ehofman
e115201066 Delay loading of the voice file since the sound manager might not be initialized (at all). 2010-04-12 09:49:32 +02:00
Tim Moore
fb361f7463 Merge branch 'jmt/runway-fix' into next 2010-04-12 09:28:32 +02:00
jmt
40b2c3b9f7 Candidate fix for bug #118, crash with custom (scenery) airport data. 2010-04-12 09:28:00 +02:00
Tim Moore
33aead9a21 Merge branch 'jmt/view' into next 2010-04-03 22:34:15 +02:00
jmt
bc7c3ad4c6 bug99 - Fix case where damping is enabled, but factor is 0. 2010-04-03 22:34:07 +02:00
jmt
a33745e888 Bug #99 - change viewer damping calculation, to work correctly regardless of set/recalc/update ordering per frame. 2010-04-03 22:34:00 +02:00
Tim Moore
cf6cdd0b78 Merge branch 'timoore/getpath-rebase' 2010-03-30 11:49:14 +02:00
Tim Moore
ebdeb3eed3 Merge branch 'jmt/gps' into next
Conflicts:
	src/Instrumentation/navradio.cxx
2010-03-28 15:32:59 +02:00
fredb
1c7278b474 Initialise member variable 2010-03-28 15:26:43 +02:00
jmt
597df694e3 GPS/route-manager - notify listeners when current waypoint is changed. 2010-03-28 15:26:25 +02:00
jmt
e4c4a3a412 MapWidget for the GUI, initial commit. 2010-03-28 15:25:47 +02:00
jmt
ee8437431a Expose a flag indicating if the GPS is driving the AP (to give clearer user feedback when that is the case) 2010-03-28 15:21:05 +02:00
Tim Moore
1aff92ce49 Merge to get true base of James' recent gps changes 2010-03-28 15:20:09 +02:00
Tim Moore
39def8132a Merge branch 'jmt/gpswidget' 2010-03-28 15:15:58 +02:00
Tim Moore
2229af9f78 Merge branch 'ehofman/particle' into next 2010-03-28 00:35:35 +01:00
ehofman
e78c56af7d Allow particles to be frozen on pause. 2010-03-28 00:35:28 +01:00
Tim Moore
70ebde4488 Merge branch 'jmt/gps' into next
Conflicts:
	src/Instrumentation/gps.cxx
2010-03-28 00:34:51 +01:00
jmt
4e24fbbb91 GPS: enable switching to OBS/DTO mode with no valid scratch - use active waypoint. 2010-03-28 00:33:44 +01:00
jmt
40e383451b GPS: add NS and EW velocity computation, which some real-world devices display. 2010-03-28 00:33:29 +01:00
jmt
4265b2e241 GPS: make slaved-to-gps read course from the GPS *when active*, via a listener. 2010-03-28 00:33:13 +01:00
jmt
0be2e03d7e GPS: fix bugs where GPS overwrites NAV1 course, including --nav1 command line 2010-03-28 00:32:34 +01:00
Tim Moore
37d3cf7fbb Merge branch 'syd/ias-limit' into next 2010-03-27 19:06:53 +01:00
jmt
5695395dd5 Add Mach/TAS computation to the airspeed indicator. 2010-03-27 19:06:42 +01:00
Tim Moore
dba4a69e2c Merge branch 'torsten/commands' into next 2010-03-27 15:45:44 +01:00
torsten
5df9f6a951 Code cleanup: reuse duplicate code. 2010-03-27 15:45:25 +01:00
Tim Moore
5a16a28893 Merge branch 'torsten/metar' into next 2010-03-27 14:19:15 +01:00
torsten
26a72a9ee2 Bugfix:
- METAR changes caused strong aircraft movements if the station temperature or field elevation changed. Temperature and dewpoint are now also slowly interpolated to reach the new value.
- Probably unnoticed bug: calculation of the interpolation speed was wrong.
- some minor code-cleanup
2010-03-27 14:19:05 +01:00
Tim Moore
b587400846 Merge branch 'curt/replay' into next 2010-03-27 13:48:30 +01:00
curt
b9b6a3a54c Stomp out a long standing bug in the replay system. Originally we didn't
collect flight data while the replay was running, but along the way someone
(who shall remain nameless) tweaked a property name and didn't update the
name in the replay system.  This led to a problem where the replay system
continued to collect replayed data into the buffer while it replayed it,
leading to an infinite loop.  And then due to the tiered recording rate
system, you would never see the highly detailed final minute of your flight.
This is now fixed!
2010-03-27 13:47:52 +01:00
Tim Moore
f71c094da2 Merge branch 'torsten/auto' into next 2010-03-20 18:46:27 +01:00
torsten
c55874d70e Fix broken anti windup if the proportional gain runs into the nonlinear area and gets clipped.
Also fix the wrong debug message.
2010-03-20 18:46:19 +01:00
Tim Moore
7cde2e800b Merge branch 'syd/ias-limit' into next 2010-03-20 18:45:52 +01:00
jmt
432da86c7b Read airspeed-indicator overspeed limit values from instrument configuration, as Syd intended. 2010-03-20 18:45:43 +01:00
Tim Moore
ca346ebc9c Merge branch 'torsten/js64' into next 2010-03-16 15:13:32 +01:00
torsten
32f8d1a110 Compile again for MSVC 2010-03-16 15:13:24 +01:00
Tim Moore
a357aad365 Merge branch 'syd/ias-limit' into next 2010-03-16 15:12:46 +01:00
jmt
b1855b34c6 Syd Adams: only define overspeed-indicator properties when enabled. 2010-03-16 15:12:38 +01:00
jmt
65ad38ccae Airspeed indicator: add default values for overspeed, and rename the
enable property to 'has-overspeed-indicator'.
2010-03-16 15:12:26 +01:00
Tim Moore
3973637606 Merge branch 'torsten/auto' into next 2010-03-11 09:01:42 +01:00
torsten
f4f784a514 Added anti windup for the pi-simple-controller 2010-03-11 09:01:25 +01:00
Tim Moore
c1e1e2f541 Merge branch 'torsten/js64' into next 2010-03-11 09:01:02 +01:00
torsten
91f0059c89 David Fries:
64bit fixes
2010-03-11 08:59:52 +01:00
Tim Moore
dd7a5dd32d Merge branch 'syd/ias-limit' into next 2010-03-11 08:58:45 +01:00
jmt
45a446dfaf Syd Adams:
add ias-limit (brarber-pole) computation to airpseed-indicator
    expose selected DME frequency on the DME instrument
2010-03-11 08:58:23 +01:00
Tim Moore
7ee645aa20 Merge branch 'timoore/getpath-rebase' into next 2010-03-09 11:25:18 +01:00
Tim Moore
7ff80d11a0 changes for SGPropertyNode::getPath return type
It's now a std::string.
2010-03-09 11:24:45 +01:00
Tim Moore
fa7d9ed549 Merge branch 'jmt/gps' 2010-03-09 11:20:04 +01:00
Tim Moore
2a0fcea8a5 Merge branch 'vivian/tachy' into next 2010-03-09 10:39:30 +01:00
torsten
cb81aa9f65 one more gcc warning fix: xxx will be initialized after yyy 2010-03-09 10:39:02 +01:00
Tim Moore
cfd243bd95 Merge branch 'torsten/auto' into next 2010-03-09 10:38:43 +01:00
torsten
881d49858d Just a tiny change adds a <reference> input to FGDigitalFilters. This is nice to have to calculate differences of signals using gain-filters.
Old calculation was
output = input * gain
and is now
output = (input-reference) * gain
Note: the PI(D) controller use (reference-input) which effectively reverses the sign. Our notation was picked for backwards compatibility to not break the myriads of <filter> elements currently existing.

All the rest is some code cleanup.
2010-03-09 10:38:32 +01:00
Tim Moore
63434ceef8 Merge branch 'timoore/fire-fix' into next 2010-03-05 18:17:39 +01:00
Tim Moore
b88fa3e1bf add back wildfire multiplayer property
This was deleted by accident when I moved property types to their own
namespace.
2010-03-05 18:17:19 +01:00
Tim Moore
37d0cfd6be Merge branch 'vivian/tachy' into next 2010-02-26 08:47:41 +01:00
V Meazza
f112fc4638 Revised bugfix for tachymetric gunsight 2010-02-26 08:46:15 +01:00
Tim Moore
0b6579d6fb Merge branch 'jmt/gpswidget' into next 2010-02-25 23:34:04 +01:00
jmt
8e12b0b679 Make automake happier. 2010-02-25 23:33:43 +01:00
Tim Moore
8b03f25e6c Merge branch 'torsten/auto' into next 2010-02-25 23:21:55 +01:00
torsten
90e313a8dd New feature: added <logic> "filters"
"logic filters" use well known conditions to drive output properties. Example for bax = baz & (foo | bar).

 <logic>
    <name>my first logic element</name>
    <input>
      <or>
        <property>foo</property>
        <property>bar</property>
      </or>
      <property>baz</property>
    </input>
    <output>bax</output>
  </logic>
2010-02-25 23:21:41 +01:00
Tim Moore
4ae8c90f76 Merge branch 'jmt/font' 2010-02-25 12:06:08 +01:00
Tim Moore
62dfad273c Merge branch 'jmt/bulk' 2010-02-25 12:05:07 +01:00
Tim Moore
d61d14aa91 Merge branch 'jmt/gui' 2010-02-25 12:04:58 +01:00
Tim Moore
51846e5129 Merge branch 'jmt/gpswidget' into next 2010-02-23 08:53:58 +01:00
jmt
f0e72608a7 waypointList: stop using GNU extension / C99 features. 2010-02-23 08:53:46 +01:00
Tim Moore
da8be3ae7b Merge branch 'jmt/gpswidget' into next 2010-02-22 09:37:05 +01:00
Tim Moore
247219d1f1 remove trailing slash / empty line from Makefile.am 2010-02-22 09:36:10 +01:00
Tim Moore
de79ec4421 Merge branch 'jmt/gpswidget' into next 2010-02-21 22:26:29 +01:00
jmt
4468d785b5 GPS / route-manager: add new custom widget to display the waypoints list.
Supports various new editing features, including dragging to re-order, and
+/- keys to adjust the target altitude for a waypoint. Also displays some
additional information, and will display *even* more once I land airways/
SID/STAR support.
2010-02-21 22:26:14 +01:00
Tim Moore
439700aecd Merge branch 'durk/traffic' into next 2010-02-21 22:25:56 +01:00
durk
0c522bee02 AI aircraft will need to switch frequencies before being able to request
push-back clearance.
2010-02-21 22:25:46 +01:00
Tim Moore
e653ed4598 Merge branch 'jmt/track-bug' into next 2010-02-21 22:24:53 +01:00
jmt
7523f05047 bug #80, exception flying west from NZAA (Auckland, NZ). The underlying
issue is numerical problems in _wgs84_inverse, triggered by the traffic-manager
testing enormous distances geodetically.

Changes
 - refactor AISchedule::update, so the aircraft approximate position
   calculation is simpler.
 - refactor AIAircraft to no longer use exceptions as a return value mechanism
 - change AISchedule::update to use cartesian math for in-visible-range check
2010-02-21 22:24:42 +01:00
Tim Moore
ee3acb9e9f Merge branch 'jmt/bulk' into next 2010-02-17 07:44:36 +01:00
jmt
301f3c5bd6 Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages.
Part of original commit that only applys to master branch.
2010-02-17 07:44:26 +01:00
Tim Moore
351d1ddb5e Merge branch 'jmt/gui' into next 2010-02-17 07:41:48 +01:00
jmt
4f99561f63 Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages.
Commit split by timoore in order to apply most of it to maint branch.
2010-02-17 07:41:23 +01:00
jmt
26361f2f5a Bugfix: stop dialogs jumping around when re-layout occurs - make positions persistent. 2010-02-17 07:31:05 +01:00
Tim Moore
4a14f8c107 Merge branch 'jmt/navradio' into next 2010-02-17 07:29:44 +01:00
jmt
3fb898643e Bugfix: don't crash on localizers with no associated runway (due to inconsistent nav.dat/apt.dat). Reported by Jacob Burbach. 2010-02-17 07:29:30 +01:00
Tim Moore
68cbdcb84e Merge branch 'vivian/mp' into next 2010-02-14 19:28:33 +01:00
V Meazza
3492c681cb Change Log Message status from ALERT to DEBUG
Signed-off-by: V Meazza <vivian.meazza@lineone.net>
2010-02-14 19:25:12 +01:00
Tim Moore
f9bbf802e9 Merge branch 'jmt/gps' into next 2010-02-14 00:27:41 +01:00
jmt
5ed73d063c Bugfix: ensure GPS WP1 Mag-bearing is normalised to [0..360] 2010-02-14 00:27:30 +01:00
Tim Moore
bf4b263071 Merge branch 'jmt/font' into next 2010-02-11 00:21:10 +01:00
jmt
73334cf61b Bugfix #35 / denker #20F:
Guard against invalid font names in panel XML files, and make font name
comparisons case-insensitive so that 'helvetica', 'Helvetica' or 'HELVETICA'
work as expected.
2010-02-11 00:20:59 +01:00
Tim Moore
e9d7bf7aa9 Merge branch 'vivian/tachy' into next 2010-02-11 00:13:19 +01:00
Tim Moore
4027a92f88 Only draw tachymetric sight if appropriate inputs exist
This avoids triggering asserts for missing inputs.
2010-02-11 00:13:04 +01:00
Tim Moore
658715f90b Merge branch 'vivian/tachy' into next 2010-02-10 16:30:31 +01:00
Meazza@.(none)
aa8bccf93e Add Tachymetric Gunsight
Signed-off-by:  <V Meazza>
2010-02-10 16:19:06 +01:00
Tim Moore
571f7301f2 Merge branch 'zan/stencil2' into next 2010-02-10 15:55:11 +01:00
V Meazza
00a9151b1a Add Stencil Lighting
Signed-off-by: V Meazza <vivina.meazza@lineone.net>
2010-02-10 15:54:48 +01:00
V Meazza
e762551524 MSVC9 fix
Signed-off-by: V Meazza <vivina.meazza@lineone.net>
2010-02-10 15:54:48 +01:00
ehofman
d0f6f748ed Improve handling of type DOUBLE in generic i/o protocol. 2010-02-10 15:02:49 +01:00
ehofman
6072e3d969 reorganize the code a bit to prevent an infinite loop in ascii mode 2010-02-10 15:02:42 +01:00
Tim Moore
fba05c527f Merge branch 'torsten/track' 2010-02-10 00:45:28 +01:00
Tim Moore
988a6771aa Merge branch 'durk/atcdcl-cond'
Conflicts:
	src/ATC/trafficcontrol.cxx
	src/Main/Makefile.am
2010-02-10 00:45:06 +01:00
Tim Moore
992b7ca8f4 Merge branch 'jmt/navradio' 2010-02-10 00:41:52 +01:00
Tim Moore
3e0489bd91 Merge branch 'torsten/auto' 2010-02-10 00:41:44 +01:00
Tim Moore
edd83dd7e8 Merge branch 'jmt/units-fix' into maint 2010-02-09 07:28:03 +01:00
durk
eccc7838b1 Revert previous commit. 2010-02-05 11:20:31 +01:00
durk
ce6e1dc07c Update version number. 2010-02-05 11:20:26 +01:00
Tim Moore
446c2064a5 Merge branch 'fredb/winbuild' 2010-02-05 00:25:52 +01:00
fredb
8f3c855d00 Update version numbers 2010-02-05 00:25:18 +01:00
Tim Moore
2d6bf222ac Merge branch 'csaba/nan' 2010-01-31 18:01:33 +01:00
durk
e54798a8e2 A couple of last-minute patched / bugfixes to mitigate the probability of collisions between user controlled aircraft and AI traffic.
* AI aircraft distance to user proximity detection works again (lat/lon were inverted).
  * The parking uses by the user aircraft is marked as such to prevent it being reused by an AI aicraft
  * AI aircraft won't receive permission for pushback until the user aircraft is at a fair distance.
2010-01-31 17:52:43 +01:00
Csaba Halasz
1d8be86335 Fix crab angle and ground speed calculation in AILocalTraffic 2010-01-31 15:22:27 +01:00
jmt
49e477f6a7 Bugfix: ensure navradio nav-loc and has-gs properties clear to false when no valid station is tuned / radio is u/s. 2010-01-31 15:11:25 +01:00
Tim Moore
9197647220 Merge branch 'timoore/ptrfix' 2010-01-28 10:38:33 +01:00
Tim Moore
705c1520dd Merge branch 'fredb/winbuild' 2010-01-28 10:38:28 +01:00
Tim Moore
7b95bb5aa3 Merge branch 'ehofman/mingw' 2010-01-28 10:38:10 +01:00
Tim Moore
2c3a68ce3e Merge branch 'ehofman/light' 2010-01-28 10:37:58 +01:00
Tim Moore
6044d929d4 eliminate some SGPropertyNode_ptr variables in classes
These were temporary variables that were being deleted explicitly, leading to
various corruption.
2010-01-26 17:19:17 +01:00
Tim Moore
5aea857dd6 initialize track variable in constructors 2010-01-26 11:06:37 +01:00
fredb
00e9ad3055 MINGW patch from Benot Laniel 2010-01-25 17:12:04 +01:00
ehofman
38cd172e82 slightly tweak the ambient color a bit. 2010-01-25 15:22:00 +01:00
fredb
c8ea82ed9d Update version number 2010-01-25 15:08:10 +01:00
fredb
d367d40f9d Update FlightGear version 2010-01-25 15:07:52 +01:00
torsten
ac90d8ff8a bugfix
Patrice Poly:
After investigation, it appears that the probes are reversed due to a
little mistake when someone changed how the probe calculations are made.
probe 0 is under the plane. probe 4 should be downwind, probes 1,2 and 3 should be upwind.
2010-01-25 15:06:53 +01:00
Tim Moore
29260852af Merge branch 'durk/version' 2010-01-25 14:21:53 +01:00
durk
a023700ebe Update base package version check. 2010-01-21 06:30:35 +01:00
fredb
bf534e1ff9 Update MSVC 9 projects 2010-01-21 06:26:48 +01:00
durk
546d3e265d And this time, fix it more properly. :-) 2010-01-21 06:25:31 +01:00
durk
16dd34839f Replacement code for ATCDCL functions are in ATC/atcutils.[ch]xx. Thanks to Alex Buzin for reporting. 2010-01-21 06:25:19 +01:00
Tim Moore
13ec36af42 Merge branch 'jmt/gps' 2010-01-17 10:52:48 +01:00
torsten
33ee43dec0 eliminate gcc warning, unused member depth. 2010-01-17 00:12:23 +01:00
ehofman
8da2f1a31b Use SGPropertyNode_ptr wherever possible 2010-01-17 00:03:06 +01:00
Tim Moore
c1bb4aec97 Merge branch 'vivian/trainz' 2010-01-17 00:02:51 +01:00
jmt
10d4799058 GPS: improve reliability (at the expense of some in-development features) for pending release.
- default to an invalid altitude in routes, instead of cruise altitude (temporarily)
- only set an altitude on the autopilot, if valid
- only add departure airport/runway to the route, if not airborne
2010-01-16 16:00:15 +01:00
jmt
21f1fcd17a GPS:
- relaxed overflight sequencing threshold
 - default to linear CDI deviation in the configuration
2010-01-16 16:00:15 +01:00
jmt
2239eb2660 GPS: guard against empty command strings in the route-manager. 2010-01-16 16:00:15 +01:00
Tim Moore
cf9a520a9f Merge branch 'curt/navradio'
Conflicts:
	src/Instrumentation/navradio.cxx
2010-01-13 07:37:44 +01:00
Tim Moore
ffb6b95782 Merge branches 'torsten/warn-atc' and 'tortsen/warn-morse' 2010-01-13 07:33:05 +01:00
Tim Moore
98d8a98ef2 Merge branch 'ehofman/sound' 2010-01-13 07:30:52 +01:00
Tim Moore
a89a28c4e6 Merge branch 'ehofman/version' 2010-01-12 09:16:02 +01:00
Tim Moore
3836abcf4b Merge branches 'jmt/spatial', 'jmt/ref_ptr', 'jmt/navradio' and 'jmt/gps' 2010-01-12 00:09:19 +01:00
Tim Moore
6b90dc2621 Merge branch 'csaba/tower' 2010-01-12 00:07:28 +01:00
Tim Moore
b61f8fba33 Merge branch 'jmt/navaid' 2010-01-11 23:55:17 +01:00
Tim Moore
0d9f2e3c95 Merge branch 'topic/pu-crash' 2010-01-11 07:46:27 +01:00
Tim Moore
ff96add35f Merge branch 'timoore/props' 2010-01-11 07:46:13 +01:00
ehofman
8e4d979aca Don't initialize the soundmanager wehn defining --disable-sound. Sound can still be enabled at runtime by setting /sim/sound/working to 'true' 2010-01-10 23:33:57 +01:00
durk
d8ae90801a Some additional changes to ensure that FlightGear at least compiles after configuring with --disable-atcdcl. Some substitution code is added in ATC/atcutils.cxx and ATC/atcutils.hxx. Note that the new code doesn't run properly yet. Instead, it is just meant to identify which parts need replacement. Getting that to work will be the next step. 2010-01-05 22:21:49 +01:00
torsten
168af9dc1e - added a differential filter
- use /orientation/track-deg instead of computing our own track
- some cosmetic changes
2010-01-05 22:20:42 +01:00
torsten
78d8e7edfd now that there is a true track property, the magnetic track is nice to have, too. 2010-01-05 22:19:58 +01:00
torsten
f14fc6b98f wrong logic never found the 'end' 2010-01-03 22:43:40 +01:00
torsten
1290c25a38 eliminate gcc warnings 2010-01-03 22:40:04 +01:00
torsten
c0b64dccdb purge gcc warning
xxx will be initialized after yyy
2010-01-03 22:39:44 +01:00
torsten
690395354f provide a property /orientation/track
The track is computed between two subsequent settings of the geodetic position and represents the true track.
Also the _set_Latitude() and _set_Longitude() methods were removed. Use _set_Geodetic_Position(lat,lon) instead.
2010-01-03 22:26:16 +01:00
torsten
149c6acc85 purge gcc warnings:
- xxx will be initialized after yyy
- age_factor may be used uninitialized
2010-01-03 10:35:33 +01:00
durk
8114d1d899 Conditional compilation of ATCDCL module. Use --disable-atcdcl to try building flightgear without ATCDCL code. 2009-12-30 17:44:06 +01:00
Tim Moore
1e6ed8db68 Move getLoggingClasses() result buffer to file level.
Getting it out of the function fixes some corruption problems at program exit.
2009-12-30 17:34:58 +01:00
torsten
95e2d62d94 bugfix: don't call the update_helper() for every instance of FGXMLAutopilot. Compute the helper properties only once per FGXMLAutopilotGroup's update() method. Only one AutopilotGroup shall be instantiated, but many Autopilots may exist. 2009-12-30 10:34:11 +01:00
ehofman
0238a09c4d skip voice delimiter (messages). 2009-12-30 10:29:41 +01:00
ehofman
2a53154e0f Stuart Buchanan: Properly catch an exception. 2009-12-30 10:29:05 +01:00
jmt
38e76a175e Navradio: constructor cleanup, tie/untie helper, and a new 'operable' property to make it clear when the radio is functioning. 2009-12-27 10:03:08 +01:00
jmt
5cad5aa7da Autopilot: clean up the helpers code (which drives the various /internal/) properties. Fixes various heading modes to work in all aircraft. 2009-12-27 09:34:39 +01:00
ehofman
90e44c6696 Display the (default) OpenAL renderer as well as the OpenAL vendor when requesting the list of sound devices. 2009-12-27 09:33:14 +01:00
jmt
7a007d9638 OSG ref_ptr fix: use .get() explicitly. 2009-12-27 09:32:18 +01:00
jmt
8cfdfb21a5 GPS / route-manager: only drive autopilot true-heading in LEG mode, for compatibility with the old behaviour. 2009-12-23 09:40:58 +01:00
Csaba Halasz
8d7f61b568 Use the _controlled member instead of the tower pointer itself to check for valid tower in AILocalTraffic as tower doesn't always reflect current state. 2009-12-22 08:07:44 +01:00
jmt
053d405a5c GPS: make 'loadRouteWaypoint' robust about bad scratch/index values. 2009-12-22 07:44:24 +01:00
jmt
52905875f9 Fix airportinfo() ILS frequency listing to use underscores. 2009-12-22 07:44:12 +01:00
jmt
d3d17d9ec0 Fix GPS SGPropertyNode tie() handling, as suggested by John Denker. 2009-12-22 07:42:14 +01:00
jmt
45d0e14cad JSD: Make false courses work for more than one instance of navradio. 2009-12-22 07:41:30 +01:00
Csaba Halasz
8d4a838cd5 Initialize eta and dist_out members in TowerPlaneRec 2009-12-22 07:19:45 +01:00
Csaba Halasz
2683a9bd2d Fix NaN due to possibly uninitialized _lastViewport in FGPanelNode 2009-12-22 07:18:58 +01:00
Csaba Halasz
54691c0086 Detect zero length fuselage in YASim/Airplane.cpp. Also, initialized _failureMsg member in the constructor and added another check for failure. 2009-12-22 07:17:27 +01:00
Csaba Halasz
41752bab57 Fix NaNs in TACAN::update 2009-12-22 07:16:44 +01:00
Csaba Halasz
de7a6b5e01 Fix NaN in FGAILocalTraffic::FlyTrafficPattern 2009-12-22 07:16:04 +01:00
Tim Moore
d2c7179cd0 Merge branches 'jmt/aircraft-name' and 'jmt/runway' 2009-12-22 00:16:38 +01:00
Tim Moore
bb419b588c Merge branch 'durk/traffic' 2009-12-22 00:15:13 +01:00
Tim Moore
50c1fe2d3e Merge branch 'ehofman/jsbsim' 2009-12-22 00:14:09 +01:00
Tim Moore
15b6c431c0 Merge branch 'timoore/merge-effects' 2009-12-20 12:05:07 +01:00
Tim Moore
b5c46a8d59 Merge branch 'ehofman/sound' 2009-12-20 11:11:16 +01:00
Tim Moore
6acd657a05 Attach an empty shader program to the scene graph root
This establishes a default state of using the OpenGL fixed function pipeline.
Otherwise a shader program from a state set can leak into state sets that don't
use shaders at all.
2009-12-20 10:34:07 +01:00
Tim Moore
9a94b26609 Changes for animated effects 2009-12-20 10:34:07 +01:00
Tim Moore
3abe700dc8 Move the property expression code back to simgear. 2009-12-20 10:34:07 +01:00
Tim Moore
c4e62cc69f Don't allocate string temporaries for comparisons. 2009-12-20 10:34:07 +01:00
jmt
88dc75695b Probably best if the string and its length agree. :) 2009-12-20 08:44:50 +01:00
jmt
3180d5f4f2 Add runway ILS frequency to Nasal airportinfo() query, as discussed on the list. 2009-12-20 08:44:47 +01:00
jmt
718d99f420 Fix for Martin: tolerate runway-associated navaids with a bogus ICAO/runway ident. 2009-12-20 08:39:33 +01:00
torsten
50adab32c1 Ingore unhandled top level elements instead of not loading the autopilot. This (re-)enables usage of <params> at top level and <property alias="../params/foo"/> 2009-12-20 08:37:00 +01:00
James Turner
0637cba24a Fix findNearest termination - ensure we expand all octree nodes that might contain closer results than the current list. 2009-12-19 23:13:17 +01:00
James Turner
34bbc6d974 Rewrite the spatial index to use a sparse octree on the cartesian coordinates of items.
* Fixes errors selecting 'nearest' items, including duplicates
* Stable behaviour around the poles and dateline
* Decently efficient, even for 'everything within 500nm' queries
2009-12-19 23:13:17 +01:00
torsten
506f6894e4 - introduce some typedefs for SGSharedPtr<>
- add a <period> element to input and output of each filter to support periodical values like headings. See README.digitalfilters for details.
2009-12-18 07:11:10 +01:00
curt
ea281051d8 Compute glide slope target rate of climb in fpm as well as fps. 2009-12-18 07:10:13 +01:00
ehofman
b0e87c8d6e A better way to stringize the predefined SimGear version number 2009-12-14 22:49:47 +01:00
ehofman
ba77293c10 John Denker: Fancier --version information. 2009-12-14 22:49:42 +01:00
ehofman
61ffbf4615 activate atc settings in the sound mixer dialog 2009-12-12 00:12:19 +01:00
jmt
35cb89626e As discussed on the mailing list, make the 'nearest' GPS command use scratch lat/lon as the search origin if they are valid. 2009-12-12 00:11:41 +01:00
jmt
c453d1a0cc Fix reset crash, thanks to Joe: make findNextWithPartial, and the route-manager, robust about people setting NULL / empty airport idents. 2009-12-12 00:11:34 +01:00
Tim Moore
582a95f0cb small cleanup to vivian's patch 2009-12-09 09:23:20 +01:00
Tim Moore
3922c12163 Vivian Meazza: AI escorts 2009-12-09 09:04:23 +01:00
ehofman
641f000860 Activate external-view checkbox for avionics 2009-12-09 08:16:48 +01:00
ehofman
168dc6ff92 if volume is too low, skip the function entirely 2009-12-09 08:16:39 +01:00