Clean up and fixes

Editor/LitGUI.cs

@@ -198,6 +198,11 @@ public override void DrawSurfaceInputs(MaterialEditor materialEditor)
             materialEditor.TexturePropertyWithHDRColor(Labels.Emission, m_EmissionMapProp,
                 m_EmissionColorProp, false);
 
+            // If texture was assigned and color was black set color to white
+            var brightness = m_EmissionColorProp.colorValue.maxColorComponent;
+            if (m_EmissionMapProp.textureValue != null && !hadEmissionTexture && brightness <= 0f)
+                m_EmissionColorProp.colorValue = Color.white;
+
             // Anisotropy
             materialEditor.ShaderProperty(m_EnableAnisotropyProp, Labels.EnableAnisotropy);
             if (m_EnableAnisotropyProp.floatValue == 1.0)
@@ -206,11 +211,6 @@ public override void DrawSurfaceInputs(MaterialEditor materialEditor)
                 materialEditor.TexturePropertySingleLine(Labels.Direction, m_DirectionMapProp);
             }
 
-            // If texture was assigned and color was black set color to white
-            var brightness = m_EmissionColorProp.colorValue.maxColorComponent;
-            if (m_EmissionMapProp.textureValue != null && !hadEmissionTexture && brightness <= 0f)
-                m_EmissionColorProp.colorValue = Color.white;
-
             // Clear Coat
             materialEditor.ShaderProperty(m_EnableClearCoatProp, Labels.EnableClearCoat);
             if (m_EnableClearCoatProp.floatValue == 1.0)

Editor/ToonLitGUI.cs

@@ -41,7 +41,8 @@ struct PropertyNames
 #region GUI
         public override void GetProperties(MaterialProperty[] properties)
         {
-            // Draw LitGUI
+            // Generate a LitGUI instance
+            // This is sealed but shares most properties
             m_LitGui = new LitGUI();
             m_LitGui.GetProperties(properties);
 
@@ -55,17 +56,18 @@ public override void GetProperties(MaterialProperty[] properties)
 
         public override void DrawSurfaceInputs(MaterialEditor materialEditor)
         {
-            // Draw LitGUI
+            // Draw LitGUI SurfaceInputs
+            // These are the same
             m_LitGui.DrawSurfaceInputs(materialEditor);
         }
 
         public override void DrawCustom(MaterialEditor materialEditor)
         {
-            // Surface Inputs
+            // Stylization Options
             var stylizationOptions = EditorGUILayout.BeginFoldoutHeaderGroup(m_StylizationOptionsFoldout, Labels.StylizationOptions);
             if(stylizationOptions)
             {
-                // Toon Reflection
+                // Toon Reflections
                 materialEditor.ShaderProperty(m_EnableToonReflectionsProp, Labels.EnableToonReflections);
                 if (m_EnableToonReflectionsProp.floatValue == 1.0)
                 {
@@ -87,9 +89,11 @@ public override void DrawCustom(MaterialEditor materialEditor)
 #region Keywords
         public override void SetMaterialKeywords(Material material)
         {
-            // Draw LitGUI
+            // Set LitGUI keywords
+            // These are mostly the same
             m_LitGui.SetMaterialKeywords(material);
 
+            // Toon Reflections
             material.SetKeyword("_TOON_REFLECTIONS", material.GetFloat(PropertyNames.EnableToonReflections) == 1.0f);
         }
 #endregion

Editor/kTools.Shading.Editor.asmdef

@@ -1,8 +1,6 @@
 {
     "name": "kTools.Shading.Editor",
-    "references": [
-        "GUID:9e705d6a72d9a354b810376671ddb3ac"
-    ],
+    "references": [],
     "includePlatforms": [
         "Editor"
     ],

README.md

@@ -1,28 +1,19 @@
-# Toon Shading
-![alt text][logo]
+# kShading
+### Shading models for Unity’s Universal Render Pipeline.
 
-[logo]: https://cdna.artstation.com/p/assets/images/images/007/124/644/large/matt-dean-screenshot01.jpg?1503872324 "Demo Scene"
+![alt text](https://github.com/Kink3d/kShading/wiki/Images/Home00.png?raw=true)
+*An example of a scene using Lit Toon shading.*
 
-A collection of "Toon" shaders based on a stepped PBR approximation.
+kShading is a package of shaders for Unity's Universal Render Pipeline. It includes:
+- **Lit:** A physically based shader that supports all default Universal surface properties as well as anisotropy, clear coat, sub-surface scattering and transmission.
+- **Toon Lit:** A cel style shader that supports all features of the **Lit** shader but uses a stepped physical approximation BSDF.
 
-Toon Standard Shader:
-- Custom "Toon" cel style BRDF
-- Specular / Smoothness 
-- Energy conservation approximation 
-- Wrap based transmission approximation 
-- Custom ShaderGUI
+Refer to the [Wiki](https://github.com/Kink3d/kShading/wiki/Home) for more information.
 
-Toon Water Shader: 
-- Uses same BRDF as above 
-- Voronoi based procedural waves 
-- Depth buffer to world position intersection for wave crests 
-- Approximated transmission and refraction 
-- Planar reflection 
-- Buoyancy calculation
+## Instructions
+- Open your project manifest file (`MyProject/Packages/manifest.json`).
+- Add `"com.kink3d.shading": "https://github.com/Kink3d/kShading.git"` to the `dependencies` list.
+- Open or focus on Unity Editor to resolve packages.
 
-Contains:
-- Toon Standard shader
-- Toon Water shader
-- Buoyancy controller
-- Demo scene
-- Source assets
+## Requirements
+- Unity 2019.3.0f3 or higher.

ShaderLibrary/Lighting.hlsl

@@ -200,7 +200,12 @@ half DirectSpecularAnisotropic(float NoH, half LoH2, float3 halfDir,
 
     // Anisotropic GGX Distribution multiplied by combined approximation of Visibility and Fresnel
     // V * F = 1.0 / ( LoH^2 * (roughness + 0.5) )
-    half d = D_GGXAniso(ToH, BoH, NoH, roughnessT, roughnessB);
+    // If roughness is 0, returns (NdotH == 1 ? 1 : 0).
+    // That is, it returns 1 for perfect mirror reflection, and 0 otherwise.
+    half a2 = roughnessT * roughnessB;
+    half3 v = half3(roughnessB * ToH, roughnessT * BoH, a2 * NoH);
+    half s = dot(v, v);
+    half d = SafeDiv(a2 * a2 * a2, s * s);
     return d * (LoH2 * (perceptualRoughness + 0.5) * 4.0);
 }
 

ShaderLibrary/ToonLighting.hlsl

@@ -3,6 +3,7 @@
 
 // -------------------------------------
 // Includes
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
 #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
 
 // -------------------------------------
@@ -62,7 +63,6 @@ half DirectSpecularAnisotropicToon(float NoH, half LoH2, float3 halfDir,
     // V * F = 1.0 / ( LoH^2 * (roughness + 0.5) )
     // If roughness is 0, returns (NdotH == 1 ? 1 : 0).
     // That is, it returns 1 for perfect mirror reflection, and 0 otherwise.
-    // half d = D_GGXAniso(ToH, BoH, NoH, roughnessT, roughnessB);
     half a2 = roughnessT * roughnessB;
     half3 v = half3(roughnessB * ToH, roughnessT * BoH, a2 * NoH);
     half s = dot(v, v);
@@ -121,8 +121,9 @@ half3 RadianceToon(half3 normalWS, half3 lightDirectionWS, half3 lightColor, hal
     half NdotL = ceil(saturate(dot(normalWS, lightDirectionWS)));
 
 #ifdef _SUBSURFACE
-    half NdotLWrap = saturate((dot(normalWS, lightDirectionWS) + subsurfaceColor) / ((1 + subsurfaceColor) * (1 + subsurfaceColor)));
-    return lightColor * (lightAttenuation * lerp(NdotLWrap * subsurfaceColor, NdotLWrap, NdotL));
+    half subsurfaceLuminance = Luminance(subsurfaceColor);
+    half NdotLWrap = ceil(saturate((dot(normalWS, lightDirectionWS) + subsurfaceLuminance) / ((1 + subsurfaceLuminance) * (1 + subsurfaceLuminance))));
+    return lightColor * (lightAttenuation * lerp(NdotLWrap * subsurfaceColor, lerp(NdotLWrap * subsurfaceColor, NdotLWrap, 1 - subsurfaceLuminance), NdotL));
 #else
     return lightColor * (lightAttenuation * NdotL);
 #endif

Tests/Editor/kTools.Shading.Editor.Tests.asmdef

@@ -2,8 +2,7 @@
     "name": "kTools.Shading.Editor.Tests",
     "references": [
         "GUID:27619889b8ba8c24980f49ee34dbb44a",
-        "GUID:0acc523941302664db1f4e527237feb3",
-        "GUID:9e705d6a72d9a354b810376671ddb3ac"
+        "GUID:0acc523941302664db1f4e527237feb3"
     ],
     "includePlatforms": [
         "Editor"