fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'next' into canvas-livery

Browse source
This commit is contained in:
fly 2021-05-15 18:04:02 +00:00
commit fd8557d53b
80 changed files with 100384 additions and 80678 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
AI/Aircraft/767/76Y-ANA.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0"?>
<PropertyList include="76Y-main.xml">
<texture-path>Textures/ANA</texture-path>
<!-- Hide Winglets -->
<animation>
<type>select</type>
<object-name>Winglets</object-name>
<condition>
<equals>
<property>/sim/signals/fdm-initialized</property>
<value>1</value>
</equals>
</condition>
</animation>
</PropertyList>

BIN
AI/Aircraft/767/Textures/ANA/76Y-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 63 KiB

9
AI/Aircraft/777/77F-ANA.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<PropertyList include="77F-main.xml">
<texture-path>Textures/ANA</texture-path>
</PropertyList>

9
AI/Aircraft/777/77L-AirChina.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<PropertyList include="77L-main.xml">
<texture-path>Textures/AirChina</texture-path>
</PropertyList>

BIN
AI/Aircraft/777/Textures/ANA/77F-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
AI/Aircraft/777/Textures/AirChina/77L-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 40 KiB

6
AI/Aircraft/A320/A320-SATA.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0"?>
<PropertyList include="A320-main.xml">
<texture-path>Textures/SATA</texture-path>
</PropertyList>

BIN
AI/Aircraft/A320/Textures/SATA/A320-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 75 KiB

9
AI/Aircraft/A321/A321-ANA.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<PropertyList include="A321-main.xml">
<texture-path>Textures/ANA</texture-path>
</PropertyList>

9
AI/Aircraft/A321/A321-AzoresAirlines.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<!-- author - Brett Harrison -->
<PropertyList include="A321-main.xml">
<texture-path>Textures/AzoresAirlines</texture-path>
</PropertyList>

BIN
AI/Aircraft/A321/Textures/ANA/A321-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 73 KiB

BIN
AI/Aircraft/A321/Textures/AzoresAirlines/A321-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 82 KiB

6
AI/Aircraft/DH4/DH4-SATA.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0"?>
<PropertyList include="DH4-main.xml">
<texture-path>Textures/SATA</texture-path>
</PropertyList>

BIN
AI/Aircraft/DH4/Textures/SATA/DH4-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 47 KiB

9
AI/Aircraft/E95/E95-TAP.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<PropertyList include="E95-main.xml">
<texture-path>Textures/TAP</texture-path>
</PropertyList>

BIN
AI/Aircraft/E95/Textures/Belavia/E95-tex.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 56 KiB

BIN
AI/Aircraft/E95/Textures/TAP/E95-tex.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 55 KiB

1065
AI/Aircraft/JA37/Models/JA-37-lowpoly.ac
View file

File diff suppressed because it is too large Load diff

208
AI/Aircraft/JA37/Models/JA-37.xml
View file

@ -3,61 +3,8 @@
<PropertyList> <PropertyList>
<path>JA-37-lowpoly.ac</path> <path>JA-37-lowpoly.ac</path>
<!-- strobe light -->
<animation>
<type>material</type>
<object-name>ja37strobe</object-name>
<condition>
<or>
<!-- flash: bit 1 -->
<equals>
<property>sim/multiplay/generic/int[9]</property>
<value>1</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[9]</property>
<value>3</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[9]</property>
<value>5</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[9]</property>
<value>7</value>
</equals>
</or>
</condition>
<emission>
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
<factor-prop>sim/multiplay/generic/int[5]</factor-prop>
<!-- sim/model/lighting/strobe/state -->
</emission>
</animation>
<!-- Fuselage animations --> <!-- Fuselage animations -->
<animation>
<type>translate</type>
<object-name>outletCover</object-name>
<property>ja37/systems/tertiary-opening</property>
<factor>-0.35</factor>
<axis>
<x>1</x>
</axis>
<center>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</center>
</animation>
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>glassOuter</object-name> <object-name>glassOuter</object-name>
@ -81,7 +28,7 @@
<type>scale</type> <type>scale</type>
<object-name>glassOuter</object-name> <object-name>glassOuter</object-name>
<object-name>canopy</object-name> <object-name>canopy</object-name>
<property>sim/multiplay/generic/int[1]</property> <property>sim/multiplay/generic/bool[13]</property>
<!-- fdm/jsbsim/fcs/canopy/hinges/serviceable --> <!-- fdm/jsbsim/fcs/canopy/hinges/serviceable -->
<interpolation> <interpolation>
<entry> <entry>
@ -300,38 +247,6 @@
***************************************** --> ***************************************** -->
<animation>
<type>scale</type>
<object-name>gearFrontDoorsClosed</object-name>
<property>gear/gear[0]/position-norm</property>
<interpolation>
<entry>
<ind> 0.00 </ind>
<dep> 1.00 </dep>
</entry>
<entry>
<ind> 0.001 </ind>
<dep> 0.00 </dep>
</entry>
</interpolation>
<center>
<x-m> 0 </x-m>
<y-m> 0 </y-m>
<z-m> 0 </z-m>
</center>
<x-min>0.0</x-min>
<y-min>0.0</y-min>
<z-min>0.0</z-min>
<x-max>1.0</x-max>
<y-max>1.0</y-max>
<z-max>1.0</z-max>
<axis>
<x>1.0</x>
<y>1.0</y>
<z>1.0</z>
</axis>
</animation>
<animation> <animation>
<type>scale</type> <type>scale</type>
<object-name>gearFrontDoorsOpenLeft</object-name> <object-name>gearFrontDoorsOpenLeft</object-name>
@ -468,27 +383,6 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<condition>
<or>
<!-- wow0: bit 1 -->
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>1</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>3</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>5</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>7</value>
</equals>
</or>
</condition>
<object-name>gearFrontBottom</object-name> <object-name>gearFrontBottom</object-name>
<object-name>gearFrontHub</object-name> <object-name>gearFrontHub</object-name>
<object-name>gearFrontScissorTop</object-name> <object-name>gearFrontScissorTop</object-name>
@ -584,25 +478,7 @@
<type>spin</type> <type>spin</type>
<object-name>gearFrontWheel</object-name> <object-name>gearFrontWheel</object-name>
<condition> <condition>
<or> <property>gear/gear[0]/compression-norm</property>
<!-- wow0: bit 1 -->
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>1</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>3</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>5</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>7</value>
</equals>
</or>
</condition> </condition>
<property>rotors/main/blade[0]/position-deg</property> <property>rotors/main/blade[0]/position-deg</property>
<!-- gear/gear[0]/rollspeed-ms --> <!-- gear/gear[0]/rollspeed-ms -->
@ -893,25 +769,7 @@
<type>spin</type> <type>spin</type>
<object-name>gearLeftWheel1</object-name> <object-name>gearLeftWheel1</object-name>
<condition> <condition>
<or> <property>gear/gear[1]/compression-norm</property>
<!-- wow1: bit 2 -->
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>2</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>3</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>6</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>7</value>
</equals>
</or>
</condition> </condition>
<property>rotors/main/blade[1]/position-deg</property> <property>rotors/main/blade[1]/position-deg</property>
<!-- gear/gear[1]/rollspeed-ms --> <!-- gear/gear[1]/rollspeed-ms -->
@ -932,25 +790,7 @@
<type>spin</type> <type>spin</type>
<object-name>gearLeftWheel2</object-name> <object-name>gearLeftWheel2</object-name>
<condition> <condition>
<or> <property>gear/gear[1]/compression-norm</property>
<!-- wow1: bit 2 -->
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>2</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>3</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>6</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>7</value>
</equals>
</or>
</condition> </condition>
<property>rotors/main/blade[1]/position-deg</property> <property>rotors/main/blade[1]/position-deg</property>
<!-- gear/gear[1]/rollspeed-ms --> <!-- gear/gear[1]/rollspeed-ms -->
@ -1242,25 +1082,7 @@
<type>spin</type> <type>spin</type>
<object-name>gearRightWheel1</object-name> <object-name>gearRightWheel1</object-name>
<condition> <condition>
<or> <property>gear/gear[2]/compression-norm</property>
<!-- wow2: bit 3 -->
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>4</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>5</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>6</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>7</value>
</equals>
</or>
</condition> </condition>
<property>rotors/main/blade[2]/position-deg</property> <property>rotors/main/blade[2]/position-deg</property>
<!-- gear/gear[2]/rollspeed-ms --> <!-- gear/gear[2]/rollspeed-ms -->
@ -1281,25 +1103,7 @@
<type>spin</type> <type>spin</type>
<object-name>gearRightWheel2</object-name> <object-name>gearRightWheel2</object-name>
<condition> <condition>
<or> <property>gear/gear[2]/compression-norm</property>
<!-- wow2: bit 3 -->
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>4</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>5</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>6</value>
</equals>
<equals>
<property>sim/multiplay/generic/int[17]</property>
<value>7</value>
</equals>
</or>
</condition> </condition>
<property>rotors/main/blade[2]/position-deg</property> <property>rotors/main/blade[2]/position-deg</property>
<!-- gear/gear[2]/rollspeed-ms --> <!-- gear/gear[2]/rollspeed-ms -->

11
AI/Aircraft/performancedb.xml
View file

@ -307,6 +307,9 @@
<alias> <alias>
<match>319</match> <match>319</match>
<match>320</match> <match>320</match>
<match>31N</match>
<match>32N</match>
<match>32Q</match>
<match>321</match> <match>321</match>
<match>A319</match> <match>A319</match>
<match>A320</match> <match>A320</match>
@ -325,6 +328,8 @@
<match>A31</match> <match>A31</match>
<match>Airbus_A310</match> <match>Airbus_A310</match>
<match>ABY</match> <match>ABY</match>
<match>ABF</match>
<match>AB6</match>
<match>30</match> <match>30</match>
<match>31</match> <match>31</match>
<alias>AB3</alias> <alias>AB3</alias>
@ -845,7 +850,7 @@
<match>AR1</match> <match>AR1</match>
<match>AR7</match> <match>AR7</match>
<match>AR8</match> <match>AR8</match>
<match>142</match> <match>142</match>
<match>146</match> <match>146</match>
<match>146-100</match> <match>146-100</match>
<match>146-200</match> <match>146-200</match>
@ -1157,9 +1162,9 @@
</aircraft> </aircraft>
<alias> <alias>
<match>BN-2</match> <match>BN-2</match>
<match>BNI</match> <match>BNI</match>
<match>Islander</match> <match>Islander</match>
<alias>BN2</alias> <alias>BN2</alias>
</alias> </alias>
</performancedb> </performancedb>
</PropertyList> </PropertyList>

8
AI/Traffic/A/AHK.xml
View file

@ -2,7 +2,7 @@
<!-- Author Ian Tolosa - Observed Traffic week of 07-13 DEC 2020 - A330-300 Freighter mapped to A 330-200 Freighter --> <!-- Author Ian Tolosa - Observed Traffic week of 07-13 DEC 2020 - A330-300 Freighter mapped to A 330-200 Freighter -->
<trafficlist> <trafficlist>
<aircraft> <aircraft>
<model>Aircraft/A332/33X-AirHongKong.xml</model> <model>Aircraft/A332/A33X-AirHongKong.xml</model>
<livery>AHK</livery> <livery>AHK</livery>
<airline>AHK</airline> <airline>AHK</airline>
<home-port>VTBS</home-port> <home-port>VTBS</home-port>
@ -16,7 +16,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/A332/33X-AirHongKong.xml</model> <model>Aircraft/A332/A33X-AirHongKong.xml</model>
<livery>AHK</livery> <livery>AHK</livery>
<airline>AHK</airline> <airline>AHK</airline>
<home-port>WMKP</home-port> <home-port>WMKP</home-port>
@ -30,7 +30,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/A332/33X-AirHongKong.xml</model> <model>Aircraft/A332/A33X-AirHongKong.xml</model>
<livery>AHK</livery> <livery>AHK</livery>
<airline>AHK</airline> <airline>AHK</airline>
<home-port>ZSPD</home-port> <home-port>ZSPD</home-port>
@ -44,7 +44,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/A332/33X-AirHongKong.xml</model> <model>Aircraft/A332/A33X-AirHongKong.xml</model>
<livery>AHK</livery> <livery>AHK</livery>
<airline>AHK</airline> <airline>AHK</airline>
<home-port>WSSS</home-port> <home-port>WSSS</home-port>

3152
AI/Traffic/A/AKX.xml
View file

File diff suppressed because it is too large Load diff

72795
AI/Traffic/A/ANA.xml
View file

File diff suppressed because it is too large Load diff

46
AI/Traffic/C/CCA.xml
View file

@ -2018,7 +2018,7 @@
<heavy>false</heavy> <heavy>false</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2032,7 +2032,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2046,7 +2046,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2060,7 +2060,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2074,7 +2074,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2088,7 +2088,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2102,7 +2102,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2116,7 +2116,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2130,7 +2130,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-200-AirChina.xml</model> <model>Aircraft/777/77L-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2144,7 +2144,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2158,7 +2158,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2172,7 +2172,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2186,7 +2186,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2200,7 +2200,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2214,7 +2214,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2228,7 +2228,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2242,7 +2242,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2256,7 +2256,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2270,7 +2270,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2284,7 +2284,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2298,7 +2298,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2312,7 +2312,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>
@ -2326,7 +2326,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/777/777-300-AirChina.xml</model> <model>Aircraft/777/77W-AirChina.xml</model>
<livery>CCA</livery> <livery>CCA</livery>
<airline>CCA</airline> <airline>CCA</airline>
<home-port>ZBAA</home-port> <home-port>ZBAA</home-port>

13921
AI/Traffic/H/HDA.xml
View file

File diff suppressed because it is too large Load diff

2
AI/Traffic/J/JSA.xml
View file

@ -207,7 +207,7 @@
<radius>17</radius> <radius>17</radius>
<flighttype>gate</flighttype> <flighttype>gate</flighttype>
<performance-class>jet_transport</performance-class> <performance-class>jet_transport</performance-class>
<registration>9V-JSQ</registration> <registration>9V-JSU</registration>
<heavy>false</heavy> <heavy>false</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>

24
AI/Traffic/J/JST.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- Cleaned Up 21APR2020 by Ian (Yves) Tolosa - Partial Traffic Observed week of 13MAR20 --> <!-- Cleaned Up 21APR2020 by Ian (Yves) Tolosa - Partial Traffic Observed week of 13MAR20 -->
<trafficlist> <trafficlist>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YMML</home-port> <home-port>YMML</home-port>
@ -16,7 +16,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YBCS</home-port> <home-port>YBCS</home-port>
@ -30,7 +30,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YSSY</home-port> <home-port>YSSY</home-port>
@ -44,7 +44,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YMML</home-port> <home-port>YMML</home-port>
@ -58,7 +58,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YBVS</home-port> <home-port>YBVS</home-port>
@ -72,7 +72,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YSSY</home-port> <home-port>YSSY</home-port>
@ -86,7 +86,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>WADD</home-port> <home-port>WADD</home-port>
@ -100,7 +100,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>WADD</home-port> <home-port>WADD</home-port>
@ -114,7 +114,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YBCG</home-port> <home-port>YBCG</home-port>
@ -128,7 +128,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YBCS</home-port> <home-port>YBCS</home-port>
@ -142,7 +142,7 @@
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/787/788-Jetstar.xml</model> <model>Aircraft/787/788-JetStar.xml</model>
<livery>JST</livery> <livery>JST</livery>
<airline>JST</airline> <airline>JST</airline>
<home-port>YMML</home-port> <home-port>YMML</home-port>

5239
AI/Traffic/P/PGA.xml Normal file
View file

File diff suppressed because it is too large Load diff

36
AI/Traffic/R/RLU.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- Author Ian (Yves) Tolosa - Timetable of JUNE 2018 --> <!-- Author Ian (Yves) Tolosa - Timetable of JUNE 2018 -->
<trafficlist> <trafficlist>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -16,7 +16,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -30,7 +30,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -44,7 +44,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -58,7 +58,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -72,7 +72,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -86,7 +86,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -100,7 +100,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -114,7 +114,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -128,7 +128,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -142,7 +142,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -156,7 +156,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -170,7 +170,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -184,7 +184,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -198,7 +198,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -212,7 +212,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>
@ -226,7 +226,7 @@
<heavy>No</heavy> <heavy>No</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>
<model>Aircraft/CR2/CR2-RusLine.xml</model> <model>Aircraft/CR2/CR2-Rusline.xml</model>
<livery>RLU</livery> <livery>RLU</livery>
<airline>RLU</airline> <airline>RLU</airline>
<home-port>UUWW</home-port> <home-port>UUWW</home-port>

545
AI/Traffic/R/RNAF.xml
View file

@ -1,545 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<trafficlist>
<!-- ============================================================================================ -->
<!-- EHVK -->
<!-- ============================================================================================ -->
<!-- MONDAY 1st WAVE -->
<!-- ============================================================================================ -->
<!-- 2-SHIP F-16 312sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/312sqn/J-058/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_312SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-058</registration>
<heavy>false</heavy>
</aircraft>
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/312sqn/J-001/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_312SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-001</registration>
<heavy>false</heavy>
</aircraft>
<flight>
<callsign>FIST11</callsign>
<required-aircraft>RNLAF_312SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:35:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:35:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<flight>
<callsign>FIST12</callsign>
<required-aircraft>RNLAF_312SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:35:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:36:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- ============================================================================================ -->
<!-- ============================================================================================ -->
<!-- 2-SHIP F-16 311sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/311sqn/J-005/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-005</registration>
<heavy>false</heavy>
</aircraft>
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/311sqn/J-515/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-515</registration>
<heavy>false</heavy>
</aircraft>
<flight>
<callsign>JUDGE11</callsign>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:38:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:38:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<flight>
<callsign>JUDGE12</callsign>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:38:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:39:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- ============================================================================================ -->
<!-- ============================================================================================ -->
<!-- 2-SHIP F-16 313sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/313sqn/J-508/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_313SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-508</registration>
<heavy>false</heavy>
</aircraft>
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/313sqn/J-055/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_313SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-055</registration>
<heavy>false</heavy>
</aircraft>
<flight>
<callsign>METAL11</callsign>
<required-aircraft>RNLAF_313SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:41:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:41:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<flight>
<callsign>METAL12</callsign>
<required-aircraft>RNLAF_313SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:41:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:42:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- ============================================================================================ -->
<!-- ============================================================================================ -->
<!-- 2-SHIP F-16 311sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/311sqn/J-638/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-638</registration>
<heavy>false</heavy>
</aircraft>
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHVK/311sqn/J-630/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHVK</home-port>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-630</registration>
<heavy>false</heavy>
</aircraft>
<flight>
<callsign>SNAKE11</callsign>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:44:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:44:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<flight>
<callsign>SNAKE12</callsign>
<required-aircraft>RNLAF_311SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHVK</port>
<time>1/09:44:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHVK</port>
<time>1/10:45:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- ============================================================================================ -->
<!-- ============================================================================================ -->
<!-- MONDAY 2nd WAVE -->
<!-- ============================================================================================ -->
<!-- TODO -->
<!-- ============================================================================================ -->
<!-- EHLW -->
<!-- ============================================================================================ -->
<!-- MONDAY 1st WAVE -->
<!-- ============================================================================================ -->
<!-- 2-SHIP F-16 322sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/322sqn/J-060/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-060</registration>
<heavy>false</heavy>
</aircraft>
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/322sqn/J-135/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-135</registration>
<heavy>false</heavy>
</aircraft>
<flight>
<callsign>BLADE11</callsign>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/09:55:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/10:55:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<flight>
<callsign>BLADE12</callsign>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/09:55:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/10:56:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- ================================================================================== -->
<!-- ================================================================================== -->
<!-- 2-SHIP F-16 323sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/323sqn/J-631/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-631</registration>
<heavy>false</heavy>
</aircraft>
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/323sqn/J-193/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-193</registration>
<heavy>false</heavy>
</aircraft>
<flight>
<callsign>NASTY11</callsign>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/09:58:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/10:58:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<flight>
<callsign>NASTY12</callsign>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/09:58:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/10:59:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- ================================================================================== -->
<!-- ================================================================================== -->
<!-- 2-SHIP F-16 322sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/322sqn/J-516/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-516</registration>
<heavy>false</heavy>
</aircraft>
<!-- J-366 is currently operating out of Tucson, AZ (KTUS)
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/322sqn/J-366/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-366</registration>
<heavy>false</heavy>
</aircraft>
-->
<flight>
<callsign>POLLY11</callsign>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/10:01:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/11:01:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- See comment of J-366
<flight>
<callsign>POLLY12</callsign>
<required-aircraft>RNLAF_322SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/10:01:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/10:02:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
-->
<!-- ================================================================================== -->
<!-- ================================================================================== -->
<!-- 2-SHIP F-16 323sqn -->
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/323sqn/J-868/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-868</registration>
<heavy>false</heavy>
</aircraft>
<!-- J-198 was sold to chili so we need a new tail for this bird
<aircraft>
<model>AI/Aircraft/f16/Models/rnlaf/EHLW/323sqn/J-198/F-16A-MLU.xml</model>
<airline>RNLAF</airline>
<home-port>EHLW</home-port>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<actype>F16A-MLU</actype>
<offset>6</offset>
<radius>10</radius>
<flighttype>mil-fighter</flighttype>
<performance-class>jet_fighter</performance-class>
<registration>J-198</registration>
<heavy>false</heavy>
</aircraft>
-->
<flight>
<callsign>COBRA11</callsign>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/10:04:00</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/11:04:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
<!-- See comment for J-198
<flight>
<callsign>COBRA12</callsign>
<required-aircraft>RNLAF_323SQN_F-16A-MLU</required-aircraft>
<fltrules>IFR</fltrules>
<departure>
<port>EHLW</port>
<time>1/10:04:10</time>
</departure>
<cruise-alt>20</cruise-alt>
<arrival>
<port>EHLW</port>
<time>1/11:05:00</time>
</arrival>
<repeat>WEEK</repeat>
</flight>
-->
<!-- ================================================================================== -->
</trafficlist>

8681
AI/Traffic/R/ROU.xml
View file

File diff suppressed because it is too large Load diff

1184
AI/Traffic/R/RZO.xml Normal file
View file

File diff suppressed because it is too large Load diff

2
AI/Traffic/S/SAS.xml
View file

@ -712,7 +712,7 @@
<radius>30</radius> <radius>30</radius>
<flighttype>gate</flighttype> <flighttype>gate</flighttype>
<performance-class>heavy_jet</performance-class> <performance-class>heavy_jet</performance-class>
<registration>LN-RKF</registration> <registration>LN-RKP</registration>
<heavy>true</heavy> <heavy>true</heavy>
</aircraft> </aircraft>
<aircraft> <aircraft>

3854
AI/Traffic/S/SAT.xml Normal file
View file

File diff suppressed because it is too large Load diff

24770
AI/Traffic/T/TAP.xml
View file

File diff suppressed because it is too large Load diff

41241
AI/Traffic/U/UAE.xml
View file

File diff suppressed because it is too large Load diff

6
Aircraft/Instruments-3d/ar-6201/ar6201.nas
View file

@ -86,12 +86,9 @@ var canvas_AR6201_base = {
canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper}); canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper});
var svg_keys = me.getKeys(); var svg_keys = me.getKeys();
foreach(var key; svg_keys) { foreach(var key; svg_keys) {
me[key] = canvas_group.getElementById(key);
var svg_keys = me.getKeys();
foreach (var key; svg_keys) {
me[key] = canvas_group.getElementById(key); me[key] = canvas_group.getElementById(key);
var clip_el = canvas_group.getElementById(key ~ "_clip"); var clip_el = canvas_group.getElementById(key ~ "_clip");
if (clip_el != nil) { if (clip_el != nil) {
@ -106,7 +103,6 @@ var canvas_AR6201_base = {
me[key].set("clip", clip_rect); me[key].set("clip", clip_rect);
me[key].set("clip-frame", canvas.Element.PARENT); me[key].set("clip-frame", canvas.Element.PARENT);
} }
}
} }
me.page = canvas_group; me.page = canvas_group;

2
Aircraft/Instruments-3d/bxp6401/bxp6401.nas
View file

@ -59,7 +59,7 @@ var canvas_BXP6401_base = {
canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper}); canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper});
var svg_keys = me.getKeys(); var svg_keys = me.getKeys();
foreach(var key; svg_keys) { foreach(var key; svg_keys) {
me[key] = canvas_group.getElementById(key); me[key] = canvas_group.getElementById(key);

18
Aircraft/Instruments-3d/glider/vario/S3/S3.nas
View file

@ -42,6 +42,8 @@ var volt_prop = props.globals.initNode("/systems/electrical/outputs/S3", 0.0, "D
var mc = s3.initNode("mc", 1.5, "DOUBLE"); var mc = s3.initNode("mc", 1.5, "DOUBLE");
var needle = s3.initNode( "needle-deg", 0.0, "DOUBLE" );
var instrument_dir = "Aircraft/Instruments-3d/glider/vario/S3/"; var instrument_dir = "Aircraft/Instruments-3d/glider/vario/S3/";
var canvas_S3_base = { var canvas_S3_base = {
@ -53,7 +55,7 @@ var canvas_S3_base = {
canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper}); canvas.parsesvg(canvas_group, file, {'font-mapper': font_mapper});
var svg_keys = me.getKeys(); var svg_keys = me.getKeys();
foreach(var key; svg_keys) { foreach(var key; svg_keys) {
me[key] = canvas_group.getElementById(key); me[key] = canvas_group.getElementById(key);
@ -135,6 +137,18 @@ var canvas_S3_start = {
}; };
var s3_update = maketimer(0.2, func() { canvas_S3_base.update() } ); var s3_update = maketimer(0.2, func() { canvas_S3_base.update() } );
s3_update.simulatedTime = 1;
var vario_needle_ctrl = func {
if( start_prop.getDoubleValue() == 1.0 ){
needle.setDoubleValue( math.clamp( te_rdg.getDoubleValue() * 24, -132, 132 ) ); # max deflection: 132 deg at +- 5.5 m/s
} else {
needle.setDoubleValue( 0.0 );
}
}
var needle_update = maketimer( 0.0, vario_needle_ctrl );
needle_update.simulatedTime = 1;
var ls = setlistener("sim/signals/fdm-initialized", func { var ls = setlistener("sim/signals/fdm-initialized", func {
S3_display = canvas.new({ S3_display = canvas.new({
@ -152,6 +166,7 @@ var ls = setlistener("sim/signals/fdm-initialized", func {
S3_start = canvas_S3_start.new(groupStart, instrument_dir~"S3_start.svg"); S3_start = canvas_S3_start.new(groupStart, instrument_dir~"S3_start.svg");
s3_update.start(); s3_update.start();
needle_update.start();
removelistener(ls); removelistener(ls);
}); });
@ -259,5 +274,4 @@ var slow_instruments = UpdateLoop.new(
update_period: 1, update_period: 1,
components: [averager], components: [averager],
enable: 1); enable: 1);

18
Aircraft/Instruments-3d/glider/vario/S3/S3.xml
View file

@ -117,17 +117,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>vario.needle</object-name> <object-name>vario.needle</object-name>
<property>instrumentation/s3/te-reading-mps</property> <property>instrumentation/s3/needle-deg</property>
<condition>
<equals>
<property>instrumentation/s3/start</property>
<value>1</value>
</equals>
</condition>
<interpolation>
<entry><ind> -5.5 </ind><dep> -132 </dep></entry>
<entry><ind> 5.5 </ind><dep> 132 </dep></entry>
</interpolation>
<center> <center>
<y-m>0.0</y-m> <y-m>0.0</y-m>
<z-m>0.0</z-m> <z-m>0.0</z-m>
@ -142,12 +132,6 @@
<type>rotate</type> <type>rotate</type>
<object-name>vario.needle</object-name> <object-name>vario.needle</object-name>
<property>instrumentation/s3/start</property> <property>instrumentation/s3/start</property>
<condition>
<not-equals>
<property>instrumentation/s3/start</property>
<value>1</value>
</not-equals>
</condition>
<interpolation> <interpolation>
<entry><ind> 0 </ind><dep> 0 </dep></entry> <entry><ind> 0 </ind><dep> 0 </dep></entry>
<entry><ind> 0.1 </ind><dep> -12 </dep></entry> <entry><ind> 0.1 </ind><dep> -12 </dep></entry>

2
Aircraft/Instruments-3d/ki206/ki206.xml
View file

@ -84,7 +84,7 @@ Syd Adams
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>KI206card</object-name> <object-name>KI206card</object-name>
<property>instrumentation/altimeter/indicated-heading-deg</property> <property>instrumentation/heading-indicator/indicated-heading-deg</property>
<axis> <axis>
<x>1</x> <x>1</x>
<y>0</y> <y>0</y>

501
Effects/building.eff
View file

@ -1,387 +1,188 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PropertyList> <PropertyList>
<name>Effects/building</name> <name>Effects/building</name>
<inherits-from>Effects/model-combined-deferred</inherits-from> <inherits-from>Effects/model-combined</inherits-from>
<parameters> <parameters>
<texture n="0"> <texture n="0">
<type>2d</type> <type>2d</type>
<image>Textures/buildings.png</image> <image>Textures/buildings.png</image>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>clamp</wrap-t> <wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<!-- Normal Map --> <!-- Normal Map -->
<normalmap-enabled type="int"> 1 </normalmap-enabled> <normalmap-enabled type="int"> 1 </normalmap-enabled>
<normalmap-dds type="int"> 0 </normalmap-dds> <normalmap-dds type="int"> 0 </normalmap-dds>
<normalmap-tiling type="float"> 1.0 </normalmap-tiling> <normalmap-tiling type="float"> 1.0 </normalmap-tiling>
<texture n="2"> <texture n="2">
<image>Textures/buildings-normalmap_orig.png</image> <image>Textures/buildings-normalmap_orig.png</image>
<type>2d</type> <type>2d</type>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s> <wrap-s>repeat</wrap-s>
<wrap-t>clamp</wrap-t> <wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<!-- Light Map --> <!-- Light Map -->
<texture n="3"> <texture n="3">
<image>Textures/buildings-lightmap.png</image> <image>Textures/buildings-lightmap.png</image>
<type>2d</type> <type>2d</type>
<filter>linear-mipmap-linear</filter> <filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s> <wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t> <wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<lightmap-enabled type="int"> 1 </lightmap-enabled> <lightmap-enabled type="int"> 1 </lightmap-enabled>
<lightmap-multi type="int"> 0 </lightmap-multi> <lightmap-multi type="int"> 0 </lightmap-multi>
<lightmap-factor type="float" n="0"> <lightmap-factor type="float" n="0">
<use>/sim/time/sun-angle-rad</use> <use>/sim/time/sun-angle-rad</use>
</lightmap-factor> </lightmap-factor>
<lightmap-color type="vec3d" n="0"> 0.3 0.3 0.3 </lightmap-color> <lightmap-color type="vec3d" n="0"> 0.3 0.3 0.3 </lightmap-color>
<!--<lightmap-factor type="float" n="1">1.0</lightmap-factor>
<lightmap-color type="vec3d" n="1"> 1.0 1.0 1.0 </lightmap-color> <!-- Reflection -->
<lightmap-factor type="float" n="2">1.0</lightmap-factor> <reflection-enabled type="int"> 1 </reflection-enabled>
<lightmap-color type="vec3d" n="2"> 1.0 1.0 1.0 </lightmap-color> <reflect-map-enabled type="int"> 1 </reflect-map-enabled>
<lightmap-factor type="float" n="3">1.0</lightmap-factor> <reflection-correction type="float"> -0.15 </reflection-correction>
<lightmap-color type="vec3d" n="3"> 1.0 1.0 1.0 </lightmap-color>--> <reflection-dynamic type="int"> 0 </reflection-dynamic>
<!-- Reflection --> <reflection-fresnel type="float"> 0.0 </reflection-fresnel>
<reflection-enabled type="int"> 1 </reflection-enabled> <reflection-rainbow type="float"> 0.0 </reflection-rainbow>
<reflect-map-enabled type="int"> 1 </reflect-map-enabled> <reflection-noise type="float"> 0.0 </reflection-noise>
<reflection-correction type="float"> -0.15 </reflection-correction> <texture n= "5" >
<reflection-dynamic type="int"> 0 </reflection-dynamic> <type>cubemap</type>
<reflection-fresnel type="float"> 0.0 </reflection-fresnel> <images>
<reflection-rainbow type="float"> 0.0 </reflection-rainbow> <positive-x>Aircraft/Generic/Effects/CubeMaps/buildings/N.png</positive-x>
<reflection-noise type="float"> 0.0 </reflection-noise> <negative-x>Aircraft/Generic/Effects/CubeMaps/buildings/S.png</negative-x>
<texture n= "5" > <positive-y>Aircraft/Generic/Effects/CubeMaps/buildings/W.png</positive-y>
<type>cubemap</type> <negative-y>Aircraft/Generic/Effects/CubeMaps/buildings/E.png</negative-y>
<images> <positive-z>Aircraft/Generic/Effects/CubeMaps/buildings/U.png</positive-z>
<positive-x>Aircraft/Generic/Effects/CubeMaps/buildings/N.png</positive-x> <negative-z>Aircraft/Generic/Effects/CubeMaps/buildings/D.png</negative-z>
<negative-x>Aircraft/Generic/Effects/CubeMaps/buildings/S.png</negative-x> </images>
<positive-y>Aircraft/Generic/Effects/CubeMaps/buildings/W.png</positive-y> </texture>
<negative-y>Aircraft/Generic/Effects/CubeMaps/buildings/E.png</negative-y> <texture n="6">
<positive-z>Aircraft/Generic/Effects/CubeMaps/buildings/U.png</positive-z> <!-- instance information from shader -->
<negative-z>Aircraft/Generic/Effects/CubeMaps/buildings/D.png</negative-z> <type>2d</type>
</images> <wrap-s>clamp</wrap-s>
</texture> <wrap-t>clamp</wrap-t>
<texture n="6"> </texture>
<!-- instance information from shader --> <!-- Add the following line to enable snow: -->
<type>2d</type> <snow-enabled>1</snow-enabled>
<wrap-s>clamp</wrap-s> <!--Ambient correction -->
<wrap-t>clamp</wrap-t> <ambient-correction type="float"> 0.0 </ambient-correction>
</texture> <material>
<!-- Add the following line to enable snow: --> <active>true</active>
<snow-enabled>1</snow-enabled> <color-mode-uniform>1</color-mode-uniform>
<!--Ambient correction --> <ambient type="vec4d">0.6 0.6 0.6 1.0</ambient>
<ambient-correction type="float"> 0.0 </ambient-correction> <diffuse type="vec4d">1.0 1.0 1.0 1.0</diffuse>
<dirt-enabled type="int"> 0 </dirt-enabled> <specular type="vec4d">0.0 0.0 0.0 1.0</specular>
<dirt-color type="vec3d"> 0.0 0.0 0.0 </dirt-color> <emissive type="vec4d">0.02 0.02 0.02 1.0</emissive>
<dirt-factor type="float"> 0.0 </dirt-factor> <shininess>0.1</shininess>
<material> <color-mode>ambient-and-diffuse</color-mode>
<active>true</active> <color-mode-uniform>ambient-and-diffuse</color-mode-uniform>
<color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
<ambient type="vec4d">0.6 0.6 0.6 1.0</ambient> </material>
<diffuse type="vec4d">1.0 1.0 1.0 1.0</diffuse> <material-id>0</material-id>
<specular type="vec4d">0.0 0.0 0.0 1.0</specular> <blend>
<emissive type="vec4d">0.02 0.02 0.02 1.0</emissive> <active>0</active>
<shininess>0.1</shininess> <source>0</source>
<color-mode>ambient-and-diffuse</color-mode> <destination>0</destination>
<color-mode-uniform>ambient-and-diffuse</color-mode-uniform> </blend>
<!-- DIFFUSE --> <shade-model>flat</shade-model>
</material> <cull-face>back</cull-face>
<material-id>0</material-id>
<blend>
<active>0</active>
<source>0</source>
<destination>0</destination>
</blend>
<shade-model>flat</shade-model>
<cull-face>back</cull-face>
<rendering-hint>opaque</rendering-hint>
<!-- fog include for atmospheric scattering-->
<visibility><use>/environment/ground-visibility-m</use></visibility>
<avisibility><use>/environment/visibility-m</use></avisibility>
<lthickness><use>/environment/ground-haze-thickness-m</use></lthickness>
<scattering><use>/rendering/scene/scattering</use></scattering>
<ground_scattering><use>/environment/surface/scattering</use></ground_scattering>
<terminator><use>/environment/terminator-relative-position-m</use></terminator>
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
<terrain_alt><use>/environment/mean-terrain-elevation-m</use></terrain_alt>
<overcast><use>/rendering/scene/overcast</use></overcast>
<eye_alt><use>/sim/rendering/eye-altitude-m</use></eye_alt>
<snow_level><use>/environment/snow-level-m</use></snow_level>
<dust_cover_factor><use>/environment/surface/dust-cover-factor</use></dust_cover_factor>
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
<fogstructure><use>/environment/fog-structure</use></fogstructure>
<delta_T><use>/environment/surface/delta-T-structure</use></delta_T>
<!-- END fog include -->
<building-flag type="int">1</building-flag> <building-flag type="int">1</building-flag>
</parameters> </parameters>
<technique n="4"> <technique n="4">
<!-- Atmospheric scattering technique with model shader--> <!-- Atmospheric scattering technique with model shader-->
<predicate> <pass>
<and> <texture-unit n="4">
<property>/sim/rendering/shaders/skydome</property> <unit>4</unit>
<property>/sim/rendering/shaders/model</property> <image>
<or> <use>texture[3]/image</use>
<less-equal> </image>
<value type="float">2.0</value> <type>
<glversion/> <use>texture[3]/type</use>
</less-equal> </type>
<and> <filter>
<extension-supported>GL_ARB_shader_objects</extension-supported> <use>texture[3]/filter</use>
<extension-supported>GL_ARB_shading_language_100</extension-supported> </filter>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <wrap-s>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <use>texture[3]/wrap-s</use>
</and> </wrap-s>
</or> <wrap-t>
</and> <use>texture[3]/wrap-t</use>
</predicate> </wrap-t>
<internal-format>
<pass> <use>texture[3]/internal-format</use>
<texture-unit n="4"> </internal-format>
<unit>4</unit> </texture-unit>
<image> <program>
<use>texture[3]/image</use> <vertex-shader n="0">Shaders/building-model-ALS-ultra.vert</vertex-shader>
</image> <attribute>
<type>
<use>texture[3]/type</use>
</type>
<filter>
<use>texture[3]/filter</use>
</filter>
<wrap-s>
<use>texture[3]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[3]/wrap-t</use>
</wrap-t>
<internal-format>
<use>texture[3]/internal-format</use>
</internal-format>
</texture-unit>
<program>
<vertex-shader n="0">Shaders/building-model-ALS-ultra.vert</vertex-shader>
<attribute>
<name>instancePosition</name>
<index>10</index>
</attribute>
<attribute>
<name>instanceScale</name>
<index>11</index>
</attribute>
<attribute>
<name>attrib1</name>
<index>12</index>
</attribute>
<attribute>
<name>attrib2</name>
<index>13</index>
</attribute>
</program>
</pass>
</technique>
<technique n="5">
<!-- Base Atmospheric scattering technique -->
<predicate>
<and>
<property>/sim/rendering/shaders/skydome</property>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
</and>
</predicate>
<pass>
<program>
<vertex-shader>Shaders/building-ALS.vert</vertex-shader>
<fragment-shader>Shaders/terrain-ALS-base.frag</fragment-shader>
<fragment-shader>Shaders/hazes.frag</fragment-shader>
<fragment-shader>Shaders/filters-ALS.frag</fragment-shader>
<fragment-shader>Shaders/noise.frag</fragment-shader>
<attribute>
<name>instancePosition</name> <name>instancePosition</name>
<index>10</index> <index>10</index>
</attribute> </attribute>
<attribute> <attribute>
<name>instanceScale</name> <name>instanceScale</name>
<index>11</index> <index>11</index>
</attribute> </attribute>
<attribute> <attribute>
<name>attrib1</name> <name>attrib1</name>
<index>12</index> <index>12</index>
</attribute> </attribute>
<attribute> <attribute>
<name>attrib2</name> <name>attrib2</name>
<index>13</index> <index>13</index>
</attribute> </attribute>
</program>
</pass>
</technique>
<technique n="11">
<pass>
<vertex-program-two-side>
<use>vertex-program-two-side</use>
</vertex-program-two-side>
<program n="0">
<vertex-shader n="1">Shaders/building-default.vert</vertex-shader>
<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
<!--fog include-->
<fragment-shader n="1">Shaders/default.frag</fragment-shader>
<attribute>
<name>instancePosition</name>
<index>10</index>
</attribute>
<attribute>
<name>instanceScale</name>
<index>11</index>
</attribute>
<attribute>
<name>attrib1</name>
<index>12</index>
</attribute>
<attribute>
<name>attrib2</name>
<index>13</index>
</attribute>
</program> </program>
</pass> </pass>
</technique> </technique>
<technique n="12"> <technique n="5">
<!-- Base Atmospheric scattering technique -->
<pass> <pass>
<lighting>true</lighting> <program>
<material> <vertex-shader n="0">Shaders/building-ALS.vert</vertex-shader>
<active> <attribute>
<use>material/active</use>
</active>
<ambient>
<use>material/ambient</use>
</ambient>
<diffuse>
<use>material/diffuse</use>
</diffuse>
<specular>
<use>material/specular</use>
</specular>
<emissive>
<use>material/emissive</use>
</emissive>
<shininess>
<use>material/shininess</use>
</shininess>
<color-mode>off</color-mode>
</material>
<render-bin>
<bin-number>2</bin-number>
<bin-name>RenderBin</bin-name>
</render-bin>
<blend>
<active>
<use>blend/active</use>
</active>
<source>
<use>blend/source</use>
</source>
<destination>
<use>blend/destination</use>
</destination>
</blend>
<shade-model>
<use>shade-model</use>
</shade-model>
<cull-face>
<use>cull-face</use>
</cull-face>
<rendering-hint>
<use>rendering-hint</use>
</rendering-hint>
<texture-unit>
<!-- The texture unit is always active because the shaders expect
that. -->
<unit>0</unit>
<!-- If there is a texture, the type in the derived effect
will be "2d". -->
<type>
<use>texture[0]/type</use>
</type>
<image>
<use>texture[0]/image</use>
</image>
<filter>
<use>texture[0]/filter</use>
</filter>
<wrap-s>
<use>texture[0]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[0]/wrap-t</use>
</wrap-t>
<!--
<internal-format>
<use>texture[0]/internal-format</use>
</internal-format>
-->
</texture-unit>
<vertex-program-two-side>
<use>vertex-program-two-side</use>
</vertex-program-two-side>
<program n="0">
<vertex-shader n="0">Shaders/building-default.vert</vertex-shader>
<fragment-shader n="0">Shaders/include_fog.frag</fragment-shader>
<!--fog include-->
<fragment-shader n="1">Shaders/default.frag</fragment-shader>
<attribute>
<name>instancePosition</name> <name>instancePosition</name>
<index>10</index> <index>10</index>
</attribute> </attribute>
<attribute> <attribute>
<name>instanceScale</name> <name>instanceScale</name>
<index>11</index> <index>11</index>
</attribute> </attribute>
<attribute> <attribute>
<name>attrib1</name> <name>attrib1</name>
<index>12</index> <index>12</index>
</attribute> </attribute>
<attribute> <attribute>
<name>attrib2</name>
<index>13</index>
</attribute>
</program>
</pass>
</technique>
<technique n="11">
<pass>
<program n="0">
<vertex-shader n="1">Shaders/building-default.vert</vertex-shader>
<attribute>
<name>instancePosition</name>
<index>10</index>
</attribute>
<attribute>
<name>instanceScale</name>
<index>11</index>
</attribute>
<attribute>
<name>attrib1</name>
<index>12</index>
</attribute>
<attribute>
<name>attrib2</name> <name>attrib2</name>
<index>13</index> <index>13</index>
</attribute> </attribute>
</program> </program>
<uniform>
<name>fogType</name>
<type>int</type>
<value>
<use>fogtype</use>
</value>
</uniform>
<uniform>
<name>texture</name>
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
<uniform>
<name>dataBuffer</name>
<type>sampler-1d</type>
<value type="int">1</value>
</uniform>
<uniform>
<name>colorMode</name>
<type>int</type>
<value>
<use>material/color-mode-uniform</use>
</value>
</uniform>
</pass> </pass>
</technique> </technique>

2
Effects/lightmap.eff
View file

@ -5,5 +5,5 @@ It's kept for backwards compatibility and should not be used on new projects.
--> -->
<PropertyList> <PropertyList>
<name>Effects/lightmap</name> <name>Effects/lightmap</name>
<inherits-from>model-default</inherits-from> <inherits-from>Effects/model-default</inherits-from>
</PropertyList> </PropertyList>

8
Effects/model-combined.eff
View file

@ -1293,4 +1293,12 @@ please see Docs/README.model-combined.eff for documentation
<!-- END shadows include --> <!-- END shadows include -->
</pass> </pass>
</technique> </technique>
<technique n="7">
<predicate><value type="bool">false</value></predicate>
</technique>
<technique n="9">
<predicate><value type="bool">false</value></predicate>
</technique>
</PropertyList> </PropertyList>

23
Effects/text-default.eff Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/text-default</name>
<technique n="10">
<pass>
<lighting>true</lighting>
<blend>
<active>true</active>
</blend>
<rendering-hint>transparent</rendering-hint>
<program>
<vertex-shader>Shaders/text.vert</vertex-shader>
<fragment-shader>Shaders/text.frag</fragment-shader>
<fragment-shader>Shaders/include_fog.frag</fragment-shader>
</program>
<uniform>
<name>glyphTexture</name>
<type>sampler-2d</type>
<value type="int">0</value>
</uniform>
</pass>
</technique>
</PropertyList>

1417
Effects/water-inland.eff
View file

File diff suppressed because it is too large Load diff

63
Effects/water.eff
View file

@ -59,6 +59,14 @@
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<texture n="8">
<image>Textures/Globe/globe_colors.jpg</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<texture n="10"> <texture n="10">
<image>Textures/Terrain/packice-overlay.png</image> <image>Textures/Terrain/packice-overlay.png</image>
<type>2d</type> <type>2d</type>
@ -67,6 +75,11 @@
<wrap-t>repeat</wrap-t> <wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format> <internal-format>normalized</internal-format>
</texture> </texture>
<use_specified_water_shallowness type="int">0</use_specified_water_shallowness>
<water_shallowness type="float">0.7</water_shallowness>
<use_specified_floor_color type="int">0</use_specified_floor_color>
<floor_color type="vec3d">0.054 0.149 0.384</floor_color>
<ocean_flag>1</ocean_flag>
<normalmap_dds type="float">0.0</normalmap_dds> <normalmap_dds type="float">0.0</normalmap_dds>
<saturation> <saturation>
<use>/rendering/scene/saturation</use> <use>/rendering/scene/saturation</use>
@ -380,6 +393,27 @@
<use>texture[10]/internal-format</use> <use>texture[10]/internal-format</use>
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<texture-unit>
<unit>8</unit>
<image>
<use>texture[8]/image</use>
</image>
<type>
<use>texture[8]/type</use>
</type>
<filter>
<use>texture[8]/filter</use>
</filter>
<wrap-s>
<use>texture[8]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[8]/wrap-t</use>
</wrap-t>
<internal-format>
<use>texture[8]/internal-format</use>
</internal-format>
</texture-unit>
<program> <program>
<vertex-shader>Shaders/water-ALS.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
@ -425,6 +459,31 @@
<type>sampler-2d</type> <type>sampler-2d</type>
<value type="int">7</value> <value type="int">7</value>
</uniform> </uniform>
<uniform>
<name>water_colormap</name>
<type>sampler-2d</type>
<value type="int">8</value>
</uniform>
<uniform>
<name>use_specified_water_shallowness</name>
<type>int</type>
<value><use>use_specified_water_shallowness</use></value>
</uniform>
<uniform>
<name>water_shallowness</name>
<type>float</type>
<value><use>water_shallowness</use></value>
</uniform>
<uniform>
<name>use_specified_floor_color</name>
<type>int</type>
<value><use>use_specified_floor_color</use></value>
</uniform>
<uniform>
<name>floor_color</name>
<type>float-vec3</type>
<value><use>floor_color</use></value>
</uniform>
<!-- normalmap is .dds--> <!-- normalmap is .dds-->
<uniform> <uniform>
<name>normalmap_dds</name> <name>normalmap_dds</name>
@ -942,7 +1001,7 @@
<uniform> <uniform>
<name>ocean_flag</name> <name>ocean_flag</name>
<type>int</type> <type>int</type>
<value>1</value> <value><use>ocean_flag</use></value>
</uniform> </uniform>
<!-- END fog include --> <!-- END fog include -->
</pass> </pass>
@ -1375,7 +1434,7 @@
<uniform> <uniform>
<name>ocean_flag</name> <name>ocean_flag</name>
<type>int</type> <type>int</type>
<value>1</value> <value><use>ocean_flag</use></value>
</uniform> </uniform>
<uniform> <uniform>
<name>display_xsize</name> <name>display_xsize</name>

1662
Effects/ws30water.eff
View file

File diff suppressed because it is too large Load diff

5
Materials/base/materials-base.xml
View file

@ -37,12 +37,13 @@
<load-resistance>1e30</load-resistance> <load-resistance>1e30</load-resistance>
</material> </material>
<material n="3001"> <material n="3001" include="Materials/base/water.xml">
<name>ws30water</name> <name>ws30water</name>
<name>ws30coastline</name>
<effect>Effects/ws30water</effect> <effect>Effects/ws30water</effect>
<texture>Terrain/water.png</texture>
</material> </material>
<!-- Signage --> <!-- Signage -->
<material n="1000"> <material n="1000">

173
Nasal/canvas/ErrorNotification.nas Normal file
View file

@ -0,0 +1,173 @@
var ErrorNotification =
{
SHOW_TIME: 10.0,
SLICE: 17,
MARGIN: 10,
new: func
{
var m = {
parents: [ErrorNotification, PropertyElement.new(["/sim/gui/canvas", "window"], nil)],
_title: "",
};
m.setInt("size[0]", 500);
m.setInt("size[1]", 400);
m.setBool("visible", 0);
m.setInt("z-index", gui.STACK_INDEX["always-on-top"]);
m._hideTimer = maketimer(m.SHOW_TIME, m, ErrorNotification._hideTimeout);
m._hideTimer.singleShot = 1;
m._reportIndex = 0;
return m;
},
# Destructor
del: func
{
me.parents[1].del();
if( me["_canvas"] != nil )
me._canvas.del();
},
_createCanvas: func()
{
var size = [
me.get("size[0]"),
me.get("size[1]")
];
me._canvas = new({
size: [2 * size[0], 2 * size[1]],
view: size,
placement: {
type: "window",
index: me._node.getIndex()
},
name: "Error Notification"
});
me.set("capture-events", 1);
me.set("fill", "rgba(255,255,255,0.8)");
# transparent background
me._canvas.setColorBackground(0.0, 0.0, 0.0, 0.0);
var root = me._canvas.createGroup();
me._root = root;
me._frame =
root.createChild("image", "background")
.set("src", "gui/images/tooltip.png")
.set("slice", me.SLICE ~ " fill")
.setSize(size);
me._warningIcon =
root.createChild("image", "warning-icon")
.set("src", "gui/images/warning-icon.png")
.setTranslation(me.SLICE, me.SLICE);
var iconWidth = me._warningIcon.get("size[0]");
me._text =
root.createChild("text", "error-description")
.setText("An error occurred")
.setAlignment("left-top")
.setFontSize(14)
.setFont("LiberationFonts/LiberationSans-Bold.ttf")
.setColor(1,1,1)
.setDrawMode(Text.TEXT)
.setTranslation(me.SLICE + iconWidth + me.MARGIN, me.SLICE);
me._canvas.addEventListener("mousedown", func me.clicked());
return me._canvas;
},
clicked: func()
{
me.hideNow();
fgcommand("show-error-report", props.Node.new({ "index": me._reportIndex})); # should we show the current one?
},
updateText: func()
{
var msg = getprop("/sim/error-report/display/category");
var clickForMoreMsg = "\n\nClick to show further details.";
me._text.setText(msg ~ clickForMoreMsg);
me._updateBounds();
},
_updateBounds: func
{
# the width of everything except the text
var extraWidth = me._warningIcon.get("size[0]") + me.MARGIN + (2 * me.SLICE);
var maxTextWidth = me.get("size[0]") - extraWidth;
me._text.setMaxWidth(maxTextWidth);
# compute the bounds
var text_bb = me._text.update().getBoundingBox();
var width = text_bb[2];
var height = text_bb[3];
if( width > maxTextWidth )
width = maxTextWidth;
me._width = width + extraWidth;
me._height = height + 2 * me.SLICE;
me._frame.setSize(me._width, me._height)
.update();
me._updatePosition();
},
_updatePosition: func
{
var INSET = 50;
var y = INSET;
var x = getprop('/sim/startup/xsize') - (me._width + INSET);
me.setInt("x", x);
me.setInt("y", y);
},
show: func(index)
{
me._reportIndex = index;
me._hideTimer.stop();
me.setBool("visible", 1);
me._hideTimer.start();
},
hideNow: func()
{
me._hideTimer.stop();
me._hideTimeout();
},
_hideTimeout: func()
{
me.setBool("visible", 0);
}
};
var errorNotificationCanvas = nil;
var showErrorNotification = func(node)
{
if (errorNotificationCanvas == nil) {
# create instance
errorNotificationCanvas = canvas.ErrorNotification.new();
errorNotificationCanvas._createCanvas();
}
errorNotificationCanvas.updateText();
var reportIndex = node.getNode("index").getValue();
errorNotificationCanvas.show(reportIndex);
}
addcommand("show-error-notification-popup", showErrorNotification);

5
Shaders/building-ALS.vert
View file

@ -28,6 +28,7 @@ attribute vec3 attrib2;
varying vec4 diffuse_term; varying vec4 diffuse_term;
varying vec3 normal; varying vec3 normal;
varying vec3 relPos; varying vec3 relPos;
varying vec4 ecPosition;
//varying float earthShade; //varying float earthShade;
//varying float yprime; //varying float yprime;
@ -55,6 +56,7 @@ const float terminator_width = 200000.0;
float earthShade; float earthShade;
//float mie_angle; //float mie_angle;
void setupShadows(vec4 eyeSpacePos);
float light_func (in float x, in float a, in float b, in float c, in float d, in float e) float light_func (in float x, in float a, in float b, in float c, in float d, in float e)
{ {
@ -308,4 +310,7 @@ if (use_IR_vision)
gl_FrontColor.rgb = constant_term.rgb; gl_FrontColor.rgb = constant_term.rgb;
gl_BackColor.rgb = constant_term.rgb; gl_BackColor.rgb = constant_term.rgb;
//gl_FrontColor.a = mie_angle; gl_BackColor.a = mie_angle; //gl_FrontColor.a = mie_angle; gl_BackColor.a = mie_angle;
ecPosition = gl_ModelViewMatrix * vec4(position, 1.0);
setupShadows(ecPosition);
} }

5
Shaders/building-default.vert
View file

@ -24,6 +24,7 @@ attribute vec3 attrib2;
// bugs with gl_FrontFacing in the fragment shader. // bugs with gl_FrontFacing in the fragment shader.
varying vec4 diffuse_term; varying vec4 diffuse_term;
varying vec3 normal; varying vec3 normal;
varying vec4 ecPosition;
uniform int colorMode; uniform int colorMode;
@ -33,6 +34,8 @@ uniform int colorMode;
//void fog_Func(int type); //void fog_Func(int type);
///////////////////////// /////////////////////////
void setupShadows(vec4 eyeSpacePos);
const float c_precision = 128.0; const float c_precision = 128.0;
const float c_precisionp1 = c_precision + 1.0; const float c_precisionp1 = c_precision + 1.0;
@ -132,4 +135,6 @@ void main()
gl_BackColor.rgb = constant_term.rgb; gl_BackColor.a = 0.0; gl_BackColor.rgb = constant_term.rgb; gl_BackColor.a = 0.0;
//fogCoord = abs(ecPosition.z / ecPosition.w); //fogCoord = abs(ecPosition.z / ecPosition.w);
//fog_Func(fogType); //fog_Func(fogType);
ecPosition = gl_ModelViewMatrix * vec4(position, 1.0);
setupShadows(ecPosition);
} }

3
Shaders/glass-ALS.frag
View file

@ -91,9 +91,10 @@ vec3 lightmapcolor = vec3(0.0, 0.0, 0.0);
if (use_reflection_lightmap == 1) if (use_reflection_lightmap == 1)
{ {
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor); vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * reflection_lighting;
if (lightmap_multi > 0 ) if (lightmap_multi > 0 )
{ {
lightmapFactor = lightmapFactor * reflection_lighting;
lightmapcolor = lightmap_r_color * lightmapFactor.r + lightmapcolor = lightmap_r_color * lightmapFactor.r +
lightmap_g_color * lightmapFactor.g + lightmap_g_color * lightmapFactor.g +
lightmap_b_color * lightmapFactor.b + lightmap_b_color * lightmapFactor.b +

3
Shaders/hud-ALS.frag
View file

@ -124,9 +124,10 @@ vec3 lightmapcolor = vec3(0.0, 0.0, 0.0);
if (use_reflection_lightmap == 1) if (use_reflection_lightmap == 1)
{ {
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor); vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * reflection_lighting;
if (lightmap_multi > 0 ) if (lightmap_multi > 0 )
{ {
lightmapFactor = lightmapFactor * reflection_lighting;
lightmapcolor = lightmap_r_color * lightmapFactor.r + lightmapcolor = lightmap_r_color * lightmapFactor.r +
lightmap_g_color * lightmapFactor.g + lightmap_g_color * lightmapFactor.g +
lightmap_b_color * lightmapFactor.b + lightmap_b_color * lightmapFactor.b +

3
Shaders/model-ALS-ultra.frag
View file

@ -515,8 +515,9 @@ void main (void)
vec3 lightmapcolor = vec3(0.0); vec3 lightmapcolor = vec3(0.0);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor,
lightmap_b_factor, lightmap_a_factor); lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 ){ if (lightmap_multi > 0 ){
lightmapFactor = lightmapFactor * lightmapTexel;
//lightmapcolor = lightmap_r_color * lightmapFactor.r + //lightmapcolor = lightmap_r_color * lightmapFactor.r +
// lightmap_g_color * lightmapFactor.g + // lightmap_g_color * lightmapFactor.g +
// lightmap_b_color * lightmapFactor.b + // lightmap_b_color * lightmapFactor.b +

3
Shaders/model-interior-ALS-detailed.frag
View file

@ -227,9 +227,10 @@ void main()
{ {
vec4 lightmapTexel = texture2D(lightmap_texture, gl_TexCoord[0].st); vec4 lightmapTexel = texture2D(lightmap_texture, gl_TexCoord[0].st);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor); vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 ) if (lightmap_multi > 0 )
{ {
lightmapFactor = lightmapFactor * lightmapTexel;
//lightmapcolor = lightmap_r_color * lightmapFactor.r + //lightmapcolor = lightmap_r_color * lightmapFactor.r +
//lightmap_g_color * lightmapFactor.g + //lightmap_g_color * lightmapFactor.g +
// lightmap_b_color * lightmapFactor.b + // lightmap_b_color * lightmapFactor.b +

3
Shaders/model-interior-display-ALS.frag
View file

@ -321,12 +321,11 @@ void main()
{ {
vec4 lightmapTexel = texture2D(lightmap_texture, gl_TexCoord[0].st); vec4 lightmapTexel = texture2D(lightmap_texture, gl_TexCoord[0].st);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor); vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 ) if (lightmap_multi > 0 )
{ {
lightmapFactor = lightmapFactor * lightmapTexel;
lightmapcolor = lightmap_r_color * lightmapFactor.r; lightmapcolor = lightmap_r_color * lightmapFactor.r;

3
Shaders/space-ALS-ultra.frag
View file

@ -489,8 +489,9 @@ void main (void)
vec3 lightmapcolor = vec3(0.0); vec3 lightmapcolor = vec3(0.0);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor,
lightmap_b_factor, lightmap_a_factor); lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 ){ if (lightmap_multi > 0 ){
lightmapFactor = lightmapFactor * lightmapTexel;
//lightmapcolor = lightmap_r_color * lightmapFactor.r + //lightmapcolor = lightmap_r_color * lightmapFactor.r +
//lightmap_g_color * lightmapFactor.g + //lightmap_g_color * lightmapFactor.g +
//lightmap_b_color * lightmapFactor.b + //lightmap_b_color * lightmapFactor.b +

44
Shaders/text.frag Normal file
View file

@ -0,0 +1,44 @@
#version 120
uniform sampler2D glyphTexture;
varying vec4 diffuse_term;
varying vec3 normal;
varying vec4 ecPosition;
////fog "include" /////
vec3 fog_Func(vec3 color, int type);
//////////////////////
void main()
{
float alpha = texture2D(glyphTexture, gl_TexCoord[0].st).a;
if (alpha == 0.0) discard;
float NdotL, NdotHV, fogFactor;
vec4 color = gl_Color;
vec3 lightDir = gl_LightSource[0].position.xyz;
vec3 halfVector = gl_LightSource[0].halfVector.xyz;
vec4 fragColor;
vec4 specular = vec4(0.0);
NdotL = dot(normal, lightDir);
if (NdotL > 0.0) {
color += diffuse_term * NdotL;
NdotHV = max(dot(normal, halfVector), 0.0);
if (gl_FrontMaterial.shininess > 0.0)
specular.rgb = (gl_FrontMaterial.specular.rgb
* gl_LightSource[0].specular.rgb
* pow(NdotHV, gl_FrontMaterial.shininess));
}
// This shouldn't be necessary, but our lighting becomes very
// saturated. Clamping the color before modulating by the texture
// is closer to what the OpenGL fixed function pipeline does.
color = clamp(color, 0.0, 1.0);
fragColor = color + specular;
fragColor = vec4(fragColor.rgb, fragColor.a * alpha);
fragColor.rgb = fog_Func(fragColor.rgb, 0);
gl_FragColor = fragColor;
}

16
Shaders/text.vert Normal file
View file

@ -0,0 +1,16 @@
#version 120
varying vec4 diffuse_term;
varying vec3 normal;
varying vec4 ecPosition;
void main()
{
gl_Position = ftransform();
ecPosition = gl_ModelViewMatrix * gl_Vertex;
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
normal = gl_NormalMatrix * gl_Normal;
diffuse_term = gl_FrontMaterial.diffuse * gl_LightSource[0].diffuse;
gl_FrontColor = gl_FrontMaterial.emission + gl_FrontMaterial.ambient *
(gl_LightModel.ambient + gl_LightSource[0].ambient);
}

74
Shaders/water-ALS-high.frag
View file

@ -9,6 +9,7 @@
#version 120 #version 120
uniform sampler2D water_normalmap; uniform sampler2D water_normalmap;
uniform sampler2D water_colormap;
uniform sampler2D water_dudvmap; uniform sampler2D water_dudvmap;
uniform sampler2D sea_foam; uniform sampler2D sea_foam;
uniform sampler2D perlin_normalmap; uniform sampler2D perlin_normalmap;
@ -27,7 +28,7 @@ varying vec3 lightdir;
varying vec3 relPos; varying vec3 relPos;
varying vec3 rawPos; varying vec3 rawPos;
varying vec2 TopoUV; varying vec2 TopoUV;
uniform vec3 floor_color;
varying float earthShade; varying float earthShade;
varying float yprime_alt; varying float yprime_alt;
@ -45,7 +46,7 @@ uniform float normalmap_dds;
uniform float hazeLayerAltitude; uniform float hazeLayerAltitude;
uniform float terminator; uniform float terminator;
uniform float terrain_alt; uniform float terrain_alt;
uniform float avisibility; uniform float avisibility;
uniform float visibility; uniform float visibility;
uniform float overcast; uniform float overcast;
@ -58,6 +59,7 @@ uniform float ice_cover;
uniform float sea_r; uniform float sea_r;
uniform float sea_g; uniform float sea_g;
uniform float sea_b; uniform float sea_b;
uniform float water_shallowness;
uniform float air_pollution; uniform float air_pollution;
uniform float landing_light1_offset; uniform float landing_light1_offset;
uniform float landing_light2_offset; uniform float landing_light2_offset;
@ -70,6 +72,8 @@ uniform float wash_strength;
uniform int quality_level; uniform int quality_level;
uniform int tquality_level; uniform int tquality_level;
uniform int ocean_flag; uniform int ocean_flag;
uniform int use_specified_water_shallowness;
uniform int use_specified_floor_color;
uniform int cloud_shadow_flag; uniform int cloud_shadow_flag;
uniform int use_searchlight; uniform int use_searchlight;
uniform int use_landing_light; uniform int use_landing_light;
@ -218,10 +222,25 @@ void main(void)
float noise_2000m = Noise3D(rawPos.xyz,2000.0); float noise_2000m = Noise3D(rawPos.xyz,2000.0);
float noise_2500m = Noise3D(rawPos.xyz, 2500.0); float noise_2500m = Noise3D(rawPos.xyz, 2500.0);
// get depth map // get water shallowness and floor colour
vec4 topoTexel = texture2D(topo_map, TopoUV); float shallowness;
float floorMixFactor = smoothstep(0.3, 0.985, topoTexel.a); if (use_specified_water_shallowness == 0)
vec3 floorColour = topoTexel.rgb; {
vec4 depthTexel = texture2D(topo_map, TopoUV);
shallowness = depthTexel.r;
} else {
shallowness = water_shallowness;
}
float floorMixFactor = smoothstep(0.3, 0.985, shallowness);
vec3 floorColour;
if (use_specified_floor_color == 0)
{
vec4 colorTexel = texture2D(water_colormap, TopoUV);
floorColour = colorTexel.rgb;
} else {
floorColour = floor_color;
}
mat4 RotationMatrix; mat4 RotationMatrix;
@ -256,7 +275,7 @@ void main(void)
// we only need detail in the near zone or where the sun reflection is // we only need detail in the near zone or where the sun reflection is
int detail_flag; int detail_flag;
if ((dist > 15000.0) && (dot(normalize(vec3 (lightdir.x, lightdir.y, 0.0) ), normalize(relPos)) < 0.7 )) {detail_flag = 0;} if ((dist > 15000.0) && (dot(normalize(vec3 (lightdir.x, lightdir.y, 0.0) ), normalize(relPos)) < 0.7 )) {detail_flag = 0;}
else {detail_flag = 1;} else {detail_flag = 1;}
//detail_flag = 1; //detail_flag = 1;
@ -365,19 +384,19 @@ void main(void)
refl.r = sea_r; refl.r = sea_r;
refl.g = sea_g; refl.g = sea_g;
refl.b = sea_b; refl.b = sea_b;
refl.a = 1.0; refl.a = 1.0;
refl.g = refl.g * (0.9 + 0.2* noise_2500m); refl.g = refl.g * (0.9 + 0.2* noise_2500m);
// the depth map works perfectly fine for both ocean and inland water texels // the depth map works perfectly fine for both ocean and inland water texels
refl.rgb = mix(refl.rgb, 0.65* floorColour, floorMixFactor); refl.rgb = mix(refl.rgb, 0.65* floorColour, floorMixFactor);
refl.rgb = refl.rgb * (0.5 + 0.5 * smoothstep(0.0,0.3,topoTexel.a)); refl.rgb = refl.rgb * (0.5 + 0.5 * smoothstep(0.0,0.3,shallowness));
float intensity; float intensity;
// de-saturate for reduced light // de-saturate for reduced light
refl.rgb = mix(refl.rgb, vec3 (0.248, 0.248, 0.248), 1.0 - smoothstep(0.1, 0.8, ground_scattering)); refl.rgb = mix(refl.rgb, vec3 (0.248, 0.248, 0.248), 1.0 - smoothstep(0.1, 0.8, ground_scattering));
// de-saturate light for overcast haze // de-saturate light for overcast haze
intensity = length(refl.rgb); intensity = length(refl.rgb);
@ -457,7 +476,7 @@ void main(void)
// compute cloud shadow effect // compute cloud shadow effect
float shadowValue; float shadowValue;
if (cloud_shadow_flag == 1) if (cloud_shadow_flag == 1)
{ {
shadowValue = shadow_func(relPos.x, relPos.y, 0.3 * noise_250m + 0.5 * noise_500m+0.2 * noise_1500m, dist); shadowValue = shadow_func(relPos.x, relPos.y, 0.3 * noise_250m + 0.5 * noise_500m+0.2 * noise_1500m, dist);
specular = specular * shadowValue; specular = specular * shadowValue;
@ -517,13 +536,12 @@ void main(void)
float surfFact = 0.0; float surfFact = 0.0;
surfFact += washStrength; surfFact += washStrength;
if ((windEffect >= 8.0) || (steepness < 0.999) || (shallowness > 0.9) || (washStrength > 0.5))
if ((windEffect >= 8.0) || (steepness < 0.999) || (topoTexel.a > 0.98) || (washStrength > 0.5)) {
{ if ((waveSlope > 0.0) && (ocean_flag ==1))
if ((waveSlope > 0.0) && (ocean_flag ==1))
{ {
surfFact = surfFact +(1.0 -smoothstep(0.97,1.0,steepness)); surfFact = surfFact +(1.0 -smoothstep(0.97,1.0,steepness));
surfFact += 0.5 * smoothstep(0.98,1.0,topoTexel.a); surfFact += 0.5 * smoothstep(0.98,1.0,shallowness);
} }
waveSlope = waveSlope + 2.0 * surfFact; waveSlope = waveSlope + 2.0 * surfFact;
@ -545,7 +563,7 @@ void main(void)
finalColor = mix(finalColor, ice_texel, mix_factor * ice_texel.a); finalColor = mix(finalColor, ice_texel, mix_factor * ice_texel.a);
finalColor.a = 1.0; finalColor.a = 1.0;
@ -563,7 +581,7 @@ void main(void)
float outscatter; float outscatter;
if ((quality_level > 5) && (tquality_level > 5)) if ((quality_level > 5) && (tquality_level > 5))
{ {
rayleigh_length = 0.4 * avisibility * (2.5 - 1.9 * air_pollution)/alt_factor(eye_alt, eye_alt+relPos.z); rayleigh_length = 0.4 * avisibility * (2.5 - 1.9 * air_pollution)/alt_factor(eye_alt, eye_alt+relPos.z);
outscatter = 1.0-exp(-dist/rayleigh_length); outscatter = 1.0-exp(-dist/rayleigh_length);
finalColor.rgb = rayleigh_out_shift(finalColor.rgb,outscatter); finalColor.rgb = rayleigh_out_shift(finalColor.rgb,outscatter);
@ -588,7 +606,7 @@ void main(void)
float delta_z = hazeLayerAltitude - eye_alt; float delta_z = hazeLayerAltitude - eye_alt;
float mvisibility = min(visibility,avisibility); float mvisibility = min(visibility,avisibility);
if (dist > 0.04 * mvisibility) if (dist > 0.04 * mvisibility)
{ {
@ -608,7 +626,7 @@ float ct = dot(vec3(0.0, 0.0, 1.0), relPos)/dist;
if (delta_z > 0.0) // we're inside the layer if (delta_z > 0.0) // we're inside the layer
{ {
if (ct < 0.0) // we look down if (ct < 0.0) // we look down
{ {
distance_in_layer = dist; distance_in_layer = dist;
vAltitude = min(distance_in_layer,mvisibility) * ct; vAltitude = min(distance_in_layer,mvisibility) * ct;
@ -634,10 +652,10 @@ if (delta_z > 0.0) // we're inside the layer
else else
{ {
vAltitude = H + delta_z; vAltitude = H + delta_z;
distance_in_layer = vAltitude/H * dist; distance_in_layer = vAltitude/H * dist;
vAltitude = min(distance_in_layer,visibility) * (-ct); vAltitude = min(distance_in_layer,visibility) * (-ct);
delta_zv = vAltitude; delta_zv = vAltitude;
} }
} }
@ -663,7 +681,7 @@ if (visibility < avisibility)
// this combines the Weber-Fechner intensity // this combines the Weber-Fechner intensity
eqColorFactor = 1.0 - 0.1 * delta_zv/visibility - (1.0 -effective_scattering); eqColorFactor = 1.0 - 0.1 * delta_zv/visibility - (1.0 -effective_scattering);
} }
else else
{ {
if (quality_level > 3) if (quality_level > 3)
{ {
@ -694,7 +712,7 @@ float eShade = 1.0 - 0.9 * smoothstep(-terminator_width+ terminator, terminator_
if (lightArg < 10.0) if (lightArg < 10.0)
{intensity = length(hazeColor); {intensity = length(hazeColor);
float mie_magnitude = 0.5 * smoothstep(350000.0, 150000.0, terminator-sqrt(2.0 * EarthRadius * terrain_alt)); float mie_magnitude = 0.5 * smoothstep(350000.0, 150000.0, terminator-sqrt(2.0 * EarthRadius * terrain_alt));
hazeColor = intensity * ((1.0 - mie_magnitude) + mie_magnitude * mie_angle) * normalize(mix(hazeColor, vec3 (0.5, 0.58, 0.65), mie_magnitude * (0.5 - 0.5 * mie_angle)) ); hazeColor = intensity * ((1.0 - mie_magnitude) + mie_magnitude * mie_angle) * normalize(mix(hazeColor, vec3 (0.5, 0.58, 0.65), mie_magnitude * (0.5 - 0.5 * mie_angle)) );
} }
// high altitude desaturation of the haze color // high altitude desaturation of the haze color
@ -709,16 +727,16 @@ if (intensity > 0.0) // this needs to be a condition, because otherwise hazeColo
// blue hue of haze // blue hue of haze
hazeColor.x = hazeColor.x * 0.83; hazeColor.x = hazeColor.x * 0.83;
hazeColor.y = hazeColor.y * 0.9; hazeColor.y = hazeColor.y * 0.9;
// additional blue in indirect light // additional blue in indirect light
float fade_out = max(0.65 - 0.3 *overcast, 0.45); float fade_out = max(0.65 - 0.3 *overcast, 0.45);
intensity = length(hazeColor); intensity = length(hazeColor);
hazeColor = intensity * normalize(mix(hazeColor, 1.5* shadedFogColor, 1.0 -smoothstep(0.25, fade_out,eShade) )); hazeColor = intensity * normalize(mix(hazeColor, 1.5* shadedFogColor, 1.0 -smoothstep(0.25, fade_out,eShade) ));
// change haze color to blue hue for strong fogging // change haze color to blue hue for strong fogging
hazeColor = intensity * normalize(mix(hazeColor, shadedFogColor, (1.0-smoothstep(0.5,0.9,eqColorFactor)))); hazeColor = intensity * normalize(mix(hazeColor, shadedFogColor, (1.0-smoothstep(0.5,0.9,eqColorFactor))));
} }

27
Textures/Globe/02READMElakes.txt Normal file
View file

@ -0,0 +1,27 @@
The HydroLAKES database provides a seamless high-resolution map of the world’s
lakes and their main characteristics in support of a broad range of global-scale
assessments and analyses, with a focus on improving users’ ability to model the
important roles that lakes play in the global environment. The current version
contains the polygons for 1.5 million individual lakes.
HydroLAKES aims to be as comprehensive and consistent as possible at a global
scale and contains both freshwater and saline lakes, including the Caspian Sea,
as well as human-made reservoirs and regulated lakes. HydroLAKES achieves
virtually full completion for lakes above 35 ha in area and close to full
completion for lakes between 10 and 35 ha.
HydroLAKES is publicly available for download at
http://www.hydrosheds.org and is free for scientific, educational, and
other uses. The data is licensed under a Creative Commons Attribution
4.0 International License (see section 4). By downloading and using the data
the user agrees to the terms and conditions of this license. The copyright
© of HydroLAKES is held by the authors, 2016, all rights reserved.
Citations and acknowledgements of the HydroLAKES database should be made as
follows:
Messager, M.L., Lehner, B., Grill, G., Nedeva, I., Schmitt, O. (2016):
Estimating the volume and age of water stored in global lakes using a
geo-statistical approach.
Nature Communications: 13603. doi: 10.1038/ncomms13603.
Data is available at www.hydrosheds.org

BIN
Textures/Globe/world.topo.bathy.200407.3x4096x2048.png → Textures/Globe/globe_colors.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 8.9 MiB

BIN
Textures/Globe/ocean_depth_1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
Textures/Terrain/coastline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 159 KiB

4
Translations/de/FlightGear-Qt.xlf
View file

@ -316,7 +316,7 @@ Local path: %2</source>
</trans-unit> </trans-unit>
<trans-unit id="_msg53"> <trans-unit id="_msg53">
<source xml:space="preserve">Uninstall</source> <source xml:space="preserve">Uninstall</source>
<target xml:space="preserve" state="needs-review-translation">Desinstallieren</target> <target xml:space="preserve" state="needs-review-translation">Deinstallieren</target>
<context-group purpose="location"><context context-type="linenumber">60</context></context-group> <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
<context-group purpose="location"><context context-type="linenumber">195</context></context-group> <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
</trans-unit> </trans-unit>
@ -344,7 +344,7 @@ Local path: %2</source>
</trans-unit> </trans-unit>
<trans-unit id="_msg58"> <trans-unit id="_msg58">
<source xml:space="preserve">Are you sure you want to uninstall this aircraft?</source> <source xml:space="preserve">Are you sure you want to uninstall this aircraft?</source>
<target xml:space="preserve" state="needs-review-translation">Möchtest Du dieses Flugzeug wirklich desinstallieren?</target> <target xml:space="preserve" state="needs-review-translation">Möchtest Du dieses Flugzeug wirklich deinstallieren?</target>
<context-group purpose="location"><context context-type="linenumber">193</context></context-group> <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
</trans-unit> </trans-unit>
</group> </group>

1
Translations/default/menu.xml
View file

@ -18,6 +18,7 @@
<terrasync>Scenery Download</terrasync> <terrasync>Scenery Download</terrasync>
<aircraft-center>Aircraft Center (Experimental)</aircraft-center> <aircraft-center>Aircraft Center (Experimental)</aircraft-center>
<exit>Quit</exit> <exit>Quit</exit>
<error-reports>View Errors</error-reports>
<!-- View menu --> <!-- View menu -->
<view>View</view> <view>View</view>

3
Translations/default/sys.xml
View file

@ -57,7 +57,8 @@
<error-category-traffic>Problems occured loading simulated aircaft traffic: some traffic may not appear.</error-category-traffic> <error-category-traffic>Problems occured loading simulated aircaft traffic: some traffic may not appear.</error-category-traffic>
<error-category-out-of-memory>Allocating memory failed. Some resources will not be loaded. Adjust your settings to reduce view distance or number of objects loaded.</error-category-out-of-memory> <error-category-out-of-memory>Allocating memory failed. Some resources will not be loaded. Adjust your settings to reduce view distance or number of objects loaded.</error-category-out-of-memory>
<error-category-multiplayer>Loading a model for another pilot (via multi-player) failed. The other pilot will appear as a default model. (You can disable these errors from the multiplayer settings dialog)</error-category-multiplayer> <error-category-multiplayer>Loading a model for another pilot (via multi-player) failed. The other pilot will appear as a default model. (You can disable these errors from the multiplayer settings dialog)</error-category-multiplayer>
<error-category-shaders>Problems occurred loading visual effects (shaders). This can cause objects to be invisible or appear incorrect. It can sometimes be fixed by changing rendering settings inside FlightGear, or occasionally, by updating the drivers for your graphics card.</error-category-shaders>
<error-type-unknown>Unknown error</error-type-unknown> <error-type-unknown>Unknown error</error-type-unknown>
<error-type-not-found>The file or resource was not found</error-type-not-found> <error-type-not-found>The file or resource was not found</error-type-not-found>
<error-type-out-of-memory>Unable to allocate sufficient memory</error-type-out-of-memory> <error-type-out-of-memory>Unable to allocate sufficient memory</error-type-out-of-memory>

2
Video/graphics-properties.xml
View file

@ -53,7 +53,7 @@ particular list.
<property>/sim/rendering/vegetation-density</property> <property>/sim/rendering/vegetation-density</property>
<!-- Atmospheric Effects --> <!-- Atmospheric Effects -->
<property>/sim/rendering/particles</property> <property>/sim/rendering/particles</property>
<property>/sim/rendering/precipitation-enable</property> <property>/sim/rendering/precipitation-gui-enable</property>
<property>/sim/rendering/clouds3d-enable</property> <property>/sim/rendering/clouds3d-enable</property>
</save-to-file> </save-to-file>

2
Video/high-quality-preset.xml
View file

@ -44,7 +44,7 @@
<random-vegetation-shadows type="bool">true</random-vegetation-shadows> <random-vegetation-shadows type="bool">true</random-vegetation-shadows>
<vegetation-density type="float">2.0</vegetation-density> <vegetation-density type="float">2.0</vegetation-density>
<particles type="bool">true</particles> <particles type="bool">true</particles>
<precipitation-enable type="bool">true</precipitation-enable> <precipitation-gui-enable type="bool">true</precipitation-gui-enable>
<clouds3d-enable type="bool">true</clouds3d-enable> <clouds3d-enable type="bool">true</clouds3d-enable>
</rendering> </rendering>
</sim> </sim>

2
Video/low-quality-preset.xml
View file

@ -44,7 +44,7 @@
<random-vegetation-shadows type="bool">false</random-vegetation-shadows> <random-vegetation-shadows type="bool">false</random-vegetation-shadows>
<vegetation-density type="float">0.5</vegetation-density> <vegetation-density type="float">0.5</vegetation-density>
<particles type="bool">true</particles> <particles type="bool">true</particles>
<precipitation-enable type="bool">true</precipitation-enable> <precipitation-gui-enable type="bool">true</precipitation-gui-enable>
<clouds3d-enable type="bool">true</clouds3d-enable> <clouds3d-enable type="bool">true</clouds3d-enable>
</rendering> </rendering>
</sim> </sim>

2
Video/medium-quality-preset.xml
View file

@ -44,7 +44,7 @@
<random-vegetation-shadows type="bool">true</random-vegetation-shadows> <random-vegetation-shadows type="bool">true</random-vegetation-shadows>
<vegetation-density type="float">1.0</vegetation-density> <vegetation-density type="float">1.0</vegetation-density>
<particles type="bool">true</particles> <particles type="bool">true</particles>
<precipitation-enable type="bool">true</precipitation-enable> <precipitation-gui-enable type="bool">true</precipitation-gui-enable>
<clouds3d-enable type="bool">true</clouds3d-enable> <clouds3d-enable type="bool">true</clouds3d-enable>
</rendering> </rendering>
</sim> </sim>

2
Video/minimal-quality-preset.xml
View file

@ -44,7 +44,7 @@
<random-vegetation-shadows type="bool">false</random-vegetation-shadows> <random-vegetation-shadows type="bool">false</random-vegetation-shadows>
<vegetation-density type="float">0.0</vegetation-density> <vegetation-density type="float">0.0</vegetation-density>
<particles type="bool">false</particles> <particles type="bool">false</particles>
<precipitation-enable type="bool">false</precipitation-enable> <precipitation-gui-enable type="bool">false</precipitation-gui-enable>
<clouds3d-enable type="bool">false</clouds3d-enable> <clouds3d-enable type="bool">false</clouds3d-enable>
</rendering> </rendering>
</sim> </sim>

2
Video/ultra-quality-preset.xml
View file

@ -44,7 +44,7 @@
<random-vegetation-shadows type="bool">true</random-vegetation-shadows> <random-vegetation-shadows type="bool">true</random-vegetation-shadows>
<vegetation-density type="float">4.0</vegetation-density> <vegetation-density type="float">4.0</vegetation-density>
<particles type="bool">true</particles> <particles type="bool">true</particles>
<precipitation-enable type="bool">true</precipitation-enable> <precipitation-gui-enable type="bool">true</precipitation-gui-enable>
<clouds3d-enable type="bool">true</clouds3d-enable> <clouds3d-enable type="bool">true</clouds3d-enable>
</rendering> </rendering>
</sim> </sim>

10
defaults.xml
View file

@ -78,6 +78,9 @@ Started September 2000 by David Megginson, david@megginson.com
<water type="float" userarchive="y">1.0</water> <water type="float" userarchive="y">1.0</water>
<wind-effects type="float" userarchive="y">0.0</wind-effects> <wind-effects type="float" userarchive="y">0.0</wind-effects>
<vegetation-effects type="float" userarchive="y">0.0</vegetation-effects> <vegetation-effects type="float" userarchive="y">0.0</vegetation-effects>
<!-- Legacy property. Kept for backwards compatibility with aircraft
with custom shaders -->
<quality-level type="float" userarchive="y">5.0</quality-level>
</shaders> </shaders>
<mie type="float" userarchive="y">0.003</mie> <mie type="float" userarchive="y">0.003</mie>
<rayleigh type="float" userarchive="y">0.0003</rayleigh> <rayleigh type="float" userarchive="y">0.0003</rayleigh>
@ -115,6 +118,8 @@ Started September 2000 by David Megginson, david@megginson.com
<line-features-lod-level type="int" userarchive="y">5</line-features-lod-level> <line-features-lod-level type="int" userarchive="y">5</line-features-lod-level>
<area-features-lod-level type="int" userarchive="y">5</area-features-lod-level> <area-features-lod-level type="int" userarchive="y">5</area-features-lod-level>
<vegetation-lod-level type="int" userarchive="y">6</vegetation-lod-level> <vegetation-lod-level type="int" userarchive="y">6</vegetation-lod-level>
<coastline-lod-level type="int" userarchive="y">3</coastline-lod-level>
<coastline-width type="float" userarchive="y">80.0</coastline-width>
<lod-level n="0"> <lod-level n="0">
<area-features-min-width>10000</area-features-min-width> <area-features-min-width>10000</area-features-min-width>
<line-features-min-width>9999.9</line-features-min-width> <line-features-min-width>9999.9</line-features-min-width>
@ -836,6 +841,9 @@ Started September 2000 by David Megginson, david@megginson.com
</record-extra-properties-paths> </record-extra-properties-paths>
</replay> </replay>
<airport> <airport>
<min-tower-height-ft type="double">6</min-tower-height-ft> <!-- a.k.a chap on the ground with a radio waving frantically -->
<max-tower-height-ft type="double">70</max-tower-height-ft> <!-- the average tower height is 10.51m; so this is a reasonable limit-->
<default-tower-height-ft type="double">30</default-tower-height-ft> <!-- based on the average tower height of ~10.5m-->
<runways> <runways>
<start-offset-m type="double">5.0</start-offset-m> <start-offset-m type="double">5.0</start-offset-m>
<search> <search>
@ -954,6 +962,7 @@ Started September 2000 by David Megginson, david@megginson.com
<enable type="bool">false</enable> <enable type="bool">false</enable>
</tile-cache> </tile-cache>
<time> <time>
<frame-time-offset-ms type="double" userarchive="n">0.0</frame-time-offset-ms>
<warp-easing type="bool">true</warp-easing> <warp-easing type="bool">true</warp-easing>
<warp-easing-method type="string">swing</warp-easing-method> <warp-easing-method type="string">swing</warp-easing-method>
<warp-easing-duration-secs type="double">10</warp-easing-duration-secs> <warp-easing-duration-secs type="double">10</warp-easing-duration-secs>
@ -969,6 +978,7 @@ Started September 2000 by David Megginson, david@megginson.com
<error-report userarchive="y"> <error-report userarchive="y">
<enabled type="bool">true</enabled> <enabled type="bool">true</enabled>
<mp-report-enabled type="bool">true</mp-report-enabled> <mp-report-enabled type="bool">true</mp-report-enabled>
<enable-in-developer-mode type="bool">false</enable-in-developer-mode>
</error-report> </error-report>
<model> <model>
<livery> <livery>

4
gui/dialogs/advanced-graphics-options.xml
View file

@ -281,14 +281,14 @@
<value>Enabled</value> <value>Enabled</value>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>model-quality</object-name> <object-name>model-effects</object-name>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
var val = getprop("/sim/gui/dialogs/advanced/model-effects"); var val = getprop("/sim/gui/dialogs/advanced/model-effects");
if (val == "Enabled") { if (val == "Enabled") {
setprop("/sim/rendering/shaders/model", 1); setprop("/sim/rendering/shaders/model", 3);
} else { } else {
setprop("/sim/rendering/shaders/model", 0); setprop("/sim/rendering/shaders/model", 0);
} }

30
gui/dialogs/error-report.xml
View file

@ -86,6 +86,36 @@
<empty><stretch>1</stretch></empty> <empty><stretch>1</stretch></empty>
<button>
<legend>Previous error</legend>
<binding>
<command>show-error-report</command>
<previous type="bool">true</previous>
</binding>
<binding>
<command>dialog-update</command>
</binding>
<visible>
<property>/sim/error-report/display/have-previous</property>
</visible>
</button>
<button>
<legend>Next error</legend>
<binding>
<command>show-error-report</command>
<next type="bool">true</next>
</binding>
<binding>
<command>dialog-update</command>
</binding>
<visible>
<property>/sim/error-report/display/have-next</property>
</visible>
</button>
<button> <button>
<legend>Close</legend> <legend>Close</legend>
<binding> <binding>

46
gui/dialogs/static-lod.xml
View file

@ -825,6 +825,52 @@
<live>true</live> <live>true</live>
<property>/sim/rendering/static-lod/area-features-lod-level</property> <property>/sim/rendering/static-lod/area-features-lod-level</property>
</text> </text>
<text>
<row>4</row>
<col>0</col>
<enable>
<equals>
<property>/scenery/use-vpb</property>
<value>true</value>
</equals>
</enable>
<label>Detailed coastline minimum LOD</label>
</text>
<slider>
<row>4</row>
<col>1</col>
<name>coast-lod</name>
<enable>
<equals>
<property>/scenery/use-vpb</property>
<value>true</value>
</equals>
</enable>
<min>0.0</min>
<max>6.0</max>
<step>1.0</step>
<fraction>0.17</fraction>
<property>/sim/rendering/static-lod/coastline-lod-level</property>
<binding>
<command>dialog-apply</command>
<object-name>coast-lod</object-name>
</binding>
</slider>
<text>
<row>4</row>
<col>2</col>
<label>1</label>
<enable>
<equals>
<property>/scenery/use-vpb</property>
<value>true</value>
</equals>
</enable>
<format>%d</format>
<live>true</live>
<property>/sim/rendering/static-lod/coastline-lod-level</property>
</text>
</group> </group>
</group> </group>

BIN
gui/images/warning-icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

7
gui/menubar.xml
View file

@ -80,6 +80,13 @@
</binding> </binding>
</item> </item>
<item>
<name>error-reports</name>
<binding>
<command>show-error-report</command>
</binding>
</item>
<item> <item>
<name>exit</name> <name>exit</name>
<key>Esc</key> <key>Esc</key>