1
0
Fork 0
Commit graph

6039 commits

Author SHA1 Message Date
ehofman
1e744a2582 Csaba Halasz: Pass file name to xml parser for error reporting from JSBSim. 2009-11-29 15:54:22 +01:00
ehofman
7af1f496e8 PreLoad and PostLoad also from a separate file. 2009-11-29 15:53:57 +01:00
ehofman
30e535bc7b Sync. withn JSBSim CVS 2009-11-29 15:53:31 +01:00
Tim Moore
6fcd9f967b Merge branch 'luff/kln89' 2009-11-27 06:41:43 +01:00
Tim Moore
e503591af4 Merge branch 'jmt/gps'
Conflicts:
	src/Instrumentation/gps.cxx
2009-11-27 06:40:47 +01:00
Tim Moore
8933486a56 Merge branch 'jmt/dialog' 2009-11-26 23:32:38 +01:00
Tim Moore
b39599f578 Merge branch 'ehofman/sky' 2009-11-26 23:32:20 +01:00
Tim Moore
ad9366ed99 Merge branch 'ehofman/jsbsim' 2009-11-26 23:31:59 +01:00
Tim Moore
8e820977be Merge branches 'csaba/commlist' and 'csaba/recip' 2009-11-26 23:31:45 +01:00
ehofman
3d19352f13 proper listener velocity calculation, this has no effect yet but is required when other models start emitting sounds. 2009-11-24 14:22:54 +01:00
ehofman
934ce52a23 Tie samplegroup 'avionics' to the listener, just in case no other device is created that does it. 2009-11-19 23:09:49 +01:00
ehofman
97db69cf8f restore listener position with offset 2009-11-19 21:03:05 +01:00
jmt
33058511de Dave Perry:
Allows using a nasal filter to smoothly park the gs needle when out
of range or frequency changes to a station w/o gs.
2009-11-15 01:31:42 +01:00
jmt
7bb785c72c Fix altitude units error loading plans, spotted by Csaba Halasz (Jester). 2009-11-15 01:29:08 +01:00
ehofman
0578b06a0c temporarily remove listener (viewer) and source offsets. they mess things up 2009-11-12 23:01:41 +01:00
ehofman
96b7939947 put the debugging quat strings as doubles under /sim/current-view/debug instead. 2009-11-11 17:49:42 +01:00
ehofman
769bac95e3 put the debugging quat strings as doubles under /sim/current-view/debug instead. 2009-11-11 17:49:42 +01:00
ehofman
742aec2f32 Pass the north-east-down velocty directly to the sample_group and do the calculations there. 2009-11-10 16:29:51 +01:00
ehofman
2bc7dc685b allow sound effects in the configuration file to be added to the 'avionics' sample group by setting '<type>avionics</type>'. 2009-11-10 06:55:46 +01:00
ehofman
af6da1d3c1 sun postition fixes
Was: allow sound effects in the configuration file to be added to the 'avionics' sample group by setting '<type>avionics</type>'.

but this change obviously snuck in with that.
2009-11-10 06:54:57 +01:00
Tim Moore
8117134879 don't define constant objects in header files 2009-11-09 10:24:46 +01:00
ehofman
e750dc368d John Denker:
Together with previous patch, make view reference frame, view offset,
and current view visible in property tree.
Also some comments about the concepts behind these variables.
2009-11-09 10:07:42 +01:00
Csaba Halasz
d8fb306c7e Fix label printing in ATCDialog 2009-11-08 01:18:09 +01:00
Csaba Halasz
f0d72b6b50 Do not pollute comm list by inserting not found elements in FGCommList::FindByPos 2009-11-08 01:17:55 +01:00
Csaba Halasz
ce7c98f210 Use wider search in FGCommList::FindByPos 2009-11-08 01:17:44 +01:00
jmt
f11572cd64 Case insensitivity for findNextByPartialId. 2009-11-07 09:00:51 +01:00
jmt
6a4e458af9 In the route-manager, track the departure and destination airport objects
* Expose the airport names as properties
* Use tied properties to simplify the code
2009-11-07 09:00:36 +01:00
jmt
9cdcd76c6b Make Nasal airportinfo() tolerant of invalid airport idents. 2009-11-07 08:57:57 +01:00
daveluff
e1af876a65 Enable correct DTO waypoint selection 2009-11-07 08:56:55 +01:00
daveluff
eb382545c5 Allow all approaches to be selected at airports with more than 3 approaches 2009-11-07 08:56:36 +01:00
ehofman
06187368d2 first stab at reorganizing fgUpdateSunPos() to make it use quats 2009-11-07 08:54:23 +01:00
ehofman
fe834dedfb Save a costly SGVec3d::fromGeod() calculation 2009-11-07 08:54:03 +01:00
Csaba Halasz
b8f5013751 Added some null pointer checks in FGAILocalTraffic to handle airports without tower 2009-11-07 07:54:18 +01:00
Csaba Halasz
52c1061e24 Re-apply the reciprocal patch from cvs rev 1.3 and correct an order of magnitude regression in HeadingIndicatorFG 2009-11-07 07:53:49 +01:00
torsten
58f303e464 Ron Jensen:
This little patch makes the KT-70 read 888-8888 when in self-test mode.
This is the correct behavior, the current behavior, where it reads the
flight level and squawk code in self-test is incorrect.
2009-11-06 23:46:02 +01:00
Tim Moore
ef152ee411 Merge branches 'durk/scenery' and 'ehofman/fog' 2009-11-06 23:39:17 +01:00
Tim Moore
53660d3699 Merge branch 'topic/moon' 2009-11-06 23:38:42 +01:00
Tim Moore
71d042b371 Merge branch 'timoore/atmos' 2009-11-06 23:38:37 +01:00
ehofman
2d2710d5da pass the geodetic position and view orientation quat to the sky repositioning function 2009-11-05 16:28:11 +01:00
ehofman
ab149d0036 John Denker:
Add a view debugging functions and represent the viewer quats in the property tree for debugging.

Do a nontrivial calculation, demonstrating how to find the 12:00 orientation given the view and the view offset.  it, and observe that the 12:00 direction does not change when you change the view offset, which is a nontrivial result.

Erik: This already proved to be useful since I now obserbed that the sky and fog coloring code depends on view offset rather that the view orientations. This is why those effects are out of line in some views.
2009-11-05 16:27:58 +01:00
daveluff
24b57ada09 Allow the DIR page to be exited properly using the inner knob 2009-11-04 23:15:48 +01:00
daveluff
00d9abef42 Make the comments about switching to the DIR page more useful 2009-11-04 23:15:41 +01:00
ehofman
c8430ce104 I really have no idea why but the velocity should be 100 times larger than feet-per-second suggests to work properly. oh and change sign 2009-11-04 23:14:54 +01:00
ehofman
342744fddb Use the proper absolute position for the listener 2009-11-04 23:14:33 +01:00
jmt
71c03b1ce4 Dynamic combo-boxes; read values from the property tree. 2009-11-04 23:13:42 +01:00
jmt
ecfe4eb21b Check one potential source of the prime-meridian crash. 2009-11-04 23:12:59 +01:00
ehofman
b1eebb21a6 rocket engine and piston engine fixes 2009-11-02 23:30:56 +01:00
ehofman
3b5792e7cc minor upodate by John 2009-11-02 23:30:34 +01:00
ehofman
0be434936e John Denker: Simplify redundant code and superfluous variable 2009-11-02 23:30:29 +01:00
ehofman
6e5673de21 Position and orientation fixes for the sound code, thanks to Tim Moore 2009-11-02 23:30:02 +01:00
ehofman
7efed53475 proper sound orientation(?) and comment out velocity since it messes with OpenAL in such a way that volume doesn't work properly anymore 2009-11-01 22:05:56 +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
28d221cd7c Revert lighting "cleanup" for now.
The osgViewer headlight appears to be critical for enabling lighting.
2009-10-31 23:00:11 +01:00
ehofman
d2799cd832 another attempt at getting something useful without any result. 2009-10-31 22:57:27 +01:00
Tim Moore
e0a779adb1 fix moon lighting at night
This hasn't worked since the OSG port was initially checked in. A real
phase-of-the-moon bug!
2009-10-30 23:12:14 +01:00
ehofman
9535c4e339 Commit the current state of affairs to see if it fixes the position code for others 2009-10-29 23:09:21 +01:00
ehofman
c56c520ab5 initlialize _playing for FGATC. Proper listerner orientation based on view offset. proper velocity orientation 2009-10-28 23:23:53 +01:00
ehofman
a70431c5a4 sync. w. JSBSim CVS 2009-10-28 23:23:29 +01:00
jmt
6593d6c065 Bugfix - don't exclude seaports or heliports when looking up by ICAO. 2009-10-28 23:22:32 +01:00
jmt
53b16caec0 Check for an empty search query in GPS searches, and fix test code. 2009-10-27 22:22:03 +01:00
daveluff
f696c541be Remove the unecessary distinction between waypoints of the core approach and waypoints of the missed approach procedure 2009-10-27 22:21:52 +01:00
Tim Moore
7024454088 Remove system typedefs for MSC in net_fdm.hxx
They are defined by stdint.hxx now.
2009-10-26 23:46:17 +01:00
Tim Moore
ec8b5df2cf stdint.h or equivalent is needed for net_fdm.hxx 2009-10-26 22:41:36 +01:00
jmt
8ace3a12ba Better idents for waypoints defined by lon/lat. 2009-10-26 22:12:20 +01:00
ehofman
290bef5749 MSVC fix 2009-10-26 22:12:10 +01:00
ehofman
1d097cc575 mingw fix 2009-10-26 22:11:58 +01:00
ehofman
82364aa4da Sync. w. JSBSim cvs 2009-10-26 18:56:23 +01:00
ehofman
ad020f5fb5 Csaba Halasz: C++-ify ATCVoice WriteMessage 2009-10-26 18:55:40 +01:00
ehofman
11d15b4513 fix a pointer reference. 2009-10-26 18:55:31 +01:00
ehofman
61d8aa5bde Adjust fog color. 2009-10-26 18:54:40 +01:00
Tim Moore
3a890859d3 more include SGMath.hxx to keep MSVC happy 2009-10-26 18:40:12 +01:00
durk
b4eb30a6c5 Revoke url change detection code. 2009-10-26 07:45:04 +01:00
Tim Moore
d6c3304f87 Generate sea level pressure from metar
This needs to account for the current temperature.
2009-10-26 07:30:37 +01:00
daveluff
0112b24540 Expand SIAP idents as found in FAA ARINC dataset to the full approach name as shown on the approach chart and possibly the GPS 2009-10-24 23:48:54 +02:00
Tim Moore
fc71333bdd Fix typo 2009-10-24 23:14:48 +02:00
Tim Moore
c563cd034a delete char array with delete[] 2009-10-24 22:50:43 +02:00
durk
904a99714e Two patches:
1) Fix for the "use custom scenery airport data" property.
2) Make it a little harder for stupid people to make money behind our backs.
2009-10-24 19:53:03 +02:00
ehofman
430fbe99fa Use shared pointers for any reference to SGSoundSample 2009-10-24 19:52:09 +02:00
ehofman
f9445874a0 Don't make the SoundManager a memebr of the subsystem manager; It needs to be initialized very early and destroyed as late as possible. That doesn't work as a subsystem meber onless some sort of priority scheme gets implemented. Get rid of auto_ptr which doesn work for the samples either. 2009-10-24 19:51:39 +02:00
ehofman
7283e506b2 Sync. with JSBSim CVS 2009-10-24 19:50:27 +02:00
jmt
57d8dca176 Fix for an uninitialised value, reported by Dave Luff. 2009-10-22 23:21:34 +02:00
jmt
9495c2efdf Route tweaks, especially in-flight activation and deactivation
* Don't require a valid departure and destination airport
* Handle in-air route activation cleanly
* Handle end-of-route situation cleanly
2009-10-22 23:21:25 +02:00
ehofman
9c8d6ee663 Add a proper typecast 2009-10-22 23:14:13 +02:00
ehofman
42b990ca1b line up aircraft orientation and velocity vector 2009-10-22 23:14:13 +02:00
jmt
08039f1fa5 Tweak permitted indices for GPS route insert commands. 2009-10-21 16:28:14 +02:00
jmt
2a86384da7 GPS commands to edit the route manager route. 2009-10-21 16:28:01 +02:00
ehofman
6e2974ea57 Assorted small soundsystem related fixes. 2009-10-21 16:27:45 +02:00
ehofman
e2678830ba Use auto_ptr when calling SGSoundSample 2009-10-20 00:00:08 +02:00
ehofman
7d6631d9a6 remove a debugging left-over 2009-10-20 00:00:08 +02:00
ehofman
b25940e1ea Fix a number of small bugs; eg test if SoundMgr::load fails and return false in that case. 2009-10-20 00:00:08 +02:00
ehofman
afb0ada81f Make sure the unbind method is called for all registered subsystems proir to deleting the subsystem manager. 2009-10-20 00:00:08 +02:00
ehofman
836aabae69 Removed code from ConsumeFuel() which failed due to rounding error. 2009-10-19 23:58:14 +02:00
jmt
069b26bbb8 Make panel-IO quieter. 2009-10-19 23:56:51 +02:00
jmt
71a9e3d419 HUD tweak - don't show cross-track error if it's (effectively) zero. 2009-10-19 23:56:51 +02:00
jmt
332e7fc59b GPS data validity clean-up; it was a mess, now it's more robust. Thanks to Dave Luff for reporting. 2009-10-19 23:56:51 +02:00
jmt
87141b47a7 Fix route-manager / GPS sequencing interaction; tied properties need help to fire listeners. 2009-10-19 23:56:51 +02:00
jmt
1a05ed6b3d Fix a copy-and-paste bug with destination runways. Caught by Scott Hamilton. 2009-10-19 23:56:51 +02:00
ehofman
73d4b78396 explicitly activate the sound manager 2009-10-18 18:19:52 +02:00
daveluff
a2401ea94b Add a hardwired instrument approach for testing. This will be removed and read from file shortly 2009-10-18 17:56:17 +02:00
Tim Moore
2c6cfca38b Fixes for changes in simgear/math/sg_types.hxx 2009-10-18 12:16:54 +02:00
frohlich
78aa4be170 Fix 64 bit linux builds.
Modified Files:
	src/ATCDCL/ATCVoice.hxx
2009-10-17 23:58:41 +02:00
daveluff
882f5b4deb My non-precision approach model had been one or more IAFs and then a common core approach from the IF. In fact, there can be one or more initial approach routes from the IAFs to the IF, then the core approach. Replace the IAFs with initial approach routes. NOTE it is assumed in the code that there is a unique IAF per initial approach route. 2009-10-17 23:54:26 +02:00
daveluff
a01bee3817 Change one of the default flight plans to something more convenient for development. These will eventually all be removed from the code and read from preferences anyway. 2009-10-17 23:54:14 +02:00
daveluff
8de8a734a2 Fix a crash where there is only 1 IAF in an approach 2009-10-17 23:54:05 +02:00
ehofman
1b08051597 SoundManager fixes 2009-10-17 14:02:46 +02:00
ehofman
6fec83155e James Turner: Add autobrake functionality 2009-10-17 14:02:27 +02:00
jmt
afb1e7ffe9 Further GPS and route manager behavioural fixes
* When the nav-radio is slaved, calculated radial/target-hdg-deg
 (needed by some autopilot logic)
* Handle editing (including deletion) of route waypoints correctly,
 including deleting the active waypoint
* Add a signal to the route manager when the last wpt is reached, and
 use it in the GPS to revert to OBS mode.
* Change the altitude handling to use the specified cruise altitude
* Fix a bug where autopilot/locks/altitude was treated as a boolean
2009-10-16 11:24:36 +02:00
ehofman
a9b3fc7a56 move some of the sound postion and orientation calculations over to the sample class which also makes the main code nice and clean 2009-10-16 11:24:10 +02:00
ehofman
b937b5bbea Changed starting fuel flow. Fixed aborted start behavior. 2009-10-16 11:23:07 +02:00
ehofman
b7079aef7a This is the looping fix. 2009-10-16 11:22:57 +02:00
ehofman
5e22f4b563 fixed egngine feed bug 2009-10-16 11:22:47 +02:00
jmt
a865555fed Route-manager: remove any interaction with the autopilot, or internal sequencing; assume the GPS always handles this (it should, now). Also fix waypoint altitude handling, which was broken. If not altitude is supplied for a waypoint, default to the requested cruise altitude. 2009-10-14 11:44:27 +02: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
jmt
879531ce63 Make the GPS drive the autopilot directly (if configured), also update external course (OBS) source, and init at the current airport. 2009-10-14 00:42:37 +02:00
jmt
5aa51e5780 Ensure we always create a GPS instrument. 2009-10-14 00:42:37 +02:00
jmt
093e267091 Make the HUD show GPS state, instead of RM state. 2009-10-14 00:42:36 +02:00
jmt
d4cc5f9c44 Change default airport search to exclude seaports and heliports, for the moment. 2009-10-14 00:42:36 +02:00
ehofman
0f0f25512d sync. with JSBSim CVS again 2009-10-14 00:40:44 +02:00
ehofman
a3af4ed1d8 make it compile again 2009-10-12 12:53:22 +02:00
Tim Moore
3c5679fa40 Merge branches 'jmt/dialog' and 'durk/scenery' 2009-10-12 11:06:12 +02:00
Tim Moore
21122fa03e Merge branches 'jmt/brakes' and 'jmt/dump' 2009-10-12 11:05:36 +02:00
Tim Moore
919d1625df Merge branch 'stuart/clouds' 2009-10-12 11:04:58 +02:00
Tim Moore
02c75ba583 Merge branch 'torsten/axes' 2009-10-12 11:04:47 +02:00
Tim Moore
40639d38a8 Merge branches 'jmt/xmlauto', 'luff/kln89' and 'curt/radial' 2009-10-12 11:03:35 +02:00
Tim Moore
c779c2ac21 Merge branch 'jmt/positioned' 2009-10-12 11:02:00 +02:00
Tim Moore
7d5c510215 Merge branch 'vivian/trainz' 2009-10-12 10:59:18 +02:00
ehofman
b582c118bd Correct (and verrified) position, orientation and velocity vector. Todo: proper sound orientation (the all face forward using the airplane orientation now) and disabling doppler effect when tied to the listener 2009-10-12 07:58:11 +02:00
jmt
110dd605a0 Fix unrealistic-but-convenient direct-drive from the route-manager to the autopilot code. A new boolean config prop, 'drive-autopilot' exists, to disable this behaviour. 2009-10-12 07:56:15 +02:00
jmt
bde366e0e3 Make GPS slaved mode on the navradio slightly more robust. Not done yet. 2009-10-12 07:55:51 +02:00
jmt
3637482916 Fix various route-manager issues - HUD display of waypoints, some potential divide-by-zeroes when paused or stationary, and Win32 compilation. 2009-10-12 07:54:09 +02:00
ehofman
33e816abb9 Split up FGFX into a dedicated effects class (FGFX) and a sample queue class. Register the sample queue cass as 'queue' at the SoundManager and tie it to the listener position. 2009-10-08 10:38:10 +02:00
ehofman
c56113d0dd add the option to tie a SampleGroup to the listener position and orientation 2009-10-08 10:38:05 +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
jmt
cb6647ff13 Fix an issue which VC90 warns about - using 'this' in initialiser lists. 2009-10-07 08:26:23 +02:00
jmt
4b5518808b Use boost string algorithms to avoid dependence on C-library extensions missing in MSVC. Also they're just nicer. 2009-10-07 08:26:10 +02:00
jmt
72d9c254f4 Numerical robustness for the GPS code, when dt or last_speed_kts is zero. 2009-10-07 08:26:00 +02:00
jmt
23ce537168 Update for screen-dumps in PNG format instead of PPM. 2009-10-07 08:24:59 +02:00
ehofman
5107a9d07f (try to) properly align model and viewer 2009-10-07 08:23:41 +02:00
Tim Moore
696007e503 include header for auto_ptr 2009-10-06 11:20:19 +02:00
jmt
d784810430 Land the GPS/route-manager re-write. Many things are better, many other things will be better, some things are no doubt broken. Please be patient and report problems on the mailing list. 2009-10-06 10:44:01 +02:00
ehofman
b64259b295 allow disabling sound completely (note: openal gets initialized but shuts down a bit later leaving the soundmanager to handle only very specific commands). At this time by specifying '--prop:/sim/sound/enabled=false', not sure why '--disable-sound' doesn't work properly 2009-10-06 10:23:15 +02:00
ehofman
446b200edc Add the Sound Manager before any other subsystem that uses it. This makes sure the SoundMgr is available at construction time which makes the code much cleaner. Call the update_last() after any other class 2009-10-06 10:23:03 +02:00
ehofman
86f462933d Initial commit of the new sound system, expect more updates to follow 2009-10-06 10:22:09 +02:00
Tim Moore
5f134cdec8 Merge branch 'topic/atis' into merge/master-atis 2009-10-06 10:21:19 +02:00
jmt
2d5924939e Extend FGPositioned API to support queries by name as well as ident. 2009-10-06 07:29:03 +02:00
jmt
5c2dbb4239 Extender iterative search APIs with a 'has-next' return arg, to enable better iteration UI. 2009-10-06 07:28:38 +02:00
durk
b40321380d New feature: Allow the loading of shared models that are not located inside
the base package, but are maintained in the SVN repository of the custom
scenery project.
2009-10-06 07:27:39 +02:00
jmt
90106c59ce Dialog support for conditional enable and visible flags, and re-running layout when conditions change. Used by the GPS code, but potentially in many other places I expect. 2009-10-04 02:06:48 +02:00
jmt
26cd4f92c5 Fix another crash in the autobrake code, with 'aircraft' (eg, ATC) with no weight-on-wheels flag. Thanks to Jacob Burbach for the report. 2009-10-04 02:05:51 +02:00