diff --git a/Models/A320-common.xml b/Models/A320-common.xml index 7d8b7da1..9de33a7c 100644 --- a/Models/A320-common.xml +++ b/Models/A320-common.xml @@ -56,4 +56,10 @@ <property>sim/multiplay/generic/int[13]</property> </condition> </animation> + + <!-- Effects --> + <effect> + <inherits-from>Aircraft/A320-family/Models/Effects/reflection</inherits-from> + <object-name>Fuselage</object-name> + </effect> </PropertyList> diff --git a/Models/Effects/LEAPl.png b/Models/Effects/LEAPl.png deleted file mode 100644 index fd9a8cab..00000000 Binary files a/Models/Effects/LEAPl.png and /dev/null differ diff --git a/Models/Effects/LEAPr.png b/Models/Effects/LEAPr.png deleted file mode 100644 index cb995477..00000000 Binary files a/Models/Effects/LEAPr.png and /dev/null differ diff --git a/Models/Effects/LightMappedWing.png b/Models/Effects/LightMappedWing.png deleted file mode 100644 index 16f5ccd2..00000000 Binary files a/Models/Effects/LightMappedWing.png and /dev/null differ diff --git a/Models/Effects/NEOreflect.eff b/Models/Effects/NEOreflect.eff deleted file mode 100644 index 9dcd3d73..00000000 --- a/Models/Effects/NEOreflect.eff +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PropertyList> - <name>Aircraft/A320-family/Models/Effects/NEOreflect</name> - <inherits-from>Effects/reflect</inherits-from> - - <parameters> - <texture n="5"> - <type>cubemap</type> - <!-- use this form for a 6 image cube map --> - <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> - <rainbowiness type="float">0.1</rainbowiness> - <fresneliness>0.1</fresneliness> - <refl_correction>0.1</refl_correction> - <ambient_correction>0.1</ambient_correction> - <reflect_map>0</reflect_map> - </parameters> - -</PropertyList> diff --git a/Models/Effects/PW1100G-l.png b/Models/Effects/PW1100G-l.png deleted file mode 100644 index 584877ca..00000000 Binary files a/Models/Effects/PW1100G-l.png and /dev/null differ diff --git a/Models/Effects/PW1100G-r.png b/Models/Effects/PW1100G-r.png deleted file mode 100644 index d10ca957..00000000 Binary files a/Models/Effects/PW1100G-r.png and /dev/null differ diff --git a/Models/Effects/Slat.png b/Models/Effects/Slat.png deleted file mode 100644 index 92e52973..00000000 Binary files a/Models/Effects/Slat.png and /dev/null differ diff --git a/Models/Effects/engineLEAPl.eff b/Models/Effects/engineLEAPl.eff deleted file mode 100644 index 717daa4f..00000000 --- a/Models/Effects/engineLEAPl.eff +++ /dev/null @@ -1,22 +0,0 @@ -<PropertyList> - <name>leapl</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">1</reflection-enabled> - <reflection-dynamic type="int">0</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/LEAPl.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - </parameters> -</PropertyList> diff --git a/Models/Effects/engineLEAPr.eff b/Models/Effects/engineLEAPr.eff deleted file mode 100644 index 777fef84..00000000 --- a/Models/Effects/engineLEAPr.eff +++ /dev/null @@ -1,22 +0,0 @@ -<PropertyList> - <name>leapr</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">1</reflection-enabled> - <reflection-dynamic type="int">0</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/LEAPr.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - </parameters> -</PropertyList> diff --git a/Models/Effects/enginePW1100L.eff b/Models/Effects/enginePW1100L.eff deleted file mode 100644 index cbffc046..00000000 --- a/Models/Effects/enginePW1100L.eff +++ /dev/null @@ -1,22 +0,0 @@ -<PropertyList> - <name>pwlightmap</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <reflection-dynamic type="int">0</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/PW1100G-l.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - </parameters> -</PropertyList> diff --git a/Models/Effects/enginePW1100R.eff b/Models/Effects/enginePW1100R.eff deleted file mode 100644 index 369e811b..00000000 --- a/Models/Effects/enginePW1100R.eff +++ /dev/null @@ -1,22 +0,0 @@ -<PropertyList> - <name>pwlightmap</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <reflection-dynamic type="int">0</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/PW1100G-r.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - </parameters> -</PropertyList> diff --git a/Models/Effects/flame.eff b/Models/Effects/flame.eff deleted file mode 100644 index 815a425d..00000000 --- a/Models/Effects/flame.eff +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PropertyList> - <name>AB-flame</name> - <inherits-from>Effects/thrust-flame</inherits-from> - <parameters> - <base_flame_b type="float"><use>/sim/model/flame/blue-base</use></base_flame_b> - <base_flame_density type="float">0.01</base_flame_density> - <base_flame_g type="float"><use>/sim/model/flame/green-base</use></base_flame_g> - <base_flame_r type="float"><use>/sim/model/flame/red-base</use></base_flame_r> - <deflection_coeff type="float">0</deflection_coeff> - <flame_color_high_b type="float"><use>/sim/model/flame/blue-high</use></flame_color_high_b> - <flame_color_high_g type="float"><use>/sim/model/flame/green-high</use></flame_color_high_g> - <flame_color_high_r type="float"><use>/sim/model/flame/red-high</use></flame_color_high_r> - <flame_color_low_b type="float"><use>/sim/model/flame/blue-low</use></flame_color_low_b> - <flame_color_low_g type="float"><use>/sim/model/flame/green-low</use></flame_color_low_g> - <flame_color_low_r type="float"><use>/sim/model/flame/red-low</use></flame_color_low_r> - <flame_radius_fraction type="float">0.82</flame_radius_fraction> - <noise_scale type="float">0.8</noise_scale> - <noise_strength type="float">0.2</noise_strength> - <thrust_collimation type="float">0.2</thrust_collimation> - <thrust_density type="float">0.8</thrust_density> - <use_noise type="int">1</use_noise> - <use_shocks type="int">0</use_shocks> - </parameters> -</PropertyList> \ No newline at end of file diff --git a/Models/Effects/logo.eff b/Models/Effects/logo.eff deleted file mode 100644 index 69452044..00000000 --- a/Models/Effects/logo.eff +++ /dev/null @@ -1,22 +0,0 @@ -<PropertyList> - <name>logo</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">0</reflection-enabled> - <reflection-dynamic type="int">0</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>/sim/model/lights/logo-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/logo.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - </parameters> -</PropertyList> diff --git a/Models/Effects/logo.png b/Models/Effects/logo.png deleted file mode 100644 index 7f6f18c3..00000000 Binary files a/Models/Effects/logo.png and /dev/null differ diff --git a/Models/Effects/reading-light.eff b/Models/Effects/reading-light.eff deleted file mode 100644 index 6d58da5a..00000000 --- a/Models/Effects/reading-light.eff +++ /dev/null @@ -1,35 +0,0 @@ -<PropertyList> - <name>panel</name> - <inherits-from>Effects/model-interior</inherits-from> - <parameters> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-factor type="float" n="0"><use>/controls/lighting/reading-light</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/reading-light.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - <irradiance-map-type type="int">1</irradiance-map-type> - <irradiance-map-strength type="float">0.33</irradiance-map-strength> - <texture n="4"> - <type>cubemap</type> - <images> - <positive-x>Models/Effects/res/0004.png</positive-x> - <negative-x>Models/Effects/res/0002.png</negative-x> - <positive-y>Models/Effects/res/0001.png</positive-y> - <negative-y>Models/Effects/res/0003.png</negative-y> - <positive-z>Models/Effects/res/0006.png</positive-z> - <negative-z>Models/Effects/res/0005.png</negative-z> - </images> - </texture> - <!-- - the cube center must be the same as the camera x,y,z in blend - --> - <opacity-cube-center type="vec3d" n="0"> 0.262764 0.0 0.610718</opacity-cube-center> - <opacity-cube-scale type="vec3d" n="0"> 1.0 2.0 1.0</opacity-cube-scale> - <opacity-cube-angle type="float">0.0</opacity-cube-angle> - </parameters> -</PropertyList> diff --git a/Models/Effects/reflection.eff b/Models/Effects/reflection.eff new file mode 100644 index 00000000..7e021e4e --- /dev/null +++ b/Models/Effects/reflection.eff @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<PropertyList> + <name>reflection</name> + <inherits-from>Effects/model-combined-deferred</inherits-from> + <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> + <reflection-type type="int">2</reflection-type> + <ambient-correction type="float">0.1</ambient-correction> + <lightmap-enabled type="int">0</lightmap-enabled> + <lightmap-multi type="int">0</lightmap-multi> + <texture n="5"> + <type>cubemap</type> + <images> + <positive-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/1.png</positive-x> + <negative-x>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/4.png</negative-x> + <positive-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/2.png</positive-y> + <negative-y>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/3.png</negative-y> + <positive-z>Aircraft/Generic/Effects/CubeMaps/fgfs-sky/6.png</positive-z> + <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> + </parameters> +</PropertyList> diff --git a/Models/Effects/slat.eff b/Models/Effects/slat.eff deleted file mode 100644 index ef2dc3f2..00000000 --- a/Models/Effects/slat.eff +++ /dev/null @@ -1,22 +0,0 @@ -<PropertyList> - <name>slat</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">1</reflection-enabled> - <reflection-dynamic type="int">0</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/Slat.png</image> - <filter>linear-mipmap-linear</filter> - <wrap-s>clamp</wrap-s> - <wrap-t>clamp</wrap-t> - <internal-format>normalized</internal-format> - </texture> - </parameters> -</PropertyList> diff --git a/Models/Effects/winglightmap.eff b/Models/Effects/winglightmap.eff deleted file mode 100644 index 9478937d..00000000 --- a/Models/Effects/winglightmap.eff +++ /dev/null @@ -1,33 +0,0 @@ -<PropertyList> - <name>winglightmap</name> - <inherits-from>Effects/model-combined-deferred</inherits-from> - <parameters> - <normalmap-enabled type="int">0</normalmap-enabled> - <reflection-enabled type="int">1</reflection-enabled> - <reflection-dynamic type="int">1</reflection-dynamic> - <reflect_map-enabled type="int">0</reflect_map-enabled> - <reflection-correction type="float">0.1</reflection-correction> - <lightmap-enabled type="int">1</lightmap-enabled> - <lightmap-multi type="int">0</lightmap-multi> - <lightmap-factor type="float" n="0"><use>controls/lighting/wing-lights</use></lightmap-factor> - <lightmap-color type="vec3d" n="0">1.0 1.0 1.0</lightmap-color> - <texture n="3"> - <image>Aircraft/A320-family/Models/Effects/LightMappedWing.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/fgfs-sky2/1.png</positive-x> - <negative-x>Aircraft/Generic/Effects/fgfs-sky2/4.png</negative-x> - <positive-y>Aircraft/Generic/Effects/fgfs-sky2/2.png</positive-y> - <negative-y>Aircraft/Generic/Effects/fgfs-sky2/3.png</negative-y> - <positive-z>Aircraft/Generic/Effects/fgfs-sky2/6.png</positive-z> - <negative-z>Aircraft/Generic/Effects/fgfs-sky2/5.png</negative-z> - </images> - </texture> - </parameters> -</PropertyList>