From 706afafb60defc45d15abd22c0de5602edd6cf04 Mon Sep 17 00:00:00 2001
From: Erik Hofman <erik@ehofman.com>
Date: Wed, 16 Feb 2022 11:24:48 +0100
Subject: [PATCH] Add a more comprehensive standard fuselage reflection
 configuration

- use ALS shaders
- Add parameters to enable or disable the effect and influence the
  shininess and fresnel factor
---
 Aircraft/Generic/Effects/Fuselagereflect.eff | 199 ++++++++++++++-----
 Aircraft/Generic/Effects/null_bumpspec.png   | Bin 168 -> 102 bytes
 defaults.xml                                 |   7 +
 3 files changed, 157 insertions(+), 49 deletions(-)

diff --git a/Aircraft/Generic/Effects/Fuselagereflect.eff b/Aircraft/Generic/Effects/Fuselagereflect.eff
index da0134ef9..0bab6af8d 100644
--- a/Aircraft/Generic/Effects/Fuselagereflect.eff
+++ b/Aircraft/Generic/Effects/Fuselagereflect.eff
@@ -1,49 +1,150 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<PropertyList>
-
-  <name>Fuselagereflect</name>
-  <inherits-from>Effects/reflect</inherits-from>
-  <parameters>
-    <texture n="5">
-      <type>cubemap</type>
-      <images>
-        <positive-x>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_px.png</positive-x>
-        <negative-x>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_nx.png</negative-x>
-        <positive-y>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_py.png</positive-y>
-        <negative-y>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_ny.png</negative-y>
-        <positive-z>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_pz.png</positive-z>
-        <negative-z>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_nz.png</negative-z>
-      </images>
-    </texture>
-    <texture n="6">
-      <image>Aircraft/Generic/Effects/Rainbow.png</image>
-      <filter>linear-mipmap-linear</filter>
-      <wrap-s>repeat</wrap-s>
-      <wrap-t>repeat</wrap-t>
-    </texture>
-    <texture n="7">
-      <image>Aircraft/Generic/Effects/FresnelLookUp.png</image>
-      <filter>linear-mipmap-linear</filter>
-      <wrap-s>repeat</wrap-s>
-      <wrap-t>repeat</wrap-t>
-      <internal-format>normalized</internal-format>
-    </texture>
-    <texture n="8">
-      <image>Aircraft/Generic/Effects/greymap.png</image>
-      <filter>linear-mipmap-linear</filter>
-      <wrap-s>repeat</wrap-s>
-      <wrap-t>repeat</wrap-t>
-      <internal-format>normalized</internal-format>
-    </texture>
-    <rendering-hint>transparent</rendering-hint>
-    <shade-model>smooth</shade-model>
-    <rainbowiness type="double">0.1</rainbowiness>
-    <fresneliness type="double">0.1</fresneliness>
-    <noisiness type="double">0.1</noisiness>
-    <refl_correction type="double">-0.2</refl_correction>
-    <ambient_correction type="double">0.1</ambient_correction>
-    <reflect_map type="double">0</reflect_map>
-  </parameters>
-
-</PropertyList>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Parameters:
+  * Boolean to enable or disable the reflection.
+    Civilian aircraft are usually glossy but military aircraft are not.
+     sim/model/civilian
+
+  * Floating point value to specify the reflection factor.
+    The range is between -1.0 and 0.0
+     sim/model/livery/shininess
+
+  * Floating point value to specify the Fresnel factor.
+    The range is between 0.0 and 1.0
+     sim/model/livery/fresnel
+
+  These parameters can all be defined within a livery configuration file:
+  <PropertyList>
+    <sim>
+      <model>
+        <civilian type="bool">true</civilian>
+        <livery>
+          <name type="string">Factory Demonstrator</name>
+         <texture>Liveries/factory.png</texture>
+         <shininess type="float">-0.5</shininess>
+         <fresnel type="float">0.7</fresnel>
+        </livery>
+      </model>
+    </sim>
+  </PropertyList>
+
+
+  Usage:
+  Add one of the following examples to your model configuration file.
+
+  * Minimal configuration
+  <effect>
+    <name>Effects/normalmap-reflection</name>
+    <inherits-from>Aircraft/Generic/Effects/Fuselagereflect</inherits-from>
+    <object-name>fuselage</object-name>
+    <object-name>wing</object-name>
+  </effect>
+
+  * Adding a normal-map:
+  <effect>
+    <name>Effects/normalmap-reflection</name>
+    <inherits-from>Aircraft/Generic/Effects/Fuselagereflect</inherits-from>
+    <object-name>fuselage</object-name>
+    <object-name>wing</object-name>
+    <parameters>
+      <texture n="2">
+        <image>Aircraft/AircraftName/Models/normalmap.png</image>
+      </texture>
+    </parameters>
+  </effect>
+
+
+  Further reading:
+  https://wiki.flightgear.org/ALS_technical_notes
+-->
+
+<PropertyList>
+ <name>Aircraft/Generic/Effects/Fuselagereflect</name>
+ <inherits-from>Effects/model-combined-deferred</inherits-from>
+ <parameters>
+  <rain-enabled type="int"> 2 </rain-enabled>
+  <normalmap-enabled type="int"> 1 </normalmap-enabled>
+  <normalmap-dds type="int"> 0 </normalmap-dds>
+  <normalmap-tiling type="float"> 1.0 </normalmap-tiling>
+  <lightmap-enabled type="int"> 0 </lightmap-enabled>
+  <ambient-correction type="float"> 0.1 </ambient-correction>
+  <reflection-enabled type="int"><use>sim/model/civilian</use></reflection-enabled>
+  <reflection-type type="int"> 1 </reflection-type>
+  <reflection-dynamic type="int"> 1 </reflection-dynamic>
+  <reflection-rainbow type="float"> 0.0 </reflection-rainbow>
+  <reflection-noise type="float"> 0.0 </reflection-noise>
+  <reflection-fresnel-factor type="float"> 1.0 </reflection-fresnel-factor>
+  <reflection-correction type="float"><use>sim/model/livery/shininess</use></reflection-correction>
+  <reflection-fresnel type="float"><use>sim/model/livery/fresnel</use></reflection-fresnel>
+  <texture n="2">
+   <image>Aircraft/Generic/Effects/null_bumpspec.png</image>
+   <filter>linear-mipmap-linear</filter>
+   <wrap-s>clamp</wrap-s>
+   <wrap-t>clamp</wrap-t>
+   <internal-format>normalized</internal-format>
+  </texture>
+  <texture n= "5" >
+   <type>cubemap</type>
+   <images>
+    <positive-x>Aircraft/Generic/Effects/CubeMaps/buildings/N.png</positive-x>
+    <negative-x>Aircraft/Generic/Effects/CubeMaps/buildings/S.png</negative-x>
+    <positive-y>Aircraft/Generic/Effects/CubeMaps/buildings/W.png</positive-y>
+    <negative-y>Aircraft/Generic/Effects/CubeMaps/buildings/E.png</negative-y>
+    <positive-z>Aircraft/Generic/Effects/CubeMaps/buildings/U.png</positive-z>
+    <negative-z>Aircraft/Generic/Effects/CubeMaps/buildings/D.png</negative-z>
+   </images>
+  </texture>
+ </parameters>
+
+ <generate>
+  <tangent type="int">6</tangent>
+  <binormal type="int">7</binormal>
+ </generate>
+
+ <technique n="4">
+  <pass>
+   <program>
+    <attribute>
+     <name>tangent</name>
+     <index>6</index>
+    </attribute>
+    <attribute>
+     <name>binormal</name>
+     <index>7</index>
+    </attribute>
+   </program>
+  </pass>
+ </technique>
+
+ <technique n="7">
+  <pass>
+   <program>
+    <attribute>
+     <name>tangent</name>
+     <index>6</index>
+    </attribute>
+    <attribute>
+     <name>binormal</name>
+     <index>7</index>
+    </attribute>
+   </program>
+  </pass>
+ </technique>
+
+ <technique n="9">
+  <pass>
+   <program>
+    <attribute>
+     <name>tangent</name>
+     <index>6</index>
+    </attribute>
+    <attribute>
+     <name>binormal</name>
+     <index>7</index>
+    </attribute>
+   </program>
+  </pass>
+ </technique>
+
+</PropertyList>
diff --git a/Aircraft/Generic/Effects/null_bumpspec.png b/Aircraft/Generic/Effects/null_bumpspec.png
index 1a4650a8cd1cf770f6fb31576c26bc3c37c481d6..dc90955ece9f3dab645ad3a5da2377a71b7e1e59 100644
GIT binary patch
literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzT~8Oskch)?&p9$OFtD%~sO*1s
o<iky&HIwgFnSAweKmiXJ{6d-S)-Wfq0yQ#ty85}Sb4q9e005I4;{X5v

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2ryY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPavmBSInE$^sFMvX_nIRD+&iT2ysd*(pE(3#eQEFmI
zYKlU6W=V#EyQgnJie4%^P@Kop#W95AdU8g_4}J#bW+sM<ZBMR&G<drDxvX<aXaWG3
Co+{P=

diff --git a/defaults.xml b/defaults.xml
index 9b030626c..fdbb0585c 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -1022,6 +1022,13 @@ Started September 2000 by David Megginson, david@megginson.com
       <speed type="double">1.0</speed>
       <codec>libx265</codec>
     </video>
+    <model>
+      <civilian type="bool">false</civilian>
+      <livery>
+        <fresnel type="double">0.7</fresnel>
+        <shininess type="double">-0.5</shininess>
+      </livery>
+    </model>
   </sim>
   <!-- accelerations -->
   <accelerations>