fly/flightgear
1
0
Fork 0
Code Activity
9030 commits 1 branch 0 tags 41 MiB
Commit graph

6462 commits

Author SHA1 Message Date
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
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