From 18838ca972310ba8bc3cef9cb83536316b31bac4 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 14 Oct 2023 15:18:04 -0700 Subject: [PATCH] Minor update to RendererPBR.psh --- Shaders/PBR/private/RenderPBR.psh | 2 +- shaders_inc/RenderPBR.psh.h | 2 +- shaders_inc/RenderPBRCommon.fxh.h | 14 -------------- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 shaders_inc/RenderPBRCommon.fxh.h diff --git a/Shaders/PBR/private/RenderPBR.psh b/Shaders/PBR/private/RenderPBR.psh index 45259417..d1d949c4 100644 --- a/Shaders/PBR/private/RenderPBR.psh +++ b/Shaders/PBR/private/RenderPBR.psh @@ -443,7 +443,7 @@ void main(in VSOutput VSOut, case DEBUG_VIEW_DIFFUSE_COLOR: OutColor.rgb = SrfInfo.DiffuseColor; break; case DEBUG_VIEW_SPECULAR_COLOR: OutColor.rgb = SrfInfo.Reflectance0; break; case DEBUG_VIEW_REFLECTANCE90: OutColor.rgb = SrfInfo.Reflectance90; break; - case DEBUG_VIEW_MESH_NORMAL: OutColor.rgb = abs(MeshNormal/ max(length(MeshNormal), 1e-3)); break; + case DEBUG_VIEW_MESH_NORMAL: OutColor.rgb = abs(MeshNormal/ max(length(MeshNormal), 1e-3)); break; case DEBUG_VIEW_PERTURBED_NORMAL: OutColor.rgb = abs(perturbedNormal); break; case DEBUG_VIEW_NDOTV: OutColor.rgb = dot(perturbedNormal, view) * float3(1.0, 1.0, 1.0); break; case DEBUG_VIEW_DIRECT_LIGHTING: OutColor.rgb = DirectLighting; break; diff --git a/shaders_inc/RenderPBR.psh.h b/shaders_inc/RenderPBR.psh.h index e91fe0d1..207e48a8 100644 --- a/shaders_inc/RenderPBR.psh.h +++ b/shaders_inc/RenderPBR.psh.h @@ -443,7 +443,7 @@ " case DEBUG_VIEW_DIFFUSE_COLOR: OutColor.rgb = SrfInfo.DiffuseColor; break;\n" " case DEBUG_VIEW_SPECULAR_COLOR: OutColor.rgb = SrfInfo.Reflectance0; break;\n" " case DEBUG_VIEW_REFLECTANCE90: OutColor.rgb = SrfInfo.Reflectance90; break;\n" -" case DEBUG_VIEW_MESH_NORMAL: OutColor.rgb = abs(MeshNormal/ max(length(MeshNormal), 1e-3)); break;\n" +" case DEBUG_VIEW_MESH_NORMAL: OutColor.rgb = abs(MeshNormal/ max(length(MeshNormal), 1e-3)); break;\n" " case DEBUG_VIEW_PERTURBED_NORMAL: OutColor.rgb = abs(perturbedNormal); break;\n" " case DEBUG_VIEW_NDOTV: OutColor.rgb = dot(perturbedNormal, view) * float3(1.0, 1.0, 1.0); break;\n" " case DEBUG_VIEW_DIRECT_LIGHTING: OutColor.rgb = DirectLighting; break;\n" diff --git a/shaders_inc/RenderPBRCommon.fxh.h b/shaders_inc/RenderPBRCommon.fxh.h deleted file mode 100644 index 45cfe79b..00000000 --- a/shaders_inc/RenderPBRCommon.fxh.h +++ /dev/null @@ -1,14 +0,0 @@ -"#ifndef _RENDER_PBR_COMMON_FXH_\n" -"#define _RENDER_PBR_COMMON_FXH_\n" -"\n" -"struct PbrVsOutput\n" -"{\n" -" float4 ClipPos : SV_Position;\n" -" float3 WorldPos : WORLD_POS;\n" -" float3 Normal : NORMAL;\n" -" float2 UV0 : UV0;\n" -" float2 UV1 : UV1;\n" -"};\n" -"\n" -"\n" -"#endif // _RENDER_PBR_COMMON_FXH_\n"