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

Applied some changes of raysan5

Browse Source
This commit is contained in:
victorfisac 2017-07-15 16:15:35 +02:00
parent 8f3c86d85e
commit 80ae79b7d5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/models/resources/shaders/pbr.fs
View File

@ -31,7 +31,7 @@ struct Light {
// Input vertex attributes (from vertex shader) // Input vertex attributes (from vertex shader)
in vec2 fragTexCoord; in vec2 fragTexCoord;
in vec3 fragPos; in vec3 fragPosition;
in vec3 fragNormal; in vec3 fragNormal;
in vec3 fragTangent; in vec3 fragTangent;
in vec3 fragBinormal; in vec3 fragBinormal;
@ -45,14 +45,14 @@ uniform MaterialProperty occlusion;
uniform MaterialProperty emission; uniform MaterialProperty emission;
uniform MaterialProperty height; uniform MaterialProperty height;
// Input lighting values
uniform Light lights[MAX_LIGHTS];
// Input uniform values // Input uniform values
uniform samplerCube irradianceMap; uniform samplerCube irradianceMap;
uniform samplerCube prefilterMap; uniform samplerCube prefilterMap;
uniform sampler2D brdfLUT; uniform sampler2D brdfLUT;
// Input lighting values
uniform Light lights[MAX_LIGHTS];
// Other uniform values // Other uniform values
uniform int renderMode; uniform int renderMode;
uniform vec3 viewPos; uniform vec3 viewPos;
@ -173,7 +173,7 @@ void main()
// Calculate lighting required attributes // Calculate lighting required attributes
vec3 normal = normalize(fragNormal); vec3 normal = normalize(fragNormal);
vec3 view = normalize(viewPos - fragPos); vec3 view = normalize(viewPos - fragPosition);
vec3 refl = reflect(-view, normal); vec3 refl = reflect(-view, normal);
// Check if parallax mapping is enabled and calculate texture coordinates to use based on height map // Check if parallax mapping is enabled and calculate texture coordinates to use based on height map
@ -217,8 +217,8 @@ void main()
if (lights[i].type == LIGHT_DIRECTIONAL) light = -normalize(lights[i].target - lights[i].position); if (lights[i].type == LIGHT_DIRECTIONAL) light = -normalize(lights[i].target - lights[i].position);
else if (lights[i].type == LIGHT_POINT) else if (lights[i].type == LIGHT_POINT)
{ {
light = normalize(lights[i].position - fragPos); light = normalize(lights[i].position - fragPosition);
float distance = length(lights[i].position - fragPos); float distance = length(lights[i].position - fragPosition);
float attenuation = 1.0/(distance*distance); float attenuation = 1.0/(distance*distance);
radiance *= attenuation; radiance *= attenuation;
} }
@ -269,6 +269,7 @@ void main()
// Calculate fragment color based on render mode // Calculate fragment color based on render mode
vec3 fragmentColor = ambient + Lo + emiss; // Physically Based Rendering vec3 fragmentColor = ambient + Lo + emiss; // Physically Based Rendering
if (renderMode == 1) fragmentColor = color; // Albedo if (renderMode == 1) fragmentColor = color; // Albedo
else if (renderMode == 2) fragmentColor = normal; // Normals else if (renderMode == 2) fragmentColor = normal; // Normals
else if (renderMode == 3) fragmentColor = metal; // Metalness else if (renderMode == 3) fragmentColor = metal; // Metalness