UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated standard shader

Browse source 
Corrects weird artifacts on web
This commit is contained in:
Ray 2016-10-11 00:39:07 +02:00
parent 648676f46b
commit 97e3277d58
3 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
examples/resources/shaders/glsl100/standard.fs
View file

@ -38,7 +38,6 @@ uniform Light lights[maxLights];
vec3 ComputeLightPoint(Light l, vec3 n, vec3 v, float s) vec3 ComputeLightPoint(Light l, vec3 n, vec3 v, float s)
{ {
/*
vec3 surfacePos = vec3(modelMatrix*vec4(fragPosition, 1.0)); vec3 surfacePos = vec3(modelMatrix*vec4(fragPosition, 1.0));
vec3 surfaceToLight = l.position - surfacePos; vec3 surfaceToLight = l.position - surfacePos;
@ -51,17 +50,14 @@ vec3 ComputeLightPoint(Light l, vec3 n, vec3 v, float s)
if (diff > 0.0) if (diff > 0.0)
{ {
vec3 h = normalize(-l.direction + v); vec3 h = normalize(-l.direction + v);
spec = pow(dot(n, h), 3.0 + glossiness)*s; spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;
} }
return (diff*l.diffuse.rgb + spec*colSpecular.rgb); return (diff*l.diffuse.rgb + spec*colSpecular.rgb);
*/
return vec3(0.5);
} }
vec3 ComputeLightDirectional(Light l, vec3 n, vec3 v, float s) vec3 ComputeLightDirectional(Light l, vec3 n, vec3 v, float s)
{ {
/*
vec3 lightDir = normalize(-l.direction); vec3 lightDir = normalize(-l.direction);
// Diffuse shading // Diffuse shading
@ -72,18 +68,15 @@ vec3 ComputeLightDirectional(Light l, vec3 n, vec3 v, float s)
if (diff > 0.0) if (diff > 0.0)
{ {
vec3 h = normalize(lightDir + v); vec3 h = normalize(lightDir + v);
spec = pow(dot(n, h), 3.0 + glossiness)*s; spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;
} }
// Combine results // Combine results
return (diff*l.intensity*l.diffuse.rgb + spec*colSpecular.rgb); return (diff*l.intensity*l.diffuse.rgb + spec*colSpecular.rgb);
*/
return vec3(0.5);
} }
vec3 ComputeLightSpot(Light l, vec3 n, vec3 v, float s) vec3 ComputeLightSpot(Light l, vec3 n, vec3 v, float s)
{ {
/*
vec3 surfacePos = vec3(modelMatrix*vec4(fragPosition, 1)); vec3 surfacePos = vec3(modelMatrix*vec4(fragPosition, 1));
vec3 lightToSurface = normalize(surfacePos - l.position); vec3 lightToSurface = normalize(surfacePos - l.position);
vec3 lightDir = normalize(-l.direction); vec3 lightDir = normalize(-l.direction);
@ -108,12 +101,10 @@ vec3 ComputeLightSpot(Light l, vec3 n, vec3 v, float s)
if (diffAttenuation > 0.0) if (diffAttenuation > 0.0)
{ {
vec3 h = normalize(lightDir + v); vec3 h = normalize(lightDir + v);
spec = pow(dot(n, h), 3.0 + glossiness)*s; spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;
} }
return (falloff*(diffAttenuation*l.diffuse.rgb + spec*colSpecular.rgb)); return (falloff*(diffAttenuation*l.diffuse.rgb + spec*colSpecular.rgb));
*/
return vec3(0.5);
} }
void main() void main()
@ -140,7 +131,7 @@ void main()
// Calculate specular texture color fetching or set to maximum specular value by default // Calculate specular texture color fetching or set to maximum specular value by default
float spec = 1.0; float spec = 1.0;
if (useSpecular == 1) spec *= normalize(texture2D(texture2, fragTexCoord).r); if (useSpecular == 1) spec = texture2D(texture2, fragTexCoord).r;
for (int i = 0; i < maxLights; i++) for (int i = 0; i < maxLights; i++)
{ {

8
examples/resources/shaders/glsl330/standard.fs
View file

@ -50,7 +50,7 @@ vec3 ComputeLightPoint(Light l, vec3 n, vec3 v, float s)
if (diff > 0.0) if (diff > 0.0)
{ {
vec3 h = normalize(-l.direction + v); vec3 h = normalize(-l.direction + v);
spec = pow(dot(n, h), 3.0 + glossiness)*s; spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;
} }
return (diff*l.diffuse.rgb + spec*colSpecular.rgb); return (diff*l.diffuse.rgb + spec*colSpecular.rgb);
@ -68,7 +68,7 @@ vec3 ComputeLightDirectional(Light l, vec3 n, vec3 v, float s)
if (diff > 0.0) if (diff > 0.0)
{ {
vec3 h = normalize(lightDir + v); vec3 h = normalize(lightDir + v);
spec = pow(dot(n, h), 3.0 + glossiness)*s; spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;
} }
// Combine results // Combine results
@ -101,7 +101,7 @@ vec3 ComputeLightSpot(Light l, vec3 n, vec3 v, float s)
if (diffAttenuation > 0.0) if (diffAttenuation > 0.0)
{ {
vec3 h = normalize(lightDir + v); vec3 h = normalize(lightDir + v);
spec = pow(dot(n, h), 3.0 + glossiness)*s; spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;
} }
return (falloff*(diffAttenuation*l.diffuse.rgb + spec*colSpecular.rgb)); return (falloff*(diffAttenuation*l.diffuse.rgb + spec*colSpecular.rgb));
@ -131,7 +131,7 @@ void main()
// Calculate specular texture color fetching or set to maximum specular value by default // Calculate specular texture color fetching or set to maximum specular value by default
float spec = 1.0; float spec = 1.0;
if (useSpecular == 1) spec *= normalize(texture(texture2, fragTexCoord).r); if (useSpecular == 1) spec = texture(texture2, fragTexCoord).r;
for (int i = 0; i < maxLights; i++) for (int i = 0; i < maxLights; i++)
{ {

10
src/shader_standard.h
View file

@ -90,7 +90,7 @@ static const char fStandardShaderStr[] =
" if (diff > 0.0)\n" " if (diff > 0.0)\n"
" {\n" " {\n"
" vec3 h = normalize(-l.direction + v);\n" " vec3 h = normalize(-l.direction + v);\n"
" spec = pow(dot(n, h), 3.0 + glossiness)*s;\n" " spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;\n"
" }\n" " }\n"
" return (diff*l.diffuse.rgb + spec*colSpecular.rgb);\n" " return (diff*l.diffuse.rgb + spec*colSpecular.rgb);\n"
"}\n" "}\n"
@ -103,7 +103,7 @@ static const char fStandardShaderStr[] =
" if (diff > 0.0)\n" " if (diff > 0.0)\n"
" {\n" " {\n"
" vec3 h = normalize(lightDir + v);\n" " vec3 h = normalize(lightDir + v);\n"
" spec = pow(dot(n, h), 3.0 + glossiness)*s;\n" " spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;\n"
" }\n" " }\n"
" return (diff*l.intensity*l.diffuse.rgb + spec*colSpecular.rgb);\n" " return (diff*l.intensity*l.diffuse.rgb + spec*colSpecular.rgb);\n"
"}\n" "}\n"
@ -124,7 +124,7 @@ static const char fStandardShaderStr[] =
" if (diffAttenuation > 0.0)\n" " if (diffAttenuation > 0.0)\n"
" {\n" " {\n"
" vec3 h = normalize(lightDir + v);\n" " vec3 h = normalize(lightDir + v);\n"
" spec = pow(dot(n, h), 3.0 + glossiness)*s;\n" " spec = pow(abs(dot(n, h)), 3.0 + glossiness)*s;\n"
" }\n" " }\n"
" return (falloff*(diffAttenuation*l.diffuse.rgb + spec*colSpecular.rgb));\n" " return (falloff*(diffAttenuation*l.diffuse.rgb + spec*colSpecular.rgb));\n"
"}\n" "}\n"
@ -152,9 +152,9 @@ static const char fStandardShaderStr[] =
" }\n" " }\n"
" float spec = 1.0;\n" " float spec = 1.0;\n"
#if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21) #if defined(GRAPHICS_API_OPENGL_ES2) || defined(GRAPHICS_API_OPENGL_21)
" if (useSpecular == 1) spec *= normalize(texture2D(texture2, fragTexCoord).r);\n" " if (useSpecular == 1) spec = texture2D(texture2, fragTexCoord).r;\n"
#elif defined(GRAPHICS_API_OPENGL_33) #elif defined(GRAPHICS_API_OPENGL_33)
" if (useSpecular == 1) spec *= normalize(texture(texture2, fragTexCoord).r);\n" " if (useSpecular == 1) spec = texture(texture2, fragTexCoord).r;\n"
#endif #endif
" for (int i = 0; i < maxLights; i++)\n" " for (int i = 0; i < maxLights; i++)\n"
" {\n" " {\n"