解决部分模型贴图贴不上的问题

Samples~/trilibSDK/LoadSample.cs

@@ -1,6 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using TriLibCore;
+using TriLibCore.Interfaces;
+using TriLibCore.Textures;
 using UnityEngine;
 
 public class LoadSample : MonoBehaviour
@@ -8,31 +11,17 @@ public class LoadSample : MonoBehaviour
  /// The Model URL.
  /// </summary>
      string ModelURL = "https://ricardoreis.net/trilib/demos/sample/TriLibSampleModel.zip";/// <summary>
-                                                                                                 /// The Model URL.
-                                                                                                 /// </summary>
-     string ModelfILE = "D:\\JiHe\\MMD20230728021557 (1)\\Unity2GLTF.gltf";
+                                                                                  /// The Model URL.
+                                                                                                            /// </summary>
+     string ModelfILE = "E:\\upright-piano.zip";
     // Start is called before the first frame update
     void Start()
     {
-        TriLibModelLoad.Load(ModelURL, (AssetLoaderContext ac) => {
-            Debug.Log("模型加载完成");
-        }, (AssetLoaderContext ac) => {
-            Debug.Log("载材质加完成");
-            ac.RootGameObject.transform.position = Camera.main.transform.forward;
-
-        }, (AssetLoaderContext ac, float f) => {
-
-            Debug.Log("加载中==》" + f);
-        }, (IContextualizedError error) => {
-
-            Debug.Log("加载失败" + error);
-        });
         TriLibModelLoad.Load(ModelfILE, (AssetLoaderContext ac) => {
             Debug.Log("模型加载完成");
         }, (AssetLoaderContext ac) => {
-            Debug.Log("载材质加完成");
+            Debug.Log("载材质加完成" );
             ac.RootGameObject.transform.position = Camera.main.transform.forward;
-
         }, (AssetLoaderContext ac, float f) => {
 
             Debug.Log("加载中==》" + f);
@@ -41,7 +30,6 @@ public class LoadSample : MonoBehaviour
             Debug.Log("加载失败" + error);
         });
     }
-
     // Update is called once per frame
     void Update()
     {

Samples~/trilibSDK/TriLib.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 13aa63bb9246cb746859fad81826d99f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/trilibSDK/TriLib/TriLibCore/Resources/Materials/Standard/Standard/TriLibStandard.mat

@@ -2,14 +2,19 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: TriLibStandard
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP _SPECGLOSSMAP
+  m_ValidKeywords:
+  - _EMISSION
+  - _METALLICGLOSSMAP
+  - _NORMALMAP
+  m_InvalidKeywords:
+  - _SPECGLOSSMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -59,6 +64,7 @@ Material:
         m_Texture: {fileID: 2800000, guid: d1597ba5656dbe14998ca5a123fc8c77, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -69,7 +75,7 @@ Material:
     - _GlossyReflections: 1
     - _Metallic: 0
     - _Mode: 0
-    - _OcclusionStrength: 1
+    - _OcclusionStrength: 0.56
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
@@ -80,3 +86,4 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []

Samples~/trilibSDK/TriLib/TriLibCore/Scripts/AssetLoaders/AssetLoader.cs

@@ -16,6 +16,7 @@ using HumanDescription = UnityEngine.HumanDescription;
 using Object = UnityEngine.Object;
 using System.Collections;
 using TriLibCore.Attributes;
+using System.IO.Compression;
 #if TRILIB_DRACO
 using TriLibCore.Gltf.Reader;
 using TriLibCore.Gltf.Draco;
@@ -1179,6 +1180,7 @@ namespace TriLibCore
         /// <param name="assetLoaderContext">The Asset Loader Context reference. Asset Loader Context contains the Model loading data.</param>
         private static void ProcessMaterials(AssetLoaderContext assetLoaderContext)
         {
+
             if (assetLoaderContext.RootModel?.AllMaterials != null && assetLoaderContext.RootModel.AllMaterials.Count > 0)
             {
                 if (assetLoaderContext.Options.MaterialMappers != null)
@@ -1278,6 +1280,7 @@ namespace TriLibCore
                 assetLoaderContext.DiscardUnusedTextures();
             }
             assetLoaderContext.Reader?.UpdateLoadingPercentage(1f, assetLoaderContext.Reader.LoadingStepsCount + (int)ReaderBase.PostLoadingSteps.FinishedProcessing);
+
             assetLoaderContext.OnMaterialsLoad?.Invoke(assetLoaderContext);
             Cleanup(assetLoaderContext);
         }
@@ -1315,10 +1318,12 @@ namespace TriLibCore
             }
             if (assetLoaderContext.Options.DiscardUnusedTextures)
             {
+                Debug.Log("DiscardUnusedTexturesDiscardUnusedTexturesDiscardUnusedTexturesDiscardUnusedTextures");
                 assetLoaderContext.ExecuteActionsQueue(FinishLoading);
             }
             else
             {
+                Debug.Log("NO    DiscardUnusedTexturesDiscardUnusedTexturesDiscardUnusedTexturesDiscardUnusedTextures");
                 assetLoaderContext.ExecuteActionsQueue(LoadUnusedTextures);
             }
         }

Samples~/trilibSDK/TriLib/TriLibCore/Scripts/AssetLoaders/AssetLoaderZip.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using ICSharpCode.SharpZipLib.Zip;
 using TriLibCore.General;
@@ -29,6 +30,96 @@ namespace TriLibCore
                 if (zipLoadCustomContextData.Stream != null) {
                     zipLoadCustomContextData.Stream.Close();
                 }
+
+
+                AssetUnloader au = assetLoaderContext.RootGameObject.GetComponent<AssetUnloader>();
+                if (assetLoaderContext.LoadedMaterials.Count == 1)
+                {
+                    foreach (var tName in AssetLoaderZip.memoryStreamList.Keys)
+                    {
+                        au.Allocations.Add(AssetLoaderZip.memoryStreamList[tName]);
+                        if (tName.Contains("albedo")|| tName.Contains("Base"))
+                        {
+                            try
+                            {
+                                foreach (var m in assetLoaderContext.LoadedMaterials)
+                                {
+                                    m.Value.SetTexture("_MainTex", AssetLoaderZip.memoryStreamList[tName]);
+                                    m.Value.SetColor("_Color", Color.white);
+                                    m.Value.DisableKeyword("_EMISSION");
+                                }
+                            }
+                            catch
+                            {
+
+                            }
+
+                        }
+                        else if (tName.Contains("AO"))
+                        {
+                            try
+                            {
+                                foreach (var m in assetLoaderContext.LoadedMaterials)
+                                {
+                                    m.Value.SetTexture("AO", AssetLoaderZip.memoryStreamList[tName]);
+                                }
+                            }
+                            catch
+                            {
+
+                            }
+
+                        }
+                        else if (tName.Contains("metallic"))
+                        {
+                            foreach (var m in assetLoaderContext.LoadedMaterials)
+                            {
+                               // float? smoothness = m.Value.GetFloat("_Glossiness");
+                               // Debug.Log("smoothnesssmoothness==>"+ smoothness);
+                               // m.Value.SetFloat("_Glossiness",0);
+                                //     m.Value.SetTexture("_MetallicGlossMap", AssetLoaderZip.memoryStreamList[tName]);
+                            }
+                        }
+                        else if (tName.Contains("normal"))
+                        {
+                            try
+                            {
+                                foreach (var m in assetLoaderContext.LoadedMaterials)
+                                {
+                                    m.Value.SetTexture("_BumpMap", AssetLoaderZip.memoryStreamList[tName]);
+                                }
+                            }
+                            catch
+                            {
+
+                            }
+
+                        }
+                        else if (tName.Contains("roughness"))
+                        {
+
+                            try
+                            {
+                                foreach (var m in assetLoaderContext.LoadedMaterials)
+                                {
+                                    m.Value.SetTexture("roughness", AssetLoaderZip.memoryStreamList[tName]);
+                                }
+                            }
+                            catch
+                            {
+
+                            }
+                        }
+                    }
+                }else
+                {
+                    foreach (var tName in AssetLoaderZip.memoryStreamList.Keys)
+                    {
+                        au.Allocations.Add(AssetLoaderZip.memoryStreamList[tName]);
+                    }
+
+                }
+
                 if (zipLoadCustomContextData.OnMaterialsLoad != null)
                 {
                     zipLoadCustomContextData.OnMaterialsLoad(assetLoaderContext);
@@ -247,6 +338,8 @@ namespace TriLibCore
             return assetLoaderContext;
         }
 
+        public static Dictionary<string, Texture2D> memoryStreamList;
+
         /// <summary>Configures the Zip Model loading, adding the Zip External Data/Texture Mappers.</summary>
         /// <param name="onError">The method to execute when any error occurs.</param>
         /// <param name="stream">The Stream containing the Zip data.</param>
@@ -268,8 +361,30 @@ namespace TriLibCore
             {
                 stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
             }
+            Debug.Log("checkingFileExtension====>" + path);
             var validExtensions = Readers.Extensions;
             zipFile = new ZipFile(stream);
+
+            List<string> picList = new List<string>();
+            picList.Add("png");
+            picList.Add("jpg");
+            picList.Add("jpeg");
+            memoryStreamList = new Dictionary<string,Texture2D>(); 
+            foreach (ZipEntry zipEntry in zipFile)
+            {
+                if (!zipEntry.IsFile)
+                {
+                    continue;
+                }
+                var checkingFileExtension = FileUtils.GetFileExtension(zipEntry.Name, false);
+                if (picList.Contains(checkingFileExtension))
+                {
+                    Debug.Log("zipEntry.Name===>" + zipEntry.Name);
+                    Stream memoryStreamPic = ZipFileEntryToStream(out fileExtension, zipEntry, zipFile);
+                    memoryStreamList.Add(zipEntry.Name,StreamToTexture(memoryStreamPic));
+                }
+
+            }
             Stream memoryStream = null;
             modelZipEntry = null;
             foreach (ZipEntry zipEntry in zipFile)
@@ -297,8 +412,39 @@ namespace TriLibCore
                 onError?.Invoke(new ContextualizedError<string>(exception, "Error"));
             }
             return memoryStream;
-        }
+        }// 从Stream加载Texture的方法
+        public static Texture2D StreamToTexture(Stream stream)
+        {
+            // 创建一个新的Texture2D对象
+            Texture2D texture = new Texture2D(2, 2);
 
+            // 从Stream中读取数据到Texture2D
+            byte[] bytes = ReadStreamToBytes(stream);
+            if (bytes != null)
+            {
+                // 使用LoadImage方法将字节数组加载到Texture2D
+                if (texture.LoadImage(bytes))
+                {
+                    return texture; // 返回加载后的Texture2D
+                }
+            }
+
+            return null; // 加载失败时返回null
+        }
+        // 从Stream读取字节数组的方法
+        public static byte[] ReadStreamToBytes(Stream stream)
+        {
+            byte[] buffer = new byte[4096];
+            using (MemoryStream memoryStream = new MemoryStream())
+            {
+                int bytesRead;
+                while ((bytesRead = stream.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    memoryStream.Write(buffer, 0, bytesRead);
+                }
+                return memoryStream.ToArray();
+            }
+        }
         /// <summary>Copies the contents of a Zip file Entry into a Memory Stream.</summary>
         /// <param name="fileExtension">The Model inside the Zip file extension.</param>
         /// <param name="zipEntry">The Zip file Entry.</param>