From ec331f322b64e987b39f1aaca07df438c5e5c71b Mon Sep 17 00:00:00 2001 From: Wojtek Date: Wed, 7 Feb 2024 13:59:41 +0100 Subject: [PATCH] normal map on ship --- grk/project/Spaceship.h | 4 ++-- grk/project/shaders/shader_tex.frag | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/grk/project/Spaceship.h b/grk/project/Spaceship.h index 7184f47..186231b 100644 --- a/grk/project/Spaceship.h +++ b/grk/project/Spaceship.h @@ -36,8 +36,8 @@ public: } glm::vec3 color = glm::vec3(0.3, 0.3, 0.5); - float roughness = 0.2; - float metallic = 1.0; + float roughness = 0.5; + float metallic = 0.6; glm::vec3 spaceshipPos /*= glm::vec3(0.065808f, 1.250000f, -2.189549f)*/; glm::vec3 spaceshipDir = glm::vec3(-0.490263f, 0.000000f, 0.871578f); diff --git a/grk/project/shaders/shader_tex.frag b/grk/project/shaders/shader_tex.frag index 682f124..54ba7a5 100644 --- a/grk/project/shaders/shader_tex.frag +++ b/grk/project/shaders/shader_tex.frag @@ -102,8 +102,17 @@ void main() 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 viewDir = normalize(cameraPos-worldPos); vec3 lightDirs[4];