Tim Moore
37ffe7be35
Merge branch 'jmt/navradio' into next
2009-09-17 22:53:30 +02:00
jmt
5947f3fcd5
NavRadio DME in-range flag, and audio code improvements. By John Denker, adapted to current trunk by me.
2009-09-17 22:53:15 +02:00
Tim Moore
19d2d70da6
Merge branch 'jmt/reciprocal' into next
2009-09-17 22:52:17 +02:00
jmt
29f84492a2
Different approach to handling the paired-ILS-on-opposite-runways situation. This uses additional information we now store (in FGRunway) to be more explicit about the behaviour (i.e only look at paired navids), and crucially, does not misbehave near either threshold. Instead it always switches about the runway midpoint (so back-course/missed-approaches are broken as before), leading to stable behaviour when touching down.
...
I am pretty confident this is (was, from FS2004) also the 'solution' taken by MSFS.
2009-09-17 22:51:44 +02:00
jmt
44bc440d32
Associate non-ILS localisers with their runway.
2009-09-17 22:51:44 +02:00
jmt
d4d1d827d0
Make FGRunway track reciprocal runways.
2009-09-17 22:51:44 +02:00
Tim Moore
2ef77e4314
Merge branch 'jmt/navradio' into next
2009-09-17 22:49:07 +02:00
jmt
bf830f681d
One more divide by zero fix from Torsten.
2009-09-17 22:48:10 +02:00
jmt
ebf5dcb828
Work around the penaltyForNav broken-ness, by ensuring GS behaves sanely even if non-matches LOC and GS transmitters are selected. Which happens. Yuck.
2009-09-17 22:47:57 +02:00
jmt
c1598361ca
navradio: fix crash spotted by Torsten, when nav range is unspecified.
2009-09-17 22:47:45 +02:00
jmt
a650cf4239
Fix the has-gs flag when switching to a VOR (thanks Torsten), and expose GS validity via a new gs-in-range boolean prop, as suggested by John Denker.
2009-09-17 22:47:32 +02:00
jmt
971e87bb49
Logging: less verbose about navaids we didn't align.
2009-09-17 22:45:30 +02:00
jmt
daadb16370
Logging: less verbose traffic-manager startup.
2009-09-17 22:45:30 +02:00
jmt
fbf7d58c25
Logging: less verbose panel loading.
2009-09-17 22:45:29 +02:00
Tim Moore
d11ad100cc
Merge branch 'topic/atmos-merge' into next
...
John Denker's atmosphere changes. Original commit message:
Two-parameter physics-based model of atmosphere up to 262,467 ft i.e.
the top of the mesosphere. Correctly exhibits the HALT phenomenon.
2009-09-12 15:51:11 +02:00
jmt
3c48943e81
Various LOC/GS improvements from John Denker, adapted to trunk by me (hopefully not introducing too many bugs along the way). Includes:
...
- false LOC courses and GS lobes
- LOC sensitivity based on runway dimensions
- GS cutoff based on range
- More accurate GS deviation computation, making final approach more stable
2009-09-12 15:47:52 +02:00
curt
606f9173b2
Avoid strtof() for portability reasons.
2009-09-12 15:47:52 +02:00
curt
bf423ef0ca
Handle "double" type fields correctly for ascii input data. Previously double
...
data was being down-cast to float and the loss of precision impacted data types like lon/lat positions dramatically, preventing smooth replay of data.
2009-09-12 15:47:52 +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
jmt
5f16e4da60
Add clamped degrees deviation for glideslope.
2009-09-12 15:47:52 +02:00
Tim Moore
a6db6d89ff
Merge branch 'jsd/atmos' into topic/atmos-merge
...
Conflicts:
src/Environment/environment.cxx
src/Environment/environment.hxx
John Denker's atmosphere changes. Original commit message:
Two-parameter physics-based model of atmosphere up to 262,467 ft i.e.
the top of the mesosphere. Correctly exhibits the HALT phenomenon.
2009-09-10 12:31:04 +02:00
Tim Moore
7b6d15d537
cleanup of atmosphere patch
...
Remove some dead code and space changes. Replace boost::tuple with std::pair,
but do use boost::tie.
2009-09-10 11:42:42 +02:00
John Denker
abc7ae96a5
Two-parameter physics-based model of atmosphere up to 262,467 ft i.e. the top of the mesosphere. Correctly exhibits the HALT phenomenon.
2009-09-10 10:59:51 +02:00
jmt
77a8b4db30
Add normalised heading deflection property to navradio.
2009-09-09 23:42:21 +02:00
daveluff
08dfa30d87
Fix MSVC compilation
2009-09-09 08:56:32 +02:00
torsten
a893748d4e
Tatsuhiro Nishioka:
...
Handle number keys on Keypad properly on Mac OS X
2009-09-09 08:56:32 +02:00
ehofman
7e07b57d92
test for the presence of alut.h. if it's not found only display a warning message in gl-info and test-env-map. A clean build without glut installed is now possible.
2009-09-09 08:56:32 +02:00
ehofman
10611c1522
Dont execute code in case the soundmanager isn't properly initialized
2009-09-09 08:56:32 +02:00
jmt
049e1ae23e
Fix compilation - missing include of globals.hxx
2009-09-09 08:56:32 +02:00
jmt
6fa1b3dfd0
Add normalised glideslope deviation property to nav-radio.
2009-09-09 08:56:32 +02:00
jmt
e2f0d1960e
Further re-factoring of nav-radio code, again no functionality changed should occur. Radio reception / GPS slaving / Glideslope handling and CDI updating are all separate functions now.
2009-09-09 08:56:32 +02:00
ehofman
e8db3a514a
Dont execute code in case the soundmanager isn't properly initialized
2009-09-09 08:56:32 +02:00
jmt
80e67b17c2
Set runway elevation to the airport elevation, and don't reset ILS/LOC elevation when aligning with runways.
2009-09-09 08:56:31 +02:00
frohlich
2f6107982c
Use the new vector conversion functions.
...
Modified Files:
src/FDM/groundcache.cxx src/Main/renderer.cxx
src/Main/viewer.cxx src/Scenery/scenery.cxx
2009-09-09 08:56:31 +02:00
frohlich
5c56757303
Move dynamic_casts to EffectGeode into the findMaterial method.
...
Modified Files:
src/Scenery/scenery.cxx
2009-09-09 08:56:31 +02:00
frohlich
690231ff64
Fix a problem introduced with the past vector changes.
...
Fix a potential nan problem with the scenery_available method.
Modified Files:
src/Scenery/scenery.cxx
2009-09-09 08:56:31 +02:00
ehofman
1fa48722b4
One last update; remember whether input or output is requested. This will make sure FlightGear isn't communicating in both directions all the time.
2009-09-09 08:56:31 +02:00
ehofman
aeefd12522
Don't forget to clear the previous configuration
2009-09-09 08:56:31 +02:00
ehofman
ea4a3ee1df
Make FGIO a proper subsystem and add a reinit method for the generic protocol. This should allow for easy runtime reloading of the configuration file.
2009-09-09 08:56:31 +02:00
ehofman
f220feb684
Sync. with JSBSim (CVS) again
2009-09-09 08:56:31 +02:00
frohlich
d9d725f28d
Remove obsolete version test.
...
Modified Files:
src/Main/fg_os_osgviewer.cxx
2009-09-09 08:56:31 +02:00
frohlich
4e7b084568
Simplify, fix some comments.
...
Modified Files:
src/Main/viewer.cxx
2009-09-09 08:56:31 +02:00
frohlich
93d2f8a963
Correct logic to determine if we really have a hit.
...
Modified Files:
src/Scenery/scenery.cxx
2009-09-09 08:56:31 +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
ccb9e64caf
Avoid division by zero.
...
Modified Files:
src/Instrumentation/dme.cxx
2009-09-09 08:56:31 +02:00
torsten
e98d7a1ea4
Tatsuhiro Nishioka:
...
FG crashes at exit at very high likelihood.
The cause of the crash is that some subsystems (input and gui) call get_subsystems() at their destructor.
This is very dangerous since SGSubSystemMgr::get_subsystem() can refer to already deleted subsystems.
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
torsten
a26ca9f3e3
Tatsuhiro Nishioka:
...
Fixed: wrong event name for abs-hat0-y
Modified: let AxisElement to generate normalized input (-1.0 to 1.0).
This can be temporal and can be removed when AxisEvent normalizes its value.
Modified: clean up code
Added: some comments so other Mac developers can see what's going on
2009-09-09 08:56:30 +02:00
jmt
80a6317ab6
Re-structure the nav-radio code, in preparation for cleaner GPS-slave separation. No functionality changes (hopefully).
2009-09-09 08:56:30 +02:00
jmt
5a01c55335
Allow the joystick hat to move the view, even when the sim is paused.
2009-09-09 08:56:30 +02:00