support normal intensity

Game.cpp

@@ -144,12 +144,14 @@ void Game::LoadTextures()
 	materials[0]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
 	materials[0]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
 	materials[0]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
+	materials[0]->SetNormalIntensity(3.5f);
 
 	materials[1]->PushSampler("BasicSampler", sampler);
 	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
 	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[1]->SetNormalIntensity(2.5f);
 
 	materials[2]->PushSampler("BasicSampler", sampler);
 	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
@@ -168,12 +170,14 @@ void Game::LoadTextures()
 	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[4]->SetNormalIntensity(0.5f);
 
 	materials[5]->PushSampler("BasicSampler", sampler);
 	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
 	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[5]->SetNormalIntensity(3.5f);
 
 	materials[6]->PushSampler("BasicSampler", sampler);
 	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
@@ -186,6 +190,7 @@ void Game::LoadTextures()
 	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[7]->SetNormalIntensity(3.5f);
 
 	materials[8]->PushSampler("BasicSampler", sampler);
 	materials[8]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());

Material.cpp

@@ -10,6 +10,7 @@ Material::Material(
 	pbr = _pbr;
 	tint = _tint;
 	roughness = _roughness;
+	normalIntensity = 1.f;
 	alpha = 1;
 	cutoff = 0;
 	vertexShader = _vertexShader;
@@ -64,6 +65,11 @@ float Material::GetCutoff()
 	return cutoff;
 }
 
+float Material::GetNormalIntensity()
+{
+	return normalIntensity;
+}
+
 DirectX::XMFLOAT3 Material::GetEmitAmount()
 {
 	return emitAmount;
@@ -120,6 +126,11 @@ void Material::SetCutoff(float _cutoff)
 	cutoff = _cutoff;
 }
 
+void Material::SetNormalIntensity(float _intensity)
+{
+	normalIntensity = _intensity;
+}
+
 void Material::SetEmitAmount(DirectX::XMFLOAT3 _emit)
 {
 	emitAmount = _emit;
@@ -169,6 +180,7 @@ void Material::ActivateStandard(Transform* _transform, std::shared_ptr<Camera> _
 
 	pixelShader->SetFloat3("cameraPosition", _camera->GetTransform()->GetPosition());
 	pixelShader->SetFloat("roughness", GetRoughness());
+	pixelShader->SetFloat("normalIntensity", GetNormalIntensity());
 	pixelShader->SetFloat("alpha", GetAlpha());
 	pixelShader->SetFloat("cutoff", GetCutoff());
 	pixelShader->SetFloat2("scale", GetUVScale());
@@ -208,6 +220,7 @@ void Material::ActivatePBR(Transform* _transform, std::shared_ptr<Camera> _camer
 	pixelShader->SetFloat2("scale", GetUVScale());
 	pixelShader->SetFloat2("offset", GetUVOffset());
 	pixelShader->SetFloat3("cameraPosition", _camera->GetTransform()->GetPosition());
+	pixelShader->SetFloat("normalIntensity", GetNormalIntensity());
 	pixelShader->SetFloat("lightCount", (int)_lights.size());
 	pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
 	pixelShader->CopyAllBufferData();

Material.h

@@ -41,6 +41,7 @@ public:
 	float									GetRoughness();
 	float									GetAlpha();
 	float									GetCutoff();
+	float									GetNormalIntensity();
 	DirectX::XMFLOAT3						GetEmitAmount();
 	std::shared_ptr<SimpleVertexShader>		GetVertexShader();
 	std::shared_ptr<SimplePixelShader>		GetPixelShader();
@@ -51,6 +52,7 @@ public:
 	void									SetRoughness(float _roughness);
 	void									SetAlpha(float _alpha);
 	void									SetCutoff(float _cutoff);
+	void									SetNormalIntensity(float _intensity);
 	void									SetEmitAmount(DirectX::XMFLOAT3 _emit);
 	void									SetVertexShader(std::shared_ptr<SimpleVertexShader> _vertexShader);
 	void									SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader);
@@ -81,6 +83,7 @@ private:
 	float									roughness;
 	float									alpha;
 	float									cutoff;
+	float									normalIntensity;
 	DirectX::XMFLOAT3						emitAmount;
 	DirectX::XMFLOAT2						uvScale;
 	DirectX::XMFLOAT2						uvOffset;

SimplePixelPBR.hlsl

@@ -14,6 +14,8 @@ cbuffer ExternalData : register(b0)
 	float3 cameraPosition;
 	float lightCount;
 
+	float normalIntensity;
+
 	Light lights[MAX_LIGHTS];
 }
 
@@ -34,7 +36,7 @@ float4 main(VertexToPixel input) : SV_TARGET
 	float4 albedo = pow(Albedo.Sample(Sampler, input.uv), 2.2f);
 
 	float3 N = Normal.Sample(Sampler, input.uv).rgb * 2 - 1;
-	float3 T = normalize(input.tangent - input.normal * dot(input.tangent, input.normal));
+	float3 T = normalize(input.tangent - input.normal * dot(input.tangent, input.normal)) * normalIntensity;
 	float3 B = cross(T, input.normal);
 	float3x3 TBN = float3x3(T, B, input.normal);
 	input.normal = mul(N, TBN);

SimplePixelShader.hlsl

@@ -24,6 +24,8 @@ cbuffer ExternalData : register(b0)
 	float alpha;
 	float cutoff;
 	float roughness;
+	float normalIntensity;
+
 	int hasSpecularMap;
 	int hasReflectionMap;
 
@@ -58,7 +60,7 @@ float4 main(VertexToPixel input) : SV_TARGET
 	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 T = normalize(input.tangent - input.normal * dot(input.tangent, input.normal)) * normalIntensity;
 		float3 B = cross(T, input.normal);
 		float3x3 TBN = float3x3(T, B, input.normal);
 		input.normal = mul(unpackedNormal, TBN);

ToonShader.hlsl

@@ -24,6 +24,8 @@ cbuffer ExternalData : register(b0)
 	float alpha;
 	float cutoff;
 	float roughness;
+	float normalIntensity;
+
 	int hasSpecularMap;
 
 	Light lights[MAX_LIGHTS];
@@ -75,7 +77,7 @@ float4 main(VertexToPixel input) : SV_TARGET
 	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 T = normalize(input.tangent - input.normal * dot(input.tangent, input.normal)) * normalIntensity;
 		float3 B = cross(T, input.normal);
 		float3x3 TBN = float3x3(T, B, input.normal);
 		normal = mul(unpackedNormal, TBN);