Avatar Emissions brought back and roughness on scene fixed (#2211)

decentraland · Sep 28, 2024 · 225f9a7 · 225f9a7
1 parent 89a4fbc
commit 225f9a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/Explorer/Assets/DCL/AvatarRendering/AvatarShape/ComputeShader/AvatarMaterialConfiguration.cs b/Explorer/Assets/DCL/AvatarRendering/AvatarShape/ComputeShader/AvatarMaterialConfiguration.cs
@@ -71,15 +71,9 @@ private static (Material avatarMaterial, TextureArraySlot?[] slots, int shaderId
             avatarMaterial.SetColor(BASE_COLOR, baseColor);
             avatarMaterial.renderQueue = (int)RenderQueue.Geometry;
 
-            if (originalMaterial.IsKeywordEnabled("_EMISSION"))
-            {
-                var emissionColor = originalMaterial.GetColor("_EmissionColor");
-                avatarMaterial.SetColor("_Emissive_Color", emissionColor);
-            }
-            else
-            {
-                avatarMaterial.SetColor("_Emissive_Color", Color.black);
-            }
+            // this should really check for keyword _EMISSION, however for some reason it's rather inconsistent.
+            var emissionColor = originalMaterial.GetColor("_EmissionColor");
+            avatarMaterial.SetColor("_Emissive_Color", emissionColor);
 
             if (originalMaterial.IsKeywordEnabled("_ALPHATEST_ON") || originalMaterial.GetFloat(ALPHA_CLIP) > 0)
                 ConfigureAlphaTest(originalMaterial, avatarMaterial, baseColor);

diff --git a/Explorer/Assets/git-submodules/unity-shared-dependencies b/Explorer/Assets/git-submodules/unity-shared-dependencies