GLTF Viewer: fixed wireframe mode

Author: TheMostDiligent

Samples/GLTFViewer/src/GLTFViewer.cpp

@@ -361,48 +361,55 @@ struct PSOutput
 
     PSMainInfo.Footer = R"(
     PSOutput PSOut;
-#if UNSHADED
-    PSOut.Color = g_Frame.Renderer.UnshadedColor + g_Frame.Renderer.HighlightColor;
-#else
-    PSOut.Color = OutColor;
-#endif
-    
-    PSOut.Normal.xyz       = Shading.BaseLayer.Normal.xyz;
-    PSOut.MaterialData.xyz = float3(Shading.BaseLayer.Srf.PerceptualRoughness, Shading.BaseLayer.Metallic, 0.0);
-    PSOut.BaseColor.xyz    = BaseColor.xyz;
-    PSOut.IBL.xyz          = GetBaseLayerIBL(Shading, SrfLighting);
-
-#   if ENABLE_CLEAR_COAT
-	{
-        // We clearly can't do SSR for both base layer and clear coat, so we
-        // blend the base layer properties with the clearcoat using the clearcoat factor.
-        // This way when the factor is 0.0, we get the base layer, when it is 1.0,
-        // we get the clear coat, and something in between otherwise.
-
-        PSOut.Normal.xyz      = lerp(PSOut.Normal.xyz, Shading.Clearcoat.Normal, Shading.Clearcoat.Factor);
-        PSOut.MaterialData.xy = lerp(PSOut.MaterialData.xy, float2(Shading.Clearcoat.Srf.PerceptualRoughness, 0.0), Shading.Clearcoat.Factor);
-        PSOut.BaseColor.xyz   = lerp(PSOut.BaseColor.xyz, float3(1.0, 1.0, 1.0), Shading.Clearcoat.Factor);
-
-        // Note that the base layer IBL is weighted by (1.0 - Shading.Clearcoat.Factor * ClearcoatFresnel).
-        // Here we are weighting it by (1.0 - Shading.Clearcoat.Factor), which is always smaller,
-        // so when we subtract the IBL, it can never be negative.
-        PSOut.IBL.xyz = lerp(
-            PSOut.IBL.xyz,
-            GetClearcoatIBL(Shading, SrfLighting),
-            Shading.Clearcoat.Factor);
+#   if UNSHADED
+    {
+        PSOut.Color        = g_Frame.Renderer.UnshadedColor + g_Frame.Renderer.HighlightColor;
+        PSOut.Normal       = float4(0.0, 0.0, 0.0, 0.0);
+        PSOut.MaterialData = float4(0.0, 0.0, 0.0, 0.0);
+        PSOut.BaseColor    = float4(0.0, 0.0, 0.0, 0.0);
+        PSOut.IBL          = float4(0.0, 0.0, 0.0, 0.0);
     }
-#   endif
+#   else
+    {
+        PSOut.Color            = OutColor;
+        PSOut.Normal.xyz       = Shading.BaseLayer.Normal.xyz;
+        PSOut.MaterialData.xyz = float3(Shading.BaseLayer.Srf.PerceptualRoughness, Shading.BaseLayer.Metallic, 0.0);
+        PSOut.BaseColor.xyz    = BaseColor.xyz;
+        PSOut.IBL.xyz          = GetBaseLayerIBL(Shading, SrfLighting);
+
+#       if ENABLE_CLEAR_COAT
+	    {
+            // We clearly can't do SSR for both base layer and clear coat, so we
+            // blend the base layer properties with the clearcoat using the clearcoat factor.
+            // This way when the factor is 0.0, we get the base layer, when it is 1.0,
+            // we get the clear coat, and something in between otherwise.
+
+            PSOut.Normal.xyz      = lerp(PSOut.Normal.xyz, Shading.Clearcoat.Normal, Shading.Clearcoat.Factor);
+            PSOut.MaterialData.xy = lerp(PSOut.MaterialData.xy, float2(Shading.Clearcoat.Srf.PerceptualRoughness, 0.0), Shading.Clearcoat.Factor);
+            PSOut.BaseColor.xyz   = lerp(PSOut.BaseColor.xyz, float3(1.0, 1.0, 1.0), Shading.Clearcoat.Factor);
+
+            // Note that the base layer IBL is weighted by (1.0 - Shading.Clearcoat.Factor * ClearcoatFresnel).
+            // Here we are weighting it by (1.0 - Shading.Clearcoat.Factor), which is always smaller,
+            // so when we subtract the IBL, it can never be negative.
+            PSOut.IBL.xyz = lerp(
+                PSOut.IBL.xyz,
+                GetClearcoatIBL(Shading, SrfLighting),
+                Shading.Clearcoat.Factor);
+        }
+#       endif
     
-    // Blend material data and IBL with background
-	PSOut.BaseColor    = float4(PSOut.BaseColor.xyz    * BaseColor.a, BaseColor.a);
-    PSOut.MaterialData = float4(PSOut.MaterialData.xyz * BaseColor.a, BaseColor.a);
-    PSOut.IBL          = float4(PSOut.IBL.xyz          * BaseColor.a, BaseColor.a);
+        // Blend material data and IBL with background
+	    PSOut.BaseColor    = float4(PSOut.BaseColor.xyz    * BaseColor.a, BaseColor.a);
+        PSOut.MaterialData = float4(PSOut.MaterialData.xyz * BaseColor.a, BaseColor.a);
+        PSOut.IBL          = float4(PSOut.IBL.xyz          * BaseColor.a, BaseColor.a);
     
-    // Do not blend motion vectors as it does not make sense
-    PSOut.MotionVec = float4(MotionVector, 0.0, 1.0);
+        // Do not blend motion vectors as it does not make sense
+        PSOut.MotionVec = float4(MotionVector, 0.0, 1.0);
 
-    // Also do not blend normal - we want normal of the top layer
-    PSOut.Normal.a = 1.0;
+        // Also do not blend normal - we want normal of the top layer
+        PSOut.Normal.a = 1.0;
+	}
+#   endif
 
     return PSOut;
 )";