1
0
Fork 0
Commit graph

544 commits

Author SHA1 Message Date
curt
ce574d59f5 The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:

a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD       - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display      - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches               - main.cxx

ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.

flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD

Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
 code.

hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.

options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows

options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.

views.cxx
---------
Added code to retrieve view offset for window.

Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
curt
ae1028b795 Added #include <math.h> for fabs() 2000-10-16 20:47:47 +00:00
curt
0750b9d34f Renamed new FGEngine to FGNewEngine to avoid conflict with stuff in JSBSim. 2000-10-16 20:01:23 +00:00
curt
47c3f41828 Check return value of FDM::init().
Updated other return values to be bool instead of int.
2000-10-16 14:54:41 +00:00
curt
972bf22630 Friday the 13th JSBSim update ... :-0 !!! 2000-10-14 02:10:10 +00:00
curt
5018278831 Panel tweaks to support "shaped" panels.
Additional HUD support for waypoints.
JSBSim updates.
2000-10-13 23:34:54 +00:00
curt
72a09d198c Updates to track current JSBSim cvs. 2000-10-12 01:06:31 +00:00
curt
7c38f172d9 Some tweaks relating to engines and the various LaRCsim related fdm's 2000-10-10 20:31:20 +00:00
curt
6caf599f2b Oct. 10, 2000 sync with JSBSim master repository. 2000-10-10 17:44:35 +00:00
curt
b85ea575a3 Oct. 9, 2000 - synced with latest JSBsim code. 2000-10-09 21:16:21 +00:00
curt
f6fac40a11 David Megginson writes:
I have a scrollable panel working (it didn't take long in the end).  A
panel can now be much wider or higher than the available area, and the
user can scroll around using [Shift]F5, [Shift]F6, [Shift]F7, and
[Shift]F8.  The user can also scroll the panel down to get a bigger
external view.  Mouse clicks seem still to be working correctly.

To set the panel's (virtual) height and width, use the panel file's /w
and /h properties in a panel XML file; to set the initial x- and y-
offsets (untested), use the panel file's /x-offset and /y-offset
properties; to set the initial height of the external view (untested
and optional), use the panel file's /view-height property.  Note that
none of these show up in the regular FGFS property manager.

Unfortunately, these patches will not affect your initialization
problems with the property manager -- I'm having a hard time tracking
them down because I cannot reproduce them.

I have also made some patches to main.cxx and views.cxx to do two
things:

1. Expand or shrink the external view as the panel moves up and down.

2. Set the window ratio correctly, so that we don't get an oval sun
   and flat clouds when the panel is visible (the problem before was
   integer division, so I added casts).

Unfortunately, the window ratio is not set properly at start-up --
there are too many dependencies, and I haven't figured that part out
yet.  As soon as you hide and redisplay the panel or move it
vertically (i.e. force fgReshape to be called), you'll see the correct
ratio.
2000-10-06 21:16:01 +00:00
curt
981d4dbd7d Properties:
- /engines/engine0/rpm changed to read-only
- /engines/engine0/egt added (read-only)
- /controls/mixture added
- /controls/propellor-pitch added (not used for C172)

BFI:

- getEGT() added
- getMixture() and setMixture() added
- getPropAdvance() and setPropAdvance() added (= pitch)
- cleaned up reinit function a bit
- force reinit only when values are actually changed; for example,
  setting the flight model to the current flight model will not cause
  a reinit

LaRCSim:

- hook up mixture and pitch to FGControls (they were hard-coded
  before)
2000-10-04 22:52:34 +00:00
curt
b6d0402074 Properties:
- /engines/engine0/rpm changed to read-only
- /engines/engine0/egt added (read-only)
- /controls/mixture added
- /controls/propellor-pitch added (not used for C172)

BFI:

- getEGT() added
- getMixture() and setMixture() added
- getPropAdvance() and setPropAdvance() added (= pitch)
- cleaned up reinit function a bit
- force reinit only when values are actually changed; for example,
  setting the flight model to the current flight model will not cause
  a reinit

LaRCSim:

- hook up mixture and pitch to FGControls (they were hard-coded
  before)
2000-10-04 22:22:21 +00:00
curt
21a5886bcb Oct 2, 2000 JSBSim sync. 2000-10-02 23:07:30 +00:00
curt
1dc35581f5 MSVC compatibility changes and code tweaks for minor nits caught by the
MSVC compiler.
2000-10-02 21:49:04 +00:00
curt
137da58a70 Working on putting engine data on "the bus" 2000-09-29 03:27:21 +00:00
curt
6d4e03361a Updates to IO360 engine model: Added a couple of guestimates for engine
and prop inertia and passed the timestep from LaRCsim in order to have
the engine rpm behaving according to the applied torque and the laws of
physics.
2000-09-28 22:49:33 +00:00
curt
32528d0cd6 A bit of fg->sg namespace changing. 2000-09-27 20:16:22 +00:00
curt
2c59508156 Renamed fg_types.hxx -> sg_types.hxx
Started work on an interactive property manager traverser/setter.
2000-09-26 23:39:29 +00:00
curt
75c77d9e53 Initial revision. 2000-09-26 23:37:26 +00:00
curt
4b6b2bc06d Minor changes to several includes to allow out of source tree builds. 2000-09-26 21:44:52 +00:00
curt
bf14bb1151 Fixes for MSVC++ issues. 2000-09-21 22:59:27 +00:00
curt
e891774a8c builddir -> srcdir so builds can be done outside the master source directory. 2000-09-20 23:27:25 +00:00
curt
68d96bfcb1 Added .h flags so the they are included in the distribution. 2000-09-15 19:25:18 +00:00
curt
13bba6c88d Tweaks to ground steering sensitivity. 2000-09-14 17:36:25 +00:00
curt
be88681d69 MacOS changes by Darrell Walisser. 2000-09-13 21:51:07 +00:00
curt
655ce0e20d MACOS -> macintosh 2000-09-10 00:04:50 +00:00
curt
a2cd367ab5 Sep 8, 2000 panel updates from David Megginson. 2000-09-08 20:47:18 +00:00
curt
b4b46df9a8 Ooops, shouldn't call a program "ps". 2000-09-08 14:35:23 +00:00
curt
517d111c5c Sep 1 2000 updates from the UIUC team. 2000-09-06 19:52:37 +00:00
curt
64719b3da1 Initial revision. 2000-09-06 15:45:43 +00:00
curt
50b74acd95 Default to not using new engine code ... 2000-09-06 00:09:02 +00:00
curt
ed9fcb74b7 Updates to trial engine model. 2000-08-29 03:15:51 +00:00
curt
306f01c41a Updates to test the 10520 engine code. 2000-08-28 21:31:28 +00:00
curt
fa000a3447 Starting to play around with an engine model. 2000-08-28 20:39:55 +00:00
curt
f89d86d4af Updates and tweaks for Oliver's multi-player networking code. 2000-08-14 20:12:17 +00:00
curt
342842537d Fixes to jsbsim. 2000-08-04 16:08:55 +00:00
curt
120b26cc88 20000803 updates. 2000-08-04 03:20:09 +00:00
curt
76b4de7f1f Updates to JSBSim. 2000-07-31 15:05:08 +00:00
curt
6a98486375 JSBSim updates.
Updates to put more internal JSBSim values on the "bus".
2000-07-25 21:41:59 +00:00
curt
64d6f149e0 Sync the JSBSim code with the Jon & Tony's devel version.
Renamed JSBsim -> the official JSBSim.
2000-07-24 17:26:05 +00:00
curt
7a2ef1d57c Merged some of Alex's code changes.
Updates for better windows support in the Joystick module.
2000-07-20 04:16:59 +00:00
curt
9d47a64a09 Updates from Jon's official CVS tree. 2000-07-06 21:02:46 +00:00
curt
ca3fd98b5c Tony Peden: fixed Mach number for LaRCsim. 2000-06-14 21:52:22 +00:00
curt
dcdd61c590 Added differential braking (Alex and David). 2000-06-12 20:52:36 +00:00
curt
0786793f42 05/30/2000 updates from Jon Berdnt. Landing gear code now is beginning to
work.
2000-05-30 16:48:52 +00:00
curt
febc9cf0b2 First quick hack at panel shading. 2000-05-27 06:40:55 +00:00
curt
e12e81dd23 5/26/2000 updated from Jon and Tony. 2000-05-27 05:48:14 +00:00
curt
b074559216 MSVC5 portability changes contributed by Bruce Finney. 2000-05-24 06:10:01 +00:00
curt
d423fa9337 MSVC5 Compatibility tweaks. 2000-05-24 04:27:28 +00:00
curt
b543d8291e Fixes to uiuc includes and initialization.
Fixes to fg_io.cxx periodic scheduler.
2000-05-23 22:08:00 +00:00
curt
9835072241 From Tony Peden:
This set of changes cleans up my previous ones quite a bit:
[tony@valkyrie FlightGear]$ tar -ztf tp_changes.tgz
src/Controls/controls.cxx
src/Controls/controls.hxx
src/FDM/JSBsim.cxx
src/Main/fg_init.cxx
src/Main/options.cxx
src/Main/options.hxx
src/Joystick/joystick.cxx

controls.[ch]xx:  removed the trimmed_throttle stuff.  This undoes the
                  changes I submitted last time.

JSBsim.cxx:       updates for the removal of the trimmed_throttle stuff

fg_init.cxx:      removed the autothrottle logic.  The autothrottle is now
off
                  by default.

options.[ch]xx:   Sets trim_mode to false by default.  It is enabled only
                  when --notrim is not used and JSBsim is the FDM.

joystick.cxx:     Added logic for syncing the throttle lever.  This is
                  only enabled when trim_mode is enabled.   The way I
                  did it is, I hope, a good way of going about it.

I tested:
fgfs --fdm=larcsim
fgfs --fdm=jsb --aircraft=c172 --vc=100 --altitude=500
fgfs --notrim --fdm=jsb --aircraft=c172 --vc=100 --altitude=500

All work as intended, at least for me.

Make sure your joystick is calibrated and give:
fgfs --fdm=jsb --aircraft=c172 --vc=100 --altitude=500
a try, I think you just might be impressed.

I am. ;-)
2000-05-19 16:29:23 +00:00
curt
fb2a4f6909 Updates from Jon (addendum to previous changes). 2000-05-16 22:43:58 +00:00
curt
c4a1cc047e Updates from the Jon and Tony show.
Tony submitted:

JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow

c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now

FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine.  Note that the X-15 will not trim.
  This is not a model or trimming routine deficiency, just the
  nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default.  --notrim will turn it off.
Added --vc, --mach, and --notrim switches
      (vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
curt
519996f34d Changes contributed by Tony Peden to put wind data "on the bus". 2000-05-11 19:17:33 +00:00
curt
292c97fa43 Propogate colocated dme flag. 2000-05-04 15:53:03 +00:00
curt
4f6ed28a17 Instrument panel / steam updates for more realistic modeling of various
instruments (contributed by Alex Perry)
2000-05-02 19:41:35 +00:00
curt
ea80ed959e Partial JSBsim update. 2000-05-02 18:25:30 +00:00
curt
1868e44ee4 0429 updates from Jon. 2000-04-28 19:59:46 +00:00
curt
949fc00815 MacOS build updates. 2000-04-27 21:57:08 +00:00
curt
f7891be922 Initial revision. 2000-04-26 00:35:14 +00:00
curt
e9b2b521ca April 25, 2000 updates from Jon. 2000-04-25 17:43:40 +00:00
curt
8f71890c08 April 25 updates to JSBsim by Jon. 2000-04-25 17:42:11 +00:00
curt
c7cac5893f Added new section of JSBsim. 2000-04-24 23:49:37 +00:00
curt
ad4416e143 Updated JSBsim code. 2000-04-24 23:49:06 +00:00
curt
336aee09c4 Added one more missing include file. 2000-04-13 17:42:09 +00:00
curt
4139964eb2 Fixed a syntax error (stray space). 2000-04-12 19:05:41 +00:00
curt
6660bb4788 Added all .h files to Makefile.am so they can be included in the distribution. 2000-04-12 17:43:58 +00:00
curt
12168687cb Changes by Tony Peden to get pitch, roll, and yaw rates onto the "bus." 2000-04-11 21:45:42 +00:00
curt
1f1b2bab50 David Megginson made a few (mostly minor) mods to the LaRCsim files, and
it's now possible to choose the LaRCsim model at runtime, as in

  fgfs --aircraft=c172

or

  fgfs --aircraft=uiuc --aircraft-dir=Aircraft-uiuc/Boeing747

I did this so that I could play with the UIUC stuff without losing
Tony's C172 with its flaps, etc.  I did my best to respect the design
of the LaRCsim code by staying in C, making only minimal changes, and
not introducing any dependencies on the rest of FlightGear.  The
modified files are attached.
2000-04-10 20:09:40 +00:00
curt
0b69d5a107 Initial revision. 2000-03-22 22:08:16 +00:00
curt
8f3aa1bebd UIUC flight model contribution. This is based on LaRCsim, but can read
the aircraft parameters from a file.  It still uses Tony's <crappy> (and I
mean that in a constructive way) gear model. :-)
2000-03-22 22:01:33 +00:00
curt
3b0cf518bc MSVC++ tweaks contributed by Christian Mayer. 2000-03-21 22:06:05 +00:00
curt
1294aed465 One more pass at a reorg. 2000-02-16 23:01:03 +00:00
curt
485230b443 Code reorganization. 2000-02-15 03:30:01 +00:00
curt
9a207fb4e1 MacOS fixes contributed by Darrell Walisser on 1/26/2000. 2000-02-10 23:37:56 +00:00
curt
095c069b39 Updated for plib-1.1.x 2000-02-04 22:50:04 +00:00
curt
0e1c43e8e5 Jan 11, 2000 changes from Jon. 2000-01-11 17:26:43 +00:00
curt
58e1bc7698 Updates to propogate V_calibrated_kts and Mach from all FDM codes. 2000-01-10 21:07:26 +00:00
curt
c722481805 Updates from Jon and Tony. 2000-01-10 21:07:00 +00:00
curt
226b8a8971 Here is a wrap-up of the latest changes to JSBSim. It still is flaky, but
much less so due to returning the aero reference point stuff to the config
files. Don't know what happened there ...

Additionally, I have added a new field to the config file: CFG_VERSION. A
version number, currently 1.1, is assigned to the config file and a matching
definition is found in FGDefs.h. The two need to match. Tony has also added
code into FGAircraft.cpp to handle if aero reference point is not specified.
1999-12-30 18:01:59 +00:00
curt
871e4e8319 Updates to help work the kinks out of JSBsim. 1999-12-30 17:42:24 +00:00
curt
3cca59bf1f Allow aircraft model file to be specified from the command line. 1999-12-20 20:25:58 +00:00
curt
9892d4f03e Initial revisions. 1999-12-20 20:25:13 +00:00
curt
c319dac02a Updates from the Jon and Tony show. 1999-12-20 20:24:49 +00:00
curt
a872c40389 Updates from Tony. 1999-12-13 21:43:41 +00:00
curt
e340190916 Updates from Tony. 1999-12-08 19:48:54 +00:00
curt
d7d9403509 Cosmetic change. 1999-11-24 14:15:00 +00:00
curt
5fdede6f75 Revamped the "External" flight model. 1999-11-19 02:12:46 +00:00
curt
5bcd8c700b Updates from Tony, mostly to landing gear. 1999-11-15 23:54:07 +00:00
curt
021ee36a78 Tweaks to get rid of compiler warnings. 1999-11-09 19:51:07 +00:00
curt
212bf4a549 Cygwin32 build tweaks. 1999-11-09 18:22:55 +00:00
curt
0a97fc1dcc Tweaked with drag and thrust. 1999-11-04 22:53:34 +00:00
curt
5097ba0bf8 Patches from Tony to enable brakes. 1999-11-03 17:46:24 +00:00
curt
308e9d1ac5 Updates so that trim will work. 1999-11-02 15:59:13 +00:00
curt
43143ef358 c172 updates from Tony. Fix extra yaw when using ailerons. Flaps and elevator
tweaks.
1999-11-01 19:17:16 +00:00
curt
06b966ee53 Added flaps support to c172 model. 1999-10-29 18:08:31 +00:00
curt
ceaf93a11c Fix for MSVC++ 1999-10-27 00:44:29 +00:00
curt
3b5667ed39 Tweaks by David Megginson. 1999-10-27 00:44:16 +00:00
curt
0e48fe8ac4 Updates from Christian Mayer. 1999-10-20 22:15:41 +00:00
curt
802af70258 A couple MSVC++ portability tweaks. 1999-10-15 22:06:56 +00:00
curt
d707c00c13 Maybe fixed an altitude problem. 1999-10-15 05:35:50 +00:00
curt
b822efcf78 Use wgs_84 time and distance calc routines instead of pure spherical geometry. 1999-10-14 19:32:15 +00:00
curt
884dae9c57 Removing all the old vestiges of the original attempt at a slew FDM. Now
this functionality is implimented as a magic carpet mode.
1999-10-14 02:01:27 +00:00
curt
b5aaa84cc9 Initial revision. 1999-10-14 01:54:11 +00:00
curt
cecd5685ca Adding magic carpet FDM mode. 1999-10-14 01:53:43 +00:00
curt
c682dec898 Initial revision of balloon simulator code. 1999-10-12 03:27:06 +00:00
curt
74a337b91e Fixed a couple warning messages. 1999-10-11 23:09:51 +00:00
curt
b86e6ddc11 Updating FGFS <=> FDM interface. 1999-10-11 23:09:07 +00:00
curt
5bb9223dda Pass through ground speed for hud ETA calculation. 1999-10-10 16:48:21 +00:00
curt
5f5905f6e8 Updates by norman vine to controls.hxx.
Joystick auto-coordination tweaks.
Additional debuging output when pausing and resuming the sim.
Window resizing tweaks by David Megginson (and Norman Vine).
1999-10-09 13:09:16 +00:00
curt
5e61535594 Irix tweaks. 1999-10-08 00:14:01 +00:00
curt
f00b1f8b83 Various SGI portability tweaks. 1999-10-07 23:08:48 +00:00
curt
2375ae99e3 Fix to keep longitude between -180 ... 180. 1999-10-01 20:35:43 +00:00
curt
26193c5b19 PVE serial output tweaks.
Other minor tweaks.
1999-10-01 20:07:44 +00:00
curt
aa065f7068 Pass a few more values between LaRCsim and FGInterface. 1999-09-30 02:59:12 +00:00
curt
d12253020b Make sure c172 files get into distribution. 1999-09-28 22:42:07 +00:00
curt
6eaf06957d Dynamic calculation of CG and inertias. 1999-09-28 14:19:34 +00:00
curt
a5e9fd1358 Jon's updates to adjust control gains. 1999-09-11 02:08:31 +00:00
curt
1b45c9ee54 Fiddling around with views, fdm data passing and management to try to be
more sensible so we can do a more reasonable external view.
1999-09-09 00:16:28 +00:00
curt
e9013be4a0 Fixed altitude update bug. 1999-09-08 16:11:09 +00:00
curt
c193021346 Updates to get engine working. 1999-09-07 23:15:45 +00:00
curt
32bab8aa10 Setup a user definable model hertz. 1999-09-01 20:24:54 +00:00
curt
c664ec4e93 Updates from Tony. 1999-08-24 23:17:05 +00:00
curt
efa21a5dd6 Initial revisions. 1999-08-17 21:20:38 +00:00
curt
bfcfbcaa5e Updates from Tony. 1999-08-17 21:18:16 +00:00
curt
f38dcfd995 Updates from Jon. 1999-08-17 21:18:11 +00:00
curt
db1be3a0ce Updates to interface to pass in radians for starting position. 1999-08-17 21:18:04 +00:00
curt
fdbfd9c2f8 Minor tweaks to work around egcs compiler pickiness. 1999-08-12 21:08:37 +00:00
curt
21f888a43f Updates from Tony. 1999-08-08 17:12:33 +00:00
curt
471fe324ff Added a place holder for optionally giving the engine a bit of a boost. 1999-08-08 07:04:11 +00:00
curt
e7751d59f2 Initial revision. 1999-08-07 19:19:14 +00:00
curt
09987296b4 Updates to Tony's c172 model. 1999-08-07 19:18:45 +00:00
curt
a7abe629cf Scaling inputs to JSBsim to get a bit more realistic results. 1999-08-07 18:28:21 +00:00
curt
e6aef49822 Updates to Tony's c172 model. 1999-08-07 18:23:55 +00:00
curt
0bb22cd0a7 Improvements to Tony's c172 model. 1999-07-31 04:57:35 +00:00
curt
aa68d067d0 Updates so that JSBsim can work. 1999-07-31 04:56:13 +00:00
curt
a1b2152d7f Updates from Jon. 1999-07-31 04:55:23 +00:00
curt
bb94a6ef5c Updates contributed by Jon Berndt. 1999-06-28 17:39:20 +00:00
curt
aea253a85c Updated build system to remove DEFS += -DFOO type lines. This doesn't seem
to be supported in recent versions of autoconf.
1999-06-24 20:38:31 +00:00
curt
116e3913ae Updated for both JSBsim and Tony Peden's c172 flight model. 1999-06-21 05:01:31 +00:00
curt
c54a4fe206 Updates to JSBsim from Jon Berndt.
Fixed a typo in hud.cxx.
1999-06-20 04:10:44 +00:00
curt
14a8533f63 Initial revision 1999-06-17 20:07:19 +00:00
Tim Moore
c90db01dc8 source tree reorganization prior to flightgear 0.7
SimGear and TerraGear appear to have been split off at this time.
2009-09-14 14:26:20 +02:00