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

create helper for directional light

Browse source
This commit is contained in:
lightling 2022-03-19 17:23:25 -04:00
parent e96c1c2e55
commit db81b3a3b9
Signed by: lightling
GPG key ID: 016F11E0AA296B67
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Game.cpp
View file

@ -179,7 +179,7 @@ void Game::Update(float deltaTime, float totalTime)
for (int i = 0; i < entities.size(); ++i)
{
entities[i]->GetTransform()->SetRotation(1.0f * (i + 1) * sin(totalTime), 1.0f * (i + 1) * sin(totalTime), 1.0f * (i + 1) * sin(totalTime));
entities[i]->GetMaterial()->SetRoughness(sin(totalTime) * 0.5f + 0.5f);
entities[i]->GetMaterial()->SetRoughness(sin(totalTime * 4) * 0.5f + 0.49f);
}
}

19
SimplePixelShader.hlsl
View file

@ -11,7 +11,7 @@ cbuffer ExternalData : register(b0)
Light directionalLight1;
}
float calculateSpecular(float3 normal, float3 worldPosition, float3 cameraPosition, float3 direction, float roughness)
float calculateSpecular(float3 normal, float3 direction, float3 worldPosition, float3 cameraPosition, float roughness)
{
return getSpecular(
getView(cameraPosition, worldPosition),
@ -20,15 +20,22 @@ float calculateSpecular(float3 normal, float3 worldPosition, float3 cameraPositi
);
}
float3 calculateDirectionalLight(Light light, float3 normal, float3 worldPosition, float3 cameraPosition, float roughness, float3 surfaceColor)
{
float3 lightDirection = normalize(light.Direction);
float diffuse = getDiffuse(normal, -lightDirection);
float specular = calculateSpecular(normal, lightDirection, worldPosition, cameraPosition, roughness);
return (diffuse * surfaceColor + specular) * light.Intensity * light.Color;
}
float4 main(VertexToPixel input) : SV_TARGET
{
input.normal = normalize(input.normal);
float3 directionalLight1Dir = normalize(-directionalLight1.Direction);
float diffuse = getDiffuse(input.normal, directionalLight1Dir);
float specular = calculateSpecular(input.normal, input.worldPosition, cameraPosition, directionalLight1Dir, roughness);
float3 final = (diffuse * directionalLight1.Color * tint) + (ambient * tint) + specular;
float3 light = calculateDirectionalLight(directionalLight1, input.normal, input.worldPosition, cameraPosition, roughness, tint);
float3 ambientTint = ambient * tint;
float3 final = light + ambientTint;
return float4(final, 1);
}