implement normal maps

Defines.hlsli

@@ -16,6 +16,7 @@ struct VertexToPixel
 	float2 uv				: TEXCOORD;
 	float3 normal			: NORMAL;
 	float3 worldPosition	: POSITION;
+	float3 tangent			: TANGENT;
 };
 
 // Struct representing a single vertex worth of data

Game.cpp

@@ -130,12 +130,13 @@ void Game::LoadLighting()
 	ambient = XMFLOAT3(0.1f, 0.1f, 0.15f);
 
 	lights = {
-		Light::Directional(XMFLOAT3(1, 0.5f, 0.5f), XMFLOAT3(1, 1, 1), 0.5f),
-		Light::Directional(XMFLOAT3(-0.25f, -1, 0.75f), XMFLOAT3(1, 1, 1), 0.5f),
-		Light::Directional(XMFLOAT3(-1, 1, -0.5f), XMFLOAT3(1, 1, 1), 0.5f),
+		Light::Directional(XMFLOAT3(1, 0.5f, 0.5f), XMFLOAT3(1, 1, 1), 0.75f),
+		Light::Directional(XMFLOAT3(-0.25f, -1, 0.75f), XMFLOAT3(1, 1, 1), 0.75f),
+		Light::Directional(XMFLOAT3(-1, 1, -0.5f), XMFLOAT3(1, 1, 1), 0.75f),
 		Light::Point(XMFLOAT3(-1.5f, 0, 0), XMFLOAT3(1, 1, 1), 0.5f, 10),
 		Light::Point(XMFLOAT3(1.5f, 0, 0), XMFLOAT3(1, 1, 1), 0.25f, 10),
 		Light::Point(XMFLOAT3(0, 2, 0), XMFLOAT3(1, 0, 0), 0.25f, 10),
+		Light::Point(XMFLOAT3(-27.5f, 0, 0), XMFLOAT3(1, 1, 0.5f), 5, 20),
 	};
 }
 
@@ -183,7 +184,7 @@ void Game::CreateBasicGeometry()
 	for (int i = 0; i < entities.size(); ++i)
 	{
 		entities[i]->GetTransform()->SetPosition((-(int)(entities.size() / 2) + i) * 5, 0, 0);
-		entities[i]->GetMaterial()->SetRoughness(0.70f);
+		entities[i]->GetMaterial()->SetRoughness(0.60f);
 	}
 }
 

Lights.hlsli

@@ -23,13 +23,13 @@ struct Light
 };
 
 // Gets the specular value for any light
-float calculateSpecular(float3 normal, float3 direction, float3 view, float roughness)
+float calculateSpecular(float3 normal, float3 direction, float3 view, float roughness, float diffuse)
 {
 	return getSpecular(
 		view,
 		getReflection(direction, normal),
 		getSpecularExponent(roughness, MAX_SPECULAR_EXPONENT)
-	);
+	) * any(diffuse);
 }
 
 // Gets the RGB value of a pixel with a directional light
@@ -37,7 +37,7 @@ float3 calculateDirectionalLight(Light light, float3 normal, float3 view, float
 {
 	float3 lightDirection = normalize(light.Direction);
 	float diffuse = getDiffuse(normal, -lightDirection);
-	float specular = calculateSpecular(normal, lightDirection, view, roughness) * specularValue;
+	float specular = calculateSpecular(normal, lightDirection, view, roughness, diffuse) * specularValue;
 
 	return (diffuse * surfaceColor + specular) * light.Intensity * light.Color;
 }
@@ -48,7 +48,7 @@ float3 calculatePointLight(Light light, float3 normal, float3 view, float3 world
 	float3 lightDirection = normalize(light.Position - worldPosition);
 	float attenuation = getAttenuation(light.Position, worldPosition, light.Range);
 	float diffuse = getDiffuse(normal, lightDirection);
-	float specular = calculateSpecular(normal, lightDirection, view, roughness) * specularValue;
+	float specular = calculateSpecular(normal, lightDirection, view, roughness, diffuse) * specularValue;
 
 	return (diffuse * surfaceColor + specular) * attenuation * light.Intensity * light.Color;
 }

SimplePixelShader.hlsl

@@ -38,6 +38,15 @@ float4 main(VertexToPixel input) : SV_TARGET
 {
 	// ensure input normals are normalized
 	input.normal = normalize(input.normal);
+	input.tangent = normalize(input.tangent);
+	if (hasNormalMap > 0)
+	{
+		float3 unpackedNormal = Normal.Sample(BasicSampler, input.uv).rgb * 2 - 1;
+		float3 T = normalize(input.tangent - input.normal * dot(input.tangent, input.normal));
+		float3 B = cross(T, input.normal);
+		float3x3 TBN = float3x3(T, B, input.normal);
+		input.normal = mul(unpackedNormal, TBN);
+	}
 	input.uv = input.uv * scale + offset;
 
 	// view only needs calculated once, so pre-calculate here and pass it to lights

VertexShader.hlsl

@@ -40,6 +40,7 @@ VertexToPixel main( VertexShaderInput input )
 
 	// Pass normal and world position throuh
 	output.normal = normalize(mul((float3x3)worldInvTranspose, input.normal));
+	output.tangent = normalize(mul((float3x3)worldInvTranspose, input.tangent));
 	output.worldPosition = mul(world, float4(input.localPosition, 1)).xyz;
 
 	// Whatever we return will make its way through the pipeline to the