Multiple Demo Changes

Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
2021-07-25 10:48:35 +02:00
parent f9018c9878
commit 7e25e7198d
13 changed files with 1009 additions and 33 deletions
+9 -5
View File
@@ -65,11 +65,14 @@ void main() {
//float intensity = dot(outNormal, normalize(directional_light)) + 0.2;
vec3 outColor;
vec4 outColor;
if(material.albedoTexture == 0) {
outColor = material.baseColor.xyz;
outColor = material.baseColor;
} else {
outColor = texture(texSampler[material.albedoTexture], uv).xyz;
outColor = texture(texSampler[material.albedoTexture], uv);
}
if(outColor.a < 0.5) {
discard;
}
vec3 outSpecular;
@@ -89,7 +92,8 @@ void main() {
gAlbedo.w = roughnessFactor;
gPosition.w = metallicFactor;
float reflectance = 1.0 - roughnessFactor;
// float reflectance = roughnessFactor * metallicFactor;
float reflectance = 1 - roughnessFactor;
gSpecular.w = reflectance;
vec3 I = normalize(outpos.xyz - cameraPos);
@@ -105,6 +109,6 @@ void main() {
gPosition.xyz = outpos.xyz;
gNormal.xyz = outNormal;
gAlbedo.xyz = outColor;
gAlbedo.xyz = outColor.xyz;
gSpecular.xyz = outSpecular;
}