X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=pbrfrag.glsl;h=c45242dfadb39f834d56cc0c6cac828185a83c4c;hp=8f41bfba31bbc157a3b0be9faab55d501a3a415b;hb=d0c631f46c6db417e013b1bc0edec24cb9c2824a;hpb=0291188124d08368ce28b308482604218bd75393 diff --git a/pbrfrag.glsl b/pbrfrag.glsl index 8f41bfb..c45242d 100644 --- a/pbrfrag.glsl +++ b/pbrfrag.glsl @@ -17,8 +17,8 @@ uniform sampler2D brdfMap; out vec4 fragColor; -uniform vec3 lightPositions[4]; -uniform vec3 lightColors[4]; +uniform vec3 lightPositions[6]; +uniform vec3 lightColors[6]; const float PI = 3.14159265359; @@ -68,7 +68,7 @@ vec3 getNormalFromMap() { void main() { vec3 albedo = pow(texture(albedoMap, texCoords).rgb, vec3(2.2)); vec3 normal = getNormalFromMap(); - float metallic = texture(metallicRoughnessMap, texCoords).r; + float metallic = texture(metallicRoughnessMap, texCoords).b; float roughness = texture(metallicRoughnessMap, texCoords).g; float ao = texture(aoMap, texCoords).r;