mirror of
https://github.com/antopilo/Nuake.git
synced 2026-09-21 20:08:40 +03:00
All material data now works
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user