Added support to metallic and AO map in lit shader. Also normal scale. Updated scenes.

Author: phi-lira

Assets/_ExampleScenes/51_LitPhysicallyBased/CustomLit.shader

@@ -12,12 +12,15 @@
  // splitting now as I've not implemented custom shader editor yet and
  // this will make it look nices in the UI
  _Metallic("Metallic", Range(0, 1)) = 1.0
+ [NoScaleOffset]_MetallicSmoothnessMap("MetalicMap", 2D) = "white" {}
  _AmbientOcclusion("AmbientOcclusion", Range(0, 1)) = 1.0
+ [NoScaleOffset]_AmbientOcclusionMap("AmbientOcclusionMap", 2D) = "white" {}
  _Reflectance("Reflectance for dieletrics", Range(0.0, 1.0)) = 0.5
  _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
 
  [Toggle(_NORMALMAP)] _EnableNormalMap("Enable Normal Map", Float) = 0.0
  [Normal][NoScaleOffset]_NormalMap("Normal Map", 2D) = "bump" {}
+ _NormalMapScale("Normal Map Scale", Float) = 1.0
 
  [Header(Emission)]
  [HDR]_Emission("Emission Color", Color) = (0,0,0,1)
@@ -43,6 +46,7 @@
  half _Reflectance;
  half _Smoothness;
  half4 _Emission;
+ half _NormalMapScale;
  CBUFFER_END
  ENDHLSL
 
@@ -74,26 +78,29 @@
  // Textures are declared in global scope
  TEXTURE2D(_BaseMap); SAMPLER(sampler_BaseMap);
  TEXTURE2D(_NormalMap); SAMPLER(sampler_NormalMap);
- TEXTURE2D(_MaskMap);
+ TEXTURE2D(_MetallicSmoothnessMap);
+ TEXTURE2D(_AmbientOcclusionMap);
 
  void SurfaceFunction(Varyings IN, out SurfaceData surfaceData)
  {
  surfaceData = (SurfaceData)0;
  float2 uv = TRANSFORM_TEX(IN.uv, _BaseMap);
 
  half3 baseColor = SAMPLE_TEXTURE2D(_BaseMap, sampler_BaseMap, uv) * _BaseColor;
- half metallic = _Metallic;
-
+ half4 metallicSmoothness = SAMPLE_TEXTURE2D(_MetallicSmoothnessMap, sampler_BaseMap, uv);
+ half metallic = _Metallic * metallicSmoothness.r;
  // diffuse color is black for metals and baseColor for dieletrics
  surfaceData.diffuse = ComputeDiffuseColor(baseColor.rgb, metallic);
 
+ // f0 is reflectance at normal incidence. we store f0 in baseColor for metals.
+ // for dieletrics f0 is monochromatic and stored in reflectance value.
  // Remap reflectance to range [0, 1] - 0.5 maps to 4%, 1.0 maps to 16% (gemstone)
- // https://google.github.io/filament/Filament.html#materialsystem/parameterization/standardparameters 
+ // https://google.github.io/filament/Filament.html#materialsystem/parameterization/standardparameters
  surfaceData.reflectance = ComputeFresnel0(baseColor.rgb, metallic, _Reflectance * _Reflectance * 0.16);
- surfaceData.ao = _AmbientOcclusion;
- surfaceData.perceptualRoughness = 1.0 - _Smoothness;
+ surfaceData.ao = SAMPLE_TEXTURE2D(_AmbientOcclusionMap, sampler_BaseMap, uv).g * _AmbientOcclusion;
+ surfaceData.perceptualRoughness = 1.0 - (_Smoothness * metallicSmoothness.a);
 #ifdef _NORMALMAP
- surfaceData.normalWS = GetPerPixelNormal(TEXTURE2D_ARGS(_NormalMap, sampler_NormalMap), uv, IN.normalWS, IN.tangentWS);
+ surfaceData.normalWS = GetPerPixelNormalScaled(TEXTURE2D_ARGS(_NormalMap, sampler_NormalMap), uv, IN.normalWS, IN.tangentWS, _NormalMapScale);
 #else
  surfaceData.normalWS = normalize(IN.normalWS);
 #endif

Assets/_ExampleScenes/51_LitPhysicallyBased/dieletricReflectance0.mat

@@ -19,6 +19,10 @@ Material:
  m_SavedProperties:
  serializedVersion: 3
  m_TexEnvs:
+ - _AmbientOcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _BaseMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 10, y: 10}
@@ -27,6 +31,10 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _MetallicSmoothnessMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _NormalMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 0, y: 0}
@@ -37,12 +45,12 @@ Material:
  - _EnableMaskMap: 0
  - _EnableNormalMap: 0
  - _Metallic: 0
+ - _NormalMapScale: 1
  - _Reflectance: 0
  - _Smoothness: 1
  m_Colors:
  - _BaseColor: {r: 0.25, g: 0.25, b: 0.75, a: 1}
  - _Emission: {r: 0, g: 0, b: 0, a: 1}
- m_BuildTextureStacks: []
 --- !u!114 &7017825111196047562
 MonoBehaviour:
  m_ObjectHideFlags: 11

Assets/_ExampleScenes/52_ClearCoat/CarPaint_DarkRedLit.mat

@@ -22,7 +22,7 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: CarPaint_DarkRedLit
  m_Shader: {fileID: 4800000, guid: 50211223aa9fe48bcb8e1dfe5cd83cc7, type: 3}
- m_ShaderKeywords: 
+ m_ShaderKeywords: _NORMALMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@@ -44,6 +44,10 @@ Material:
  m_Texture: {fileID: 2800000, guid: ab941052b65bab5469d7376db72d99bd, type: 3}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _AmbientOcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _BaseMap:
  m_Texture: {fileID: 2800000, guid: d36c7fd843399dc48b8582c0821022c3, type: 3}
  m_Scale: {x: 20, y: 20}
@@ -68,10 +72,14 @@ Material:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
- - _NormalMap:
+ - _MetallicSmoothnessMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 2800000, guid: ab941052b65bab5469d7376db72d99bd, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _OcclusionMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
@@ -100,12 +108,13 @@ Material:
  - _Cutoff: 0.5
  - _DstBlend: 0
  - _EnableClearCoat: 1
- - _EnableNormalMap: 0
+ - _EnableNormalMap: 1
  - _EnvironmentReflections: 1
  - _GlossMapScale: 0
  - _Glossiness: 0
  - _GlossyReflections: 0
  - _Metallic: 0.777
+ - _NormalMapScale: 0.03
  - _OcclusionStrength: 1
  - _QueueOffset: 0
  - _ReceiveShadows: 1

Assets/_ExampleScenes/52_ClearCoat/CarbonFiberLit.mat

@@ -8,15 +8,14 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: CarbonFiberLit
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 4800000, guid: 50211223aa9fe48bcb8e1dfe5cd83cc7, type: 3}
  m_ShaderKeywords: _ENVIRONMENTREFLECTIONS_OFF _METALLICSPECGLOSSMAP _NORMALMAP
  _OCCLUSIONMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2050
- stringTagMap:
- RenderType: Opaque
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
  serializedVersion: 3
@@ -33,9 +32,13 @@ Material:
  m_Texture: {fileID: 2800000, guid: 97a5e65a076f50d42963a284a1bc592c, type: 3}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _AmbientOcclusionMap:
+ m_Texture: {fileID: 2800000, guid: 8157dd09913f891428066feaa94ccf12, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _BaseMap:
  m_Texture: {fileID: 2800000, guid: 26d0b250f59e0f841ba5e17c1d3825ef, type: 3}
- m_Scale: {x: 15, y: 15}
+ m_Scale: {x: 10, y: 10}
  m_Offset: {x: 0, y: 0}
  - _BumpMap:
  m_Texture: {fileID: 2800000, guid: 067474a1fe20636438146556fb01a657, type: 3}
@@ -57,6 +60,14 @@ Material:
  m_Texture: {fileID: 2800000, guid: f7d1bc0cc81c7e84e969040c53742d0a, type: 3}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _MetallicSmoothnessMap:
+ m_Texture: {fileID: 2800000, guid: f7d1bc0cc81c7e84e969040c53742d0a, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 2800000, guid: 067474a1fe20636438146556fb01a657, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _OcclusionMap:
  m_Texture: {fileID: 2800000, guid: 8157dd09913f891428066feaa94ccf12, type: 3}
  m_Scale: {x: 1, y: 1}
@@ -75,6 +86,7 @@ Material:
  - Vector1_D4371E4A: 1
  - Vector1_D9C0A08D: 1
  - _AlphaClip: 0
+ - _AmbientOcclusion: 1
  - _Blend: 0
  - _BumpScale: 1
  - _ClearCoat: 0.863
@@ -84,14 +96,17 @@ Material:
  - _Cutoff: 0.5
  - _DstBlend: 0
  - _EnableClearCoat: 1
+ - _EnableNormalMap: 1
  - _EnvironmentReflections: 0
  - _GlossMapScale: 0
  - _Glossiness: 0
  - _GlossyReflections: 0
- - _Metallic: 0.262
+ - _Metallic: 0
+ - _NormalMapScale: 1
  - _OcclusionStrength: 1
  - _QueueOffset: 0
  - _ReceiveShadows: 1
+ - _Reflectance: 0.5
  - _Smoothness: 0
  - _SmoothnessTextureChannel: 0
  - _SpecularHighlights: 1
@@ -103,8 +118,9 @@ Material:
  - Color_B11A0B8E: {r: 1, g: 1, b: 1, a: 0}
  - Vector2_161E53D1: {r: 20, g: 20, b: 0, a: 0}
  - Vector2_BD63EE59: {r: 0, g: 0, b: 0, a: 0}
- - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
  - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ - _Emission: {r: 0, g: 0, b: 0, a: 1}
  - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
 --- !u!114 &8637944387010510288

Assets/_ExampleScenes/52_ClearCoat/CarbonFilterCoat.mat

@@ -29,7 +29,7 @@ Material:
  m_Offset: {x: 0, y: 0}
  - _BaseMap:
  m_Texture: {fileID: 2800000, guid: 26d0b250f59e0f841ba5e17c1d3825ef, type: 3}
- m_Scale: {x: 15, y: 15}
+ m_Scale: {x: 10, y: 10}
  m_Offset: {x: 0, y: 0}
  - _MaskMap:
  m_Texture: {fileID: 0}
@@ -63,7 +63,7 @@ Material:
  - _Reflectance: 0.5
  - _Smoothness: 0
  m_Colors:
- - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
  - _Emission: {r: 0, g: 0, b: 0, a: 1}
 --- !u!114 &7017825111196047562
 MonoBehaviour:

Assets/_ExampleScenes/52_ClearCoat/FloatingMahoganyCoat_BronzeLit.mat

@@ -9,7 +9,7 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: FloatingMahoganyCoat_BronzeLit
  m_Shader: {fileID: 4800000, guid: 50211223aa9fe48bcb8e1dfe5cd83cc7, type: 3}
- m_ShaderKeywords: _CLEARCOAT _OCCLUSIONMAP
+ m_ShaderKeywords: _CLEARCOAT _NORMALMAP _OCCLUSIONMAP
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@@ -31,6 +31,10 @@ Material:
  m_Texture: {fileID: 2800000, guid: b6ab2245abdaa4a42ac45889aa9861a9, type: 3}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _AmbientOcclusionMap:
+ m_Texture: {fileID: 2800000, guid: a70f1ac2e70003444917f97bdf5b3123, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _BaseMap:
  m_Texture: {fileID: 2800000, guid: 6ce3faf7453e55d4988f09d34f954be6, type: 3}
  m_Scale: {x: 5, y: 5}
@@ -55,10 +59,14 @@ Material:
  m_Texture: {fileID: 2800000, guid: 140e74c1ce570fc4798f10081855ccc9, type: 3}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
- - _NormalMap:
+ - _MetallicSmoothnessMap:
  m_Texture: {fileID: 0}
  m_Scale: {x: 1, y: 1}
  m_Offset: {x: 0, y: 0}
+ - _NormalMap:
+ m_Texture: {fileID: 2800000, guid: 179dee3bd04bba945995dd57bb9c550b, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
  - _OcclusionMap:
  m_Texture: {fileID: 2800000, guid: a70f1ac2e70003444917f97bdf5b3123, type: 3}
  m_Scale: {x: 1, y: 1}
@@ -86,17 +94,18 @@ Material:
  - _Cutoff: 0.5
  - _DstBlend: 0
  - _EnableClearCoat: 1
- - _EnableNormalMap: 0
+ - _EnableNormalMap: 1
  - _EnvironmentReflections: 1
  - _GlossMapScale: 0
  - _Glossiness: 0
  - _GlossyReflections: 0
  - _Metallic: 0
+ - _NormalMapScale: 0.13
  - _OcclusionStrength: 1
  - _QueueOffset: 0
  - _ReceiveShadows: 1
  - _Reflectance: 0.5
- - _Smoothness: 1
+ - _Smoothness: 0
  - _SmoothnessTextureChannel: 0
  - _SpecularHighlights: 1
  - _SrcBlend: 1

Assets/_ExampleScenes/52_ClearCoat/lit.mat

@@ -134,7 +134,7 @@ half3 EnvironmentBRDF(half3 f0, half roughness, half NdotV)
  {
  // 0.089 perceptual roughness is the min value we can represent in fp16
  // to avoid denorm/division by zero as we need to do 1 / (pow(perceptualRoughness, 4)) in GGX
- half perceptualRoughness = max(1.0 - surfaceData.perceptualRoughness, 0.089);
+ half perceptualRoughness = max(surfaceData.perceptualRoughness, 0.089);
  half roughness = PerceptualRoughnessToRoughness(perceptualRoughness);
 
  half3 environmentReflection = lightingData.environmentReflections;