From 1471c2849def3b26c1b8095369021fb127c790eb Mon Sep 17 00:00:00 2001 From: antopilo Date: Sat, 4 Jan 2025 20:37:24 -0500 Subject: [PATCH] All material data now works --- Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp | 2 ++ Resources/Shaders/Vulkan/triangle.frag | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp b/Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp index 8aa009d1..85513af3 100644 --- a/Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp +++ b/Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp @@ -498,6 +498,8 @@ void VkSceneRenderer::BuildMatrixBuffer() materialBuffer.metalnessValue = material->data.u_MetalnessValue; materialBuffer.hasAO = material->HasAO(); materialBuffer.aoValue = material->data.u_AOValue; + materialBuffer.hasRoughness = material->HasRoughness(); + materialBuffer.roughnessValue = material->data.u_RoughnessValue; allMaterials[currentMaterialIndex] = materialBuffer; MeshMaterialMapping[m->GetVkMesh()->GetID()] = currentMaterialIndex; diff --git a/Resources/Shaders/Vulkan/triangle.frag b/Resources/Shaders/Vulkan/triangle.frag index 76588b9b..3a8ba29e 100644 --- a/Resources/Shaders/Vulkan/triangle.frag +++ b/Resources/Shaders/Vulkan/triangle.frag @@ -48,7 +48,7 @@ PSOutput main(PSInput input) float3 textureColor = albedo.Sample(mySampler, input.UV); output.oColor0 = float4(textureColor, 1.0f); output.oNormal = float4(input.Normal, 1.0f); - //output.oMaterial = float4(inMaterial.metalnessValue, inMaterial.aoValue, inMaterial.roughnessValue, 1.0f); - output.oMaterial = float4(inMaterial.albedo.xyz, 1.0f); + output.oMaterial = float4(inMaterial.metalnessValue, inMaterial.aoValue, inMaterial.roughnessValue, 1.0f); + //output.oMaterial = float4(inMaterial.albedo.xyz, 1.0f); return output; } \ No newline at end of file