Compare commits
No commits in common. "1f7071750265dfd9a91e4d990586631b955ae33d" and "203110adf54b8b11200c96df6220a821e2285406" have entirely different histories.
1f70717502
...
203110adf5
@ -36,8 +36,8 @@ public:
|
||||
}
|
||||
|
||||
glm::vec3 color = glm::vec3(0.3, 0.3, 0.5);
|
||||
float roughness = 0.5;
|
||||
float metallic = 0.6;
|
||||
float roughness = 0.2;
|
||||
float metallic = 1.0;
|
||||
|
||||
glm::vec3 spaceshipPos /*= glm::vec3(0.065808f, 1.250000f, -2.189549f)*/;
|
||||
glm::vec3 spaceshipDir = glm::vec3(-0.490263f, 0.000000f, 0.871578f);
|
||||
|
@ -102,17 +102,8 @@ void main()
|
||||
|
||||
vec4 texColor = texture(textureSampler, TexCoords);
|
||||
|
||||
|
||||
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(texture(normalSampler, TexCoords).xyz * TBN);
|
||||
//vec3 normal = normalize(vecNormal);
|
||||
|
||||
|
||||
vec3 viewDir = normalize(cameraPos-worldPos);
|
||||
|
||||
vec3 lightDirs[4];
|
||||
|
Loading…
Reference in New Issue
Block a user