Merge pull request #41 from CyberAgentGameEntertainment/feature/rende…

…ring_debugger_support Rendering Debugger supports.
CyberAgentGameEntertainment · Jan 6, 2023 · 8196fc8 · 8196fc8
2 parents 666e586 + a10ebf1
commit 8196fc8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/Assets/Nova/Runtime/Core/Shaders/ParticlesUberLit.shader b/Assets/Nova/Runtime/Core/Shaders/ParticlesUberLit.shader
@@ -172,6 +172,7 @@ Shader "Nova/Particles/UberLit"
             // Unity Defined
             #pragma multi_compile_fog
             #pragma multi_compile_instancing
+            #pragma multi_compile_fragment _ DEBUG_DISPLAY
             #pragma instancing_options procedural:ParticleInstancingSetup
             #pragma require 2darray
 
@@ -516,4 +517,4 @@ Shader "Nova/Particles/UberLit"
         }
     }
     CustomEditor "Nova.Editor.Core.Scripts.ParticlesUberLitGUI"
-}
+}
diff --git a/Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlit.shader b/Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlit.shader
@@ -147,6 +147,7 @@ Shader "Nova/Particles/UberUnlit"
             // Unity Defined
             #pragma multi_compile_fog
             #pragma multi_compile_instancing
+            #pragma multi_compile_fragment _ DEBUG_DISPLAY
             #pragma instancing_options procedural:ParticleInstancingSetup
             #pragma require 2darray
 
@@ -464,4 +465,4 @@ Shader "Nova/Particles/UberUnlit"
         }
     }
     CustomEditor "Nova.Editor.Core.Scripts.ParticlesUberUnlitGUI"
-}
+}
diff --git a/Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlitForward.hlsl b/Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlitForward.hlsl
@@ -2,8 +2,28 @@
 #define NOVA_PARTICLESUBERUNLITFORWARD_INCLUDED
 
 #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
+#ifdef DEBUG_DISPLAY // for backward compatibility
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Unlit.hlsl"
+#endif
 #include "ParticlesUberUnlit.hlsl"
 
+void InitializeInputData(out InputData inputData, Varyings input)
+{
+    inputData = (InputData)0;
+
+    // InputData is only used for DebugDisplay purposes in Unlit.
+    // This is implemented with reference to Packages/com.unity.render-pipelines.universal/ShaderLibrary/Input.hlsl.
+    inputData.positionWS = half3(0, 0, 0);
+    inputData.normalWS = half3(0, 0, 1);
+    inputData.viewDirectionWS = half3(0, 0, 1);
+    inputData.shadowCoord = 0;
+    inputData.fogCoord = 0;
+    inputData.vertexLighting = half3(0, 0, 0);
+    inputData.bakedGI = half3(0, 0, 0);
+    inputData.normalizedScreenSpaceUV = 0;
+    inputData.shadowMask = half4(1, 1, 1, 1);
+}
+
 Varyings vert(Attributes input)
 {
     float3 positionWS;
@@ -12,7 +32,15 @@ Varyings vert(Attributes input)
 
 half4 frag(Varyings input) : SV_Target
 {
-    return fragUnlit(input, true, true);
+    InputData inputData;
+    InitializeInputData(inputData, input);
+
+    half4 color = fragUnlit(input, true, true);
+    #ifdef DEBUG_DISPLAY  // for backward compatibility
+    color = UniversalFragmentUnlit(inputData, color.rgb, color.a);
+    #endif
+    color.rgb = MixFog(color.rgb, inputData.fogCoord);
+    return color;
 }
 
-#endif
+#endif