From 4015294be36cb33f9f36d355a9db386cfc5bd759 Mon Sep 17 00:00:00 2001 From: Geoff Birch Date: Fri, 23 Aug 2024 09:00:30 +0100 Subject: [PATCH 1/2] envLightingMultiplier = 4.0 to match MetaLighting on DCL/Toon shader --- .../DCL_Avatar_Facial_Feature_ForwardPass.hlsl | 2 ++ .../DCL_Avatar_Facial_Features.shader | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Feature_ForwardPass.hlsl b/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Feature_ForwardPass.hlsl index f3bb11be2f..393e954c9c 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Feature_ForwardPass.hlsl +++ b/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Feature_ForwardPass.hlsl @@ -201,6 +201,8 @@ half4 UniversalFragmentBlinnPhong_FacialFeatures(InputData inputData, SurfaceDat MixRealtimeAndBakedGI(mainLight, inputData.normalWS, inputData.bakedGI, aoFactor); + half envLightingMultiplier = 4.0; // To match MetaLighting on DCL/Toon shader + inputData.bakedGI *= envLightingMultiplier; inputData.bakedGI *= surfaceData.albedo; LightingData lightingData = CreateLightingData(inputData, surfaceData); diff --git a/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Features.shader b/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Features.shader index 5c27c4ea61..6abe26b325 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Features.shader +++ b/Explorer/Assets/DCL/AvatarRendering/Shaders/DCL_Avatar_Facial_Features/DCL_Avatar_Facial_Features.shader @@ -95,7 +95,7 @@ Shader "DCL/DCL_Avatar_Facial_Features" // Shader Stages #pragma vertex LitPassVertexSimple #pragma fragment LitPassFragmentSimple - #pragma enable_d3d11_debug_symbols + //#pragma enable_d3d11_debug_symbols // ------------------------------------- // Material Keywords From 561804543d0018cf402253dd8c86ee943c103599 Mon Sep 17 00:00:00 2001 From: Geoff Birch Date: Mon, 26 Aug 2024 14:02:58 +0100 Subject: [PATCH 2/2] Default Facial mask texture changed from White to Black --- .../DCL/PluginSystem/World/World Plugins Container.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset b/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset index e742b35f7b..d696a0c237 100644 --- a/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset +++ b/Explorer/Assets/DCL/PluginSystem/World/World Plugins Container.asset @@ -109,12 +109,12 @@ MonoBehaviour: m_SubObjectType: m_EditorAssetChanged: 0 k__BackingField: - m_AssetGUID: b0989591ebd3293419eece13d705a1e3 + m_AssetGUID: 6bdb4b9ae9bf04745acee14bf4c684e1 m_SubObjectName: m_SubObjectType: m_EditorAssetChanged: 0 k__BackingField: - m_AssetGUID: b7201c2efeb480b4293d5baae77973d6 + m_AssetGUID: f3fd7329d073f964aaec82eb9acc9ed3 m_SubObjectName: m_SubObjectType: m_EditorAssetChanged: 0