mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the example lighting shaders to use both frag and diffuse colors so they work with shapes and meshes. (#4482)

Browse Source
This commit is contained in:
Jeffery Myers 2024-11-11 10:55:33 -08:00 committed by GitHub
parent 5cc06f4ba4
commit 10fd4de258
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/shaders/resources/shaders/glsl100/lighting.fs
View File

@ -40,6 +40,8 @@ void main()
vec3 viewD = normalize(viewPos - fragPosition); vec3 viewD = normalize(viewPos - fragPosition);
vec3 specular = vec3(0.0); vec3 specular = vec3(0.0);
vec4 tint = colDiffuse * fragColor;
// NOTE: Implement here your fragment shader code // NOTE: Implement here your fragment shader code
for (int i = 0; i < MAX_LIGHTS; i++) for (int i = 0; i < MAX_LIGHTS; i++)
@ -67,7 +69,7 @@ void main()
} }
} }
vec4 finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0))); vec4 finalColor = (texelColor*((tint + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
finalColor += texelColor*(ambient/10.0); finalColor += texelColor*(ambient/10.0);
// Gamma correction // Gamma correction

4
examples/shaders/resources/shaders/glsl120/lighting.fs
View File

@ -38,6 +38,8 @@ void main()
vec3 viewD = normalize(viewPos - fragPosition); vec3 viewD = normalize(viewPos - fragPosition);
vec3 specular = vec3(0.0); vec3 specular = vec3(0.0);
vec4 tint = colDiffuse * fragColor;
// NOTE: Implement here your fragment shader code // NOTE: Implement here your fragment shader code
for (int i = 0; i < MAX_LIGHTS; i++) for (int i = 0; i < MAX_LIGHTS; i++)
@ -65,7 +67,7 @@ void main()
} }
} }
vec4 finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0))); vec4 finalColor = (texelColor*((tint + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
finalColor += texelColor*(ambient/10.0); finalColor += texelColor*(ambient/10.0);
// Gamma correction // Gamma correction

8
examples/shaders/resources/shaders/glsl330/lighting.fs
View File

@ -3,7 +3,7 @@
// Input vertex attributes (from vertex shader) // Input vertex attributes (from vertex shader)
in vec3 fragPosition; in vec3 fragPosition;
in vec2 fragTexCoord; in vec2 fragTexCoord;
//in vec4 fragColor; in vec4 fragColor;
in vec3 fragNormal; in vec3 fragNormal;
// Input uniform values // Input uniform values
@ -41,6 +41,8 @@ void main()
vec3 viewD = normalize(viewPos - fragPosition); vec3 viewD = normalize(viewPos - fragPosition);
vec3 specular = vec3(0.0); vec3 specular = vec3(0.0);
vec4 tint = colDiffuse * fragColor;
// NOTE: Implement here your fragment shader code // NOTE: Implement here your fragment shader code
for (int i = 0; i < MAX_LIGHTS; i++) for (int i = 0; i < MAX_LIGHTS; i++)
@ -68,8 +70,8 @@ void main()
} }
} }
finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0))); finalColor = (texelColor*((tint + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
finalColor += texelColor*(ambient/10.0)*colDiffuse; finalColor += texelColor*(ambient/10.0)*tint;
// Gamma correction // Gamma correction
finalColor = pow(finalColor, vec4(1.0/2.2)); finalColor = pow(finalColor, vec4(1.0/2.2));