fly/A320-family
1
0
Fork 0
Code Activity

Effetcs: remove legacy effect files and textures; add reflection cubemap

Browse source
This commit is contained in:
legoboyvdlp R 2020-06-02 00:38:36 +01:00
parent 709b0e8732
commit 7f51381b18
19 changed files with 36 additions and 251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Models/A320-common.xml
View file

@ -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>

BIN
Models/Effects/LEAPl.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 41 KiB

BIN
Models/Effects/LEAPr.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 41 KiB

BIN
Models/Effects/LightMappedWing.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 259 KiB

26
Models/Effects/NEOreflect.eff
View file

@ -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>

BIN
Models/Effects/PW1100G-l.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 97 KiB

BIN
Models/Effects/PW1100G-r.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 91 KiB

BIN
Models/Effects/Slat.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 48 KiB

22
Models/Effects/engineLEAPl.eff
View file

@ -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>

22
Models/Effects/engineLEAPr.eff
View file

@ -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>

22
Models/Effects/enginePW1100L.eff
View file

@ -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>

22
Models/Effects/enginePW1100R.eff
View file

@ -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>

25
Models/Effects/flame.eff
View file

@ -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>

22
Models/Effects/logo.eff
View file

@ -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>

BIN
Models/Effects/logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 44 KiB

35
Models/Effects/reading-light.eff
View file

@ -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>

30
Models/Effects/reflection.eff Normal file
View file

@ -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>

22
Models/Effects/slat.eff
View file

@ -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>

33
Models/Effects/winglightmap.eff
View file

@ -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>