From 99cff371750fae74ab26354f492c3bf667ac85a8 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R <legoboyvdlp@gmail.com> Date: Tue, 2 Jun 2020 01:21:37 +0100 Subject: [PATCH] Reflection effect dynamic parameters --- A320-main.xml | 18 ++++++---------- Models/A320-common.xml | 23 ++++++++++++++++++++ Models/Effects/reflection.eff | 13 ++++++----- Models/Fuselages/A320/fuselage-old.xml | 30 -------------------------- 4 files changed, 36 insertions(+), 48 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 226e44e7..b4566190 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -67,17 +67,13 @@ <output-property>/systems/pitot/icing</output-property> </iceable> </icing> - <flame> - <red-high type="double">1.0</red-high> - <red-low type="double">0.95</red-low> - <red-base type="double">1.0</red-base> - <green-high type="double">0.741</green-high> - <green-low type="double">0.32</green-low> - <green-base type="double">0.741</green-base> - <blue-high type="double">0.10</blue-high> - <blue-low type="double">0.02</blue-low> - <blue-base type="double">0.09</blue-base> - </flame> + <reflection> + <ambient-correction type="double">0.5</ambient-correction> + <reflection-correction type="double">-0.05</reflection-correction> + <reflection-fresnel type="double">0.0</reflection-fresnel> + <reflection-fresnel-factor type="double">0.5</reflection-fresnel-factor> + <reflection-rainbow type="double">0.0</reflection-rainbow> + </reflection> </model> <previews> diff --git a/Models/A320-common.xml b/Models/A320-common.xml index 9de33a7c..ab169c62 100644 --- a/Models/A320-common.xml +++ b/Models/A320-common.xml @@ -61,5 +61,28 @@ <effect> <inherits-from>Aircraft/A320-family/Models/Effects/reflection</inherits-from> <object-name>Fuselage</object-name> + <object-name>DoorL1</object-name> + <object-name>DoorL4</object-name> + <object-name>DoorR1</object-name> + <object-name>DoorR4</object-name> + <object-name>Cargo1</object-name> + <object-name>Cargo2</object-name> + <object-name>Cargo3</object-name> </effect> + + <!-- Ancilliary Objects --> + + <!-- APU fire --> + <model> + <name>APU fire</name> + <path>Aircraft/A320-family/Models/Effects/enginefire.xml</path> + <offsets> + <x-m>38.9</x-m> + <y-m>0</y-m> + <z-m>0.95</z-m> + </offsets> + <condition> + <property>systems/failures/apu-fire</property> + </condition> + </model> </PropertyList> diff --git a/Models/Effects/reflection.eff b/Models/Effects/reflection.eff index 7e021e4e..fc0ec196 100644 --- a/Models/Effects/reflection.eff +++ b/Models/Effects/reflection.eff @@ -5,10 +5,10 @@ <parameters> <reflection-enabled type="int">1</reflection-enabled> <reflection-dynamic type="int">1</reflection-dynamic> - <reflect_map-enabled type="int">1</reflect_map-enabled> - <reflection-correction type="float">-0.05</reflection-correction> + <reflect_map-enabled type="int">0</reflect_map-enabled> + <reflection-correction type="float"><use>/sim/model/reflection/reflection-correction</use></reflection-correction> <reflection-type type="int">2</reflection-type> - <ambient-correction type="float">0.1</ambient-correction> + <ambient-correction type="float"><use>/sim/model/reflection/reflection-correction</use></ambient-correction> <lightmap-enabled type="int">0</lightmap-enabled> <lightmap-multi type="int">0</lightmap-multi> <texture n="5"> @@ -22,9 +22,8 @@ <negative-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/5.png</negative-z> </images> </texture> - <reflection-rainbow type="float">0.0</reflection-rainbow> - <reflection-fresnel type="float">0.0</reflection-fresnel> - <reflection-fresnel-factor type="float">0.5</reflection-fresnel-factor> - <ambient_correction>0.5</ambient_correction> + <reflection-rainbow type="float"><use>/sim/model/reflection/reflection-rainbow</use></reflection-rainbow> + <reflection-fresnel type="float"><use>/sim/model/reflection/reflection-fresnel</use></reflection-fresnel> + <reflection-fresnel-factor type="float"><use>/sim/model/reflection/reflection-fresnel-factor</use></reflection-fresnel-factor> </parameters> </PropertyList> diff --git a/Models/Fuselages/A320/fuselage-old.xml b/Models/Fuselages/A320/fuselage-old.xml index 380343cb..2f62f750 100644 --- a/Models/Fuselages/A320/fuselage-old.xml +++ b/Models/Fuselages/A320/fuselage-old.xml @@ -6,36 +6,6 @@ <name>Fuselage</name> <path>res/fuselage.ac</path> - <!-- Reflection Shader --> - <!--effect> - <inherits-from>Aircraft/A320-family/Models/Effects/NEOreflect</inherits-from> - <object-name>Fuselage</object-name> - </effect--> - - <effect> - <inherits-from>Effects/glass</inherits-from> - <object-name>Windsheild</object-name> - <object-name>Windows</object-name> - <object-name>glass</object-name> - <object-name>glass1</object-name> - <object-name>glass2</object-name> - <object-name>glass3</object-name> - </effect> - - <!-- APU fire --> - <model> - <name>APU fire</name> - <path>Aircraft/A320-family/Models/Effects/enginefire.xml</path> - <offsets> - <x-m>38.9</x-m> - <y-m>0</y-m> - <z-m>0.95</z-m> - </offsets> - <condition> - <property>systems/failures/apu-fire</property> - </condition> - </model> - <!-- ANIMATIONS --> <!-- PAX doors --> <animation>