1
0
Fork 0
Commit graph

5825 commits

Author SHA1 Message Date
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
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
jmt
25c55f67bf More precise matching of ILS records to navaids. 2009-09-03 00:02:48 +02:00
ehofman
98b5e7e6fe Bertrand Coconnier:
Additionally to the original fix (problem with the Tec2b matrix initialization) I have modified the code for the "STRUCTURE" contacts in order not to generate NaNs when the z direction of the body frame is normal to the ground normal. Now there should no longer be any NaN generated by the landing gear code.
2009-09-03 00:02:48 +02:00
jmt
294a7b675a Add support for processing the ICAO.ils.xml scenery data into ILS/LOC nav records. 2009-09-03 00:02:48 +02:00
durk
ce084ab1c5 Two minor (codewise) fixes to ensure everything works as advertised:
- Make sure to initialize the groundnetwork after succesful loading.
 - Ensure that the AI groundnetwork code proximity detection code used the
   correct values for bearing. (Note that detecting the proximity of the
   user aircraft appears still to be broken. I'll look into that later).
2009-09-03 00:02:48 +02:00
durk
1ae2b59333 Added two missing files from JSBSim.org that were missing in the last sync. 2009-09-03 00:02:48 +02:00
ehofman
48cad71a70 Sync with JSBSim CVS again 2009-09-03 00:02:48 +02:00
curt
f07a83c73a Allow setting of NED velocities. 2009-09-03 00:02:48 +02:00
jmt
2dee4ef14f Update FGRunway to process information from threshold.xml files. 2009-09-03 00:02:47 +02:00
jmt
7ff374ef8b Trigger lazy loading of Airport data from the scenery on access. 2009-09-03 00:02:47 +02:00
torsten
b1e2b7ee20 missing declaration of SGPropertyNode 2009-09-03 00:02:47 +02:00
jmt
cc0c19f62e XMLLoader re-factoring. 2009-09-03 00:02:47 +02:00
jmt
1c015387ba Initial framing for reading in-scenery airport data. 2009-09-03 00:02:47 +02:00
torsten
a1a610f7d5 - added support for MAC OSX and initial hotplug support from Tatsuhiro Nishioka
- added support for per-device <nasal> <open> and <close>
2009-09-03 00:02:47 +02:00
Tim Moore
be4b46b894 change back unsigned byte count to signed (multiplaymgr)
Also, small fixes to generic protocol from AndersG
2009-08-27 00:12:44 +02:00
Tim Moore
acbcf94bde AIGroundVehicle from Vivian Meazza 2009-08-25 12:52:50 +02:00
Tim Moore
5b29cd4cc0 fix warnings in Multiplayer, Scripting, and Time 2009-08-24 18:07:19 +02:00
Tim Moore
62620177aa Fix transmission of float and double values in generic protocol
gcc -Wall -Werror turned up some problems with the type-punning of pointers
used to write the message buffer; it turns out that truncated ints were being
written to the message buffer when values needed to be swapped to network byte
order.
2009-08-24 18:06:06 +02:00
Tim Moore
0a64405cad fix warnings in Main 2009-08-24 18:03:49 +02:00
Tim Moore
67c7d8642a fix warnings in Instrumentation
Mostly signed comparisons and order of initializers in constructors
2009-08-24 18:02:15 +02:00
Tim Moore
8238bcddbd fix warnings in GUI code 2009-08-24 18:00:10 +02:00
Tim Moore
185ede0159 Fix order of initializers in constructor 2009-08-24 17:58:27 +02:00
Tim Moore
5a1e0d92f4 fix gcc warnings
Mostly comment out unused variables.
2009-08-24 17:57:32 +02:00
Tim Moore
1e049f24b0 fixes to remove warnings
Comment out unused variables; fix a real bug in uiuc_gear().
2009-08-24 17:56:39 +02:00
Tim Moore
bfe942268e Initialize some variables 2009-08-24 17:54:48 +02:00
Tim Moore
c6d4f3b0ff Fix to LaRCsim interpolation code
Is this code still used? I don't know, but -Wall -Werror turned up a problem.
2009-08-24 17:53:57 +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
b3ceb9a2fd warning fixes 2009-08-23 21:43:10 +02:00
torsten
8d98e4cd49 warning fixes 2009-08-23 21:43:10 +02:00
torsten
1b08957f2a Olaf Flebbe: the plib/ul.h is needed for the TGT_PLATFORM Macro to make the tags <windows> or
<mac> work in the joystick xml files.
2009-08-23 21:43:10 +02:00
ehofman
9a01f8bf73 temporary fix for a division by zero problem for some aircraft 2009-08-23 21:43:10 +02:00
torsten
b772e5872a add option <grab/> to the device configuration. If this is set to 'true', the events from this devices are exclusively handled by our handler and are not distributed to other driver(s). 2009-08-23 21:43:10 +02:00
torsten
cd89ce7d0a warning fixes 2009-08-23 21:43:10 +02:00
torsten
6ba395969c warning fixes 2009-08-23 21:43:09 +02:00
torsten
2ea02594c0 even more warning fixes 2009-08-23 21:43:09 +02:00
torsten
e294ab7b39 warning fixes 2009-08-23 21:43:09 +02:00
torsten
e0b2d43fb4 the warning extinguisher hits again... 2009-08-23 21:43:09 +02:00
torsten
c672f2aba5 warning fixes 2009-08-23 21:43:09 +02:00
torsten
4d977e9411 warning fixes 2009-08-23 21:43:09 +02:00
torsten
5e9864994c fix warnings (order of initialization) 2009-08-23 21:43:09 +02:00
fredb
f2b9b9f441 Compile under MSVC9 again 2009-08-23 21:43:09 +02:00
ehofman
5ee9cd1fcc Add Bertrand Coconnier's latest landing gear code 2009-08-23 21:43:09 +02:00
torsten
5a04b82dfc Tom P: magnetic-variation isn't boolean. 2009-08-23 21:43:09 +02:00
fredb
4c29f8711b Compile under MSVC9 again 2009-08-23 21:43:08 +02:00
ehofman
83675c7216 Changed my mind, the 'scene specular' color is actually the diffuse color and the sun specular color is the scene specular color 2009-08-23 21:43:08 +02:00
ehofman
37e1581964 forgot a few untie's and fix a small bug 2009-08-23 21:43:08 +02:00
ehofman
cf25f69d36 Update to the latest version of JSBSim 2009-08-23 21:43:08 +02:00
ehofman
25a99a2417 Expose the color of the sun (which is not the scene specular color anymore) 2009-08-23 21:43:08 +02:00
curt
0590333e53 Fix a bug that is screwing me! 2009-08-23 21:43:08 +02:00
fredb
efbe6984c2 Win32 fix and suppress one warning 2009-08-23 21:43:08 +02:00
timoore
8bac481865 fgviewer: support random objects, vegetation, and static models 2009-08-23 21:43:08 +02:00
torsten
8cf74b8f2d Add a debug property to make devices print out incoming events on the console. 2009-08-12 23:45:55 +02:00
torsten
3231561e5a fixed typo. Thanks m. 2009-08-12 23:45:54 +02:00
torsten
d7eab6061c be compatible with older kernels 2009-08-12 23:45:54 +02:00
torsten
da9a4c3216 missing dbus include path 2009-08-12 23:45:54 +02:00
torsten
5c57153e62 Advanced input subsystem - Step3: Adding support for the Linux event devices 2009-08-12 23:45:54 +02:00
timoore
3bce312213 Get fgviewer working as a part of fgfs
Move fgviewer code into fgfs binary. Its osgViewer-style main function is
called from bootstrap.cxx if the --fgviewer argument is passed to fgfs.

Use fgfs initialization functions in fgviewer codepath. Read
command-line arguments and autosave.xml.
2009-08-12 23:45:54 +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
fredb
71d7f043a8 Compile under MSVC9 2009-08-10 07:14:38 +02:00
timoore
b65f0ae0dc From Till Busch - reload shaders command
Also, more documentation for effects.
2009-08-10 07:14:38 +02:00
torsten
aea9c750f3 Advanced input subsystem - Step2: Split up current input subsystem
- encapsulate code into classes
- create separate subsystem for keyboard, mouse and joystick
- group new subsystems into subsystemgroup "input"
2009-08-08 08:37:15 +02:00
frohlich
aac4bec5c7 Add a possible node not to visit.
Modified Files:
	scenery.cxx scenery.hxx
2009-08-08 08:37:14 +02:00
torsten
0c2db22988 Advanced input subsystem - Step1: cleanup dependencies 2009-08-08 08:37:14 +02:00
torsten
c5f63a4ac1 Advanced input subsystem - Step1: cleanup dependencies 2009-08-08 08:37:14 +02:00
fredb
abe00db6aa Compile under MSVC9 again 2009-08-08 08:37:14 +02:00
ehofman
a7976b835d Sync. with JSBSim 2009-08-08 08:37:14 +02:00
fredb
94caa0b891 Fix case typo 2009-07-27 23:52:33 +02:00
fredb
9718338560 Compile under MSVC9 2009-07-27 23:52:33 +02:00
daveluff
443f3f3654 Fix the rendering of the KLN89 on the 2D panel that was broken during the move to osg. This is an interim step with the aim being to eventually use render-to-texture. 2009-07-27 23:52:32 +02:00
torsten
0c1c224443 At startup, fetch METAR for closest airport that has one, which is not necessarily the same. 2009-07-27 23:52:32 +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
Tim Moore
ddb6551a91 SGRawValue::DefaultValue is now a function 2009-07-17 11:47:11 +02:00
timoore
e2b21c1e0c Property predicate for techniques 2009-07-16 12:10:48 +02:00
timoore
d7a07bdd58 Find material from EffectGeode and Effect
The scenery now uses the Effect class.
2009-07-16 12:10:48 +02:00
timoore
890b584b8f Enable EffectCullVisitor 2009-07-16 12:10:48 +02:00
timoore
ca3bd1c309 accomodate changed getDisplayName interface in yasim::Hitch 2009-07-16 12:10:47 +02:00
timoore
5cf18d30c6 Support for VEC3D and VEC4D properties.
Tiny update to property_list for extended properties.

New property types in nasal.
2009-07-16 12:10:47 +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
ehofman
a4a593745e Hopefuly fix what might be a 64-bit OS problem 2009-07-12 00:55:33 +02:00
ehofman
f5ab3756a1 although the official name is 'bool' also support 'boolean' for backward compatibility. 2009-07-02 08:59:16 +02:00
ehofman
38d538cdb8 Add the statement about the wrong received-buffer size again which might be a useful debugging tool. 2009-07-02 08:59:16 +02:00
ehofman
0dfd7b8024 If more than one packet has arrived in the mean time, process them all. 2009-07-02 08:59:16 +02:00
jmt
6c65a26ddf Switch some log message from the traffic code to SG_BULK (with Durk's permission) 2009-07-02 08:59:16 +02:00
frohlich
05a0a1f231 Remove ViewPartitionNode that is obviously superseeded by the
CameraGroup implementation and that is not used by flightgear.

Modified Files:
	FlightGear.dsp configure.ac projects/VC7.1/FlightGear.vcproj
 	src/FDM/Makefile.am src/Main/Makefile.am
Removed Files:
	src/Main/ViewPartitionNode.cxx src/Main/ViewPartitionNode.hxx
2009-07-02 08:59:16 +02:00
frohlich
e9c0c01ebb Remove now unused functions.
Modified Files:
 	src/Main/renderer.cxx src/Main/renderer.hxx
2009-07-02 08:59:16 +02:00
torsten
786c10a69e fix self initialized of average variable in FGPredictor 2009-07-02 08:59:16 +02:00
fredb
219be77f1e Suppress warnings 2009-07-02 08:59:16 +02:00
fredb
0783a96d4d Suppress MSVC warnings 2009-07-02 08:59:15 +02:00
fredb
00d7c1865f Suppress warnings 2009-07-02 08:59:15 +02:00
ehofman
6079ff58fd sync. with JSBSim again 2009-07-02 08:59:15 +02:00
ehofman
1ed6276f16 Don't create a new instance of /fdm/jsbsim upon reset 2009-07-02 08:59:15 +02:00
ehofman
a9c47a7b78 split up binary and ascii message handling functions, mostly for readability 2009-07-02 08:59:15 +02:00
torsten
14f4354523 added GPL license header 2009-06-25 10:20:24 +02:00
torsten
d23628a9ce hack to stop startup.nas complaining if metar arrives after nasal-dir-initialized
is fired. Immediately fetch and wait for the METAR before continuing. This gets the
/environment/metar/xxx properties filled before nasal-dir is initialized.
2009-06-25 10:20:24 +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
torsten
40d2925126 don't mix geodetic and geocentric coordinates 2009-06-23 10:54:09 +02:00
ehofman
90581f8bf0 changes matching those of generic.?xx 2009-06-23 10:54:09 +02:00
ehofman
36f8519973 * Add proper support for float and double values
* properly honour network byte order on little-endian and big-endian systems
* various cleanups and bug-fixes
2009-06-23 10:54:09 +02:00
ehofman
30e925bb38 Anders Gidenstam:
Add support for generic binary input.
This patch has been sitting in my source tree since 2007.
2009-06-23 10:54:09 +02:00
ehofman
879b4df9fc Return an error when not enough tokens are parsed for the generic protocol, that must be better than causing a segmentation fault. 2009-06-23 10:54:09 +02:00
Tim Moore
b588a92b7f adapt to changes in sg_exception interface
sg_location now uses C strings. Also, change uses of sg_throwable to more
specific exceptions like sg_io_exception.
2009-06-16 11:46:47 +02:00
timoore
d30398f2b2 uninitialized variable fix from Vivian Meazza 2009-06-16 11:32:14 +02:00
timoore
f0bfb4d137 Realize viewer explicitly
The osgViewer needs to be "realized" so that, among other things, threading
will start. This is normally done by osgViewer::run, but we don't call
that.
Don't realize graphics contexts; Let osgViewer code do it. This way
osgViewer::isRealized returns the correct answer.
2009-06-15 11:25:06 +02:00
fredb
862f59aded Reserve a special FGPositionned type for pavements 2009-06-15 10:29:45 +02:00
fredb
522787c173 Retrieve the full pavement/taxiway description, made of several words 2009-06-15 10:29:45 +02:00
fredb
97c214e4fc Suppress warnings 2009-06-15 10:29:45 +02:00
fredb
40586c77fd X-Plane 850 airport file format parsing. 810 is still supported and may be mixed with new format.
Ground radar updated to display new pavements.
2009-06-15 10:29:45 +02:00
fredb
73fbc05a6b Projection matrix and texture size should be coherent 2009-06-15 10:29:44 +02:00
fredb
3b024e3dab Suppress warnings 2009-06-15 10:29:44 +02:00
ehofman
d27097d7b8 don't forget to include the new header for the tardist 2009-06-15 10:29:44 +02:00
ehofman
cb435814c1 latest changes for JSBSim (1.0 prerelease) 2009-06-15 10:29:44 +02:00
jmt
21a8522160 Whoops, type codes for localizers and ILSs were swapped in the nav.dat reader 2009-06-15 10:29:44 +02:00
jmt
86d1e4ea9d Directly associate runways objects with their ILS navrecord (if one exists) 2009-06-15 10:29:44 +02:00
jmt
83c29b4f43 Fix a bad copy-and-paste bug in namedFindClosest, which broke things in the
multiple-matches case.
2009-06-11 16:05:21 +02:00
frohlich
e837aefceb Remove old osg 2.2 code.
Modified Files:
	src/Main/renderer.cxx
2009-06-11 16:05:21 +02:00
frohlich
173af5d55f Remove dead variables.
Modified Files:
	./src/Model/acmodel.cxx ./src/Model/acmodel.hxx
2009-06-11 16:05:21 +02:00