Trying to clean up the old specularity code

This was SVN commit r12568.
This commit is contained in:
myconid 2012-08-31 19:12:42 +00:00
parent 7ce09c315b
commit 2ed11f6a84
2 changed files with 2 additions and 2 deletions

View File

@ -44,7 +44,7 @@ varying vec2 v_los;
uniform vec3 specularColor;
#endif
#if USE_SPECULAR || USE_NORMAL_MAP || USE_SPECULAR_MAP || USE_PARALLAX_MAP || USE_AO
#if USE_NORMAL_MAP || USE_SPECULAR_MAP || USE_PARALLAX_MAP || USE_AO
uniform vec4 effectSettings;
#endif

View File

@ -207,7 +207,7 @@ void main()
specPow = effectSettings.y;
#else
specCol = specularColor;
specPow = specularPower.x;
specPow = specularPower;
#endif
specular.rgb = sunColor * specCol * pow(max(0.0, dot(normalize(normal), v_half)), specPow);
#endif