1
0
Fork 0

Merge branch 'dev' into FMGC

This commit is contained in:
legoboyvdlp R 2020-02-07 18:01:30 +00:00
commit 0743c0e01f
2 changed files with 10 additions and 10 deletions

View file

@ -424,7 +424,7 @@
<current-view> <current-view>
<z-offset-default type="float">80.0</z-offset-default> <z-offset-default type="float">80.0</z-offset-default>
<z-offset-min-m type="float">30.0</z-offset-min-m> <z-offset-min-m type="float">10.0</z-offset-min-m>
<z-offset-max-m type="float">300.0</z-offset-max-m> <z-offset-max-m type="float">300.0</z-offset-max-m>
</current-view> </current-view>

View file

@ -6,24 +6,24 @@ var distance = 0;
var min_dist = 0; var min_dist = 0;
var max_dist = 0; var max_dist = 0;
var canChangeZOffset = 0; var canChangeZOffset = 0;
var decStep = -5; var decStep = -0.5;
var incStep = 5; var incStep = 0.5;
var viewName = "XX"; var viewName = "XX";
var fovZoom = func(d) { var fovZoom = func(d) {
viewName = getprop("sim/current-view/name"); viewName = getprop("sim/current-view/name");
canChangeZOffset = getprop("sim/current-view/type") == "lookat" and viewName != "Tower View" and viewName != "Fly-By View" and viewName != "Chase View" and viewName != "Chase View Without Yaw" and viewName != "Walk View"; canChangeZOffset = getprop("sim/current-view/type") == "lookat" and viewName != "Tower View" and viewName != "Tower View AGL" and viewName != "Fly-By View" and viewName != "Chase View" and viewName != "Chase View Without Yaw" and viewName != "Walk View";
if (getprop("sim/current-view/z-offset-m") <= -50) { if (getprop("sim/current-view/z-offset-m") <= -20) {
decStep = -10; decStep = -2;
} else { } else {
decStep = -5; decStep = -1;
} }
if (getprop("sim/current-view/z-offset-m") < -50) { # Not a typo, the conditions are different if (getprop("sim/current-view/z-offset-m") < -20) { # Not a typo, the conditions are different
incStep = 10; incStep = 2;
} else { } else {
incStep = 5; incStep = 1;
} }
if (d == -1) { if (d == -1) {