Updated material generators to take care of the name normalization

Author: Kinerius

Runtime/GLTFastWrappers/DecentralandMaterialGenerator.cs

@@ -32,10 +32,11 @@ public DecentralandMaterialGenerator(string shaderName)
         /// <param name="gltfMaterial"></param>
         /// <param name="gltf"></param>
         /// <returns></returns>
-        public override Material GenerateMaterial(GLTFastMaterial gltfMaterial, IGltfReadable gltf, bool pointsSupport = false)
+        public override Material GenerateMaterial(int materialIndex, GLTFastMaterial gltfMaterial, IGltfReadable gltf, bool pointsSupport = false)
         {
             material = new Material(shader);
-            material.name = gltfMaterial.name;
+
+            SetMaterialName(materialIndex, gltfMaterial);
 
             if (gltfMaterial.extensions?.KHR_materials_pbrSpecularGlossiness != null)
             {
@@ -76,6 +77,20 @@ public override Material GenerateMaterial(GLTFastMaterial gltfMaterial, IGltfRea
             return material;
         }
 
+        // This step is important if we want to keep the functionality of skin and hair colouring
+        private void SetMaterialName(int materialIndex, GLTFastMaterial gltfMaterial)
+        {
+            material.name = "material";
+
+            if (gltfMaterial.name.Contains("skin", StringComparison.InvariantCultureIgnoreCase))
+                material.name += "_skin";
+
+            if (gltfMaterial.name.Contains("hair", StringComparison.InvariantCultureIgnoreCase))
+                material.name += "_hair";
+
+            material.name += $"_{materialIndex}";
+        }
+
         private void SetEmissiveColor(Color gltfMaterialEmissive)
         {
             if (gltfMaterialEmissive != Color.black)

Runtime/GLTFastWrappers/DefaultMaterialGenerator.cs

@@ -1,5 +1,6 @@
 using GLTFast;
 using GLTFast.Materials;
+using System;
 using UnityEngine;
 
 namespace DCL.GLTFast.Wrappers
@@ -12,13 +13,29 @@ internal class DefaultMaterialGenerator : ShaderGraphMaterialGenerator
     {
         private const float CUSTOM_EMISSIVE_FACTOR = 5f;
 
-        public override Material GenerateMaterial(global::GLTFast.Schema.Material gltfMaterial, IGltfReadable gltf, bool pointsSupport = false)
+        public override Material GenerateMaterial(int materialIndex, global::GLTFast.Schema.Material gltfMaterial, IGltfReadable gltf, bool pointsSupport = false)
         {
-            Material generatedMaterial = base.GenerateMaterial(gltfMaterial, gltf);
+            Material generatedMaterial = base.GenerateMaterial(materialIndex, gltfMaterial, gltf);
+
+            SetMaterialName(generatedMaterial, materialIndex, gltfMaterial);
 
             if (gltfMaterial.Emissive != Color.black) { generatedMaterial.SetColor(EmissiveFactorProperty, gltfMaterial.Emissive * CUSTOM_EMISSIVE_FACTOR); }
 
             return generatedMaterial;
+
+            // This step is important if we want to keep the functionality of skin and hair colouring
+            void SetMaterialName(Material material, int materialIndex, global::GLTFast.Schema.Material gltfMaterial)
+            {
+                material.name = "material";
+
+                if (gltfMaterial.name.Contains("skin", StringComparison.InvariantCultureIgnoreCase))
+                    material.name += "_skin";
+
+                if (gltfMaterial.name.Contains("hair", StringComparison.InvariantCultureIgnoreCase))
+                    material.name += "_hair";
+
+                material.name += $"_{materialIndex}";
+            }
         }
     }
 }