HDRenderPipeline: split normalOS property

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/Editor/LayeredLitUI.cs

 
             for (int i = 0; i < kMaxLayerCount; ++i)
             {
-                SetKeyword(material, "_NORMALMAP_TANGENT_SPACE" + i, ((NormalMapSpace)material.GetFloat(kNormalMapSpace + i)) == NormalMapSpace.TangentSpace);
+                NormalMapSpace normalMapSpace = ((NormalMapSpace)material.GetFloat(kNormalMapSpace + i));
+
+                SetKeyword(material, "_NORMALMAP_TANGENT_SPACE" + i, normalMapSpace == NormalMapSpace.TangentSpace);
-                SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMap + i));
+                if (normalMapSpace == NormalMapSpace.TangentSpace)
+                {
+                    SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMap + i) || material.GetTexture(kDetailMap + i));
+                }
+                else
+                {
+                    SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMapOS + i) || material.GetTexture(kDetailMap + i));
+                }
 
                 SetKeyword(material, "_MASKMAP" + i, material.GetTexture(kMaskMap + i));
 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader

         _NormalMap2("NormalMap2", 2D) = "bump" {}
         _NormalMap3("NormalMap3", 2D) = "bump" {}
 
+        _NormalMapOS0("NormalMapOS0", 2D) = "white" {}
+        _NormalMapOS1("NormalMapOS1", 2D) = "white" {}
+        _NormalMapOS2("NormalMapOS2", 2D) = "white" {}
+        _NormalMapOS3("NormalMapOS3", 2D) = "white" {}
+
         _NormalScale0("_NormalScale0", Range(0.0, 2.0)) = 1
         _NormalScale1("_NormalScale1", Range(0.0, 2.0)) = 1
         _NormalScale2("_NormalScale2", Range(0.0, 2.0)) = 1

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader

         _NormalMap2("NormalMap2", 2D) = "bump" {}
         _NormalMap3("NormalMap3", 2D) = "bump" {}
 
+        _NormalMapOS0("NormalMapOS0", 2D) = "white" {}
+        _NormalMapOS1("NormalMapOS1", 2D) = "white" {}
+        _NormalMapOS2("NormalMapOS2", 2D) = "white" {}
+        _NormalMapOS3("NormalMapOS3", 2D) = "white" {}
+
         _NormalScale0("_NormalScale0", Range(0.0, 2.0)) = 1
         _NormalScale1("_NormalScale1", Range(0.0, 2.0)) = 1
         _NormalScale2("_NormalScale2", Range(0.0, 2.0)) = 1

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

         protected const string kHorizonFade = "_HorizonFade";
         protected MaterialProperty normalMap = null;
         protected const string kNormalMap = "_NormalMap";
+        protected MaterialProperty normalMapOS = null;
+        protected const string kNormalMapOS = "_NormalMapOS";
         protected MaterialProperty normalScale = null;
         protected const string kNormalScale = "_NormalScale";
         protected MaterialProperty normalMapSpace = null;
             specularOcclusionMap = FindProperty(kSpecularOcclusionMap, props);
             horizonFade = FindProperty(kHorizonFade, props);
             normalMap = FindProperty(kNormalMap, props);
+            normalMapOS = FindProperty(kNormalMapOS, props);
             normalScale = FindProperty(kNormalScale, props);
             normalMapSpace = FindProperty(kNormalMapSpace, props);
             heightMap = FindProperty(kHeightMap, props);
                 EditorGUILayout.HelpBox(Styles.normalMapSpaceWarning.text, MessageType.Error);
             }
 
-            m_MaterialEditor.TexturePropertySingleLine(Styles.normalMapText, normalMap, normalScale);
+            // We have two different property for object space and tangent space normal map to allow
+            // 1. to go back and forth
+            // 2. to avoid the warning that ask to fix the object normal map texture (normalOS are just linear RGB texture
+            if ((NormalMapSpace)normalMapSpace.floatValue == NormalMapSpace.TangentSpace)
+            {
+                m_MaterialEditor.TexturePropertySingleLine(Styles.normalMapText, normalMap, normalScale);
+            }
+            else
+            {
+                // No scaling in object space
+                m_MaterialEditor.TexturePropertySingleLine(Styles.normalMapText, normalMapOS);
+            }
 
             m_MaterialEditor.TexturePropertySingleLine(Styles.heightMapText, heightMap);
             if (!heightMap.hasMixedValue && heightMap.textureValue != null)
             SetupBaseLitKeywords(material);
             SetupBaseLitMaterialPass(material);
 
+            NormalMapSpace normalMapSpace = (NormalMapSpace)material.GetFloat(kNormalMapSpace);
+
-            SetKeyword(material, "_NORMALMAP_TANGENT_SPACE", ((NormalMapSpace)material.GetFloat(kNormalMapSpace)) == NormalMapSpace.TangentSpace);
+            SetKeyword(material, "_NORMALMAP_TANGENT_SPACE", (normalMapSpace == NormalMapSpace.TangentSpace));
-            SetKeyword(material, "_NORMALMAP", material.GetTexture(kNormalMap) || material.GetTexture(kDetailMap)); // With details map, we always use a normal map and Unity provide a default (0, 0, 1) normal map for ir
+            if (normalMapSpace == NormalMapSpace.TangentSpace)
+            {
+                // With details map, we always use a normal map and Unity provide a default (0, 0, 1) normal map for it
+                SetKeyword(material, "_NORMALMAP", material.GetTexture(kNormalMap) || material.GetTexture(kDetailMap));
+            }
+            else // Object space
+            {
+                // With details map, we always use a normal map but in case of objects space there is no good default, so the result will be weird until users fix it
+                SetKeyword(material, "_NORMALMAP", material.GetTexture(kNormalMapOS) || material.GetTexture(kDetailMap));
+            }
             SetKeyword(material, "_MASKMAP", material.GetTexture(kMaskMap));
             SetKeyword(material, "_SPECULAROCCLUSIONMAP", material.GetTexture(kSpecularOcclusionMap));
             SetKeyword(material, "_EMISSIVE_COLOR_MAP", material.GetTexture(kEmissiveColorMap));

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader

 
         _SpecularOcclusionMap("SpecularOcclusion", 2D) = "white" {}
 
-        _NormalMap("NormalMap", 2D) = "bump" {}
+        _NormalMap("NormalMap", 2D) = "bump" {}     // Tangent space normal map
+        _NormalMapOS("NormalMapOS", 2D) = "white" {} // Object space normal map - no good default value
         _NormalScale("_NormalScale", Range(0.0, 2.0)) = 1
 
         _HeightMap("HeightMap", 2D) = "black" {}

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

 
 #ifndef LAYERED_LIT_SHADER
 
+// Want to use only one sampler for normalmap either we use OS or TS.
+#ifdef _NORMALMAP_TANGENT_SPACE
+#else
+#define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS
+#endif
+
 #define SAMPLER_DETAILMASK_IDX sampler_DetailMask
 #define SAMPLER_DETAILMAP_IDX sampler_DetailMap
 #define SAMPLER_MASKMAP_IDX sampler_MaskMap
 // for this we put the constraint that the sampler are the same in a layered material for all textures of the same type
 // then we take the sampler matching the first textures use of this type
 #if defined(_NORMALMAP0)
-#define SAMPLER_NORMALMAP_IDX sampler_NormalMap0
+    #if defined(_NORMALMAP_TANGENT_SPACE0)
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap0
+    #else
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS0
+    #endif
-#define SAMPLER_NORMALMAP_IDX sampler_NormalMap1
+    #if defined(_NORMALMAP_TANGENT_SPACE1)
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap1
+    #else
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS1
+    #endif
-#define SAMPLER_NORMALMAP_IDX sampler_NormalMap2
+    #if defined(_NORMALMAP_TANGENT_SPACE2)
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap2
+    #else
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS2
+    #endif
-#define SAMPLER_NORMALMAP_IDX sampler_NormalMap3
+    #if defined(_NORMALMAP_TANGENT_SPACE3)
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMap3
+    #else
+    #define SAMPLER_NORMALMAP_IDX sampler_NormalMapOS3
+    #endif
 #endif
 
 #if defined(_DETAIL_MAP0)

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitDataInternal.hlsl

         normalTS = SAMPLE_UVMAPPING_NORMALMAP(ADD_IDX(_NormalMap), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale));
     }
     #else // Object space
-    // to be able to combine object space normal with detail map or to apply a "scale" we transform it to tangent space (object space normal composition is complex operation).
-    // then later we will re-transform it to world space.
+    // We forbid scale in case of object space as it make no sense
+    // To be able to combine object space normal with detail map then later we will re-transform it to world space.
-        float3 normalOS = SAMPLE_TEXTURE2D_BIAS(ADD_IDX(_NormalMap), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv, bias).xyz * 2.0 - 1.0;
+        float3 normalOS = SAMPLE_TEXTURE2D_BIAS(ADD_IDX(_NormalMapOS), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv, bias).xyz * 2.0 - 1.0;
-        normalTS *= ADD_IDX(_NormalScale);
-        float3 normalOS = UnpackNormalRGB(SAMPLE_TEXTURE2D_BIAS(ADD_IDX(_NormalMap), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv, bias), 1.0);
+        float3 normalOS = UnpackNormalRGB(SAMPLE_TEXTURE2D_BIAS(ADD_IDX(_NormalMapOS), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv, bias), 1.0);
-        normalTS.xy *= ADD_IDX(_NormalScale);  // Scale in tangent space
-        normalTS = (normalTS);
         #endif
     }
     else
-        float3 normalOS = SAMPLE_TEXTURE2D(ADD_IDX(_NormalMap), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv).xyz * 2.0 - 1.0;
+        float3 normalOS = SAMPLE_TEXTURE2D(ADD_IDX(_NormalMapOS), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv).xyz * 2.0 - 1.0;
-        normalTS *= ADD_IDX(_NormalScale);
-        float3 normalOS = UnpackNormalRGB(SAMPLE_TEXTURE2D(ADD_IDX(_NormalMap), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv), 1.0);
+        float3 normalOS = UnpackNormalRGB(SAMPLE_TEXTURE2D(ADD_IDX(_NormalMapOS), SAMPLER_NORMALMAP_IDX, ADD_IDX(layerTexCoord.base).uv), 1.0);
-        normalTS.xy *= ADD_IDX(_NormalScale); // Scale in tangent space
-        normalTS = (normalTS);
         #endif
     }
     #endif

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

 
 TEXTURE2D(_NormalMap);
 SAMPLER2D(sampler_NormalMap);
+TEXTURE2D(_NormalMapOS);
+SAMPLER2D(sampler_NormalMapOS);
+
 float _NormalScale;
 
 TEXTURE2D(_DetailMask);
 PROP_DECL_TEX2D(_SpecularOcclusionMap);
 
 PROP_DECL_TEX2D(_NormalMap);
+PROP_DECL_TEX2D(_NormalMapOS);
 PROP_DECL(float, _NormalScale);
 float4 _NormalMap0_TexelSize; // Unity facility. This will provide the size of the base normal to the shader
 

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

 
         _SpecularOcclusionMap("SpecularOcclusion", 2D) = "white" {}
 
-        _NormalMap("NormalMap", 2D) = "bump" {}
+        _NormalMap("NormalMap", 2D) = "bump" {}     // Tangent space normal map
+        _NormalMapOS("NormalMapOS", 2D) = "white" {} // Object space normal map - no good default value
         _NormalScale("_NormalScale", Range(0.0, 2.0)) = 1
 
         _HeightMap("HeightMap", 2D) = "black" {}