Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Removes AO multiplier as a duplicate way to adjust AO, makes it closer to PBR.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D4361
This was SVN commit r26038.
This commit is contained in:
Vladislav Belov 2021-12-08 18:28:42 +00:00
parent 22a21e4bd9
commit b53c454e3e
42 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
View File

@ -8,5 +8,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_glow.xml
View File

@ -8,5 +8,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_glow_norm.xml
View File

@ -9,5 +9,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_glow_wind.xml
View File

@ -7,7 +7,7 @@
<define name="USE_SPECULAR_MAP" value="1"/>
<define name="USE_SELF_LIGHT" value="1"/>
<define name="USE_WIND" value="1"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
<renderquery name="sim_time"/>
<required_texture name="baseTex"/>
<shader effect="model_transparent"/>

2
binaries/data/mods/public/art/materials/basic_specmap.xml
View File

@ -3,5 +3,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 25.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 25.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_ao.xml
View File

@ -7,5 +7,5 @@
<required_texture name="baseTex"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
View File

@ -10,5 +10,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
View File

@ -7,5 +7,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml
View File

@ -8,5 +8,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0 0"/>
<uniform name="effectSettings" value="1.0 50.0 0"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
View File

@ -9,5 +9,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_spec.xml
View File

@ -7,5 +7,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model_transparent"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml
View File

@ -10,5 +10,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model_transparent"/>
<uniform name="windData" value="1.0 1.0"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.0"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_ao.xml
View File

@ -4,5 +4,5 @@
<required_texture name="baseTex"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml
View File

@ -7,5 +7,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_ao_spec.xml
View File

@ -5,5 +5,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_norm_spec.xml
View File

@ -5,5 +5,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1 50 0 0"/>
<uniform name="effectSettings" value="1 50 0"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
View File

@ -6,5 +6,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml
View File

@ -6,5 +6,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/no_trans_spec.xml
View File

@ -4,5 +4,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/objectcolor_specmap.xml
View File

@ -4,5 +4,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_ao.xml
View File

@ -5,5 +5,5 @@
<required_texture name="baseTex"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
View File

@ -7,5 +7,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
View File

@ -8,5 +8,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
View File

@ -7,5 +7,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_norm_spec.xml
View File

@ -6,5 +6,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1 50 0 0"/>
<uniform name="effectSettings" value="1 50 0"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_parallax.xml
View File

@ -5,5 +5,5 @@
<required_texture name="baseTex"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.75"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
View File

@ -7,5 +7,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
View File

@ -6,5 +6,5 @@
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 10.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_spec.xml
View File

@ -5,5 +5,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
View File

@ -5,5 +5,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 10.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/rock_norm_spec.xml
View File

@ -8,5 +8,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="5.0 50.0 0.0075 0.85"/>
<uniform name="effectSettings" value="5.0 50.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
View File

@ -8,5 +8,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="aoTex" define="USE_AO"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
<uniform name="effectSettings" value="1.0 10.0 0.0075"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
View File

@ -4,5 +4,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="terrain_grass"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_grass_spec.xml
View File

@ -3,5 +3,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="terrain_grass"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_norm.xml
View File

@ -4,5 +4,5 @@
<required_texture name="baseTex"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_norm_spec.xml
View File

@ -5,5 +5,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml
View File

@ -5,5 +5,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="2.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="2.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_spec.xml
View File

@ -4,5 +4,5 @@
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_triplanar.xml
View File

@ -4,5 +4,5 @@
<define name="USE_TRIPLANAR" value="1"/>
<required_texture name="baseTex"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
View File

@ -5,5 +5,5 @@
<required_texture name="baseTex"/>
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

2
binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
View File

@ -6,5 +6,5 @@
<required_texture name="normTex" define="USE_NORMAL_MAP"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="terrain_base"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
<uniform name="effectSettings" value="1.0 15.0 0.0"/>
</material>

1
binaries/data/mods/public/shaders/glsl/model_common.fs
View File

@ -156,7 +156,6 @@ void main()
#if (USE_INSTANCING || USE_GPU_SKINNING) && USE_AO
float ao = texture2D(aoTex, v_tex2).r;
ao = mix(1.0, ao * 2.0, effectSettings.w);
#else
float ao = 1.0;
#endif