fly/fgdata
1
0
Fork 0
Code Activity

Address Melchior's concern about view prediction depending on a particular

Browse source 
aircraft system, rather than "core" data.

Fix a long standing annoyance (for me anyway) when the fly-by-view is first
instantiated, it never put a point forward very far so the first transtion
came very quickly and abruptly.  Improve the forward prediction based on
ground speed and time when the view is reset (or switched to.)  I like this
a lot better personally.
This commit is contained in:
Curtis L. Olson 2011-01-18 11:47:15 -06:00
parent 5c54690bb0
commit 1f4371245b
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Nasal/view.nas
View file

@ -252,8 +252,9 @@ var fly_by_view_handler = {
me.latN = props.globals.getNode("/sim/viewer/latitude-deg", 1); me.latN = props.globals.getNode("/sim/viewer/latitude-deg", 1);
me.lonN = props.globals.getNode("/sim/viewer/longitude-deg", 1); me.lonN = props.globals.getNode("/sim/viewer/longitude-deg", 1);
me.altN = props.globals.getNode("/sim/viewer/altitude-ft", 1); me.altN = props.globals.getNode("/sim/viewer/altitude-ft", 1);
# me.hdgN = props.globals.getNode("/orientation/heading-deg", 1); me.vnN = props.globals.getNode("/velocities/speed-north-fps", 1);
me.hdgN = props.globals.getNode("/instrumentation/gps/indicated-track-true-deg", 1); me.veN = props.globals.getNode("/velocities/speed-east-fps", 1);
me.hdgN = props.globals.getNode("/orientation/heading-deg", 1);
setlistener("/sim/signals/reinit", func(n) { n.getValue() or me.reset() }); setlistener("/sim/signals/reinit", func(n) { n.getValue() or me.reset() });
setlistener("/sim/crashed", func(n) { n.getValue() and me.reset() }); setlistener("/sim/crashed", func(n) { n.getValue() and me.reset() });
@ -267,21 +268,37 @@ var fly_by_view_handler = {
}, },
reset: func { reset: func {
me.chase = -getprop("/sim/chase-distance-m"); me.chase = -getprop("/sim/chase-distance-m");
me.course = me.hdgN.getValue(); # me.course = me.hdgN.getValue();
var vn = me.vnN.getValue();
var ve = me.veN.getValue();
me.course = (0.5*math.pi - math.atan2(vn, ve))*R2D;
me.last = geo.aircraft_position(); me.last = geo.aircraft_position();
me.setpos(1); me.setpos(1);
me.dist = 20; # me.dist = 20;
}, },
setpos : func(force = 0) { setpos : func(force = 0) {
var pos = geo.aircraft_position(); var pos = geo.aircraft_position();
var vn = me.vnN.getValue();
var ve = me.veN.getValue();
var dist = 0.0;
if ( force ) {
# predict distance based on speed
var mps = math.sqrt( vn*vn + ve*ve ) * FT2M;
dist = mps * 3.5; # 3.5 seconds worth of travel
} else {
# use actual distance
dist = me.last.distance_to(pos);
}
# check if the aircraft has moved enough # check if the aircraft has moved enough
var dist = me.last.distance_to(pos);
if (dist < 1.7 * me.chase and !force) if (dist < 1.7 * me.chase and !force)
return 1.13; return 1.13;
# "predict" and remember next aircraft position # "predict" and remember next aircraft position
var course = me.hdgN.getValue(); # var course = me.hdgN.getValue();
var course = (0.5*math.pi - math.atan2(vn, ve))*R2D;
var delta_alt = (pos.alt() - me.last.alt()) * 0.5; var delta_alt = (pos.alt() - me.last.alt()) * 0.5;
pos.apply_course_distance(course, dist * 0.8); pos.apply_course_distance(course, dist * 0.8);
pos.set_alt(pos.alt() + delta_alt); pos.set_alt(pos.alt() + delta_alt);