X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=pbrfrag.glsl;h=c45242dfadb39f834d56cc0c6cac828185a83c4c;hp=99523ec604f99b0fd7673e56848d14a837328c13;hb=610bb8ddab4ec871cadfed0a0b66695b8fea41a4;hpb=d80972d96e5fcd444657f937ab2700039efa83d2

diff --git a/pbrfrag.glsl b/pbrfrag.glsl
index 99523ec..c45242d 100644
--- a/pbrfrag.glsl
+++ b/pbrfrag.glsl
@@ -9,8 +9,7 @@ uniform vec3 camPos;
 
 uniform sampler2D albedoMap;
 uniform sampler2D normalMap;
-uniform sampler2D metallicMap;
-uniform sampler2D roughnessMap;
+uniform sampler2D metallicRoughnessMap;
 uniform sampler2D aoMap;
 uniform samplerCube irradianceMap;
 uniform samplerCube prefilterMap;
@@ -18,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;
 
@@ -69,8 +68,8 @@ vec3 getNormalFromMap() {
 void main() {
 	vec3 albedo = pow(texture(albedoMap, texCoords).rgb, vec3(2.2));
 	vec3 normal = getNormalFromMap();
-	float metallic = texture(metallicMap, texCoords).r;
-	float roughness = texture(roughnessMap, texCoords).r;
+	float metallic = texture(metallicRoughnessMap, texCoords).b;
+	float roughness = texture(metallicRoughnessMap, texCoords).g;
 	float ao = texture(aoMap, texCoords).r;
 
 	vec3 N = normalize(normal);