fly/fgdata
1
0
Fork 0
Code Activity

- add <target> feature: for each defined <target> lon/lat pair, corresponding

Browse source 
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>                                  ;-)
This commit is contained in:
mfranz 2007-03-21 00:21:51 +00:00
parent 20fa1233fb
commit b482f5d852
1 changed files with 85 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
Nasal/tutorial.nas
View file

@ -32,6 +32,11 @@
# <pitch-deg> # <pitch-deg>
# <roll-deg # <roll-deg
# #
# <targets>
# <target> - the tutorial will always keep properties
# <longitude-deg> /sim/tutorial/targets/target[*]/{direction-deg,distance-m}
# <latitude-deg> up-to-date for each <target>
#
# <init> - Optional: Initialization section consist of one or more # <init> - Optional: Initialization section consist of one or more
# set nodes: # set nodes:
# <set> # <set>
@ -41,7 +46,7 @@
# <step> - Tutorial step - a segment of the tutorial, consisting of # <step> - Tutorial step - a segment of the tutorial, consisting of
# the following: # the following:
# <message> - Text instruction displayed when the tutorial reaches # <message> - Text instruction displayed when the tutorial reaches
# this step, and when neither the exit nor any error # this step, and when neither the exit nor any error.
# criteria have been fulfilled # criteria have been fulfilled
# <audio> - Optional: wav filename to play when displaying # <audio> - Optional: wav filename to play when displaying
# instruction # instruction
@ -58,7 +63,12 @@
# <end> # <end>
# <message>> - Optional: Text to display when the tutorial exits the last step. # <message>> - Optional: Text to display when the tutorial exits the last step.
# <audio> - Optional: wav filename to play when the tutorial exits the last step # <audio> - Optional: wav filename to play when the tutorial exits the last step
#
#
# NOTE: everywhere where <message> and/or <audio> is supported there can be
# more than one <message> or <audio> entry defined, in which case one
# is randomly chosen.
#
# #
# GLOBAL VARIABLES # GLOBAL VARIABLES
# #
@ -173,25 +183,10 @@ var stepTutorial = func {
var voice = nil; var voice = nil;
var message = nil; var message = nil;
# If we've reached the end of the tutorial, simply indicate and exit
if (current_step >= size(tutorial.getChildren("step"))) { if (current_step >= size(tutorial.getChildren("step"))) {
message = "Tutorial finished."; # end of the tutorial
say_message(tutorial.getNode("end"), "Tutorial finished.");
var end = tutorial.getNode("end"); say_message(nil, "Deviations: " ~ num_errors);
if (end != nil) {
var m = end.getNode("message");
if (m != nil) {
message = m.getValue();
}
var v = end.getNode("audio");
if (v != nil) {
voice = v.getValue();
}
run_nasal(end);
}
say(message, voice);
say("Deviations: " ~ num_errors);
is_running(0); is_running(0);
return; return;
} }
@ -199,24 +194,9 @@ var stepTutorial = func {
var step = tutorial.getChildren("step")[current_step]; var step = tutorial.getChildren("step")[current_step];
set_cursor(step); set_cursor(step);
var instr = step.getChild("message");
message = instr != nil ? instr.getValue() : "Tutorial step " ~ current_step;
if (!num_step_runs) { if (!num_step_runs) {
# If this is the first time we've encountered this step : # first time we've encountered this step
# - Set any values required say_message(step, "Tutorial step " ~ current_step);
# - Display any messages
# - Play any instructions.
#
# We then do not go through the error or exit processing, giving the user
# time to react to the instructions.
var v = step.getChild("audio");
if (v != nil) {
voice = v.getValue();
}
say(message, voice);
set_properties(step); set_properties(step);
num_step_runs += 1; num_step_runs += 1;
@ -224,47 +204,30 @@ var stepTutorial = func {
return; return;
} }
set_targets(tutorial.getNode("targets"));
run_nasal(step); run_nasal(step);
var error = 0;
# Check for error conditions # Check for error conditions
foreach (var e; step.getChildren("error")) { foreach (var e; step.getChildren("error")) {
if (props.condition(e.getNode("condition"))) { if (props.condition(e.getNode("condition"))) {
error = 1;
num_errors += 1; num_errors += 1;
run_nasal(e); run_nasal(e);
say_message(e);
var m = e.getNode("message"); return settimer(stepTutorial, STEP_INTERVAL);
if (m != nil) {
message = m.getValue();
var v = e.getChild("audio");
voice = v != nil ? v.getValue() : nil;
}
} }
} }
# Check for exit condition, but only if we didn't hit any errors
if (!error) {
var e = step.getNode("exit"); var e = step.getNode("exit");
if (e != nil) { if (e != nil) {
if (props.condition(e.getNode("condition"))) { if (!props.condition(e.getNode("condition"))) {
return settimer(stepTutorial, STEP_INTERVAL);
}
run_nasal(e); run_nasal(e);
current_step += 1;
num_step_runs = 0;
return settimer(stepTutorial, EXIT_INTERVAL);
}
} else {
current_step += 1;
num_step_runs = 0;
return settimer(stepTutorial, EXIT_INTERVAL);
}
} }
# Display the resulting message and wait to go around again. current_step += 1;
say(message, voice, error); num_step_runs = 0;
settimer(stepTutorial, STEP_INTERVAL); return settimer(stepTutorial, EXIT_INTERVAL);
} }
@ -288,23 +251,48 @@ var set_properties = func(node) {
} }
var set_targets = func(node) {
node != nil or return;
var dest = props.globals.getNode("/sim/tutorial/targets", 1);
var aircraft = geo.aircraft_position();
var hdg = heading.getValue() + slip.getValue();
foreach (var t; node.getChildren("target")) {
var lon = t.getNode("longitude-deg");
var lat = t.getNode("latitude-deg");
if (lon == nil or lat == nil) {
die("target coords not defined");
}
var target = geo.Coord.new().set_lonlat(lon.getValue(), lat.getValue());
var dist = int(aircraft.distance_to(target));
var angle = geo.normdeg(aircraft.course_to(target) - hdg);
if (angle >= 180) {
angle -= 360;
}
var d = dest.getChild("target", t.getIndex(), 1);
d.getNode("distance-m", 1).setDoubleValue(dist);
d.getNode("direction-deg", 1).setDoubleValue(angle);
}
}
var models = []; var models = [];
var set_models = func(node) { var set_models = func(node) {
remove_models(); remove_models();
node != nil or return; node != nil or return;
var manager = props.globals.getNode("/models", 1); var manager = props.globals.getNode("/models", 1);
foreach (var src; node.getChildren("model")) { foreach (var src; node.getChildren("model")) {
var i = 0; var i = 0;
while (i += 1) { for (; 1; i += 1) {
if (manager.getChild("model", i, 0) == nil) { if (manager.getChild("model", i, 0) == nil) {
break; break;
} }
} }
var dest = manager.getChild("model", i, 1); var dest = manager.getChild("model", i, 1);
props.copy(src, dest); props.copy(src, dest);
dest.getNode("load", 1); # this make the modelmgr load the model dest.getNode("load", 1); # makes the modelmgr load the model
dest.removeChildren("load"); dest.removeChildren("load");
append(models, dest); append(models, dest);
} }
@ -356,21 +344,36 @@ var is_running = func(which = nil) {
# Output the message and optional sound recording. # Output the message and optional sound recording.
# #
var lastmsgcount = 0; var lastmsgcount = 0;
var say = func(msg, snd = nil, error = 0) { var say_message = func(node, default = nil) {
var msg = default;
var audio = nil;
var error = 0;
if (node != nil) {
error = node.getName() == "error";
var m = node.getChildren("message");
if (size(m)) {
msg = m[rand() * size(m)].getValue();
}
var a = node.getChildren("audio");
if (size(a)) {
audio = a[rand() * size(m)].getValue();
}
}
var lastmsg = getprop("/sim/tutorial/last-message"); var lastmsg = getprop("/sim/tutorial/last-message");
if (msg != lastmsg or (error == 1 and lastmsgcount == 1)) { if (msg != lastmsg or (error == 1 and lastmsgcount == 1)) {
# Error messages are only displayed every 10 seconds (2 iterations) # Error messages are only displayed every 10 seconds (2 iterations)
# Other messages are only displayed if they change # Other messages are only displayed if they change
if (snd == nil) { if (audio != nil) {
# Simply set to the co-pilot channel. TTS is picked up automatically. var prop = { path : audio_dir, file : audio };
setprop("/sim/messages/copilot", msg);
} else {
# Play the audio, and write directly to the screen-logger to avoid
# any tts being sent to festival.
var prop = { path : audio_dir, file : snd };
fgcommand("play-audio-message", props.Node.new(prop)); fgcommand("play-audio-message", props.Node.new(prop));
screen.log.write(msg, 1, 1, 1); screen.log.write(msg, 1, 1, 1);
} else {
setprop("/sim/messages/copilot", msg);
} }
setprop("/sim/tutorial/last-message", msg); setprop("/sim/tutorial/last-message", msg);
@ -398,7 +401,7 @@ var run_nasal = func(node) {
# #
var init_nasal = func { var init_nasal = func {
globals.__tutorial = { globals.__tutorial = {
say : say, #say : say,
next : func { current_step += 1; num_step_runs = 0 }, next : func { current_step += 1; num_step_runs = 0 },
previous : func { previous : func {
if (current_step > 0) { if (current_step > 0) {
@ -416,8 +419,12 @@ var dialog = func {
var marker = nil; var marker = nil;
var heading = nil;
var slip = nil;
_setlistener("/sim/signals/nasal-dir-initialized", func { _setlistener("/sim/signals/nasal-dir-initialized", func {
marker = props.globals.getNode("/sim/model/marker", 1); marker = props.globals.getNode("/sim/model/marker", 1);
heading = props.globals.getNode("/orientation/heading-deg", 1);
slip = props.globals.getNode("/orientation/side-slip-deg", 1);
}); });