From e27bc547754f3e11868ee1e84d845933c4cca293 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 2 Jun 2020 13:39:03 +0100 Subject: [PATCH] Apply effects to engines; prepare .xmls for animations, clean out legacy engine files --- A320-main.xml | 2 +- Models/Engines/XMLs/a320.cfm.xml | 330 +++++++++++++++++- Models/Engines/XMLs/a320.engine.cfm.left.xml | 194 ---------- Models/Engines/XMLs/a320.engine.cfm.right.xml | 194 ---------- Models/Engines/XMLs/a320.engine.iae.left.xml | 191 ---------- Models/Engines/XMLs/a320.engine.iae.right.xml | 191 ---------- Models/Engines/XMLs/a320.nacelle.cfm.xml | 53 --- Models/Engines/XMLs/a320.nacelle.iae.left.xml | 53 --- .../Engines/XMLs/a320.nacelle.iae.right.xml | 53 --- Models/Engines/XMLs/a320.pylon.cfm.left.xml | 9 - Models/Engines/XMLs/a320.pylon.cfm.right.xml | 9 - Models/Engines/XMLs/a320.pylon.iae.left.xml | 9 - Models/Engines/XMLs/a320.pylon.iae.right.xml | 9 - Models/Engines/XMLs/a320.v2500.xml | 327 ++++++++++++++++- 14 files changed, 656 insertions(+), 968 deletions(-) delete mode 100644 Models/Engines/XMLs/a320.engine.cfm.left.xml delete mode 100644 Models/Engines/XMLs/a320.engine.cfm.right.xml delete mode 100644 Models/Engines/XMLs/a320.engine.iae.left.xml delete mode 100644 Models/Engines/XMLs/a320.engine.iae.right.xml delete mode 100644 Models/Engines/XMLs/a320.nacelle.cfm.xml delete mode 100644 Models/Engines/XMLs/a320.nacelle.iae.left.xml delete mode 100644 Models/Engines/XMLs/a320.nacelle.iae.right.xml delete mode 100644 Models/Engines/XMLs/a320.pylon.cfm.left.xml delete mode 100644 Models/Engines/XMLs/a320.pylon.cfm.right.xml delete mode 100644 Models/Engines/XMLs/a320.pylon.iae.left.xml delete mode 100644 Models/Engines/XMLs/a320.pylon.iae.right.xml diff --git a/A320-main.xml b/A320-main.xml index b4566190..f8d055f3 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -69,7 +69,7 @@ 0.5 - -0.05 + 0.333 0.0 0.5 0.0 diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml index 32ab6931..0041dadb 100644 --- a/Models/Engines/XMLs/a320.cfm.xml +++ b/Models/Engines/XMLs/a320.cfm.xml @@ -3,5 +3,333 @@ - ../Models/cfm56.ac + Aircraft/A320-family/Models/Engines/Models/cfm56.ac + + + engines/engine[0]/contrail + engines/engine[1]/contrail + + + + + + + + + + select + FanSpinningCFM56 + + + engines/engine[0]/n1 + 40.0 + + + + + + select + FanLCFM56 + + + engines/engine[0]/n1 + 40.0 + + + + + + + Aircraft/A320-family/Models/Effects/reflection + EngineCFM56 + ReverserLDoor1 + ReverserLDoor2 + ReverserRDoor1 + ReverserRDoor2 + diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml deleted file mode 100644 index 4c53bba1..00000000 --- a/Models/Engines/XMLs/a320.engine.cfm.left.xml +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - 2.2 - - - - engines/engine[3]/n1 - systems/failures/engine-left-fire - engines/engine[0]/contrail - sim/multiplay/generic/float[2] - Aircraft/A320-family/Models/Engines/XMLs/a320.pylon.cfm.left.xml - - - - - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.cfm.xml - - 0.941 - - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.nacelle.cfm.xml - - - - - - - - - Aircraft/A320-family/Models/Effects/contrail.xml - contrail - - environment/contrail - - - - - - - - 4.875 - 0 - 0 - - - - - - Aircraft/A320-family/Models/Effects/Moisture.xml - moisture - - - - position/altitude-agl-ft - 1 - - - environment/relative-humidity - 45 - - - position/altitude-agl-ft - 75 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[0]/n1 - 65 - - - - - 0 - 0 - 0.3 - 0 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray.xml - engine-spray - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - position/altitude-agl-ft - 15 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[0]/n1-actual - 65 - - - engines/engine[0]/reverser-pos-norm - 0 - - - - - 4.875 - 0 - -5 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml - engine-spray-reverse - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[0]/n1-actual - 65 - - - engines/engine[0]/reverser-pos-norm - 0.75 - - - - - 0 - 0 - 0 - - - - - Engine fire - Aircraft/A320-family/Models/Effects/enginefire.xml - - 2.774 - 0 - 0 - - - - - - - - Fan - spin - blades - cone - -67 - - - -1 - 0 - 0 - - - - diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml deleted file mode 100644 index 9236f4f3..00000000 --- a/Models/Engines/XMLs/a320.engine.cfm.right.xml +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - 2.2 - - - - engines/engine[4]/n1 - systems/failures/engine-right-fire - engines/engine[1]/contrail - sim/multiplay/generic/float[3] - Aircraft/A320-family/Models/Engines/XMLs/a320.pylon.cfm.right.xml - - - - - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.cfm.xml - - 0.941 - - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.nacelle.cfm.xml - - - - - - - - - contrail - Aircraft/A320-family/Models/Effects/contrail.xml - - environment/contrail - - - - - - - - 4.875 - 0 - 0 - - - - - - moisture - Aircraft/A320-family/Models/Effects/Moisture.xml - - - - position/altitude-agl-ft - 1 - - - environment/relative-humidity - 45 - - - position/altitude-agl-ft - 75 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[1]/n1 - 60 - - - - - 0 - 0 - 0.3 - 0 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray.xml - engine-spray - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - position/altitude-agl-ft - 15 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[1]/n1-actual - 65 - - - engines/engine[1]/reverser-pos-norm - 0 - - - - - 4.875 - 0 - -5 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml - engine-spray-reverse - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[1]/n1-actual - 65 - - - engines/engine[1]/reverser-pos-norm - 0.75 - - - - - 0 - 0 - 0 - - - - - Engine fire - Aircraft/A320-family/Models/Effects/enginefire.xml - - 2.774 - 0 - 0 - - - - - - - - Fan - spin - blades - cone - -67 - - - -1 - 0 - 0 - - - - diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml deleted file mode 100644 index 77daff5c..00000000 --- a/Models/Engines/XMLs/a320.engine.iae.left.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - 2.2 - - - - engines/engine[3]/n1 - systems/failures/engine-left-fire - engines/engine[0]/contrail - sim/multiplay/generic/float[2] - Aircraft/A320-family/Models/Engines/XMLs/a320.pylon.iae.left.xml - - - - - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.v2500.xml - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.nacelle.iae.left.xml - - - - - - - - - Aircraft/A320-family/Models/Effects/contrail.xml - contrail - - environment/contrail - - - - - - - - 5.137 - 0 - 0 - - - - - - Aircraft/A320-family/Models/Effects/Moisture.xml - moisture - - - - position/altitude-agl-ft - 1 - - - environment/relative-humidity - 45 - - - position/altitude-agl-ft - 75 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[0]/n1 - 65 - - - - - 0 - 0 - 0.5 - 0 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray.xml - engine-spray - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - position/altitude-agl-ft - 15 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[0]/n1-actual - 65 - - - engines/engine[0]/reverser-pos-norm - 0 - - - - - 4.875 - 0 - -5 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml - engine-spray-reverse - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[0]/n1-actual - 65 - - - engines/engine[0]/reverser-pos-norm - 0.75 - - - - - 0 - 0 - 0 - - - - - Engine fire - Aircraft/A320-family/Models/Effects/enginefire.xml - - 3.316 - 0 - 0 - - - - - - - - Fan - spin - cone - fan - 67 - - - -1 - 0 - 0 - - - - diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml deleted file mode 100644 index e3ae99a8..00000000 --- a/Models/Engines/XMLs/a320.engine.iae.right.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - 2.2 - - - - engines/engine[4]/n1 - systems/failures/engine-right-fire - engines/engine[1]/contrail - sim/multiplay/generic/float[3] - Aircraft/A320-family/Models/Engines/XMLs/a320.pylon.iae.right.xml - - - - - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.v2500.xml - - - - Aircraft/A320-family/Models/Engines/XMLs/a320.nacelle.iae.right.xml - - - - - - - - - Aircraft/A320-family/Models/Effects/contrail.xml - contrail - - environment/contrail - - - - - - - - 5.137 - 0 - 0 - - - - - - Aircraft/A320-family/Models/Effects/Moisture.xml - moisture - - - - position/altitude-agl-ft - 1 - - - environment/relative-humidity - 45 - - - position/altitude-agl-ft - 75 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[1]/n1 - 60 - - - - - 0 - 0 - 0.5 - 0 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray.xml - engine-spray - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - position/altitude-agl-ft - 15 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[1]/n1-actual - 65 - - - engines/engine[1]/reverser-pos-norm - 0 - - - - - 4.875 - 0 - -5 - - - - - - Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml - engine-spray-reverse - - - - position/altitude-agl-ft - 1 - - - environment/surface/wetness - 0.3 - - - sim/time/sun-angle-rad - 1.63 - - - engines/engine[1]/n1-actual - 65 - - - engines/engine[1]/reverser-pos-norm - 0.75 - - - - - 0 - 0 - 0 - - - - - Engine fire - Aircraft/A320-family/Models/Effects/enginefire.xml - - 3.316 - 0 - 0 - - - - - - - - Fan - spin - cone - fan - 67 - - - -1 - 0 - 0 - - - - diff --git a/Models/Engines/XMLs/a320.nacelle.cfm.xml b/Models/Engines/XMLs/a320.nacelle.cfm.xml deleted file mode 100644 index bff7ff8f..00000000 --- a/Models/Engines/XMLs/a320.nacelle.cfm.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - ../Models/a320.nacelle.cfm.ac - - - - translate - Reverser - - 0.50 - - 1 - 0 - 0 - - - - - - Chrome shader - shader - chrome - ../Models/chrome.png - Nozzle - - - - - - material - Intake - Nacelle - Reverser - sim/model/livery - texture - Liveries/A320/USAirways.png - - - - - - var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320"); - - - livery_update.stop(); - - - - diff --git a/Models/Engines/XMLs/a320.nacelle.iae.left.xml b/Models/Engines/XMLs/a320.nacelle.iae.left.xml deleted file mode 100644 index 926212aa..00000000 --- a/Models/Engines/XMLs/a320.nacelle.iae.left.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - ../Models/a320.nacelle.iae.left.ac - - - - translate - Reverser - - 0.50 - - 1 - 0 - 0 - - - - - - Chrome shader - shader - chrome - ../Models/chrome.png - Nozzle - - - - - - material - Intake - Nacelle - Reverser - sim/model/livery - texture - Liveries/A320/USAirways.png - - - - - - var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320"); - - - livery_update.stop(); - - - - diff --git a/Models/Engines/XMLs/a320.nacelle.iae.right.xml b/Models/Engines/XMLs/a320.nacelle.iae.right.xml deleted file mode 100644 index c516eaba..00000000 --- a/Models/Engines/XMLs/a320.nacelle.iae.right.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - ../Models/a320.nacelle.iae.right.ac - - - - translate - Reverser - - 0.50 - - 1 - 0 - 0 - - - - - - Chrome shader - shader - chrome - ../Models/chrome.png - Nozzle - - - - - - material - Intake - Nacelle - Reverser - sim/model/livery - texture - Liveries/A320/USAirways.png - - - - - - var livery_update = aircraft.livery_update.new("Aircraft/A320-family/Models/Liveries/A320"); - - - livery_update.stop(); - - - - diff --git a/Models/Engines/XMLs/a320.pylon.cfm.left.xml b/Models/Engines/XMLs/a320.pylon.cfm.left.xml deleted file mode 100644 index 404ccd80..00000000 --- a/Models/Engines/XMLs/a320.pylon.cfm.left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - Aircraft/A320-family/Models/Engines/Models/a320.pylon.cfm.left.ac - - diff --git a/Models/Engines/XMLs/a320.pylon.cfm.right.xml b/Models/Engines/XMLs/a320.pylon.cfm.right.xml deleted file mode 100644 index 7dc3371c..00000000 --- a/Models/Engines/XMLs/a320.pylon.cfm.right.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - Aircraft/A320-family/Models/Engines/Models/a320.pylon.cfm.right.ac - - diff --git a/Models/Engines/XMLs/a320.pylon.iae.left.xml b/Models/Engines/XMLs/a320.pylon.iae.left.xml deleted file mode 100644 index 41089b50..00000000 --- a/Models/Engines/XMLs/a320.pylon.iae.left.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - Aircraft/A320-family/Models/Engines/Models/a320.pylon.iae.left.ac - - diff --git a/Models/Engines/XMLs/a320.pylon.iae.right.xml b/Models/Engines/XMLs/a320.pylon.iae.right.xml deleted file mode 100644 index 7764b669..00000000 --- a/Models/Engines/XMLs/a320.pylon.iae.right.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - Aircraft/A320-family/Models/Engines/Models/a320.pylon.iae.right.ac - - diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml index f59ffd57..e235d21f 100644 --- a/Models/Engines/XMLs/a320.v2500.xml +++ b/Models/Engines/XMLs/a320.v2500.xml @@ -3,5 +3,330 @@ - ../Models/IAEV2500.ac + Aircraft/A320-family/Models/Engines/Models/IAEV2500.ac + + + engines/engine[0]/contrail + engines/engine[1]/contrail + + + + + + + + + + select + FanSpinningIAE + + + engines/engine[0]/n1 + 40.0 + + + + + + select + FanLIAE + + + engines/engine[0]/n1 + 40.0 + + + + + + + Aircraft/A320-family/Models/Effects/reflection + EngineIAEV2500 + ReverserLDoor +