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

406 commits

Author SHA1 Message Date
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
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
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
Vivian Meazza
d317428257 More tidying 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2010-08-01 14:50:03 +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
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
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
d1852430bf Make various implicit includes (via PLIB) explicit. 2010-07-28 10:25:42 +01: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
James Turner
900fce6374 Fix issues exposed by PLIB-free SimGear. 2010-07-23 09:41:37 +01: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
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
Mathias Froehlich
721ae71cd7 Use simgear abstraction instead of directly osg for the AIBase class. 2010-06-16 07:00:18 +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
Stuart Buchanan
1a29f4499a Export the AI object callsign on ballistic impact. 2010-05-24 21:16:46 +01: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
durk
e004e43553 Expanded ATC communication between AI aircraft and Airport ground control. 2010-05-05 11:59:37 +02:00
Tim Moore
eca715f687 Merge branch 'jmt/track-bug' 2010-04-25 23:04:24 +02:00
Tim Moore
7ff80d11a0 changes for SGPropertyNode::getPath return type 
It's now a std::string.
 2010-03-09 11:24:45 +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
988a6771aa Merge branch 'durk/atcdcl-cond' 
Conflicts:
	src/ATC/trafficcontrol.cxx
	src/Main/Makefile.am
 2010-02-10 00:45:06 +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
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
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
Tim Moore
e503591af4 Merge branch 'jmt/gps' 
Conflicts:
	src/Instrumentation/gps.cxx
 2009-11-27 06:40:47 +01:00
Tim Moore
d096455b7f Add support for high speed trains. Change update rate to main frame rate, and move framerate-heavy functions to a 20Hz update cycle. Jitter is much reduced, at a small cost to framerate 
Signed-off-by: v meazza <vivian.meazza@lineone.net>

Conflicts:

	src/AIModel/AIGroundVehicle.cxx
 2009-11-01 00:15:14 +01:00
Tim Moore
3a890859d3 more include SGMath.hxx to keep MSVC happy 2009-10-26 18:40:12 +01:00
v meazza
d974954b5a Fix bug in collision calculations 
Signed-off-by: v meazza <vivian.meazza@lineone.net>
 2009-10-14 10:40:47 +02:00
v meazza
e91b5a8804 remove debug message 
Signed-off-by: v meazza <vivian.meazza@lineone.net>
 2009-10-14 10:40:47 +02:00
Tim Moore
919d1625df Merge branch 'stuart/clouds' 2009-10-12 11:04:58 +02:00
jmt
bc7ac3493e Refactor airway code to use SGGeod in external APIs. First of various changes to make airways more useful in GPS/FMS modules. 2009-10-08 10:37:21 +02:00
durk
47a7952f89 Stuart Buchanan: 
Improvements to the cloudsystem:
        - A new xml format
        - Texture indexing based on the position of the sprite in the cloud
          mass, allowing more control over the texture set.
        - Improved fog and shading
        - Better sprite distribution
        - A more natural distribution of clouds, so no more obvious grids.
 2009-10-04 02:05:08 +02:00
Tim Moore
d59088dc1a Try to improve frame rate and reduce jitter 
Signed-off-by: v meazza <vivian.meazza@lineone.net>

Conflicts:

	src/AIModel/AIGroundVehicle.cxx
 2009-09-30 08:08:09 +02:00
vmeazza
5c7d8c7b68 Add support for tunnel, y-offset and limit update rate 
Signed-off-by: vmeazza <vivian.meazza@lineone.net>
 2009-09-18 20:03:38 +02:00
frohlich
d09c0ec8b9 Disable collisions with the MP aircraft again. 
Modified Files:
	src/AIModel/AIMultiplayer.cxx
 2009-09-12 15:47:52 +02:00
frohlich
cb10d714fd Initialize all members. 
Modified Files:
	src/AIModel/AIAircraft.cxx src/AIModel/AIBase.cxx
 2009-09-09 08:56:31 +02:00
frohlich
8676c2bbd8 Replace the SGVec*::sg() methods with the equivalent SGVec*::data() calls. 
Modified Files:
	src/Traffic/Schedule.cxx src/Sound/fg_fx.cxx src/Main/main.cxx
	src/Instrumentation/navradio.cxx
	src/AIModel/AIFlightPlanCreateCruise.cxx
 2009-09-09 08:56:30 +02:00
Tim Moore
acbcf94bde AIGroundVehicle from Vivian Meazza 2009-08-25 12:52:50 +02:00
Tim Moore
d838ef5f40 compilation fixes for gcc -Wall -Werror 
Most are cosmetic, but the changes in the FGATCInstruction constructor
fix unitialized members.
 2009-08-24 17:13:31 +02:00
torsten
e0b2d43fb4 the warning extinguisher hits again... 2009-08-23 21:43:09 +02:00
frohlich
bb2e5fb2c9 Use the 'all but self' capability of the scenery elevaton code instead of 
playing with node masks.

Modified Files:
 	src/AIModel/AIAircraft.cxx src/AIModel/AIBallistic.cxx
 	src/AIModel/AIBase.cxx src/AIModel/AIBase.hxx
 	src/AIModel/AIShip.cxx src/AIModel/AIShip.hxx
	src/AIModel/AIThermal.cxx src/ATCDCL/AILocalTraffic.cxx
 2009-08-10 23:31:21 +02:00
Tim Moore
7d6c567fde Refer to property types using props:: namespace 
BOOL, FLOAT etc. conflict with typedefs in windows.h.
 2009-07-17 14:54:12 +02:00
timoore
4cc3084256 SGPropertyNode::Type moves to simgear::props namespace 2009-07-16 12:10:47 +02:00
Tim Moore
e342d879e8 Radar patch from Vivian 2009-07-12 01:02:58 +02:00
fredb
219be77f1e Suppress warnings 2009-07-02 08:59:16 +02:00
frohlich
33a2e2128f Simplify AI model loading. 
Modified Files:
 	AIBallistic.cxx AIBallistic.hxx AIBase.cxx AICarrier.hxx
 	Makefile.am
Removed Files:
	AIModelData.cxx AIModelData.hxx
 2009-06-23 10:54:10 +02:00
frohlich
8f501de78c Remove carrier wire and catapult configuration from the scenario file. 
This is now included in the model xml file.
So, wires and catapults also work even if they are not loaded by an AICarrier.

Modified Files:
 	AICarrier.cxx AICarrier.hxx
 2009-06-23 10:54:10 +02:00
timoore
d30398f2b2 uninitialized variable fix from Vivian Meazza 2009-06-16 11:32:14 +02:00
fredb
97c214e4fc Suppress warnings 2009-06-15 10:29:45 +02:00
jmt
6e42458a55 Convert waypoint::CourseAndDistance users to use SGGeodesy helper functions. 2009-06-11 16:05:20 +02:00
jmt
e1583cb28c Update FGViewer position clients to work with SGGeod directly 2009-06-11 16:05:20 +02:00
fredb
5b93117e2d Functions should always return a value 2009-06-03 00:18:54 +02:00
frohlich
d9c3c6da96 Fix Carriers without catapults and wires. 
Modified Files:
	src/AIModel/AICarrier.cxx
 2009-05-20 00:00:05 +02:00
fredb
19eab15f8e Remove few warnings 2009-05-18 12:24:17 +02:00
fredb
25c633af3e Functions should always return a value 2009-05-18 12:24:17 +02:00
durk
a4debec122 Removed hardcoded performance data. 2009-05-18 12:24:15 +02:00
Tim Moore
f528fc7154 AICarrier fixes from Vivian 2009-05-04 16:16:00 +02:00
torsten
2fc7f94154 restoring original copyright of David Culp 2009-05-02 00:44:20 +02:00
torsten
7e3531ef5c Implementation of ridge lift from Patrice Poly based on an algorithm of Ian Forster-Lewis 2009-05-02 00:44:20 +02:00
frohlich
58a427fb12 Fix a problem with node traversal masks and paged model loading that 
shows up as a non solid carrier under some circumstance.

Modified Files:
	AIBase.cxx AIBase.hxx AIShip.cxx
 2009-04-15 23:19:30 +02:00
mfranz
de35bbe4ed assign a unique module name to ai/mp embedded nasal (again): __model%u 2009-04-01 09:23:54 +02:00
durk
c478cdd35f Allow the AI Traffic controller to set a transponder code. This code is 
used in ATC chatter, and writted to the property, so it can -in principle-
be picked up by the radar.
 2009-04-01 09:23:54 +02:00
frohlich
a99ea1c7b5 Port over remaining Point3D usage to the more type and unit safe SG* classes. 
Remove leftover headers from plib/sg.

Modified Files:
 	src/AIModel/AIBase.cxx
 	src/AIModel/AIFlightPlanCreateCruise.cxx
 	src/ATCDCL/AIEntity.cxx src/ATCDCL/AIEntity.hxx
 	src/ATCDCL/AIGAVFRTraffic.cxx src/ATCDCL/AIGAVFRTraffic.hxx
 	src/ATCDCL/AILocalTraffic.cxx src/ATCDCL/AILocalTraffic.hxx
 	src/ATCDCL/AIMgr.cxx src/ATCDCL/ATC.hxx
 	src/ATCDCL/ATCDialog.cxx src/ATCDCL/ATCProjection.cxx
 	src/ATCDCL/ATCProjection.hxx src/ATCDCL/ATCutils.cxx
 	src/ATCDCL/ATCutils.hxx src/ATCDCL/approach.cxx
 	src/ATCDCL/commlist.cxx src/ATCDCL/ground.cxx
	src/ATCDCL/ground.hxx src/ATCDCL/tower.cxx
 	src/ATCDCL/tower.hxx src/Airports/calc_loc.cxx
 	src/Airports/dynamics.cxx src/Airports/groundnetwork.cxx
 	src/Airports/parking.cxx src/Airports/runwayprefs.cxx
 	src/Airports/simple.cxx src/Cockpit/cockpit.cxx
 	src/Cockpit/hud.hxx src/Cockpit/hud_card.cxx
 	src/Cockpit/hud_rwy.cxx src/Environment/environment.cxx
 	src/FDM/UFO.cxx src/FDM/SP/MagicCarpet.cxx src/GUI/dialog.hxx
 	src/Instrumentation/HUD/HUD.hxx
 	src/Instrumentation/HUD/HUD_runway.cxx
 	src/Instrumentation/KLN89/kln89.cxx src/Main/fg_init.cxx
 	src/Main/viewer.cxx src/Main/viewmgr.cxx
 	src/Model/panelnode.cxx src/MultiPlayer/mpmessages.hxx
 	src/Scenery/tilemgr.cxx src/Traffic/SchedFlight.cxx
 	src/Traffic/TrafficMgr.cxx
 2009-03-18 08:00:08 +01:00
frohlich
da8b3f9ce5 The simtime alread contains the increment. So do not add that twice. 
Modified Files:
	src/AIModel/AIShip.cxx
 2009-03-18 08:00:08 +01:00
frohlich
2d1d8120f6 Set the reference time the transform is meant for. 
Modified Files:
	src/AIModel/AICarrier.cxx src/AIModel/AIShip.cxx
 2009-03-18 08:00:08 +01:00
frohlich
7e73a87882 Improove FGTileMgr::scenery_available for small ranges. 
Use SGGeod in FGTileMgr, FGScenery apis.

Modified Files:
	src/AIModel/AIBallistic.cxx src/Main/main.cxx
	src/Scenery/scenery.cxx src/Scenery/scenery.hxx
	src/Scenery/tilemgr.cxx src/Scenery/tilemgr.hxx
	src/Scripting/NasalSys.cxx
 2009-03-18 08:00:07 +01:00
durk
9cc92035b1 A set of additions related to allow the use of SID and STAR procedures. 
The current code still has some rough edges, in particular memory still
needs to be deallocated where possible, and the actual use of the code
needs more testing. This code has been running without noticable problems,
so I think it's ready for some wider exposure. Detailed changes include:
- Finetuning of the SID/STAR data concept.
- Preloading of all SIDs, from one xml file.
- ATC determines which SID should be used and echoes this over the com1 or
  com2 radio.
 2009-03-11 23:14:34 +01:00
frohlich
82b54e7a25 Avoid SGLocation usage. 
Modified Files:
	configure.ac src/AIModel/AIBase.cxx
	src/ATCDCL/AILocalTraffic.cxx src/FDM/Makefile.am
	src/FDM/flight.hxx src/FDM/LaRCsim/LaRCsim.cxx
	src/Main/Makefile.am src/Main/fg_init.cxx src/Main/main.cxx
	src/Main/viewer.cxx src/Main/viewer.hxx
	src/Scenery/tilemgr.cxx src/Scenery/tilemgr.hxx
 2009-03-11 23:14:34 +01:00
frohlich
6b72986b27 Use api's with objects instead of scalars. 
Modified Files:
	src/AIModel/AIAircraft.cxx
 2009-03-11 23:14:33 +01:00
frohlich
3afc7e0690 Move the velocity computations for aimodels into AIShip. 
You should now be able to step on any ship with your model.

Modified Files:
	src/AIModel/AICarrier.cxx src/AIModel/AIShip.cxx
	src/AIModel/AIShip.hxx
 2009-03-05 10:52:03 +01:00
frohlich
1708e43a39 Make initial use of the boundingvolumes for the ground cache. 
Modified Files:
	src/AIModel/AICarrier.cxx src/AIModel/AICarrier.hxx
	src/FDM/flight.hxx src/FDM/groundcache.cxx
	src/FDM/groundcache.hxx
 2009-03-05 10:52:03 +01:00
durk
321706a007 Remove stray debug statement. 2009-03-05 10:52:03 +01:00
durk
c7e9c7a610 Some initial code for AI Aircraft making use of SIDs. Current code is a bit 
experimental: Only one SID per runway is supported, and the waypoints are
read from file at every request, which is not very efficient. The current
code is only executed when FlightGear is configured to use airport dynamics
data from the scenery repository, instead of the base package. Since the
latter is still the default, I believe that this will provide enough safe-
guarding to commit SID/STAR support in small, incremental steps.
Next step will be buffering and support for multiple departure routes per
runway.
 2009-03-05 10:52:03 +01:00
durk
d24fe19914 One step further toward better integration of AI and ATC systems. 
* Changed the runway XX. ATC message to actually report the real
   designated departure runway
 * In case of multiple active runways, select the one with a heading that is
   closest to the direction of the ultimate departure destination / lines up
   with the arrival path.
 2009-02-16 00:56:44 +01:00
mfranz
4b5353d396 make default model configurable (default: Models/Geometry/glider.ac) 
This allows to set Models/Geometry/null.ac or something that doesn't
look bad in multiplayer for both fast and slow speeds, for example
the harrier.
 2009-02-04 23:51:22 +01:00
fredb
41a8ae42f5 Allow the search of header files in the current directory 2009-02-02 00:58:00 +01:00
durk
9a19c238a9 And some more cleanup. 2009-02-02 00:58:00 +01:00
durk
c6f88e5b9b Development for two new features: 
* Some support for geometry information provided by the custom scenery
   project. Current support is for AI groundnets and runway use files only
   since this is a switch that involves a lot of data verification and
   updating, during the transistion the actual path where the data can be
   read from is user configurable. setting the property

   /sim/traffic-manager/use-custom-scenery-data to true

  will cause flightgear to read the ground networks from the scenery
  directory (--{fg-scenery}/Airports/[I]/[C]/[A]/[ICAO].groundnet.xml to be
  precise). Setting this property to false will retain the original
  behvior.
* For departing aircraft, runway takeoff calculations will be done on the
  basis of the performance database. For testing purposes, a performance
 estimate for a heavy jet has been added.
 2009-02-01 23:44:10 +01:00
Tim Moore
9bb896dd20 Merge branch 'maint' into next 2009-01-18 23:22:06 +01:00
timoore
51b686a796 Division by zero fixes from Vivian Meazza. 2009-01-18 23:17:23 +01:00
Tim Moore
76958a0382 Merge branch 'maint' into next 2009-01-14 22:32:52 +01:00
jmt
473bf5f731 Apply Ron Jensen's fix for Csaba's atan2() fix. Also remove some dead code, 
and use SG_NORMALIZE_RANGE.
 2009-01-14 22:31:55 +01:00
jmt
6f2dc41135 Simpler bearing and distance computations for AIFlightPlan. 2009-01-07 10:39:09 +01:00
jmt
e39373cb6a Clean up naming of the 'point on runway' helpers, to get rid of the confusing 
notion of a 'displacedThreshold'. Now there's just a real threshold,
displaced or otherwise, and people who care about the paved area can use
'begin' and 'end'. Thanks to John Denker for pointing out the confusion this
leads to. Using 'end' also gets rid of the 'reverseThreshold' name, which was
clearly a bad choice of mine.
 2009-01-07 10:22:53 +01:00
Tim Moore
89010e6b0a Merge branch 'maint2' into next 2009-01-04 00:25:04 +01:00
jmt
1a05695ff5 NaN fix by Csaba/Jester - prefer atan2(x,y) to atan(a/y). 2009-01-04 00:24:33 +01:00
durk
632d89d6e7 James Turner: Cleanup of AI traffic route generation code. 2009-01-04 00:17:45 +01:00
Tim Moore
43b300fe46 Merge branch 'maint2' into next 2009-01-04 00:01:46 +01:00
fredb
6ccc0b64ef Win32 fixes 2009-01-04 00:00:20 +01:00
jmt
0f4f044a94 Kill off many Point3D includes, and a couple of uses in the HUD code. 
Requires a SimGear update to get some new SGGeodesy helpers.
 2008-12-26 12:28:05 +00:00
durk
1fdac74f8e Minimize impact of distant AI models on the scene graph. 2008-12-10 16:04:10 +00:00
durk
931c661b40 Changes to the AIModel code, to prepare for the new traffic manager code: 
- Leg loading can fail when no additional flights are available
- Better support for waypoint interception during pushback (speed ~ 0)
 2008-11-16 13:41:24 +00:00
fredb
dc2341b643 Revert to previous revision after an error during last commit 2008-10-19 16:22:17 +00:00