projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bones and skeletal animation
[opengl.git]
/
pbrfrag.glsl
diff --git
a/pbrfrag.glsl
b/pbrfrag.glsl
index 8f41bfba31bbc157a3b0be9faab55d501a3a415b..4460872ffc120aafb8e438984eb1bf885ed97368 100644
(file)
--- a/
pbrfrag.glsl
+++ b/
pbrfrag.glsl
@@
-68,7
+68,7
@@
vec3 getNormalFromMap() {
void main() {
vec3 albedo = pow(texture(albedoMap, texCoords).rgb, vec3(2.2));
vec3 normal = 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;
float roughness = texture(metallicRoughnessMap, texCoords).g;
float ao = texture(aoMap, texCoords).r;