1
0
Fork 0
Commit graph

3301 commits

Author SHA1 Message Date
mfranz
c1c86bb8a5 - use <hrule/> and <vrule/> without dummy children
- minor improvements/cosmetics
2007-03-26 15:25:27 +00:00
sydadams
c018eb9ca4 Updated Aerostar....
Aligned hotspots...
Moved kfc200.nas to Instruments-3d where it belongs...
Redoing the kfc200 flightdirector with newer functions (setlisteners) ...still in progress
Updated radios to change standby frequencies instead of selected frequencies....
2007-03-26 03:32:24 +00:00
mfranz
c09c7ac5c6 When loading a dialog, first close it, then remove the whole branch,
then load, and finally open the dialog again if it was open at the
beginning. That way it's easy to edit and to update a Nasal-loaded
XML dialog.
2007-03-25 10:00:53 +00:00
mfranz
7a300fca3e add tutorial loader function for AJ :-) 2007-03-24 23:28:41 +00:00
mfranz
b2fe43808c alining <textarea> and <list> looks nicer 2007-03-24 21:33:23 +00:00
mfranz
2a9993c37e minor adjustment of the <list> box 2007-03-24 21:02:45 +00:00
mfranz
269396c421 - remove tutorial dialogs from gui.nas and create a new XML dialog
$FG_ROOT/gui/dialogs/tutorial.xml. It combines the former selection
  and description dialogs, which makes browsing much more pleasant.
  No more switching back and forth between the two old dialogs. Also,
  the <list> box can handle a bigger number of tutorials than the
  <combo> box could.
- remove comments from the top of tutorial.nas. The documentation is
  now $FG_ROOT/Docs/README.tutorials
2007-03-24 20:56:40 +00:00
sydadams
dae87cdc0b Added conversions to make fuel annunciators work with Yasim AND JSBsim... 2007-03-24 19:23:09 +00:00
mfranz
b47f8f439d change <marker><[xyz]> to <marker><[xyz]-m> (for consistency with the
animation syntax, and to make tutorials noisier and harder to read :-)
2007-03-24 18:10:33 +00:00
mfranz
706483bc27 tutorial README 2007-03-24 18:08:38 +00:00
mfranz
44305607b3 - s,/sim/tutorial,/sim/tutorials,
- add a <delay> property that can be used at top level (for the default),
  and in <init> and <step>  (Time in seconds in which the main loop should
  run again.)
- fix initialization bug
2007-03-24 13:39:01 +00:00
mfranz
7f375cf76c s,/sim/tutorial,/sim/tutorials, 2007-03-24 13:32:15 +00:00
mfranz
c0290713b6 slider effect can be modulated by holding modifier keys down:
Ctrl -> coarse, Shift -> fine
2007-03-23 23:13:59 +00:00
mfranz
25e61dad0d AJ MacLEOD: replace obsolete and broken throttle bindings by controls
wrapper call

mf: I didn't find a trace of that /autopilot/controls-overrides/ property
    in the fgfs source code and most of the data package. There are regular
    complaints in the IRC channel about numpad keys 9 & 3 not working.
2007-03-23 20:03:28 +00:00
mfranz
10093284ba If text contains "{display|voice}" groups, skip the delimiters and discard
the "voice" part. It's no longer possible to display the three letters {|}
in screen message at the moment, but they aren't overly useful. We may want
to support escaping in the future, if necessary.
2007-03-23 15:56:34 +00:00
mfranz
03ba6e2b80 - now *really* disable marker on stopTutorial()
- add target heading
2007-03-23 10:58:15 +00:00
mfranz
9f3160542f - use en1_mbrola for the instructor: it's the clearest voice and, unlike
us3_mbrola doesn't lack some phonemes, causing interrupted messages
- use us2_mbrola for the pilot (seems to be rather complete, too;
  pity that the female voice us1_mbrola sounds so ugly :-)
2007-03-23 10:56:54 +00:00
mfranz
4762fb1db9 use self-closing tag instead of empty tags 2007-03-22 22:44:00 +00:00
mfranz
8a288f59c2 calculate "Estimated Time of Arrival" (ETA) in minutes for each <target>.
Negative values show that you are actually moving away. To avoid division
by zero, a small value is always added to speed. So, if you aren't moving
at all, you still get a non-infinity, but huge ETA.
2007-03-22 22:10:55 +00:00
mfranz
ef9caa1310 - <targets> can have arbitrary names
- <set> pair: allow to set <property> from <value> or second <property>
- support <set> pairs in <end>, too. This can be used to restore values.
- add optional <view> to <init>/<step>/<exit>/<end>. This is meant for
  cockpit tutorials. See the Lightning's startup tutorial for an example.
2007-03-22 17:08:05 +00:00
mfranz
9a0600b150 - replace "sprintf hack" by real sprintf
- add view manager for saving/restoring and moving/interpolating view
  axes & fov to absolute values. This is used for cockpit tutorials in
  $FG_ROOT/Nasal/tutorial.nas
2007-03-22 16:22:41 +00:00
sydadams
b900685c73 Amplified feeble turboprop sound.
Realigned fuel display ... again
Updated broken material animations....
Updated sounds
2007-03-22 07:20:57 +00:00
mfranz
0606fa3703 make condition() slightly faster and prettier (or not) 2007-03-21 18:37:06 +00:00
mfranz
54693a663f - fix <audio> bug
- check a step's errors in random order (otherwise a retarded instructor
  bitches minutes about the climb angle, and only then notices that the
  heading is totally wrong ;-) ... mabye simple scheduling would be better
- document embedded <nasal>
- start of <view> support
2007-03-21 17:31:26 +00:00
mfranz
b482f5d852 - add <target> feature: for each defined <target> lon/lat pair, corresponding
entries /sim/tutorial/targets/target[n]/{distance-m,direction-deg} are
  provided and kept up-to-date. A direction angle of 0 means that the target
  is straight ahead, 90 means it's to the right (3 o'clock) 179 means the
  target is right behind, etc.

- everywhere where <message> and/or <audio> is supported, there can be more
  of those entries, in which case one is randomly chosen. This is to make
  the instructions less monotone:

  <message>You are too fast. Fly at 100 knots.</message>
  <message>Not so fast. 100 knots are more than enough.</message>
  <message>Slower! Idiot!</message>                                  ;-)
2007-03-21 00:21:51 +00:00
mfranz
20fa1233fb better output coords with tenth of mm 2007-03-20 21:53:25 +00:00
mfranz
3fe72de020 remove code that is now in $FG_ROOT/Nasal/geo.nas 2007-03-20 20:57:58 +00:00
mfranz
80913de2e0 code from ufo.nas (used by ufo.nas and tutorial.nas)
- simple geo coordinates class: geo.Coord with methods to set/get single
  components, to apply distance/course and the get distance/course to other
  coords
- functions that return click and aircraft position as geo.Coord
- function that returns tile_path for given lon/lat
- function that returns normalized angle (0 <= angle < 360)
2007-03-20 20:54:52 +00:00
mfranz
cf16f4de88 support <model> definition in a tutorial file, so that tutorials can place
static scenery objects, like air-racing pylons, etc.
2007-03-20 17:32:28 +00:00
mfranz
1e23cd6efc Anders GIDENSTAM: update 2007-03-20 17:05:23 +00:00
mfranz
9e04231685 adapt for tutorial.nas changes 2007-03-20 16:26:00 +00:00
mfranz
6d20159866 - trim/sanitize screen messages, so that tabs aren't displayed as
question marks
- make listeners one-shot (saves a couple of bytes of RAM :-)
2007-03-20 16:25:11 +00:00
mfranz
7319f5e772 better condition() comment & cosmetics 2007-03-20 16:23:23 +00:00
mfranz
dcd471b63d - add dialog wrapper, so that "tutorial.dialog()" typed into the
Help->Nasal-Console opens the adjustment dialog
- reset Nasal namespace for emebedded Nasal for every tutorial
- rename <voice> to <audio>  (in the hope that this won't be mixed up
  with Festival voice synthesis; should we call it <audio-sample>?)
- rename <instruction> to <message> for consistency reasons, so there
  are now <step><message>s, <error><message>s, and <end><message>s
2007-03-20 16:22:26 +00:00
mfranz
318c08f9c7 - reverse longitudinal axis
- add reset button (moves cursor back to origin)
- make Ctrl/Shift scale movements (coarser/finer)
2007-03-20 16:17:47 +00:00
mfranz
a7d30fa76e fix broken and inconsistent indentation 2007-03-20 00:07:00 +00:00
mfranz
83c6911af2 adapt to tutorial.nas changes 2007-03-19 23:47:40 +00:00
mfranz
7cb5ad477c major overhaul/part I:
- add <marker> support (blinking magenta circle to point to switches etc.)
- use "real" conditions instead of tutorial-only ones
- list of <error> with <message> and <condition> children, instead
  of one <error> group with <check> items (necessary because of <condition>)
- only one <exit> (use <condition><and>... to define a set
- rename properties <prop><val><msg> to <property><value><message>
  (consistency with other systems)
- <end><message>/<voice> instead of <endtext> and <endtext-voice> etc.
- add <nasal> support everywhere, with separate namespace and predefined
  tutorial functions in it (currently only say(), next(), previous())
- make <timeofday> property actually work

TODO:
- more cleanup/re-organization
- add optional <view> group, to direct user view to switches (for startup
  tutorials etc.)

2-space indentation changed to tabs (with Stuarts permission), and braces
to K&R style (rationale on request :-)
2007-03-19 23:46:50 +00:00
mfranz
d4863a1001 adjustment dialog for tutorial markers 2007-03-19 23:29:54 +00:00
mfranz
caea872fbe Anders GIDENSTAM: X36 gamport js driver 2007-03-19 21:06:17 +00:00
mfranz
5b812986fb undefined <condition>s are "true" 2007-03-19 18:17:05 +00:00
mfranz
b2f57eab81 boolify <property> result 2007-03-18 15:49:11 +00:00
mfranz
0b4e6f934e add a props.condition(property) command that evaluates a property branch
as <condition> according to the rules set out in $FG_ROOT/Docs/README.condition
2007-03-18 13:57:32 +00:00
mfranz
5f7104ac8a revert condition() patch. This can as easily be done in pure Nasal. 2007-03-18 10:52:08 +00:00
sydadams
2cdd9418d4 Added a Flightdirector Mode checkbox to the Autopilot dialog (Autopilot on / off) for the Primus 1000 system.... 2007-03-18 04:18:20 +00:00
mfranz
d1c4bcea85 condition(property) wrapper for the _condition function.
See $FG_ROOT/Docs/README.condition
2007-03-17 15:59:39 +00:00
sydadams
a6496bbf0b Added a nasal file to eliminate the need for adding new properties for each aircraft that uses the Primus 1000 system 2007-03-17 07:55:16 +00:00
mfranz
ba429a7110 rename default.xml to classic.xml (who says that this needs to be the
default? :-)
2007-03-16 10:47:14 +00:00
sydadams
f468880ad5 Updated Primus1000 PFD flightdirector bars to use autopilot properties in passive mode
Updated CitationX autopilot....
Autopilot is in flightdirector mode by default...
Until instruments are created , enable autopilot by setting "/autopilot/locks/passive-mode" to false
2007-03-16 05:48:22 +00:00
sydadams
970cb27b7b Added the missing animations to the EICAS (for the Citation X) 2007-03-12 01:59:13 +00:00