HDRenderPipeline: commit unworking code

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Editor/BaseLitUI.cs

 
             public static GUIContent emissiveWarning = new GUIContent("Emissive value is animated but the material has not been configured to support emissive. Please make sure the material itself has some amount of emissive.");
             public static GUIContent emissiveColorWarning = new GUIContent("Ensure emissive color is non-black for emission to have effect.");
+
+            public static GUIContent tesselationText = new GUIContent("Tesselation options", "Tesselation options");
+            public static GUIContent tesselationFactorText = new GUIContent("Tesselation factor", "Tesselation factor");
         }
 
         public enum SurfaceType

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Editor/LitUI.cs

         protected MaterialProperty emissiveIntensity = null;
         protected const string kEmissiveIntensity = "_EmissiveIntensity";
 
+        // tesselation params
+        protected MaterialProperty tesselationFactor = null;
+        protected const string kTesselationFactor = "_TesselationFactor";
+
         // These are options that are shared with the LayeredLit shader. Don't put anything that can't be shared here:
         // For instance, properties like BaseColor and such don't exist in the LayeredLit so don't put them here.
         protected void FindMaterialOptionProperties(MaterialProperty[] props)
             emissiveColor = FindProperty(kEmissiveColor, props);
             emissiveColorMap = FindProperty(kEmissiveColorMap, props);
             emissiveIntensity = FindProperty(kEmissiveIntensity, props);
+
+            tesselationFactor = FindProperty(kTesselationFactor, props);;
         }
 
         override protected void ShaderInputOptionsGUI()
             m_MaterialEditor.LightmapEmissionProperty(MaterialEditor.kMiniTextureFieldLabelIndentLevel + 1);
 
             EditorGUI.indentLevel--;
+
+            EditorGUILayout.Space();
+            
+            if (tesselationFactor != null)
+            {
+                GUILayout.Label(Styles.tesselationText, EditorStyles.boldLabel);
+                EditorGUI.indentLevel++;
+                m_MaterialEditor.ShaderProperty(tesselationFactor, Styles.tesselationFactorText);
+                EditorGUI.indentLevel--;
+            }
+            
         }
 
         public override void AssignNewShaderToMaterial(Material material, Shader oldShader, Shader newShader)

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitData.hlsl

 #define ADD_IDX(Name) Name
 #define ADD_ZERO_IDX(Name) Name
 #include "LitDataInternal.hlsl"
+#ifdef TESSELATION_ON
+#include "LitTesselation.hlsl"
+#endif
 
 void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs posInput, out SurfaceData surfaceData, out BuiltinData builtinData)
 {
 #define LAYER_INDEX 0
 #define ADD_IDX(Name) Name##0
 #include "LitDataInternal.hlsl"
+#ifdef TESSELATION_ON
+#include "LitTesselation.hlsl" // Include only one time for layer 0
+#endif
 #undef LAYER_INDEX
 #undef ADD_IDX
 

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl

 float _AlphaCutoff;
 
 #endif // LAYERED_LIT_SHADER
+
+// Tesselation specific
+
+#ifdef TESSELATION_ON
+float _TesselationFactor;
+#endif

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitTesselation.hlsl

 
  //   return UnityDistanceBasedTess(input0.positionOS, input1.positionOS, input2.positionOS, minDist, maxDist, 0.5 /* _Tess */, unity_ObjectToWorld, _WorldSpaceCameraPos);
 
-    return float4(10.0, 10.0, 10.0, 10.0);
+    return float4(_TesselationFactor, _TesselationFactor, _TesselationFactor, _TesselationFactor);
 }
 
 void Displacement(inout Attributes v)
     float d = ((tex2Dlod(_DispTex, float4(v.texcoord.xy * _Tiling, 0, 0)).r) - _DisplacementCenter) * (_Displacement * LengthLerp);
     d /= max(0.0001, _Tiling);
     */
-   // v.positionOS.xyz += 10 * float3(0.5, 0.5, 0.5); // v.normalOS * 5.0;
+
+#if _HEIGHTMAP
+    float height = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_HeightMap), ADD_ZERO_IDX(sampler_HeightMap), ADD_IDX(layerTexCoord.base)).r * ADD_IDX(_HeightScale) + ADD_IDX(_HeightBias);
+#else
+    float height = 0.0;
+#endif
+
+    v.positionOS.xyz += height * v.normalOS;
 }

Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitTessellation.shader

         _EmissiveColorMap("EmissiveColorMap", 2D) = "white" {}
         _EmissiveIntensity("EmissiveIntensity", Float) = 0
 
-            [ToggleOff] _DistortionEnable("Enable Distortion", Float) = 0.0
-            [ToggleOff] _DistortionOnly("Distortion Only", Float) = 0.0
-            [ToggleOff] _DistortionDepthTest("Distortion Depth Test Enable", Float) = 0.0
-            [ToggleOff] _DepthOffsetEnable("Depth Offset View space", Float) = 0.0
+        [ToggleOff] _DistortionEnable("Enable Distortion", Float) = 0.0
+        [ToggleOff] _DistortionOnly("Distortion Only", Float) = 0.0
+        [ToggleOff] _DistortionDepthTest("Distortion Depth Test Enable", Float) = 0.0
+        [ToggleOff] _DepthOffsetEnable("Depth Offset View space", Float) = 0.0
-            [ToggleOff]  _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0
-            _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
+        [ToggleOff]  _AlphaCutoffEnable("Alpha Cutoff Enable", Float) = 0.0
+        _AlphaCutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
-            // Blending state
-            [HideInInspector] _SurfaceType("__surfacetype", Float) = 0.0
-            [HideInInspector] _BlendMode("__blendmode", Float) = 0.0
-            [HideInInspector] _SrcBlend("__src", Float) = 1.0
-            [HideInInspector] _DstBlend("__dst", Float) = 0.0
-            [HideInInspector] _ZWrite("__zw", Float) = 1.0
-            [HideInInspector] _CullMode("__cullmode", Float) = 2.0
-            [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
+        // Blending state
+        [HideInInspector] _SurfaceType("__surfacetype", Float) = 0.0
+        [HideInInspector] _BlendMode("__blendmode", Float) = 0.0
+        [HideInInspector] _SrcBlend("__src", Float) = 1.0
+        [HideInInspector] _DstBlend("__dst", Float) = 0.0
+        [HideInInspector] _ZWrite("__zw", Float) = 1.0
+        [HideInInspector] _CullMode("__cullmode", Float) = 2.0
+        [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
-            // Material Id
-            [HideInInspector] _MaterialId("_MaterialId", FLoat) = 0
+        // Material Id
+        [HideInInspector] _MaterialId("_MaterialId", FLoat) = 0
-            [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
+        [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
-            [Enum(Mask Alpha, 0, BaseColor Alpha, 1)] _SmoothnessTextureChannel("Smoothness texture channel", Float) = 1
-            [Enum(UV0, 0, Planar, 1, TriPlanar, 2)] _UVBase("UV Set for base", Float) = 0
-            _TexWorldScale("Scale to apply on world coordinate", Float) = 1.0
-            [HideInInspector] _UVMappingMask("_UVMappingMask", Color) = (1, 0, 0, 0)
-            [HideInInspector] _UVMappingPlanar("_UVMappingPlanar", Float) = 0
-            [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace("NormalMap space", Float) = 0
-            [ToggleOff]  _EnablePerPixelDisplacement("Enable per pixel displacement", Float) = 0.0
-            [Enum(DetailMapNormal, 0, DetailMapAOHeight, 1)] _DetailMapMode("DetailMap mode", Float) = 0
-            [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail("UV Set for detail", Float) = 0
-            [HideInInspector] _UVDetailsMappingMask("_UVDetailsMappingMask", Color) = (1, 0, 0, 0)
-            [Enum(Use Emissive Color, 0, Use Emissive Mask, 1)] _EmissiveColorMode("Emissive color mode", Float) = 1
+        [Enum(Mask Alpha, 0, BaseColor Alpha, 1)] _SmoothnessTextureChannel("Smoothness texture channel", Float) = 1
+        [Enum(UV0, 0, Planar, 1, TriPlanar, 2)] _UVBase("UV Set for base", Float) = 0
+        _TexWorldScale("Scale to apply on world coordinate", Float) = 1.0
+        [HideInInspector] _UVMappingMask("_UVMappingMask", Color) = (1, 0, 0, 0)
+        [HideInInspector] _UVMappingPlanar("_UVMappingPlanar", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace("NormalMap space", Float) = 0
+        [ToggleOff]  _EnablePerPixelDisplacement("Enable per pixel displacement", Float) = 0.0
+        [Enum(DetailMapNormal, 0, DetailMapAOHeight, 1)] _DetailMapMode("DetailMap mode", Float) = 0
+        [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail("UV Set for detail", Float) = 0
+        [HideInInspector] _UVDetailsMappingMask("_UVDetailsMappingMask", Color) = (1, 0, 0, 0)
+        [Enum(Use Emissive Color, 0, Use Emissive Mask, 1)] _EmissiveColorMode("Emissive color mode", Float) = 1
-            // Tesselation specific
-            float _TesselationFactor;
+        // Tesselation specific
+        _TesselationFactor("Tesselation Factor", Float) = 3.0
     }
 
     HLSLINCLUDE
             #include "../../Material/Material.hlsl"
             #include "LitData.hlsl"
             #include "ShaderPass/LitSharePass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
 
             #include "../../ShaderPass/ShaderPassGBuffer.hlsl"
             #include "../../Material/Material.hlsl"
             #include "LitData.hlsl"
             #include "ShaderPass/LitSharePass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
             
             #include "../../ShaderPass/ShaderPassDebugViewMaterial.hlsl"
             #include "../../Material/Material.hlsl"            
             #include "LitData.hlsl"
             #include "ShaderPass/LitDepthPass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
 
             #include "../../ShaderPass/ShaderPassDepthOnly.hlsl"
             #include "../../Material/Material.hlsl"            
             #include "LitData.hlsl"
             #include "ShaderPass/LitDepthPass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
 
             #include "../../ShaderPass/ShaderPassDepthOnly.hlsl"
             #include "../../Material/Material.hlsl"         
             #include "LitData.hlsl"
             #include "ShaderPass/LitVelocityPass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
 
             #include "../../ShaderPass/ShaderPassVelocity.hlsl"
             #include "../../Material/Material.hlsl"         
             #include "LitData.hlsl"
             #include "ShaderPass/LitDistortionPass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
 
             #include "../../ShaderPass/ShaderPassDistortion.hlsl"
             #include "../../Lighting/Lighting.hlsl"
             #include "LitData.hlsl"
             #include "ShaderPass/LitSharePass.hlsl"
-            #include "LitTesselation.hlsl"
             #include "../Tesselation/TesselationShare.hlsl"
 
             #include "../../ShaderPass/ShaderPassForward.hlsl"