fly/fgdata
1
0
Fork 0
Code Activity

fix lookat() method (didn't consider unmanaged view "goals")

Browse source
This commit is contained in:
mfranz 2006-12-10 23:09:42 +00:00
parent bfacf76538
commit ddc4b4c8e5
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Nasal/dynamic_view.nas
View file

@ -71,6 +71,11 @@ ViewAxis = {
add_offset : func { add_offset : func {
me.prop.setValue(me.prop.getValue() + me.applied_offset); me.prop.setValue(me.prop.getValue() + me.applied_offset);
}, },
sub_offset : func {
var raw = me.prop.getValue() - me.applied_offset;
me.prop.setValue(raw);
return raw;
},
apply : func(v) { apply : func(v) {
var raw = me.prop.getValue() - me.applied_offset; var raw = me.prop.getValue() - me.applied_offset;
me.applied_offset = v; me.applied_offset = v;
@ -152,11 +157,22 @@ ViewManager = {
}, },
lookat : func(heading = nil, pitch = nil) { lookat : func(heading = nil, pitch = nil) {
if (heading != nil and pitch != nil) { if (heading != nil and pitch != nil) {
if (!me.lookat_active) {
me.save_heading = me.heading_axis.sub_offset();
me.save_pitch = me.pitch_axis.sub_offset();
me.save_roll = me.roll_axis.sub_offset();
}
me.lookat_active = 1; me.lookat_active = 1;
me.heading_axis.apply(heading); me.heading_axis.prop.setDoubleValue(heading);
me.pitch_axis.apply(pitch); me.pitch_axis.prop.setDoubleValue(pitch);
me.roll_axis.apply(0); me.roll_axis.prop.setDoubleValue(0);
} else { } else {
if (me.lookat_active) {
me.heading_axis.prop.setDoubleValue(me.save_heading);
me.pitch_axis.prop.setDoubleValue(me.save_pitch);
me.roll_axis.prop.setDoubleValue(me.save_roll);
me.add_offset();
}
me.lookat_active = 0; me.lookat_active = 0;
me.heading_axis.apply(me.heading_offset); me.heading_axis.apply(me.heading_offset);
me.pitch_axis.apply(me.pitch_offset); me.pitch_axis.apply(me.pitch_offset);