Remmoved unnecessary transparency from merge meshes

decentraland · Feb 22, 2024 · 19962e2 · 19962e2
1 parent 2ad6b0e
commit 19962e2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/DCL_PiXYZ/PXZEntryPoint.cs b/DCL_PiXYZ/PXZEntryPoint.cs
@@ -26,7 +26,7 @@ private static async Task RunLODBuilder(string[] args)
             string defaultOutputPath = Path.Combine(Directory.GetCurrentDirectory(), "built-lods") ;
             string defaultSceneLodManifestDirectory = Path.Combine(Directory.GetCurrentDirectory(), "scene-lod-entities-manifest-builder/");
 
-            bool isDebug = false;
+            bool isDebug = true;
 
             if (args.Length > 0)
             {

diff --git a/DCL_PiXYZ/PiXYZWorflow/PXZMergeMeshes.cs b/DCL_PiXYZ/PiXYZWorflow/PXZMergeMeshes.cs
@@ -32,7 +32,6 @@ public PXZMergeMeshes(int lodLevel)
             bakeOption = new BakeOption();
             BakeMaps bakeMaps = new BakeMaps();
             bakeMaps.diffuse = true;
-            bakeMaps.opacity = true;
             bakeOption.bakingMethod = BakingMethod.RayOnly;
             this.lodLevel = lodLevel;
             bakeOption.padding = 1;
@@ -134,7 +133,6 @@ private void AddOcurrences(PiXYZAPI pxz, PackedTree packedTree)
                         MaterialList material = pxz.Scene.GetMaterialsFromSubtree(packedTreeOccurrence);
                         //A material will be consider transparent only if it has a single material and its name contains "FORCED_TRANSPARENT" added during the material curation
                         bool isTransparent = material.list.Length == 1 && pxz.Core.GetProperty(material.list[0], "Name").Contains("FORCED_TRANSPARENT");
-
                         if (isTransparent)
                             transparentsToMerge.AddOccurrence(packedTreeOccurrence);
                         else

diff --git a/DCL_PiXYZ/SceneRepositioner/SceneBuilder/Entities/DCLGLTFMesh.cs b/DCL_PiXYZ/SceneRepositioner/SceneBuilder/Entities/DCLGLTFMesh.cs
@@ -29,28 +29,33 @@ public DCLGLTFMesh(string src)
 
         public override PXZModel InstantiateMesh(PiXYZAPI pxz, string entityID, uint parent, uint material, Dictionary<string, string> contentTable, SceneConversionPathHandler pathHandler, int lodLevel)
         {
-            if (contentTable.TryGetValue(src.ToLower(), out string modelPath))
+            if (!contentTable.TryGetValue(src.ToLower(), out string modelPath))
             {
-                bool modelWorkSuccessfull = true;
-                try
-                {
-                    ReadSettings readSettings = new ReadSettings(ValidationMode.TryFix);
-                    var model = ModelRoot.Load(modelPath, readSettings);
-                    foreach (var gltfMaterial in model.LogicalMaterials)
-                    {
-                        if (gltfMaterial.Alpha != AlphaMode.OPAQUE && !gltfMaterial.Name.Contains("FORCED_TRANSPARENT"))
-                            gltfMaterial.Name += "FORCED_TRANSPARENT";
-                    }
-                    if (Path.GetExtension(modelPath).Contains("glb", StringComparison.OrdinalIgnoreCase))
-                        model.SaveGLB(modelPath);
-                    else
-                        model.SaveGLTF(modelPath);
-                }
-                catch (Exception e)
+                Console.WriteLine($"ERROR: GLTF {src} file not found in sceneContent");
+                return PXYZConstants.EMPTY_MODEL;
+            }
+
+            bool modelWorkSuccessfull = true;
+            try
+            {
+                var readSettings = new ReadSettings(ValidationMode.TryFix);
+                var model = ModelRoot.Load(modelPath, readSettings);
+                foreach (var gltfMaterial in model.LogicalMaterials)
                 {
-                    //PXZEntryPoint.WriteToFile($"MODEL FAILED A {modelPath} {e}", "FAILEDIMPORTMODELS.txt");
-                    Console.WriteLine($"ERROR pre-processing GLTF material: {e}");
+                    if (gltfMaterial.Alpha != AlphaMode.OPAQUE && !gltfMaterial.Name.Contains("FORCED_TRANSPARENT"))
+                        gltfMaterial.Name += "FORCED_TRANSPARENT";
                 }
+
+                if (Path.GetExtension(modelPath).Contains("glb", StringComparison.OrdinalIgnoreCase))
+                    model.SaveGLB(modelPath);
+                else
+                    model.SaveGLTF(modelPath);
+            }
+            catch (Exception e)
+            {
+                //PXZEntryPoint.WriteToFile($"MODEL FAILED A {modelPath} {e}", "FAILEDIMPORTMODELS.txt");
+                Console.WriteLine($"ERROR pre-processing GLTF material: {e}");
+            }
                 try
                 {
                     ReadSettings readSettings = new ReadSettings(ValidationMode.TryFix);
@@ -118,12 +123,7 @@ public override PXZModel InstantiateMesh(PiXYZAPI pxz, string entityID, uint par
                     Console.WriteLine($"ERROR: Importing GLTF {src} failed with error {e}");
                     return PXYZConstants.EMPTY_MODEL;
                 }
-            }
-            else
-            {
-                Console.WriteLine($"ERROR: GLTF {src} file not found in sceneContent");
-                return PXYZConstants.EMPTY_MODEL;
-            }
+
         }