fly/fgdata
1
0
Fork 0
Code Activity

- make stepView() read the <enabled> flag as bool

Browse source 
- some more 'var', as usual
This commit is contained in:
mfranz 2007-12-13 20:16:20 +00:00
parent f0cd9efc9f
commit c96fd4b089
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Nasal/view.nas
View file

@ -14,10 +14,10 @@
# mul^steps = max/min # mul^steps = max/min
# steps * ln(mul) = ln(max/min) # steps * ln(mul) = ln(max/min)
# mul = exp(ln(max/min) / steps) # mul = exp(ln(max/min) / steps)
STEPS = 40; var STEPS = 40;
ACUITY = 1/60; # Maximum angle subtended by one pixel (== 1 arc minute) var ACUITY = 1/60; # Maximum angle subtended by one pixel (== 1 arc minute)
max = min = mul = 0; var max = var min = var mul = 0;
calcMul = func { var calcMul = func {
max = 120; # Fixed at 120 degrees max = 120; # Fixed at 120 degrees
min = getprop("/sim/startup/xsize") * ACUITY; min = getprop("/sim/startup/xsize") * ACUITY;
mul = math.exp(math.ln(max/min) / STEPS); mul = math.exp(math.ln(max/min) / STEPS);
@ -26,9 +26,9 @@ calcMul = func {
## ##
# Handler. Increase FOV by one step # Handler. Increase FOV by one step
# #
increase = func { var increase = func {
calcMul(); calcMul();
val = fovProp.getValue() * mul; var val = fovProp.getValue() * mul;
if(val == max) { return; } if(val == max) { return; }
if(val > max) { val = max } if(val > max) { val = max }
fovProp.setDoubleValue(val); fovProp.setDoubleValue(val);
@ -38,9 +38,9 @@ increase = func {
## ##
# Handler. Decrease FOV by one step # Handler. Decrease FOV by one step
# #
decrease = func { var decrease = func {
calcMul(); calcMul();
val = fovProp.getValue() / mul; var val = fovProp.getValue() / mul;
fovProp.setDoubleValue(val); fovProp.setDoubleValue(val);
gui.popupTip(sprintf("FOV: %.1f%s", val, val < min ? " (overzoom)" : "")); gui.popupTip(sprintf("FOV: %.1f%s", val, val < min ? " (overzoom)" : ""));
} }
@ -81,7 +81,7 @@ var stepView = func(step, force = 0) {
n = size(views) - 1; n = size(views) - 1;
elsif (n >= size(views)) elsif (n >= size(views))
n = 0; n = 0;
if (force or (var e = views[n].getNode("enabled")) == nil or e.getValue()) if (force or (var e = views[n].getNode("enabled")) == nil or e.getBoolValue())
break; break;
} }
setprop("/sim/current-view/view-number", n); setprop("/sim/current-view/view-number", n);
@ -103,17 +103,17 @@ var indexof = func(name) {
## ##
# Standard view "slew" rate, in degrees/sec. # Standard view "slew" rate, in degrees/sec.
# #
VIEW_PAN_RATE = 60; var VIEW_PAN_RATE = 60;
## ##
# Pans the view horizontally. The argument specifies a relative rate # Pans the view horizontally. The argument specifies a relative rate
# (or number of "steps" -- same thing) to the standard rate. # (or number of "steps" -- same thing) to the standard rate.
# #
panViewDir = func(step) { var panViewDir = func(step) {
if (getprop("/sim/freeze/master")) if (getprop("/sim/freeze/master"))
prop = "/sim/current-view/heading-offset-deg"; var prop = "/sim/current-view/heading-offset-deg";
else else
prop = "/sim/current-view/goal-heading-offset-deg"; var prop = "/sim/current-view/goal-heading-offset-deg";
controls.slewProp(prop, step * VIEW_PAN_RATE); controls.slewProp(prop, step * VIEW_PAN_RATE);
} }
@ -122,11 +122,11 @@ panViewDir = func(step) {
# Pans the view vertically. The argument specifies a relative rate # Pans the view vertically. The argument specifies a relative rate
# (or number of "steps" -- same thing) to the standard rate. # (or number of "steps" -- same thing) to the standard rate.
# #
panViewPitch = func(step) { var panViewPitch = func(step) {
if (getprop("/sim/freeze/master")) if (getprop("/sim/freeze/master"))
prop = "/sim/current-view/pitch-offset-deg"; var prop = "/sim/current-view/pitch-offset-deg";
else else
prop = "/sim/current-view/goal-pitch-offset-deg"; var prop = "/sim/current-view/goal-pitch-offset-deg";
controls.slewProp(prop, step * VIEW_PAN_RATE); controls.slewProp(prop, step * VIEW_PAN_RATE);
} }