diff --git a/Models/Effects/LightMappedWing.png b/Models/Effects/LightMappedWing.png index 96e54d7c..193d2677 100644 Binary files a/Models/Effects/LightMappedWing.png and b/Models/Effects/LightMappedWing.png differ diff --git a/Models/Effects/Slat.png b/Models/Effects/Slat.png new file mode 100644 index 00000000..92e52973 Binary files /dev/null and b/Models/Effects/Slat.png differ diff --git a/Models/Effects/SlatL1.png b/Models/Effects/SlatL1.png deleted file mode 100644 index 141697dd..00000000 Binary files a/Models/Effects/SlatL1.png and /dev/null differ diff --git a/Models/Effects/SlatL2.png b/Models/Effects/SlatL2.png deleted file mode 100644 index 88c4af28..00000000 Binary files a/Models/Effects/SlatL2.png and /dev/null differ diff --git a/Models/Effects/SlatR1.png b/Models/Effects/SlatR1.png deleted file mode 100644 index d20a9e06..00000000 Binary files a/Models/Effects/SlatR1.png and /dev/null differ diff --git a/Models/Effects/SlatR2.png b/Models/Effects/SlatR2.png deleted file mode 100644 index 8b62eb44..00000000 Binary files a/Models/Effects/SlatR2.png and /dev/null differ diff --git a/Models/Effects/slatL1.eff b/Models/Effects/slat.eff similarity index 90% rename from Models/Effects/slatL1.eff rename to Models/Effects/slat.eff index d267fdff..9e96ea05 100644 --- a/Models/Effects/slatL1.eff +++ b/Models/Effects/slat.eff @@ -1,5 +1,5 @@ - slatl1 + slat Effects/model-combined-deferred 0 @@ -12,7 +12,7 @@ controls/lighting/wing-lights 1.0 1.0 1.0 - Aircraft/A320Family/Models/Effects/SlatL1.png + Aircraft/A320Family/Models/Effects/Slat.png linear-mipmap-linear clamp clamp diff --git a/Models/Effects/slatL2.eff b/Models/Effects/slatL2.eff deleted file mode 100644 index fca1b684..00000000 --- a/Models/Effects/slatL2.eff +++ /dev/null @@ -1,22 +0,0 @@ - - slatl2 - Effects/model-combined-deferred - - 0 - 1 - 0 - 0 - 0.1 - 1 - 0 - controls/lighting/wing-lights - 1.0 1.0 1.0 - - Aircraft/A320Family/Models/Effects/SlatL2.png - linear-mipmap-linear - clamp - clamp - normalized - - - diff --git a/Models/Effects/slatR1.eff b/Models/Effects/slatR1.eff deleted file mode 100644 index d9a55cc4..00000000 --- a/Models/Effects/slatR1.eff +++ /dev/null @@ -1,22 +0,0 @@ - - slatr1 - Effects/model-combined-deferred - - 0 - 1 - 0 - 0 - 0.1 - 1 - 0 - controls/lighting/wing-lights - 1.0 1.0 1.0 - - Aircraft/A320Family/Models/Effects/SlatR1.png - linear-mipmap-linear - clamp - clamp - normalized - - - diff --git a/Models/Effects/slatR2.eff b/Models/Effects/slatR2.eff deleted file mode 100644 index ab10a644..00000000 --- a/Models/Effects/slatR2.eff +++ /dev/null @@ -1,22 +0,0 @@ - - slatr2 - Effects/model-combined-deferred - - 0 - 1 - 0 - 0 - 0.1 - 1 - 0 - controls/lighting/wing-lights - 1.0 1.0 1.0 - - Aircraft/A320Family/Models/Effects/SlatR2.png - linear-mipmap-linear - clamp - clamp - normalized - - - diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml index 9018b2ff..fb610e33 100644 --- a/Models/Wings/a320.wings.cfm.xml +++ b/Models/Wings/a320.wings.cfm.xml @@ -832,22 +832,16 @@ - Aircraft/A320Family/Models/Effects/slatL1 + Aircraft/A320Family/Models/Effects/slat SlatL1 - - - - Aircraft/A320Family/Models/Effects/slatL2 SlatL2 - - - - Aircraft/A320Family/Models/Effects/slatR1 + SlatL3 + SlatL4 + SlatL5 SlatR1 - - - - Aircraft/A320Family/Models/Effects/slatR2 SlatR2 + SlatR3 + SlatR4 + SlatR5 diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml index c53e79ad..da23686f 100644 --- a/Models/Wings/a320.wings.iae.xml +++ b/Models/Wings/a320.wings.iae.xml @@ -832,22 +832,16 @@ - Aircraft/A320Family/Models/Effects/slatL1 + Aircraft/A320Family/Models/Effects/slat SlatL1 - - - - Aircraft/A320Family/Models/Effects/slatL2 SlatL2 - - - - Aircraft/A320Family/Models/Effects/slatR1 + SlatL3 + SlatL4 + SlatL5 SlatR1 - - - - Aircraft/A320Family/Models/Effects/slatR2 SlatR2 + SlatR3 + SlatR4 + SlatR5 diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml index ef36ea4d..4637b2d5 100644 --- a/Models/Wings/a320.wings.neocfm.xml +++ b/Models/Wings/a320.wings.neocfm.xml @@ -825,28 +825,23 @@ -1 + Aircraft/A320Family/Models/Effects/winglightmap Wings - Aircraft/A320Family/Models/Effects/slatL1 + Aircraft/A320Family/Models/Effects/slat SlatL1 - - - - Aircraft/A320Family/Models/Effects/slatL2 SlatL2 - - - - Aircraft/A320Family/Models/Effects/slatR1 + SlatL3 + SlatL4 + SlatL5 SlatR1 - - - - Aircraft/A320Family/Models/Effects/slatR2 SlatR2 + SlatR3 + SlatR4 + SlatR5 diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml index f4a1ee49..8d695965 100644 --- a/Models/Wings/a320.wings.neopw.xml +++ b/Models/Wings/a320.wings.neopw.xml @@ -832,23 +832,18 @@ - Aircraft/A320Family/Models/Effects/slatL1 + Aircraft/A320Family/Models/Effects/slat SlatL1 - - - - Aircraft/A320Family/Models/Effects/slatL2 SlatL2 - - - - Aircraft/A320Family/Models/Effects/slatR1 + SlatL3 + SlatL4 + SlatL5 SlatR1 + SlatR2 + SlatR3 + SlatR4 + SlatR5 - - Aircraft/A320Family/Models/Effects/slatR2 - SlatR2 -