implement toon ramp sampler

Game.cpp

@@ -127,6 +127,11 @@ void Game::LoadTextures()
 	rastDesc.FillMode = D3D11_FILL_SOLID;
 	device->CreateRasterizerState(&rastDesc, backfaceRasterState.GetAddressOf());
 
+	sampDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
+	sampDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
+	sampDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
+	device->CreateSamplerState(&sampDesc, clampSampler.GetAddressOf());
+
 	demoCubemap = CreateCubemap(
 		device,
 		context,
@@ -202,6 +207,7 @@ void Game::LoadTextures()
 	materials[8]->SetAlpha(0.8f);
 
 	materials[9]->PushSampler("BasicSampler", sampler);
+	materials[9]->PushSampler("ClampSampler", clampSampler);
 	materials[9]->SetRoughness(1);
 	materials[9]->LoadTexture(L"Assets/Textures/WithNormals/cushion.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
 	materials[9]->LoadTexture(L"Assets/Textures/WithNormals/cushion_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
@@ -209,7 +215,11 @@ void Game::LoadTextures()
 	materials[9]->SetOutlineThickness(0);
 
 	materials[10]->PushSampler("BasicSampler", sampler);
+	materials[10]->PushSampler("ClampSampler", clampSampler);
 	materials[10]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
+	materials[10]->LoadTexture(L"Assets/Textures/Ramps/toonRamp3.png", TEXTYPE_RAMPDIFFUSE, device.Get(), context.Get());
+	materials[10]->LoadTexture(L"Assets/Textures/Ramps/toonRampSpecular.png", TEXTYPE_RAMPSPECULAR, device.Get(), context.Get());
+	materials[10]->SetRimCutoff(0.15f);
 	materials[10]->SetEmitAmount(XMFLOAT3(0.05f, 0.1f, 0.01f));
 }
 

Game.h

@@ -72,5 +72,6 @@ private:
 	Microsoft::WRL::ComPtr<ID3D11Buffer> constantBufferVS;
 	Microsoft::WRL::ComPtr<ID3D11BlendState> alphaBlendState;
 	Microsoft::WRL::ComPtr<ID3D11RasterizerState> backfaceRasterState;
+	Microsoft::WRL::ComPtr<ID3D11SamplerState> clampSampler;
 };
 

Material.cpp

@@ -23,6 +23,8 @@ Material::Material(
 	hasSpecularMap = false;
 	hasNormalMap = false;
 	hasReflectionMap = false;
+	hasRampDiffuse = false;
+	hasRampSpecular = false;
 	outlineThickness = 1;
 	rimCutoff = 0.075f;
 	rimTint = DirectX::XMFLOAT3(0.5f, 0.5f, 0.5f);
@@ -200,6 +202,8 @@ void Material::LoadTexture(const wchar_t* _path, const char* _type, ID3D11Device
 	else if (_type == TEXTYPE_SPECULAR) hasSpecularMap = true;
 	else if (_type == TEXTYPE_NORMAL) hasNormalMap = true;
 	else if (_type == TEXTYPE_REFLECTION) hasReflectionMap = true;
+	else if (_type == TEXTYPE_RAMPDIFFUSE) hasRampDiffuse = true;
+	else if (_type == TEXTYPE_RAMPSPECULAR) hasRampSpecular = true;
 }
 
 void Material::PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler)
@@ -241,6 +245,8 @@ void Material::ActivateStandard(Transform* _transform, std::shared_ptr<Camera> _
 	pixelShader->SetInt("hasSpecularMap", (int)hasSpecularMap);
 	pixelShader->SetInt("hasNormalMap", (int)hasNormalMap);
 	pixelShader->SetInt("hasReflectionMap", (int)hasReflectionMap);
+	pixelShader->SetInt("hasRampDiffuse", (int)hasRampDiffuse);
+	pixelShader->SetInt("hasRampSpecular", (int)hasRampSpecular);
 	pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
 	pixelShader->CopyAllBufferData();
 	pixelShader->SetShader();

Material.h

@@ -17,6 +17,8 @@ constexpr auto TEXTYPE_SPECULAR = "Specular";
 constexpr auto TEXTYPE_REFLECTION = "Reflection";
 constexpr auto TEXTYPE_ROUGHNESS = "Roughness";
 constexpr auto TEXTYPE_METALNESS = "Metalness";
+constexpr auto TEXTYPE_RAMPDIFFUSE = "RampDiffuse";
+constexpr auto TEXTYPE_RAMPSPECULAR = "RampSpecular";
 
 class Material
 {
@@ -74,6 +76,8 @@ public:
 	bool									hasSpecularMap;
 	bool									hasNormalMap;
 	bool									hasReflectionMap;
+	bool									hasRampDiffuse;
+	bool									hasRampSpecular;
 private:
 	void									ActivateStandard(
 												Transform* _transform,

ToonShader.hlsl

@@ -33,6 +33,8 @@ cbuffer ExternalData : register(b0)
 	float rimCutoff;
 
 	int hasSpecularMap;
+	int hasRampDiffuse;
+	int hasRampSpecular;
 
 	Light lights[MAX_LIGHTS];
 }
@@ -44,12 +46,13 @@ Texture2D Emissive : register(t3);
 Texture2D RampDiffuse : register(t4);
 Texture2D RampSpecular : register(t5);
 SamplerState BasicSampler : register(s0);
+SamplerState ClampSampler : register(s1);
 
 float GetRampDiffuse(float original)
 {
 	if (original < 0.25f) return 0.0f;
-	//if (original < 0.5f) return 0.5f;
+	if (original < 0.33f) return 0.33f;
-	if (original < 0.75f) return 0.75f;
+	if (original < 0.8f) return 0.8f;
 
 	return 1;
 }
@@ -110,8 +113,24 @@ float4 main(VertexToPixel input) : SV_TARGET
 			break;
 		}
 
-		float diffuse = GetRampDiffuse(getDiffuse(normal, toLight));
+		float diffuse = 0;
-		float specular = GetRampSpecular(calculateSpecular(normal, toLight, view, specularValue, diffuse) * roughness);
+		float specular = 0;
+		if (hasRampDiffuse > 0)
+		{
+			diffuse = RampDiffuse.Sample(ClampSampler, float2(getDiffuse(normal, toLight), 0)).r;
+		}
+		else
+		{
+			diffuse = GetRampDiffuse(getDiffuse(normal, toLight));
+		}
+		if (hasRampSpecular > 0)
+		{
+			specular = RampSpecular.Sample(ClampSampler, float2(calculateSpecular(normal, toLight, view, specularValue, diffuse) * roughness, 0));
+		}
+		else
+		{
+			specular = GetRampSpecular(calculateSpecular(normal, toLight, view, specularValue, diffuse) * roughness);
+		}
 
 		light += (diffuse * surface.rgb + specular) * attenuate * lights[i].Intensity * lights[i].Color;
 	}