lightling/DX11Starter
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move light code from SimplePixelShader to Lights

Browse source
This commit is contained in:
lightling 2022-04-03 16:08:21 -04:00
parent 80e0790a63
commit f0ab528f13
Signed by: lightling
GPG key ID: 016F11E0AA296B67
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Lights.hlsli
View file

@ -22,4 +22,35 @@ struct Light
float3 Padding;
};
// Gets the specular value for any light
float calculateSpecular(float3 normal, float3 direction, float3 view, float roughness)
{
return getSpecular(
view,
getReflection(direction, normal),
getSpecularExponent(roughness, MAX_SPECULAR_EXPONENT)
);
}
// Gets the RGB value of a pixel with a directional light
float3 calculateDirectionalLight(Light light, float3 normal, float3 view, float roughness, float3 surfaceColor, float specularValue)
{
float3 lightDirection = normalize(light.Direction);
float diffuse = getDiffuse(normal, -lightDirection);
float specular = calculateSpecular(normal, lightDirection, view, roughness) * specularValue;
return (diffuse * surfaceColor + specular) * light.Intensity * light.Color;
}
// Gets the RGB value of a pixel with a point light
float3 calculatePointLight(Light light, float3 normal, float3 view, float3 worldPosition, float roughness, float3 surfaceColor, float specularValue)
{
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;
return (diffuse * surfaceColor + specular) * attenuation * light.Intensity * light.Color;
}
#endif

31
SimplePixelShader.hlsl
View file

@ -26,37 +26,6 @@ Texture2D Specular : register(t1);
Texture2D Emissive : register(t2);
SamplerState BasicSampler : register(s0);
// Gets the specular value for any light
float calculateSpecular(float3 normal, float3 direction, float3 view, float roughness)
{
return getSpecular(
view,
getReflection(direction, normal),
getSpecularExponent(roughness, MAX_SPECULAR_EXPONENT)
);
}
// Gets the RGB value of a pixel with a directional light
float3 calculateDirectionalLight(Light light, float3 normal, float3 view, float roughness, float3 surfaceColor, float specularValue)
{
float3 lightDirection = normalize(light.Direction);
float diffuse = getDiffuse(normal, -lightDirection);
float specular = calculateSpecular(normal, lightDirection, view, roughness) * specularValue;
return (diffuse * surfaceColor + specular) * light.Intensity * light.Color;
}
// Gets the RGB value of a pixel with a point light
float3 calculatePointLight(Light light, float3 normal, float3 view, float3 worldPosition, float roughness, float3 surfaceColor, float specularValue)
{
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;
return (diffuse * surfaceColor + specular) * attenuation * light.Intensity * light.Color;
}
// shader entry point
float4 main(VertexToPixel input) : SV_TARGET
{