1
0
Fork 0
Commit graph

3633 commits

Author SHA1 Message Date
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
sydadams
cd549a4e15 xml file cleanup (indentation) preparing to update Primus 2000 EICAS 2007-03-11 23:20:36 +00:00
sydadams
fc50ad8874 removed 2 png files 2007-03-11 21:22:26 +00:00
sydadams
22d64ce7c3 minor xml file cleanup 2007-03-11 21:21:04 +00:00
ehofman
64716222e4 Add a small ACMS playback example 2007-03-09 08:14:13 +00:00
martin
5d22ae28a2 While I'm there .... 2007-03-02 21:43:45 +00:00
martin
a01b7797a8 Remove references to PLIB as a scene graph. 2007-03-02 21:41:04 +00:00
martin
28ad6984fa Reagan Thomas:
I came upon the TODO asking for illustrations in the 3D Aircraft Models
HOWTO and thought "that's something I can do now!" :)

Merged into model howto by Ron Jensen.
2007-03-02 21:30:35 +00:00
mfranz
813988f718 Csaba HALASZ: fix dme property name 2007-03-01 17:39:52 +00:00
mfranz
780222aa60 ufo-editor: mention multi-selection and changed key def 2007-02-28 17:38:12 +00:00
mfranz
b887d8b253 - add m-key to <help> section
- improve key descriptions
2007-02-27 23:03:32 +00:00
mfranz
e959633725 s/cursor/marker/ and put the marker toggle function on the m-key. It isn't
a cursor, after all, and the term "cursor" is already used for the startup
model. That one should really be called "model", but can't, because this is
already used for the ufo 3D model property ... sigh.   :-]
2007-02-27 22:56:22 +00:00
mfranz
6bba354b30 - add marker for active object (toggle with c-key)
- make space-key toggle the model dialog for easier access  (was m-key)
- fix Coord class bug
2007-02-27 15:39:49 +00:00
mfranz
628a000472 distance scaling doesn't work too well for heading 2007-02-26 19:15:26 +00:00
mfranz
490ed46d89 - allow selection and manipulation of multiple objects
- replace lon/lat adjustment with more predictable nearer/farther/left/right
  adjustment (i.e. movements relative to the UFO position)
- add key bindings to move objects
2007-02-26 17:57:55 +00:00
mfranz
ad8048627d add Dialog.namespace() method, which returns the XML dialog's namespace
if the dialog is open and contains embedded <nasal>, or nil otherwise.
This can be used to call dialog functions.
2007-02-26 11:00:04 +00:00
mfranz
3079726bda move dialogs from ufo.nas into dialog XML files 2007-02-24 19:48:02 +00:00
mfranz
2987f9660f let Shift-Space open property browser 2007-02-24 10:16:26 +00:00
mfranz
4ee7b32fa1 a more modern, electronic overspeed and alarm sound 2007-02-24 09:09:31 +00:00