Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL

Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs

             UV0,
             UV1,
             Planar,
-            Triplanar,
+            //Triplanar,
-            public readonly GUIContent[] materialLayerLabels =
+            public readonly GUIContent[] layerLabels =
-                new GUIContent("Material Layer 0"),
-                new GUIContent("Material Layer 1"),
-                new GUIContent("Material Layer 2"),
-                new GUIContent("Material Layer 3"),
+                new GUIContent("Layer 0"),
+                new GUIContent("Layer 1"),
+                new GUIContent("Layer 2"),
+                new GUIContent("Layer 3"),
+
+            public readonly GUIContent materialLayer = new GUIContent("Material");
             public readonly GUIContent syncButton = new GUIContent("Re-Synchronize Layers", "Re-synchronize all layers's properties with the referenced Material");
             public readonly GUIContent layers = new GUIContent("Layers");
             public readonly GUIContent emission = new GUIContent("Emissive");
         bool DoLayerGUI(AssetImporter materialImporter, int layerIndex)
         {
             bool result = false;
+
+            EditorGUILayout.LabelField(styles.layerLabels[layerIndex]);
+
+            EditorGUI.indentLevel++;
+
-            m_MaterialLayers[layerIndex] = EditorGUILayout.ObjectField(styles.materialLayerLabels[layerIndex], m_MaterialLayers[layerIndex], typeof(Material), true) as Material;
+            m_MaterialLayers[layerIndex] = EditorGUILayout.ObjectField(styles.materialLayer, m_MaterialLayers[layerIndex], typeof(Material), true) as Material;
             if (EditorGUI.EndChangeCheck())
             {
                 Undo.RecordObject(materialImporter, "Change layer material");
             {
                 result = true;
             }
-            m_MaterialEditor.ShaderProperty(layerSizeProperty[layerIndex], styles.layerSize);
+            if ((LayerMapping)layerMappingProperty[layerIndex].floatValue == LayerMapping.Planar)
+            {
+                EditorGUI.indentLevel++;
+                m_MaterialEditor.ShaderProperty(layerSizeProperty[layerIndex], styles.layerSize);
+                EditorGUI.indentLevel--;
+            }
+
+            EditorGUI.indentLevel--;
 
             return result;
         }
 
             m_MaterialEditor.ShaderProperty(layerMaskVertexColorProperty, styles.layerMapVertexColor);
             m_MaterialEditor.TexturePropertySingleLine(styles.layerMapMask, layerMaskMapProperty);
+
+            EditorGUILayout.Space();
 
             for (int i = 0; i < layerCount; i++)
             {
                     SetKeyword(material, currentLayerMappingPlanar, true);
                     SetKeyword(material, currentLayerMappingTriplanar, false);
                 }
-                else if(layerMapping == LayerMapping.Triplanar)
-                {
-                    SetKeyword(material, currentLayerMappingUV1, false);
-                    SetKeyword(material, currentLayerMappingPlanar, false);
-                    SetKeyword(material, currentLayerMappingTriplanar, true);
-                }
+                //else if(layerMapping == LayerMapping.Triplanar)
+                //{
+                //    SetKeyword(material, currentLayerMappingUV1, false);
+                //    SetKeyword(material, currentLayerMappingPlanar, false);
+                //    SetKeyword(material, currentLayerMappingTriplanar, true);
+                //}
             }
         }
 

Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/LayeredLit.shader

         [Enum(Use Emissive Color, 0, Use Emissive Mask, 1)] _EmissiveColorMode("Emissive color mode", Float) = 1
         [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
 
-        [Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping0("Layer 0 Mapping", Float) = 0
-        [Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping1("Layer 1 Mapping", Float) = 0
-        [Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping2("Layer 2 Mapping", Float) = 0
-        [Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping3("Layer 3 Mapping", Float) = 0
+        //[Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping0("Layer 0 Mapping", Float) = 0
+        //[Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping1("Layer 1 Mapping", Float) = 0
+        //[Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping2("Layer 2 Mapping", Float) = 0
+        //[Enum(UV0, 0, UV1, 1, Planar, 2, Triplanar, 3)] _LayerMapping3("Layer 3 Mapping", Float) = 0
+
+        [Enum(UV0, 0, UV1, 1, Planar, 2)] _LayerMapping0("Layer 0 Mapping", Float) = 0
+        [Enum(UV0, 0, UV1, 1, Planar, 2)] _LayerMapping1("Layer 1 Mapping", Float) = 0
+        [Enum(UV0, 0, UV1, 1, Planar, 2)] _LayerMapping2("Layer 2 Mapping", Float) = 0
+        [Enum(UV0, 0, UV1, 1, Planar, 2)] _LayerMapping3("Layer 3 Mapping", Float) = 0
     }
 
     HLSLINCLUDE

Assets/ScriptableRenderLoop/HDRenderLoop/Material/Material.hlsl

 #include "Debug.hlsl"
 #include "GeometricTools.hlsl"
 #include "CommonMaterial.hlsl"
+#include "CommonLighting.hlsl"
 #include "EntityLighting.hlsl"
 
 //-----------------------------------------------------------------------------