Phong lighting model (TEMPORAL)

Author: PR3C14D0

src/Shader/GBufferPass.hlsl

@@ -8,22 +8,25 @@ cbuffer WVP : register(b0)
 struct VertexOutput
 {
     float4 position : SV_Position;
-    float4 normal : NORMAL;
-    float2 uv : TEXCOORD;
+    float4 normal : NORMAL0;
+    float2 uv : TEXCOORD0;
+    float4 vertexPos : POSITION0;
 };
 
 SamplerState texSampler : register(s0);
 Texture2D tex : register(t0);
 
-VertexOutput VertexMain(float4 position : POSITION0, float4 normal : NORMAL0, float2 uv : TEXCOORD0)
+VertexOutput VertexMain(float4 position : POSITION, float4 normal : NORMAL, float2 uv : TEXCOORD)
 {
     VertexOutput output;
 
     output.position = mul(position, World);
     output.position = mul(output.position, View);
     output.position = mul(output.position, Projection);
-    output.normal = mul(normal, World);
+    
+    output.normal = float4(normalize(mul((float3) normal, (float3x3) World)), 0.0f);
     output.uv = uv;
+    output.vertexPos = mul(position, World);
 
     return output;
 }
@@ -40,6 +43,6 @@ PixelOutput PixelMain(VertexOutput input)
     PixelOutput output;
     output.albedo = tex.Sample(texSampler, float2(input.uv.x, 1 - input.uv.y));
     output.normal = input.normal * 0.5f + 0.5f;
-    output.position = input.position;
+    output.position = input.vertexPos;
     return output;
 }

src/Shader/LightPass.hlsl

@@ -22,6 +22,19 @@ struct PixelOutput
 PixelOutput PixelMain(VertexOutput input, uint index : SV_SampleIndex)
 {
     PixelOutput output;
-    output.screen = albedo.Load(input.position.xy, index);
+    float4 albedoColor = albedo.Load(input.position.xy, index);
+    float4 nml = normalize(normal.Load(input.position.xy, index) * 2 - 1);
+    float4 vertexPos = position.Load(input.position.xy, index);
+    
+    float4 ambientColor = float4(0.1f, 0.1f, 0.1f, 1.f);
+    float4 lightPos = float4(0.f, 200.f, 200.f, 1.f);
+    float4 lightColor = float4(1.f, 1.f, 1.f, 1.f);
+    
+    float3 lightDir = normalize(lightPos.xyz - vertexPos.xyz);
+    float LdotN = saturate(dot(lightDir, nml.xyz));
+    
+    float4 outputColor = saturate(saturate(LdotN + ambientColor) * lightColor) * albedoColor;
+    
+    output.screen = outputColor;
     return output;
 }

src/private/Core/GameObject/Camera/EditorCamera.cpp

@@ -1,10 +1,10 @@
 #include "Core/GameObject/Camera/EditorCamera.h"
 
 EditorCamera::EditorCamera(std::string name) : Camera(name) {
-	this->m_fSensX = 15.f;
+	this->m_fSensX = 10.f;
 	this->m_fSensY = 10.f;
 
-	this->m_fSpeed = 5.f;
+	this->m_fSpeed = 50.f;
 }
 
 void EditorCamera::Init() {

src/private/Core/GameObject/Component/Mesh.cpp

@@ -122,7 +122,7 @@ void Mesh::InitConstantBuffer() {
 void Mesh::UpdateConstantBuffer() {
 	UINT nWVPSize = (sizeof(this->m_wvp) + 255) & ~255;
 	this->m_wvp.World = XMMatrixTranspose(XMMatrixIdentity());
-	this->m_wvp.World *= XMMatrixTranspose(XMMatrixScaling(.01f, .01f, .01f));
+	this->m_wvp.World *= XMMatrixTranspose(XMMatrixScaling(0.1f, 0.1f, 0.1f));
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationX(XMConvertToRadians(this->m_transform.rotation.x)));
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationY(XMConvertToRadians(this->m_transform.rotation.y)));
 	this->m_wvp.World *= XMMatrixTranspose(XMMatrixRotationZ(XMConvertToRadians(this->m_transform.rotation.z)));

src/private/Core/Renderer/D3D12.cpp

@@ -137,19 +137,16 @@ void D3D12::Init(HWND hwnd) {
 	this->m_screenQuad->Init();
 	this->InitGBufferShader();
 
-	RECT rect;
-	GetClientRect(this->m_hwnd, &rect);
-
 	ZeroMemory(&this->m_viewport, sizeof(D3D12_VIEWPORT));
-	this->m_viewport.Width = rect.right;
-	this->m_viewport.Height = rect.bottom;
+	this->m_viewport.Width = this->m_nWidth;
+	this->m_viewport.Height = this->m_nHeight;
 	this->m_viewport.MaxDepth = 1.f;
 
 	ZeroMemory(&this->m_scissor, sizeof(D3D12_RECT));
 	this->m_scissor.left = 0;
 	this->m_scissor.top = 0;
-	this->m_scissor.right = rect.right;
-	this->m_scissor.bottom = rect.bottom;
+	this->m_scissor.right = this->m_nWidth;
+	this->m_scissor.bottom = this->m_nHeight;
 
 
 	ThrowIfFailed(this->m_list->Close());
@@ -286,8 +283,17 @@ void D3D12::Update() {
 	this->m_list->ResolveSubresource(this->m_backBuffers[this->m_nActualBackBuffer].Get(), 0, sqRes.Get(), 0, DXGI_FORMAT_B8G8R8A8_UNORM);
 
 	this->ResourceBarrier(sqRes, D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
-	this->ResourceBarrier(this->m_backBuffers[this->m_nActualBackBuffer], D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_PRESENT);
+	this->ResourceBarrier(this->m_backBuffers[this->m_nActualBackBuffer], D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_RENDER_TARGET);
+	this->m_list->OMSetRenderTargets(1, &rtv.cpuHandle, FALSE, nullptr);
+
+	ImGui_ImplWin32_NewFrame();
+	ImGui_ImplDX12_NewFrame();
+	ImGui::NewFrame();
+
+	ImGui::Render();
+	ImGui_ImplDX12_RenderDrawData(ImGui::GetDrawData(), this->m_list.Get());
 
+	this->ResourceBarrier(this->m_backBuffers[this->m_nActualBackBuffer], D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT);
 	ThrowIfFailed(this->m_list->Close());
 
 	ID3D12CommandList* commandLists[] = {