From ff1b5138eb7e3853be3d0aeb979555f01354a234 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sun, 10 May 2020 11:40:46 +0100
Subject: [PATCH] Displays: fix effect (remove weird shadows that sometimes
happen)
---
A320-main.xml | 1 +
Models/Effects/display.eff | 32 ++++++++++++++++++++
Models/Instruments/Lower-ECAM/Lower-ECAM.xml | 6 +---
Models/Instruments/MCDU/MCDU1.xml | 6 +---
Models/Instruments/MCDU/MCDU2.xml | 6 +---
Models/Instruments/ND/ND_L.xml | 6 +---
Models/Instruments/ND/ND_R.xml | 6 +---
Models/Instruments/PFD/PFD1.xml | 6 +---
Models/Instruments/PFD/PFD2.xml | 6 +---
Models/Instruments/Upper-ECAM/Upper-ECAM.xml | 6 +---
10 files changed, 41 insertions(+), 40 deletions(-)
create mode 100644 Models/Effects/display.eff
diff --git a/A320-main.xml b/A320-main.xml
index 2371b620..d2a91d47 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -19,6 +19,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>
diff --git a/Models/Effects/display.eff b/Models/Effects/display.eff
new file mode 100644
index 00000000..4f16dd51
--- /dev/null
+++ b/Models/Effects/display.eff
@@ -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>
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml
index 8b05fff2..3c034eab 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml
@@ -31,12 +31,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>lecam.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
</PropertyList>
diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml
index 9c16f93e..7c42f789 100644
--- a/Models/Instruments/MCDU/MCDU1.xml
+++ b/Models/Instruments/MCDU/MCDU1.xml
@@ -49,12 +49,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>mcdu1.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
<animation>
diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml
index 25241cee..432c832d 100644
--- a/Models/Instruments/MCDU/MCDU2.xml
+++ b/Models/Instruments/MCDU/MCDU2.xml
@@ -49,12 +49,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>mcdu2.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
<animation>
diff --git a/Models/Instruments/ND/ND_L.xml b/Models/Instruments/ND/ND_L.xml
index b36c872c..309de176 100644
--- a/Models/Instruments/ND/ND_L.xml
+++ b/Models/Instruments/ND/ND_L.xml
@@ -31,12 +31,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>ND.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
</PropertyList>
diff --git a/Models/Instruments/ND/ND_R.xml b/Models/Instruments/ND/ND_R.xml
index e77bfe64..05da0651 100644
--- a/Models/Instruments/ND/ND_R.xml
+++ b/Models/Instruments/ND/ND_R.xml
@@ -31,12 +31,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>ND_R.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
</PropertyList>
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index 5e76af6e..13feac39 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -31,12 +31,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>pfd1.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
</PropertyList>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 246cf671..56ff758d 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -31,12 +31,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>pfd2.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
</PropertyList>
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml
index 2b8afe4a..d2faf06f 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml
@@ -31,12 +31,8 @@
</animation>
<effect>
- <inherits-from>Effects/model-interior-display</inherits-from>
+ <inherits-from>Aircraft/A320-family/Models/Effects/display</inherits-from>
<object-name>uecam.screen</object-name>
- <parameters>
- <contrast>0.7</contrast>
- <dirt-factor><use>/maintainance/cockpit-cleaness-factor</use></dirt-factor>
- </parameters>
</effect>
</PropertyList>