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

support 3 directional lights

Browse source
This commit is contained in:
lightling 2022-03-19 17:39:52 -04:00
parent db81b3a3b9
commit 8ec8b16a88
Signed by: lightling
GPG key ID: 016F11E0AA296B67
4 changed files with 50 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
DX11Starter.vcxproj
View file

@ -80,6 +80,9 @@
<Link>
<SubSystem>Windows</SubSystem>
</Link>
<FxCompile>
<ShaderModel>5.0</ShaderModel>
</FxCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@ -91,6 +94,9 @@
<Link>
<SubSystem>Windows</SubSystem>
</Link>
<FxCompile>
<ShaderModel>5.0</ShaderModel>
</FxCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -106,6 +112,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<FxCompile>
<ShaderModel>5.0</ShaderModel>
</FxCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -121,6 +130,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<FxCompile>
<ShaderModel>5.0</ShaderModel>
</FxCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Camera.cpp" />

27
Game.cpp
View file

@ -98,11 +98,27 @@ void Game::LoadShaders()
void Game::LoadLighting()
{
directionalLight1 = {};
ambient = XMFLOAT3(0.05f, 0.05f, 0.20f);
Light directionalLight0 = {};
directionalLight0.Type = LIGHT_TYPE_DIRECTIONAL;
directionalLight0.Direction = XMFLOAT3(1, 0, 0);
directionalLight0.Color = XMFLOAT3(1, 0, 0);
directionalLight0.Intensity = 1;
Light directionalLight1 = {};
directionalLight1.Type = LIGHT_TYPE_DIRECTIONAL;
directionalLight1.Direction = XMFLOAT3(1, 0, 0);
directionalLight1.Color = XMFLOAT3(1.0f, 0, 0);
directionalLight1.Intensity = 1.0f;
directionalLight1.Direction = XMFLOAT3(0, -1, 0);
directionalLight1.Color = XMFLOAT3(0, 1, 0);
directionalLight1.Intensity = 1;
Light directionalLight2 = {};
directionalLight2.Type = LIGHT_TYPE_DIRECTIONAL;
directionalLight2.Direction = XMFLOAT3(-1, 1, -0.5f);
directionalLight2.Color = XMFLOAT3(0, 0, 1);
directionalLight2.Intensity = 1;
lights = {
directionalLight0,
directionalLight1,
directionalLight2,
};
}
// --------------------------------------------------------
@ -190,7 +206,6 @@ void Game::Draw(float deltaTime, float totalTime)
{
// Background color (Cornflower Blue in this case) for clearing
static const float color[4] = { 0.4f, 0.6f, 0.75f, 0.0f };
static const DirectX::XMFLOAT3 ambient = XMFLOAT3(0.1f, 0.1f, 0.25f);
// Clear the render target and depth buffer (erases what's on the screen)
// - Do this ONCE PER FRAME
@ -216,7 +231,7 @@ void Game::Draw(float deltaTime, float totalTime)
ps->SetFloat("roughness", entity->GetMaterial()->GetRoughness());
ps->SetFloat3("tint", entity->GetMaterial()->GetTint());
ps->SetFloat3("ambient", ambient);
ps->SetData("directionalLight1", &directionalLight1, sizeof(Light));
ps->SetData("lights", &lights[0], sizeof(Light) * (int)lights.size());
ps->CopyAllBufferData();
entity->GetMaterial()->GetVertexShader()->SetShader();

3
Game.h
View file

@ -55,7 +55,8 @@ private:
// A6 Materials
std::vector<std::shared_ptr<Material>> materials;
// A7 Lights
Light directionalLight1;
std::vector<Light> lights;
DirectX::XMFLOAT3 ambient;
Microsoft::WRL::ComPtr<ID3D11Buffer> constantBufferVS;
};

22
SimplePixelShader.hlsl
View file

@ -2,13 +2,16 @@
#include "Helpers.hlsli"
#include "Lights.hlsli"
// temporary
#define LIGHT_COUNT 3
cbuffer ExternalData : register(b0)
{
float3 cameraPosition;
float roughness;
float3 ambient;
float3 tint;
Light directionalLight1;
Light lights[LIGHT_COUNT];
}
float calculateSpecular(float3 normal, float3 direction, float3 worldPosition, float3 cameraPosition, float roughness)
@ -33,9 +36,16 @@ float4 main(VertexToPixel input) : SV_TARGET
{
input.normal = normalize(input.normal);
float3 light = calculateDirectionalLight(directionalLight1, input.normal, input.worldPosition, cameraPosition, roughness, tint);
float3 ambientTint = ambient * tint;
float3 final = light + ambientTint;
return float4(final, 1);
float3 light = ambient * tint;
for (int i = 0; i < LIGHT_COUNT; i++)
{
switch (lights[i].Type)
{
case LIGHT_TYPE_DIRECTIONAL:
light += calculateDirectionalLight(lights[i], input.normal, input.worldPosition, cameraPosition, roughness, tint);
break;
}
}
return float4(light, 1);
}