Task/1020 aov albedo (unity3d-jp#98)

* Started experimental implementation to put albedo into baseColor in DebugShader.

* Fixed Albedo. sololy for 2020.3/HDRP 10.

* Added AOV Albedo output for Unity 2019.4.

* Updated CHANGELOG.md.

* Updated some documents.

* Fixed: 2 update section in CHANGELOG.md.

.gitattributes

@@ -1,4 +1,4 @@
 /.*  export-ignore
 /TestProjects export-ignore
 /HDRP-DefaultVolumeProject-2019.4 export-ignore
-
+/CheckAovRecorderIssue export-ignore

com.unity.toonshader/CHANGELOG.md

@@ -1,15 +1,20 @@
 # Changelog
-## [0.5.0-preview] - 2021-01-17
+## [0.5.0-preview] - 2021-01-20
 ### Updated
 * Updated documentation and folder structure in order to make the package structure friendly to Unity official package.
 * Tentatively deleted Japanese documentation before making the package ready for Unity standard translation system.
+* HDRP: made UTS compatible with HDRP AOV. Capable of outputting Albedo, Normal and so on using AOV Image Sequence Recorder newer than 3.0.
+* More effective and strict internal tests.
 ### Fixed:
 * HDRP:reduced shader variants by disabling some debug pragmas.
 * URP:UTS materials don't recieve shadows when using newer than Unity 2021.1.
 * Legacy:Unable to disable Outline.
 * AutoRenderQueue is disabled when material inspector is unfocused.
-### Updated
-* More effective and strict internal tests.
+
+
+### Known Issues:
+* HDRP: When Outputing AOV images, UTS Outline is also put into them images. In such cases,  please disable OUTLINE in Metrial Inspecotrs. 
+
 ## [0.4.1-preview] - 2021-10-20
 ### Added
 * HDRP:Something similar to HDRP exposure compensation.
@@ -19,6 +24,7 @@
 * HDRP:BoxLightAdjustment script. some flags are not updated properly when some checkboxes are clicked.
 * HDRP:Shader compile errors when used with HDRP 12.1
 
+
 ## [0.4.0-preview] - 2021-10-13
 ### Added
 * HDRP: Compatibility with Box Light, a spot light varietion, as main lights.

com.unity.toonshader/Documentation~/TableOfContents.md

@@ -2,6 +2,7 @@
 * [Requirements](System-Requirements.md)
 * [Installation](installation.md)
 * [What's new](whats-new.md)
+  * [0.5.0-preview](whats-new-0.5.0.md)
   * [0.4.0-preview](whats-new-0.4.0.md)
   * [0.3.0-preview](whats-new-0.3.0.md)
 * Features

com.unity.toonshader/Documentation~/whats-new-0.5.0.md

@@ -0,0 +1,9 @@
+<a id="AOV"></a>
+## HDRP AOV
+
+Added compatiblity with HDRP AOV, which makes it possible to record Abedo, Normal and some other tracks using Recorder later than 3.0.
+
+* Known Issue:
+UTS outline is also output when recording with AOV image sequences, in such cases, please disable OUTLINE in Meterial Inspectors.
+
+

com.unity.toonshader/Documentation~/whats-new.md

@@ -3,6 +3,6 @@
 This section contains information about changes to Unity Toon Shader (UTS). Each page contains a list of new features and, if relevant, a list of improvements and a list of resolved issues.
 
 The list of pages is as follows:
-
+* [0.5.0-preview ](whats-new-0.5.0.md)
 * [0.4.0-preview ](whats-new-0.4.0.md)
 * [0.3.0-preview ](whats-new-0.3.0.md)

com.unity.toonshader/Runtime/HDRP/Shaders/DebugDisplay.hlsl

@@ -0,0 +1,263 @@
+#ifdef DEBUG_DISPLAY // Guard define here to be compliant with how shader graph generate code for include
+
+#ifndef UNITY_DEBUG_DISPLAY_INCLUDED
+#define UNITY_DEBUG_DISPLAY_INCLUDED
+
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs.hlsl"
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/MaterialDebug.cs.hlsl"
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs.hlsl"
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/MipMapDebug.cs.hlsl"
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/ColorPickerDebug.cs.hlsl"
+
+
+// Local shader variables
+static SHADOW_TYPE g_DebugShadowAttenuation = 0;
+
+StructuredBuffer<int2>  _DebugDepthPyramidOffsets;
+
+#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/PBRValidator.hlsl"
+
+// When displaying lux meter we compress the light in order to be able to display value higher than 65504
+// The sun is between 100 000 and 150 000, so we use 4 to be able to cover such a range (4 * 65504)
+#define LUXMETER_COMPRESSION_RATIO  4
+
+TEXTURE2D(_DebugFont); // Debug font to write string in shader
+TEXTURE2D(_DebugMatCapTexture);
+
+void GetPropertiesDataDebug(uint paramId, inout float3 result, inout bool needLinearToSRGB)
+{
+    switch (paramId)
+    {
+        case DEBUGVIEWPROPERTIES_TESSELLATION:
+#ifdef TESSELLATION_ON
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_PIXEL_DISPLACEMENT:
+#ifdef _PIXEL_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_VERTEX_DISPLACEMENT:
+#ifdef _VERTEX_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_TESSELLATION_DISPLACEMENT:
+#ifdef _TESSELLATION_DISPLACEMENT // Caution: This define is related to a shader features (But it may become a standard features for HD)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_DEPTH_OFFSET:
+#ifdef _DEPTHOFFSET_ON  // Caution: This define is related to a shader features (But it may become a standard features for HD)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_LIGHTMAP:
+#if defined(LIGHTMAP_ON) || defined (DIRLIGHTMAP_COMBINED) || defined(DYNAMICLIGHTMAP_ON)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+
+        case DEBUGVIEWPROPERTIES_INSTANCING:
+#if defined(UNITY_INSTANCING_ENABLED)
+            result = float3(1.0, 0.0, 0.0);
+#else
+            result = float3(0.0, 0.0, 0.0);
+#endif
+            break;
+    }
+}
+
+float3 GetTextureDataDebug(uint paramId, float2 uv, Texture2D tex, float4 texelSize, float4 mipInfo, float3 originalColor)
+{
+    float3 outColor = originalColor;
+
+    switch (paramId)
+    {
+    case DEBUGMIPMAPMODE_MIP_RATIO:
+        outColor = GetDebugMipColorIncludingMipReduction(originalColor, tex, texelSize, uv, mipInfo);
+        break;
+    case DEBUGMIPMAPMODE_MIP_COUNT:
+        outColor = GetDebugMipCountColor(originalColor, tex);
+        break;
+    case DEBUGMIPMAPMODE_MIP_COUNT_REDUCTION:
+        outColor = GetDebugMipReductionColor(tex, mipInfo);
+        break;
+    case DEBUGMIPMAPMODE_STREAMING_MIP_BUDGET:
+        outColor = GetDebugStreamingMipColor(tex, mipInfo);
+        break;
+    case DEBUGMIPMAPMODE_STREAMING_MIP:
+        outColor = GetDebugStreamingMipColorBlended(originalColor, tex, mipInfo);
+        break;
+    }
+
+    return outColor;
+}
+
+// DebugFont code assume black and white font with texture size 256x128 with bloc of 16x16
+#define DEBUG_FONT_TEXT_WIDTH   16
+#define DEBUG_FONT_TEXT_HEIGHT  16
+#define DEBUG_FONT_TEXT_COUNT_X 16
+#define DEBUG_FONT_TEXT_COUNT_Y 8
+#define DEBUG_FONT_TEXT_ASCII_START 32
+
+#define DEBUG_FONT_TEXT_SCALE_WIDTH 10 // This control the spacing between characters (if a character fill the text block it will overlap).
+
+// Only support ASCII symbol from DEBUG_FONT_TEXT_ASCII_START to 126
+// return black or white depends if we hit font character or not
+// currentUnormCoord is current unormalized screen position
+// fixedUnormCoord is the position where we want to draw something, this will be incremented by block font size in provided direction
+// color is current screen color
+// color of the font to use
+// direction is 1 or -1 and indicate fixedUnormCoord block shift
+void DrawCharacter(uint asciiValue, float3 fontColor, uint2 currentUnormCoord, inout uint2 fixedUnormCoord, inout float3 color, int direction, int fontTextScaleWidth)
+{
+    // Are we inside a font display block on the screen ?
+    uint2 localCharCoord = currentUnormCoord - fixedUnormCoord;
+    if (localCharCoord.x >= 0 && localCharCoord.x < DEBUG_FONT_TEXT_WIDTH && localCharCoord.y >= 0 && localCharCoord.y < DEBUG_FONT_TEXT_HEIGHT)
+    {
+        localCharCoord.y = DEBUG_FONT_TEXT_HEIGHT - localCharCoord.y;
+
+        asciiValue -= DEBUG_FONT_TEXT_ASCII_START; // Our font start at ASCII table 32;
+        uint2 asciiCoord = uint2(asciiValue % DEBUG_FONT_TEXT_COUNT_X, asciiValue / DEBUG_FONT_TEXT_COUNT_X);
+        // Unorm coordinate inside the font texture
+        uint2 unormTexCoord = asciiCoord * uint2(DEBUG_FONT_TEXT_WIDTH, DEBUG_FONT_TEXT_HEIGHT) + localCharCoord;
+        // normalized coordinate
+        float2 normTexCoord = float2(unormTexCoord) / float2(DEBUG_FONT_TEXT_WIDTH * DEBUG_FONT_TEXT_COUNT_X, DEBUG_FONT_TEXT_HEIGHT * DEBUG_FONT_TEXT_COUNT_Y);
+
+#if UNITY_UV_STARTS_AT_TOP
+        normTexCoord.y = 1.0 - normTexCoord.y;
+#endif
+
+        float charColor = SAMPLE_TEXTURE2D_LOD(_DebugFont, s_point_clamp_sampler, normTexCoord, 0).r;
+        color = color * (1.0 - charColor) + charColor * fontColor;
+    }
+
+    fixedUnormCoord.x += fontTextScaleWidth * direction;
+}
+
+void DrawCharacter(uint asciiValue, float3 fontColor, uint2 currentUnormCoord, inout uint2 fixedUnormCoord, inout float3 color, int direction)
+{
+    DrawCharacter(asciiValue, fontColor, currentUnormCoord, fixedUnormCoord, color, direction, DEBUG_FONT_TEXT_SCALE_WIDTH);
+}
+
+// Shortcut to not have to file direction
+void DrawCharacter(uint asciiValue, float3 fontColor, uint2 currentUnormCoord, inout uint2 fixedUnormCoord, inout float3 color)
+{
+    DrawCharacter(asciiValue, fontColor, currentUnormCoord, fixedUnormCoord, color, 1);
+}
+
+// Draw a signed integer
+// Can't display more than 16 digit
+// The two following parameter are for float representation
+// leading0 is used when drawing frac part of a float to draw the leading 0 (call is in charge of it)
+// forceNegativeSign is used to force to display a negative sign as -0 is not recognize
+void DrawInteger(int intValue, float3 fontColor, uint2 currentUnormCoord, inout uint2 fixedUnormCoord, inout float3 color, int leading0, bool forceNegativeSign)
+{
+    const uint maxStringSize = 16;
+
+    uint absIntValue = abs(intValue);
+
+    // 1. Get size of the number of display
+    int numEntries = min((intValue == 0 ? 0 : log10(absIntValue)) + ((intValue < 0 || forceNegativeSign) ? 1 : 0) + leading0, maxStringSize);
+
+    // 2. Shift curseur to last location as we will go reverse
+    fixedUnormCoord.x += numEntries * DEBUG_FONT_TEXT_SCALE_WIDTH;
+
+    // 3. Display the number
+    bool drawCharacter = true; // bit weird, but it is to appease the compiler.
+    for (uint j = 0; j < maxStringSize; ++j)
+    {
+        // Numeric value incurrent font start on the second row at 0
+        if(drawCharacter)
+            DrawCharacter((absIntValue % 10) + '0', fontColor, currentUnormCoord, fixedUnormCoord, color, -1);
+
+        if (absIntValue  < 10)
+            drawCharacter = false;
+
+        absIntValue /= 10;
+    }
+
+    // 4. Display leading 0
+    if (leading0 > 0)
+    {
+        for (int i = 0; i < leading0; ++i)
+        {
+            DrawCharacter('0', fontColor, currentUnormCoord, fixedUnormCoord, color, -1);
+        }
+    }
+
+    // 5. Display sign
+    if (intValue < 0 || forceNegativeSign)
+    {
+        DrawCharacter('-', fontColor, currentUnormCoord, fixedUnormCoord, color, -1);
+    }
+
+    // 6. Reset cursor at end location
+    fixedUnormCoord.x += (numEntries + 2) * DEBUG_FONT_TEXT_SCALE_WIDTH;
+}
+
+void DrawInteger(int intValue, float3 fontColor, uint2 currentUnormCoord, inout uint2 fixedUnormCoord, inout float3 color)
+{
+    DrawInteger(intValue, fontColor, currentUnormCoord, fixedUnormCoord, color, 0, false);
+}
+
+void DrawFloatExplicitPrecision(float floatValue, float3 fontColor, uint2 currentUnormCoord, uint digitCount, inout uint2 fixedUnormCoord, inout float3 color)
+{
+    if (IsNaN(floatValue))
+    {
+        DrawCharacter('N', fontColor, currentUnormCoord, fixedUnormCoord, color);
+        DrawCharacter('a', fontColor, currentUnormCoord, fixedUnormCoord, color);
+        DrawCharacter('N', fontColor, currentUnormCoord, fixedUnormCoord, color);
+    }
+    else
+    {
+        int intValue = int(floatValue);
+        bool forceNegativeSign = floatValue >= 0.0f ? false : true;
+        DrawInteger(intValue, fontColor, currentUnormCoord, fixedUnormCoord, color, 0, forceNegativeSign);
+        DrawCharacter('.', fontColor, currentUnormCoord, fixedUnormCoord, color);
+        int fracValue = int(frac(abs(floatValue)) * pow(10, digitCount));
+        int leading0 = digitCount - (int(log10(fracValue)) + 1); // Counting leading0 to add in front of the float
+        DrawInteger(fracValue, fontColor, currentUnormCoord, fixedUnormCoord, color, leading0, false);
+    }
+}
+
+void DrawFloat(float floatValue, float3 fontColor, uint2 currentUnormCoord, inout uint2 fixedUnormCoord, inout float3 color)
+{
+    DrawFloatExplicitPrecision(floatValue, fontColor, currentUnormCoord, 6, fixedUnormCoord, color);
+}
+
+// Debug rendering is performed at the end of the frame (after post-processing).
+// Debug textures are never flipped upside-down automatically. Therefore, we must always flip manually.
+bool ShouldFlipDebugTexture()
+{
+    #if UNITY_UV_STARTS_AT_TOP
+        return (_ProjectionParams.x > 0);
+    #else
+        return (_ProjectionParams.x < 0);
+    #endif
+}
+
+#endif
+
+#endif // DEBUG_DISPLAY