Compare commits
4 Commits
7c410aee09
...
3f818cac54
Author | SHA1 | Date | |
---|---|---|---|
3f818cac54 | |||
95988104a1 | |||
2063395cea | |||
7543350dfd |
@ -36,8 +36,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
glm::vec3 color = glm::vec3(0.3, 0.3, 0.5);
|
glm::vec3 color = glm::vec3(0.3, 0.3, 0.5);
|
||||||
float roughness = 0.5;
|
float roughness = 0.2;
|
||||||
float metallic = 0.6;
|
float metallic = 1.0;
|
||||||
float turbo = 1.0f;
|
float turbo = 1.0f;
|
||||||
float turboMAX = 1.0f;
|
float turboMAX = 1.0f;
|
||||||
|
|
||||||
|
@ -102,17 +102,8 @@ void main()
|
|||||||
|
|
||||||
vec4 texColor = texture(textureSampler, TexCoords);
|
vec4 texColor = texture(textureSampler, TexCoords);
|
||||||
|
|
||||||
|
vec3 normal = normalize(texture(normalSampler, TexCoords).xyz * TBN);
|
||||||
vec3 normalMapNormal = texture(normalSampler, TexCoords).xyz;
|
|
||||||
normalMapNormal = normalMapNormal * 2.0 - 1.0;
|
|
||||||
//normalMapNormal.y = -normalMapNormal.y;
|
|
||||||
|
|
||||||
vec3 normal = normalize(normalMapNormal * TBN );
|
|
||||||
|
|
||||||
//vec3 normal = normalize(texture(normalSampler, TexCoords).xyz * TBN);
|
|
||||||
//vec3 normal = normalize(vecNormal);
|
//vec3 normal = normalize(vecNormal);
|
||||||
|
|
||||||
|
|
||||||
vec3 viewDir = normalize(cameraPos-worldPos);
|
vec3 viewDir = normalize(cameraPos-worldPos);
|
||||||
|
|
||||||
vec3 lightDirs[4];
|
vec3 lightDirs[4];
|
||||||
|
Loading…
Reference in New Issue
Block a user