1
0
Fork 0
Commit graph

2040 commits

Author SHA1 Message Date
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
2f22748275 Fixes from David Megginson for save/restore. 2000-05-19 16:14:37 +00:00
curt
466c7ec5dc Fix so that we don't attempt a phantom trim on the larcsim flight model at
startup.
2000-05-17 03:53:36 +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
90707efd3f Changes by David Megginson. 2000-05-16 18:21:08 +00:00
curt
ed973e8993 Updated hud controls a bit:
"h" toggles between day/night/off
"H" cycles through black/dark/medium/light intensities.
2000-05-15 17:47:50 +00:00
curt
9dc5c9ca22 Instrument panel updates from David Megginson.
- the panel uses much, much less texture memory, and draws much
  faster, at least on my hardware

- there is a wet (magnetic) compass at the top of the panel

- the gyro compass shows true heading again, but don't get used to it:
  we're going to set it up to drift soon

- there are TO/FROM flags on NAV1 and NAV2 (but no GS flag yet)

- the ADF looks a little more realistic (if you can forgive the ugly
  needle)

- when the HUD is not open, the framerate is moved to the right side
  of the screen so that it won't be obscured by the mag compass
2000-05-15 16:33:42 +00:00
curt
7863c607bf Heading bug (and bfi) now deals with magnetic compass heading rather than
true heading.  Internally, the sim (and the autopilot) still runs off of
true heading.
2000-05-14 04:18:12 +00:00
curt
365b26d093 HUD updates/cleanups from Norman Vine. 2000-05-13 00:02:43 +00:00
curt
db89ecfae8 Fixes to ILS approaches ... now takes into consideration actual GS and DME
locations.
2000-05-12 20:07:51 +00:00
curt
109088a84e Updated save file and bfi code from David Megginson. 2000-05-06 21:47:53 +00:00
curt
2fac753991 minor tweaks. 2000-05-04 05:21:50 +00:00
curt
6bc7ed9ba2 Overhaul of the navaid system to increase efficiency, reduce redundancy, and
also properly model the DME.
2000-05-04 01:18:45 +00:00
curt
a975fd77c5 User-visible
- knobs now continue to rotate when you hold down the mouse
- the middle mouse button makes knobs rotate much faster
- there are NAV1, NAV2, and ADF radios that can be tuned using the mouse
- there are standby frequencies for NAV1 and NAV2, and buttons to swap
- there is a crude, rather silly-looking DME, hard-wired to NAV1
- there is a crude, rather silly-looking autopilot that can lock
  the heading (to the bug on the gyro), can lock to NAV1, and can lock
  the current altitude
- the knobs for changing the radials on NAV1 and NAV2 look much better
  and are in the right place
- tuning into an ILS frequency doesn't change the displayed radial for
  NAV1

Code

- I've created a new module, sp_panel.[ch]xx, that constructs the
  default single-prop panel; this works entirely outside of FGPanel,
  so it is possible to construct similar modules for other sorts of
  panels; all code specific to the default panel has been removed from
  panel.cxx
- current_panel is now a pointer
- radiostack.[ch]xx keeps track both of the actual radial and of the
  selected radial (they will differ with ILS); the NAV gauges should
  not spin around automatically to show the actual radial (we need to
  do something similar with the autopilot)
- the panel is initialized fairly early
- make sure that standby frequencies also get initialized
- I've started combining and clipping small textures to save texture
  memory; there's a lot more to do, but at least I've made a start
2000-05-02 18:26:00 +00:00
curt
921beb96d7 First stab at NAV1 and GS hold modes for the autopilot. 2000-04-30 22:21:47 +00:00
curt
b62900e44c Minor autopilot/gui tweaks. 2000-04-30 07:33:11 +00:00
curt
3ecf1b8dce Autopilot "class-ification".
Separated out gui parts of autopilot control from the actual autopilot code.
2000-04-30 06:51:49 +00:00
curt
2aefd15f74 Added getAGL() 2000-04-28 20:08:22 +00:00
curt
418279fdd4 Panel updates from David Megginson. Radials can now be adjusted on the fly
by clicking on the knob on the instrument panel.
2000-04-27 22:45:48 +00:00
curt
949fc00815 MacOS build updates. 2000-04-27 21:57:08 +00:00
curt
ff8e6b9e28 Tweaks to navaid database loading. 2000-04-25 17:33:13 +00:00
curt
b5420977d7 Updates to nav radio stack model ... starting to get to first usable pass. 2000-04-25 04:58:25 +00:00
curt
b23f930aa6 Beginning work on integrating radiostack model into fgfs. 2000-04-25 03:09:26 +00:00
curt
8f21c91edf Moved main.o to beginning of link line.
Initialize navaid databases.
2000-04-24 23:51:26 +00:00
curt
96c20e6532 Added custom joystick client support so that flight gear can read values
being shipped over from a separate joystick server.
2000-04-19 21:22:16 +00:00
curt
d9c7848ed7 Replaced all instances sgMultMat4 with sgPre/PostMultMat4 to avoid bug and
fix discrepancy in plib.
2000-04-04 05:49:05 +00:00
curt
616610a962 Removed all sgMultMat4 in favor of Pre/PostMultMat4. Steve says there is
an error in MultMat4 that isn't found in Pre/Post.  He wants to fix it which
means different versions of plib could work differently from each other.
2000-04-04 05:46:37 +00:00
curt
3b34980556 Updates to simple.[ch]xx to use gdbm to look up airport values. 2000-03-29 20:21:31 +00:00
curt
19d2b1a314 Updated for magvar calculations. 2000-03-29 00:15:58 +00:00
curt
a2f328c8a8 A couple more tweaks to get UIUC flight model stuff to work. 2000-03-23 03:28:54 +00:00
curt
bd969d8e11 tweaks. 2000-03-23 00:14:37 +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
a940c7293e Added Alex's patches for more accurate instrument modeling (compass, vsi,
altitute)
2000-03-21 20:51:03 +00:00
curt
a9f48c0dac Rendering tweaks. 2000-03-17 06:16:15 +00:00
curt
314a1dd9dd Moved src/Astro to src/Ephemeris 2000-03-16 23:19:39 +00:00
curt
84c64c8cc3 Removed dependencies on Astro/solarsystem.*
Pass star and planet data to Sky module.
2000-03-16 23:01:57 +00:00
curt
dc01e3f8d2 tweaks. 2000-03-16 04:23:24 +00:00
curt
7ada12ed09 Updates for ssg solarsystem/sky model. Includes changes to Time, Light, and
initialization sequences.
2000-03-16 04:15:22 +00:00
curt
28f17b1052 Updates for sky rendering. 2000-03-06 23:28:43 +00:00
curt
359b9507b1 Working on drawing sun and sun halo. 2000-03-03 00:07:23 +00:00
curt
02732b23f8 Sun now correctly placed in sky and correctly colored. 2000-03-02 19:20:54 +00:00
curt
f874d4a94f Working on separating out ephemeris code from the actual rendering code
which I am trying to ssg-ify at the same time.
2000-03-02 13:51:31 +00:00
curt
e6d5923ad0 Separating out the Sky rendering as a separate unit and ssg-ifying it. 2000-03-02 03:03:16 +00:00
curt
138863b3e2 Working on skydome ... some actual progress has been made. :-) Still
something goofy with sunrise, sunset effects.
2000-03-01 00:31:35 +00:00
curt
cb071f4e56 Continuing work on ssg-ifying the sky dome. 2000-02-29 17:13:02 +00:00
curt
749462f9bb Make NetworkOLK optional even if compiled in. 2000-02-28 04:16:12 +00:00
curt
c2226f6e34 Added bfi.[ch]xx (Big Flat Interface) to give a consistant access point
to shared state inside Flight Gear.
2000-02-26 18:01:13 +00:00
curt
cc26bb7fe7 Removed all dependencies on <simgear/math/mat3.h> and friends. These are
old routines from SRGP.  Steve's plib/sg.h does a nice job of completely
replacing this (and since plib is already around) and is a nice clean design
so it just makes sense.
2000-02-19 14:29:27 +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
7f9c6d72ab Added a load/save state function contributed by David Megginson. 2000-02-11 22:27:23 +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
fa16790a9b Fixed a comment typo. 2000-01-21 18:01:57 +00:00
curt
e7c6f292a5 The aircraft model used for external views was being included in the height
above terrain check so when the view position and the aircraft model collided
the current altitude kept getting pushed up to compensate, but of course the
aircraft model would get pushed up as well because it tracks the current
aircraft position and orientation.  Thus you had a never ending cycle ...
2000-01-13 20:12:16 +00:00
curt
fd48bdb9f2 Moved Oliver's network stuff to his own subdir: NetworkOLK. 2000-01-12 18:09:35 +00:00
curt
6e14da1e16 Corrected a comment. 2000-01-10 21:07:52 +00:00
curt
871e4e8319 Updates to help work the kinks out of JSBsim. 1999-12-30 17:42:24 +00:00
curt
817279c7a8 Removed libVoronoi.a
Added Ctrl-U key binding to force an instant altitude gain of 1000'.
1999-12-23 19:38:40 +00:00
curt
5c487a7803 Allow JSBsim aircraft model file to be specified from the command line. 1999-12-20 20:26:18 +00:00
curt
cd5ab3222a Added FGFS "Native" I/O protocol. 1999-11-23 05:51:14 +00:00
curt
ed98ee8a31 Tweaked a comment line. 1999-11-20 15:40:15 +00:00
curt
60ac2b36e0 Do a better job of disabling all sound related stuff if --disable-sound is
specified.
1999-11-20 15:39:53 +00:00
curt
65e9aba6dc Added support for parsing socket options. 1999-11-20 15:39:20 +00:00
curt
24caa82715 Cleaning out old code ... 1999-11-19 23:19:51 +00:00
curt
1f66606440 Added two new output formats, PVE and RUL. 1999-11-19 03:03:11 +00:00
curt
1fd9270267 Revamping I/O system. 1999-11-19 02:10:24 +00:00
curt
846ac621a2 Tweaks to my ssg LOS routines and their usage. 1999-11-04 00:41:23 +00:00
curt
1d6675a895 Debug output tweaks. 1999-11-03 23:50:15 +00:00
curt
369f052c7b Clear traversal bit on aircraft model. 1999-11-03 20:58:20 +00:00
curt
7638109583 Better no-texture support contributed by David Megginson. 1999-11-01 19:17:43 +00:00
curt
f9044bc5de Trying to fix automake version problems. 1999-10-30 04:27:21 +00:00
curt
715062e85f Fixed (hopefully) a build problem with newer versions of automake
and autoconf.
1999-10-30 02:37:56 +00:00
curt
4c92fd1418 Added keyboard support for flap control. 1999-10-29 18:09:04 +00:00
curt
a631bd2e55 Add a key mapping (F3) for taking a screen snap shot.
Keep track of and free index arrays that are fed to ssg.
Ssg branch deletion memory leak work around.
1999-10-26 03:45:33 +00:00
curt
29bcf26577 Added cloud puffs as we pass through the cloud layer. 1999-10-23 00:09:26 +00:00
curt
e69c859afd Moved where glBlendFunc() is reset to main.cxx 1999-10-22 17:15:43 +00:00
curt
5c9b04f975 Just a minor tweak. 1999-10-22 01:30:39 +00:00
curt
37220833ed Added Durk's first stab at clouds.
Added Simulator/Clouds/
Durk fixed a problem in gui.cxx with cursor type.
Durk updated his time zone / time-offset command line parameters
Curt added a cheezy fade in/out as we transition through the cloud layer.
  We really need to fog the sky dome, sun, moon, stars as well.
Curt added --enable/disable-clouds and --clouds-asl= to control clouds.
1999-10-22 00:27:49 +00:00
curt
adf5011f80 Fixes to Christian's latest weather submission. 1999-10-21 22:53:12 +00:00
curt
aacffa37d6 Updates to BalloonSim init by Christian Mayer.
Removed old plib include line from the days when plib was rolled in with
  flight gear.
Texture handling tweaks contributed by David Megginson.
1999-10-20 22:18:54 +00:00
curt
0b55a915b4 Wire in the balloon sim. 1999-10-15 22:21:09 +00:00
curt
c0b59ca4b2 Pan view with mouse both side-to-side and up/down from Norman Vine. 1999-10-15 20:43:02 +00:00
curt
c9b58a1e44 Rename screen dump to snap shot.
Updated view enums.
1999-10-15 13:55:44 +00:00
curt
6d733533ba Script was looking for wrong executable name. 1999-10-15 00:11:52 +00:00
curt
c866ba581d Added screen dumping and screen printing (win32) functionality. 1999-10-14 23:46:28 +00:00
curt
eddea671a2 Upgraded to latest weather data base code from Christian Mayer's and make
it the default.
1999-10-14 20:30:54 +00:00
curt
7a5fbf1ba3 Fixed up external view mode so it works once again. 1999-10-14 17:32:34 +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
cecd5685ca Adding magic carpet FDM mode. 1999-10-14 01:53:43 +00:00
curt
c4963be66c First pass at incorporating Christian's BalloonSim. 1999-10-12 03:30:00 +00:00
curt
b86e6ddc11 Updating FGFS <=> FDM interface. 1999-10-11 23:09:07 +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
f00b1f8b83 Various SGI portability tweaks. 1999-10-07 23:08:48 +00:00
curt
f8df262633 Added a simple auto-coordination capability.
Can be enabled/disabled from the command line.
1999-10-06 20:58:57 +00:00
curt
038b68153e Added support for a pilot view offset vector from the center of gravity. 1999-10-04 04:43:09 +00:00
curt
38999ec3e0 "sg-izing" the matrix/vector code so that I can hopefully eventually remove
the older "MAT3" code.
1999-10-04 04:02:10 +00:00
curt
ad7718ff02 Rewriting old mat3 stuff with plib's sg library. 1999-10-03 18:49:39 +00:00
curt
7d08a3c508 Tweaks for greater precision output in PVE format. 1999-10-02 16:39:54 +00:00
curt
780a3c6831 More heave tweaks. 1999-10-01 20:33:06 +00:00
curt
26193c5b19 PVE serial output tweaks.
Other minor tweaks.
1999-10-01 20:07:44 +00:00
curt
cea7b4b335 Try to generate serial output for a motion platform company in California. 1999-09-30 02:59:44 +00:00
curt
b274e7ce4a Some view tweaks. 1999-09-28 22:43:52 +00:00
curt
057fa8d37e Norman's autopilot updates, now serving great circle routes direct to
the center of airports.
1999-09-11 02:07:48 +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
92f7e1123c Added Durks timezone handling changes. 1999-09-07 23:09:43 +00:00
curt
8d903eac1c Patches to allow panel to display.
Allow model_hz to be defined from the command line.
1999-09-03 00:27:48 +00:00
curt
32bab8aa10 Setup a user definable model hertz. 1999-09-01 20:24:54 +00:00
curt
0f6565f764 Patch to allow window resizes. 1999-08-31 23:22:05 +00:00
curt
bbced46d9f Tweaks to fix problems with moon rendering introduced with ssg. 1999-08-15 15:35:07 +00:00
curt
82da518255 minor tweaks 1999-08-14 22:07:15 +00:00
curt
e945d2b761 Christian's new weather subsystem is causing problems with some compilers
so I am allowing it to be #ifdef'd out until the compile problems can be
resolved.
1999-08-12 17:13:44 +00:00
curt
9e3edfb47b Added support for Christian Mayers new weather subsystem.
Added support for david@megginson.com's mouse yoke patch.
Added a flight model acceleration options (controlled by a/A keys.)
1999-08-10 03:44:47 +00:00
curt
1e8b5c8956 Makefile.am: Got rid of -DUSE_SSG
options.cxx: reorder option initializations to match declaration order.
views.cxx: much cleanup of stuff that was depricated by the move to ssg.
           I now use ssg to do all the projection/modelview matrix calculation
           and setup. (mostly)
vies.hxx: also added the view pan offset to the view matrix calcs.
1999-08-08 15:21:54 +00:00
curt
82b41d7db6 Set up the model view matrix exactly as ssg does it before drawing sky, stars
sun, and moon.  I really should do a derived sgLeaf class so that these things
can be drawn within ssgCullandDraw() but this is quicker for now ...
1999-08-08 01:31:30 +00:00
curt
b512e40e79 Cleaning cruft that can be removed now that ssg is taking over. 1999-08-07 23:07:59 +00:00
curt
6b2f7f4e3d Mac portability changes. 1999-08-07 18:24:23 +00:00
curt
def090d631 Return to glider model ... 1999-07-31 05:01:04 +00:00
curt
439779ee36 Tweaks so that Jon's FDM stuff get's initialized better. 1999-07-31 04:58:26 +00:00
curt
8d58f64257 Fixed a tile caching bug. When I was freeing tiles to make room in the
cache, I was only checking currently visible tiles, rather than checking
all the cache entries.
1999-07-25 01:52:36 +00:00
curt
d3b9b645ad ssg and external view tweaks. 1999-07-01 01:17:43 +00:00
curt
0660ea821a Network updates contributed by Oliver Delise. 1999-06-30 20:21:04 +00:00
curt
7a56d332ad Force initial ssgState before doing ssg cull and render pass so that the
lazy state loader get's primed.
1999-06-30 19:16:53 +00:00
curt
9f9f487e2a Added some early support for a cheezy external view of TuX.
'v' toggles internal vs. external view modes.
Add the distance of the bouding radius into the tile's range selector.
1999-06-30 14:35:01 +00:00
curt
35dc68a0d0 Ssg tweaks. 1999-06-30 00:25:13 +00:00
curt
b333a30678 Misc. tweaks. 1999-06-29 17:26:46 +00:00
curt
0ae48876a7 More ssg tweaks. 1999-06-29 14:57:00 +00:00
curt
b67e68b684 FreeBSD tweaks. 1999-06-28 18:19:26 +00:00
curt
aa27214f65 Additional tweaks to fix the ssg texture (state) problems. Tweaked near
and far clip planes.  Adjusted rendering order so menus and hud get drawn
last.
1999-06-28 05:47:02 +00:00
curt
858f17b323 Changes to begin incorporating plib support for managing and rendering the
terrain.
1999-06-28 00:02:52 +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
540849b9c3 Incorporated Oliver's initial networking code. 1999-06-22 21:24:31 +00:00
curt
3895c604ce Borland C++ tweaks.
MacOS/Metrowerks tweaks.
Fix for fgText default constructor.
More ssg fiddling.
Fixed an include problem with client/server tile build tools.
1999-06-20 03:54:57 +00:00
curt
bfe5df5f24 Working on getting ssg integrated. 1999-06-19 04:48:07 +00:00
curt
6e10fd9a05 Fiddling with ssg. 1999-06-18 16:12:17 +00:00
curt
c8501f9b29 Now use plib in native install mode.
Preparations for unstable development version 0.7.0
Some reorganizational changes.
Beginning to test the use of ssg (part of plib)
1999-06-18 03:42:54 +00:00
curt
90655cf54b renamed GLUTkey.* -> keyboard.*
renamed GLUTmain.cxx -> main.cxx
1999-06-17 21:33:39 +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