Removes AO multiplier as a duplicate way to adjust AO, makes it closer to PBR.
Differential Revision: https://code.wildfiregames.com/D4361 This was SVN commit r26038.
This commit is contained in:
parent
22a21e4bd9
commit
b53c454e3e
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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"/>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user