sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Lighting material

Browse Source 
* Hopefully fix incorrect parallax map 
 * Multiply specular by diffuse factor to prevent physically impossible shininess (compare TestNormalMapping to understand the difference)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8006 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-08-13 19:02:29 +00:00
parent 17b949fea2
commit e5be9cef83
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/core-data/Common/MatDefs/Light/Lighting.frag
View File

@ -125,6 +125,8 @@ vec2 computeLighting(in vec3 wvPos, in vec3 wvNorm, in vec3 wvViewDir, in vec3 w
float att = vLightDir.w; float att = vLightDir.w;
#endif #endif
specularFactor *= diffuseFactor;
return vec2(diffuseFactor, specularFactor) * vec2(att); return vec2(diffuseFactor, specularFactor) * vec2(att);
} }
#endif #endif
@ -143,7 +145,7 @@ void main(){
float heightBias = heightScale * -0.5; float heightBias = heightScale * -0.5;
vec3 normView = normalize(vViewDir); vec3 normView = normalize(vViewDir);
h = (h * heightScale + heightBias) * normView.z; h = (h * heightScale + heightBias) * normView.z;
newTexCoord = texCoord + (h * -normView.xy); newTexCoord = texCoord + (h * normView.xy);
#else #else
newTexCoord = texCoord; newTexCoord = texCoord;
#endif #endif