1
0
Fork 0

Merge branch 'dev' into maint

This commit is contained in:
legoboyvdlp R 2020-05-15 13:54:14 +01:00
commit b2f20c6635
383 changed files with 556520 additions and 559726 deletions

View file

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList include="A320-main.xml">
<sim>
<sound>
<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
</sound>
<checklists include="A32X-Checklists.xml"/>
<description>Airbus A320-111 (CFM56-5A1)</description>
<flight-model>jsb</flight-model>
<aero>A320-100-CFM</aero>
@ -28,6 +23,10 @@
<model type="int">4</model>
</rating>
<sound>
<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
</sound>
<previews>
<preview>
<type>exterior</type>
@ -163,14 +162,6 @@
</config>
</view>
<systems>
<wingflexer include="Systems/wingflexer-params.xml"/>
<property-rule n="100">
<name>wing flexer property rule</name>
<path>Aircraft/Generic/wingflexer.xml</path>
</property-rule>
</systems>
<systems n="0">
<autopilot n="0">
<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
@ -183,17 +174,18 @@
</sim>
<limits>
<mass-and-balance> <!--Data source: https://en.wikipedia.org/wiki/Airbus_A320_family#Specifications-->
<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>146000</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>138000</maximum-zero-fuel-mass-lbs>
<mass-and-balance> <!--Data source: TCDS WV 002 (Issue 12) -->
<maximum-takeoff-mass-lbs>150000</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>138900</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>131840</maximum-zero-fuel-mass-lbs>
</mass-and-balance>
</limits>
<options n="0">
<EIS2 type="bool">0</EIS2>
<eng>CFM</eng>
<maxblock>52.3</maxblock>
<eng type="string">CFM</eng>
<maxblock type="double">52.3</maxblock>
<maxflap type="int">35</maxflap>
</options>
<sharklet type="bool">0</sharklet>
@ -205,7 +197,7 @@
<nasal>
<specific>
<file>Aircraft/A320-family/Nasal/Sim/a320livery-cfm-100.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/a320livery-cfm-100.nas</file>
</specific>
</nasal>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<fdm_config name="A320-family" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -70,6 +70,32 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</thruster>
</engine>
<engine file="APS3200">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
<feed>7</feed>
<thruster file="direct">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
</thruster>
</engine>
<tank type="FUEL"> <!-- Outer Left Wing Tank -->
<location unit="M">
<x> 18.9231 </x>
@ -97,7 +123,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<temperature>50</temperature>
</tank>
<tank type="FUEL"> <!-- Center Tank -->
<tank type="FUEL"> <!-- Center Tank - wing box may be modified to center fuel tank on the -100 so we have a center tank. Or mostly because its easier... -->
<location unit="M">
<x> 18.9731 </x>
<y> 0 </y>
@ -158,9 +184,21 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- APU Pipes -->
<location unit="M">
<x> 18.8231 </x>
<y> 0 </y>
<z> 0.19249 </z>
</location>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="glass-effect"/>
<system file="a320-fbw"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>
<system file="a320-fwc"/>
@ -170,6 +208,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<system file="a320-lights"/>
<system file="a320-engine-fire"/>
<system file="a320-adr"/>
<system file="a320-apu"/>
<system file="a320-fmgc"/>
<flight_control name="none"/>

View file

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList include="A320-main.xml">
<sim>
<sound>
<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
</sound>
<checklists include="A32X-Checklists.xml"/>
<description>Airbus A320-214 (CFM56-5B4)</description>
<flight-model>jsb</flight-model>
<aero>A320-200-CFM</aero>
@ -28,6 +23,10 @@
<model type="int">4</model>
</rating>
<sound>
<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
</sound>
<previews>
<preview>
<type>exterior</type>
@ -163,14 +162,6 @@
</config>
</view>
<systems>
<wingflexer include="Systems/wingflexer-params.xml"/>
<property-rule n="100">
<name>wing flexer property rule</name>
<path>Aircraft/Generic/wingflexer.xml</path>
</property-rule>
</systems>
<systems n="0">
<autopilot n="0">
<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
@ -183,17 +174,18 @@
</sim>
<limits>
<mass-and-balance> <!--Data source: https://en.wikipedia.org/wiki/Airbus_A320_family#Specifications-->
<mass-and-balance> <!--Data source: TCDS WV 017-->
<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>146000</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>138000</maximum-zero-fuel-mass-lbs>
<maximum-landing-mass-lbs>145500</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>137800</maximum-zero-fuel-mass-lbs>
</mass-and-balance>
</limits>
<options n="0">
<EIS2 type="bool">0</EIS2>
<eng>CFM</eng>
<maxblock>52.3</maxblock>
<eng type="string">CFM</eng>
<maxblock type="double">52.3</maxblock>
<maxflap type="int">35</maxflap>
</options>
<sharklet type="bool">0</sharklet>
@ -205,7 +197,7 @@
<nasal>
<specific>
<file>Aircraft/A320-family/Nasal/Sim/a320livery-cfm.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/a320livery-cfm.nas</file>
</specific>
</nasal>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<fdm_config name="A320-family" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -70,6 +70,32 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</thruster>
</engine>
<engine file="APS3200">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
<feed>7</feed>
<thruster file="direct">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
</thruster>
</engine>
<tank type="FUEL"> <!-- Outer Left Wing Tank -->
<location unit="M">
<x> 18.9231 </x>
@ -157,11 +183,22 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- APU Pipes -->
<location unit="M">
<x> 18.8231 </x>
<y> 0 </y>
<z> 0.19249 </z>
</location>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="glass-effect"/>
<system file="a320-fbw"/>
<system file="a320-fcs"/>
<system file="a320-adr"/>
<system file="a320-fuel"/>
<system file="a320-fwc"/>
<system file="a320-spoiler"/>
@ -170,6 +207,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<system file="a320-lights"/>
<system file="a320-engine-fire"/>
<system file="a320-adr"/>
<system file="a320-apu"/>
<system file="a320-fmgc"/>
<flight_control name="none"/>

View file

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList include="A320-main.xml">
<sim>
<sound>
<path>Aircraft/A320-family/Sounds/v2500-sound.xml</path>
</sound>
<checklists include="A32X-Checklists.xml"/>
<description>Airbus A320-232 (IAE V2527-A5)</description>
<flight-model>jsb</flight-model>
<aero>A320-200-IAE</aero>
@ -28,6 +23,10 @@
<model type="int">4</model>
</rating>
<sound>
<path>Aircraft/A320-family/Sounds/v2500-sound.xml</path>
</sound>
<previews>
<preview>
<type>exterior</type>
@ -163,14 +162,6 @@
</config>
</view>
<systems>
<wingflexer include="Systems/wingflexer-params.xml"/>
<property-rule n="100">
<name>wing flexer property rule</name>
<path>Aircraft/Generic/wingflexer.xml</path>
</property-rule>
</systems>
<systems n="0">
<autopilot n="0">
<path>Aircraft/A320-family/Systems/fadec-iae.xml</path>
@ -183,17 +174,18 @@
</sim>
<limits>
<mass-and-balance> <!--Data source: https://en.wikipedia.org/wiki/Airbus_A320_family#Specifications-->
<mass-and-balance> <!--Data source: TCDS WV 017-->
<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>146000</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>138000</maximum-zero-fuel-mass-lbs>
<maximum-landing-mass-lbs>145500</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>137800</maximum-zero-fuel-mass-lbs>
</mass-and-balance>
</limits>
<options n="0">
<EIS2 type="bool">0</EIS2>
<eng>IAE</eng>
<maxblock>52.3</maxblock>
<eng type="string">IAE</eng>
<maxblock type="double">52.3</maxblock>
<maxflap type="int">40</maxflap>
</options>
<sharklet type="bool">0</sharklet>
@ -205,7 +197,7 @@
<nasal>
<specific>
<file>Aircraft/A320-family/Nasal/Sim/a320livery-iae.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/a320livery-iae.nas</file>
</specific>
</nasal>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<fdm_config name="A320-family" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -70,6 +70,32 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</thruster>
</engine>
<engine file="APS3200">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
<feed>7</feed>
<thruster file="direct">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
</thruster>
</engine>
<tank type="FUEL"> <!-- Outer Left Wing Tank -->
<location unit="M">
<x> 18.9231 </x>
@ -157,9 +183,21 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- APU Pipes -->
<location unit="M">
<x> 18.8231 </x>
<y> 0 </y>
<z> 0.19249 </z>
</location>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="glass-effect"/>
<system file="a320-fbw"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>
<system file="a320-fwc"/>
@ -169,6 +207,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<system file="a320-lights"/>
<system file="a320-engine-fire"/>
<system file="a320-adr"/>
<system file="a320-apu"/>
<system file="a320-fmgc"/>
<flight_control name="none"/>

View file

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Matthew Maring (hayden2000) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- Copyright (c) 2020 Matthew Maring (mattmaring) -->
<PropertyList include="Aircraft/Generic/Human/Include/walker-include.xml">
<sim>
<author>Joshua Davidson (Octal450), Jonathan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555), Based on IDG-A32X</author>
<author>Josh Davidson/Octal450 (Flight Dynamics, Systems, Displays), Jonathan Redpath/legoboyvdlp, merspieler, Matthew Maring/mattmaring (Systems, Displays), Thorsten Herrmann/TH-555, Semir Gebran/CaptB (3D, Textures)</author>
<checklists include="A32X-Checklists.xml"/>
<status>Pre V1.0</status>
@ -19,6 +21,7 @@
<fallback-model-index>212</fallback-model-index>
<autopush include="AircraftConfig/autopush-config.xml"/>
<display-contrast type="double">0.7</display-contrast>
<icing>
<iceable>
<name>Wing</name>
@ -96,14 +99,6 @@
<tag>2-engine</tag>
</tags>
<flaps>
<setting>0.000</setting>
<setting>0.290</setting>
<setting>0.596</setting>
<setting>0.645</setting>
<setting>1.000</setting>
</flaps>
<systems n="0">
<electrical>
<path></path>
@ -146,6 +141,11 @@
<autopilot n="13">
<path>Aircraft/A320-family/Systems/ecam-proprules.xml</path>
</autopilot>
<wingflexer include="Systems/wingflexer-params.xml"/>
<property-rule n="100">
<name>Generic Wing Flexer</name>
<path>Aircraft/Generic/wingflexer.xml</path>
</property-rule>
<path>Aircraft/A320-family/Systems/pitot-static.xml</path>
</systems>
@ -158,7 +158,7 @@
<no-smoking-sign type="bool">0</no-smoking-sign>
<btn1 type="bool">0</btn1>
<btn3 type="bool">0</btn3>
<gear-vol type="double">0.25</gear-vol>
<gear-vol type="double">0.40</gear-vol>
<knb1 type="bool">0</knb1>
<oh-btn type="bool">0</oh-btn>
<switch1 type="bool">0</switch1>
@ -176,6 +176,10 @@
<menubar>
<default>
<menu n="100">
<label>|</label>
<enabled type="bool">false</enabled>
</menu>
<menu n="101">
<label>A320-family</label>
<item>
<label>Aircraft Config</label>
@ -196,7 +200,7 @@
</binding>
</item>
</menu>
<menu n="101">
<menu n="102">
<label>FMGC</label>
<item>
<label>FCU Autoflight</label>
@ -205,8 +209,17 @@
<dialog-name>autopilot</dialog-name>
</binding>
</item>
<item>
<label>Load Flightplan</label>
<binding>
<command>nasal</command>
<script>
acconfig.loadflightplan_dlg.open();
</script>
</binding>
</item>
</menu>
<menu n="102">
<menu n="103">
<label>DU</label>
<item>
<label>Captain's PFD</label>
@ -272,7 +285,7 @@
</binding>
</item>
</menu>
<menu n="103">
<menu n="104">
<label>Instruments</label>
<item>
<label>Left MCDU</label>
@ -320,7 +333,7 @@
</binding>
</item>
</menu>
<menu n="104">
<menu n="105">
<label>Utilities</label>
<item>
<label>Select Livery</label>
@ -432,7 +445,7 @@
<z-offset-max-m type="float">300.0</z-offset-max-m>
</current-view>
<minimum-fg-version>2019.1.2</minimum-fg-version>
<minimum-fg-version>2019.2.0</minimum-fg-version>
</sim>
<consumables>
@ -458,6 +471,9 @@
<tank n="6">
<name>Engine 2 Pipes</name>
</tank>
<tank n="7">
<name>APU Pipes</name>
</tank>
</fuel>
</consumables>
@ -484,43 +500,43 @@
<name>Cockpit Crew</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
<min-lb type="double">200</min-lb>
<max-lb type="double">440</max-lb>
<max-lb type="double">776</max-lb>
</weight>
<weight n="1">
<name>Forward Cabin</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">4649</max-lb>
<max-lb type="double">11640</max-lb>
</weight>
<weight n="2">
<name>Center Cabin</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">13949</max-lb>
<max-lb type="double">11640</max-lb>
</weight>
<weight n="3">
<name>Aft Cabin</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">10462</max-lb>
<max-lb type="double">11640</max-lb>
</weight>
<weight n="4">
<name>Forward Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">5000</max-lb>
<max-lb type="double">7500</max-lb>
</weight>
<weight n="5">
<name>Aft Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[5]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">6662</max-lb>
<max-lb type="double">10000</max-lb>
</weight>
<weight n="6">
<name>Aft Bulk Cargo</name>
<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[6]"/>
<min-lb type="double">0</min-lb>
<max-lb type="double">3285</max-lb>
<max-lb type="double">3300</max-lb>
</weight>
</payload>
@ -561,11 +577,6 @@
</speeds>
</it-fbw>
<apu>
<rpm type="float">0</rpm>
<egt type="float">0</egt>
</apu>
<FMGC n="0">
<active-fmgc-channel type="int">0</active-fmgc-channel>
<internal>
@ -581,59 +592,31 @@
<footrest-cpt n="1" type="double">0</footrest-cpt>
<footrest-fo n="0" type="double">0</footrest-fo>
<footrest-fo n="1" type="double">0</footrest-fo>
<adirs n="0">
<adr n="0">
<fault type="bool">false</fault>
<off type="bool">false</off>
</adr>
<adr n="1">
<fault type="bool">false</fault>
<off type="bool">false</off>
</adr>
<adr n="2">
<fault type="bool">false</fault>
<off type="bool">false</off>
</adr>
<display>
<selected type="int">1</selected>
<dataknob type="int">5</dataknob>
<text type="string"></text>
</display>
<ir n="0">
<align type="bool">false</align>
<knob type="int">0</knob>
<fault type="bool">false</fault>
</ir>
<ir n="1">
<align type="bool">false</align>
<knob type="int">0</knob>
<fault type="bool">false</fault>
</ir>
<ir n="2">
<align type="bool">false</align>
<knob type="int">0</knob>
<fault type="bool">false</fault>
</ir>
<onbat type="bool">false</onbat>
<skip type="bool">0</skip>
</adirs>
<atc>
<system-knob type="int">0</system-knob>
<mode-knob type="int">0</mode-knob>
</atc>
<APU>
<apu>
<agent-btn type="bool">0</agent-btn>
<fire-btn type="bool">0</fire-btn>
<fire-btn-cover type="bool">0</fire-btn-cover>
<fire-light type="bool">0</fire-light>
<master type="bool">0</master>
<start type="bool">0</start>
<bleed type="bool">0</bleed>
</APU>
</apu>
<autobrake>
<active type="bool">0</active>
<brake-left type="double">0</brake-left>
<brake-right type="double">0</brake-right>
</autobrake>
<CVR>
<erase type="bool">0</erase>
<gndctl type="bool">0</gndctl>
<power type="bool">0</power>
<test type="bool">0</test>
<tone type="bool">0</tone>
</CVR>
<electric>
<avionics-switch type="bool">true</avionics-switch>
</electric>
@ -686,6 +669,12 @@
<throttle-output type="double">0</throttle-output>
<throttle-fdm type="double">0</throttle-fdm>
</engine>
<engine n="2">
<cutoff type="bool">true</cutoff>
<starter type="bool">0</starter>
<throttle-output type="double">0</throttle-output>
<throttle-fdm type="double">0</throttle-fdm>
</engine>
</engines>
<fctl>
<lights>
@ -714,11 +703,10 @@
</fire>
<flight>
<aileron-drives-tiller type="bool">0</aileron-drives-tiller>
<aileron-input>0</aileron-input>
<elevator-input>0</elevator-input>
<flap-pos type="int">0</flap-pos>
<speedbrake-arm>0</speedbrake-arm>
<slats>0</slats>
<aileron-input type="double">0</aileron-input>
<elevator-input type="double">0</elevator-input>
<speedbrake-arm type="bool">0</speedbrake-arm>
<slats type="double">0</slats>
</flight>
<fuel>
<switches>
@ -801,9 +789,9 @@
<navigation>
<adirscp>
<switches>
<adr-1 type="bool">0</adr-1>
<adr-2 type="bool">0</adr-2>
<adr-3 type="bool">0</adr-3>
<adr-1 type="bool">1</adr-1>
<adr-2 type="bool">1</adr-2>
<adr-3 type="bool">1</adr-3>
<ir-1 type="bool">0</ir-1>
<ir-2 type="bool">0</ir-2>
<ir-3 type="bool">0</ir-3>
@ -815,9 +803,9 @@
<adr-1-fault type="bool">0</adr-1-fault>
<adr-2-fault type="bool">0</adr-2-fault>
<adr-3-fault type="bool">0</adr-3-fault>
<adr-1-off type="bool">1</adr-1-off>
<adr-2-off type="bool">1</adr-2-off>
<adr-3-off type="bool">1</adr-3-off>
<adr-1-off type="bool">0</adr-1-off>
<adr-2-off type="bool">0</adr-2-off>
<adr-3-off type="bool">0</adr-3-off>
<ir-1-fault type="bool">0</ir-1-fault>
<ir-2-fault type="bool">0</ir-2-fault>
<ir-3-fault type="bool">0</ir-3-fault>
@ -866,6 +854,13 @@
<wing-lights type="bool">0</wing-lights>
<landing-lights-l type="float">0.0</landing-lights-l>
<landing-lights-r type="float">0.0</landing-lights-r>
<LrainRpt type="bool">0</LrainRpt>
<RrainRpt type="bool">0</RrainRpt>
<emerCallLtO type="bool">0</emerCallLtO>
<emerCallLtC type="bool">0</emerCallLtC>
<cabinCall type="bool">0</cabinCall>
<emerCall type="bool">0</emerCall>
<mechCall type="bool">0</mechCall>
</switches>
<tray n="0">
<lefttrayext type="double">0</lefttrayext>
@ -874,12 +869,6 @@
</controls>
<engines>
<apu>
<rpm type="double">0</rpm>
<on-fire type="bool">0</on-fire>
<running type="bool">0</running>
<serviceable type="bool">true</serviceable>
</apu>
<engine n="0">
<egt-actual type="double">0</egt-actual>
<epr-actual type="double">1</epr-actual>
@ -900,6 +889,13 @@
<running type="bool">0</running>
<state type="int">0</state>
</engine>
<engine n="2">
<egt-actual type="double">0</egt-actual>
<n1 type="double">0</n1>
<n-actual type="double">0</n-actual>
<running type="bool">0</running>
<servicable type="bool">1</servicable>
</engine>
</engines>
<gear>
@ -946,10 +942,28 @@
<transponder-code type="string">2000</transponder-code>
<failed type="bool">0</failed>
</atc>
<apu n="0">
<n2 type="double">0</n2>
<emer-shutdown type="bool">false</emer-shutdown>
<apu>
<oil>
<level-l type="double">5.4</level-l>
<allow-oil-consumption type="bool">1</allow-oil-consumption>
<oil-pressure-psi type="double">0</oil-pressure-psi>
<oil-temperature-degC type="double">0</oil-temperature-degC>
</oil>
<bleed-load-kw type="double">252</bleed-load-kw>
<electrical-load-kw type="double">132</electrical-load-kw>
<available type="bool">0</available>
<fault type="bool">0</fault>
<dc-bat-three-minutes type="bool">0</dc-bat-three-minutes>
<start type="bool">0</start>
</apu>
<comm>
<hf>
<reception-1 type="bool">1</reception-1>
<reception-2 type="bool">1</reception-2>
<tone1000hz-1 type="bool">0</tone1000hz-1>
<tone1000hz-2 type="bool">0</tone1000hz-2>
</hf>
</comm>
<electrical n="0">
<bus>
<dc-1 type="double">0</dc-1>
@ -966,15 +980,11 @@
<sources>
<bat-1>
<amps type="double">0</amps>
<limiter type="bool">0</limiter>
<percent type="double">80</percent>
<time type="int">0</time>
<percent-calc type="double">80</percent-calc>
</bat-1>
<bat-2>
<amps type="double">0</amps>
<limiter type="bool">0</limiter>
<percent type="double">80</percent>
<time type="int">0</time>
<percent-calc type="double">80</percent-calc>
</bat-2>
</sources>
</electrical>
@ -1088,10 +1098,19 @@
<right-valve type="bool">0</right-valve>
<refuelling type="bool">0</refuelling>
</refuel>
<valves>
<apu-lp-valve-cmd type="bool">0</apu-lp-valve-cmd>
</valves>
<fuel-used-1 type="double">0</fuel-used-1>
<fuel-used-2 type="double">0</fuel-used-2>
</fuel>
<hydraulic n="0">
<sources>
<ptu>
<green-yellow type="double">0</green-yellow>
<yellow-green type="double">0</yellow-green>
</ptu>
</sources>
<blue-psi>0</blue-psi>
<green-psi>0</green-psi>
<yellow-psi>0</yellow-psi>
@ -1114,6 +1133,9 @@
</static>
<navigation>
<aligned-1 type="bool">0</aligned-1>
<aligned-2 type="bool">0</aligned-2>
<aligned-3 type="bool">0</aligned-3>
<adr>
<operating-1 type="bool">0</operating-1>
<operating-2 type="bool">0</operating-2>
@ -1133,6 +1155,15 @@
</options>
<instrumentation n="0">
<altimeter n="0">
<inhg type="bool">0</inhg>
<indicated-altitude-ft tyep="double">0</indicated-altitude-ft>
<indicated-altitude-ft-pfd tyep="double">0</indicated-altitude-ft-pfd>
<oldqnh type="double">29.92</oldqnh>
<serviceable type="bool">true</serviceable>
<std type="bool">0</std>
</altimeter>
<altimeter n="1">
<serviceable type="bool">true</serviceable>
</altimeter>
@ -1336,6 +1367,12 @@
<category-13 type="int">7</category-13>
<category-14 type="int">0</category-14>
</configuration-module>
<input-feeders>
<discretes>
<!-- disable the built-in input feeder -->
<landing-flaps type="bool">false</landing-flaps>
</discretes>
</input-feeders>
<inputs>
<arinc429>
<decision-height-ncd type="bool">0</decision-height-ncd>
@ -1344,7 +1381,7 @@
</inputs>
<speaker>
<max-dist type="double">2</max-dist>
<reference-dist type="double">1</reference-dist>
<reference-dist type="double">5</reference-dist>
<volume type="double">2</volume>
</speaker>
<voice>
@ -1352,6 +1389,11 @@
</voice>
</mk-viii>
<pfd n="0">
<hundred-above type="int">99999</hundred-above>
<minimums type="int">99999</minimums>
</pfd>
<radar-altimeter n="0">
<antenna>
<x-offset-m type="double">-1</x-offset-m>
@ -1382,11 +1424,6 @@
</instrumentation>
<modes>
<altimeter>
<inhg>0</inhg>
<std>0</std>
<oldqnh>29.92</oldqnh>
</altimeter>
<cpt-du-xfr>0</cpt-du-xfr>
<fo-du-xfr>0</fo-du-xfr>
<pfd>
@ -1438,7 +1475,9 @@
<desc>Autothrottle Disconnect</desc>
<binding>
<command>nasal</command>
<script>fcu.FCUController.ATDisc();</script>
<script>
fcu.FCUController.ATDisc();
</script>
</binding>
</key>
<key n="6">
@ -1452,8 +1491,8 @@
</binding>
</key>
<key n="8">
<name>Ctrl-H</name>
<desc>Toggle autopilot heading lock</desc>
<name>Del</name>
<desc>CLR</desc>
<binding>
<condition>
<property>/FMGC/keyboard-left</property>
@ -1468,20 +1507,19 @@
<command>nasal</command>
<script>mcdu.button("CLR", 1);</script>
</binding>
</key>
<key n="11">
<name>Disable MCDU keyboard mode</name>
<desc>Ctrl+k</desc>
<binding>
<condition>
<not><property>/FMGC/keyboard-left</property></not>
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<command>nasal</command>
<script>
var node = props.globals.getNode("/autopilot/locks/heading", 1);
if ( node.getValue() == "dg-heading-hold" ) {
node.setValue( "" );
} else {
node.setValue( "dg-heading-hold" );
}
</script>
<command>property-assign</command>
<property>/FMGC/keyboard-left</property>
<value>0</value>
</binding>
<binding>
<command>property-assign</command>
<property>/FMGC/keyboard-right</property>
<value>0</value>
</binding>
</key>
<key n="24">
@ -1515,7 +1553,14 @@
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<command>nasal</command>
<script>space(1, modifiers.getValue())</script>
<script>
space(1, modifiers.getValue());
if (getprop("systems/audio/acp[0]/call_chan") == "hf1") {
systems.HFS[0].pttToggle();
} elsif (getprop("systems/audio/acp[0]/call_chan") == "hf2") {
systems.HFS[1].pttToggle();
}
</script>
</binding>
<mod-up>
<binding>
@ -1524,7 +1569,14 @@
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<command>nasal</command>
<script>space(0, modifiers.getValue())</script>
<script>
space(0, modifiers.getValue());
if (getprop("systems/audio/acp[0]/call_chan") == "hf1") {
systems.HFS[0].pttToggle();
} elsif (getprop("systems/audio/acp[0]/call_chan") == "hf2") {
systems.HFS[1].pttToggle();
}
</script>
</binding>
</mod-up>
<mod-shift>
@ -2016,6 +2068,12 @@
</script>
</binding>
</key>
<key n="63">
<binding>
<command>nasal</command>
<script>acconfig.help_dlg.open();</script>
</binding>
</key>
<key n="65">
<name>SHIFT-a</name>
<repeatable>false</repeatable>
@ -2188,7 +2246,9 @@
<not><property>/FMGC/keyboard-right</property></not>
</condition>
<command>nasal</command>
<script>fcu.FCUController.APDisc();</script>
<script>
fcu.FCUController.APDisc();
</script>
</binding>
</key>
<key n="69">
@ -3856,6 +3916,30 @@
</binding>
</mod-shift>
</key>
<key n="22">
<name>Ctrl-V</name>
<desc>Select default view (pilot or copilot)</desc>
<binding>
<condition>
<equals>
<property>/options/system/fo-view</property>
<value type="double">1</value>
</equals>
</condition>
<command>nasal</command>
<script>view.setViewByIndex(100);</script>
</binding>
<binding>
<condition>
<equals>
<property>/options/system/fo-view</property>
<value type="double">0</value>
</equals>
</condition>
<command>nasal</command>
<script>view.setViewByIndex(0);</script>
</binding>
</key>
</keyboard>
</input>
@ -3870,36 +3954,39 @@
<nasal>
<pts>
<file>Aircraft/A320-family/Nasal/Sim/property-tree-setup.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/property-tree-setup.nas</file>
</pts>
<libraries>
<file>Aircraft/A320-family/Nasal/ECAM/ECAM-main.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file>
<file>Aircraft/A320-family/Nasal/Sim/libraries.nas</file>
<file>Aircraft/A320-family/Nasal/Sim/buttons.nas</file>
<file>Aircraft/A320-family/Nasal/Sim/shake.nas</file>
<file>Aircraft/A320-family/Nasal/Sim/zoom-views.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/efis.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/libraries.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/buttons.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/shake.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/zoom-views.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/efis.nas</file>
</libraries>
<acconfig>
<file>Aircraft/A320-family/AircraftConfig/acconfig.nas</file>
</acconfig>
<systems>
<file>Aircraft/A320-family/Nasal/Systems/APU.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/effects.nas</file>
<file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/electrical.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/pneumatics.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/hydraulics.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/fuel.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/FADEC/engines-common.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ADIRS/ADIRS.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ADIRS/ADR.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ADIRS/SwitchingPanel.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/Comm/HF.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/brakes.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/brakesystem.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
<file>Aircraft/A320-family/Nasal/Instruments/clock.nas</file>
</systems>
<fadec>
<file>Aircraft/A320-family/Nasal/Systems/FADEC/fadec-common.nas</file>
@ -3923,6 +4010,8 @@
<file>Aircraft/A320-family/Nasal/MCDU/VERTREV.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/DEPARTURE.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/ARRIVAL.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/AIRWAYS.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/CLOSESTAIRPORT.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/HOLD.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/F-PLN.nas</file> <!-- dynamic page - init before MCDU -->
<file>Aircraft/A320-family/Nasal/MCDU/MCDU.nas</file>

View file

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList include="A320-main.xml">
<sim>
<sound>
<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
</sound>
<checklists include="A32X-Checklists.xml"/>
<description>Airbus A320-251N (LEAP-1A26)</description>
<flight-model>jsb</flight-model>
<aero>A320neo-CFM</aero>
@ -28,6 +23,10 @@
<model type="int">4</model>
</rating>
<sound>
<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
</sound>
<previews>
<preview>
<type>exterior</type>
@ -163,14 +162,6 @@
</config>
</view>
<systems>
<wingflexer include="Systems/wingflexer-params.xml"/>
<property-rule n="100">
<name>wing flexer property rule</name>
<path>Aircraft/Generic/wingflexer.xml</path>
</property-rule>
</systems>
<systems n="0">
<autopilot n="0">
<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
@ -183,17 +174,18 @@
</sim>
<limits>
<mass-and-balance> <!--Data source: https://en.wikipedia.org/wiki/Airbus_A320_family#Specifications-->
<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>146000</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>138000</maximum-zero-fuel-mass-lbs>
<mass-and-balance> <!--Data source: TCDS WV 55 -->
<maximum-takeoff-mass-lbs>174200</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>148600</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>141800</maximum-zero-fuel-mass-lbs>
</mass-and-balance>
</limits>
<options n="0">
<EIS2 type="bool">1</EIS2>
<eng>CFM</eng>
<maxblock>52.3</maxblock>
<eng type="string">CFM</eng>
<maxblock type="double">52.3</maxblock>
<maxflap type="int">35</maxflap>
</options>
<sharklet type="bool">1</sharklet>
@ -205,7 +197,7 @@
<nasal>
<specific>
<file>Aircraft/A320-family/Nasal/Sim/a320livery-neocfm.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/a320livery-neocfm.nas</file>
</specific>
</nasal>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<fdm_config name="A320-family" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -70,6 +70,32 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</thruster>
</engine>
<engine file="APS3200">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
<feed>7</feed>
<thruster file="direct">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
</thruster>
</engine>
<tank type="FUEL"> <!-- Outer Left Wing Tank -->
<location unit="M">
<x> 18.9231 </x>
@ -157,9 +183,21 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- APU Pipes -->
<location unit="M">
<x> 18.8231 </x>
<y> 0 </y>
<z> 0.19249 </z>
</location>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="glass-effect"/>
<system file="a320-fbw"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>
<system file="a320-fwc"/>
@ -169,6 +207,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<system file="a320-lights"/>
<system file="a320-engine-fire"/>
<system file="a320-adr"/>
<system file="a320-apu"/>
<system file="a320-fmgc"/>
<flight_control name="none"/>

View file

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList include="A320-main.xml">
<sim>
<sound>
<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
</sound>
<checklists include="A32X-Checklists.xml"/>
<description>Airbus A320-271N (PurePower 1127G)</description>
<flight-model>jsb</flight-model>
<aero>A320neo-PW</aero>
@ -28,6 +23,10 @@
<model type="int">4</model>
</rating>
<sound>
<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
</sound>
<previews>
<preview>
<type>exterior</type>
@ -163,14 +162,6 @@
</config>
</view>
<systems>
<wingflexer include="Systems/wingflexer-params.xml"/>
<property-rule n="100">
<name>wing flexer property rule</name>
<path>Aircraft/Generic/wingflexer.xml</path>
</property-rule>
</systems>
<systems n="0">
<autopilot n="0"> <!-- Apparently PW PurePower uses N1, not EPR.... sooo I use CFM FADEC -->
<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
@ -183,17 +174,18 @@
</sim>
<limits>
<mass-and-balance> <!--Data source: https://en.wikipedia.org/wiki/Airbus_A320_family#Specifications-->
<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>146000</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>138000</maximum-zero-fuel-mass-lbs>
<mass-and-balance> <!--Data source: TCDS WV 55 -->
<maximum-takeoff-mass-lbs>174200</maximum-takeoff-mass-lbs>
<maximum-landing-mass-lbs>148600</maximum-landing-mass-lbs>
<maximum-zero-fuel-mass-lbs>141800</maximum-zero-fuel-mass-lbs>
</mass-and-balance>
</limits>
<options n="0">
<EIS2 type="bool">1</EIS2>
<eng>CFM</eng> <!-- Apparently PW PurePower uses N1, not EPR.... sooo I use CFM ECAM, and no N1 mode switches -->
<maxblock>52.3</maxblock>
<eng type="string">CFM</eng> <!-- Apparently PW PurePower uses N1, not EPR.... sooo I use CFM ECAM, and no N1 mode switches -->
<maxblock type="double">52.3</maxblock>
<maxflap type="int">35</maxflap>
</options>
<sharklet type="bool">1</sharklet>
@ -205,7 +197,7 @@
<nasal>
<specific>
<file>Aircraft/A320-family/Nasal/Sim/a320livery-neopw.nas</file>
<file>Aircraft/A320-family/Nasal/Libraries/a320livery-neopw.nas</file>
</specific>
</nasal>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<fdm_config name="A320-family" version="2.0" release="BETA"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -70,6 +70,32 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
</thruster>
</engine>
<engine file="APS3200">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
<feed>7</feed>
<thruster file="direct">
<location unit="M">
<x> 38.9 </x>
<y> 0 </y>
<z> 0.95 </z>
</location>
<orient unit="DEG">
<roll> 0.0 </roll>
<pitch> 0.0 </pitch>
<yaw> 0.0 </yaw>
</orient>
</thruster>
</engine>
<tank type="FUEL"> <!-- Outer Left Wing Tank -->
<location unit="M">
<x> 18.9231 </x>
@ -157,9 +183,21 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
<tank type="FUEL"> <!-- APU Pipes -->
<location unit="M">
<x> 18.8231 </x>
<y> 0 </y>
<z> 0.19249 </z>
</location>
<capacity unit="LBS">10</capacity>
<contents unit="LBS">0</contents>
<priority>1</priority>
<density unit="LBS/GAL">6.71</density>
</tank>
</propulsion>
<system file="glass-effect"/>
<system file="a320-fbw"/>
<system file="a320-fcs"/>
<system file="a320-fuel"/>
<system file="a320-fwc"/>
@ -169,6 +207,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
<system file="a320-lights"/>
<system file="a320-engine-fire"/>
<system file="a320-adr"/>
<system file="a320-apu"/>
<system file="a320-fmgc"/>
<flight_control name="none"/>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- Sven Seipp, Oct 2017 -->
@ -12,7 +12,7 @@
<value>COMPLETED(BOTH)</value>
</item>
<item>
<name>PINS AND COVERS</name>
<name>GEAR PINS AND COVERS</name>
<value>REMOVED</value>
</item>
<item>
@ -86,7 +86,7 @@
</marker>
</item>
<item>
<name>THR LEVERS</name>
<name>THRUST LEVERS</name>
<value>IDLE</value>
<marker>
<x-m>4.7200</x-m>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->
@ -34,30 +34,26 @@
<text>
<halign>left</halign>
<label>A320-family</label>
</text>
<text>
<halign>left</halign>
<label>Joshua Davidson (Octal450), Jonanthan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555), Based on IDG-A32X</label>
<label>Airbus A320 Family</label>
</text>
<hrule/>
<text>
<halign>left</halign>
<label>FDM: Joshua Davidson (Octal450)</label>
<label>Flight Dyanmics: Josh Davidson (Octal450)</label>
</text>
<text>
<halign>left</halign>
<label>Systems: Joshua Davidson (Octal450), Jonanthan Redpath (legoboyvdlp)</label>
<label>Systems: Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp), merspieler, Matthew Maring (mattmaring)</label>
</text>
<text>
<halign>left</halign>
<label>Cockpit: Thorsten Herrmann (TH-555), Joshua Davidson (Octal450), Jonanthan Redpath (legoboyvdlp)</label>
<label>Displays: Josh Davidson (Octal450), Jonathan Redpath (legoboyvdlp), merspieler, Matthew Maring (mattmaring)</label>
</text>
<text>
<halign>left</halign>
<label>Instruments: Joshua Davidson (Octal450), Jonanthan Redpath (legoboyvdlp)</label>
<label>3D/Textures: Thorsten Herrmann (TH-555), Semir Gebran (CaptB)</label>
</text>
</group>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,22 +1,22 @@
# Aircraft Config Center
# Joshua Davidson (Octal450)
# Copyright (c) 2019 Joshua Davidson (Octal450)
# Copyright (c) 2020 Josh Davidson (Octal450)
var spinning = maketimer(0.05, func {
var spinning = getprop("systems/acconfig/spinning");
var spinning = getprop("/systems/acconfig/spinning");
if (spinning == 0) {
setprop("systems/acconfig/spin", "\\");
setprop("systems/acconfig/spinning", 1);
setprop("/systems/acconfig/spin", "\\");
setprop("/systems/acconfig/spinning", 1);
} else if (spinning == 1) {
setprop("systems/acconfig/spin", "|");
setprop("systems/acconfig/spinning", 2);
setprop("/systems/acconfig/spin", "|");
setprop("/systems/acconfig/spinning", 2);
} else if (spinning == 2) {
setprop("systems/acconfig/spin", "/");
setprop("systems/acconfig/spinning", 3);
setprop("/systems/acconfig/spin", "/");
setprop("/systems/acconfig/spinning", 3);
} else if (spinning == 3) {
setprop("systems/acconfig/spin", "-");
setprop("systems/acconfig/spinning", 0);
setprop("/systems/acconfig/spin", "-");
setprop("/systems/acconfig/spinning", 0);
}
});
@ -25,140 +25,143 @@ var failReset = func {
}
var failResetOld = func {
setprop("systems/failures/elac1", 0);
setprop("systems/failures/elac2", 0);
setprop("systems/failures/sec1", 0);
setprop("systems/failures/sec2", 0);
setprop("systems/failures/sec3", 0);
setprop("systems/failures/fac1", 0);
setprop("systems/failures/fac2", 0);
setprop("systems/failures/aileron-left", 0);
setprop("systems/failures/aileron-right", 0);
setprop("systems/failures/elevator-left", 0);
setprop("systems/failures/elevator-right", 0);
setprop("systems/failures/rudder", 0);
setprop("systems/failures/spoiler-l1", 0);
setprop("systems/failures/spoiler-l2", 0);
setprop("systems/failures/spoiler-l3", 0);
setprop("systems/failures/spoiler-l4", 0);
setprop("systems/failures/spoiler-l5", 0);
setprop("systems/failures/spoiler-r1", 0);
setprop("systems/failures/spoiler-r2", 0);
setprop("systems/failures/spoiler-r3", 0);
setprop("systems/failures/spoiler-r4", 0);
setprop("systems/failures/spoiler-r5", 0);
setprop("systems/failures/elec-ac-ess", 0);
setprop("systems/failures/elec-batt1", 0);
setprop("systems/failures/elec-batt2", 0);
setprop("systems/failures/elec-galley", 0);
setprop("systems/failures/elec-genapu", 0);
setprop("systems/failures/elec-gen1", 0);
setprop("systems/failures/elec-gen2", 0);
setprop("systems/failures/bleed-apu", 0);
setprop("systems/failures/bleed-ext", 0);
setprop("systems/failures/bleed-eng1", 0);
setprop("systems/failures/bleed-eng2", 0);
setprop("systems/failures/pack1", 0);
setprop("systems/failures/pack2", 0);
setprop("systems/failures/hyd-blue", 0);
setprop("systems/failures/hyd-green", 0);
setprop("systems/failures/hyd-yellow", 0);
setprop("systems/failures/ptu", 0);
setprop("systems/failures/pump-blue", 0);
setprop("systems/failures/pump-green", 0);
setprop("systems/failures/pump-yellow-eng", 0);
setprop("systems/failures/pump-yellow-elec", 0);
setprop("systems/failures/tank0pump1", 0);
setprop("systems/failures/tank0pump2", 0);
setprop("systems/failures/tank1pump1", 0);
setprop("systems/failures/tank1pump2", 0);
setprop("systems/failures/tank2pump1", 0);
setprop("systems/failures/tank2pump2", 0);
setprop("systems/failures/fuelmode", 0);
setprop("systems/failures/cargo-aft-fire", 0);
setprop("systems/failures/cargo-fwd-fire", 0);
setprop("systems/failures/engine-left-fire", 0);
setprop("systems/failures/engine-right-fire", 0);
setprop("/systems/failures/elac1", 0);
setprop("/systems/failures/elac2", 0);
setprop("/systems/failures/sec1", 0);
setprop("/systems/failures/sec2", 0);
setprop("/systems/failures/sec3", 0);
setprop("/systems/failures/fac1", 0);
setprop("/systems/failures/fac2", 0);
setprop("/systems/failures/aileron-left", 0);
setprop("/systems/failures/aileron-right", 0);
setprop("/systems/failures/elevator-left", 0);
setprop("/systems/failures/elevator-right", 0);
setprop("/systems/failures/rudder", 0);
setprop("/systems/failures/spoiler-l1", 0);
setprop("/systems/failures/spoiler-l2", 0);
setprop("/systems/failures/spoiler-l3", 0);
setprop("/systems/failures/spoiler-l4", 0);
setprop("/systems/failures/spoiler-l5", 0);
setprop("/systems/failures/spoiler-r1", 0);
setprop("/systems/failures/spoiler-r2", 0);
setprop("/systems/failures/spoiler-r3", 0);
setprop("/systems/failures/spoiler-r4", 0);
setprop("/systems/failures/spoiler-r5", 0);
setprop("/systems/failures/elec-ac-ess", 0);
setprop("/systems/failures/elec-batt1", 0);
setprop("/systems/failures/elec-batt2", 0);
setprop("/systems/failures/elec-galley", 0);
setprop("/systems/failures/elec-genapu", 0);
setprop("/systems/failures/elec-gen1", 0);
setprop("/systems/failures/elec-gen2", 0);
setprop("/systems/failures/bleed-apu", 0);
setprop("/systems/failures/bleed-ext", 0);
setprop("/systems/failures/bleed-eng1", 0);
setprop("/systems/failures/bleed-eng2", 0);
setprop("/systems/failures/pack1", 0);
setprop("/systems/failures/pack2", 0);
setprop("/systems/failures/hyd-blue", 0);
setprop("/systems/failures/hyd-green", 0);
setprop("/systems/failures/hyd-yellow", 0);
setprop("/systems/failures/ptu", 0);
setprop("/systems/failures/pump-blue", 0);
setprop("/systems/failures/pump-green", 0);
setprop("/systems/failures/pump-yellow-eng", 0);
setprop("/systems/failures/pump-yellow-elec", 0);
setprop("/systems/failures/tank0pump1", 0);
setprop("/systems/failures/tank0pump2", 0);
setprop("/systems/failures/tank1pump1", 0);
setprop("/systems/failures/tank1pump2", 0);
setprop("/systems/failures/tank2pump1", 0);
setprop("/systems/failures/tank2pump2", 0);
setprop("/systems/failures/fuelmode", 0);
setprop("/systems/failures/cargo-aft-fire", 0);
setprop("/systems/failures/cargo-fwd-fire", 0);
setprop("/systems/failures/engine-left-fire", 0);
setprop("/systems/failures/engine-right-fire", 0);
}
failResetOld();
setprop("systems/acconfig/autoconfig-running", 0);
setprop("systems/acconfig/spinning", 0);
setprop("systems/acconfig/spin", "-");
setprop("systems/acconfig/options/revision", 0);
setprop("systems/acconfig/new-revision", 0);
setprop("systems/acconfig/out-of-date", 0);
setprop("systems/acconfig/mismatch-code", "0x000");
setprop("systems/acconfig/mismatch-reason", "XX");
setprop("systems/acconfig/options/keyboard-mode", 0);
setprop("/systems/acconfig/autoconfig-running", 0);
setprop("/systems/acconfig/spinning", 0);
setprop("/systems/acconfig/spin", "-");
setprop("/systems/acconfig/options/revision", 0);
setprop("/systems/acconfig/new-revision", 0);
setprop("/systems/acconfig/out-of-date", 0);
setprop("/systems/acconfig/mismatch-code", "0x000");
setprop("/systems/acconfig/mismatch-reason", "XX");
setprop("/systems/acconfig/options/keyboard-mode", 0);
# TODO Revert default weight-kgs to 1, when fully implemented
setprop("systems/acconfig/options/weight-kgs", 0);
setprop("systems/acconfig/options/adirs-skip", 0);
setprop("systems/acconfig/options/welcome-skip", 0);
setprop("systems/acconfig/options/no-rendering-warn", 0);
setprop("systems/acconfig/options/save-state", 0);
setprop("systems/acconfig/options/pfd-rate", 1);
setprop("systems/acconfig/options/nd-rate", 1);
setprop("systems/acconfig/options/uecam-rate", 1);
setprop("systems/acconfig/options/lecam-rate", 1);
setprop("systems/acconfig/options/iesi-rate", 1);
setprop("systems/acconfig/options/autopush/show-route", 1);
setprop("systems/acconfig/options/autopush/show-wingtip", 1);
var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/A320-family/AircraftConfig/main.xml");
var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/A320-family/AircraftConfig/welcome.xml");
var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/A320-family/AircraftConfig/psload.xml");
var ps_loaded_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psloaded/dialog", "Aircraft/A320-family/AircraftConfig/psloaded.xml");
var init_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/init/dialog", "Aircraft/A320-family/AircraftConfig/ac_init.xml");
var help_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/help/dialog", "Aircraft/A320-family/AircraftConfig/help.xml");
var fbw_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/A320-family/AircraftConfig/fbw.xml");
var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/A320-family/AircraftConfig/fail.xml");
var about_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/about/dialog", "Aircraft/A320-family/AircraftConfig/about.xml");
var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircraft/A320-family/AircraftConfig/update.xml");
var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/A320-family/AircraftConfig/updated.xml");
var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/A320-family/AircraftConfig/error-mismatch.xml");
var fuel_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fuel/dialog", "Aircraft/A320-family/AircraftConfig/fuel.xml");
var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/A320-family/AircraftConfig/groundservices.xml");
var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/A320-family/AircraftConfig/du-quality.xml");
var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/A320-family/AircraftConfig/rendering.xml");
setprop("/systems/acconfig/options/weight-kgs", 0);
setprop("/systems/acconfig/options/adirs-skip", 0);
setprop("/systems/acconfig/options/allow-oil-consumption", 0);
setprop("/systems/acconfig/options/welcome-skip", 0);
setprop("/systems/acconfig/options/no-rendering-warn", 0);
setprop("/systems/acconfig/options/save-state", 0);
setprop("/systems/acconfig/options/pfd-rate", 1);
setprop("/systems/acconfig/options/nd-rate", 1);
setprop("/systems/acconfig/options/uecam-rate", 1);
setprop("/systems/acconfig/options/lecam-rate", 1);
setprop("/systems/acconfig/options/iesi-rate", 1);
setprop("/systems/acconfig/options/autopush/show-route", 1);
setprop("/systems/acconfig/options/autopush/show-wingtip", 1);
var main_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/main/dialog", "Aircraft/A320-family/AircraftConfig/main.xml");
var welcome_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/A320-family/AircraftConfig/welcome.xml");
var ps_load_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/A320-family/AircraftConfig/psload.xml");
var ps_loaded_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/psloaded/dialog", "Aircraft/A320-family/AircraftConfig/psloaded.xml");
var init_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/init/dialog", "Aircraft/A320-family/AircraftConfig/ac_init.xml");
var help_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/help/dialog", "Aircraft/A320-family/AircraftConfig/help.xml");
var fbw_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/A320-family/AircraftConfig/fbw.xml");
var fail_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/A320-family/AircraftConfig/fail.xml");
var about_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/about/dialog", "Aircraft/A320-family/AircraftConfig/about.xml");
var update_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/update/dialog", "Aircraft/A320-family/AircraftConfig/update.xml");
var updated_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/A320-family/AircraftConfig/updated.xml");
var error_mismatch = gui.Dialog.new("/sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/A320-family/AircraftConfig/error-mismatch.xml");
var fuel_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/fuel/dialog", "Aircraft/A320-family/AircraftConfig/fuel.xml");
var groundservices_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/A320-family/AircraftConfig/groundservices.xml");
var loadflightplan_dlg = gui.Dialog.new("/sim/gui/dialogs/acconfig/loadfpln/dialog","Aircraft/A320-family/AircraftConfig/load-flightplan.xml");
var du_quality = gui.Dialog.new("/sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/A320-family/AircraftConfig/du-quality.xml");
var rendering_dlg = gui.Dialog.new("/sim/gui/dialogs/rendering/dialog", "Aircraft/A320-family/AircraftConfig/rendering.xml");
spinning.start();
init_dlg.open();
http.load("https://raw.githubusercontent.com/legoboyvdlp/A320-family/201912/revision.txt").done(func(r) setprop("systems/acconfig/new-revision", r.response));
var revisionFile = (getprop("sim/aircraft-dir") ~ "/revision.txt");
http.load("/https://raw.githubusercontent.com/legoboyvdlp/A320-family/dev/revision.txt").done(func(r) setprop("/systems/acconfig/new-revision", r.response));
var revisionFile = (getprop("/sim/aircraft-dir") ~ "/revision.txt");
var current_revision = io.readfile(revisionFile);
print("A320-family Revision: " ~ current_revision);
setprop("systems/acconfig/revision", current_revision);
setprop("/systems/acconfig/revision", current_revision);
setprop("/systems/acconfig/options/fo-view", 0);
setlistener("/systems/acconfig/new-revision", func {
if (getprop("systems/acconfig/new-revision") > current_revision) {
setprop("systems/acconfig/out-of-date", 1);
if (getprop("/systems/acconfig/new-revision") > current_revision) {
setprop("/systems/acconfig/out-of-date", 1);
} else {
setprop("systems/acconfig/out-of-date", 0);
setprop("/systems/acconfig/out-of-date", 0);
}
});
var mismatch_chk = func {
if (num(string.replace(getprop("sim/version/flightgear"),".","")) < 201912) {
setprop("systems/acconfig/mismatch-code", "0x121");
setprop("systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2019.1.2.");
if (getprop("systems/acconfig/out-of-date") != 1) {
if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201920) {
setprop("/systems/acconfig/mismatch-code", "0x121");
setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2019.2.0.");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
libraries.systemsLoop.stop();
print("Mismatch: 0x121");
welcome_dlg.close();
} else if (getprop("gear/gear[0]/wow") == 0 or getprop("position/altitude-ft") >= 15000) {
setprop("systems/acconfig/mismatch-code", "0x223");
setprop("systems/acconfig/mismatch-reason", "Preposterous configuration detected for initialization. Check your position or scenery.");
if (getprop("systems/acconfig/out-of-date") != 1) {
} else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) {
setprop("/systems/acconfig/mismatch-code", "0x223");
setprop("/systems/acconfig/mismatch-reason", "Preposterous configuration detected for initialization. Check your position or scenery.");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
libraries.systemsLoop.stop();
print("Mismatch: 0x223");
welcome_dlg.close();
} else if (getprop("systems/acconfig/libraries-loaded") != 1) {
setprop("systems/acconfig/mismatch-code", "0x247");
setprop("systems/acconfig/mismatch-reason", "System files are missing or damaged. Please download a new copy of the aircraft.");
if (getprop("systems/acconfig/out-of-date") != 1) {
} else if (getprop("/systems/acconfig/libraries-loaded") != 1) {
setprop("/systems/acconfig/mismatch-code", "0x247");
setprop("/systems/acconfig/mismatch-reason", "System files are missing or damaged. Please download a new copy of the aircraft.");
if (getprop("/systems/acconfig/out-of-date") != 1) {
error_mismatch.open();
}
libraries.systemsLoop.stop();
@ -169,84 +172,92 @@ var mismatch_chk = func {
setlistener("/sim/signals/fdm-initialized", func {
init_dlg.close();
if (getprop("systems/acconfig/out-of-date") == 1) {
if (getprop("/systems/acconfig/out-of-date") == 1) {
update_dlg.open();
print("System: The A320-family is out of date!");
}
mismatch_chk();
readSettings();
if (getprop("systems/acconfig/out-of-date") != 1 and getprop("systems/acconfig/options/revision") < current_revision and getprop("systems/acconfig/mismatch-code") == "0x000") {
if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/options/revision") < current_revision and getprop("/systems/acconfig/mismatch-code") == "0x000") {
updated_dlg.open();
if (getprop("systems/acconfig/options/no-rendering-warn") != 1) {
if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) {
renderingSettings.check();
}
} else if (getprop("systems/acconfig/out-of-date") != 1 and getprop("systems/acconfig/mismatch-code") == "0x000" and getprop("systems/acconfig/options/welcome-skip") != 1) {
} else if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/mismatch-code") == "0x000" and getprop("/systems/acconfig/options/welcome-skip") != 1) {
welcome_dlg.open();
if (getprop("systems/acconfig/options/no-rendering-warn") != 1) {
if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) {
renderingSettings.check();
}
}
setprop("systems/acconfig/options/revision", current_revision);
setprop("/systems/acconfig/options/revision", current_revision);
writeSettings();
if (getprop("options/system/save-state") == 1)
if (getprop("/options/system/save-state") == 1)
{
save.restore(save.default, getprop("sim/fg-home") ~ "/Export/" ~ getprop("sim/aircraft") ~ "-save.xml");
save.restore(save.default, getprop("/sim/fg-home") ~ "/Export/" ~ getprop("/sim/aircraft") ~ "-save.xml");
}
if (getprop("/options/system/fo-view") == 1) {
view.setViewByIndex(100);
}
spinning.stop();
});
setlistener("/sim/signals/exit", func {
save.save(save.default, getprop("sim/fg-home") ~ "/Export/" ~ getprop("sim/aircraft") ~ "-save.xml");
save.save(save.default, getprop("/sim/fg-home") ~ "/Export/" ~ getprop("/sim/aircraft") ~ "-save.xml");
});
var renderingSettings = {
check: func() {
var rembrandt = getprop("sim/rendering/rembrandt/enabled");
var ALS = getprop("sim/rendering/shaders/skydome");
var customSettings = getprop("sim/rendering/shaders/custom-settings") == 1;
var landmass = getprop("sim/rendering/shaders/landmass") >= 4;
var model = getprop("sim/rendering/shaders/model") >= 2;
var rembrandt = getprop("/sim/rendering/rembrandt/enabled");
var ALS = getprop("/sim/rendering/shaders/skydome");
var customSettings = getprop("/sim/rendering/shaders/custom-settings") == 1;
var landmass = getprop("/sim/rendering/shaders/landmass") >= 4;
var model = getprop("/sim/rendering/shaders/model") >= 2;
if (!rembrandt and (!ALS or !customSettings or !landmass or !model)) {
rendering_dlg.open();
}
},
fixAll: func() {
me.fixCore();
var landmass = getprop("sim/rendering/shaders/landmass") >= 4;
var model = getprop("sim/rendering/shaders/model") >= 2;
var landmass = getprop("/sim/rendering/shaders/landmass") >= 4;
var model = getprop("/sim/rendering/shaders/model") >= 2;
if (!landmass) {
setprop("sim/rendering/shaders/landmass", 4);
setprop("/sim/rendering/shaders/landmass", 4);
}
if (!model) {
setprop("sim/rendering/shaders/model", 2);
setprop("/sim/rendering/shaders/model", 2);
}
},
fixCore: func() {
setprop("sim/rendering/shaders/skydome", 1); # ALS on
setprop("sim/rendering/shaders/custom-settings", 1);
gui.popupTip("Rendering Settings updated!");
setprop("/sim/rendering/shaders/skydome", 1); # ALS on
setprop("/sim/rendering/shaders/custom-settings", 1);
gui.popupTip("/Rendering Settings updated!");
},
};
var readSettings = func {
io.read_properties(getprop("sim/fg-home") ~ "/Export/A320-family-config.xml", "/systems/acconfig/options");
setprop("options/system/keyboard-mode", getprop("systems/acconfig/options/keyboard-mode"));
setprop("options/system/weight-kgs", getprop("systems/acconfig/options/weight-kgs"));
setprop("options/system/save-state", getprop("systems/acconfig/options/save-state"));
setprop("controls/adirs/skip", getprop("systems/acconfig/options/adirs-skip"));
setprop("sim/model/autopush/route/show", getprop("systems/acconfig/options/autopush/show-route"));
setprop("sim/model/autopush/route/show-wingtip", getprop("systems/acconfig/options/autopush/show-wingtip"));
io.read_properties(getprop("/sim/fg-home") ~ "/Export/A320-family-config.xml", "/systems/acconfig/options");
setprop("/options/system/keyboard-mode", getprop("/systems/acconfig/options/keyboard-mode"));
setprop("/options/system/weight-kgs", getprop("/systems/acconfig/options/weight-kgs"));
setprop("/options/system/save-state", getprop("/systems/acconfig/options/save-state"));
setprop("/controls/adirs/skip", getprop("/systems/acconfig/options/adirs-skip"));
setprop("/systems/apu/oil/allow-oil-consumption", getprop("/systems/acconfig/options/allow-oil-consumption"));
setprop("/sim/model/autopush/route/show", getprop("/systems/acconfig/options/autopush/show-route"));
setprop("/sim/model/autopush/route/show-wingtip", getprop("/systems/acconfig/options/autopush/show-wingtip"));
setprop("/options/system/fo-view", getprop("/systems/acconfig/options/fo-view"));
}
var writeSettings = func {
setprop("systems/acconfig/options/keyboard-mode", getprop("options/system/keyboard-mode"));
setprop("systems/acconfig/options/weight-kgs", getprop("options/system/weight-kgs"));
setprop("systems/acconfig/options/save-state", getprop("options/system/save-state"));
setprop("systems/acconfig/options/adirs-skip", getprop("controls/adirs/skip"));
setprop("systems/acconfig/options/autopush/show-route", getprop("sim/model/autopush/route/show"));
setprop("systems/acconfig/options/autopush/show-wingtip", getprop("sim/model/autopush/route/show-wingtip"));
io.write_properties(getprop("sim/fg-home") ~ "/Export/A320-family-config.xml", "/systems/acconfig/options");
setprop("/systems/acconfig/options/keyboard-mode", getprop("/options/system/keyboard-mode"));
setprop("/systems/acconfig/options/weight-kgs", getprop("/options/system/weight-kgs"));
setprop("/systems/acconfig/options/save-state", getprop("/options/system/save-state"));
setprop("/systems/acconfig/options/adirs-skip", getprop("/controls/adirs/skip"));
setprop("/systems/acconfig/options/allow-oil-consumption", getprop("/systems/apu/oil/allow-oil-consumption"));
setprop("/systems/acconfig/options/autopush/show-route", getprop("/sim/model/autopush/route/show"));
setprop("/systems/acconfig/options/autopush/show-wingtip", getprop("/sim/model/autopush/route/show-wingtip"));
setprop("/systems/acconfig/options/fo-view", getprop("/options/system/fo-view"));
io.write_properties(getprop("/sim/fg-home") ~ "/Export/A320-family-config.xml", "/systems/acconfig/options");
}
################
@ -255,47 +266,42 @@ var writeSettings = func {
# Cold and Dark
var colddark = func {
if (getprop("systems/acconfig/mismatch-code") == "0x000") {
if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
spinning.start();
ps_loaded_dlg.close();
ps_load_dlg.open();
setprop("systems/acconfig/autoconfig-running", 1);
setprop("controls/gear/brake-left", 1);
setprop("controls/gear/brake-right", 1);
setprop("/systems/acconfig/autoconfig-running", 1);
setprop("/controls/gear/brake-left", 1);
setprop("/controls/gear/brake-right", 1);
# Initial shutdown, and reinitialization.
setprop("controls/engines/engine-start-switch", 1);
setprop("controls/engines/engine[0]/cutoff-switch", 1);
setprop("controls/engines/engine[1]/cutoff-switch", 1);
setprop("controls/flight/slats", 0.000);
setprop("controls/flight/flaps", 0.000);
setprop("controls/flight/flap-lever", 0);
setprop("controls/flight/flap-pos", 0);
setprop("controls/flight/flap-txt", " ");
libraries.flaptimer.stop();
setprop("controls/flight/speedbrake-arm", 0);
setprop("controls/flight/speedbrake", 0);
setprop("controls/gear/gear-down", 1);
setprop("controls/flight/elevator-trim", 0);
setprop("controls/switches/beacon", 0);
setprop("controls/switches/strobe", 0.0);
setprop("controls/switches/wing-lights", 0);
setprop("controls/lighting/nav-lights-switch", 0);
setprop("controls/lighting/turnoff-light-switch", 0);
setprop("controls/lighting/taxi-light-switch", 0.0);
setprop("controls/switches/landing-lights-l", 0.0);
setprop("controls/switches/landing-lights-r", 0.0);
setprop("controls/atc/mode-knob", 0);
setprop("controls/lighting/fcu-panel-knb", 0);
setprop("controls/lighting/main-panel-knb", 0);
setprop("controls/lighting/overhead-panel-knb", 0);
setprop("/controls/engines/engine-start-switch", 1);
setprop("/controls/engines/engine[0]/cutoff-switch", 1);
setprop("/controls/engines/engine[1]/cutoff-switch", 1);
setprop("/controls/flight/flaps", 0);
setprop("/controls/flight/speedbrake-arm", 0);
setprop("/controls/flight/speedbrake", 0);
setprop("/controls/gear/gear-down", 1);
setprop("/controls/flight/elevator-trim", 0);
setprop("/controls/switches/beacon", 0);
setprop("/controls/switches/strobe", 0.0);
setprop("/controls/switches/wing-lights", 0);
setprop("/controls/lighting/nav-lights-switch", 0);
setprop("/controls/lighting/turnoff-light-switch", 0);
setprop("/controls/lighting/taxi-light-switch", 0.0);
setprop("/controls/switches/landing-lights-l", 0.0);
setprop("/controls/switches/landing-lights-r", 0.0);
setprop("/controls/atc/mode-knob", 0);
setprop("/controls/lighting/fcu-panel-knb", 0);
setprop("/controls/lighting/main-panel-knb", 0);
setprop("/controls/lighting/overhead-panel-knb", 0);
atc.transponderPanel.modeSwitch(1);
libraries.systemsInit();
failResetOld();
if (getprop("engines/engine[1]/n2-actual") < 2) {
if (getprop("/engines/engine[1]/n2-actual") < 2) {
colddark_b();
} else {
var colddark_eng_off = setlistener("/engines/engine[1]/n2-actual", func {
if (getprop("engines/engine[1]/n2-actual") < 2) {
if (getprop("/engines/engine[1]/n2-actual") < 2) {
removelistener(colddark_eng_off);
colddark_b();
}
@ -305,12 +311,11 @@ var colddark = func {
}
var colddark_b = func {
# Continues the Cold and Dark script, after engines fully shutdown.
setprop("controls/APU/master", 0);
setprop("controls/APU/start", 0);
setprop("/controls/apu/master", 0);
settimer(func {
setprop("controls/gear/brake-left", 0);
setprop("controls/gear/brake-right", 0);
setprop("systems/acconfig/autoconfig-running", 0);
setprop("/controls/gear/brake-left", 0);
setprop("/controls/gear/brake-right", 0);
setprop("/systems/acconfig/autoconfig-running", 0);
ps_load_dlg.close();
ps_loaded_dlg.open();
spinning.stop();
@ -319,39 +324,35 @@ var colddark_b = func {
# Ready to Start Eng
var beforestart = func {
if (getprop("systems/acconfig/mismatch-code") == "0x000") {
if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
spinning.start();
ps_loaded_dlg.close();
ps_load_dlg.open();
setprop("systems/acconfig/autoconfig-running", 1);
setprop("controls/gear/brake-left", 1);
setprop("controls/gear/brake-right", 1);
setprop("/systems/acconfig/autoconfig-running", 1);
setprop("/controls/gear/brake-left", 1);
setprop("/controls/gear/brake-right", 1);
# First, we set everything to cold and dark.
setprop("controls/engines/engine-start-switch", 1);
setprop("controls/engines/engine[0]/cutoff-switch", 1);
setprop("controls/engines/engine[1]/cutoff-switch", 1);
setprop("controls/flight/slats", 0.000);
setprop("controls/flight/flaps", 0.000);
setprop("controls/flight/flap-lever", 0);
setprop("controls/flight/flap-pos", 0);
setprop("controls/flight/flap-txt", " ");
libraries.flaptimer.stop();
setprop("controls/flight/speedbrake-arm", 0);
setprop("controls/flight/speedbrake", 0);
setprop("controls/gear/gear-down", 1);
setprop("controls/flight/elevator-trim", 0);
setprop("/controls/engines/engine-start-switch", 1);
setprop("/controls/engines/engine[0]/cutoff-switch", 1);
setprop("/controls/engines/engine[1]/cutoff-switch", 1);
setprop("/controls/flight/flaps", 0);
setprop("/controls/flight/speedbrake-arm", 0);
setprop("/controls/flight/speedbrake", 0);
setprop("/controls/gear/gear-down", 1);
setprop("/controls/flight/elevator-trim", 0);
libraries.systemsInit();
failResetOld();
setprop("controls/APU/master", 0);
setprop("controls/APU/start", 0);
# Now the Startup!
props.globals.getNode("controls/electrical/switches/bat-1").setValue(1);
props.globals.getNode("controls/electrical/switches/bat-2").setValue(1);
setprop("controls/APU/master", 1);
setprop("controls/APU/start", 1);
var apu_rpm_chk = setlistener("/systems/apu/rpm", func {
if (getprop("systems/apu/rpm") >= 98) {
props.globals.getNode("/controls/electrical/switches/bat-1").setValue(1);
props.globals.getNode("/controls/electrical/switches/bat-2").setValue(1);
setprop("/controls/apu/master", 1);
settimer(func() {
systems.APUController.APU.powerOn(); # guarantee it always works
systems.APUController.APU.startCommand(1);
}, 0.1);
var apu_rpm_chk = setlistener("/engines/engine[2]/n1", func {
if (getprop("/engines/engine[2]/n1") >= 98) {
removelistener(apu_rpm_chk);
beforestart_b();
}
@ -366,42 +367,42 @@ var beforestart_b = func {
systems.FUEL.Switches.pumpCenter2.setValue(1);
systems.FUEL.Switches.pumpRight1.setValue(1);
systems.FUEL.Switches.pumpRight2.setValue(1);
setprop("controls/lighting/fcu-panel-knb", 1);
setprop("controls/lighting/main-panel-knb", 1);
setprop("controls/lighting/overhead-panel-knb", 1);
setprop("controls/electrical/switches/apu", 1);
setprop("controls/electrical/switches/galley", 1);
setprop("controls/electrical/switches/gen-1", 1);
setprop("controls/electrical/switches/gen-2", 1);
setprop("controls/pneumatic/switches/bleedapu", 1);
setprop("controls/pneumatic/switches/bleed1", 1);
setprop("controls/pneumatic/switches/bleed2", 1);
setprop("controls/pneumatic/switches/pack1", 1);
setprop("controls/pneumatic/switches/pack2", 1);
setprop("controls/adirs/ir[0]/knob","1");
setprop("controls/adirs/ir[1]/knob","1");
setprop("controls/adirs/ir[2]/knob","1");
if (systems.ADIRSnew.Switches.adrSw[0].getValue() != 1) { systems.ADIRSControlPanel.adrSw(0); }
if (systems.ADIRSnew.Switches.adrSw[1].getValue() != 1) { systems.ADIRSControlPanel.adrSw(1); }
if (systems.ADIRSnew.Switches.adrSw[2].getValue() != 1) { systems.ADIRSControlPanel.adrSw(2); }
setprop("/controls/lighting/fcu-panel-knb", 1);
setprop("/controls/lighting/main-panel-knb", 1);
setprop("/controls/lighting/overhead-panel-knb", 1);
setprop("/controls/electrical/switches/apu", 1);
setprop("/controls/electrical/switches/galley", 1);
setprop("/controls/electrical/switches/gen-1", 1);
setprop("/controls/electrical/switches/gen-2", 1);
setprop("/controls/pneumatic/switches/bleedapu", 1);
setprop("/controls/pneumatic/switches/bleed1", 1);
setprop("/controls/pneumatic/switches/bleed2", 1);
setprop("/controls/pneumatic/switches/pack1", 1);
setprop("/controls/pneumatic/switches/pack2", 1);
setprop("/controls/adirs/ir[0]/knob","1");
setprop("/controls/adirs/ir[1]/knob","1");
setprop("/controls/adirs/ir[2]/knob","1");
if (systems.ADIRS.Switches.adrSw[0].getValue() != 1) { systems.ADIRSControlPanel.adrSw(0); }
if (systems.ADIRS.Switches.adrSw[1].getValue() != 1) { systems.ADIRSControlPanel.adrSw(1); }
if (systems.ADIRS.Switches.adrSw[2].getValue() != 1) { systems.ADIRSControlPanel.adrSw(2); }
systems.ADIRSControlPanel.irModeSw(0, 1);
systems.ADIRSControlPanel.irModeSw(1, 1);
systems.ADIRSControlPanel.irModeSw(2, 1);
systems.ADIRSnew.ADIRunits[0].instAlign();
systems.ADIRSnew.ADIRunits[1].instAlign();
systems.ADIRSnew.ADIRunits[2].instAlign();
setprop("controls/adirs/mcducbtn", 1);
setprop("controls/switches/beacon", 1);
setprop("controls/lighting/nav-lights-switch", 1);
setprop("controls/radio/rmp[0]/on", 1);
setprop("controls/radio/rmp[1]/on", 1);
setprop("controls/radio/rmp[2]/on", 1);
setprop("systems/fadec/power-avail", 1);
setprop("systems/fadec/powered-time", -310);
systems.ADIRS.ADIRunits[0].instAlign();
systems.ADIRS.ADIRunits[1].instAlign();
systems.ADIRS.ADIRunits[2].instAlign();
setprop("/controls/adirs/mcducbtn", 1);
setprop("/controls/switches/beacon", 1);
setprop("/controls/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1);
setprop("/controls/radio/rmp[2]/on", 1);
setprop("/systems/fadec/power-avail", 1);
setprop("/systems/fadec/powered-time", -310);
settimer(func {
setprop("controls/gear/brake-left", 0);
setprop("controls/gear/brake-right", 0);
setprop("systems/acconfig/autoconfig-running", 0);
setprop("/controls/gear/brake-left", 0);
setprop("/controls/gear/brake-right", 0);
setprop("/systems/acconfig/autoconfig-running", 0);
ps_load_dlg.close();
ps_loaded_dlg.open();
spinning.stop();
@ -410,39 +411,35 @@ var beforestart_b = func {
# Ready to Taxi
var taxi = func {
if (getprop("systems/acconfig/mismatch-code") == "0x000") {
if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
spinning.start();
ps_loaded_dlg.close();
ps_load_dlg.open();
setprop("systems/acconfig/autoconfig-running", 1);
setprop("controls/gear/brake-left", 1);
setprop("controls/gear/brake-right", 1);
setprop("/systems/acconfig/autoconfig-running", 1);
setprop("/controls/gear/brake-left", 1);
setprop("/controls/gear/brake-right", 1);
# First, we set everything to cold and dark.
setprop("controls/engines/engine-start-switch", 1);
setprop("controls/engines/engine[0]/cutoff-switch", 1);
setprop("controls/engines/engine[1]/cutoff-switch", 1);
setprop("controls/flight/slats", 0.000);
setprop("controls/flight/flaps", 0.000);
setprop("controls/flight/flap-lever", 0);
setprop("controls/flight/flap-pos", 0);
setprop("controls/flight/flap-txt", " ");
libraries.flaptimer.stop();
setprop("controls/flight/speedbrake-arm", 0);
setprop("controls/flight/speedbrake", 0);
setprop("controls/gear/gear-down", 1);
setprop("controls/flight/elevator-trim", 0);
setprop("/controls/engines/engine-start-switch", 1);
setprop("/controls/engines/engine[0]/cutoff-switch", 1);
setprop("/controls/engines/engine[1]/cutoff-switch", 1);
setprop("/controls/flight/flaps", 0);
setprop("/controls/flight/speedbrake-arm", 0);
setprop("/controls/flight/speedbrake", 0);
setprop("/controls/gear/gear-down", 1);
setprop("/controls/flight/elevator-trim", 0);
libraries.systemsInit();
failResetOld();
setprop("controls/APU/master", 0);
setprop("controls/APU/start", 0);
# Now the Startup!
props.globals.getNode("controls/electrical/switches/bat-1").setValue(1);
props.globals.getNode("controls/electrical/switches/bat-2").setValue(1);
setprop("controls/APU/master", 1);
setprop("controls/APU/start", 1);
var apu_rpm_chk = setlistener("/systems/apu/rpm", func {
if (getprop("systems/apu/rpm") >= 98) {
props.globals.getNode("/controls/electrical/switches/bat-1").setValue(1);
props.globals.getNode("/controls/electrical/switches/bat-2").setValue(1);
setprop("/controls/apu/master", 1);
settimer(func() {
systems.APUController.APU.powerOn(); # guarantee it always works
systems.APUController.APU.startCommand(1);
}, 0.1);
var apu_rpm_chk = setlistener("/engines/engine[2]/n1", func {
if (getprop("/engines/engine[2]/n1") >= 98) {
removelistener(apu_rpm_chk);
taxi_b();
}
@ -457,65 +454,67 @@ var taxi_b = func {
systems.FUEL.Switches.pumpCenter2.setValue(1);
systems.FUEL.Switches.pumpRight1.setValue(1);
systems.FUEL.Switches.pumpRight2.setValue(1);
setprop("controls/lighting/fcu-panel-knb", 1);
setprop("controls/lighting/main-panel-knb", 1);
setprop("controls/lighting/overhead-panel-knb", 1);
setprop("controls/electrical/switches/apu", 1);
setprop("controls/electrical/switches/galley", 1);
setprop("controls/electrical/switches/gen-1", 1);
setprop("controls/electrical/switches/gen-2", 1);
setprop("controls/pneumatic/switches/bleedapu", 1);
setprop("controls/pneumatic/switches/bleed1", 1);
setprop("controls/pneumatic/switches/bleed2", 1);
setprop("controls/pneumatic/switches/pack1", 1);
setprop("controls/pneumatic/switches/pack2", 1);
setprop("controls/adirs/ir[0]/knob","1");
setprop("controls/adirs/ir[1]/knob","1");
setprop("controls/adirs/ir[2]/knob","1");
if (systems.ADIRSnew.Switches.adrSw[0].getValue() != 1) { systems.ADIRSControlPanel.adrSw(0); }
if (systems.ADIRSnew.Switches.adrSw[1].getValue() != 1) { systems.ADIRSControlPanel.adrSw(1); }
if (systems.ADIRSnew.Switches.adrSw[2].getValue() != 1) { systems.ADIRSControlPanel.adrSw(2); }
setprop("/controls/lighting/fcu-panel-knb", 1);
setprop("/controls/lighting/main-panel-knb", 1);
setprop("/controls/lighting/overhead-panel-knb", 1);
setprop("/controls/electrical/switches/apu", 1);
setprop("/controls/electrical/switches/galley", 1);
setprop("/controls/electrical/switches/gen-1", 1);
setprop("/controls/electrical/switches/gen-2", 1);
setprop("/controls/pneumatic/switches/bleedapu", 1);
setprop("/controls/pneumatic/switches/bleed1", 1);
setprop("/controls/pneumatic/switches/bleed2", 1);
setprop("/controls/pneumatic/switches/pack1", 1);
setprop("/controls/pneumatic/switches/pack2", 1);
setprop("/controls/adirs/ir[0]/knob","1");
setprop("/controls/adirs/ir[1]/knob","1");
setprop("/controls/adirs/ir[2]/knob","1");
if (systems.ADIRS.Switches.adrSw[0].getValue() != 1) { systems.ADIRSControlPanel.adrSw(0); }
if (systems.ADIRS.Switches.adrSw[1].getValue() != 1) { systems.ADIRSControlPanel.adrSw(1); }
if (systems.ADIRS.Switches.adrSw[2].getValue() != 1) { systems.ADIRSControlPanel.adrSw(2); }
systems.ADIRSControlPanel.irModeSw(0, 1);
systems.ADIRSControlPanel.irModeSw(1, 1);
systems.ADIRSControlPanel.irModeSw(2, 1);
systems.ADIRSnew.ADIRunits[0].instAlign();
systems.ADIRSnew.ADIRunits[1].instAlign();
systems.ADIRSnew.ADIRunits[2].instAlign();
setprop("controls/adirs/mcducbtn", 1);
setprop("controls/switches/beacon", 1);
setprop("controls/switches/wing-lights", 1);
setprop("controls/lighting/nav-lights-switch", 1);
setprop("controls/radio/rmp[0]/on", 1);
setprop("controls/radio/rmp[1]/on", 1);
setprop("controls/radio/rmp[2]/on", 1);
setprop("controls/atc/mode-knob", 2);
systems.ADIRS.ADIRunits[0].instAlign();
systems.ADIRS.ADIRunits[1].instAlign();
systems.ADIRS.ADIRunits[2].instAlign();
setprop("/controls/adirs/mcducbtn", 1);
setprop("/controls/switches/beacon", 1);
setprop("/controls/switches/wing-lights", 1);
setprop("/controls/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1);
setprop("/controls/radio/rmp[2]/on", 1);
setprop("/controls/atc/mode-knob", 2);
atc.transponderPanel.modeSwitch(3);
setprop("systems/fadec/power-avail", 1);
setprop("systems/fadec/powered-time", -310);
setprop("controls/lighting/turnoff-light-switch", 1);
setprop("controls/lighting/taxi-light-switch", 0.5);
setprop("controls/switches/landing-lights-l", 0.5);
setprop("controls/switches/landing-lights-r", 0.5);
setprop("instrumentation/altimeter[0]/setting-inhg", getprop("environment/pressure-sea-level-inhg"));
setprop("/systems/fadec/power-avail", 1);
setprop("/systems/fadec/powered-time", -310);
setprop("/controls/lighting/turnoff-light-switch", 1);
setprop("/controls/lighting/taxi-light-switch", 0.5);
setprop("/controls/switches/landing-lights-l", 0.5);
setprop("/controls/switches/landing-lights-r", 0.5);
if (pts.Instrumentation.Altimeter.std.getBoolValue()) {
libraries.toggleSTD();
}
setprop("/instrumentation/altimeter[0]/setting-inhg", getprop("/environment/pressure-sea-level-inhg"));
settimer(taxi_c, 2);
}
var taxi_c = func {
setprop("controls/engines/engine-start-switch", 2);
setprop("controls/engines/engine[0]/cutoff-switch", 0);
setprop("controls/engines/engine[1]/cutoff-switch", 0);
setprop("/controls/engines/engine-start-switch", 2);
setprop("/controls/engines/engine[0]/cutoff-switch", 0);
setprop("/controls/engines/engine[1]/cutoff-switch", 0);
settimer(func {
taxi_d();
}, 10);
}
var taxi_d = func {
# After Start items.
setprop("controls/engines/engine-start-switch", 1);
setprop("controls/APU/master", 0);
setprop("controls/APU/start", 0);
setprop("controls/pneumatic/switches/bleedapu", 0);
setprop("controls/gear/brake-left", 0);
setprop("controls/gear/brake-right", 0);
setprop("systems/acconfig/autoconfig-running", 0);
setprop("/controls/engines/engine-start-switch", 1);
setprop("/controls/apu/master", 0);
setprop("/controls/pneumatic/switches/bleedapu", 0);
setprop("/controls/gear/brake-left", 0);
setprop("/controls/gear/brake-right", 0);
setprop("/systems/acconfig/autoconfig-running", 0);
ps_load_dlg.close();
ps_loaded_dlg.open();
spinning.stop();
@ -523,30 +522,25 @@ var taxi_d = func {
# Ready to Takeoff
var takeoff = func {
if (getprop("systems/acconfig/mismatch-code") == "0x000") {
if (getprop("/systems/acconfig/mismatch-code") == "0x000") {
# The same as taxi, except we set some things afterwards.
taxi();
var eng_one_chk_c = setlistener("/engines/engine[0]/state", func {
if (getprop("engines/engine[0]/state") == 3) {
if (getprop("/engines/engine[0]/state") == 3) {
removelistener(eng_one_chk_c);
setprop("controls/switches/strobe", 1.0);
setprop("controls/lighting/taxi-light-switch", 1);
setprop("controls/switches/landing-lights-l", 1);
setprop("controls/switches/landing-lights-r", 1);
setprop("controls/flight/speedbrake-arm", 1);
setprop("controls/flight/flaps", 0.290);
setprop("controls/flight/slats", 0.666);
setprop("controls/flight/flap-lever", 1);
setprop("controls/flight/flap-pos", 2);
setprop("controls/flight/flap-txt", "1+F");
setprop("controls/atc/mode-knob", 4);
setprop("/controls/switches/strobe", 1.0);
setprop("/controls/lighting/taxi-light-switch", 1);
setprop("/controls/switches/landing-lights-l", 1);
setprop("/controls/switches/landing-lights-r", 1);
setprop("/controls/flight/speedbrake-arm", 1);
setprop("/controls/flight/flaps", 0.2);
setprop("/controls/atc/mode-knob", 4);
atc.transponderPanel.modeSwitch(5);
libraries.flaptimer.start();
setprop("controls/flight/elevator-trim", -0.07);
setprop("/controls/flight/elevator-trim", -0.07);
systems.arm_autobrake(3);
setprop("ECAM/to-config-test", 1);
setprop("/ECAM/to-config-test", 1);
settimer(func {
setprop("ECAM/to-config-test", 0);
setprop("/ECAM/to-config-test", 0);
}, 1);
}
});

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->
@ -167,6 +167,47 @@
<live>true</live>
</checkbox>
<group>
<layout>hbox</layout>
<hrule>
<stretch type="bool">true</stretch>
</hrule>
<text>
<label>APU Oil Level</label>
</text>
<hrule>
<stretch type="bool">true</stretch>
</hrule>
</group>
<group>
<layout>hbox</layout>
<slider>
<enable>
<property>/systems/apu/oil/allow-oil-consumption</property>
</enable>
<x>10</x>
<y>50</y>
<width>200</width>
<property>/systems/apu/oil/level-l</property>
<min>3.9</min>
<max>5.4</max>
<live>true</live>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<x>10</x>
<y>200</y>
<label>8.8 litres</label> <!-- placeholder for width -->
<format>%.1f litres</format>
<property>/systems/apu/oil/level-l</property>
<live>true</live>
</text>
</group>
</group>
</PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->
@ -123,6 +123,14 @@
<halign>left</halign>
<label>SHIFT + F - Set CL Thrust</label>
</text>
<text>
<halign>left</halign>
<label>CTRL + K - Disable MCDU keyboard input</label>
</text>
<text>
<halign>left</halign>
<label>CTRL + V - Select Pilot Flying view (See Aircraft Configuration dialog)</label>
</text>
</group>

View file

@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Load Flightplans -->
<PropertyList>
<name>load-flightplans</name>
<layout>vbox</layout>
<nasal>
<open><![CDATA[
var loadfpl = func(path) {
fmgc.flightPlanController.loadFlightPlan(path.getValue());
}
var defaultDirInFileSelector = getprop("/sim/fg-home") ~ "/Export";
var file_selector = gui.FileSelector.new(
callback: loadfpl, title: "Load flightplan", button: "Load",
dir: defaultDirInFileSelector, dotfiles: 1, pattern: ["*.xml","*.gpx","*.fgfp"]);
]]></open>
<close><![CDATA[
file_selector.del();
]]></close>
</nasal>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>Load Flightplans</label>
</text>
<button>
<halign>right</halign>
<pref-width>20</pref-width>
<pref-height>20</pref-height>
<legend>X</legend>
<key>Esc</key>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>vbox</layout>
<text>
<halign>left</halign>
<label>This dialog allows users to load their own .gpx / .fgfp flightplans.</label>
</text>
<text>
<halign>left</halign>
<label>Follow these guidelines. Not doing so will cause problems!</label>
</text>
<text>
<halign>left</halign>
<label>1. You must have a departure and destination airport set on MCDU INIT A</label>
</text>
<text>
<halign>left</halign>
<label>2. Your file's destination / departure must match exactly the one set in INITA</label>
</text>
<text>
<halign>left</halign>
<label>3. If your file includes SIDS / STARS you CANNOT change them in the MCDU.</label>
</text>
<text>
<halign>left</halign>
<label>If you have a NAVIGRAPH subcription, we reccomend to load them in the MCDU instead of here.</label>
</text>
<group>
<layout>hbox</layout>
<text>
<halign>left</halign>
<label>Load a flightplan</label>
</text>
<button>
<legend>Load flightplan</legend>
<equal>true</equal>
<enable>
<property>FMGC/internal/tofrom-set</property>
</enable>
<binding>
<command>nasal</command>
<script>file_selector.open()</script>
</binding>
</button>
</group>
</group>
</PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->
@ -427,6 +427,46 @@
<live>true</live>
</checkbox>
<checkbox>
<label>Allow APU Oil Consumption</label>
<halign>left</halign>
<property>/systems/apu/oil/allow-oil-consumption</property>
<binding>
<command>property-toggle</command>
<property>/systems/apu/oil/allow-oil-consumption</property>
</binding>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
acconfig.writeSettings();
</script>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<label>First Officer is the Pilot Flying</label>
<halign>left</halign>
<property>/options/system/fo-view</property>
<binding>
<command>property-toggle</command>
<property>/options/system/fo-view</property>
</binding>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
acconfig.writeSettings();
</script>
</binding>
<live>true</live>
</checkbox>
<checkbox>
<!-- TODO there might be a better way to formulate this. -->
<label>Save states between sessions</label>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<!-- A3XX Aircraft Config Dialog -->

61
Engines/APS3200.xml Normal file
View file

@ -0,0 +1,61 @@
<?xml version="1.0"?>
<turbine_engine name="APS3200">
<milthrust> 2.6 </milthrust>
<bypassratio> 0.000 </bypassratio>
<tsfc> 0.820 </tsfc>
<bleed> 0.96</bleed> <!-- 16 / 400 KW exhaust energy -->
<!-- self sustaining speed is 55.0 -->
<ignitionn1> 5.0</ignitionn1>
<ignitionn2> 26</ignitionn2> <!-- hack to make work -->
<n1spinup> 3.0</n1spinup>
<n2spinup> 8.666</n2spinup> <!-- hack to make work -->
<n1startrate> 1.8222</n1startrate>
<n2startrate> 1.8222</n2startrate>
<idlen1> 99.9 </idlen1>
<idlen2> 99.9 </idlen2>
<n1spindown> 20</n1spindown>
<n2spindown> 20</n2spindown>
<disable-windmill> 1</disable-windmill>
<maxn1> 100.0 </maxn1>
<maxn2> 100.0 </maxn2>
<augmented> 0 </augmented>
<injected> 0 </injected>
<function name="IdleThrust">
<table>
<independentVar lookup="row">velocities/mach</independentVar>
<independentVar lookup="column">atmosphere/density-altitude</independentVar>
<tableData>
-10000 0 10000 20000 30000 40000 50000 90000
0.0 0.0430 0.0488 0.0528 0.0694 0.0899 0.1183 0.1467 0
0.2 0.0500 0.0501 0.0335 0.0544 0.0797 0.1049 0.1342 0
0.4 0.0040 0.0047 0.0020 0.0272 0.0595 0.0891 0.1203 0
0.6 -0.0804 -0.0804 -0.0560 -0.0237 0.0276 0.0718 0.1073 0
0.8 -0.2129 -0.2129 -0.1498 -0.1025 0.0474 0.0868 0.0900 0
1.0 -0.2839 -0.2839 -0.1104 -0.0469 -0.0270 0.0552 0.0800 0
</tableData>
</table>
</function>
<function name="MilThrust">
<table>
<independentVar lookup="row">velocities/mach</independentVar>
<independentVar lookup="column">atmosphere/density-altitude</independentVar>
<tableData>
-10000 0 10000 20000 30000 40000 50000 60000 90000
0.0 1.2600 1.0000 0.7400 0.5340 0.3720 0.2410 0.1490 0.0580 0
0.2 1.1692 0.9326 0.6959 0.5052 0.3545 0.2306 0.1428 0.0399 0
0.4 1.1465 0.9182 0.6899 0.5044 0.3559 0.2323 0.1446 0.0429 0
0.6 1.1755 0.9466 0.7177 0.5295 0.3763 0.2469 0.1533 0.0468 0
0.8 1.2503 1.0137 0.7772 0.5784 0.4144 0.2733 0.1690 0.0527 0
1.0 1.3585 1.1114 0.8643 0.6460 0.4713 0.3126 0.1935 0.0625 0
1.2 1.4713 1.2186 0.9660 0.7371 0.5400 0.3606 0.2229 0.0733 0
1.4 1.5769 1.3256 1.0743 0.8359 0.6212 0.4194 0.2602 0.0890 0
</tableData>
</table>
</function>
</turbine_engine>

View file

@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="CFM56_5A1">
<!-- source https://www.youtube.com/watch?v=jnGfzv7Odh4 -->
<milthrust> 27000 </milthrust>
<milthrust> 25000 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 0.6 </ignitionn1>

View file

@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="CFM56_5A1">
<!-- source https://www.youtube.com/watch?v=jnGfzv7Odh4 -->
<milthrust> 27000 </milthrust>
<milthrust> 25000 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 0.6 </ignitionn1>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="CFM56_5B4">

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="CFM56_5B4">

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<direct name="Direct">
</direct>

View file

@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="LEAP1A26">
<milthrust> 27000 </milthrust>
<milthrust> 27120 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 0.6 </ignitionn1>

View file

@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="LEAP1A26">
<milthrust> 27000 </milthrust>
<milthrust> 27120 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 0.6 </ignitionn1>

View file

@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="PW1127G">
<milthrust> 26345 </milthrust>
<milthrust> 27075 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 0.6 </ignitionn1>

View file

@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="PW1127G">
<milthrust> 26345 </milthrust>
<milthrust> 27075 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 0.6 </ignitionn1>

View file

@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="V2527_A5">
<!-- data measured from https://www.youtube.com/watch?v=gPRQcYNRV_U -->
<milthrust> 26600 </milthrust>
<milthrust> 24800 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 4.8 </ignitionn1>

View file

@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<turbine_engine name="V2527_A5">
<!-- data measured from https://www.youtube.com/watch?v=gPRQcYNRV_U -->
<milthrust> 26600 </milthrust>
<milthrust> 24800 </milthrust>
<tsfc> 0.445 </tsfc>
<bleed> 0.03 </bleed>
<ignitionn1> 4.8 </ignitionn1>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>
<name>A320-100</name>
@ -391,6 +391,7 @@
<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
<name>wing-condensation</name>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
<name>wing-condensation</name>
@ -407,6 +408,10 @@
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Firetruck -->
<model>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>
<name>A320-200</name>
@ -421,6 +421,7 @@
<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
<name>wing-condensation</name>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
<name>wing-condensation</name>
@ -437,6 +438,10 @@
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Firetruck -->
<model>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>
<name>A320-200</name>
@ -421,6 +421,7 @@
<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
<name>wing-condensation</name>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
<name>wing-condensation</name>
@ -437,6 +438,10 @@
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Firetruck -->
<model>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>
<name>A320-200</name>
@ -400,6 +400,7 @@
<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
<name>wing-condensation</name>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
<name>wing-condensation</name>
@ -416,6 +417,10 @@
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Firetruck -->
<model>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>
<name>A320-200</name>
@ -400,6 +400,7 @@
<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
<name>wing-condensation</name>
</model>
<model>
<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
<name>wing-condensation</name>
@ -416,6 +417,10 @@
</offsets>
</model>
<model>
<path>Aircraft/Generic/marker.xml</path>
</model>
<!-- Firetruck -->
<model>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -0,0 +1,25 @@
<PropertyList>
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -2,8 +2,8 @@
<name>panel</name>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -18,8 +18,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>display</name>
<inherits-from>Effects/model-interior-display</inherits-from>
<parameters>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
</images>
</texture>
<texture n="5">
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
<image>Aircraft/Generic/Effects/dust-effect-overlay.png</image>
</texture>
<sample-res>0.0007</sample-res>
<dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
<contrast><use>/sim/model/display-contrast</use></contrast>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,6 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +26,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,6 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +26,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -13,7 +13,7 @@
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,6 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +26,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 KiB

After

Width:  |  Height:  |  Size: 299 KiB

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,24 +12,24 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/white.png</positive-x>
<negative-x>Models/Effects/res/white.png</negative-x>
<positive-y>Models/Effects/res/white.png</positive-y>
<negative-y>Models/Effects/res/white.png</negative-y>
<positive-z>Models/Effects/res/white.png</positive-z>
<negative-z>Models/Effects/res/white.png</negative-z>
<positive-x>Models/Effects/res/0004.png</positive-x>
<negative-x>Models/Effects/res/0002.png</negative-x>
<positive-y>Models/Effects/res/0001.png</positive-y>
<negative-y>Models/Effects/res/0003.png</negative-y>
<positive-z>Models/Effects/res/0006.png</positive-z>
<negative-z>Models/Effects/res/0005.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -12,8 +12,8 @@
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">2</irradiance-map-type>
<irradiance-map-strength type="float">0.1</irradiance-map-strength>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
@ -28,8 +28,8 @@
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.207344 0.0 0.797276</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 0.672 0.672 0.672</opacity-cube-scale>
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -1,22 +1,35 @@
<PropertyList>
<name>tiller</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<inherits-from>Effects/model-interior</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<reflection-enabled type="int">0</reflection-enabled>
<reflection-dynamic type="int">0</reflection-dynamic>
<reflect_map-enabled type="int">0</reflect_map-enabled>
<reflection-correction type="float">0.1</reflection-correction>
<lightmap-enabled type="int">1</lightmap-enabled>
<lightmap-multi type="int">0</lightmap-multi>
<lightmap-factor type="float" n="0"><use>/controls/lighting/main-flood-norm</use></lightmap-factor>
<lightmap-factor type="float" n="0"><use>/controls/lighting/panel-light</use></lightmap-factor>
<lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color>
<texture n="3">
<image>Aircraft/A320-family/Models/Effects/tiller.png</image>
<image>Aircraft/A320-family/Models/Effects/panel-floodlight.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<irradiance-map-type type="int">1</irradiance-map-type>
<irradiance-map-strength type="float">0.33</irradiance-map-strength>
<texture n="4">
<type>cubemap</type>
<images>
<positive-x>Models/Effects/res/0004.png</positive-x>
<negative-x>Models/Effects/res/0002.png</negative-x>
<positive-y>Models/Effects/res/0001.png</positive-y>
<negative-y>Models/Effects/res/0003.png</negative-y>
<positive-z>Models/Effects/res/0006.png</positive-z>
<negative-z>Models/Effects/res/0005.png</negative-z>
</images>
</texture>
<!--
the cube center must be the same as the camera x,y,z in blend
-->
<opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center>
<opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale>
<opacity-cube-angle type="float">0.0</opacity-cube-angle>
</parameters>
</PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>
<path>../Models/cfm56.ac</path>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright (c) 2019 Joshua Davidson (Octal450) -->
<!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
<PropertyList>

Some files were not shown because too many files have changed in this diff Show more