fly/fgdata
1
0
Fork 0
Code Activity

Removed Model View so that Tower View AGL doesn't alter view numbers.

Browse source 
Due to Nasal/view.nas making a sequential copy of views, inserting new view
number 8 for Tower View AGL broke custom views, e.g. for aircraft 777).

We no longer require Model View (it's identical to Helicopter view now), so
this way we can have Tower View AGL without altering sequential view numbers.
This commit is contained in:
Julian Smith 2019-07-20 22:01:05 +01:00
parent 3738d84d7b
commit c80059ba53
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Nasal/view.nas
View file

@ -255,7 +255,7 @@ var manager = {
# this allows Tower View AGL to work on aircraft that don't
# know about it but need non-zero target-*-offset-m values
# to centre the view on the middle of the aircraft.
if (i==2 or i==3 or i==5 or i==7 or i==8) {
if (i==2 or i==3 or i==5 or i==7) {
set_default(helicopter_view, "config/target-x-offset-m", viewnode);
set_default(helicopter_view, "config/target-y-offset-m", viewnode);
set_default(helicopter_view, "config/target-z-offset-m", viewnode);
@ -839,7 +839,7 @@ var fdm_init_listener = _setlistener("/sim/signals/fdm-initialized", func {
var zoffset = nil;
foreach (var v; views) {
var index = v.getIndex();
if (index > 8 and index < 100) {
if (index > 7 and index < 100) {
globals["view"] = nil;
die("\n***\n*\n* Illegal use of reserved view index "
~ index ~ ". Use indices >= 100!\n*\n***");

12
defaults.xml
View file

@ -750,18 +750,6 @@ Started September 2000 by David Megginson, david@megginson.com
<default-field-of-view-deg type="double">55.0</default-field-of-view-deg>
</config>
</view>
<view>
<name>Model View</name>
<enabled type="bool" userarchive="y">true</enabled>
<type>lookat</type>
<config>
<from-model type="bool">false</from-model>
<from-model-idx type="int">0</from-model-idx>
<eye-heading-deg-path>/orientation/true-heading-deg</eye-heading-deg-path>
<at-model type="bool">true</at-model>
<z-offset-m alias="/sim/chase-distance-m"/>
</config>
</view>
<view>
<name>Tower View AGL</name>
<enabled type="bool" userarchive="y">true</enabled>